diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-09-11 01:32:48 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-09-11 01:33:47 -0400 |
| commit | 34b312a4274fa1fe232cd72f080070fec4b13e9c (patch) | |
| tree | 8e0a2e0d45dadcecd4ff7cbcac5ec1a8b1d3926c /app-arch/cpio | |
| parent | dev-python/pydecomp: Add natural-name to metadata.xml (diff) | |
| download | gentoo-34b312a4274fa1fe232cd72f080070fec4b13e9c.tar.gz gentoo-34b312a4274fa1fe232cd72f080070fec4b13e9c.tar.bz2 gentoo-34b312a4274fa1fe232cd72f080070fec4b13e9c.zip | |
app-arch/cpio: add upstream fix for symlink-bad-length test failure #554760
Diffstat (limited to 'app-arch/cpio')
| -rw-r--r-- | app-arch/cpio/cpio-2.11-r3.ebuild | 1 | ||||
| -rw-r--r-- | app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch | 39 |
2 files changed, 40 insertions, 0 deletions
diff --git a/app-arch/cpio/cpio-2.11-r3.ebuild b/app-arch/cpio/cpio-2.11-r3.ebuild index d234da80e401..c389789622b9 100644 --- a/app-arch/cpio/cpio-2.11-r3.ebuild +++ b/app-arch/cpio/cpio-2.11-r3.ebuild @@ -20,6 +20,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-no-gets.patch #424974 epatch "${FILESDIR}"/${P}-non-gnu-compilers.patch #275295 epatch "${FILESDIR}"/${P}-security.patch #530512 #536010 + epatch "${FILESDIR}"/${P}-symlink-bad-length-test.patch #554760 eautoreconf } diff --git a/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch b/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch new file mode 100644 index 000000000000..7af5fe0f0bc5 --- /dev/null +++ b/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch @@ -0,0 +1,39 @@ +https://lists.gnu.org/archive/html/bug-cpio/2015-06/msg00001.html +https://bugs.gentoo.org/554760 + +this fix is squashed into 0396591026410f91f7a81b4b150bc7285d9f2278 +(as upstream doesn't seem to understand git) + +>From bebf9662c406d1d137a66c567d8748b489d352e7 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <address@hidden> +Date: Thu, 4 Jun 2015 13:27:42 +0200 +Subject: [PATCH] tests: fix expected output for old file + +Thanks Victor Rodriguez. Upstream thread: +http://lists.gnu.org/archive/html/bug-cpio/2015-06/msg00000.html + +* tests/symlink-bad-length.at (STDOUT): Expect the year string +'2014' is printed and not time because the file in archive is +older than 6 months. +* Thanks: Mention Victor. +--- + THANKS | 1 + + tests/symlink-bad-length.at | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at +index e1a7093..2cdc692 100644 +--- a/tests/symlink-bad-length.at ++++ b/tests/symlink-bad-length.at +@@ -57,7 +57,7 @@ cat stderr | grep -v \ + echo >&2 STDERR + ], + [0], +-[-rw-rw-r-- 1 10029 10031 13 Nov 25 11:52 FILE ++[-rw-rw-r-- 1 10029 10031 13 Nov 25 2014 FILE + ],[STDERR + ]) + +-- +2.1.0 + |