From 9ae1e920718e95577c12de890754b6a6a4ff70a1 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 17 Jun 2015 22:13:33 -0400
Subject: gnu: cpio: Fix symlink-bad-length test.

* gnu/packages/patches/cpio-fix-symlink-bad-length-test.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/cpio.scm (cpio): Add patch.
---
 .../patches/cpio-fix-symlink-bad-length-test.patch | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 gnu/packages/patches/cpio-fix-symlink-bad-length-test.patch

(limited to 'gnu/packages/patches/cpio-fix-symlink-bad-length-test.patch')

diff --git a/gnu/packages/patches/cpio-fix-symlink-bad-length-test.patch b/gnu/packages/patches/cpio-fix-symlink-bad-length-test.patch
new file mode 100644
index 0000000000..58a5a478c9
--- /dev/null
+++ b/gnu/packages/patches/cpio-fix-symlink-bad-length-test.patch
@@ -0,0 +1,44 @@
+From bebf9662c406d1d137a66c567d8748b489d352e7 Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup <praiskup@redhat.com>
+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/THANKS b/THANKS
+index 45b0dfb..3228df9 100644
+--- a/THANKS
++++ b/THANKS
+@@ -23,6 +23,7 @@ Mitsuru Chinen		<mchinen@yamato.ibm.com>
+ Peter Breitenlohner     <peb@mppmu.mpg.de>
+ Peter Vrabec            <pvrabec@redhat.com>
+ Robert Millan           <rmh@aybabtu.com>
++Victor Rodriguez        <vm.rod25@gmail.com>
+ 
+ Local Variables:
+ mode: Fundamental
+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
-- 
cgit v1.2.3