-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi Bdale,
I applied the patch below and tested a successful build.
Since this bug is RC and is preventing the package from migrating to
testing, and the recursive extract fixes from being included in Debian
(I'm one of the people that hits this recursive problem in my daily
job), I did prepare an NMU called 1.28-2.1 and uploaded on DELAYED/5
queue.
I also included the disable-silent-rules and the parallel builds, as
suggested in this bug report
(I know they might be out of the NMU scope, but they really help the
builders in faster builds and having some more verbosity is helpful in
debugging the builds).
Let me know if I need to delay it any longer or cancel it.
Hope this helps, I'm attaching the full debdiff to this email
the differences from Mark patch are:
changelog:
+tar (1.28-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ [ Gianfranco Costamagna ]
+ * Disable silent rules, to have more verbose builds.
+ * Fix missing MAKEFLAGS in $(MAKE) call, preventing parallel builds.
+
+ [ Marc Deslauriers ]
+ * debian/patches/use-sort-in-t-dir-tests.diff: upstream patch to fix
+ test sort order (Closes: #803012)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Wed, 04 Nov
2015 10:04:22 +0100
+
rules:
@@ -29,6 +29,7 @@
--libexecdir=/usr/lib/tar \
--enable-backup-scripts \
--with-lzma=xz \
+ --disable-silent-rules \
$(CONFARGS)
touch configure-stamp
@@ -38,7 +39,7 @@
build-stamp: configure-stamp
dh_testdir
RSH="/usr/bin/rsh" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
- - LDFLAGS="$(LDFLAGS)" $(MAKE)
+ LDFLAGS="$(LDFLAGS)" $(MAKE) $(MAKEFLAGS)
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
thanks,
Gianfranco
On Tue, 03 Nov 2015 22:24:57 -0600 Marc Deslauriers
<marc.deslauri...@ubuntu.com> wrote:
> Package: tar Version: 1.28-2 Followup-For: Bug #803012 User:
> ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu xenial
> ubuntu-patch
>
>
>
> *** /tmp/tmp70_1Po/bug_body
>
> In Ubuntu, the attached patch was applied to achieve the
> following:
>
> * debian/patches/use-sort-in-t-dir-tests.diff: upstream patch to
> fix test sort order.
>
>
> Thanks for considering the patch.
>
>
> -- System Information: Debian Release: jessie/sid APT prefers
> vivid-updates APT policy: (500, 'vivid-updates'), (500,
> 'vivid-security'), (500, 'vivid-proposed'), (500, 'vivid'), (100,
> 'vivid-backports') Architecture: amd64 (x86_64) Foreign
> Architectures: i386
>
> Kernel: Linux 3.19.0-32-generic (SMP w/4 CPU cores) Locale:
> LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell:
> /bin/sh linked to /bin/dash Init: systemd (via
> /run/systemd/system)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCAAGBQJWOc3SAAoJEPNPCXROn13ZuGwP/1FXDKqhupjW2aRygkIR3n7R
H62cq7Qxw6MWe1YDDrCt+DF26VUHEE9NegHSZUJ0gCX6/1n0lW3u9+nTkUoLgY1T
42wb1g2tDXQimkx6CmjmsoBa9eDGWq6LadAYm5w5zwSDVHvajzOmD40rpKAcjjNC
8xaVgnEim4Wm2wmRLqIDFxhy0Ird97qKrm5f0BvZsjxSeiUy89Mx5UQfjuWe2iLi
EZNyjZI1QtJlCSIByb2h4lenUftoNlNEJ42gZqKaCvZDH+mSXxl2nIX4W7HPpolI
qGCDD6ldiQO7jTb0nMVReFYQC7ygn3eWQXiwTqMI564jpip7g6ZXQ8gP5Gc6xYfL
BypeNdQt6nhVqKfIiyUzI0yGGrh8RpOs1XXDhz6TtRsrHlSLYM+kcOvtwgEpytwe
CKT4hGCBR8GzpYyaXH0hnpCxJHMyvQdwWphOmr2zgq4kwkEsNl9FyL5d/7SRg+mq
tlNNrnJc7SDXXWWy+Cwo6p9UZ1Fk8G1TkzhTK3f/kScc/z1Mr3fFiFwoU5T0eqvn
7NnBe6ox+bCpPcAfsfEBKGVDIO36kmhuH2tA3q9Jt/lx6Y27KewAc1dfvI1uaeaS
tnZ1dA8DdVjhYFQ28Zmrp1YXODUvNCN7/2ki6YMLMQAOJ9lAKDkGhF2fPc/53n8h
VFQtSbjpiZN7z9Axwurv
=H2Fn
-----END PGP SIGNATURE-----
diff -Nru tar-1.28/debian/changelog tar-1.28/debian/changelog
--- tar-1.28/debian/changelog 2015-09-29 00:26:37.000000000 +0200
+++ tar-1.28/debian/changelog 2015-11-04 10:06:13.000000000 +0100
@@ -1,3 +1,16 @@
+tar (1.28-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ [ Gianfranco Costamagna ]
+ * Disable silent rules, to have more verbose builds.
+ * Fix missing MAKEFLAGS in $(MAKE) call, preventing parallel builds.
+
+ [ Marc Deslauriers ]
+ * debian/patches/use-sort-in-t-dir-tests.diff: upstream patch to fix
+ test sort order (Closes: #803012)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Wed, 04 Nov 2015
10:04:22 +0100
+
tar (1.28-2) unstable; urgency=low
* patch from upstream to fix --files-from and recursive extract,
diff -Nru tar-1.28/debian/patches/series tar-1.28/debian/patches/series
--- tar-1.28/debian/patches/series 2015-09-29 00:26:37.000000000 +0200
+++ tar-1.28/debian/patches/series 2015-11-04 10:03:57.000000000 +0100
@@ -2,3 +2,4 @@
listed03-linux-only
add-clamp-mtime.diff
files-from-and-recursive-extract.diff
+use-sort-in-t-dir-tests.diff
diff -Nru tar-1.28/debian/patches/use-sort-in-t-dir-tests.diff
tar-1.28/debian/patches/use-sort-in-t-dir-tests.diff
--- tar-1.28/debian/patches/use-sort-in-t-dir-tests.diff 1970-01-01
01:00:00.000000000 +0100
+++ tar-1.28/debian/patches/use-sort-in-t-dir-tests.diff 2015-11-04
10:04:13.000000000 +0100
@@ -0,0 +1,48 @@
+From 5e2a1d5b3801d016f51b3f4c476d275a6adff5d7 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <g...@gnu.org>
+Date: Mon, 02 Nov 2015 11:54:26 +0000
+Subject: Use sort in T-dir tests.
+
+---
+diff --git a/tests/T-dir00.at b/tests/T-dir00.at
+index 7f89fcf..8ff6ba8 100644
+--- a/tests/T-dir00.at
++++ b/tests/T-dir00.at
+@@ -28,13 +28,14 @@
+ AT_SETUP([recursive extraction from --files-from])
+ AT_KEYWORDS([files-from extract T-dir T-dir00])
+ AT_TAR_CHECK([
++AT_SORT_PREREQ
+ mkdir dir
+ genfile -f dir/file1
+ genfile -f dir/file2
+ tar cf archive dir
+ rm -rf dir
+ echo dir > list
+-tar xfTv archive list
++tar xfTv archive list | sort
+ ],
+ [0],
+ [dir/
+diff --git a/tests/T-dir01.at b/tests/T-dir01.at
+index 155a373..db92292 100644
+--- a/tests/T-dir01.at
++++ b/tests/T-dir01.at
+@@ -28,13 +28,14 @@
+ AT_SETUP([trailing slash in --files-from])
+ AT_KEYWORDS([files-from extract T-dir T-dir01])
+ AT_TAR_CHECK([
++AT_SORT_PREREQ
+ mkdir dir
+ genfile -f dir/file1
+ genfile -f dir/file2
+ tar cf archive dir
+ rm -rf dir
+ echo dir/ > list
+-tar xfTv archive list
++tar xfTv archive list | sort
+ ],
+ [0],
+ [dir/
+--
+cgit v0.9.0.2
diff -Nru tar-1.28/debian/rules tar-1.28/debian/rules
--- tar-1.28/debian/rules 2015-09-29 00:26:37.000000000 +0200
+++ tar-1.28/debian/rules 2015-11-04 10:03:40.000000000 +0100
@@ -29,6 +29,7 @@
--libexecdir=/usr/lib/tar \
--enable-backup-scripts \
--with-lzma=xz \
+ --disable-silent-rules \
$(CONFARGS)
touch configure-stamp
@@ -38,7 +39,7 @@
build-stamp: configure-stamp
dh_testdir
RSH="/usr/bin/rsh" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
- LDFLAGS="$(LDFLAGS)" $(MAKE)
+ LDFLAGS="$(LDFLAGS)" $(MAKE) $(MAKEFLAGS)
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
