diff --git a/libxcrypt-4.4.25.tar.gz b/libxcrypt-4.4.25.tar.gz deleted file mode 100644 index f500e82..0000000 --- a/libxcrypt-4.4.25.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:caea3d032a46c4855ff818637884c7f5719ad228b79387b62ee023c8fbef17b4 -size 523797 diff --git a/libxcrypt-4.4.26.tar.xz b/libxcrypt-4.4.26.tar.xz new file mode 100644 index 0000000..a45feda --- /dev/null +++ b/libxcrypt-4.4.26.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e6ab1e22b9d1dc40165ec767662a34773d22f766aae1f989328069e8a3aa99a +size 614264 diff --git a/libxcrypt-4.4.26.tar.xz.asc b/libxcrypt-4.4.26.tar.xz.asc new file mode 100644 index 0000000..dc93da9 --- /dev/null +++ b/libxcrypt-4.4.26.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEZ4zj/uQwMRWW24wW9S6YAHWUwh0FAmFF1kUACgkQ9S6YAHWU +wh1eQw//QcuUPJna/qbpD+j1gan8nccZFrJ14+1Wv+GLogbnJxQru29DmkSHXVjp +5LY2AIBTr0czRx3FJhW+aZd9yzCrQF/0iyaT5ewSPeB3jpXE7Ho12LHTEYT/clJj +dp6kKnhF6c2ALulow77KdJs6nCmsysgIlpnuP9UHUxv14sk3MxANZR9wdxWi31Kf +DlIVKog5gM6rNtOxYxvspmT1Z3HVlqI8QpieaNAR20clTH0XRkxFP++Xo2igm6hW +SiAFkwLqu9htBfPkM9bHxmgk0Ie5DX6s5g+JeLnkOeQSt9fTDHdKIof6QOpfBohk +4v5f5EOmd0F2coMzfmpjIOTazcNWXHii7GiUL/7SWzwC5AZ2lkGxvs5YfTp5jMky +Fve1x/jqVOgD1MK8UpNIPll4PtTdFWXY0wtWqJXb/dCwuqlQjGarejcB04pYsdH5 +d+UnHoGlpPpjgKo9EcjL51PAPjS035Mf0Lua3bSZtG+Gs1qxl+WW/RWPvkZC7oQE +zqZO60r5KFuQploTU+IAwlFQ1RfT4M8NR3zZKO+E4uy3rq7fVZW4vg92kuDH3AaU +akwJpKYKXhZbnNlObkoNL012K/CJB0wsGphcWDausboFghrZJ/rosIWF1h0WP2La +pAtSDdE3iUsohmHVZPXOBv/lLd42vGBFuA2F5KmwxX7OJ/0JYNk= +=E20L +-----END PGP SIGNATURE----- diff --git a/libxcrypt.changes b/libxcrypt.changes index 9b18d5e..e1721de 100644 --- a/libxcrypt.changes +++ b/libxcrypt.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Nov 28 19:44:05 UTC 2021 - Andreas Stieger + +- update to 4.4.26: + * fix compilation on system with gcc >= 10 that do not support + declarations with __attribute__((symver)) +- switch to bootstrapped tarball, add upstream signing key and + verify source signature + ------------------------------------------------------------------- Wed Aug 18 10:22:27 UTC 2021 - Andreas Schwab diff --git a/libxcrypt.keyring b/libxcrypt.keyring new file mode 100644 index 0000000..8242b3f Binary files /dev/null and b/libxcrypt.keyring differ diff --git a/libxcrypt.spec b/libxcrypt.spec index 81eebdd..1c22459 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -17,17 +17,16 @@ Name: libxcrypt -Version: 4.4.25 +Version: 4.4.26 Release: 0 Summary: Extended crypt library for DES, MD5, Blowfish and others License: BSD-2-Clause AND GPL-3.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause AND SUSE-Public-Domain Group: Development/Libraries/C and C++ -URL: https://github.com/besser82/%{name} -Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source1: baselibs.conf -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool +URL: https://github.com/besser82/libxcrypt +Source0: https://github.com/besser82/libxcrypt/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source1: https://github.com/besser82/libxcrypt/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc +Source2: https://github.com/besser82/libxcrypt/releases/download/v%{version}/libxcrypt-gpgkey.gpg#/%{name}.keyring +Source3: baselibs.conf BuildRequires: pkgconfig %description @@ -66,9 +65,9 @@ Summary: Development files for %{name} License: BSD-2-Clause AND LGPL-2.1-or-later AND BSD-3-Clause AND SUSE-Public-Domain Group: Development/Languages/C and C++ Requires: libcrypt1 = %{version} -Requires: pkgconfig -Provides: glibc-devel:%{_libdir}/libcrypt.so +Requires: pkgconfig >= 0.9.0 Conflicts: glibc-devel < 2.28 +Provides: glibc-devel:%{_libdir}/libcrypt.so %description devel The %{name}-devel package contains libraries and header files for @@ -80,8 +79,8 @@ License: BSD-2-Clause AND GPL-3.0-or-later AND LGPL-2.1-or-later AND BSD- Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} Requires: glibc-devel-static -Provides: glibc-devel-static:%{_libdir}/libcrypt.a Conflicts: glibc-devel-static < 2.28 +Provides: glibc-devel-static:%{_libdir}/libcrypt.a %description devel-static This package contains the libxcrypt static libraries for -static @@ -95,8 +94,6 @@ is highly discouraged. # Disable LTO due to symbol versioning (boo#1138833): # (https://en.opensuse.org/openSUSE:LTO#Symbol_versioning). %define _lto_cflags %{nil} - -autoreconf -fi %configure \ --disable-silent-rules \ --enable-shared \ @@ -108,14 +105,14 @@ autoreconf -fi %install %make_install -find %{buildroot}%{_libdir} -name '*.la' -print -delete +find %{buildroot} -type f -name "*.la" -delete -print %check %make_build check || \ { rc=$?; echo "-----BEGIN TESTLOG-----"; - %{__cat} test-suite.log; + cat test-suite.log; echo "-----END TESTLOG-----"; exit $rc; } @@ -125,33 +122,17 @@ find %{buildroot}%{_libdir} -name '*.la' -print -delete %files -n libcrypt1 %license COPYING.LIB LICENSING -%doc AUTHORS NEWS README README.md THANKS -%{_libdir}/libcrypt.so.* -%{_libdir}/libowcrypt.so.* +%doc AUTHORS NEWS THANKS +%{_libdir}/*.so.* %files devel -%doc TODO TODO.md -%{_libdir}/libcrypt.so -%{_libdir}/libxcrypt.so -%{_libdir}/libowcrypt.so -%{_includedir}/crypt.h -%{_includedir}/xcrypt.h -%{_libdir}/pkgconfig/libcrypt.pc -%{_libdir}/pkgconfig/%{name}.pc -%{_mandir}/man3/crypt_rn.3.* -%{_mandir}/man3/crypt_gensalt.3.* -%{_mandir}/man3/crypt.3.* -%{_mandir}/man3/crypt_checksalt.3.* -%{_mandir}/man3/crypt_gensalt_ra.3.* -%{_mandir}/man3/crypt_gensalt_rn.3.* -%{_mandir}/man3/crypt_preferred_method.3.* -%{_mandir}/man3/crypt_r.3.* -%{_mandir}/man3/crypt_ra.3.* -%{_mandir}/man5/crypt.5.* +%doc TODO +%{_libdir}/*.so +%{_includedir}/*.h +%{_libdir}/pkgconfig/*.pc +%{_mandir}/man?/*%{?ext_man} %files devel-static -%{_libdir}/libcrypt.a -%{_libdir}/libxcrypt.a -%{_libdir}/libowcrypt.a +%{_libdir}/*.a %changelog