Your message dated Sat, 23 May 2015 07:34:17 +0000
with message-id <[email protected]>
and subject line Bug#764251: fixed in socat 1.7.3.0-1
has caused the Debian Bug report #764251,
regarding socat: please set the build timestamp to a deterministic time
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
764251: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764251
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: socat
Version: 1.7.2.4-1
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: timestamps

Hi!

As part of the “reproducible builds” effort, we have discovered that
socat is using the __DATE__ and __TIME__ C pre-processor macro to record
the time of the build. This prevent socat build to be reproducible.

The attached patch will instead set the value of the `timestamp`
variable to the date of the latest debian/changelog entry. In order to
do so, it will patch the build system to allow the build timestamp to be
externally set through the BUILD_DATE variable.

Once applied, socat can be built reproducibly.

-- 
Lunar                                .''`. 
[email protected]                    : :Ⓐ  :  # apt-get install anarchism
                                    `. `'` 
                                      `-   
diff -Nru socat-1.7.2.4/debian/changelog socat-1.7.2.4/debian/changelog
--- socat-1.7.2.4/debian/changelog	2014-06-24 21:20:21.000000000 +0200
+++ socat-1.7.2.4/debian/changelog	2014-10-06 17:56:32.000000000 +0200
@@ -1,3 +1,10 @@
+socat (1.7.2.4-1.0~reproducible1) UNRELEASED; urgency=medium
+
+  * Patch build system to allow the build date to be set externally,
+    and set it to the latest debian/changelog entry for reproducibility.
+
+ -- Jérémy Bobbio <[email protected]>  Mon, 06 Oct 2014 17:55:47 +0200
+
 socat (1.7.2.4-1) unstable; urgency=low
 
   * New upstream release, update patches.
diff -Nru socat-1.7.2.4/debian/control socat-1.7.2.4/debian/control
--- socat-1.7.2.4/debian/control	2014-06-24 19:15:04.000000000 +0200
+++ socat-1.7.2.4/debian/control	2014-10-06 17:51:02.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Laszlo Boszormenyi (GCS) <[email protected]>
 Homepage: http://www.dest-unreach.org/socat/
-Build-Depends: debhelper (>= 9), libssl-dev, libwrap0-dev
+Build-Depends: debhelper (>= 9), dh-autoreconf, libssl-dev, libwrap0-dev
 Standards-Version: 3.9.5
 
 Package: socat
diff -Nru socat-1.7.2.4/debian/patches/04-Set-build-date socat-1.7.2.4/debian/patches/04-Set-build-date
--- socat-1.7.2.4/debian/patches/04-Set-build-date	1970-01-01 01:00:00.000000000 +0100
+++ socat-1.7.2.4/debian/patches/04-Set-build-date	2014-10-06 18:55:35.000000000 +0200
@@ -0,0 +1,41 @@
+Description: allow time of the build to be set externally
+ When running the configure script, the time of the build
+ will be set to the environment variable BUILD_DATE if the
+ latr is set. This is needed to make builds reproducible.
+Author: Jérémy Bobbio <[email protected]>
+Last-Update: 2014-10-06
+
+--- socat-1.7.2.4.orig/configure.in
++++ socat-1.7.2.4/configure.in
+@@ -1844,4 +1844,11 @@ if test -n "$WITH_FIPS"; then
+ fi
+ AC_SUBST(FIPSLD_CC)
+ 
++# allow BUILD_DATE to be externally set for build reproducibility
++if test "$BUILD_DATE"; then
++  AC_DEFINE_UNQUOTED(BUILD_DATE, ["$BUILD_DATE"])
++else
++  AC_DEFINE(BUILD_DATE, [__DATE__" "__TIME__])
++fi
++
+ AC_OUTPUT(Makefile)
+--- socat-1.7.2.4.orig/socat.c
++++ socat-1.7.2.4/socat.c
+@@ -70,7 +70,7 @@ static int socat_newchild(void);
+ static const char socatversion[] =
+ #include "./VERSION"
+       ;
+-static const char timestamp[] = __DATE__" "__TIME__;
++static const char timestamp[] = BUILD_DATE;
+ 
+ const char copyright_socat[] = "socat by Gerhard Rieger - see www.dest-unreach.org";
+ #if WITH_OPENSSL
+--- socat-1.7.2.4.orig/config.h.in
++++ socat-1.7.2.4/config.h.in
+@@ -550,4 +550,6 @@
+ 
+ #undef WITH_MSGLEVEL
+ 
++#define BUILD_DATE __DATE__ " " __TIME__
++
+ #endif /* !defined(__config_h_included) */
diff -Nru socat-1.7.2.4/debian/patches/series socat-1.7.2.4/debian/patches/series
--- socat-1.7.2.4/debian/patches/series	2014-06-24 21:11:46.000000000 +0200
+++ socat-1.7.2.4/debian/patches/series	2014-10-06 18:55:59.000000000 +0200
@@ -2,3 +2,4 @@
 01-Index
 02-Manpage-slashes
 03-Truncate
+04-Set-build-date
diff -Nru socat-1.7.2.4/debian/rules socat-1.7.2.4/debian/rules
--- socat-1.7.2.4/debian/rules	2013-07-03 20:12:23.000000000 +0200
+++ socat-1.7.2.4/debian/rules	2014-10-06 18:47:18.000000000 +0200
@@ -1,7 +1,12 @@
 #!/usr/bin/make -f
 
+export BUILD_DATE = $(shell LC_ALL=C date -u --date="`dpkg-parsechangelog -SDate`" +'%b %e %Y %H:%M:%S')
+
+# upsteram maintains config.h.in manually
+export AUTOHEADER = true
+
 %:
-	dh $@
+	dh $@ --with=autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-readline

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message ---
Source: socat
Source-Version: 1.7.3.0-1

We believe that the bug you reported is fixed in the latest version of
socat, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Laszlo Boszormenyi (GCS) <[email protected]> (supplier of updated socat package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Sat, 23 May 2015 06:53:56 +0000
Source: socat
Binary: socat
Architecture: source amd64
Version: 1.7.3.0-1
Distribution: unstable
Urgency: low
Maintainer: Laszlo Boszormenyi (GCS) <[email protected]>
Changed-By: Laszlo Boszormenyi (GCS) <[email protected]>
Description:
 socat      - multipurpose relay for bidirectional data transfer
Closes: 764251
Changes:
 socat (1.7.3.0-1) unstable; urgency=low
 .
   * New upstream release.
   * Specify BUILD_DATE to make builds reproducible (closes: #764251).
   * Update Standards-Version to 3.9.6 .
Checksums-Sha1:
 b729f4dae52afa466ecb8ca9b1582cd667539760 1727 socat_1.7.3.0-1.dsc
 276a3c7c8bc09f2e72f4dfbbb7f6c4190abef163 474633 socat_1.7.3.0.orig.tar.bz2
 23bbcf504eba5d53608be4a8ccdb3b027d50372d 9200 socat_1.7.3.0-1.debian.tar.xz
 63df336925fa2aaf137c563dab3e39a26d2003ae 341470 socat_1.7.3.0-1_amd64.deb
Checksums-Sha256:
 c0a9e8459845184cc3646a7d54894665e1457a991c205f0cf2df74b19c2743e7 1727 
socat_1.7.3.0-1.dsc
 0767e850c0329b9fdf711c6cd468565cbbb28786ba1a8a1cbd5531d4016b3e04 474633 
socat_1.7.3.0.orig.tar.bz2
 fef75220bae9b4e3552ae7288310e534f14dd2c4c552687e3ae341e96c1987c0 9200 
socat_1.7.3.0-1.debian.tar.xz
 a17fe36b87939b76e27aa76482e3417f5cbecca23cea1b054a419c7bb46f8550 341470 
socat_1.7.3.0-1_amd64.deb
Files:
 a8f5513056c068f4e185071a2a034eec 1727 net extra socat_1.7.3.0-1.dsc
 b607edb65bc6c57f4a43f06247504274 474633 net extra socat_1.7.3.0.orig.tar.bz2
 42cf6a7224feabd47aac7b811bd335ac 9200 net extra socat_1.7.3.0-1.debian.tar.xz
 e06993ed4e44ac0ce09f91cce87beba8 341470 net extra socat_1.7.3.0-1_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJVYCpXAAoJENzjEOeGTMi/Kk8P/R9QeWIAZ2prlBVICqQBfHd2
c7OAyeR5lc8neGj8LdkNfJT3z//rlQ/bWeHp/BbwZzWmRV3OVkvc7Bae9t9cfINI
TubaLWn2y6VUH3p3j/GCb/7UdrS8XNpk2PklJ+1asdrprBZOfzboSL30Dx54k7CZ
IGJhIw9urEWlZqglHsxQ4c6d4VKyYDSLb/DF9YI8wrqCWPYxOi7F8OaFoTOisqMf
AlheJwOlejkJ50SmGZBEap/PAjZJuAehsWczX+E4CyZCzyOyl3Xh8NfkGRvyJSUB
+Me3Ga+QkHqodGM5WmZpWqdTB9NfsjSvLadgZd+mz0XOcUkqBVNYj5kJVDgkCXWh
ZRQBhNRWdH9YaUE0erY5uzUf4Vu6m0zALA/5uq38A5tl7mzybQAFBYXf8U2VakHn
SirL6VWRiH2gbGlk4nVLldCDOlW+4akW2XPC2Pb10Hpj7K9pu5n9WMAODxSVbMrp
jITLADjuGmjOP8GMpTPb50xd69F+YjAxOcI+2jx+LpJI0hDHl8aLdwauzIPICC8F
VNxLe1X5jpEynmT6PG2egIv2nwad6nv1y3XTdeqzXLJ8mnCWg+k/FIiYJePKrTP8
rtvn5u+Ie8PaEalVVYu9YpGt4ZZ3caOUFFLGLKH98yL5AfePg5OPSrWIeZeyvFSi
NZcj0ZVpX0cSJtJ7UMOB
=cCXP
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to