This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag debian/2.5.2-7 in repository nexuiz-data.
commit 257228b723e72972c910b486ffd35d15e8dc0304 Author: Simon McVittie <[email protected]> Date: Tue Jan 2 09:16:50 2018 +0000 Apply patch from Reiner Herrmann for locale-independent sorting (Closes: #808652) --- debian/changelog | 2 ++ debian/patches/reproducible_build.diff | 29 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+) diff --git a/debian/changelog b/debian/changelog index d0f0160..d9328ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ nexuiz-data (2.5.2-7) UNRELEASED; urgency=low [ Simon McVittie ] * Add Multi-Arch: foreign to all the binary packages + * Apply patch from Reiner Herrmann for locale-independent sorting + (Closes: #808652) -- Anton Balashov <[email protected]> Fri, 23 Aug 2013 09:18:43 +0400 diff --git a/debian/patches/reproducible_build.diff b/debian/patches/reproducible_build.diff new file mode 100644 index 0000000..ab512d0 --- /dev/null +++ b/debian/patches/reproducible_build.diff @@ -0,0 +1,29 @@ +From: Reiner Herrmann <[email protected]> +Subject: Sort in a locale-independent way +Date: Mon, 21 Dec 2015 19:09:04 +0100 + +During build a checksum over configuration settings is calculated and +embedded in some files. The lines are sorted before generating the +checksum, but sort behaves differently depending on the configured locale. + +Sort with the locale set to C, so that the same values are generated +independent of the current locale. + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=808652 + +--- a/data/update-cvarcount.sh ++++ b/data/update-cvarcount.sh +@@ -2,10 +2,10 @@ + + balance_cfgs="balanceHavoc.cfg balance25.cfg balanceSamual.cfg" + +-countd=`awk '/^seta? g_/ { print $2; }' defaultNexuiz.cfg | sort -u | tr -d '\r' | md5sum | cut -c 1-32` +-countw=`awk '/^seta? g_/ { print $2; }' balance.cfg | sort -u | tr -d '\r' | md5sum | cut -c 1-32` ++countd=`awk '/^seta? g_/ { print $2; }' defaultNexuiz.cfg | LC_ALL=C sort -u | tr -d '\r' | md5sum | cut -c 1-32` ++countw=`awk '/^seta? g_/ { print $2; }' balance.cfg | LC_ALL=C sort -u | tr -d '\r' | md5sum | cut -c 1-32` + for b in $balance_cfgs; do +- countb=`awk '/^seta? g_/ { print $2; }' "$b" | sort -u | tr -d '\r' | md5sum | cut -c 1-32` ++ countb=`awk '/^seta? g_/ { print $2; }' "$b" | LC_ALL=C sort -u | tr -d '\r' | md5sum | cut -c 1-32` + if [ "$countw" != "$countb" ]; then + echo "Mismatch between balance.cfg and $b. Aborting." + exit 1 diff --git a/debian/patches/series b/debian/patches/series index 49193fe..d19e688 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 05_disable_development_warning.diff exclude_textures_from_data.pk3.diff windowed_by_default.diff +reproducible_build.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/nexuiz-data.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
