Your message dated Sat, 20 Feb 2021 22:03:28 +0000
with message-id <e1ldaly-0000yk...@fasolo.debian.org>
and subject line Bug#983147: fixed in armagetronad 0.2.9.1.0-2
has caused the Debian Bug report #983147,
regarding armagetronad: reproducible builds: Embeds date in version string
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.)
--
983147: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983147
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: armagetronad
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The current Reproducible Builds patch appears to be ineffective,
possibly due to checking for the presence of the debian/changelog when
it is not necessarily run from the top level source directory:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/armagetronad.html
/usr/games/armagetronad-dedicated.real
0.2.9.1_alpha20210219
vs.
0.2.9.1_alpha20220325
Two patches are attached, one that could possibly be applied upstream,
and another that is a patch-on-patch applying the changes to
debian/patches.
Thanks for maintaining armagetronad!
live well,
vagrant
From bac143a46de8763ec8a5ef05a3ec37e8f3ef5255 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Sat, 20 Feb 2021 02:54:04 +0000
Subject: [PATCH 1/2] batch/make/version: Use SOURCE_DATE_EPOCH to set date.
The minor_version may have a date string appended.
https://reproducible-builds.org/docs/source-date-epoch/
---
batch/make/version | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/batch/make/version b/batch/make/version
index adc1c4a..3910d1c 100755
--- a/batch/make/version
+++ b/batch/make/version
@@ -15,7 +15,10 @@ fi
# set version parts to defaults for CVS snapshot
major_version=`cat ${srcdir}/major_version`
minor_version_proto=`cat ${srcdir}/minor_version`
-DATE=`date +%Y%m%d`
+# Set DATE from SOURCE_DATE_EPOCH to enable reproducible builds:
+# https://reproducible-builds.org/docs/source-date-epoch/
+DATE_FMT='+%Y%m%d'
+DATE=$(date -u -d "@${SOURCE_DATE_EPOCH}" "${DATE_FMT}" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "${DATE_FMT}" 2>/dev/null || date -u "${DATE_FMT}")
#echo $major_version
#echo $minor_version
--
2.30.1
From e7c32fed8c8efec8e61d47224f82cee834222786 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Sat, 20 Feb 2021 02:59:26 +0000
Subject: [PATCH 2/2] Update reproducible build patch.
---
debian/patches/reproducible_build.patch | 42 ++++++++++++++++---------
1 file changed, 27 insertions(+), 15 deletions(-)
diff --git a/debian/patches/reproducible_build.patch b/debian/patches/reproducible_build.patch
index c140622..784e4f9 100644
--- a/debian/patches/reproducible_build.patch
+++ b/debian/patches/reproducible_build.patch
@@ -1,19 +1,31 @@
-Description: Make the build reproducible
-Author: Chris Lamb <la...@debian.org>
-Last-Update: 2020-11-16
+From bac143a46de8763ec8a5ef05a3ec37e8f3ef5255 Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <vagr...@reproducible-builds.org>
+Date: Sat, 20 Feb 2021 02:54:04 +0000
+Subject: [PATCH] batch/make/version: Use SOURCE_DATE_EPOCH to set date.
---- armagetronad-0.2.9.0.1.orig/batch/make/version
-+++ armagetronad-0.2.9.0.1/batch/make/version
-@@ -12,6 +12,12 @@ if test "${CI_COMMIT_REF_PROTECTED}" = "
- exit 0
- fi
-
-+# if we're building from a Debian package, that is our version
-+if test -f debian/changelog; then
-+ dpkg-parsechangelog -SVersion
-+ exit 0
-+fi
-+
+The minor_version may have a date string appended.
+
+https://reproducible-builds.org/docs/source-date-epoch/
+---
+ batch/make/version | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/batch/make/version b/batch/make/version
+index adc1c4a..3910d1c 100755
+--- a/batch/make/version
++++ b/batch/make/version
+@@ -15,7 +15,10 @@ fi
# set version parts to defaults for CVS snapshot
major_version=`cat ${srcdir}/major_version`
minor_version_proto=`cat ${srcdir}/minor_version`
+-DATE=`date +%Y%m%d`
++# Set DATE from SOURCE_DATE_EPOCH to enable reproducible builds:
++# https://reproducible-builds.org/docs/source-date-epoch/
++DATE_FMT='+%Y%m%d'
++DATE=$(date -u -d "@${SOURCE_DATE_EPOCH}" "${DATE_FMT}" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "${DATE_FMT}" 2>/dev/null || date -u "${DATE_FMT}")
+
+ #echo $major_version
+ #echo $minor_version
+--
+2.30.1
+
--
2.30.1
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
Source: armagetronad
Source-Version: 0.2.9.1.0-2
Done: Markus Koschany <a...@debian.org>
We believe that the bug you reported is fixed in the latest version of
armagetronad, 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 983...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Markus Koschany <a...@debian.org> (supplier of updated armagetronad 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: SHA512
Format: 1.8
Date: Sat, 20 Feb 2021 22:11:10 +0100
Source: armagetronad
Architecture: source
Version: 0.2.9.1.0-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
Changed-By: Markus Koschany <a...@debian.org>
Closes: 983147
Changes:
armagetronad (0.2.9.1.0-2) unstable; urgency=medium
.
* Update reproducible_build.patch and really make the build reproducible.
Thanks to Vagrant Cascadian for the patches. (Closes: #983147)
Checksums-Sha1:
48ab1eb673f5d312b3e59f09728a5ebb85657d8a 2410 armagetronad_0.2.9.1.0-2.dsc
2b0eab06e567dfa922dc0b311a1b59022f09e97c 29852
armagetronad_0.2.9.1.0-2.debian.tar.xz
abf7da1ebdcb124a82495a66f149db64118deac1 12135
armagetronad_0.2.9.1.0-2_amd64.buildinfo
Checksums-Sha256:
063c7a7206cfe8be074c51f05fed37e66e47beee00a5033868c1f98ca938c73d 2410
armagetronad_0.2.9.1.0-2.dsc
28b778440ee2d7a8657fec2a8a468723017645a98259a7afac9fa67841a6c36f 29852
armagetronad_0.2.9.1.0-2.debian.tar.xz
1274e551803b7555fc73c8ac31dac190680ecd2a14843f9e97644ddd38a2fc35 12135
armagetronad_0.2.9.1.0-2_amd64.buildinfo
Files:
dc8739e5cc0d0de70e9656e61ea1fd01 2410 games optional
armagetronad_0.2.9.1.0-2.dsc
96aedd343cd43ac25ab39a3298f663d8 29852 games optional
armagetronad_0.2.9.1.0-2.debian.tar.xz
1c569ad684697ec4b460af1ba5223066 12135 games optional
armagetronad_0.2.9.1.0-2_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQKjBAEBCgCNFiEErPPQiO8y7e9qGoNf2a0UuVE7UeQFAmAxgwhfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEFD
RjNEMDg4RUYzMkVERUY2QTFBODM1RkQ5QUQxNEI5NTEzQjUxRTQPHGFwb0BkZWJp
YW4ub3JnAAoJENmtFLlRO1HklRgP/ApVoEkZOMjzrtmj7G9ri8xfH3KKzHOWVK5M
Sm7MWsVaSjC/8L4y6viQmP8AxYpq/qJ/jjrLS1udjE9N/Cx1ArEE5ynijcHq2Gxr
0ScFcmaugtnGB/wY39O4Dn/mcqRkEWKnSliDE7OjKncmW85yPwlBO5B39rvTupyO
nos4ue9F9eCk8q62f2XY/RZ1xYXQMD6nCRt3PoCd4ZRYy3iwRhmjmiPgkjzcpUtE
qbH+Ef6gtfQPdgXF0pqq9bCV/9xhtirIPkGCztJMbNEuuXFvkLRvQGg0knwK1a/y
5HQXszDAFWu9WMJp2bJfYyTUM2VvRq8+uZwisDrd2/lh04MHbz48MYvfaA2ZNpfg
ByLtpzu25taz1eW3vfvjY3Lj5T3p1MervwUtsgTZKfwC2DEWXZmZRnx7OLGBFStW
j+RVWwMVF40wx+uC3eRjUx3Lpp1Qd7MxpWXVJdh8NvcC+tCKuSIfM5pTPWrfKIyg
XzHwb/i3tyTX+8PchVJccaD88wpzmRtgdDG7fOPQzMGfugwBfyUUouIXqk7se0gi
GkpUbsF3Vxo99M2Zu5OGOwfWZXXqw8Cvp2R2zvJgJQqEdtBU8RlouceTgMq80pb5
8TugIvor+8nLkiFQfG+j5fQ1QK0cOgi/l9+E2V4nLGNZiiDcASydjbNFqZdGqOvi
jCZGFVkO
=0ik4
-----END PGP SIGNATURE-----
--- End Message ---
