nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Mark H Weaver 2015-06-17 22:13:33 -04:00
parent a2ee6cbea2
commit 9ae1e92071
3 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu-system.am
View File

@ -402,6 +402,7 @@ dist_patch_DATA = \
gnu/packages/patches/cpio-CVE-2014-9112-pt3.patch \ gnu/packages/patches/cpio-CVE-2014-9112-pt3.patch \
gnu/packages/patches/cpio-CVE-2014-9112-pt4.patch \ gnu/packages/patches/cpio-CVE-2014-9112-pt4.patch \
gnu/packages/patches/cpio-CVE-2014-9112-pt5.patch \ gnu/packages/patches/cpio-CVE-2014-9112-pt5.patch \
gnu/packages/patches/cpio-fix-symlink-bad-length-test.patch \
gnu/packages/patches/cpio-gets-undeclared.patch \ gnu/packages/patches/cpio-gets-undeclared.patch \
gnu/packages/patches/cpufrequtils-fix-aclocal.patch \ gnu/packages/patches/cpufrequtils-fix-aclocal.patch \
gnu/packages/patches/crossmap-allow-system-pysam.patch \ gnu/packages/patches/crossmap-allow-system-pysam.patch \

14
gnu/packages/cpio.scm
View File

@ -36,12 +36,14 @@
(sha256 (sha256
(base32 (base32
"1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv")) "1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv"))
(patches (list (search-patch "cpio-CVE-2014-9112-pt1.patch") (patches (map search-patch
(search-patch "cpio-CVE-2014-9112-pt2.patch") '("cpio-CVE-2014-9112-pt1.patch"
(search-patch "cpio-CVE-2014-9112-pt3.patch") "cpio-CVE-2014-9112-pt2.patch"
(search-patch "cpio-CVE-2014-9112-pt4.patch") "cpio-CVE-2014-9112-pt3.patch"
(search-patch "cpio-CVE-2014-9112-pt5.patch") "cpio-CVE-2014-9112-pt4.patch"
(search-patch "cpio-gets-undeclared.patch"))))) "cpio-CVE-2014-9112-pt5.patch"
"cpio-fix-symlink-bad-length-test.patch"
"cpio-gets-undeclared.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; FIXME: autoconf is needed to run autom4te, to update to test suite ;; FIXME: autoconf is needed to run autom4te, to update to test suite

44
gnu/packages/patches/cpio-fix-symlink-bad-length-test.patch Normal file
View File

@ -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