Your message dated Sun, 05 Jun 2016 22:40:31 +0000
with message-id <[email protected]>
and subject line Bug#826343: fixed in usb-modeswitch-data 20160112-3
has caused the Debian Bug report #826343,
regarding usb-modeswitch-data: Please make the package build reproducibly
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.)
--
826343: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826343
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: usb-modeswitch-data
Version: 20160112-2
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: locale, fileordering
Hi,
the attached Git patch series makes the package build reproducibly in
my local rebuild.sh test environment. Please consider applying them :)
Cheers,
--
intrigeri
>From 40b452eb2070ca76d7cebb5ad729b2639e6a6ac4 Mon Sep 17 00:00:00 2001
From: intrigeri <[email protected]>
Date: Sat, 4 Jun 2016 16:28:04 +0000
Subject: [PATCH 1/2] 02_pack_config_reproducibly.patch: update to make the
sort order independent of the build locale.
tar's --sort=name has no effect when it's passed an explicit list of
files on the command-line, whose order is locale-dependent, as we do
here with '*'. So, we instead pass tar the list of files sorted in
a locale-independent way, thanks to find|sort|tar.
---
debian/patches/02_pack_config_reproducibly.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/02_pack_config_reproducibly.patch b/debian/patches/02_pack_config_reproducibly.patch
index 265221a..0eefeaf 100644
--- a/debian/patches/02_pack_config_reproducibly.patch
+++ b/debian/patches/02_pack_config_reproducibly.patch
@@ -8,7 +8,7 @@ Last-Update: 2016-03-02
@# Create a compressed tar without gzip timestamp, so tar.gz
@# differs only if content is different
- cd ./usb_modeswitch.d; tar --mode=go=rX,u+rw,a-s -cf ../configPack.tar *
-+ cd ./usb_modeswitch.d; tar --sort=name --mode=go=rX,u+rw,a-s -cf ../configPack.tar *
++ cd ./usb_modeswitch.d; find -print0 | LC_ALL=C sort -z | tar --no-recursion --null --files-from=- --mode=go=rX,u+rw,a-s -cf ../configPack.tar
gzip -f9n ./configPack.tar
install --mode=644 -t $(PREFIX)/share/usb_modeswitch ./configPack.tar.gz
rm -f ./configPack.tar.gz
--
2.8.1
>From 7210f460a421513cebda3230de493566a0420dac Mon Sep 17 00:00:00 2001
From: intrigeri <[email protected]>
Date: Sat, 4 Jun 2016 17:32:43 +0000
Subject: [PATCH 2/2] Create 40-usb_modeswitch.rules reproducibly.
---
...reate-40-usb_modeswitch.rules-reproducibly.patch | 21 +++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 22 insertions(+)
create mode 100644 debian/patches/03-Create-40-usb_modeswitch.rules-reproducibly.patch
diff --git a/debian/patches/03-Create-40-usb_modeswitch.rules-reproducibly.patch b/debian/patches/03-Create-40-usb_modeswitch.rules-reproducibly.patch
new file mode 100644
index 0000000..02e6fb3
--- /dev/null
+++ b/debian/patches/03-Create-40-usb_modeswitch.rules-reproducibly.patch
@@ -0,0 +1,21 @@
+From: intrigeri <[email protected]>
+Date: Sat, 4 Jun 2016 17:31:48 +0000
+Subject: Create 40-usb_modeswitch.rules reproducibly.
+
+---
+ gen-rules.tcl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gen-rules.tcl b/gen-rules.tcl
+index 44781d3..22b7d7b 100755
+--- a/gen-rules.tcl
++++ b/gen-rules.tcl
+@@ -27,7 +27,7 @@ if {![file isdirectory usb_modeswitch.d]} {
+ exit
+ }
+
+-set filelist [glob -nocomplain ./usb_modeswitch.d/*]
++set filelist [lsort [glob -nocomplain ./usb_modeswitch.d/*]]
+ if {[llength $filelist] == 0} {
+ puts "The \"usb_modeswitch.d\" subfolder is empty"
+ exit
diff --git a/debian/patches/series b/debian/patches/series
index f05eca5..7596337 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_no_udev_reload.patch
02_pack_config_reproducibly.patch
+03-Create-40-usb_modeswitch.rules-reproducibly.patch
--
2.8.1
--- End Message ---
--- Begin Message ---
Source: usb-modeswitch-data
Source-Version: 20160112-3
We believe that the bug you reported is fixed in the latest version of
usb-modeswitch-data, 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.
Didier Raboud <[email protected]> (supplier of updated usb-modeswitch-data
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: SHA512
Format: 1.8
Date: Sun, 05 Jun 2016 15:26:39 +0200
Source: usb-modeswitch-data
Binary: usb-modeswitch-data
Architecture: source
Version: 20160112-3
Distribution: unstable
Urgency: medium
Maintainer: Didier Raboud <[email protected]>
Changed-By: Didier Raboud <[email protected]>
Description:
usb-modeswitch-data - mode switching data for usb-modeswitch
Closes: 826343
Changes:
usb-modeswitch-data (20160112-3) unstable; urgency=medium
.
[ intrigeri ]
* Updates patches for reproducibility (Closes: #826343):
- 02_pack_config_reproducibly.patch: update to make the sort order
independent of the build locale
- Create 40-usb_modeswitch.rules reproducibly
Checksums-Sha1:
14bbf4b91c7009099fec12f544f07ae97d7b78b0 1804
usb-modeswitch-data_20160112-3.dsc
a54373cf5db55170a3ace3229e577d5c2f26953c 12856
usb-modeswitch-data_20160112-3.debian.tar.xz
Checksums-Sha256:
1d5ea75deaacc58ff92241bb5132dc77f6a477734dcac22c59a97c65c34da9ab 1804
usb-modeswitch-data_20160112-3.dsc
ab142f1960442e0cdbff5ee98af7e78295b21514aee8a259f99937a7321749c5 12856
usb-modeswitch-data_20160112-3.debian.tar.xz
Files:
0a4cbe0fbc3dc827773502d6ff556055 1804 comm extra
usb-modeswitch-data_20160112-3.dsc
63e1b9bc54625f4f0e7220a36dc27fe3 12856 comm extra
usb-modeswitch-data_20160112-3.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
iQGcBAEBCgAGBQJXVCjHAAoJEIvPpx7KFjRVcMML/26Q5kPiAhoOFOkRrVlQFVft
5Elo9uwwjO92c2bNo+XX0mxnQK5B1ZOcB2jKuXIUJi9TPwm0OP5D2+CA+2VRJZDV
Yw6QTb1s8W2K/KfGa1uVfO92Tg3IqbfNR0bTSRkaie6heo0t7JiGtqYU0Q4DSpmp
S1advZDuTkbTbHKtwbnXn29KqZFmpK4p25Bu1cQcNoeEUfb7GkxBcRknNxHW+/A8
36cLSV+egL/01hlzHyCeCfGdrKCCAFzSIxx1Ox2Z+YO5f1pEycwWMiPpCcf8f854
QMZJQvnvdlGcopO78bf2YrUiizi/vZ+RXlKSkefzjY4Ilir13ZymHMbocMMlQZi3
yHrR+dkGEn5uFiqkuVyuBmGAqWQJUgSeNS00eDQUrby3NlocdQF5id1pzgZn1xov
EDbfVTdBRh5mRFY9oCDZmVMxDv2F5+Fwu1eVqu03WvTQDXRgxpDHVuyEYN/XnNQd
b2/nfmnD7OdX/4rrt64rvH2cCd12TrzbfhjNleHbpg==
=FJre
-----END PGP SIGNATURE-----
--- End Message ---
