From: Christian Hofstaedtler <zeha@debian.org>
Date: Sun, 3 Jul 2016 08:20:06 +0000 (+0200)
Subject: Sort included html files
X-Git-Tag: rec-4.0.0~20^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F4094%2Fhead;p=thirdparty%2Fpdns.git

Sort included html files

For improved reproducibility.
---

diff --git a/pdns/dnsdistdist/incfiles b/pdns/dnsdistdist/incfiles
index b6c50d0810..da127415f6 100755
--- a/pdns/dnsdistdist/incfiles
+++ b/pdns/dnsdistdist/incfiles
@@ -1,18 +1,21 @@
 #!/bin/sh
 
+export LC_ALL=C.UTF-8
+export LANG=C.UTF-8
+
 if [ -n "$1" ]
 then
 	DIR=$1/
 fi
 
-for a in $(find ${DIR}html -type f | grep -v \~)
+for a in $(find ${DIR}html -type f | grep -v \~ | sort)
 do
 	c=$(echo $a | sed s:${DIR}html/:: | tr "/.-" "___")
 	echo "INCBIN(${c}, \"$a\");"
 done
 
 echo "map<string,string> g_urlmap={"
-for a in $(find ${DIR}html -type f | grep -v \~)
+for a in $(find ${DIR}html -type f | grep -v \~ | sort)
 do
 	b=$(echo $a | sed s:${DIR}html/::g)
 	c=$(echo $b | tr "/.-" "___")
diff --git a/pdns/recursordist/incfiles b/pdns/recursordist/incfiles
index b6c50d0810..da127415f6 100755
--- a/pdns/recursordist/incfiles
+++ b/pdns/recursordist/incfiles
@@ -1,18 +1,21 @@
 #!/bin/sh
 
+export LC_ALL=C.UTF-8
+export LANG=C.UTF-8
+
 if [ -n "$1" ]
 then
 	DIR=$1/
 fi
 
-for a in $(find ${DIR}html -type f | grep -v \~)
+for a in $(find ${DIR}html -type f | grep -v \~ | sort)
 do
 	c=$(echo $a | sed s:${DIR}html/:: | tr "/.-" "___")
 	echo "INCBIN(${c}, \"$a\");"
 done
 
 echo "map<string,string> g_urlmap={"
-for a in $(find ${DIR}html -type f | grep -v \~)
+for a in $(find ${DIR}html -type f | grep -v \~ | sort)
 do
 	b=$(echo $a | sed s:${DIR}html/::g)
 	c=$(echo $b | tr "/.-" "___")