up to 4.4.19

diff --git a/libxcrypt-xcrypt.patch b/libxcrypt-xcrypt.patch
index 44b1704ef11a4bad733d7d69f7b300dbca4bb2dd..f912a0676d57e4350cda9bd6a74a6599117a982d 100644 (file)
--- a/libxcrypt-xcrypt.patch
+++ b/libxcrypt-xcrypt.patch
@@ -1,13 +1,12 @@
---- libxcrypt-4.4.18/Makefile.am.orig  2021-02-20 21:34:36.000000000 +0100
-+++ libxcrypt-4.4.18/Makefile.am       2021-02-26 07:13:19.480003785 +0100
-@@ -84,19 +84,15 @@
+diff -ur libxcrypt-4.4.19.orig/Makefile.am libxcrypt-4.4.19/Makefile.am
+--- libxcrypt-4.4.19.orig/Makefile.am  2021-04-08 21:57:36.000000000 +0200
++++ libxcrypt-4.4.19/Makefile.am       2021-04-13 18:19:42.502648175 +0200
+@@ -86,17 +86,15 @@
        test/des-cases.h \
        test/ka-table.inc
  
 -if ENABLE_XCRYPT_COMPAT_FILES
  nodist_include_HEADERS += xcrypt.h
--else
--nodist_noinst_HEADERS += xcrypt.h
 -endif
  
  noinst_PROGRAMS = \
@@ -22,7 +21,7 @@
        lib/alg-des-tables.c \
        lib/alg-des.c \
        lib/alg-gost3411-2012-core.c \
-@@ -143,23 +139,23 @@
+@@ -146,23 +144,23 @@
  
  # Build libcrypt.so.2 if obsolete APIs are excluded, libcrypt.so.1 otherwise.
  if ENABLE_OBSOLETE_API
@@ -52,52 +51,52 @@
 +EXTRA_libxcrypt_la_DEPENDENCIES = libcrypt.map
  CLEANFILES = \
        Makefile.deps Makefile.deps.T \
-       libcrypt.map libcrypt.map.T \
-@@ -236,9 +232,9 @@
+       libcrypt.map libcrypt.map.T libcrypt.map.stamp \
+@@ -266,9 +264,9 @@
        uninstall-hook-xcrypt-static
  install-exec-hook-xcrypt-static:
        cd $(DESTDIR)$(libdir) && \
--              $(LN_S) libcrypt.a libxcrypt.a
-+              $(LN_S) libxcrypt.a libcrypt.a
+-              $(LN_S) -f libcrypt.a libxcrypt.a
++              $(LN_S) -f libxcrypt.a libcrypt.a
  uninstall-hook-xcrypt-static:
 -      -rm -f $(DESTDIR)$(libdir)/libxcrypt.a
 +      -rm -f $(DESTDIR)$(libdir)/libcrypt.a
  endif
  
  if ENABLE_SHARED
-@@ -251,9 +247,9 @@
+@@ -281,9 +279,9 @@
        uninstall-hook-xcrypt-shared
  install-exec-hook-xcrypt-shared:
        cd $(DESTDIR)$(libdir) && \
--              $(LN_S) libcrypt.so libxcrypt.so
-+              $(LN_S) libxcrypt.so libcrypt.so
+-              $(LN_S) -f libcrypt.so libxcrypt.so
++              $(LN_S) -f libxcrypt.so libcrypt.so
  uninstall-hook-xcrypt-shared:
 -      -rm -f $(DESTDIR)$(libdir)/libxcrypt.so
 +      -rm -f $(DESTDIR)$(libdir)/libcrypt.so
  endif
  endif
  
-@@ -280,7 +276,7 @@
+@@ -310,7 +308,7 @@
        uninstall-hook-libstatic
  install-exec-hook-libstatic:
        cd $(DESTDIR)$(libdir) && \
--              $(LN_S) libcrypt.a libowcrypt.a
-+              $(LN_S) libxcrypt.a libowcrypt.a
+-              $(LN_S) -f libcrypt.a libowcrypt.a
++              $(LN_S) -f libxcrypt.a libowcrypt.a
  uninstall-hook-libstatic:
        -rm -f $(DESTDIR)$(libdir)/libowcrypt.a
  endif
-@@ -293,8 +289,8 @@
+@@ -323,8 +321,8 @@
        uninstall-hook-libshared
  install-exec-hook-libshared:
        cd $(DESTDIR)$(libdir) && \
--              $(LN_S) libcrypt.so libowcrypt.so && \
--              $(LN_S) libcrypt.so.1 libowcrypt.so.1
-+              $(LN_S) libxcrypt.so libowcrypt.so && \
-+              $(LN_S) libxcrypt.so.1 libowcrypt.so.1
+-              $(LN_S) -f libcrypt.so libowcrypt.so && \
+-              $(LN_S) -f libcrypt.so.1 libowcrypt.so.1
++              $(LN_S) -f libxcrypt.so libowcrypt.so && \
++              $(LN_S) -f libxcrypt.so.1 libowcrypt.so.1
  uninstall-hook-libshared:
        -rm -f  $(DESTDIR)$(libdir)/libowcrypt.so \
                $(DESTDIR)$(libdir)/libowcrypt.so.1
