From f3deb426aaf0f10e637a2fb912e2b26a53b58624667a93599581fb76143f2795 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 6 Feb 2015 18:56:02 +0000 Subject: [PATCH 1/2] Accepting request 284553 from home:coolo:branches:openSUSE:Factory - making the build reproducible - see http://lists.gnupg.org/pipermail/gnupg-commits/2014-September/010683.html for a very similiar problem - fix filename for info pages in %post scripts OBS-URL: https://build.opensuse.org/request/show/284553 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=67 --- libgcrypt.changes | 12 ++++++++++++ libgcrypt.spec | 13 ++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/libgcrypt.changes b/libgcrypt.changes index df01bd7..6169fca 100644 --- a/libgcrypt.changes +++ b/libgcrypt.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Feb 6 18:42:28 UTC 2015 - coolo@suse.com + +- making the build reproducible - see + http://lists.gnupg.org/pipermail/gnupg-commits/2014-September/010683.html + for a very similiar problem + +------------------------------------------------------------------- +Fri Feb 6 18:30:26 UTC 2015 - coolo@suse.com + +- fix filename for info pages in %post scripts + ------------------------------------------------------------------- Wed Nov 5 20:37:24 UTC 2014 - andreas.stieger@gmx.de diff --git a/libgcrypt.spec b/libgcrypt.spec index 2643d70..02a54bf 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -1,7 +1,7 @@ # # spec file for package libgcrypt # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,6 +36,7 @@ Source4: %{name}.keyring # cavs test framework Source5: cavs-test.sh Source6: cavs_driver.pl +Source99: %{name}.changes Patch0: %{name}-ppc64.patch Patch1: %{name}-strict-aliasing.patch Patch3: %{name}-1.4.1-rijndael_no_strict_aliasing.patch @@ -177,6 +178,8 @@ 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}) +sed -e "s,BUILD_TIMESTAMP=.*,BUILD_TIMESTAMP=$date," -i configure export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)" %configure --with-pic \ --enable-noexecstack \ @@ -243,13 +246,13 @@ mv %{buildroot}%{_bindir}/drbg_test %{buildroot}%{cavs_dir} %post devel %install_info --info-dir=%{_infodir} %{_infodir}/gcrypt.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/gcrypt-1.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/gcrypt-2.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/gcrypt.info-1.gz +%install_info --info-dir=%{_infodir} %{_infodir}/gcrypt.info-2.gz %postun devel %install_info_delete --info-dir=%{_infodir} %{_infodir}/gcrypt.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/gcrypt-1.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/gcrypt-2.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/gcrypt.info-1.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/gcrypt.info-2.gz %files -n %{libsoname} %defattr(-,root,root) From f5c7e834a5d161e8703845f0ba4e8696d82c661ca72dda75235dfef27e150441 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 6 Feb 2015 18:56:29 +0000 Subject: [PATCH 2/2] Accepting request 284554 from home:dimstar:Factory - Move %install_info_delete calls from postun to preun: the files must still be present to be parsed. - Fix the names passed to install_info for gcrypt.info-[12].gz instead of gcrypt-[12].info.gz. via xtrymalloc macro OBS-URL: https://build.opensuse.org/request/show/284554 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=68 --- libgcrypt.changes | 10 +++++++++- libgcrypt.spec | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libgcrypt.changes b/libgcrypt.changes index 6169fca..01a187b 100644 --- a/libgcrypt.changes +++ b/libgcrypt.changes @@ -5,6 +5,14 @@ Fri Feb 6 18:42:28 UTC 2015 - coolo@suse.com http://lists.gnupg.org/pipermail/gnupg-commits/2014-September/010683.html for a very similiar problem +------------------------------------------------------------------- +Fri Feb 6 18:38:55 UTC 2015 - dimstar@opensuse.org + +- Move %install_info_delete calls from postun to preun: the files + must still be present to be parsed. +- Fix the names passed to install_info for gcrypt.info-[12].gz + instead of gcrypt-[12].info.gz. + ------------------------------------------------------------------- Fri Feb 6 18:30:26 UTC 2015 - coolo@suse.com @@ -21,7 +29,7 @@ Wed Nov 5 20:37:24 UTC 2014 - andreas.stieger@gmx.de * Fix building for the x32 ABI platform. * Fix some possible NULL deref bugs. - remove libgcrypt-1.6.0-use-intenal-functions.patch, upstream - via xtrymalloc macro + via xtrymalloc macro - remove libgcrypt-fixed-sizet.patch, upstream - adjust libgcrypt-1.6.1-use-fipscheck.patch for xtrymalloc change diff --git a/libgcrypt.spec b/libgcrypt.spec index 02a54bf..63fcd03 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -249,7 +249,7 @@ mv %{buildroot}%{_bindir}/drbg_test %{buildroot}%{cavs_dir} %install_info --info-dir=%{_infodir} %{_infodir}/gcrypt.info-1.gz %install_info --info-dir=%{_infodir} %{_infodir}/gcrypt.info-2.gz -%postun devel +%preun devel %install_info_delete --info-dir=%{_infodir} %{_infodir}/gcrypt.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/gcrypt.info-1.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/gcrypt.info-2.gz