Date: Wednesday, March 18, 2015 @ 17:29:13 Author: tpowa Revision: 234108
archrelease: copy trunk to testing-i686, testing-x86_64 Added: cpio/repos/testing-i686/ cpio/repos/testing-i686/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch (from rev 234107, cpio/trunk/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch) cpio/repos/testing-x86_64/ cpio/repos/testing-x86_64/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch (from rev 234107, cpio/trunk/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch) Deleted: cpio/repos/testing-i686/PKGBUILD cpio/repos/testing-i686/cpio-2.11-CVE-2014-9112.patch cpio/repos/testing-i686/cpio-2.11-stdio.in.patch cpio/repos/testing-i686/cpio-2.11-testsuite-CVE-2014-9112.patch cpio/repos/testing-i686/cpio.install cpio/repos/testing-x86_64/PKGBUILD cpio/repos/testing-x86_64/cpio-2.11-CVE-2014-9112.patch cpio/repos/testing-x86_64/cpio-2.11-stdio.in.patch cpio/repos/testing-x86_64/cpio-2.11-testsuite-CVE-2014-9112.patch cpio/repos/testing-x86_64/cpio.install -----------------------------------------------------------------+ testing-i686/PKGBUILD | 49 -- testing-i686/cpio-2.11-CVE-2014-9112.patch | 212 ---------- testing-i686/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch | 152 +++++++ testing-i686/cpio-2.11-stdio.in.patch | 13 testing-i686/cpio-2.11-testsuite-CVE-2014-9112.patch | 30 - testing-i686/cpio.install | 21 testing-x86_64/PKGBUILD | 49 -- testing-x86_64/cpio-2.11-CVE-2014-9112.patch | 212 ---------- testing-x86_64/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch | 152 +++++++ testing-x86_64/cpio-2.11-stdio.in.patch | 13 testing-x86_64/cpio-2.11-testsuite-CVE-2014-9112.patch | 30 - testing-x86_64/cpio.install | 21 12 files changed, 304 insertions(+), 650 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2014-12-16 15:53:36 UTC (rev 227655) +++ testing-i686/PKGBUILD 2015-03-18 16:29:13 UTC (rev 234108) @@ -1,49 +0,0 @@ -# $Id$ -# Maintainer: judd <jvi...@zeroflux.org> -pkgname=cpio -pkgver=2.11 -pkgrel=5 -pkgdesc="A tool to copy files into or out of a cpio or tar archive" -arch=(i686 x86_64) -license=('GPL') -url="http://www.gnu.org/software/cpio" -depends=('glibc') -source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz - cpio-2.11-stdio.in.patch - cpio-2.11-CVE-2014-9112.patch - cpio-2.11-testsuite-CVE-2014-9112.patch) -install=cpio.install -md5sums=('1112bb6c45863468b5496ba128792f6c' - 'd7e58f2a1ec286febd09ea75042cf96e' - '2541e37b85cb7baffc3a3f687453737c' - '348870bebae57146eafeb189adbd43a4') - -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/cpio-2.11-stdio.in.patch - # from fedora git - patch -Np1 -i ${srcdir}/cpio-2.11-CVE-2014-9112.patch - patch -Np1 -i ${srcdir}/cpio-2.11-testsuite-CVE-2014-9112.patch -} - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - rm -f ${pkgdir}/usr/bin/mt ${pkgdir}/pkg/usr/share/man/man1/mt.1 - rm -rf ${pkgdir}/usr/libexec - # remove mt manpage it conflicts with mt-st from extra - rm $pkgdir/usr/share/man/man1/mt.1 || return 1 - # remove infodir - rm $pkgdir/usr/share/info/dir -} Deleted: testing-i686/cpio-2.11-CVE-2014-9112.patch =================================================================== --- testing-i686/cpio-2.11-CVE-2014-9112.patch 2014-12-16 15:53:36 UTC (rev 227655) +++ testing-i686/cpio-2.11-CVE-2014-9112.patch 2015-03-18 16:29:13 UTC (rev 234108) @@ -1,212 +0,0 @@ -diff --git a/src/copyin.c b/src/copyin.c -index d505407..db8ee66 100644 ---- a/src/copyin.c -+++ b/src/copyin.c -@@ -124,10 +124,30 @@ tape_skip_padding (int in_file_des, off_t offset) - 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 @@ list_file(struct cpio_file_stat* file_hdr, int in_file_des) - { - 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 -@@ -650,10 +665,7 @@ copyin_link(struct cpio_file_stat *file_hdr, int in_file_des) - - 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); - } - else - { -diff --git a/tests/Makefile.am b/tests/Makefile.am -index b3e8e60..cf186da 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -52,6 +52,8 @@ TESTSUITE_AT = \ - setstat04.at\ - setstat05.at\ - symlink.at\ -+ symlink-bad-length.at\ -+ symlink-long.at\ - version.at - - TESTSUITE = $(srcdir)/testsuite -diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at -new file mode 100644 -index 0000000..cbf4aa7 ---- /dev/null -+++ b/tests/symlink-bad-length.at -@@ -0,0 +1,49 @@ -+# 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= -+]) -+ -+AT_CHECK([ -+base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST -+cpio -ntv < ARCHIVE -+test $? -eq 2 -+], -+[0], -+[-rw-rw-r-- 1 10029 10031 13 Nov 25 13:52 FILE -+],[cpio: LINK: stored filename length is out of range -+cpio: premature end of file -+]) -+ -+AT_CLEANUP -diff --git a/tests/symlink-long.at b/tests/symlink-long.at -new file mode 100644 -index 0000000..d3def2d ---- /dev/null -+++ b/tests/symlink-long.at -@@ -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 --git a/tests/testsuite.at b/tests/testsuite.at -index 8f3330b..590bdcb 100644 ---- a/tests/testsuite.at -+++ b/tests/testsuite.at -@@ -31,6 +31,8 @@ m4_include([version.at]) - - 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]) Copied: cpio/repos/testing-i686/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch (from rev 234107, cpio/trunk/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch) =================================================================== --- testing-i686/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch (rev 0) +++ testing-i686/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch 2015-03-18 16:29:13 UTC (rev 234108) @@ -0,0 +1,152 @@ +Index: cpio-2.11/src/copyin.c +=================================================================== +--- cpio-2.11.orig/src/copyin.c 2014-07-01 14:02:39.991007263 +0200 ++++ cpio-2.11/src/copyin.c 2014-07-22 16:05:28.171344584 +0200 +@@ -686,6 +686,51 @@ copyin_link(struct cpio_file_stat *file_ + free (link_name); + } + ++ ++static int ++path_contains_symlink(char *path) ++{ ++ struct stat st; ++ char *slash; ++ char *nextslash; ++ ++ /* we got NULL pointer or empty string */ ++ if (!path || !*path) { ++ return false; ++ } ++ ++ slash = path; ++ ++ while ((nextslash = strchr(slash + 1, '/')) != NULL) { ++ slash = nextslash; ++ *slash = '\0'; ++ ++ if (lstat(path, &st) != 0) { ++ if (errno == ELOOP) { ++ /* ELOOP - too many symlinks */ ++ *slash = '/'; ++ return true; ++ } else if (errno == ENOMEM) { ++ /* No memory for lstat - terminate */ ++ xalloc_die(); ++ } else { ++ /* cannot lstat path - give up */ ++ *slash = '/'; ++ return false; ++ } ++ } ++ ++ if (S_ISLNK(st.st_mode)) { ++ *slash = '/'; ++ return true; ++ } ++ ++ *slash = '/'; ++ } ++ ++ return false; ++} ++ + static void + copyin_file (struct cpio_file_stat *file_hdr, int in_file_des) + { +@@ -1463,6 +1508,23 @@ process_copy_in () + { + /* Copy the input file into the directory structure. */ + ++ /* Can we write files over symlinks? */ ++ if (!extract_over_symlinks) ++ { ++ if (path_contains_symlink(file_hdr.c_name)) ++ { ++ /* skip the file */ ++ /* ++ fprintf(stderr, "Can't write over symlinks. Skipping %s\n", file_hdr.c_name); ++ tape_toss_input (in_file_des, file_hdr.c_filesize); ++ tape_skip_padding (in_file_des, file_hdr.c_filesize); ++ continue; ++ */ ++ /* terminate */ ++ error (1, 0, _("Can't write over symlinks: %s\n"), file_hdr.c_name); ++ } ++ } ++ + /* Do we need to rename the file? */ + if (rename_flag || rename_batch_file) + { +Index: cpio-2.11/src/global.c +=================================================================== +--- cpio-2.11.orig/src/global.c 2014-07-17 16:33:09.768900927 +0200 ++++ cpio-2.11/src/global.c 2014-07-21 17:45:58.563494706 +0200 +@@ -187,6 +187,9 @@ bool to_stdout_option = false; + /* The name this program was run with. */ + char *program_name; + ++/* Extract files over symbolic links */ ++bool extract_over_symlinks; ++ + /* A pointer to either lstat or stat, depending on whether + dereferencing of symlinks is done for input files. */ + int (*xstat) (); +Index: cpio-2.11/src/main.c +=================================================================== +--- cpio-2.11.orig/src/main.c 2014-07-01 14:02:39.840005051 +0200 ++++ cpio-2.11/src/main.c 2014-07-17 20:33:47.839215571 +0200 +@@ -57,7 +57,8 @@ enum cpio_options { + FORCE_LOCAL_OPTION, + DEBUG_OPTION, + BLOCK_SIZE_OPTION, +- TO_STDOUT_OPTION ++ TO_STDOUT_OPTION, ++ EXTRACT_OVER_SYMLINKS + }; + + const char *program_authors[] = +@@ -222,6 +223,8 @@ static struct argp_option options[] = { + N_("Create leading directories where needed"), GRID+1 }, + {"no-preserve-owner", NO_PRESERVE_OWNER_OPTION, 0, 0, + N_("Do not change the ownership of the files"), GRID+1 }, ++ {"extract-over-symlinks", EXTRACT_OVER_SYMLINKS, 0, 0, ++ N_("Force writing over symbolic links"), GRID+1 }, + {"unconditional", 'u', NULL, 0, + N_("Replace all files unconditionally"), GRID+1 }, + {"sparse", SPARSE_OPTION, NULL, 0, +@@ -413,6 +416,10 @@ crc newc odc bin ustar tar (all-caps als + no_chown_flag = true; + break; + ++ case EXTRACT_OVER_SYMLINKS: /* --extract-over-symlinks */ ++ extract_over_symlinks = true; ++ break; ++ + case 'o': /* Copy-out mode. */ + if (copy_function != 0) + error (PAXEXIT_FAILURE, 0, _("Mode already defined")); +Index: cpio-2.11/src/extern.h +=================================================================== +--- cpio-2.11.orig/src/extern.h 2014-07-01 14:02:39.907006032 +0200 ++++ cpio-2.11/src/extern.h 2014-07-17 17:11:20.948908806 +0200 +@@ -95,6 +95,7 @@ extern char input_is_special; + extern char output_is_special; + extern char input_is_seekable; + extern char output_is_seekable; ++extern bool extract_over_symlinks; + extern int (*xstat) (); + extern void (*copy_function) (); + +Index: cpio-2.11/doc/cpio.1 +=================================================================== +--- cpio-2.11.orig/doc/cpio.1 2009-02-14 19:15:50.000000000 +0100 ++++ cpio-2.11/doc/cpio.1 2014-07-21 23:00:33.878746855 +0200 +@@ -22,6 +22,7 @@ cpio \- copy files to and from archives + [\-\-owner=[user][:.][group]] [\-\-no-preserve-owner] [\-\-message=message] + [\-\-force\-local] [\-\-no\-absolute\-filenames] [\-\-sparse] + [\-\-only\-verify\-crc] [\-\-to\-stdout] [\-\-quiet] [\-\-rsh-command=command] ++[\-\-extract\-over\-symlinks] + [\-\-help] [\-\-version] [pattern...] [< archive] + + .B cpio Deleted: testing-i686/cpio-2.11-stdio.in.patch =================================================================== --- testing-i686/cpio-2.11-stdio.in.patch 2014-12-16 15:53:36 UTC (rev 227655) +++ testing-i686/cpio-2.11-stdio.in.patch 2015-03-18 16:29:13 UTC (rev 234108) @@ -1,13 +0,0 @@ -diff -urNp cpio-2.11-orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h ---- cpio-2.11-orig/gnu/stdio.in.h 2010-03-10 10:27:03.000000000 +0100 -+++ cpio-2.11/gnu/stdio.in.h 2012-06-04 10:23:23.804471185 +0200 -@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ Deleted: testing-i686/cpio-2.11-testsuite-CVE-2014-9112.patch =================================================================== --- testing-i686/cpio-2.11-testsuite-CVE-2014-9112.patch 2014-12-16 15:53:36 UTC (rev 227655) +++ testing-i686/cpio-2.11-testsuite-CVE-2014-9112.patch 2015-03-18 16:29:13 UTC (rev 234108) @@ -1,30 +0,0 @@ -diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at -index cbf4aa7..d8d250b 100644 ---- a/tests/symlink-bad-length.at -+++ b/tests/symlink-bad-length.at -@@ -37,13 +37,20 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - - AT_CHECK([ - base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST --cpio -ntv < ARCHIVE --test $? -eq 2 -+TZ=UTC cpio -ntv < ARCHIVE 2>stderr -+rc=$? -+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' \ -+ >&2 -+echo >&2 STDERR -+test "$rc" -ne 0 - ], - [0], --[-rw-rw-r-- 1 10029 10031 13 Nov 25 13:52 FILE --],[cpio: LINK: stored filename length is out of range --cpio: premature end of file -+[-rw-rw-r-- 1 10029 10031 13 Nov 25 11:52 FILE -+],[STDERR - ]) - - AT_CLEANUP Deleted: testing-i686/cpio.install =================================================================== --- testing-i686/cpio.install 2014-12-16 15:53:36 UTC (rev 227655) +++ testing-i686/cpio.install 2015-03-18 16:29:13 UTC (rev 234108) @@ -1,21 +0,0 @@ -infodir=/usr/share/info -filelist=(cpio.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2014-12-16 15:53:36 UTC (rev 227655) +++ testing-x86_64/PKGBUILD 2015-03-18 16:29:13 UTC (rev 234108) @@ -1,49 +0,0 @@ -# $Id$ -# Maintainer: judd <jvi...@zeroflux.org> -pkgname=cpio -pkgver=2.11 -pkgrel=5 -pkgdesc="A tool to copy files into or out of a cpio or tar archive" -arch=(i686 x86_64) -license=('GPL') -url="http://www.gnu.org/software/cpio" -depends=('glibc') -source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz - cpio-2.11-stdio.in.patch - cpio-2.11-CVE-2014-9112.patch - cpio-2.11-testsuite-CVE-2014-9112.patch) -install=cpio.install -md5sums=('1112bb6c45863468b5496ba128792f6c' - 'd7e58f2a1ec286febd09ea75042cf96e' - '2541e37b85cb7baffc3a3f687453737c' - '348870bebae57146eafeb189adbd43a4') - -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/cpio-2.11-stdio.in.patch - # from fedora git - patch -Np1 -i ${srcdir}/cpio-2.11-CVE-2014-9112.patch - patch -Np1 -i ${srcdir}/cpio-2.11-testsuite-CVE-2014-9112.patch -} - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - rm -f ${pkgdir}/usr/bin/mt ${pkgdir}/pkg/usr/share/man/man1/mt.1 - rm -rf ${pkgdir}/usr/libexec - # remove mt manpage it conflicts with mt-st from extra - rm $pkgdir/usr/share/man/man1/mt.1 || return 1 - # remove infodir - rm $pkgdir/usr/share/info/dir -} Deleted: testing-x86_64/cpio-2.11-CVE-2014-9112.patch =================================================================== --- testing-x86_64/cpio-2.11-CVE-2014-9112.patch 2014-12-16 15:53:36 UTC (rev 227655) +++ testing-x86_64/cpio-2.11-CVE-2014-9112.patch 2015-03-18 16:29:13 UTC (rev 234108) @@ -1,212 +0,0 @@ -diff --git a/src/copyin.c b/src/copyin.c -index d505407..db8ee66 100644 ---- a/src/copyin.c -+++ b/src/copyin.c -@@ -124,10 +124,30 @@ tape_skip_padding (int in_file_des, off_t offset) - 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 @@ list_file(struct cpio_file_stat* file_hdr, int in_file_des) - { - 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 -@@ -650,10 +665,7 @@ copyin_link(struct cpio_file_stat *file_hdr, int in_file_des) - - 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); - } - else - { -diff --git a/tests/Makefile.am b/tests/Makefile.am -index b3e8e60..cf186da 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -52,6 +52,8 @@ TESTSUITE_AT = \ - setstat04.at\ - setstat05.at\ - symlink.at\ -+ symlink-bad-length.at\ -+ symlink-long.at\ - version.at - - TESTSUITE = $(srcdir)/testsuite -diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at -new file mode 100644 -index 0000000..cbf4aa7 ---- /dev/null -+++ b/tests/symlink-bad-length.at -@@ -0,0 +1,49 @@ -+# 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= -+]) -+ -+AT_CHECK([ -+base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST -+cpio -ntv < ARCHIVE -+test $? -eq 2 -+], -+[0], -+[-rw-rw-r-- 1 10029 10031 13 Nov 25 13:52 FILE -+],[cpio: LINK: stored filename length is out of range -+cpio: premature end of file -+]) -+ -+AT_CLEANUP -diff --git a/tests/symlink-long.at b/tests/symlink-long.at -new file mode 100644 -index 0000000..d3def2d ---- /dev/null -+++ b/tests/symlink-long.at -@@ -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 --git a/tests/testsuite.at b/tests/testsuite.at -index 8f3330b..590bdcb 100644 ---- a/tests/testsuite.at -+++ b/tests/testsuite.at -@@ -31,6 +31,8 @@ m4_include([version.at]) - - 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]) Copied: cpio/repos/testing-x86_64/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch (from rev 234107, cpio/trunk/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch) =================================================================== --- testing-x86_64/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch (rev 0) +++ testing-x86_64/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch 2015-03-18 16:29:13 UTC (rev 234108) @@ -0,0 +1,152 @@ +Index: cpio-2.11/src/copyin.c +=================================================================== +--- cpio-2.11.orig/src/copyin.c 2014-07-01 14:02:39.991007263 +0200 ++++ cpio-2.11/src/copyin.c 2014-07-22 16:05:28.171344584 +0200 +@@ -686,6 +686,51 @@ copyin_link(struct cpio_file_stat *file_ + free (link_name); + } + ++ ++static int ++path_contains_symlink(char *path) ++{ ++ struct stat st; ++ char *slash; ++ char *nextslash; ++ ++ /* we got NULL pointer or empty string */ ++ if (!path || !*path) { ++ return false; ++ } ++ ++ slash = path; ++ ++ while ((nextslash = strchr(slash + 1, '/')) != NULL) { ++ slash = nextslash; ++ *slash = '\0'; ++ ++ if (lstat(path, &st) != 0) { ++ if (errno == ELOOP) { ++ /* ELOOP - too many symlinks */ ++ *slash = '/'; ++ return true; ++ } else if (errno == ENOMEM) { ++ /* No memory for lstat - terminate */ ++ xalloc_die(); ++ } else { ++ /* cannot lstat path - give up */ ++ *slash = '/'; ++ return false; ++ } ++ } ++ ++ if (S_ISLNK(st.st_mode)) { ++ *slash = '/'; ++ return true; ++ } ++ ++ *slash = '/'; ++ } ++ ++ return false; ++} ++ + static void + copyin_file (struct cpio_file_stat *file_hdr, int in_file_des) + { +@@ -1463,6 +1508,23 @@ process_copy_in () + { + /* Copy the input file into the directory structure. */ + ++ /* Can we write files over symlinks? */ ++ if (!extract_over_symlinks) ++ { ++ if (path_contains_symlink(file_hdr.c_name)) ++ { ++ /* skip the file */ ++ /* ++ fprintf(stderr, "Can't write over symlinks. Skipping %s\n", file_hdr.c_name); ++ tape_toss_input (in_file_des, file_hdr.c_filesize); ++ tape_skip_padding (in_file_des, file_hdr.c_filesize); ++ continue; ++ */ ++ /* terminate */ ++ error (1, 0, _("Can't write over symlinks: %s\n"), file_hdr.c_name); ++ } ++ } ++ + /* Do we need to rename the file? */ + if (rename_flag || rename_batch_file) + { +Index: cpio-2.11/src/global.c +=================================================================== +--- cpio-2.11.orig/src/global.c 2014-07-17 16:33:09.768900927 +0200 ++++ cpio-2.11/src/global.c 2014-07-21 17:45:58.563494706 +0200 +@@ -187,6 +187,9 @@ bool to_stdout_option = false; + /* The name this program was run with. */ + char *program_name; + ++/* Extract files over symbolic links */ ++bool extract_over_symlinks; ++ + /* A pointer to either lstat or stat, depending on whether + dereferencing of symlinks is done for input files. */ + int (*xstat) (); +Index: cpio-2.11/src/main.c +=================================================================== +--- cpio-2.11.orig/src/main.c 2014-07-01 14:02:39.840005051 +0200 ++++ cpio-2.11/src/main.c 2014-07-17 20:33:47.839215571 +0200 +@@ -57,7 +57,8 @@ enum cpio_options { + FORCE_LOCAL_OPTION, + DEBUG_OPTION, + BLOCK_SIZE_OPTION, +- TO_STDOUT_OPTION ++ TO_STDOUT_OPTION, ++ EXTRACT_OVER_SYMLINKS + }; + + const char *program_authors[] = +@@ -222,6 +223,8 @@ static struct argp_option options[] = { + N_("Create leading directories where needed"), GRID+1 }, + {"no-preserve-owner", NO_PRESERVE_OWNER_OPTION, 0, 0, + N_("Do not change the ownership of the files"), GRID+1 }, ++ {"extract-over-symlinks", EXTRACT_OVER_SYMLINKS, 0, 0, ++ N_("Force writing over symbolic links"), GRID+1 }, + {"unconditional", 'u', NULL, 0, + N_("Replace all files unconditionally"), GRID+1 }, + {"sparse", SPARSE_OPTION, NULL, 0, +@@ -413,6 +416,10 @@ crc newc odc bin ustar tar (all-caps als + no_chown_flag = true; + break; + ++ case EXTRACT_OVER_SYMLINKS: /* --extract-over-symlinks */ ++ extract_over_symlinks = true; ++ break; ++ + case 'o': /* Copy-out mode. */ + if (copy_function != 0) + error (PAXEXIT_FAILURE, 0, _("Mode already defined")); +Index: cpio-2.11/src/extern.h +=================================================================== +--- cpio-2.11.orig/src/extern.h 2014-07-01 14:02:39.907006032 +0200 ++++ cpio-2.11/src/extern.h 2014-07-17 17:11:20.948908806 +0200 +@@ -95,6 +95,7 @@ extern char input_is_special; + extern char output_is_special; + extern char input_is_seekable; + extern char output_is_seekable; ++extern bool extract_over_symlinks; + extern int (*xstat) (); + extern void (*copy_function) (); + +Index: cpio-2.11/doc/cpio.1 +=================================================================== +--- cpio-2.11.orig/doc/cpio.1 2009-02-14 19:15:50.000000000 +0100 ++++ cpio-2.11/doc/cpio.1 2014-07-21 23:00:33.878746855 +0200 +@@ -22,6 +22,7 @@ cpio \- copy files to and from archives + [\-\-owner=[user][:.][group]] [\-\-no-preserve-owner] [\-\-message=message] + [\-\-force\-local] [\-\-no\-absolute\-filenames] [\-\-sparse] + [\-\-only\-verify\-crc] [\-\-to\-stdout] [\-\-quiet] [\-\-rsh-command=command] ++[\-\-extract\-over\-symlinks] + [\-\-help] [\-\-version] [pattern...] [< archive] + + .B cpio Deleted: testing-x86_64/cpio-2.11-stdio.in.patch =================================================================== --- testing-x86_64/cpio-2.11-stdio.in.patch 2014-12-16 15:53:36 UTC (rev 227655) +++ testing-x86_64/cpio-2.11-stdio.in.patch 2015-03-18 16:29:13 UTC (rev 234108) @@ -1,13 +0,0 @@ -diff -urNp cpio-2.11-orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h ---- cpio-2.11-orig/gnu/stdio.in.h 2010-03-10 10:27:03.000000000 +0100 -+++ cpio-2.11/gnu/stdio.in.h 2012-06-04 10:23:23.804471185 +0200 -@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ Deleted: testing-x86_64/cpio-2.11-testsuite-CVE-2014-9112.patch =================================================================== --- testing-x86_64/cpio-2.11-testsuite-CVE-2014-9112.patch 2014-12-16 15:53:36 UTC (rev 227655) +++ testing-x86_64/cpio-2.11-testsuite-CVE-2014-9112.patch 2015-03-18 16:29:13 UTC (rev 234108) @@ -1,30 +0,0 @@ -diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at -index cbf4aa7..d8d250b 100644 ---- a/tests/symlink-bad-length.at -+++ b/tests/symlink-bad-length.at -@@ -37,13 +37,20 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - - AT_CHECK([ - base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST --cpio -ntv < ARCHIVE --test $? -eq 2 -+TZ=UTC cpio -ntv < ARCHIVE 2>stderr -+rc=$? -+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' \ -+ >&2 -+echo >&2 STDERR -+test "$rc" -ne 0 - ], - [0], --[-rw-rw-r-- 1 10029 10031 13 Nov 25 13:52 FILE --],[cpio: LINK: stored filename length is out of range --cpio: premature end of file -+[-rw-rw-r-- 1 10029 10031 13 Nov 25 11:52 FILE -+],[STDERR - ]) - - AT_CLEANUP Deleted: testing-x86_64/cpio.install =================================================================== --- testing-x86_64/cpio.install 2014-12-16 15:53:36 UTC (rev 227655) +++ testing-x86_64/cpio.install 2015-03-18 16:29:13 UTC (rev 234108) @@ -1,21 +0,0 @@ -infodir=/usr/share/info -filelist=(cpio.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} -