pool/libgcrypt
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 396173 from devel:libraries:c_c++

Browse Source 
- remove conditionals for unsupported distributions (before 13.2),
  it would not build anyway because of new dependencies

- make the -hmac package depend on the same version of the library,
  fixing bsc#979629 FIPS: system fails to reboot after installing
  fips pattern

OBS-URL: https://build.opensuse.org/request/show/396173
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgcrypt?expand=0&rev=60
This commit is contained in:
Dominique Leuenberger 2016-05-20 09:55:14 +00:00 committed by Git OBS Bridge
commit 9f54cee2c1
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libgcrypt.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon May 16 14:37:45 UTC 2016 - pjanouch@suse.de
- remove conditionals for unsupported distributions (before 13.2),
it would not build anyway because of new dependencies
-------------------------------------------------------------------
Mon May 16 12:36:14 UTC 2016 - pjanouch@suse.de
- make the -hmac package depend on the same version of the library,
fixing bsc#979629 FIPS: system fails to reboot after installing
fips pattern
-------------------------------------------------------------------
Tue Feb 9 20:51:59 UTC 2016 - astieger@suse.com

25
libgcrypt.spec
View File

@ -70,12 +70,10 @@ Patch32: libgcrypt-fips_run_selftest_at_constructor.patch
Patch33: libgcrypt-fips_ecdsa.patch
Patch34: libgcrypt-1.6.3-aliasing.patch
BuildRequires: automake >= 1.14
BuildRequires: fipscheck
BuildRequires: libgpg-error-devel >= 1.11
BuildRequires: libtool
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1310
BuildRequires: fipscheck
%endif
%description
Libgcrypt is a general purpose library of cryptographic building
@ -96,6 +94,7 @@ GnuPG (alpha version).
Summary: HMAC checksums for the GNU Crypto Library
License: GPL-2.0+ and LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: %{libsoname} = %{version}-%{release}
%description -n %{libsoname}-hmac
Libgcrypt is a general purpose crypto library based on the code used in
@ -131,7 +130,6 @@ Requires: %{libsoname}-hmac
CAVS testing framework for libgcrypt
%if 0%{?separate_hmac256_binary}
%package hmac256
Summary: The GNU Crypto Library
License: GPL-2.0+ and LGPL-2.1+
@ -156,7 +154,6 @@ understanding of applied cryptography is required to use Libgcrypt.
%patch4 -p1
%patch5 -p1
%patch7 -p1
%if 0%{?suse_version} > 1310
%patch12 -p1
%patch21 -p1
%patch22 -p1
@ -172,7 +169,6 @@ understanding of applied cryptography is required to use Libgcrypt.
%patch32 -p1
%patch33 -p1
%patch34 -p1
%endif
%patch13 -p1
%patch14 -p1
@ -180,7 +176,7 @@ understanding of applied cryptography is required to use Libgcrypt.
echo building with build_hmac256 set to %{build_hmac256}
%{?suse_update_config}
autoreconf -fi
date=$(date -u +%Y-%m-%dT%H:%M+0000 -r %{S:99})
date=$(date -u +%Y-%m-%dT%H:%M+0000 -r %{SOURCE99})
sed -e "s,BUILD_TIMESTAMP=.*,BUILD_TIMESTAMP=$date," -i configure
export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
%configure --with-pic \
@ -202,26 +198,14 @@ make %{?_smp_mflags}
#
# this shows up earlier because otherwise the %expand of
# the macro is too late.
%if 0%{?suse_version} > 1310
%{expand:%%global __os_install_post {%__os_install_post
fipshmac %{buildroot}/%{_bindir}/hmac256
fipshmac %{buildroot}/%{_libdir}/*.so.??
}}
%else
%{expand:%%global __os_install_post {%__os_install_post
%{buildroot}/%{_bindir}/hmac256 "What am I, a doctor or a moonshuttle conductor?" \
< %{buildroot}/%{_bindir}/hmac256 > %{buildroot}/%{_bindir}/.hmac256.hmac
%{buildroot}/%{_bindir}/hmac256 "What am I, a doctor or a moonshuttle conductor?" \
< %{buildroot}/%{_libdir}/libgcrypt.so.%{sosuffix} > %{buildroot}/%{_libdir}/.libgcrypt.so.20.hmac
}}
%endif
%endif
%check
%if 0%{?suse_version} > 1310
fipshmac src/.libs/libgcrypt.so.??
%endif
# Nice idea. however this uses /dev/random, which hangs
# on hardware without random feeds.
# so lets not run it inside OBS
@ -236,11 +220,9 @@ install -m 0755 -d %{buildroot}%{cavs_dir}
install -m 0755 %{SOURCE5} %{buildroot}%{cavs_dir}
install -m 0755 %{SOURCE6} %{buildroot}%{cavs_dir}
%if 0%{?suse_version} > 1310
mv %{buildroot}%{_bindir}/fips186_dsa %{buildroot}%{cavs_dir}
mv %{buildroot}%{_bindir}/fipsdrv %{buildroot}%{cavs_dir}
mv %{buildroot}%{_bindir}/drbg_test %{buildroot}%{cavs_dir}
%endif
%post -n %{libsoname} -p /sbin/ldconfig
@ -275,7 +257,6 @@ mv %{buildroot}%{_bindir}/drbg_test %{buildroot}%{cavs_dir}
%{_datadir}/aclocal/%{name}.m4
%if 0%{?separate_hmac256_binary}
%files hmac256
%defattr(-,root,root)
%endif # %if 0%{?separate_hmac256_binary}