Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 12 May 2016 22:51:04 +0000 (UTC)
From:      Martin Matuska <mm@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r299576 - head/contrib/libarchive/cpio
Message-ID:  <201605122251.u4CMp40B086835@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mm
Date: Thu May 12 22:51:04 2016
New Revision: 299576
URL: https://svnweb.freebsd.org/changeset/base/299576

Log:
  Fix broken cpio behavior.
  Suggested upstream as PR #704.
  
  MFC:	1 month (together with libarchive 3.2.0)

Modified:
  head/contrib/libarchive/cpio/bsdcpio.1
  head/contrib/libarchive/cpio/cpio.c

Modified: head/contrib/libarchive/cpio/bsdcpio.1
==============================================================================
--- head/contrib/libarchive/cpio/bsdcpio.1	Thu May 12 22:17:00 2016	(r299575)
+++ head/contrib/libarchive/cpio/bsdcpio.1	Thu May 12 22:51:04 2016	(r299576)
@@ -156,8 +156,7 @@ See above for description.
 .It Fl Fl insecure
 (i and p mode only)
 Disable security checks during extraction or copying.
-This allows extraction via symbolic links, absolute paths,
-and path names containing
+This allows extraction via symbolic links and path names containing
 .Sq ..
 in the name.
 .It Fl J , Fl Fl xz

Modified: head/contrib/libarchive/cpio/cpio.c
==============================================================================
--- head/contrib/libarchive/cpio/cpio.c	Thu May 12 22:17:00 2016	(r299575)
+++ head/contrib/libarchive/cpio/cpio.c	Thu May 12 22:51:04 2016	(r299576)
@@ -171,7 +171,6 @@ main(int argc, char *argv[])
 	cpio->extract_flags |= ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER;
 	cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_SYMLINKS;
 	cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NODOTDOT;
-	cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
 	cpio->extract_flags |= ARCHIVE_EXTRACT_PERM;
 	cpio->extract_flags |= ARCHIVE_EXTRACT_FFLAGS;
 	cpio->extract_flags |= ARCHIVE_EXTRACT_ACL;
@@ -257,7 +256,6 @@ main(int argc, char *argv[])
 		case OPTION_INSECURE:
 			cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_SYMLINKS;
 			cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NODOTDOT;
-			cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
 			break;
 		case 'L': /* GNU cpio */
 			cpio->option_follow_links = 1;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605122251.u4CMp40B086835>