[med-svn] [Git][med-team/libzstd][master] 5 commits: Add patch making build reproducible, Closes: #897904

Alexandre Mestiashvili gitlab at salsa.debian.org
Wed May 9 12:55:58 BST 2018 

Alexandre Mestiashvili pushed to branch master at Debian Med / libzstd


Commits:
7f162afc by Alexandre Mestiashvili at 2018-05-09T10:55:19+02:00
Add patch making build reproducible, Closes: #897904

- - - - -
17470bc9 by Alexandre Mestiashvili at 2018-05-09T11:03:08+02:00
Update patch skipping heavy tests on mips(el) and hurd

- - - - -
b47be938 by Alexandre Mestiashvili at 2018-05-09T11:12:02+02:00
Add patch fixing tests on GNU/Hurd

- - - - -
1bf3b49b by Alexandre Mestiashvili at 2018-05-09T11:13:20+02:00
Drop not needed override_dh_auto_test

- - - - -
1e6ba0f7 by Alexandre Mestiashvili at 2018-05-09T13:12:17+02:00
Update changelog, prepare for release

Gbp-Dch: Ignore

Signed-off-by: Alexandre Mestiashvili <mestia at debian.org>

- - - - -


6 changed files:

- debian/changelog
- debian/patches/0013-skip-memory-greedy-tests.patch
- + debian/patches/0014-Reproducible-build.patch
- + debian/patches/0015-Non-regular-file-test.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libzstd (1.3.4+dfsg-3) unstable; urgency=medium
+
+  * Add patch making build reproducible, Closes: #897904
+  * Update patch skipping heavy tests on mips(el) and hurd
+  * Add patch fixing tests on GNU/Hurd
+  * Drop not needed override_dh_auto_test
+
+ -- Alexandre Mestiashvili <mestia at debian.org>  Wed, 09 May 2018 13:08:47 +0200
+
 libzstd (1.3.4+dfsg-2) unstable; urgency=medium
 
   * Add liblzma-dev and liblz4-dev to build-depends to enable xz and lz4 support


=====================================
debian/patches/0013-skip-memory-greedy-tests.patch
=====================================
--- a/debian/patches/0013-skip-memory-greedy-tests.patch
+++ b/debian/patches/0013-skip-memory-greedy-tests.patch
@@ -1,16 +1,30 @@
-Subject: Skip memory heavy tests causing FTBFS on mips and mipsel buildds
+Subject: Skip memory heavy tests causing FTBFS on mips(el) and hurd buildds
 From: Alex Mestiashvili <mestia at debian.org>
 --- libzstd.orig/tests/playTests.sh
 +++ libzstd/tests/playTests.sh
-@@ -761,9 +761,15 @@
+@@ -743,8 +743,13 @@
+ roundTripTest -g5000000000 -P99 1
+ roundTripTest -g1700000000 -P0 "1 --zstd=strategy=6"   # ensure btlazy2 can survive an overflow rescale
+ 
++DEBARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
++if [ "$DEBARCH" != 'hurd-i386' ]
++then
+ fileRoundTripTest -g4193M -P99 1
+-
++else
++  $ECHO "\n**** skip memory greedy tests on $DEBARCH **** "
++fi
+ 
+ $ECHO "\n===>   zstd long, long distance matching round-trip tests "
+ roundTripTest -g270000000 "1 --single-thread --long"
+@@ -761,9 +766,14 @@
      $ECHO "\n===>   zstdmt long round-trip tests "
      roundTripTest -g80000000 -P99 "19 -T2" " "
      roundTripTest -g5000000000 -P99 "1 -T2" " "
 -    roundTripTest -g500000000 -P97 "1 -T999" " "
 -    fileRoundTripTest -g4103M -P98 " -T0" " "
 -    roundTripTest -g400000000 -P97 "1 --long=24 -T2" " "
-+	DEBARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
-+	if [ "$DEBARCH" != 'mips' -a "$DEBARCH" != 'mipsel' ]
++    if [ "$DEBARCH" != 'mips' -a "$DEBARCH" != 'mipsel' -a "$DEBARCH" != 'hurd-i386' ]
 +    then
 +        roundTripTest -g500000000 -P97 "1 -T999" " "
 +        fileRoundTripTest -g4103M -P98 " -T0" " "


