openldap: Reproducibility: Remove user, hostname, pwd from version string

Upstream-Status: Pending
Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 13 insertions, 0 deletions

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 000000000..478a680ca
--- /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 <http://www.openldap.org/>.
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 0c2550671..7fe9fb0d7 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"