[oe-commits] [meta-openembedded] 04/16: openldap: Reproducibility: Remove user, hostname, pwd from version string

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 18efa5fa25bcc6a8d6e28250518593d5ceaac060
Author: douglas.royds <douglas.royds at taitradio.com>
AuthorDate: Fri Oct 26 14:19:50 2018 +1300

    openldap: Reproducibility: Remove user, hostname, pwd from version string
    
    This updated patch also sets the date and time strings to the SOURCE_DATE_EPOCH.
    The WHOWHERE string will now be set to simply "openldap"
    in the case that a SOURCE_DATE_EPOCH is set.
    
    Upstream-Status: Submitted [https://www.openldap.org/its/index.cgi/Incoming?id=8928]
    Signed-off-by: Douglas Royds <douglas.royds at taitradio.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../remove-user-host-pwd-from-version.patch        | 27 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 5 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
index 478a680..4eb3897 100644
--- 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
@@ -1,12 +1,29 @@
-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 @@
+diff -ru openldap-2.4.46.orig/build/mkversion openldap-2.4.46/build/mkversion
+--- openldap-2.4.46.orig/build/mkversion	2018-10-25 18:46:10.383750480 +1300
++++ openldap-2.4.46/build/mkversion	2018-10-25 18:46:33.156232586 +1300
+@@ -50,7 +50,15 @@
  fi
  
  APPLICATION=$1
 -WHOWHERE="$USER@`uname -n`:`pwd`"
-+WHOWHERE="${SOURCE_DATE_EPOCH:-$USER@`uname -n`:`pwd`}"
++if [ -n "${SOURCE_DATE_EPOCH}" ]; then
++   WHOWHERE="openldap"
++   DATE=$(date -d@$SOURCE_DATE_EPOCH +' %b %d %Y ')
++   TIME=$(date -d@$SOURCE_DATE_EPOCH +' %H:%M:%S ')
++else
++   WHOWHERE="$USER@$(uname -n):$(pwd)"
++   DATE='" __DATE__ "'
++   TIME='" __TIME__ "'
++fi
  
  cat << __EOF__
  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+@@ -72,7 +80,7 @@
+ "COPYING RESTRICTIONS APPLY\n";
+ 
+ $static $const char $SYMBOL[] =
+-"@(#) \$$PACKAGE: $APPLICATION $VERSION (" __DATE__ " " __TIME__ ") \$\n"
++"@(#) \$$PACKAGE: $APPLICATION $VERSION ($DATE $TIME) \$\n"
+ "\t$WHOWHERE\n";
+ 
+ __EOF__

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.