Re: [notes] 01/01: Tag 9 total packages with user_hostname_manually_added_requiring_further_investigation
Hi Emanuel, > I changed the user.email, sorry for the inconvenience :) Just want to jump in here to say I think you're doing sterling work here. Best wishes, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Bug#836670: marked as done (strip-nondeterminism: leaves temporary files behind)
Your message dated Sun, 04 Sep 2016 18:25:13 + with message-id and subject line Bug#836670: fixed in strip-nondeterminism 0.025-1 has caused the Debian Bug report #836670, regarding strip-nondeterminism: leaves temporary files behind 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 ow...@bugs.debian.org immediately.) -- 836670: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=836670 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: dh-strip-nondeterminism Version: 0.024-1 Severity: serious Control: affects -1 + src:lintian Justification: breaks the world dh_strip_nondeterminism leaves temporary files behind, as seen in the Lintian test suite: https://jenkins.debian.net/job/lintian-tests_sid/lastFailedBuild/consoleText (interesting part starts with "tests::changelog-file-general") -- Jakub Wilk --- End Message --- --- Begin Message --- Source: strip-nondeterminism Source-Version: 0.025-1 We believe that the bug you reported is fixed in the latest version of strip-nondeterminism, 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 836...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Chris Lamb (supplier of updated strip-nondeterminism 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 ftpmas...@ftp-master.debian.org) -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Sun, 04 Sep 2016 17:43:00 +0100 Source: strip-nondeterminism Binary: libfile-stripnondeterminism-perl strip-nondeterminism dh-strip-nondeterminism Architecture: source Version: 0.025-1 Distribution: unstable Urgency: medium Maintainer: Reproducible builds folks Changed-By: Chris Lamb Description: dh-strip-nondeterminism - file non-deterministic information stripper — Debhelper add-on libfile-stripnondeterminism-perl - file non-deterministic information stripper — Perl module strip-nondeterminism - file non-deterministic information stripper — stand-alone tool Closes: 836670 Changes: strip-nondeterminism (0.025-1) unstable; urgency=medium . * Drop all calls to unlink_on_destroy now that we copy the file. (Closes: #836670) - Extend testsuite to ensure no extra files are leftover again. Checksums-Sha1: c5052a131c749ccfac075c74a3657ac3e2e727d1 2350 strip-nondeterminism_0.025-1.dsc f99d26c4032feeb8425262b7c602c862ff734ffb 149517 strip-nondeterminism_0.025.orig.tar.gz a513bb3a6a326675dfd483ae932376e2e7011578 5620 strip-nondeterminism_0.025-1.debian.tar.xz Checksums-Sha256: cecbf81f3679dd742d933fd5d8c9a2b938cef7e2d4c09089b815d9e6ace4 2350 strip-nondeterminism_0.025-1.dsc 21c4737fc49fa3c152f651ddd975d882b98e63a6320c0ad63abce9236c79572c 149517 strip-nondeterminism_0.025.orig.tar.gz 5da577aa0f6c7e9830cef3ffb6a3609be5f4020312d7445fd1fc21217875ef60 5620 strip-nondeterminism_0.025-1.debian.tar.xz Files: 9c05719d4cf35141494a349e320474bd 2350 devel optional strip-nondeterminism_0.025-1.dsc 7056ca9098d7037afc07b313abad03ce 149517 devel optional strip-nondeterminism_0.025.orig.tar.gz 077bfd23cb05662ec2d6728a9424bfeb 5620 devel optional strip-nondeterminism_0.025-1.debian.tar.xz -BEGIN PGP SIGNATURE- iQIcBAEBCAAGBQJXzE9MAAoJEB6VPifUMR5YrM0QAIHSn9Zxti74cdAvquy8sI8r fuIXC0jahVMHkofgpaSr5LvMMNbcsLOhF/MuUEay8AAHqw0VXhJ9WpTqpRZlBCCr +tbT/ZvNoViKFy0+RyZ2G+MysN2tbp4TcFaGme3Wm1CbZpOMS8ZcX2dYxmC77rCz cJkMAuRo7xC/Nd8gsE9wQ7SQR2dkRhnEKM5cBT3Cd1EhEDf9KsKJnK5xaFQ+HkQS 4mPcAXhNlyXs/GV9KsXfG6HtvW2vYGOzT0c/FSARzwC9WE7cuIgpXXgpuZcY5djP 8oSlwyNq9xYNP9L5eo47TzDFRCwnbXFN2EIVrxLZdLeFRnQ0S6v0kFQme2InRSrL 8bVP3SEMc6APSywLG3DfCcogFVWzT3f/4Dt4gxA4d0KFYZEoe4OZg+dG8gyeKgud hyes4+x1OWXHcT2zACxFnu7yHwMnWJCIjOngX4tsZLQnH4xg97H96Zm80KUIWLb6 K1OxNl7vJIQBZdZFSNx7nW2j4ozRW7nb/xh4Nflv8NBp09yVRVRRaK9fbW0RftFk Ebs/72OsDBjsquOOokrWlnXOiJ7pFD5+wlN5ar0TBMhMvXWqfEjkOa5bhcbgPqM7 epQakf36UtQOAnMgl9iEXZeqnpbPA4D8NJheAMBm57fIWpl9lU8hFzGuR0Sib+Qp CdRMbIhOY2B0LeReG/6B =uXnQ -END PGP SIGNATURE End Message --- ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
strip-nondeterminism_0.025-1_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Sun, 04 Sep 2016 17:43:00 +0100 Source: strip-nondeterminism Binary: libfile-stripnondeterminism-perl strip-nondeterminism dh-strip-nondeterminism Architecture: source Version: 0.025-1 Distribution: unstable Urgency: medium Maintainer: Reproducible builds folks Changed-By: Chris Lamb Description: dh-strip-nondeterminism - file non-deterministic information stripper — Debhelper add-on libfile-stripnondeterminism-perl - file non-deterministic information stripper — Perl module strip-nondeterminism - file non-deterministic information stripper — stand-alone tool Closes: 836670 Changes: strip-nondeterminism (0.025-1) unstable; urgency=medium . * Drop all calls to unlink_on_destroy now that we copy the file. (Closes: #836670) - Extend testsuite to ensure no extra files are leftover again. Checksums-Sha1: c5052a131c749ccfac075c74a3657ac3e2e727d1 2350 strip-nondeterminism_0.025-1.dsc f99d26c4032feeb8425262b7c602c862ff734ffb 149517 strip-nondeterminism_0.025.orig.tar.gz a513bb3a6a326675dfd483ae932376e2e7011578 5620 strip-nondeterminism_0.025-1.debian.tar.xz Checksums-Sha256: cecbf81f3679dd742d933fd5d8c9a2b938cef7e2d4c09089b815d9e6ace4 2350 strip-nondeterminism_0.025-1.dsc 21c4737fc49fa3c152f651ddd975d882b98e63a6320c0ad63abce9236c79572c 149517 strip-nondeterminism_0.025.orig.tar.gz 5da577aa0f6c7e9830cef3ffb6a3609be5f4020312d7445fd1fc21217875ef60 5620 strip-nondeterminism_0.025-1.debian.tar.xz Files: 9c05719d4cf35141494a349e320474bd 2350 devel optional strip-nondeterminism_0.025-1.dsc 7056ca9098d7037afc07b313abad03ce 149517 devel optional strip-nondeterminism_0.025.orig.tar.gz 077bfd23cb05662ec2d6728a9424bfeb 5620 devel optional strip-nondeterminism_0.025-1.debian.tar.xz -BEGIN PGP SIGNATURE- iQIcBAEBCAAGBQJXzE9MAAoJEB6VPifUMR5YrM0QAIHSn9Zxti74cdAvquy8sI8r fuIXC0jahVMHkofgpaSr5LvMMNbcsLOhF/MuUEay8AAHqw0VXhJ9WpTqpRZlBCCr +tbT/ZvNoViKFy0+RyZ2G+MysN2tbp4TcFaGme3Wm1CbZpOMS8ZcX2dYxmC77rCz cJkMAuRo7xC/Nd8gsE9wQ7SQR2dkRhnEKM5cBT3Cd1EhEDf9KsKJnK5xaFQ+HkQS 4mPcAXhNlyXs/GV9KsXfG6HtvW2vYGOzT0c/FSARzwC9WE7cuIgpXXgpuZcY5djP 8oSlwyNq9xYNP9L5eo47TzDFRCwnbXFN2EIVrxLZdLeFRnQ0S6v0kFQme2InRSrL 8bVP3SEMc6APSywLG3DfCcogFVWzT3f/4Dt4gxA4d0KFYZEoe4OZg+dG8gyeKgud hyes4+x1OWXHcT2zACxFnu7yHwMnWJCIjOngX4tsZLQnH4xg97H96Zm80KUIWLb6 K1OxNl7vJIQBZdZFSNx7nW2j4ozRW7nb/xh4Nflv8NBp09yVRVRRaK9fbW0RftFk Ebs/72OsDBjsquOOokrWlnXOiJ7pFD5+wlN5ar0TBMhMvXWqfEjkOa5bhcbgPqM7 epQakf36UtQOAnMgl9iEXZeqnpbPA4D8NJheAMBm57fIWpl9lU8hFzGuR0Sib+Qp CdRMbIhOY2B0LeReG/6B =uXnQ -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Re: [notes] 01/01: Tag 9 total packages with user_hostname_manually_added_requiring_further_investigation
Hi, I changed the user.email, sorry for the inconvenience :) Thanks, -Emanuel. Sent: Sunday, September 04, 2016 at 7:59 PM From: "Mattia Rizzolo" To: "Emanuel Bronshtein" Cc: reproducible-builds@lists.alioth.debian.org Subject: Re: [notes] 01/01: Tag 9 total packages with user_hostname_manually_added_requiring_further_investigation Hi Emanuel, On Sun, Sep 04, 2016 at 02:34:47AM +, Emanuel Bronshtein wrote: > e3amn2l-guest pushed a commit to branch master > in repository notes. > > commit 2e6c85f175308bd426fe6ab15856a71ddd610ffd > Author: Emanuel Bronshtein > Date: Sun Sep 4 05:33:52 2016 +0300 Please put a valid email address in your user.email. Stuff (starting by the KGB bot that relies the commits to our IRC channel) are not happy with your current setting. Thanks! :) -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. more about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `- ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Re: [notes] 01/01: Tag 9 total packages with user_hostname_manually_added_requiring_further_investigation
Hi Emanuel, On Sun, Sep 04, 2016 at 02:34:47AM +, Emanuel Bronshtein wrote: > e3amn2l-guest pushed a commit to branch master > in repository notes. > > commit 2e6c85f175308bd426fe6ab15856a71ddd610ffd > Author: Emanuel Bronshtein > Date: Sun Sep 4 05:33:52 2016 +0300 Please put a valid email address in your user.email. Stuff (starting by the KGB bot that relies the commits to our IRC channel) are not happy with your current setting. Thanks! :) -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. more about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `- signature.asc Description: PGP signature ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Processing of strip-nondeterminism_0.025-1_amd64.changes
strip-nondeterminism_0.025-1_amd64.changes uploaded successfully to localhost along with the files: strip-nondeterminism_0.025-1.dsc strip-nondeterminism_0.025.orig.tar.gz strip-nondeterminism_0.025-1.debian.tar.xz Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Bug#836670: strip-nondeterminism: leaves temporary files behind
tag 836670 + pending thanks Apologies for this. I did not spot this regression as a patch modified the testsuite to run in a temporary directory - it therefore did not pollute my working tree which — I would hope — I would have spotted. I've extended the testsuite to catch this in the future. Upload pending. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Processed: Re: strip-nondeterminism: leaves temporary files behind
Processing commands for cont...@bugs.debian.org: > tag 836670 + pending Bug #836670 [dh-strip-nondeterminism] strip-nondeterminism: leaves temporary files behind Added tag(s) pending. > thanks Stopping processing here. Please contact me if you need assistance. -- 836670: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=836670 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Bug#836670: strip-nondeterminism: leaves temporary files behind
* Jakub Wilk , 2016-09-04, 16:16: https://jenkins.debian.net/job/lintian-tests_sid/lastFailedBuild/consoleText This URL is better: https://jenkins.debian.net/job/lintian-tests_sid/1267/consoleText The relevant part is: tests::changelog-file-general: diff -u t/tests/changelog-file-general/tags /tmp/testrun/debian/test-out/tests/changelog-file-general/tags.changelog-file-general --- t/tests/changelog-file-general/tags 2016-09-04 13:11:18.259885818 + +++ /tmp/testrun/debian/test-out/tests/changelog-file-general/tags.changelog-file-general 2016-09-04 13:17:22.033786444 + @@ -5,6 +5,7 @@ W: changelog-file-general: debian-changelog-file-contains-obsolete-user-emacs-settings W: changelog-file-general: debian-changelog-line-too-long line 15 W: changelog-file-general: debian-changelog-line-too-long line 8 +W: changelog-file-general: duplicate-changelog-files usr/share/doc/changelog-file-general/changelog.Debian.gz usr/share/doc/changelog-file-general/l1nNtreQxL W: changelog-file-general: improbable-bug-number-in-closes 12 W: changelog-file-general: latest-debian-changelog-entry-without-new-date W: changelog-file-general: latest-debian-changelog-entry-without-new-version fail tests::changelog-file-general: output differs! (The are many other similar failures.) This can be reproduced without running the whole Lintian test suite: $ apt-get source lintian $ cd lintian-*/ $ debian/rules runtests onlyrun=changelog-file-general -- Jakub Wilk ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Processed: strip-nondeterminism: leaves temporary files behind
Processing control commands: > affects -1 + src:lintian Bug #836670 [dh-strip-nondeterminism] strip-nondeterminism: leaves temporary files behind Added indication that 836670 affects src:lintian -- 836670: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=836670 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Bug#836670: strip-nondeterminism: leaves temporary files behind
Package: dh-strip-nondeterminism Version: 0.024-1 Severity: serious Control: affects -1 + src:lintian Justification: breaks the world dh_strip_nondeterminism leaves temporary files behind, as seen in the Lintian test suite: https://jenkins.debian.net/job/lintian-tests_sid/lastFailedBuild/consoleText (interesting part starts with "tests::changelog-file-general") -- Jakub Wilk ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Re: [Reproducible-builds] Minimising work needed for this build-path issue
Re: Ximin Luo 2016-08-24 > However, I am not sure if this is the best approach. At present, the output > of dpkg-buildflags is itself dependent on the build-path, and some packages > *might* save this value somewhere in their output. (This is the case for > perl, although in perl's specific case this seems fixable.) Fwiw, PostgreSQL is hit by this, because: $ pg_config --cflags -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -g -g -O2 -fdebug-prefix-map=/build/postgresql-9.6-IP43WX/postgresql-9.6-9.6~rc1=. -fstack-protector-strong -Wformat -Werror=format-security -I/usr/include/mit-krb5 -fPIC -pie -fno-omit-frame-pointer The idea is that these CFLAGS will be used when compiling server extensions. Granted, in that scenario the original -fdebug-prefix-map will be useless, so stripping it away will likely improve things, but I still have to mess with the guts of the server build system to make that happen. The SOURCE_ROOT idea sounds sane to me. It would also nicely carry over to extensions built later with these CFLAGS. Christoph signature.asc Description: PGP signature ___ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Bug#836609: nostalgy: please make the build reproducible
Source: nostalgy
Version: 0.2.34-1
Severity: wishlist
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-builds@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0], I noticed
that nostalgy could not be built reproducibly.
Patch attached.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/0003-Reproducible-build.patch 1970-01-01
01:00:00.0 +0100
--- b/debian/patches/0003-Reproducible-build.patch 2016-09-04
13:56:42.262802348 +0100
@@ -0,0 +1,18 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2016-09-04
+
+--- nostalgy-0.2.34.orig/build.sh
nostalgy-0.2.34/build.sh
+@@ -72,7 +72,10 @@ find content -path '*.svn*' -prune -o -t
+ find locale -path '*.svn*' -prune -o -type f -print | grep -v \~ >> files
+
+
+-cat files | zip -0 $JAR_FILE -@
++if [ -n "$SOURCE_DATE_EPOCH" ]; then
++ cat files | xargs -r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
++fi
++LC_ALL=C sort files | zip -0 $JAR_FILE -@
+ # The following statement should be used instead if you don't wish to use the
JAR file
+ #cp --verbose --parents `cat files` $TMP_DIR/chrome
+
--- a/debian/patches/series 2016-09-04 13:52:14.384034333 +0100
--- b/debian/patches/series 2016-09-04 13:56:41.182791060 +0100
@@ -1,2 +1,3 @@
0001-Remove-cleanup-from-the-build.patch
0002-Fix-RDF-syntax.patch
+0003-Reproducible-build.patch
___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
Bug#836605: torque: please make the build reproducible
Source: torque
Version: 2.4.16+dfsg-1.5
Severity: wishlist
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-builds@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0], I noticed
that torque could not be built reproducibly.
Patch attached.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/control2016-09-04 11:52:16.103933074 +0100
--- b/debian/control2016-09-04 13:32:08.295709352 +0100
@@ -8,6 +8,7 @@
Build-Depends: autotools-dev (>= 20100122.1~),
chrpath,
debhelper (>= 7),
+ dh-autoreconf,
libpam0g-dev,
libkvm-dev [kfreebsd-any],
openssh-client,
--- a/debian/patches/CVE-2014-3684.patch2016-09-04 11:52:16.103933074
+0100
--- b/debian/patches/CVE-2014-3684.patch2016-09-04 13:30:07.822486110
+0100
@@ -18,8 +18,8 @@
Reviewed-by: Salvatore Bonaccorso
Last-Update: 2014-10-21
a/src/cmds/pbs_track.c
-+++ b/src/cmds/pbs_track.c
+--- torque-2.4.16+dfsg.orig/src/cmds/pbs_track.c
torque-2.4.16+dfsg/src/cmds/pbs_track.c
@@ -232,6 +232,12 @@ int main(
break;
@@ -33,8 +33,8 @@
default:
/* Unexpected error occurred */
a/src/include/tm.h
-+++ b/src/include/tm.h
+--- torque-2.4.16+dfsg.orig/src/include/tm.h
torque-2.4.16+dfsg/src/include/tm.h
@@ -195,7 +195,7 @@ int tm_register(tm_whattodo_t *what,
/*
* DJH 15 Nov 2001.
@@ -44,8 +44,8 @@
* Cannot be called with any other tm call.
* 26 Feb 2002. Allows id to be jobid (adoptCmd = TM_ADOPT_JOBID)
* or some altid (adoptCmd = TM_ADOPT_ALTID)
a/src/include/tm_.h
-+++ b/src/include/tm_.h
+--- torque-2.4.16+dfsg.orig/src/include/tm_.h
torque-2.4.16+dfsg/src/include/tm_.h
@@ -133,6 +133,7 @@ typedef unsigned int tm_task_id;
#define TM_EBADENVIRONMENT 17005
#define TM_ENOTFOUND 17006
@@ -54,8 +54,8 @@
#define TM_TODO_NOP 5000 /* Do nothing (the nodes value may be new) */
#define TM_TODO_CKPT 5001 /* Checkpoint and continue it */
a/src/lib/Libifl/tm.c
-+++ b/src/lib/Libifl/tm.c
+--- torque-2.4.16+dfsg.orig/src/lib/Libifl/tm.c
torque-2.4.16+dfsg/src/lib/Libifl/tm.c
@@ -80,10 +80,14 @@
#include/* the master config generated by configure */
--- a/debian/patches/reproducible-build.patch 1970-01-01 01:00:00.0
+0100
--- b/debian/patches/reproducible-build.patch 2016-09-04 13:34:37.569226410
+0100
@@ -0,0 +1,28 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2016-09-04
+
+--- torque-2.4.16+dfsg.orig/configure.ac
torque-2.4.16+dfsg/configure.ac
+@@ -1417,13 +1417,20 @@ AH_VERBATIM([NEED_BLOCKING_CONNECTIONS],
+ pbs_build_host=`uname -n`
+ pbs_build_date=`date`
+ pbs_build_dir=`pwd`
++pbs_build_user="${USER}"
++if test -n "$SOURCE_DATE_EPOCH"; then
++ pbs_build_host=generic
++ pbs_build_user=generic
++ pbs_build_date=`LC_ALL=C date --utc --date="@$SOURCE_DATE_EPOCH"`
++ pbs_build_dir=.
++fi
+ pbs_source_dir=`cd $srcdir && pwd`
+ pbs_config_args=$@
+ AC_DEFINE_UNQUOTED([PBS_BUILD_HOST],"${pbs_build_host}",[Define to the build
hostname])
+ AC_DEFINE_UNQUOTED([PBS_BUILD_DATE],"${pbs_build_date}",[Define to the build
date])
+ AC_DEFINE_UNQUOTED([PBS_BUILD_DIR],"${pbs_build_dir}",[Define to the build
directory])
+ AC_DEFINE_UNQUOTED([PBS_SOURCE_DIR],"${pbs_source_dir}",[Define to the source
directory])
+-AC_DEFINE_UNQUOTED([PBS_BUILD_USER],"${USER}",[Define to the building
username])
++AC_DEFINE_UNQUOTED([PBS_BUILD_USER],"${pbs_build_user}",[Define to the
building username])
+ AC_DEFINE_UNQUOTED([PBS_INSTALL_DIR],"${prefix}",[Define to the install
directory])
+ AC_DEFINE_UNQUOTED([PBS_CONFIG_ARGS],"${ac_configure_args}",[Define to the
install directory])
+ AC_DEFINE_UNQUOTED([PBS_CFLAGS],"${CFLAGS}",[Define to the install directory])
--- a/debian/patches/series 2016-09-04 11:52:16.103933074 +0100
--- b/debian/patches/series 2016-09-04 13:21:21.949155279 +0100
@@ -9,3 +9,4 @@
CVE-2013-4495.patch
CVE-2014-0749.patch
CVE-2014-3684.patch
+reproducible-build.patch
--- a/debian/rules 2016-09-04 11:52:16.103933074 +0100
--- b/debian/rules 2016-09-04 13:44:31.467290816 +0100
@@ -46,9 +46,7 @@
configure: configure-stamp
configure-stamp:
dh_testdir
- if [ -x /usr/bin/dh_autotools-dev_updateconfig ]; then \
- dh_autotools-dev_updateconfig; \
- fi
+ dh_autoreconf
ln -sf $(CURDIR) /tmp/torque-src
mkdir -p debian/build/with-x
mkdir -p debian/build/without-x
@@ -75,10 +73,8 @@
dh_testroot
rm -f build-arch-stamp build-indep-stamp configure-stamp
rm -rf debian/build
+ dh_autoreconf_clean
dh_clean
- if [ -x /usr/bin/dh_autotools-dev_restoreconfig ]; then \
- dh_autotools