-@@ -391,7 +387,7 @@
+@@ -422,7 +420,7 @@
  # This is very slow and requires nonstandard Python libraries and a shared
  # library build of libcrypt already present in the build-tree, so we only
  # do it when explicitly requested.
@@ -106,16 +105,16 @@
        $(PYTHON) $(srcdir)/test/ka-table-gen.py > ka-table.inc.T
        @if cmp -s ka-table.inc.T $(srcdir)/test/ka-table.inc; \
        then echo ka-table.inc is unchanged; rm ka-table.inc.T; \
-@@ -403,7 +399,7 @@
+@@ -434,7 +432,7 @@
  endif
  
  if ENABLE_OBSOLETE_API
 -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
+ check_PROGRAMS += test/des-obsolete test/des-obsolete_r
  endif
  
-@@ -418,7 +414,7 @@
+@@ -449,7 +447,7 @@
  endif
  
  AM_TESTS_ENVIRONMENT = \
@@ -124,18 +123,26 @@
      lib_map="$(srcdir)/lib/libcrypt.map.in"; \
      HAVE_CPP_dD="$(HAVE_CPP_dD)"; \
      SYMBOL_PREFIX="$(SYMBOL_PREFIX)"; \
-@@ -445,7 +441,7 @@
- # Refer to object files that are linked into libxcrypt with the
- # qualified name, lib/libcrypt_la-foobar.lo, to prevent them from
- # being compiled a second time.
--COMMON_TEST_OBJECTS = lib/libcrypt_la-crypt-common.lo libcrypt.la
-+COMMON_TEST_OBJECTS = lib/libxcrypt_la-crypt-common.lo libxcrypt.la
+@@ -473,7 +471,7 @@
+ test/symbols-renames.log test/symbols-renames.trs: test/TestCommon.pm
+ test/symbols-static.log test/symbols-static.trs: test/TestCommon.pm
+ 
+-COMMON_TEST_OBJECTS = libcrypt.la
++COMMON_TEST_OBJECTS = libxcrypt.la
  
  test_badsalt_LDADD = $(COMMON_TEST_OBJECTS)
  test_badsetting_LDADD = $(COMMON_TEST_OBJECTS)
-@@ -481,58 +477,58 @@
+@@ -507,81 +505,81 @@
  # These tests call internal APIs that may not be accessible from the
  # fully linked shared library.
+ # Refer to object files that are linked into libxcrypt with the
+-# qualified name, lib/libcrypt_la-foobar.lo, to prevent them from
++# qualified name, lib/libxcrypt_la-foobar.lo, to prevent them from
+ # being compiled a second time.
+ test_gensalt_LDADD = \
+-      lib/libcrypt_la-util-xstrcpy.lo \
++      lib/libxcrypt_la-util-xstrcpy.lo \
+       $(COMMON_TEST_OBJECTS)
  test_alg_des_LDADD = \
 -      lib/libcrypt_la-alg-des.lo \
 -      lib/libcrypt_la-alg-des-tables.lo \
@@ -145,52 +152,74 @@
  test_alg_gost3411_2012_LDADD = \
 -      lib/libcrypt_la-alg-gost3411-2012-core.lo \
 -      lib/libcrypt_la-alg-gost3411-2012-hmac.lo \
+-      lib/libcrypt_la-util-xbzero.lo \
 +      lib/libxcrypt_la-alg-gost3411-2012-core.lo \
 +      lib/libxcrypt_la-alg-gost3411-2012-hmac.lo \
++      lib/libxcrypt_la-util-xbzero.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_gost3411_2012_hmac_LDADD = \
 -      lib/libcrypt_la-alg-gost3411-2012-core.lo \
 -      lib/libcrypt_la-alg-gost3411-2012-hmac.lo \
+-      lib/libcrypt_la-util-xbzero.lo \
 +      lib/libxcrypt_la-alg-gost3411-2012-core.lo \
 +      lib/libxcrypt_la-alg-gost3411-2012-hmac.lo \
++      lib/libxcrypt_la-util-xbzero.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_hmac_sha1_LDADD = \
 -      lib/libcrypt_la-alg-sha1.lo \
 -      lib/libcrypt_la-alg-hmac-sha1.lo \
+-      lib/libcrypt_la-util-xbzero.lo \
 +      lib/libxcrypt_la-alg-sha1.lo \
 +      lib/libxcrypt_la-alg-hmac-sha1.lo \
++      lib/libxcrypt_la-util-xbzero.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_md4_LDADD = \
 -      lib/libcrypt_la-alg-md4.lo \
+-      lib/libcrypt_la-util-xbzero.lo \
 +      lib/libxcrypt_la-alg-md4.lo \
++      lib/libxcrypt_la-util-xbzero.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_md5_LDADD = \
 -      lib/libcrypt_la-alg-md5.lo \
