diff --git a/libxcrypt-epel.spec b/libxcrypt-epel.spec index b7ed88d..7be3379 100644 --- a/libxcrypt-epel.spec +++ b/libxcrypt-epel.spec @@ -7,11 +7,7 @@ # Build the compat package? -%if 0%{?fedora} >= 999 || 0%{?rhel} >= 10 || %{without new_api} -%bcond_with compat_pkg -%else %bcond_without compat_pkg -%endif # Replace obsolete functions with a stub? @@ -23,12 +19,12 @@ # Build the static library? -%bcond_without staticlib +%bcond_with staticlib # When we are bootstrapping, we omit the # verification of the source tarball with GnuPG. -%bcond_with bootstrap +%bcond_without bootstrap # Shared object version of libcrypt. @@ -140,18 +136,6 @@ libdir="%{buildroot}%{_libdir}" \ fipsdir="$libdir/fipscheck" \ mkdir -p $fipsdir \ -fipshmac -d $fipsdir \\\ - $libdir/libcrypt.so.%{sov} \ -ln -s libcrypt.so.%{sov}.hmac \\\ - $fipsdir/libcrypt.so.%{soc}.hmac \ -if [[ %{with staticlib} == 1 ]]; then \ - fipshmac -d $fipsdir \\\ - $libdir/libcrypt.a \ - if [[ %{without new_api} == 1 ]]; then \ - ln -s .libcrypt.a.hmac \\\ - $fipsdir/libxcrypt.a.hmac \ - fi \ -fi \ if [[ %{with compat_pkg} == 1 ]]; then \ fipshmac -d $fipsdir \\\ $libdir/libcrypt.so.%{csov} \ @@ -166,7 +150,7 @@ fi \ %global _ld_strict_symbol_defs 1 -Name: libxcrypt +Name: libxcrypt-epel Version: 4.4.36 Release: 6%{?dist} Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and others @@ -174,11 +158,11 @@ Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and other # For explicit license breakdown, see the # LICENSING file in the source tarball. License: LGPL-2.1-or-later AND BSD-3-Clause AND BSD-2-Clause AND BSD-2-Clause-FreeBSD AND 0BSD AND CC0-1.0 AND LicenseRef-Fedora-Public-Domain -URL: https://github.com/besser82/%{name} -Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz -Source1: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc -Source2: %{url}/releases/download/v%{version}/%{name}-gpgkey.gpg -Source3: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz.sha256sum +URL: https://github.com/besser82/libxcrypt +Source0: %{url}/releases/download/v%{version}/libxcrypt-%{version}.tar.xz +Source1: %{url}/releases/download/v%{version}/libxcrypt-%{version}.tar.xz.asc +Source2: %{url}/releases/download/v%{version}/libxcrypt-gpgkey.gpg +Source3: %{url}/releases/download/v%{version}/libxcrypt-%{version}.tar.xz.sha256sum Patch0: libxcrypt-configure-c99.patch # Patch 0000 - 2999: Backported patches from upstream. @@ -270,7 +254,7 @@ that have been provided by glibc's libcrypt.so.1. %if %{with compat_pkg} -%package compat +%package -n libxcrypt-compat Summary: Compatibility library providing legacy API functions %if %{without bootstrap} @@ -278,9 +262,9 @@ Summary: Compatibility library providing legacy API functions BuildRequires: libxcrypt-compat %endif -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libxcrypt%{?_isa} = %{version} -%description compat +%description -n libxcrypt-compat This package contains the library providing the compatibility API for applications that are linked against glibc's libxcrypt, or that are still using the unsafe and deprecated, encrypt, encrypt_r, @@ -293,40 +277,6 @@ work unmodified with the library supplied by this package. %endif -%package devel -Summary: Development files for %{name} - -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: glibc-devel%{?_isa} -%if 0%{?trans_pkg} -Conflicts: man-pages < %{man_pages_minver} -Requires: glibc-devel%{?_isa} >= %{glibc_minver} -%endif - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - - -%if %{with staticlib} -%package static -Summary: Static library for -static linking with %{name} - -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: glibc-static%{?_isa} -%if 0%{?trans_pkg} -Requires: glibc-static%{?_isa} >= %{glibc_minver} -%endif - -%description static -This package contains the libxcrypt static library for -static -linking. - -You don't need this, unless you link statically, which is highly -discouraged. -%endif - - %prep %if %{without bootstrap} # Omitted during bootstrap. @@ -336,7 +286,7 @@ pushd %{_sourcedir} sha256sum -c %{SOURCE3} popd -%autosetup -p 1 +%autosetup -p 1 -n libxcrypt-%{version} # Regen Autotools. autoreconf -fiv -Wall,error @@ -474,18 +424,12 @@ find %{buildroot} \ -not -type d -not -name 'libcrypt.so.%{csoc}*' -delete -print %endif -# Install the default system library. -%make_install -C %{_vpath_builddir} - # Get rid of libtool crap. find %{buildroot} -name '*.la' -delete -print # Install documentation to shared %%_pkgdocdir. install -Dpm 0644 -t %{buildroot}%{_pkgdocdir} \ - ChangeLog NEWS README* THANKS TODO - -# Drop README.md as it is identical to README. -rm -f %{buildroot}%{_pkgdocdir}/README.md + README.posix %check @@ -506,34 +450,14 @@ for dir in ${build_dirs}; do done -%ldconfig_scriptlets %if %{with compat_pkg} %ldconfig_scriptlets compat %endif -%files -%dir %{_fipsdir} -%doc %dir %{_pkgdocdir} -%doc %{_pkgdocdir}/NEWS -%doc %{_pkgdocdir}/README -%if %{with new_api} -%doc %{_pkgdocdir}/README%{distname} -%endif -%if %{with enosys_stubs} && %{without compat_pkg} -%doc %{_pkgdocdir}/README.posix -%endif -%doc %{_pkgdocdir}/THANKS -%license AUTHORS COPYING.LIB LICENSING -%{_fipsdir}/libcrypt.so.%{soc}.hmac -%{_fipsdir}/libcrypt.so.%{sov}.hmac -%{_libdir}/libcrypt.so.%{soc} -%{_libdir}/libcrypt.so.%{sov} -%{_mandir}/man5/crypt.5* - - %if %{with compat_pkg} -%files compat +%files -n libxcrypt-compat +%license AUTHORS COPYING.LIB LICENSING %dir %{_fipsdir} %if %{with enosys_stubs} %doc %{_pkgdocdir}/README.posix @@ -545,384 +469,6 @@ done %endif -%files devel -%doc %{_pkgdocdir}/ChangeLog -%doc %{_pkgdocdir}/TODO -%{_libdir}/libcrypt.so -%if %{without new_api} -%{_libdir}/libxcrypt.so -%endif -%{_includedir}/crypt.h -%if %{without new_api} -%{_includedir}/xcrypt.h -%endif -%{_libdir}/pkgconfig/libcrypt.pc -%{_libdir}/pkgconfig/%{name}.pc -%{_mandir}/man3/crypt.3* -%{_mandir}/man3/crypt_r.3* -%{_mandir}/man3/crypt_ra.3* -%{_mandir}/man3/crypt_rn.3* -%{_mandir}/man3/crypt_checksalt.3* -%{_mandir}/man3/crypt_gensalt.3* -%{_mandir}/man3/crypt_gensalt_ra.3* -%{_mandir}/man3/crypt_gensalt_rn.3* -%{_mandir}/man3/crypt_preferred_method.3* - - -%if %{with staticlib} -%files static -%dir %{_fipsdir} -%doc %{_pkgdocdir}/README.static -%{_fipsdir}/libcrypt.a.hmac -%if %{without new_api} -%{_fipsdir}/libxcrypt.a.hmac -%endif -%{_libdir}/libcrypt.a -%if %{without new_api} -%{_libdir}/libxcrypt.a -%endif -%endif - - %changelog -* Thu Jan 25 2024 Fedora Release Engineering - 4.4.36-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 4.4.36-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Dec 19 2023 Stanislav Zidek - 4.4.36-4 -- Remove -compat package from Fedora ELN / RHEL 10 - -* Tue Dec 19 2023 Florian Weimer - 4.4.36-3 -- Fix C compatibility issue in the configure script - -* Thu Jul 20 2023 Fedora Release Engineering - 4.4.36-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jul 05 2023 Björn Esser - 4.4.36-1 -- New upstream release - -* Tue Jun 06 2023 Björn Esser - 4.4.35-1 -- New upstream release - -* Wed May 31 2023 Björn Esser - 4.4.34-1 -- New upstream release - -* Sat Jan 21 2023 Björn Esser - 4.4.33-7 -- Run autoreconf during %%prep - -* Thu Jan 19 2023 Fedora Release Engineering - 4.4.33-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Dec 19 2022 Björn Esser - 4.4.33-5 -- Simplify transitional Requires and Obsoletes for legacy packages -- Drop versioned BR on perl-interpreter -- Fix README.posix file, as the fcrypt function is still available - -* Tue Dec 13 2022 Björn Esser - 4.4.33-4 -- Add upstream patch to improve performance on SHA512 computation - -* Mon Nov 28 2022 Björn Esser - 4.4.33-3 -- Convert License to SPDX expression -- Add upstream patch to improve performance on some type-cast operations - -* Mon Nov 21 2022 Björn Esser - 4.4.33-2 -- Do not BR the compat package during bootstrap -- Use BR: coreutils instead of %%{_bindir}/sha256sum - -* Fri Nov 18 2022 Björn Esser - 4.4.33-1 -- New upstream release - -* Fri Nov 18 2022 Björn Esser - 4.4.32-1 -- New upstream release - -* Wed Nov 16 2022 Björn Esser - 4.4.31-5 -- Add %%{perl_minver} macro and re-add BR on perl(:VERSION) - -* Wed Nov 16 2022 Björn Esser - 4.4.31-4 -- Add BR for perl modules to run the skip-if-exec-format-error script -- Move the BR for minimum Perl version to perl-interpreter - -* Tue Nov 15 2022 Björn Esser - 4.4.31-3 -- Explicitly list all needed build-time Perl modules - -* Tue Nov 15 2022 Björn Esser - 4.4.31-2 -- Narrow down BuildRequires for the minimum needed Perl modules - -* Sun Nov 13 2022 Björn Esser - 4.4.31-1 -- New upstream release - -* Tue Nov 08 2022 Björn Esser - 4.4.30-3 -- Backport another upstream patch for a conversion fix - -* Tue Nov 08 2022 Björn Esser - 4.4.30-2 -- Backport some upstream patches for fixes and optimizations -- Explicitly disable arc4random_buf in all_possible_tests configuration - -* Tue Nov 01 2022 Björn Esser - 4.4.30-1 -- New upstream release - -* Mon Oct 31 2022 Björn Esser - 4.4.29-1 -- New upstream release - -* Wed Aug 10 2022 Björn Esser - 4.4.28-3 -- Rebuilt for arc4random_buf in glibc 2.36 (or later) - -* Thu Jul 21 2022 Fedora Release Engineering - 4.4.28-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Feb 01 2022 Björn Esser - 4.4.28-1 -- New upstream release - -* Thu Jan 20 2022 Fedora Release Engineering - 4.4.27-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 04 2022 Björn Esser - 4.4.27-2 -- Update Obsoletes, Provides, and Requires to glibc 2.28 (or later), - as this was the first upstream version of glibc with an option to - be built without shipping libcrypt -- Fix rhel version in conditional - -* Fri Dec 17 2021 Björn Esser - 4.4.27-1 -- New upstream release - -* Tue Sep 21 2021 Björn Esser - 4.4.26-4 -- Add some more recent distro releases to previous change - -* Tue Sep 21 2021 Björn Esser - 4.4.26-3 -- Limit explicit versioned Requires on glibc to older distro releases - -* Sat Sep 18 2021 Björn Esser - 4.4.26-2 -- Build from signed and verified distribution tarball - -* Fri Sep 17 2021 Björn Esser - 4.4.26-1 -- New upstream release - -* Mon Aug 30 2021 Björn Esser - 4.4.25-3 -- Rebuild (autoconf) - -* Mon Aug 16 2021 Björn Esser - 4.4.25-2 -- Compile test-programs during %%build stage - -* Sun Aug 08 2021 Björn Esser - 4.4.25-1 -- New upstream release - -* Wed Aug 04 2021 Björn Esser - 4.4.24-1 -- New upstream release - -* Thu Jul 22 2021 Fedora Release Engineering - 4.4.23-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Jun 20 2021 Björn Esser - 4.4.23-1 -- New upstream release - -* Wed Jun 16 2021 Björn Esser - 4.4.22-3 -- Add patches to fix issues with type conversion in the DES code - -* Sat Jun 05 2021 Björn Esser - 4.4.22-2 -- Add a patch to fix o_size calculation for gensalt_yescrypt_rn - -* Thu May 27 2021 Björn Esser - 4.4.22-1 -- New upstream release - -* Wed May 26 2021 Björn Esser - 4.4.21-1 -- New upstream release - -* Wed May 19 2021 Björn Esser - 4.4.20-3 -- Run test for glibc compatibility symbols -- Run a build with all possible tests enabled - -* Sun May 02 2021 Björn Esser - 4.4.20-2 -- Add upstream patch to fix a typo in the documentation - -* Sat May 01 2021 Björn Esser - 4.4.20-1 -- New upstream release - -* Thu Apr 08 2021 Björn Esser - 4.4.19-1 -- New upstream release - -* Sat Feb 20 2021 Björn Esser - 4.4.18-1 -- New upstream release -- Add explicit BR: perl-core - -* Tue Jan 26 2021 Fedora Release Engineering - 4.4.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sun Aug 23 2020 Björn Esser - 4.4.17-1 -- New upstream release - -* Sat Aug 15 2020 Björn Esser - 4.4.16-7 -- Add a patch to add support for LTO builds -- Enable LTO -- Add a patch to fix Wformat-overflow - -* Tue Jul 28 2020 Fedora Release Engineering - 4.4.16-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 30 2020 Jeff Law - 4.4.16-5 -- Disable LTO - -* Fri Jun 19 2020 Björn Esser - 4.4.16-4 -- Trim %%changelog starting with v4.4.0 -- Remove memcheck conditional - -* Sat Apr 25 2020 Björn Esser - 4.4.16-3 -- Explicitly force linking with '-Wl,-z,defs' - -* Fri Apr 24 2020 Björn Esser - 4.4.16-2 -- Move fipscheck hmac checksums to %%{_libdir}/fipscheck - -* Sat Apr 04 2020 Björn Esser - 4.4.16-1 -- New upstream release - -* Thu Apr 02 2020 Björn Esser - 4.4.15-2 -- Move library from %%_lib to %%_libdir - -* Wed Feb 26 2020 Björn Esser - 4.4.15-1 -- New upstream release - -* Mon Feb 17 2020 Björn Esser - 4.4.14-1 -- New upstream release - -* Sun Feb 16 2020 Björn Esser - 4.4.13-1 -- New upstream release - -* Tue Feb 11 2020 Björn Esser - 4.4.12-3 -- Add an upstream patch to fix a typo in the documentation - -* Wed Feb 05 2020 Björn Esser - 4.4.12-2 -- Add two upstream patches to resolve minor bugs - -* Thu Jan 30 2020 Björn Esser - 4.4.12-1 -- New upstream release - -* Wed Jan 29 2020 Fedora Release Engineering - 4.4.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jan 18 2020 Björn Esser - 4.4.11-1 -- New upstream release - -* Sun Dec 15 2019 Björn Esser - 4.4.10-2 -- Add two upstream patches to fix build with upcoming GCC-10 - -* Wed Sep 18 2019 Björn Esser - 4.4.10-1 -- New upstream release - -* Sat Sep 07 2019 Björn Esser - 4.4.9-1 -- New upstream release (#1750010) - -* Sun Sep 01 2019 Björn Esser - 4.4.8-1 -- New upstream release - -* Sat Aug 24 2019 Björn Esser - 4.4.7-1 -- New upstream release - -* Thu Jul 25 2019 Fedora Release Engineering - 4.4.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jun 24 2019 Björn Esser - 4.4.6-2 -- Build all hash methods for the compat package -- Add a patch to fix Wformat in crypt-kat.c - -* Sun May 05 2019 Björn Esser - 4.4.6-1 -- New upstream release - -* Sat May 04 2019 Björn Esser - 4.4.5-1 -- New upstream release (#1706419) -- Add patch to remove an unneeded union keyword -- Add patch to make unalignment test really unaligned - -* Fri Mar 15 2019 Björn Esser - 4.4.4-2 -- Change Recommends: whois-mkpasswd to Fedora 30 and later (#1687870) - -* Mon Mar 04 2019 Björn Esser - 4.4.4-1 -- New upstream release - -* Tue Feb 19 2019 Björn Esser - 4.4.3-10 -- Fix versioned requirements on glibc - -* Tue Feb 19 2019 Björn Esser - 4.4.3-9 -- Fix conditional in __spec_install_post - -* Tue Feb 19 2019 Björn Esser - 4.4.3-8 -- Update Obsoletes, Provides, and Requires to glibc 2.27 -- Add Recommends: whois-mkpasswd for Fedora -- Optimize installation of the documentation files -- Fix %%description -- Use an absolute path for the configure script and srcdir - -* Tue Feb 19 2019 Björn Esser - 4.4.3-7 -- Add patch to fix the output formatting of a test - -* Wed Feb 06 2019 Björn Esser - 4.4.3-6 -- Always build all supported hash methods -- Drop distcheck at the end of %%check stage - -* Fri Feb 01 2019 Fedora Release Engineering - 4.4.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 30 2019 Björn Esser - 4.4.3-4 -- Add a README.posix file with information about the stub functions -- Add a README.static file with information about the static library - -* Wed Jan 30 2019 Björn Esser - 4.4.3-3 -- Replace unsafe functions in libxcrypt-compat with stubs (#1670735) - -* Thu Jan 24 2019 Björn Esser - 4.4.3-2 -- Fix and simplify the conditionals for the compat package -- Add an option to replace unsafe functions in the compat lib with a stub -- Add patch to fix another possible format-overflow - -* Thu Jan 24 2019 Björn Esser - 4.4.3-1 -- New upstream release - -* Thu Jan 24 2019 Björn Esser - 4.4.2-8 -- Optimize file removal for compatibility library - -* Mon Jan 21 2019 Björn Esser - 4.4.2-7 -- Add two upstream patches to fix build with GCC 9 - -* Mon Jan 21 2019 Björn Esser - 4.4.2-6 -- Add upstream patch to add proper C++-guards in - -* Mon Jan 14 2019 Björn Esser - 4.4.2-5 -- Build the compat package with glibc hashing methods only -- Add an option to disable the compat-package for future use - -* Mon Jan 14 2019 Björn Esser - 4.4.2-4 -- Bump SO-name for Fedora >= 30 and enable compat package (#1666033) -- Add distribution README file -- Update description of the compat package -- Conditionally remove non-built hashing methods from description - -* Sun Dec 23 2018 Björn Esser - 4.4.2-3 -- Remove architecture bits from Recommends - -* Sun Dec 23 2018 Björn Esser - 4.4.2-2 -- Update summary - -* Sat Dec 22 2018 Björn Esser - 4.4.2-1 -- New upstream release - -* Thu Dec 06 2018 Björn Esser - 4.4.1-1 -- New upstream release - -* Tue Dec 04 2018 Björn Esser - 4.4.0-5 -- Sync -fno-plt patch with upstream commit - -* Tue Dec 04 2018 Björn Esser - 4.4.0-4 -- Backport upstream commit to fix a memory leak from a static pointer - -* Tue Dec 04 2018 Björn Esser - 4.4.0-3 -- Backport upstream PR to build with -fno-plt optimization - -* Mon Nov 26 2018 Björn Esser - 4.4.0-2 -- Backport upstream commit to use a safer strcpy for the NT method -- Backport upstream generating base64 encoded output for NT gensalt -- Backport upstream commit to require less rbytes for NT gensalt -- Backport upstream commit to test incremental hmac-sha256 computation -- Add Recommends: mkpasswd for Fedora >= 30 - -* Tue Nov 20 2018 Björn Esser - 4.4.0-1 -- New upstream release +* Wed Apr 3 2024 Michel Lind - 4.4.36-6 +- Initial epel-only package, based on libxcrypt with the same EVR