From owner-svn-ports-all@freebsd.org Fri Nov 15 22:47:27 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B40931B2763; Fri, 15 Nov 2019 22:47:27 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47FD4v4QTXz4VRS; Fri, 15 Nov 2019 22:47:27 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B3A71FEB9; Fri, 15 Nov 2019 22:47:27 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAFMlRtN036821; Fri, 15 Nov 2019 22:47:27 GMT (envelope-from naddy@FreeBSD.org) Received: (from naddy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAFMlPLI036811; Fri, 15 Nov 2019 22:47:25 GMT (envelope-from naddy@FreeBSD.org) Message-Id: <201911152247.xAFMlPLI036811@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: naddy set sender to naddy@FreeBSD.org using -f From: Christian Weisgerber Date: Fri, 15 Nov 2019 22:47:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517705 - in head/archivers/gcpio: . files X-SVN-Group: ports-head X-SVN-Commit-Author: naddy X-SVN-Commit-Paths: in head/archivers/gcpio: . files X-SVN-Commit-Revision: 517705 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2019 22:47:27 -0000 Author: naddy Date: Fri Nov 15 22:47:25 2019 New Revision: 517705 URL: https://svnweb.freebsd.org/changeset/ports/517705 Log: Security update to 2.13: * Fix CVE-2015-1197 * Fix CVE-2016-2037 * Fix CVE-2019-14866 * Remove --extract-over-symlinks option again, which was part of an earlier third-party fix for CVE-2015-1197. Security: f59af308-07f3-11ea-8c56-f8b156b6dcc8 Added: head/archivers/gcpio/files/patch-src_util.c (contents, props changed) head/archivers/gcpio/files/patch-tests_symlink-bad-length.at (contents, props changed) Deleted: head/archivers/gcpio/files/patch-po_Makefile.in.in head/archivers/gcpio/files/patch-src_copyin.c head/archivers/gcpio/files/patch-src_extern.h head/archivers/gcpio/files/patch-src_global.c head/archivers/gcpio/files/patch-src_main.c head/archivers/gcpio/files/patch-tests_symlink-long.at Modified: head/archivers/gcpio/Makefile head/archivers/gcpio/distinfo head/archivers/gcpio/files/patch-doc_cpio.1 head/archivers/gcpio/files/patch-gnu_Makefile.in head/archivers/gcpio/pkg-plist Modified: head/archivers/gcpio/Makefile ============================================================================== --- head/archivers/gcpio/Makefile Fri Nov 15 22:46:16 2019 (r517704) +++ head/archivers/gcpio/Makefile Fri Nov 15 22:47:25 2019 (r517705) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cpio -PORTVERSION= 2.12 -PORTREVISION= 1 +PORTVERSION= 2.13 CATEGORIES= archivers MASTER_SITES= GNU PKGNAMEPREFIX= g @@ -11,6 +10,8 @@ MAINTAINER= naddy@FreeBSD.org COMMENT= GNU cpio copies files to and from archives LICENSE= GPLv3 + +TEST_DEPENDS= autom4te:devel/autoconf USES= cpe tar:bzip2 Modified: head/archivers/gcpio/distinfo ============================================================================== --- head/archivers/gcpio/distinfo Fri Nov 15 22:46:16 2019 (r517704) +++ head/archivers/gcpio/distinfo Fri Nov 15 22:47:25 2019 (r517705) @@ -1,2 +1,3 @@ -SHA256 (cpio-2.12.tar.bz2) = 70998c5816ace8407c8b101c9ba1ffd3ebbecba1f5031046893307580ec1296e -SIZE (cpio-2.12.tar.bz2) = 1258605 +TIMESTAMP = 1573685109 +SHA256 (cpio-2.13.tar.bz2) = eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d +SIZE (cpio-2.13.tar.bz2) = 1354559 Modified: head/archivers/gcpio/files/patch-doc_cpio.1 ============================================================================== --- head/archivers/gcpio/files/patch-doc_cpio.1 Fri Nov 15 22:46:16 2019 (r517704) +++ head/archivers/gcpio/files/patch-doc_cpio.1 Fri Nov 15 22:47:25 2019 (r517705) @@ -1,8 +1,8 @@ ---- doc/cpio.1.orig 2015-09-12 10:57:30 UTC +--- doc/cpio.1.orig 2018-06-21 07:12:05 UTC +++ doc/cpio.1 @@ -15,9 +15,9 @@ .\" along with GNU cpio. If not, see . - .TH CPIO 1 "December 1, 2014" "CPIO" "GNU CPIO" + .TH CPIO 1 "June 21, 2018" "CPIO" "GNU CPIO" .SH NAME -cpio \- copy files to and from archives +gcpio \- copy files to and from archives @@ -21,11 +21,8 @@ {\fB\-i\fR|\fB\-\-extract\fR} [\fB\-bcdfmnrtsuvBSV\fR] [\fB\-C\fR \fIBYTES\fR] [\fB\-E\fR \fIFILE\fR] [\fB\-H\fR \fIFORMAT\fR] [\fB\-M\fR \fIMESSAGE\fR] [\fB\-R\fR [\fIUSER\fR][\fB:.\fR][\fIGROUP\fR]] -@@ -50,9 +50,10 @@ cpio \- copy files to and from archives - [\fB\-\-force\-local\fR] [\fB\-\-no\-absolute\-filenames\fR] [\fB\-\-sparse\fR] - [\fB\-\-only\-verify\-crc\fR] [\fB\-\-to\-stdout\fR] [\fB\-\-quiet\fR] +@@ -52,7 +52,7 @@ cpio \- copy files to and from archives [\fB\-\-rsh\-command=\fICOMMAND\fR] -+[\fB\-\-extract\-over\-symlinks\fR] [\fIpattern\fR...] [\fB<\fR \fIarchive\fR] -.B cpio @@ -33,7 +30,7 @@ {\fB\-p\fR|\fB\-\-pass\-through\fR} [\fB\-0adlmuvLV\fR] [\fB\-R\fR [\fIUSER\fR][\fB:.\fR][\fIGROUP\fR]] [\fB\-\-null\fR] [\fB\-\-reset\-access\-time\fR] -@@ -63,7 +64,7 @@ cpio \- copy files to and from archives +@@ -63,7 +63,7 @@ cpio \- copy files to and from archives [\fB\-\-no\-preserve\-owner\fR] [\fB\-\-sparse\fR] \fIdestination-directory\fR \fB<\fR \fIname-list\fR Modified: head/archivers/gcpio/files/patch-gnu_Makefile.in ============================================================================== --- head/archivers/gcpio/files/patch-gnu_Makefile.in Fri Nov 15 22:46:16 2019 (r517704) +++ head/archivers/gcpio/files/patch-gnu_Makefile.in Fri Nov 15 22:47:25 2019 (r517705) @@ -1,6 +1,6 @@ ---- gnu/Makefile.in.orig 2015-09-12 11:11:14 UTC +--- gnu/Makefile.in.orig 2019-11-06 07:29:32 UTC +++ gnu/Makefile.in -@@ -2077,7 +2077,7 @@ inttypes.h: inttypes.in.h $(top_builddir +@@ -2129,7 +2129,7 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.statu # avoid installing it. all-local: charset.alias ref-add.sed ref-del.sed Added: head/archivers/gcpio/files/patch-src_util.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/gcpio/files/patch-src_util.c Fri Nov 15 22:47:25 2019 (r517705) @@ -0,0 +1,23 @@ +https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=df55fb19be545e22d023950263ed5d0756edf81e + +--- src/util.c.orig 2019-11-03 15:07:23 UTC ++++ src/util.c +@@ -1140,8 +1140,16 @@ stat_to_cpio (struct cpio_file_stat *hdr, struct stat + hdr->c_nlink = st->st_nlink; + hdr->c_uid = CPIO_UID (st->st_uid); + hdr->c_gid = CPIO_GID (st->st_gid); +- hdr->c_rdev_maj = major (st->st_rdev); +- hdr->c_rdev_min = minor (st->st_rdev); ++ if (S_ISBLK (st->st_mode) || S_ISCHR (st->st_mode)) ++ { ++ hdr->c_rdev_maj = major (st->st_rdev); ++ hdr->c_rdev_min = minor (st->st_rdev); ++ } ++ else ++ { ++ hdr->c_rdev_maj = 0; ++ hdr->c_rdev_min = 0; ++ } + hdr->c_mtime = st->st_mtime; + hdr->c_filesize = st->st_size; + hdr->c_chksum = 0; Added: head/archivers/gcpio/files/patch-tests_symlink-bad-length.at ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/gcpio/files/patch-tests_symlink-bad-length.at Fri Nov 15 22:47:25 2019 (r517705) @@ -0,0 +1,11 @@ +--- tests/symlink-bad-length.at.orig 2019-11-13 23:07:23 UTC ++++ tests/symlink-bad-length.at +@@ -44,7 +44,7 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + # but that could hurt backward compatibility. + + AT_CHECK([ +-base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST ++b64decode -r 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' \ Modified: head/archivers/gcpio/pkg-plist ============================================================================== --- head/archivers/gcpio/pkg-plist Fri Nov 15 22:46:16 2019 (r517704) +++ head/archivers/gcpio/pkg-plist Fri Nov 15 22:47:25 2019 (r517705) @@ -15,6 +15,7 @@ man/man1/gcpio.1.gz %%NLS%%share/locale/ko/LC_MESSAGES/cpio.mo %%NLS%%share/locale/nl/LC_MESSAGES/cpio.mo %%NLS%%share/locale/pl/LC_MESSAGES/cpio.mo +%%NLS%%share/locale/pt/LC_MESSAGES/cpio.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/cpio.mo %%NLS%%share/locale/ro/LC_MESSAGES/cpio.mo %%NLS%%share/locale/ru/LC_MESSAGES/cpio.mo