- updated to 4.4.10

- updated xcrypt patch
- removed obsolete Add-x32-specific-inline-asm patch

diff --git a/0001-Add-x32-specific-inline-asm.patch b/0001-Add-x32-specific-inline-asm.patch
deleted file mode 100644 (file)
index 9e31b03..0000000
--- a/0001-Add-x32-specific-inline-asm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7d01f2acf6fde6341a68a91f9b343841cc424af7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 17 Dec 2018 11:33:35 -0800
-Subject: [PATCH] Add x32 specific inline asm
-
-Upstream-Status: Pending [https://github.com/besser82/libxcrypt/issues/74#issuecomment-447966455]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- alg-yescrypt-opt.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/alg-yescrypt-opt.c b/alg-yescrypt-opt.c
-index 5dbd822..060caf4 100644
---- a/alg-yescrypt-opt.c
-+++ b/alg-yescrypt-opt.c
-@@ -528,6 +528,11 @@ static volatile uint64_t Smask2var = Smask2;
- #undef MAYBE_MEMORY_BARRIER
- #define MAYBE_MEMORY_BARRIER \
-       __asm__("" : : : "memory");
-+#ifdef __ILP32__ /* x32 */
-+#define REGISTER_PREFIX "e"
-+#else
-+#define REGISTER_PREFIX "r"
-+#endif
- #define PWXFORM_SIMD(X) { \
-       __m128i H; \
-       __asm__( \
-@@ -537,8 +542,8 @@ static volatile uint64_t Smask2var = Smask2;
-           "pmuludq %1, %0\n\t" \
-           "movl %%eax, %%ecx\n\t" \
-           "shrq $0x20, %%rax\n\t" \
--          "paddq (%3,%%rcx), %0\n\t" \
--          "pxor (%4,%%rax), %0\n\t" \
-+          "paddq (%3,%%" REGISTER_PREFIX "cx), %0\n\t" \
-+          "pxor (%4,%%" REGISTER_PREFIX "ax), %0\n\t" \
-           : "+x" (X), "=x" (H) \
-           : "d" (Smask2), "S" (S0), "D" (S1) \
-           : "cc", "ax", "cx"); \
--- 
-2.20.1
-

diff --git a/libxcrypt-xcrypt.patch b/libxcrypt-xcrypt.patch
index c6c0e35e6b85f0b8f6fbc5e458807a23536400a2..fb2d14475dea9e3452909492565672ca2d237674 100644 (file)
--- a/libxcrypt-xcrypt.patch
+++ b/libxcrypt-xcrypt.patch
@@ -1,26 +1,28 @@
---- libxcrypt-4.4.0/Makefile.am.orig   2018-11-19 20:39:12.000000000 +0100
-+++ libxcrypt-4.4.0/Makefile.am        2018-11-29 20:46:27.369590776 +0100
-@@ -37,17 +37,13 @@
-       alg-yescrypt-sysendian.h byteorder.h crypt-common.h \
-       crypt-obsolete.h crypt-port.h test-des-cases.h
+--- libxcrypt-4.4.10/Makefile.am.orig  2019-09-18 18:07:41.000000000 +0200
++++ libxcrypt-4.4.10/Makefile.am       2019-10-05 20:24:46.898848434 +0200
+@@ -84,19 +84,15 @@
+       test/des-cases.h \
+       test/crypt-kat.inc
  
 -if ENABLE_XCRYPT_COMPAT_FILES
- include_HEADERS = xcrypt.h
+ nodist_include_HEADERS += xcrypt.h
 -else
--noinst_HEADERS += xcrypt.h
+-nodist_noinst_HEADERS += xcrypt.h
 -endif
  
+ noinst_PROGRAMS = \
+       lib/gen-des-tables
  
- noinst_PROGRAMS = gen-des-tables
+ lib_LTLIBRARIES = \
+-      libcrypt.la
++      libxcrypt.la
  
--lib_LTLIBRARIES = libcrypt.la
 -libcrypt_la_SOURCES = \
-+lib_LTLIBRARIES = libxcrypt.la
 +libxcrypt_la_SOURCES = \
-       alg-des.c alg-des-tables.c alg-gost3411-2012-core.c \
-       alg-gost3411-2012-hmac.c alg-hmac-sha1.c alg-md4.c alg-md5.c \
-       alg-sha1.c alg-sha256.c alg-sha512.c alg-yescrypt-opt.c \
-@@ -75,23 +71,23 @@
+       lib/alg-des-tables.c \
+       lib/alg-des.c \
+       lib/alg-gost3411-2012-core.c \
+@@ -143,23 +139,23 @@
  
  # Build libcrypt.so.2 if obsolete APIs are excluded, libcrypt.so.1 otherwise.
  if ENABLE_OBSOLETE_API
@@ -39,19 +41,19 @@
 +libxcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map
  endif
  
--libcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG)
-+libxcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG)
+-libcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG) $(AM_LDFLAGS)
++libxcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG) $(AM_LDFLAGS)
  
 -libcrypt_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_LIBCRYPT
 +libxcrypt_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_LIBCRYPT
  
