[packages/libxcrypt] - packages already linked with libxcrypt.so.2 need glibc compatibility API (e.g. pam)

qboosh qboosh at pld-linux.org
Fri Nov 30 19:12:35 CET 2018


commit eee95ac930478c571e8706bb58f55fe16f52cead
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Nov 30 19:16:56 2018 +0100

    - packages already linked with libxcrypt.so.2 need glibc compatibility API (e.g. pam)

 libxcrypt-xcrypt.patch | 4 ++--
 libxcrypt.spec         | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/libxcrypt.spec b/libxcrypt.spec
index 0b25718..54f5378 100644
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -69,7 +69,6 @@ Ten pakiet zawiera statyczną wersję biblioteki libxcrypt.
 %{__automake}
 %configure \
 	--includedir=%{_includedir}/xcrypt \
-	--disable-obsolete-api \
 	--disable-werror \
 	--disable-xcrypt-compat-files
 %{__make}
@@ -84,6 +83,9 @@ 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
 
+# PLD doesn't need Owl compatibility
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libowcrypt.*
+# packaged with glibc-devel
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/crypt{,_r,_ra,_rn}.3*
 
 %clean
diff --git a/libxcrypt-xcrypt.patch b/libxcrypt-xcrypt.patch
index 7470d9e..c6c0e35 100644
--- a/libxcrypt-xcrypt.patch
+++ b/libxcrypt-xcrypt.patch
@@ -25,10 +25,10 @@
  # Build libcrypt.so.2 if obsolete APIs are excluded, libcrypt.so.1 otherwise.
  if ENABLE_OBSOLETE_API
 -libcrypt_la_VERSION = 2:0:1
-+libxcrypt_la_VERSION = 2:0:1
++libxcrypt_la_VERSION = 3:0:1
  else
 -libcrypt_la_VERSION = 2:0:0
-+libxcrypt_la_VERSION = 2:0:0
++libxcrypt_la_VERSION = 3:0:0
  endif
  
 -libcrypt_la_LDFLAGS = -version-info $(libcrypt_la_VERSION)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libxcrypt.git/commitdiff/eee95ac930478c571e8706bb58f55fe16f52cead



More information about the pld-cvs-commit mailing list