[packages/libxcrypt] - new URLs, updated to 3.1.1 (now includes crypt_blowfish 1.3) - updated noWerror patch - added link
qboosh
qboosh at pld-linux.org
Mon Apr 10 20:17:25 CEST 2017
commit dd0823fd51e0243f7b270f4bf7eed9b0889257d5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Apr 10 20:17:27 2017 +0200
- new URLs, updated to 3.1.1 (now includes crypt_blowfish 1.3)
- updated noWerror patch
- added link patch
libxcrypt-link.patch | 10 ++++++++++
libxcrypt-noWerror.patch | 17 ++++++++---------
libxcrypt.spec | 24 ++++++++++++++++++------
3 files changed, 36 insertions(+), 15 deletions(-)
---
diff --git a/libxcrypt.spec b/libxcrypt.spec
index b2d46ff..e9e11f3 100644
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -1,14 +1,20 @@
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: 3.0.2
-Release: 3
+Version: 3.1.1
+Release: 1
License: LGPL v2.1+ (library), LGPL v2.1+/Public Domain (plugins)
Group: Libraries
-Source0: ftp://ftp.suse.com/pub/people/kukuk/libxcrypt/%{name}-%{version}.tar.bz2
-# Source0-md5: 56cf4285086f26649b8792b53fe8b00f
+#Source0Download: https://github.com/besser82/libxcrypt/releases
+Source0: https://github.com/besser82/libxcrypt/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 7eff183695f0dc4744b0f4bc8334eae9
Patch0: %{name}-noWerror.patch
Patch1: %{name}-libc-lock.patch
+Patch2: %{name}-link.patch
+URL: https://github.com/besser82/libxcrypt
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake >= 1:1.7
+BuildRequires: libtool >= 2:2
BuildRequires: sed >= 4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,8 +63,14 @@ Ten pakiet zawiera statyczną wersję biblioteki libxcrypt.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
--libdir=/%{_lib}
%{__make}
@@ -70,8 +82,8 @@ install -d $RPM_BUILD_ROOT%{_libdir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-mv -f $RPM_BUILD_ROOT/%{_lib}/libxcrypt.{so,la,a} $RPM_BUILD_ROOT%{_libdir}
-sed -i -e 's#/%{_lib}#%{_libdir}#g' $RPM_BUILD_ROOT%{_libdir}/libxcrypt.la
+%{__mv} $RPM_BUILD_ROOT/%{_lib}/libxcrypt.{so,la,a} $RPM_BUILD_ROOT%{_libdir}
+%{__sed} -i -e 's#/%{_lib}#%{_libdir}#g' $RPM_BUILD_ROOT%{_libdir}/libxcrypt.la
ln -snf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libxcrypt.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libxcrypt.so
%{__rm} $RPM_BUILD_ROOT/%{_lib}/xcrypt/*.{la,a}
diff --git a/libxcrypt-link.patch b/libxcrypt-link.patch
new file mode 100644
index 0000000..147c5d1
--- /dev/null
+++ b/libxcrypt-link.patch
@@ -0,0 +1,10 @@
+--- libxcrypt-3.1.1/plugins/blowfish/Makefile.am.orig 2015-05-13 01:29:46.000000000 +0200
++++ libxcrypt-3.1.1/plugins/blowfish/Makefile.am 2017-04-10 19:13:39.158177658 +0200
+@@ -16,6 +16,7 @@
+
+ TESTS = blowfish-test
+
++libxcrypt_2a_la_LIBADD = -ldl
+ libxcrypt_2a_la_LDFLAGS = -version-info 1:0:0 \
+ -Wl,--version-script=$(top_srcdir)/plugins/plugin.map
+
diff --git a/libxcrypt-noWerror.patch b/libxcrypt-noWerror.patch
index 1efa071..bade05f 100644
--- a/libxcrypt-noWerror.patch
+++ b/libxcrypt-noWerror.patch
@@ -1,12 +1,11 @@
-diff -dur libxcrypt-3.0.2.orig/configure.in libxcrypt-3.0.2/configure.in
---- libxcrypt-3.0.2.orig/configure.in 2008-07-16 14:30:29.000000000 +0200
-+++ libxcrypt-3.0.2/configure.in 2012-06-19 12:27:48.000000000 +0200
-@@ -29,7 +29,7 @@
-
- EXTRA_CFLAGS=""
- if eval "test x$GCC = xyes"; then
-- EXTRA_CFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef -Wpointer-arith -Werror"
-+ EXTRA_CFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef -Wpointer-arith"
+--- libxcrypt-3.1.1/configure.ac.orig 2015-05-13 01:29:46.000000000 +0200
++++ libxcrypt-3.1.1/configure.ac 2017-04-10 18:59:27.731520714 +0200
+@@ -38,7 +38,7 @@
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wcast-qual -Winline"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wmissing-declarations -Wmissing-prototypes"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wnested-externs -Wshadow -Wstrict-prototypes"
+- EXTRA_CFLAGS="$EXTRA_CFLAGS -Wundef -Wpointer-arith -Werror"
++ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wundef -Wpointer-arith"
fi
AC_SUBST(EXTRA_CFLAGS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libxcrypt.git/commitdiff/dd0823fd51e0243f7b270f4bf7eed9b0889257d5
More information about the pld-cvs-commit
mailing list