- CONFIG_STATUS_DEPENDENCIES = libcrypt.minver
+ CONFIG_STATUS_DEPENDENCIES = lib/libcrypt.minver.$(MINVER_OS)
 -EXTRA_libcrypt_la_DEPENDENCIES = libcrypt.map
 +EXTRA_libxcrypt_la_DEPENDENCIES = libcrypt.map
- CLEANFILES = Makefile.deps.T Makefile.deps \
+ CLEANFILES = \
+       Makefile.deps Makefile.deps.T \
        libcrypt.map libcrypt.map.T \
-       crypt-symbol-vers.h crypt-symbol-vers.h.T \
-@@ -151,9 +147,9 @@
+@@ -234,9 +230,9 @@
        uninstall-hook-xcrypt-static
  install-exec-hook-xcrypt-static:
        cd $(DESTDIR)$(libdir) && \
@@ -63,7 +65,7 @@
  endif
  
  if ENABLE_SHARED
-@@ -166,9 +162,9 @@
+@@ -249,9 +245,9 @@
        uninstall-hook-xcrypt-shared
  install-exec-hook-xcrypt-shared:
        cd $(DESTDIR)$(libdir) && \
@@ -75,7 +77,7 @@
  endif
  endif
  
-@@ -195,7 +191,7 @@
+@@ -278,7 +274,7 @@
        uninstall-hook-libstatic
  install-exec-hook-libstatic:
        cd $(DESTDIR)$(libdir) && \
@@ -84,7 +86,7 @@
  uninstall-hook-libstatic:
        -rm -f $(DESTDIR)$(libdir)/libowcrypt.a
  endif
-@@ -208,8 +204,8 @@
+@@ -291,8 +287,8 @@
        uninstall-hook-libshared
  install-exec-hook-libshared:
        cd $(DESTDIR)$(libdir) && \
@@ -95,111 +97,119 @@
  uninstall-hook-libshared:
        -rm -f  $(DESTDIR)$(libdir)/libowcrypt.so \
                $(DESTDIR)$(libdir)/libowcrypt.so.1
-@@ -231,7 +227,7 @@
-         test-getrandom-interface test-getrandom-fallbacks
+@@ -346,7 +342,7 @@
+ endif
  
  if ENABLE_OBSOLETE_API
--libcrypt_la_SOURCES += crypt-des-obsolete.c
-+libxcrypt_la_SOURCES += crypt-des-obsolete.c
- check_PROGRAMS += test-des-obsolete test-des-obsolete_r
+-libcrypt_la_SOURCES += lib/crypt-des-obsolete.c
++libxcrypt_la_SOURCES += lib/crypt-des-obsolete.c
+ check_PROGRAMS += test/des-obsolete test/des-obsolete_r test/fcrypt-enosys
  endif
  
-@@ -252,7 +248,7 @@
- EXTRA_DIST += test-symbols-static.sh test-symbols-compat.sh test-symbols-renames.sh
+@@ -365,7 +361,7 @@
+ endif
  
  AM_TESTS_ENVIRONMENT = \
--    lib_la="./libcrypt.la"; lib_map="$(srcdir)/libcrypt.map.in"; \
-+    lib_la="./libxcrypt.la"; lib_map="$(srcdir)/libcrypt.map.in"; \
+-    lib_la="./libcrypt.la"; lib_map="$(srcdir)/lib/libcrypt.map.in"; \
++    lib_la="./libxcrypt.la"; lib_map="$(srcdir)/lib/libcrypt.map.in"; \
      CC="$(CC)"; CPP="$(CPP)"; \
      CPPFLAGS="$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)"; \
      CPPFLAGS="$${CPPFLAGS} $(AM_CPPFLAGS) $(CPPFLAGS)"; \
-@@ -267,7 +263,7 @@
+@@ -378,7 +374,7 @@
  # Refer to object files that are linked into libxcrypt with the
- # qualified name, libcrypt_la-foobar.lo, to prevent them from
+ # qualified name, lib/libcrypt_la-foobar.lo, to prevent them from
  # being compiled a second time.
--COMMON_TEST_OBJECTS = libcrypt_la-crypt-common.lo libcrypt.la
-+COMMON_TEST_OBJECTS = libxcrypt_la-crypt-common.lo libxcrypt.la
+-COMMON_TEST_OBJECTS = lib/libcrypt_la-crypt-common.lo libcrypt.la
++COMMON_TEST_OBJECTS = lib/libxcrypt_la-crypt-common.lo libxcrypt.la
  
