Package: src:dash
Followup-For: Bug #825643
Hi, I've uploaded this to DELAYED/14.
The patch is attached, it's just a combined version of what the previous two
bug reporters submitted, plus a changelog.
X
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable-debug'), (500,
'testing-debug'), (300, 'unstable'), (200, 'experimental'), (1,
'experimental-debug')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8), LANGUAGE=en_GB:en
(charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -u dash-0.5.8/debian/changelog dash-0.5.8/debian/changelog
--- dash-0.5.8/debian/changelog
+++ dash-0.5.8/debian/changelog
@@ -1,3 +1,16 @@
+dash (0.5.8-2.5) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ [ Reiner Herrmann ]
+ * Improve build reproducibility: set LC_ALL instead of LC_COLLATE to C.
+
+ [ HW42 ]
+ * Improve build reproducibility: avoid exec call which embeds different paths
+ between different system shells. (Closes: #825643)
+
+ -- Ximin Luo <infini...@debian.org> Wed, 28 Jun 2017 18:26:52 +0200
+
dash (0.5.8-2.4) unstable; urgency=medium
* Non-maintainer upload.
diff -u dash-0.5.8/debian/rules dash-0.5.8/debian/rules
--- dash-0.5.8/debian/rules
+++ dash-0.5.8/debian/rules
@@ -46,7 +46,7 @@
touch configure
(cd build-tmp && CC='$(CC)' \
CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \
- exec ../configure --enable-fnmatch --disable-lineno \
+ ../configure --enable-fnmatch --disable-lineno \
--host='$(DEB_HOST_GNU_TYPE)')
touch configure-stamp
only in patch2:
unchanged:
--- dash-0.5.8.orig/src/mkbuiltins
+++ dash-0.5.8/src/mkbuiltins
@@ -78,7 +78,7 @@
if ($i ~ /^-/)
line = $(++i) "\t" line
print line
- }}' $temp | LC_COLLATE=C sort -k 1,1 | tee $temp2 | awk '{
+ }}' $temp | LC_ALL=C sort -k 1,1 | tee $temp2 | awk '{
opt = ""
if (NF > 2) {
opt = substr($2, 2)
@@ -97,7 +97,7 @@
*/
!
-sed 's/ -[a-z]*//' $temp2 | nl -b a -v 0 | LC_COLLATE=C sort -u -k 3,3 |
+sed 's/ -[a-z]*//' $temp2 | nl -b a -v 0 | LC_ALL=C sort -u -k 3,3 |
tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ |
awk '{ printf "#define %s (builtincmd + %d)\n", $3, $1}'
printf '\n#define NUMBUILTINS %d\n' $(wc -l < $temp2)
