From ed5c1c19963546f09201747b11b94b71729b0bcd Mon Sep 17 00:00:00 2001 From: "douglas.royds" Date: Tue, 9 Oct 2018 17:55:20 +1300 Subject: openldap: Reproducibility: Remove user, hostname, pwd from version string Upstream-Status: Pending Signed-off-by: Douglas Royds Signed-off-by: Khem Raj --- .../openldap/remove-user-host-pwd-from-version.patch | 12 ++++++++++++ meta-oe/recipes-support/openldap/openldap_2.4.46.bb | 1 + 2 files changed, 13 insertions(+) create mode 100644 meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch diff --git a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch new file mode 100644 index 0000000000..478a680ca0 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch @@ -0,0 +1,12 @@ +diff -ru openldap-2.4.46.original/build/mkversion openldap-2.4.46/build/mkversion +--- openldap-2.4.46.original/build/mkversion 2018-03-23 04:44:27.000000000 +1300 ++++ openldap-2.4.46/build/mkversion 2018-10-09 14:34:51.152684040 +1300 +@@ -50,7 +50,7 @@ + fi + + APPLICATION=$1 +-WHOWHERE="$USER@`uname -n`:`pwd`" ++WHOWHERE="${SOURCE_DATE_EPOCH:-$USER@`uname -n`:`pwd`}" + + cat << __EOF__ + /* This work is part of OpenLDAP Software . diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.46.bb b/meta-oe/recipes-support/openldap/openldap_2.4.46.bb index 0c2550671d..7fe9fb0d77 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.46.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.46.bb @@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \ file://slapd.service \ file://thread_stub.patch \ file://openldap-CVE-2015-3276.patch \ + file://remove-user-host-pwd-from-version.patch \ " SRC_URI[md5sum] = "829016c5a9f45c51adc50073ac6f9fd7" -- cgit 1.2.3-korg