- test_crypt_bcrypt_LDADD = $(COMMON_TEST_OBJECTS)
- test_crypt_des_LDADD = $(COMMON_TEST_OBJECTS)
-@@ -293,53 +289,53 @@
+ test_badsalt_LDADD = $(COMMON_TEST_OBJECTS)
+ test_badsetting_LDADD = $(COMMON_TEST_OBJECTS)
+@@ -400,58 +396,58 @@
  # These tests call internal APIs that may not be accessible from the
  # fully linked shared library.
  test_alg_des_LDADD = \
--      libcrypt_la-alg-des.lo \
--      libcrypt_la-alg-des-tables.lo \
-+      libxcrypt_la-alg-des.lo \
-+      libxcrypt_la-alg-des-tables.lo \
+-      lib/libcrypt_la-alg-des.lo \
+-      lib/libcrypt_la-alg-des-tables.lo \
++      lib/libxcrypt_la-alg-des.lo \
++      lib/libxcrypt_la-alg-des-tables.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_gost3411_2012_LDADD = \
--      libcrypt_la-alg-gost3411-2012-core.lo \
--      libcrypt_la-alg-gost3411-2012-hmac.lo \
-+      libxcrypt_la-alg-gost3411-2012-core.lo \
-+      libxcrypt_la-alg-gost3411-2012-hmac.lo \
+-      lib/libcrypt_la-alg-gost3411-2012-core.lo \
+-      lib/libcrypt_la-alg-gost3411-2012-hmac.lo \
++      lib/libxcrypt_la-alg-gost3411-2012-core.lo \
++      lib/libxcrypt_la-alg-gost3411-2012-hmac.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_gost3411_2012_hmac_LDADD = \
--      libcrypt_la-alg-gost3411-2012-core.lo \
--      libcrypt_la-alg-gost3411-2012-hmac.lo \
-+      libxcrypt_la-alg-gost3411-2012-core.lo \
-+      libxcrypt_la-alg-gost3411-2012-hmac.lo \
+-      lib/libcrypt_la-alg-gost3411-2012-core.lo \
+-      lib/libcrypt_la-alg-gost3411-2012-hmac.lo \
++      lib/libxcrypt_la-alg-gost3411-2012-core.lo \
++      lib/libxcrypt_la-alg-gost3411-2012-hmac.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_hmac_sha1_LDADD = \
--      libcrypt_la-alg-sha1.lo \
--      libcrypt_la-alg-hmac-sha1.lo \
-+      libxcrypt_la-alg-sha1.lo \
-+      libxcrypt_la-alg-hmac-sha1.lo \
+-      lib/libcrypt_la-alg-sha1.lo \
+-      lib/libcrypt_la-alg-hmac-sha1.lo \
++      lib/libxcrypt_la-alg-sha1.lo \
++      lib/libxcrypt_la-alg-hmac-sha1.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_md4_LDADD = \
--      libcrypt_la-alg-md4.lo \
-+      libxcrypt_la-alg-md4.lo \
+-      lib/libcrypt_la-alg-md4.lo \
++      lib/libxcrypt_la-alg-md4.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_md5_LDADD = \
--      libcrypt_la-alg-md5.lo \
-+      libxcrypt_la-alg-md5.lo \
+-      lib/libcrypt_la-alg-md5.lo \
++      lib/libxcrypt_la-alg-md5.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_pbkdf_hmac_sha256_LDADD = \
--      libcrypt_la-alg-sha256.lo \
-+      libxcrypt_la-alg-sha256.lo \
+-      lib/libcrypt_la-alg-sha256.lo \
++      lib/libxcrypt_la-alg-sha256.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_sha1_LDADD = \
--      libcrypt_la-alg-sha1.lo \
-+      libxcrypt_la-alg-sha1.lo \
+-      lib/libcrypt_la-alg-sha1.lo \
++      lib/libxcrypt_la-alg-sha1.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_sha256_LDADD = \
--      libcrypt_la-alg-sha256.lo \
-+      libxcrypt_la-alg-sha256.lo \
+-      lib/libcrypt_la-alg-sha256.lo \
++      lib/libxcrypt_la-alg-sha256.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_sha512_LDADD = \
--      libcrypt_la-alg-sha512.lo \
-+      libxcrypt_la-alg-sha512.lo \
+-      lib/libcrypt_la-alg-sha512.lo \
++      lib/libxcrypt_la-alg-sha512.lo \
+       $(COMMON_TEST_OBJECTS)
+ test_alg_yescrypt_LDADD = \
+-      lib/libcrypt_la-alg-sha256.lo \
+-      lib/libcrypt_la-alg-yescrypt-common.lo \
+-      lib/libcrypt_la-alg-yescrypt-opt.lo \
++      lib/libxcrypt_la-alg-sha256.lo \
++      lib/libxcrypt_la-alg-yescrypt-common.lo \
++      lib/libxcrypt_la-alg-yescrypt-opt.lo \
        $(COMMON_TEST_OBJECTS)
  test_crypt_gost_yescrypt_LDADD = \
