From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehHDZ-00013b-D1 for guix-patches@gnu.org; Thu, 01 Feb 2018 10:56:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehHDW-0006Y0-7U for guix-patches@gnu.org; Thu, 01 Feb 2018 10:56:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:44691) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehHDW-0006XO-1W for guix-patches@gnu.org; Thu, 01 Feb 2018 10:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ehHDV-0007vv-RN for guix-patches@gnu.org; Thu, 01 Feb 2018 10:56:01 -0500 Subject: [bug#30319] [PATCH] gnu: tar: Update to 1.30. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehHD0-0000wG-6V for guix-patches@gnu.org; Thu, 01 Feb 2018 10:55:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehHCw-0005qv-9f for guix-patches@gnu.org; Thu, 01 Feb 2018 10:55:29 -0500 Received: from mail-pl0-x235.google.com ([2607:f8b0:400e:c01::235]:38388) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehHCv-0005pQ-Sb for guix-patches@gnu.org; Thu, 01 Feb 2018 10:55:26 -0500 Received: by mail-pl0-x235.google.com with SMTP id 13so3824897plb.5 for ; Thu, 01 Feb 2018 07:55:25 -0800 (PST) From: Alex Vong Date: Thu, 01 Feb 2018 23:55:11 +0800 Message-ID: <87a7wsaen4.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30319@debbugs.gnu.org --=-=-= Content-Type: text/plain Hello, This patch updates tar to its latest version for core-updates. I add a 2016 copyright header because I forgot to add it in 20be64dcf. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-tar-Update-to-1.30.patch Content-Transfer-Encoding: quoted-printable >From bc2c8230c7089cbd3e9de8776dd97bd758dcde2d Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 1 Feb 2018 23:03:55 +0800 Subject: [PATCH] gnu: tar: Update to 1.30. * gnu/packages/base.scm (tar): Update to 1.30. [source]: Remove 'tar-CVE-2016-6321.patch'. * gnu/packages/patches/tar-CVE-2016-6321.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/base.scm | 8 ++--- gnu/packages/patches/tar-CVE-2016-6321.patch | 51 ------------------------= ---- 3 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/tar-CVE-2016-6321.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9df027a8d..7bddb4060 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1076,7 +1076,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/t1lib-CVE-2010-2642.patch \ %D%/packages/patches/t1lib-CVE-2011-0764.patch \ %D%/packages/patches/t1lib-CVE-2011-1552+.patch \ - %D%/packages/patches/tar-CVE-2016-6321.patch \ %D%/packages/patches/tar-skip-unreliable-tests.patch \ %D%/packages/patches/tclxml-3.2-install.patch \ %D%/packages/patches/tcsh-fix-autotest.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 92acbd364..faa5066cc 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2014, 2015 Manolis Fragkiskos Ragkousis ;;; Copyright =C2=A9 2016, 2017 Efraim Flashner ;;; Copyright =C2=A9 2016 Jan Nieuwenhuizen +;;; Copyright =C2=A9 2016, 2018 Alex Vong ;;; Copyright =C2=A9 2017 Rene Saavedra ;;; Copyright =C2=A9 2017 Mathieu Othacehe ;;; Copyright =C2=A9 2017 Marius Bakke @@ -166,16 +167,15 @@ implementation offers several extensions over the sta= ndard utility.") (define-public tar (package (name "tar") - (version "1.29") + (version "1.30") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/tar/tar-" version ".tar.xz")) (sha256 (base32 - "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0")) - (patches (search-patches "tar-CVE-2016-6321.patch" - "tar-skip-unreliable-tests.patch")))) + "1lyjyk8z8hdddsxw0ikchrsfg3i0x3fsh7l63a8jgaz1n7dr5gzi")) + (patches (search-patches "tar-skip-unreliable-tests.patch")))) (build-system gnu-build-system) ;; Note: test suite requires ~1GiB of disk space. (arguments diff --git a/gnu/packages/patches/tar-CVE-2016-6321.patch b/gnu/packages/pa= tches/tar-CVE-2016-6321.patch deleted file mode 100644 index b79be9bc9..000000000 --- a/gnu/packages/patches/tar-CVE-2016-6321.patch +++ /dev/null @@ -1,51 +0,0 @@ -Fix CVE-2016-6321: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=3DCVE-2016-6321 -https://security-tracker.debian.org/tracker/CVE-2016-6321 - -Patch adapted from upstream source repository (the changes to 'NEWS' -don't apply to the Tar 1.29 release tarball). - -http://git.savannah.gnu.org/cgit/tar.git/commit/?id=3D7340f67b9860ea0531c1= 450e5aa261c50f67165d - -From 7340f67b9860ea0531c1450e5aa261c50f67165d Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sat, 29 Oct 2016 21:04:40 -0700 -Subject: [PATCH] When extracting, skip ".." members - -* NEWS: Document this. -* src/extract.c (extract_archive): Skip members whose names -contain "..". ---- - NEWS | 8 +++++++- - src/extract.c | 8 ++++++++ - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/src/extract.c b/src/extract.c -index f982433..7904148 100644 ---- a/src/extract.c -+++ b/src/extract.c -@@ -1629,12 +1629,20 @@ extract_archive (void) - { - char typeflag; - tar_extractor_t fun; -+ bool skip_dotdot_name; -=20 - fatal_exit_hook =3D extract_finish; -=20 - set_next_block_after (current_header); -=20 -+ skip_dotdot_name =3D (!absolute_names_option -+ && contains_dot_dot (current_stat_info.orig_file_name)); -+ if (skip_dotdot_name) -+ ERROR ((0, 0, _("%s: Member name contains '..'"), -+ quotearg_colon (current_stat_info.orig_file_name))); -+ - if (!current_stat_info.file_name[0] -+ || skip_dotdot_name - || (interactive_option - && !confirm ("extract", current_stat_info.file_name))) - { ---=20 -2.11.0 - --=20 2.16.1 --=-=-= Content-Type: text/plain Cheers, Alex --=-=-=--