- updated to 4.4.17

- updated xcrypt patch

diff --git a/libxcrypt-xcrypt.patch b/libxcrypt-xcrypt.patch
index fb2d14475dea9e3452909492565672ca2d237674..1afa243b5f2ae4e34992251e98a20fda87222777 100644 (file)
--- a/libxcrypt-xcrypt.patch
+++ b/libxcrypt-xcrypt.patch
@@ -1,8 +1,8 @@
---- 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
+--- libxcrypt-4.4.17/Makefile.am.orig  2020-08-23 09:49:51.000000000 +0200
++++ libxcrypt-4.4.17/Makefile.am       2020-08-23 10:47:59.294128962 +0200
 @@ -84,19 +84,15 @@
        test/des-cases.h \
-       test/crypt-kat.inc
+       test/ka-table.inc
  
 -if ENABLE_XCRYPT_COMPAT_FILES
  nodist_include_HEADERS += xcrypt.h
@@ -97,7 +97,7 @@
  uninstall-hook-libshared:
        -rm -f  $(DESTDIR)$(libdir)/libowcrypt.so \
                $(DESTDIR)$(libdir)/libowcrypt.so.1
-@@ -346,7 +342,7 @@
+@@ -401,7 +397,7 @@
  endif
  
  if ENABLE_OBSOLETE_API
@@ -106,16 +106,16 @@
  check_PROGRAMS += test/des-obsolete test/des-obsolete_r test/fcrypt-enosys
  endif
  
-@@ -365,7 +361,7 @@
- endif
+@@ -421,7 +417,7 @@
  
  AM_TESTS_ENVIRONMENT = \
--    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)"; \
-@@ -378,7 +374,7 @@
+     host_os="$(host_os)"; \
+-    lib_la="./libcrypt.la"; \
++    lib_la="./libxcrypt.la"; \
+     lib_map="$(srcdir)/lib/libcrypt.map.in"; \
+     AWK="$(AWK)"; \
+     CC="$(CC)"; \
+@@ -438,7 +434,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.
@@ -124,7 +124,7 @@
  
  test_badsalt_LDADD = $(COMMON_TEST_OBJECTS)
  test_badsetting_LDADD = $(COMMON_TEST_OBJECTS)
-@@ -400,58 +396,58 @@
+@@ -474,58 +470,58 @@
  # These tests call internal APIs that may not be accessible from the
  # fully linked shared library.
  test_alg_des_LDADD = \

diff --git a/libxcrypt.spec b/libxcrypt.spec
index fcea84f335dc83ec558b6722f4412b0154c0274c..f9c565b83683277894dbccd14a5717678590dcca 100644 (file)
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -1,13 +1,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.10
+Version:       4.4.17
 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: 3eb083c2528cdd37314080891d77e779
+# Source0-md5: 12118d098ead971f9a8377cacfdd0da7
 Patch0:                %{name}-xcrypt.patch
 URL:           https://github.com/besser82/libxcrypt
 BuildRequires: autoconf >= 2.62
@@ -84,6 +84,8 @@ install -d $RPM_BUILD_ROOT/%{_lib}
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libxcrypt.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -snf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libxcrypt.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libxcrypt.so
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libxcrypt.la
 # PLD doesn't need Owl compatibility
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libowcrypt.*
 # packaged with glibc-devel
@@ -104,7 +106,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libxcrypt.so
-%{_libdir}/libxcrypt.la
 %{_includedir}/xcrypt
 %{_pkgconfigdir}/libcrypt.pc
 %{_pkgconfigdir}/libxcrypt.pc