[cdo] 02/04: Additional fix ore reproducible build: set hostname, username to constant values.

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/1.6.6+dfsg.1-2
in repository cdo.

commit 7e1c811810b341c2fe8061a1068b21dee3a026b8
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jul 8 20:51:16 2015 +0100

    Additional fix ore reproducible build: set hostname, username to  constant values.
---
 debian/changelog                         |  4 +++-
 debian/patches/reproducible-builds.patch | 39 +++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4fedc83..255b63a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-cdo (1.6.6+dfsg.1-2) UNRELEASED; urgency=medium
+cdo (1.6.6+dfsg.1-2) unstable; urgency=medium
 
   * deregister.patch: remove obsolete 'register' statements from some code. 
     Finding the address of a register strictly verboten and breaks 
     ppc64el code. 
+  * Additional fix ore reproducible build: set hostname, username to 
+    constant values. 
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 08 Jul 2015 20:44:36 +0100
 
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
index 4cefb4b..1ab43f2 100644
--- a/debian/patches/reproducible-builds.patch
+++ b/debian/patches/reproducible-builds.patch
@@ -1,6 +1,7 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Make builds bit-reproducible in Debian: remove timestamps
-Last-Updated: 2015-06-29
+ and hostname, username
+Last-Updated: 2015-07-08
 Forwarded: no
 
 Index: cdo-1.6.6+dfsg.1/libcdi/app/cdi.c
@@ -136,3 +137,39 @@ Index: cdo-1.6.6+dfsg.1/src/cdo.c
  #endif
  #if defined(COMPILER)
    fprintf(stderr, "Compiler: %s\n", COMPILER);
+Index: cdo-1.6.6+dfsg.1/configure.ac
+===================================================================
+--- cdo-1.6.6+dfsg.1.orig/configure.ac
++++ cdo-1.6.6+dfsg.1/configure.ac
+@@ -85,19 +85,19 @@ if test -z "$COMP_VERSION" ; then COMP_V
+ AC_DEFINE_UNQUOTED(COMP_VERSION, ["$COMP_VERSION"], [Compiler version])
+ 
+ # Checks for username, hostname and system type
+-USERNAME=$LOGNAME
+-if test -z "$USERNAME" ; then USERNAME=$USER; fi;
+-if test -z "$USERNAME" ; then USERNAME="unknown"; fi;
+-AC_DEFINE_UNQUOTED([USER_NAME],["$USERNAME"], [User name])
+-AC_SUBST([USER_NAME],["$USERNAME"])
++#USERNAME=$LOGNAME
++#if test -z "$USERNAME" ; then USERNAME=$USER; fi;
++#if test -z "$USERNAME" ; then USERNAME="unknown"; fi;
++#AC_DEFINE_UNQUOTED([USER_NAME],["$USERNAME"], [User name])
++AC_SUBST([USER_NAME],["debian_build"])
+ 
+-AS_IF([test -z "$HOST"],
+-      [HOST=unknown
+-       AS_IF([test -x /bin/hostname],[HOST=$(hostname)],
+-             [AS_IF([test -x /bin/uname],
+-                    [HOST=$(uname -n)])])])
+-AC_DEFINE_UNQUOTED([HOST_NAME],["$HOST"],[Host name])
+-AC_SUBST([HOST_NAME],["$HOST"])
++#AS_IF([test -z "$HOST"],
++#      [HOST=unknown
++#      AS_IF([test -x /bin/hostname],[HOST=$(hostname)],
++#             [AS_IF([test -x /bin/uname],
++#                    [HOST=$(uname -n)])])])
++#AC_DEFINE_UNQUOTED([HOST_NAME],["$HOST"],[Host name])
++AC_SUBST([HOST_NAME],["debian"])
+ 
+ AC_DEFINE_UNQUOTED([SYSTEM_TYPE],["$ac_cv_build"], [System type])
+ AC_SUBST([SYSTEM_TYPE],["$ac_cv_build"])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git