[debrepatch] 01/01: patches: dash: include first patch from the bug report as well

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository debrepatch.

commit a07c2b2d5dadf758522eb9a603fab8100249f31c
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Sep 16 20:00:26 2016 +0200

    patches: dash: include first patch from the bug report as well
---
 patches/dash_825643.patch | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/patches/dash_825643.patch b/patches/dash_825643.patch
index d74f0cd..cabb597 100644
--- a/patches/dash_825643.patch
+++ b/patches/dash_825643.patch
@@ -1,6 +1,22 @@
-diff -urN a/debian/rules b/debian/rules
---- a/debian/rules	2016-06-13 01:27:12.000000000 +0200
-+++ b/debian/rules	2016-06-13 01:20:28.447939088 +0200
+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,12 @@
++dash (0.5.8-2.3.0~reproducible1) experimental; urgency=low
++
++  * Improve build reproducibility: set LC_ALL instead of LC_COLLATE to C.
++    Thanks to Reiner Herrmann.
++  * Improve build reproducibility: avoid exec call which embeds different paths
++    between different system shells. Thanks to HW42.
++
++ -- Ximin Luo <infinity0 at debian.org>  Fri, 16 Sep 2016 19:06:49 +0200
++
+ dash (0.5.8-2.3) 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)' \
@@ -10,3 +26,23 @@ diff -urN a/debian/rules b/debian/rules
  	    --host='$(DEB_HOST_GNU_TYPE)')
  	touch configure-stamp
  
+--- 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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debrepatch.git