From: Tony Vroon Date: Fri, 9 Jan 2015 11:47:56 +0000 (+0000) Subject: Scavenge upstream bug fixes for heap-based buffer overflow and directory traversal... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa49abc12939f089e5a447ee3d05cfd38a607f02;p=gentoo.git Scavenge upstream bug fixes for heap-based buffer overflow and directory traversal through symlinks. For security bugs #530512 and #536010. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB5058F9A --- diff --git a/app-arch/cpio/ChangeLog b/app-arch/cpio/ChangeLog index 1c26bceb60fe..e55cc2c57499 100644 --- a/app-arch/cpio/ChangeLog +++ b/app-arch/cpio/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/cpio -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.129 2014/08/12 12:18:29 vapier Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.130 2015/01/09 11:47:52 chainsaw Exp $ + +*cpio-2.11-r2 (09 Jan 2015) + + 09 Jan 2015; Tony Vroon +cpio-2.11-r2.ebuild, + +files/cpio-2.11-security.patch: + Scavenge upstream bug fixes for heap-based buffer overflow and directory + traversal through symlinks. For security bugs #530512 and #536010. 12 Aug 2014; Mike Frysinger cpio-2.11-r1.ebuild: Mark arm64/m68k/s390/sh stable. diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest index 10f8fe226583..24ac9be15e32 100644 --- a/app-arch/cpio/Manifest +++ b/app-arch/cpio/Manifest @@ -3,26 +3,18 @@ Hash: SHA256 AUX cpio-2.11-no-gets.patch 811 SHA256 4d5a8cfcc43167ef9ee4b3d463a9c7aedcbd7f89e7bd54d821f8c6c577e6ad6c SHA512 686f25306369017508dba1442c8d4fa671df5f68252861790ec8be68d2c91dce786c5b7069efb07c9bd5dd4d863d3c53d61b3b919f5b7d95f77c90efc9b6532e WHIRLPOOL a5b4f932d83f6e2e92c238995e62e3ac728d34a7a0ff665824d3de47664616cff1833a19ded7032c12ad18992a4217898305f3fc3f76ffd17b7de389dbaf413d AUX cpio-2.11-non-gnu-compilers.patch 415 SHA256 f05e154c11fb13932daae25e323f538ae1cee38bf0e7b7a5f3aabc38abc63d46 SHA512 0071b89aca67a65b5675e23b9fe9c8198db5b84634d3437cae752d4b07371b2c0a14bfcf5fa093af478a23c0679bf44f0571fdd1391c13fd6cd457b8ada19029 WHIRLPOOL 3f9656d4227fd0ce4dceac585004a0dfe679f7d52e395b377215d54707825a3a48fe97324b74f12093c9d27e2a89b8c7895c8d718976e19334040f64d9e02c6f +AUX cpio-2.11-security.patch 9090 SHA256 972c1a804adffe053f2a640b6fd9f2fa6b48c4e41eb60483734065a2261bff9b SHA512 060696d4bc55ec560e8ca53332677f51f1c3a5b99bb61c3a8a2e9d9754e09134b87c1852a02a9611961fd1f9eb5760787c3b30e06ee2e42da9733e0fa252a565 WHIRLPOOL 78da44864536f5a87701eedd9f18485afb03a2e0b2b379d32afed79d631924f0d53669e7c825f9eab1ebf91ae1866dd442fc3a25086875b8d14673df936642f2 AUX cpio-2.11-stat.patch 575 SHA256 b3d317e3c5705d7f9e503f56540baf3cb6dd1d0e9be0261151a5b08378c2d98c SHA512 87fd17c24e53d2286147239a1f588face81290ab6d93c68f8a7e704394c454880972d03a9b24f2d6898bfc9805945566be71b693254863e95469f836d224bba5 WHIRLPOOL 35bac9ac5fb84bb9586357bd74b695f2648e2e00faf6cce6f1f9a086b80ddcdfcabdd1fabda1c03397345f9705d41c0407b77604896250a03e317d0432166e09 DIST cpio-2.11.tar.bz2 1018483 SHA256 bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd SHA512 b6ccb3e121ea29780219d21c9cd6267c2f7b7ae72fb899bb80e1c54cc33e9eac5363443d93dbfbe37e8e8d295dad2724ac607f0543cc62797919605f68c396aa WHIRLPOOL 3e19212f8d5c16de0d531d189fa9fc288ff90d6299c1f3f98f61e182bb0ec278705ae5021c85c7aaeab869ad36b2b3bcd11327a746cde0bf5a596049d711d9cd EBUILD cpio-2.11-r1.ebuild 1184 SHA256 0edab3c3c41c06d227f8af438484440fbc41eafe99934201bd52c374d831a74c SHA512 49c7b36093df3942ad3c14baf2522f3aa204d98e1bb7d459f1da86aa8f71c779d71aed47c9b5481f5a7e6715708e5dfd799846b18c466b832200553fc26e09bf WHIRLPOOL 7d0d9a75fa733df34b901d8cf7ce32c6b244de89917f561b8c4ba19896c87525eb54574df6b7fa36e61a9455ef5fa09d5eabb4bea4423ce172e16a782b9db9ab +EBUILD cpio-2.11-r2.ebuild 1256 SHA256 fc71dfa4675cf3989d902e4aa00026181ba83ba236f9c9916f9ad5ab81f52ad0 SHA512 f553f08a4c78123a3627e409f7d724c0a54005f4a63fb0c07f23f475b6cefce1ced8a42f710f98f8e5635bd3469be474025fcc69d122d96df7f1bff006674b89 WHIRLPOOL 467162a2c53350f9e7196f7e65955222d645004f950882985095c237f00e0234d08073c606d3b9f88795fa24be039b5790159953ac658db49d2e447ca15cf163 EBUILD cpio-2.11.ebuild 934 SHA256 7f497a2cd1b7bd7f331670e20703c3bc50d15ef9091b0178f5a43c1ebb3a0520 SHA512 653b672e74cf1e644009a058480ee770209aeb9d53dee16a253c7b9e65dc91223b8eb1ef48466bae0f969c146a893305cbc11883af37dead93ae8b25019c1006 WHIRLPOOL 9e18e13f0f5ea066a3e08958890f38c28f4ed224209e9064cd33afb32b57226e963621ca7c3169f357a478d41197baac5b739230c04a6feeb7e322e6d23ac80c -MISC ChangeLog 17064 SHA256 260f25613a30d15b5756b03d0de6b79fcf677c96484d89b7704fcb72e56bb15e SHA512 4cebe95a83a6bdd05d3c4ad0a1afad9b8af7c9d412f5b5d9e1083364c3b403ccf6876ac0748bfda4caa2ed110a685632bb42857fc1e033b694ca6c06bf84880f WHIRLPOOL 044c5f3108163e701aad171c88f3a8ca4f7b93002239c4e730aa67ad4205103f8ce9f95171096b4499af53128d873ac26ff1f2bb3014cbab626ca1218d5d32e7 +MISC ChangeLog 17345 SHA256 28fdbe42eebf2a5267ee8422a0866a0e411eab42abef141490e5b169fcef49d2 SHA512 31b15c44f6bf7441c9f485adfd4d66ea8f85fc70cd8211badf497e7e985cba6ee3e9d6679f6b0a23e89174a4198552f4bc2d214f72cfc894ad85693ed4f3d9ea WHIRLPOOL a790a20913577cd2232d005bc2c0914a9fa1549b95e3f11f5a51dd0375802ec97b134ef1ad2ddd73a8310ab48eaa0598eea9ba133d2900a6ea2805395b0262e6 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJT6gYYAAoJEPGu1DbS6WIAxHMP/0YGu07GMml0xq2Idhp8QElA -r1rI5/BWl+EjD1Ez/su4lrvvo+TkVkitaMB8dGxnNwsEsCw2e4m+tYVUCyjsHYB1 -71e1n/NVvlnAIK5jXS21BHf36wrZA6L2WxWG8yV45gbAfr6fVoN1mEiIQcxWcrRj -/6PAgdY0WV7TR67tR2YmKkDubP0qaK6jQg/IOdbwhX3KLHZ3n/okO9v1MpFjdeo6 -Wl4rTqDTLx6NZHXj9wsLJGR/rabJsqlOT1u8aQ/esMnvALsBwv7SUBhfRltSkRk9 -z0H3ETEuvO+VoLFFqoNadKfrWZu+fOCKdbvRc8+jwA3KvZGnKqYlkmaHvIBgu0zA -K8ZpcXtxZssQ5IqFMSApL7uBPqj+EH8EZx5UO9dKRYCTbHcHuspsY49fzakjILAb -A73pgfZ9/AABQfX0BpYEZLI+tVEJkI3vuu1ZjNK5Uck1MuOieBjk1y6wHdvmav9k -wSPzX15E8jUHwYxBG/3xHqe5MzmlGbpiyw+WcOx43nX1OlHNqwAqkPwBjaxhBXpo -qMDUYlTyuHEQQTQprMylv+UfnR4XRACMOSpeXwQtdpK4aEmL/OH1bfhYocGLMGms -aovpyIw70UUskAZqsTAq96F2wXetba3SAzwA21+KL/n416LxnLh6sMwL9qCAlu0Y -bZFtJ7fi3x3lfuQURfmT -=qPr/ +iEYEAREIAAYFAlSvv/oACgkQp5vW4rUFj5r32ACgtx956B7ilEQ0q3DTJM2j8agc +pswAniZlW3w4yIEgQpVm9/nCmiyf8iVb +=aHPz -----END PGP SIGNATURE----- diff --git a/app-arch/cpio/cpio-2.11-r2.ebuild b/app-arch/cpio/cpio-2.11-r2.ebuild new file mode 100644 index 000000000000..9e6f342b3046 --- /dev/null +++ b/app-arch/cpio/cpio-2.11-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11-r2.ebuild,v 1.1 2015/01/09 11:47:52 chainsaw Exp $ + +EAPI="5" + +inherit eutils + +DESCRIPTION="A file archival tool which can also read and write tar files" +HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html" +SRC_URI="mirror://gnu/cpio/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls" + +src_prepare() { + epatch "${FILESDIR}"/${P}-stat.patch #328531 + epatch "${FILESDIR}"/${P}-no-gets.patch #424974 + epatch "${FILESDIR}"/${P}-non-gnu-compilers.patch #275295 + epatch "${FILESDIR}"/${P}-security.patch #530512 #536010 +} + +src_configure() { + econf \ + $(use_enable nls) \ + --bindir="${EPREFIX}"/bin \ + --with-rmt="${EPREFIX}"/usr/sbin/rmt +} + +src_install() { + default + rm "${ED}"/usr/share/man/man1/mt.1 || die + rmdir "${ED}"/usr/libexec || die +} diff --git a/app-arch/cpio/files/cpio-2.11-security.patch b/app-arch/cpio/files/cpio-2.11-security.patch new file mode 100644 index 000000000000..e3ad7a44d000 --- /dev/null +++ b/app-arch/cpio/files/cpio-2.11-security.patch @@ -0,0 +1,266 @@ +diff -uNr cpio-2.11.ORIG/src/copyin.c cpio-2.11/src/copyin.c +--- cpio-2.11.ORIG/src/copyin.c 2015-01-09 11:31:49.017090090 +0000 ++++ cpio-2.11/src/copyin.c 2015-01-09 11:35:37.723092293 +0000 +@@ -124,10 +124,30 @@ + if (pad != 0) + tape_toss_input (in_file_des, pad); + } +- ++ ++static char * ++get_link_name (struct cpio_file_stat *file_hdr, int in_file_des) ++{ ++ char *link_name; ++ ++ if (file_hdr->c_filesize < 0 || file_hdr->c_filesize > SIZE_MAX-1) ++ { ++ error (0, 0, _("%s: stored filename length is out of range"), ++ file_hdr->c_name); ++ link_name = NULL; ++ } ++ else ++ { ++ link_name = xmalloc (file_hdr->c_filesize + 1); ++ tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize); ++ link_name[file_hdr->c_filesize] = '\0'; ++ tape_skip_padding (in_file_des, file_hdr->c_filesize); ++ } ++ return link_name; ++} + + static void +-list_file(struct cpio_file_stat* file_hdr, int in_file_des) ++list_file (struct cpio_file_stat* file_hdr, int in_file_des) + { + if (verbose_flag) + { +@@ -136,21 +156,16 @@ + { + if (archive_format != arf_tar && archive_format != arf_ustar) + { +- char *link_name = NULL; /* Name of hard and symbolic links. */ +- +- link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize + 1); +- link_name[file_hdr->c_filesize] = '\0'; +- tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize); +- long_format (file_hdr, link_name); +- free (link_name); +- tape_skip_padding (in_file_des, file_hdr->c_filesize); +- return; ++ char *link_name = get_link_name (file_hdr, in_file_des); ++ if (link_name) ++ { ++ long_format (file_hdr, link_name); ++ free (link_name); ++ } + } + else +- { +- long_format (file_hdr, file_hdr->c_tar_linkname); +- return; +- } ++ long_format (file_hdr, file_hdr->c_tar_linkname); ++ return; + } + else + #endif +@@ -640,7 +655,7 @@ + } + + static void +-copyin_link(struct cpio_file_stat *file_hdr, int in_file_des) ++copyin_link (struct cpio_file_stat *file_hdr, int in_file_des) + { + char *link_name = NULL; /* Name of hard and symbolic links. */ + int res; /* Result of various function calls. */ +@@ -650,10 +665,9 @@ + + if (archive_format != arf_tar && archive_format != arf_ustar) + { +- link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize + 1); +- link_name[file_hdr->c_filesize] = '\0'; +- tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize); +- tape_skip_padding (in_file_des, file_hdr->c_filesize); ++ link_name = get_link_name (file_hdr, in_file_des); ++ if (!link_name) ++ return; + } + else + { +@@ -1005,7 +1019,7 @@ + + file_hdr->c_tar_linkname = NULL; + +- tape_buffered_read (magic.str, in_des, 6L); ++ tape_buffered_read (magic.str, in_des, sizeof (magic.str)); + while (1) + { + if (append_flag) +@@ -1050,8 +1064,8 @@ + break; + } + bytes_skipped++; +- memmove (magic.str, magic.str + 1, 5); +- tape_buffered_read (magic.str, in_des, 1L); ++ memmove (magic.str, magic.str + 1, sizeof (magic.str) - 1); ++ tape_buffered_read (magic.str + sizeof (magic.str) - 1, in_des, 1L); + } + } + +diff -uNr cpio-2.11.ORIG/src/util.c cpio-2.11/src/util.c +--- cpio-2.11.ORIG/src/util.c 2015-01-09 11:31:49.018090090 +0000 ++++ cpio-2.11/src/util.c 2015-01-09 11:36:55.794093045 +0000 +@@ -206,10 +206,7 @@ + if (input_size < 0) + error (1, errno, _("read error")); + if (input_size == 0) +- { +- error (0, 0, _("premature end of file")); +- exit (1); +- } ++ error (PAXEXIT_FAILURE, 0, _("premature end of file")); + input_bytes += input_size; + } + +diff -uNr cpio-2.11.ORIG/tests/Makefile.am cpio-2.11/tests/Makefile.am +--- cpio-2.11.ORIG/tests/Makefile.am 2015-01-09 11:31:49.020090090 +0000 ++++ cpio-2.11/tests/Makefile.am 2015-01-09 11:34:05.121091401 +0000 +@@ -52,6 +52,8 @@ + setstat04.at\ + setstat05.at\ + symlink.at\ ++ symlink-bad-length.at\ ++ symlink-long.at\ + version.at + + TESTSUITE = $(srcdir)/testsuite +diff -uNr cpio-2.11.ORIG/tests/symlink-bad-length.at cpio-2.11/tests/symlink-bad-length.at +--- cpio-2.11.ORIG/tests/symlink-bad-length.at 1970-01-01 01:00:00.000000000 +0100 ++++ cpio-2.11/tests/symlink-bad-length.at 2015-01-09 11:35:52.124092432 +0000 +@@ -0,0 +1,64 @@ ++# Process this file with autom4te to create testsuite. -*- Autotest -*- ++# Copyright (C) 2014 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301 USA. ++ ++# Cpio v2.11 did segfault with badly set symlink length. ++# References: ++# http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg00007.html ++ ++AT_SETUP([symlink-bad-length]) ++AT_KEYWORDS([symlink-long copyout]) ++ ++AT_DATA([ARCHIVE.base64], ++[x3EjAIBAtIEtJy8nAQAAAHRUYW0FAAAADQBGSUxFAABzb21lIGNvbnRlbnQKAMdxIwBgQ/+hLScv ++JwEAAAB0VEhuBQD/////TElOSwAARklMRcdxAAAAAAAAAAAAAAEAAAAAAAAACwAAAAAAVFJBSUxF ++UiEhIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= ++]) ++ ++# The exact error message and exit status depend on the host architecture, ++# therefore strderr is filtered out and error code is not checked. ++ ++# So far the only case when cpio would exit with code 0 is when it skips ++# several bytes and encounters a valid record header. Perhaps it should ++# exit with code 2 (non-critical error), if at least one byte was skipped, ++# but that could hurt backward compatibility. ++ ++AT_CHECK([ ++base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST ++TZ=UTC cpio -ntv < ARCHIVE 2>stderr ++cat stderr | grep -v \ ++ -e 'stored filename length is out of range' \ ++ -e 'premature end of file' \ ++ -e 'archive header has reverse byte-order' \ ++ -e 'memory exhausted' \ ++ -e 'skipped [[0-9][0-9]*] bytes of junk' \ ++ -e '[[0-9][0-9]*] block' \ ++ >&2 ++echo >&2 STDERR ++], ++[0], ++[-rw-rw-r-- 1 10029 10031 13 Nov 25 11:52 FILE ++],[STDERR ++]) ++ ++AT_CLEANUP +diff -uNr cpio-2.11.ORIG/tests/symlink-long.at cpio-2.11/tests/symlink-long.at +--- cpio-2.11.ORIG/tests/symlink-long.at 1970-01-01 01:00:00.000000000 +0100 ++++ cpio-2.11/tests/symlink-long.at 2015-01-09 11:32:53.908090715 +0000 +@@ -0,0 +1,46 @@ ++# Process this file with autom4te to create testsuite. -*- Autotest -*- ++# Copyright (C) 2014 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301 USA. ++ ++# Cpio v2.11.90 changed the way symlink name is read from archive. ++# References: ++# http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg00007.html ++ ++AT_SETUP([symlink-long]) ++AT_KEYWORDS([symlink-long copyout]) ++ ++AT_CHECK([ ++ ++# len(dirname) > READBUFSIZE ++dirname= ++for i in {1..52}; do ++ dirname="xxxxxxxxx/$dirname" ++ mkdir "$dirname" ++done ++ln -s "$dirname" x || AT_SKIP_TEST ++ ++echo x | cpio -o > ar ++list=`cpio -tv < ar | sed 's|.*-> ||'` ++test "$list" = "$dirname" && echo success || echo fail ++], ++[0], ++[success ++],[2 blocks ++2 blocks ++]) ++ ++AT_CLEANUP +diff -uNr cpio-2.11.ORIG/tests/testsuite.at cpio-2.11/tests/testsuite.at +--- cpio-2.11.ORIG/tests/testsuite.at 2015-01-09 11:31:49.020090090 +0000 ++++ cpio-2.11/tests/testsuite.at 2015-01-09 11:34:34.386091683 +0000 +@@ -31,6 +31,8 @@ + + m4_include([inout.at]) + m4_include([symlink.at]) ++m4_include([symlink-bad-length.at]) ++m4_include([symlink-long.at]) + m4_include([interdir.at]) + + m4_include([setstat01.at])