From 0298c538812967867d1447208ad8569c7919b031cdbc2f1fbae926d7e143b6c5 Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Sat, 12 Feb 2022 15:58:54 +0000 Subject: [PATCH] Accepting request 952933 from home:bmwiedemann:branches:security:OpenVAS:STABLE Add reproducible.patch to omit build date (boo#1047218) OBS-URL: https://build.opensuse.org/request/show/952933 OBS-URL: https://build.opensuse.org/package/show/security:OpenVAS:STABLE/openvas-smb?expand=0&rev=3 --- openvas-smb.changes | 5 +++++ openvas-smb.spec | 4 ++-- reproducible.patch | 27 +++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 reproducible.patch diff --git a/openvas-smb.changes b/openvas-smb.changes index d152c53..beec743 100644 --- a/openvas-smb.changes +++ b/openvas-smb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 9 12:08:44 UTC 2022 - Bernhard Wiedemann + +- Add reproducible.patch to omit build date (boo#1047218) + ------------------------------------------------------------------- Thu Jan 9 23:23:19 UTC 2020 - Martin Hauke diff --git a/openvas-smb.spec b/openvas-smb.spec index 318403a..70b9fc9 100644 --- a/openvas-smb.spec +++ b/openvas-smb.spec @@ -29,6 +29,7 @@ Source: https://github.com/greenbone/%{name}/archive/v%{version}.tar.gz# Source98: https://github.com/greenbone/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.sig Source99: https://www.greenbone.net/GBCommunitySigningKey.asc#/%{name}.keyring Patch0: 0001-Fix-heimdal-gssapi-dependencies.patch +Patch1: reproducible.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: graphviz @@ -86,8 +87,7 @@ This subpackage contains libraries and header files for developing applications that want to make use of libopenvas_wmiclient. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 # Fix libheimdal include path find . -name '*.[c\|h]' -print0 | xargs -0 sed -i 's|heimdal\/||g' diff --git a/reproducible.patch b/reproducible.patch new file mode 100644 index 0000000..372c3f8 --- /dev/null +++ b/reproducible.patch @@ -0,0 +1,27 @@ +https://github.com/greenbone/openvas-smb/pull/40 +commit 195440b141e198740d06d1391a9d4de44521855a +Author: Bernhard M. Wiedemann +Date: Sat Jun 12 05:42:28 2021 +0200 + + Omit timestamp from PE executable + + to make binaries reproducible. + See https://reproducible-builds.org/ for why this is good. + + This PR was done while working on reproducible builds for openSUSE. + + Co-authored-by: Jaspar L. + +Index: openvas-smb-1.0.5/winexe/CMakeLists.txt +=================================================================== +--- openvas-smb-1.0.5.orig/winexe/CMakeLists.txt ++++ openvas-smb-1.0.5/winexe/CMakeLists.txt +@@ -71,7 +71,7 @@ set (BINTOC_SOURCES + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winexesvc.exe +- COMMAND ${MINGW_GCC} ${WINEXESVC_SOURCES} -o winexesvc.exe ++ COMMAND ${MINGW_GCC} -Xlinker --no-insert-timestamp ${WINEXESVC_SOURCES} -o winexesvc.exe + DEPENDS ${WINEXESVC_SOURCES}) + + add_custom_command(