[cdo] 02/02: Further hostname fix for reproducible build

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository cdo.

commit 708e86cbf406b158dbf031c5c74c1f5fe03170e0
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Oct 20 17:41:35 2015 +0100

    Further hostname fix for reproducible build
---
 debian/changelog                         |  7 ++++++
 debian/patches/reproducible-builds.patch | 40 +++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8df85d8..15e617c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cdo (1.6.9+dfsg.1-3) unstable; urgency=medium
+
+  * Further hostname changes needed for libcdi/configure.ac for 
+    reproducible builds 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 20 Oct 2015 17:40:54 +0100
+
 cdo (1.6.9+dfsg.1-2) unstable; urgency=medium
 
   * Builg against magics 2.24.7-7 for g++5 transition 
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
index cacb791..e2c26a3 100644
--- a/debian/patches/reproducible-builds.patch
+++ b/debian/patches/reproducible-builds.patch
@@ -1,7 +1,7 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Make builds bit-reproducible in Debian: remove timestamps
  and hostname, username
-Last-Updated: 2015-07-08
+Last-Updated: 2015-10-20
 Forwarded: no
 
 Index: cdo-1.6.9+dfsg.1/libcdi/app/cdi.c
@@ -146,3 +146,41 @@ Index: cdo-1.6.9+dfsg.1/configure.ac
  
  AC_DEFINE_UNQUOTED([SYSTEM_TYPE],["$ac_cv_build"], [System type])
  AC_SUBST([SYSTEM_TYPE],["$ac_cv_build"])
+Index: cdo-1.6.9+dfsg.1/libcdi/configure.ac
+===================================================================
+--- cdo-1.6.9+dfsg.1.orig/libcdi/configure.ac
++++ cdo-1.6.9+dfsg.1/libcdi/configure.ac
+@@ -106,19 +106,21 @@ 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],["$USERNAME"])
++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],["$HOST"])
++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