--      libcrypt_la-alg-gost3411-2012-core.lo \
--      libcrypt_la-alg-gost3411-2012-hmac.lo \
--      libcrypt_la-alg-sha256.lo \
--      libcrypt_la-alg-yescrypt-common.lo \
--      libcrypt_la-alg-yescrypt-opt.lo \
--      libcrypt_la-crypt-yescrypt.lo \
-+      libxcrypt_la-alg-gost3411-2012-core.lo \
-+      libxcrypt_la-alg-gost3411-2012-hmac.lo \
-+      libxcrypt_la-alg-sha256.lo \
-+      libxcrypt_la-alg-yescrypt-common.lo \
-+      libxcrypt_la-alg-yescrypt-opt.lo \
-+      libxcrypt_la-crypt-yescrypt.lo \
+-      lib/libcrypt_la-alg-gost3411-2012-core.lo \
+-      lib/libcrypt_la-alg-gost3411-2012-hmac.lo \
+-      lib/libcrypt_la-alg-sha256.lo \
+-      lib/libcrypt_la-alg-yescrypt-common.lo \
+-      lib/libcrypt_la-alg-yescrypt-opt.lo \
+-      lib/libcrypt_la-crypt-yescrypt.lo \
++      lib/libxcrypt_la-alg-gost3411-2012-core.lo \
++      lib/libxcrypt_la-alg-gost3411-2012-hmac.lo \
++      lib/libxcrypt_la-alg-sha256.lo \
++      lib/libxcrypt_la-alg-yescrypt-common.lo \
++      lib/libxcrypt_la-alg-yescrypt-opt.lo \
++      lib/libxcrypt_la-crypt-yescrypt.lo \
        $(COMMON_TEST_OBJECTS)
  
  test_getrandom_interface_LDADD = \
--      libcrypt_la-randombytes.lo \
-+      libxcrypt_la-randombytes.lo \
+-      lib/libcrypt_la-randombytes.lo \
++      lib/libxcrypt_la-randombytes.lo \
        $(COMMON_TEST_OBJECTS)
  test_getrandom_fallbacks_LDADD = \
--      libcrypt_la-randombytes.lo \
-+      libxcrypt_la-randombytes.lo \
+-      lib/libcrypt_la-randombytes.lo \
++      lib/libxcrypt_la-randombytes.lo \
        $(COMMON_TEST_OBJECTS)
  
  if HAVE_LD_WRAP
---- libxcrypt-4.4.0/libxcrypt.pc.in.orig       2018-11-19 20:39:12.000000000 +0100
-+++ libxcrypt-4.4.0/libxcrypt.pc.in    2018-11-29 20:47:35.179590003 +0100
+--- libxcrypt-4.4.10/lib/libxcrypt.pc.in.orig  2019-09-18 18:07:41.000000000 +0200
++++ libxcrypt-4.4.10/lib/libxcrypt.pc.in       2019-10-05 20:26:31.028284316 +0200
 @@ -11,5 +11,5 @@
  Name: @PACKAGE@
  Version: @VERSION@

diff --git a/libxcrypt.spec b/libxcrypt.spec
index 5d5636ac4a9b89b5fad0cdc42d27e359da09946b..fcea84f335dc83ec558b6722f4412b0154c0274c 100644 (file)
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -1,18 +1,18 @@
 Summary:       Crypt Library for DES, MD5, and Blowfish
 Summary(pl.UTF-8):     Biblioteka szyfrująca hasła obsługująca DES, MD5 i Blowfish
 Name:          libxcrypt
-Version:       4.4.0
-Release:       2
+Version:       4.4.10
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 #Source0Download: https://github.com/besser82/libxcrypt/releases
 Source0:       https://github.com/besser82/libxcrypt/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 13e9f41b9881956c529a028b636ff22b
+# Source0-md5: 3eb083c2528cdd37314080891d77e779
 Patch0:                %{name}-xcrypt.patch
-Patch1:                0001-Add-x32-specific-inline-asm.patch
 URL:           https://github.com/besser82/libxcrypt
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.14
+BuildRequires: gcc >= 5:3.2
 BuildRequires: libtool >= 2:2
 BuildRequires: pkgconfig >= 1:0.27
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,7 +61,6 @@ Ten pakiet zawiera statyczną wersję biblioteki libxcrypt.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}