+-      lib/libcrypt_la-util-xbzero.lo \
 +      lib/libxcrypt_la-alg-md5.lo \
++      lib/libxcrypt_la-util-xbzero.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_pbkdf_hmac_sha256_LDADD = \
 -      lib/libcrypt_la-alg-sha256.lo \
+-      lib/libcrypt_la-util-xbzero.lo \
 +      lib/libxcrypt_la-alg-sha256.lo \
++      lib/libxcrypt_la-util-xbzero.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_sha1_LDADD = \
 -      lib/libcrypt_la-alg-sha1.lo \
+-      lib/libcrypt_la-util-xbzero.lo \
 +      lib/libxcrypt_la-alg-sha1.lo \
++      lib/libxcrypt_la-util-xbzero.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_sha256_LDADD = \
 -      lib/libcrypt_la-alg-sha256.lo \
+-      lib/libcrypt_la-util-xbzero.lo \
 +      lib/libxcrypt_la-alg-sha256.lo \
++      lib/libxcrypt_la-util-xbzero.lo \
        $(COMMON_TEST_OBJECTS)
  test_alg_sha512_LDADD = \
 -      lib/libcrypt_la-alg-sha512.lo \
+-      lib/libcrypt_la-util-xbzero.lo \
 +      lib/libxcrypt_la-alg-sha512.lo \
++      lib/libxcrypt_la-util-xbzero.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/libcrypt_la-util-base64.lo \
+-      lib/libcrypt_la-util-xbzero.lo \
 +      lib/libxcrypt_la-alg-sha256.lo \
 +      lib/libxcrypt_la-alg-yescrypt-common.lo \
 +      lib/libxcrypt_la-alg-yescrypt-opt.lo \
++      lib/libxcrypt_la-util-base64.lo \
++      lib/libxcrypt_la-util-xbzero.lo \
        $(COMMON_TEST_OBJECTS)
  test_crypt_gost_yescrypt_LDADD = \
 -      lib/libcrypt_la-alg-gost3411-2012-core.lo \
@@ -199,26 +228,39 @@
 -      lib/libcrypt_la-alg-yescrypt-common.lo \
 -      lib/libcrypt_la-alg-yescrypt-opt.lo \
 -      lib/libcrypt_la-crypt-yescrypt.lo \
+-      lib/libcrypt_la-util-base64.lo \
+-      lib/libcrypt_la-util-xbzero.lo \
+-      lib/libcrypt_la-util-xstrcpy.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 \
++      lib/libxcrypt_la-util-base64.lo \
++      lib/libxcrypt_la-util-xbzero.lo \
++      lib/libxcrypt_la-util-xstrcpy.lo \
        $(COMMON_TEST_OBJECTS)
  
+ test_explicit_bzero_LDADD = \
+-      lib/libcrypt_la-util-xbzero.lo
++      lib/libxcrypt_la-util-xbzero.lo
  test_getrandom_interface_LDADD = \
--      lib/libcrypt_la-randombytes.lo \
-+      lib/libxcrypt_la-randombytes.lo \
-       $(COMMON_TEST_OBJECTS)
+-      lib/libcrypt_la-util-get-random-bytes.lo \
+-      lib/libcrypt_la-util-xbzero.lo
++      lib/libxcrypt_la-util-get-random-bytes.lo \
++      lib/libxcrypt_la-util-xbzero.lo
  test_getrandom_fallbacks_LDADD = \
--      lib/libcrypt_la-randombytes.lo \
-+      lib/libxcrypt_la-randombytes.lo \
-       $(COMMON_TEST_OBJECTS)
+-      lib/libcrypt_la-util-get-random-bytes.lo \
+-      lib/libcrypt_la-util-xbzero.lo
++      lib/libxcrypt_la-util-get-random-bytes.lo \
++      lib/libxcrypt_la-util-xbzero.lo
+ 
  
  if HAVE_LD_WRAP
---- 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
+diff -ur libxcrypt-4.4.19.orig/lib/libxcrypt.pc.in libxcrypt-4.4.19/lib/libxcrypt.pc.in
+--- libxcrypt-4.4.19.orig/lib/libxcrypt.pc.in  2021-04-08 21:57:36.000000000 +0200
++++ libxcrypt-4.4.19/lib/libxcrypt.pc.in       2021-04-13 18:20:04.059324711 +0200
 @@ -11,5 +11,5 @@
  Name: @PACKAGE@
  Version: @VERSION@

diff --git a/libxcrypt.spec b/libxcrypt.spec
index f814a36e6088de2d211e80ee3d7524e6cb4129d0..d8b68465e54f16612644e0e07065ae2d5c3ae637 100644 (file)
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -5,13 +5,13 @@
 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.18
+Version:       4.4.19
 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: b7c35b67b07744493d97b3db04daf499
+# Source0-md5: a088bd62745b1e29a9318eb5a44c09f7
 Patch0:                %{name}-xcrypt.patch
 URL:           https://github.com/besser82/libxcrypt
 BuildRequires: autoconf >= 2.62