=====================================
debian/patches/0014-Reproducible-build.patch
=====================================
--- /dev/null
+++ b/debian/patches/0014-Reproducible-build.patch
@@ -0,0 +1,16 @@
+Description: Make the build reproducible
+Author: Chris Lamb <lamby at debian.org>
+Last-Update: 2018-05-04
+Applied-Upstream: https://github.com/facebook/zstd/commit/ef1abd3c071ce42a457404ee2bca6d5bebb87f62
+
+--- libzstd.orig/contrib/pzstd/Options.cpp
++++ libzstd/contrib/pzstd/Options.cpp
+@@ -88,7 +88,7 @@
+   std::fprintf(stderr, "  -p, --processes   #    : number of threads to use for (de)compression (default:%d)\n", defaultNumThreads());
+ 
+   std::fprintf(stderr, "ZSTD options:\n");
+-  std::fprintf(stderr, "  -#                     : # compression level (1-%d, default:%d)\n", kMaxNonUltraCompressionLevel, kDefaultCompressionLevel);
++  std::fprintf(stderr, "  -#                     : # compression level (1-%d, default:<numcpus>)\n", kMaxNonUltraCompressionLevel);
+   std::fprintf(stderr, "  -d, --decompress       : decompression\n");
+   std::fprintf(stderr, "  -o                file : result stored into `file` (only if 1 input file)\n");
+   std::fprintf(stderr, "  -f, --force            : overwrite output without prompting, (de)compress links\n");


=====================================
debian/patches/0015-Non-regular-file-test.patch
=====================================
--- /dev/null
+++ b/debian/patches/0015-Non-regular-file-test.patch
@@ -0,0 +1,25 @@
+Description: Use /dev/random instead of /dev/zero as non-regular file,
+ because /dev/zero isn't writable on GNU/Hurd.
+ Fix a typo in tests s/INTONULL/INTOVOID/
+Author: Alex Mestiashvili <mestia at debian.org>
+Applied-Upstream: https://github.com/facebook/zstd/pull/1124/commits/2dde9d5abaade164329bf698aa938f1a5b0526d1
+--- libzstd.orig/tests/playTests.sh
++++ libzstd/tests/playTests.sh
+@@ -56,7 +56,7 @@
+ 
+ isWindows=false
+ INTOVOID="/dev/null"
+-DEVDEVICE="/dev/zero"
++DEVDEVICE="/dev/random"
+ case "$OS" in
+   Windows*)
+     isWindows=true
+@@ -175,7 +175,7 @@
+ $ZSTD tmp -f -o "$DEVDEVICE" 2>tmplog > "$INTOVOID"
+ grep -v "Refusing to remove non-regular file" tmplog
+ rm -f tmplog
+-$ZSTD tmp -f -o "$INTONULL" 2>&1 | grep -v "Refusing to remove non-regular file"
++$ZSTD tmp -f -o "$INTOVOID" 2>&1 | grep -v "Refusing to remove non-regular file"
+ $ECHO "test : --rm on stdin"
+ $ECHO a | $ZSTD --rm > $INTOVOID   # --rm should remain silent
+ rm tmp


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@
 0012-typos.patch
 pthread.patch
 0013-skip-memory-greedy-tests.patch
+0014-Reproducible-build.patch
+0015-Non-regular-file-test.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -43,10 +43,3 @@ override_dh_installman:
 	dh_installman
 	mkdir -p $(mandir)
 	$(HELP2MAN) --name='parallelised Zstandard compression, al la pigz' contrib/pzstd/pzstd >$(mandir)/pzstd.1
-
-override_dh_auto_test:
-ifeq ($(DEB_HOST_ARCH),hurd-i386)
-	make shortest
-else
-	dh_auto_test
-endif



View it on GitLab: https://salsa.debian.org/med-team/libzstd/compare/dcd0dbf7feedca747dd43e4f9500dd6a9961335b...1e6ba0f7c2fe2610c4f846afa786fca639be6ccc

---
View it on GitLab: https://salsa.debian.org/med-team/libzstd/compare/dcd0dbf7feedca747dd43e4f9500dd6a9961335b...1e6ba0f7c2fe2610c4f846afa786fca639be6ccc
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180509/5c28d9db/attachment-0001.html>

More information about the debian-med-commit mailing list