rpms/libxcrypt
6
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream release

Browse Source
This commit is contained in:
Björn Esser 2018-11-14 19:36:20 +01:00
parent 009c4269bc
commit aaff10ab4d
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libxcrypt.spec
View File

@ -36,7 +36,7 @@
# Hash methods and API supported by libcrypt. # Hash methods and API supported by libcrypt.
# NEVER EVER touch this, if you do NOT know what you are doing! # NEVER EVER touch this, if you do NOT know what you are doing!
%if %{with new_api} %if %{with new_api}
%global hash_methods glibc,strong %global hash_methods fedora,glibc,strong
%global obsolete_api no %global obsolete_api no
%global compat_methods all %global compat_methods all
%global compat_api glibc %global compat_api glibc
@ -74,6 +74,8 @@
%{__arch_install_post} \ %{__arch_install_post} \
%{__os_install_post} \ %{__os_install_post} \
%{_bindir}/fipshmac %{buildroot}/%{_lib}/libcrypt.a \ %{_bindir}/fipshmac %{buildroot}/%{_lib}/libcrypt.a \
%{__ln_s} .libcrypt.a.hmac \\\
%{buildroot}/%{_lib}/.libxcrypt.a.hmac \
%{_bindir}/fipshmac %{buildroot}/%{_lib}/libcrypt.so.%{sov} \ %{_bindir}/fipshmac %{buildroot}/%{_lib}/libcrypt.so.%{sov} \
%{__ln_s} .libcrypt.so.%{sov}.hmac \\\ %{__ln_s} .libcrypt.so.%{sov}.hmac \\\
%{buildroot}/%{_lib}/.libcrypt.so.%{soc}.hmac \ %{buildroot}/%{_lib}/.libcrypt.so.%{soc}.hmac \
@ -86,8 +88,8 @@ fi \
Name: libxcrypt Name: libxcrypt
Version: 4.3.3 Version: 4.3.4
Release: 4%{?dist} Release: 1%{?dist}
Summary: Extended crypt library for DES, MD5, Blowfish and others Summary: Extended crypt library for DES, MD5, Blowfish and others
# For explicit license breakdown, see the # For explicit license breakdown, see the
@ -97,13 +99,10 @@ URL: https://github.com/besser82/%{name}
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Patch 0000 - 2999: Backported patches from upstream. # Patch 0000 - 2999: Backported patches from upstream.
Patch0000: %{url}/commit/5e9199f293473a0c14f836b3df8ecf6aeed1e315.patch#/%{name}-4.3.3-alg_sha512_make_PAD_const.patch
Patch0001: %{url}/commit/65485d7891cfe50db941ab14e864bb485a54d71c.patch#/%{name}-4.3.3-skip_bcrypt_test_if_not_enabled.patch
# Patch 3000 - 5999: Backported patches from pull requests. # Patch 3000 - 5999: Backported patches from pull requests.
# Patch 6000 - 9999: Downstream patches. # Patch 6000 - 9999: Downstream patches.
Patch6000: %{name}-4.3.3-gensalt_r_as_macro.patch
BuildRequires: fipscheck BuildRequires: fipscheck
BuildRequires: libtool BuildRequires: libtool
@ -206,6 +205,7 @@ discouraged.
%build %build
# Build the default system library.
pushd %{_vpath_builddir} pushd %{_vpath_builddir}
%configure \ %configure \
%{common_configure_options} \ %{common_configure_options} \
@ -213,7 +213,9 @@ pushd %{_vpath_builddir}
--enable-obsolete-api=%{obsolete_api} --enable-obsolete-api=%{obsolete_api}
%make_build %make_build
popd popd
%if %{with new_api} %if %{with new_api}
# Build the compatibility library.
pushd %{_vpath_builddir}-compat pushd %{_vpath_builddir}-compat
%configure \ %configure \
%{common_configure_options} \ %{common_configure_options} \
@ -226,14 +228,19 @@ popd
%install %install
%if %{with new_api} %if %{with new_api}
# Install the compatibility library.
%make_install -C %{_vpath_builddir}-compat %make_install -C %{_vpath_builddir}-compat
# Cleanup everything we do not need from the compatibility library.
%{__rm} -fr %{buildroot}%{_bindir} \ %{__rm} -fr %{buildroot}%{_bindir} \
%{buildroot}%{_includedir} \ %{buildroot}%{_includedir} \
%{buildroot}/%{_lib}/libcrypt.{a,so} \ %{buildroot}/%{_lib}/lib{,x}crypt.{a,so} \
%{buildroot}%{_libdir}/pkgconfig \ %{buildroot}%{_libdir}/pkgconfig \
%{buildroot}%{_mandir} \ %{buildroot}%{_mandir} \
%{buildroot}%{_sbindir} %{buildroot}%{_sbindir}
%endif %endif
# Install the default system library.
%make_install -C %{_vpath_builddir} %make_install -C %{_vpath_builddir}
# Get rid of libtool crap. # Get rid of libtool crap.
@ -243,6 +250,7 @@ popd
%{__install} -Dpm 0644 -t %{buildroot}%{_pkgdocdir} \ %{__install} -Dpm 0644 -t %{buildroot}%{_pkgdocdir} \
ChangeLog NEWS README THANKS TODO ChangeLog NEWS README THANKS TODO
# Install 'README.fedora', if existing, to shared %%_pkgdocdir.
if [ -f README.fedora ]; then if [ -f README.fedora ]; then
%{__install} -Dpm 0644 -t %{buildroot}%{_pkgdocdir} \ %{__install} -Dpm 0644 -t %{buildroot}%{_pkgdocdir} \
README.fedora README.fedora
@ -303,8 +311,8 @@ done
%files devel %files devel
%doc %{_pkgdocdir}/ChangeLog %doc %{_pkgdocdir}/ChangeLog
%doc %{_pkgdocdir}/TODO %doc %{_pkgdocdir}/TODO
/%{_lib}/libcrypt.so /%{_lib}/lib{,x}crypt.so
%{_includedir}/crypt.h %{_includedir}/{,x}crypt.h
%{_libdir}/pkgconfig/{libcrypt,%{name}}.pc %{_libdir}/pkgconfig/{libcrypt,%{name}}.pc
%{_mandir}/man3/crypt{,_r,_ra,_rn}.3.* %{_mandir}/man3/crypt{,_r,_ra,_rn}.3.*
%{_mandir}/man3/crypt_checksalt.3.* %{_mandir}/man3/crypt_checksalt.3.*
@ -312,11 +320,14 @@ done
%files static %files static
/%{_lib}/.libcrypt.a.hmac /%{_lib}/.lib{,x}crypt.a.hmac
/%{_lib}/libcrypt.a /%{_lib}/lib{,x}crypt.a
%changelog %changelog
* Wed Nov 14 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.4-1
- New upstream release
* Wed Nov 14 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.3-4 * Wed Nov 14 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.3-4
- Bump release for proper obsoletion of former common sub-package - Bump release for proper obsoletion of former common sub-package

2
sources
View File

@ -1 +1 @@
SHA512 (libxcrypt-4.3.3.tar.gz) = d77fcb9827086f4f5d232ac56a3e8cb5caf17da1807cd18a41029e49fee4088d143885b08f8edf65da61dc11b5061af0ae86508857c417fec933844999f4443a SHA512 (libxcrypt-4.3.4.tar.gz) = 0c18f2dd1e6c1dd428a3acc65504b8b4592a8c4d1531e397e94b7872049f4a929bfbc2748eb937be74482175a762e78b275f93591dea7cf009d4f7ae26243bc7