Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Jan 2019 15:33:22 +0000 (UTC)
From:      Christian Weisgerber <naddy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490146 - in head/archivers/gtar: . files
Message-ID:  <201901131533.x0DFXM0n056213@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: naddy
Date: Sun Jan 13 15:33:22 2019
New Revision: 490146
URL: https://svnweb.freebsd.org/changeset/ports/490146

Log:
  Update to 1.31.  Noteworthy changes:
  * Support for zstd compression (if zstd is installed).
  * The -K option interacts properly with member names given on the command line.
  * Fix handling of file shrinkage during read access when --sparse is used.

Added:
  head/archivers/gtar/files/patch-src_extract.c   (contents, props changed)
  head/archivers/gtar/files/patch-tests_multiv01.at   (contents, props changed)
  head/archivers/gtar/files/patch-tests_multiv03.at   (contents, props changed)
  head/archivers/gtar/files/patch-tests_multiv05.at   (contents, props changed)
Deleted:
  head/archivers/gtar/files/patch-gnu_error.c
  head/archivers/gtar/files/patch-tests_difflink.at
Modified:
  head/archivers/gtar/Makefile
  head/archivers/gtar/distinfo
  head/archivers/gtar/files/patch-src_utf8.c

Modified: head/archivers/gtar/Makefile
==============================================================================
--- head/archivers/gtar/Makefile	Sun Jan 13 15:25:51 2019	(r490145)
+++ head/archivers/gtar/Makefile	Sun Jan 13 15:33:22 2019	(r490146)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tar
-PORTVERSION=	1.30
-PORTREVISION=	1
+PORTVERSION=	1.31
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	g
@@ -16,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 INFO=		tar
 
-USES=		charsetfix cpe iconv:${STATIC_ARGS} localbase makeinfo tar:xz
+USES=		charsetfix cpe iconv:${STATIC_ARGS} localbase tar:xz
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g

Modified: head/archivers/gtar/distinfo
==============================================================================
--- head/archivers/gtar/distinfo	Sun Jan 13 15:25:51 2019	(r490145)
+++ head/archivers/gtar/distinfo	Sun Jan 13 15:33:22 2019	(r490146)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525097977
-SHA256 (tar-1.30.tar.xz) = f1bf92dbb1e1ab27911a861ea8dde8208ee774866c46c0bb6ead41f4d1f4d2d3
-SIZE (tar-1.30.tar.xz) = 2108028
+TIMESTAMP = 1547218928
+SHA256 (tar-1.31.tar.xz) = 37f3ef1ceebd8b7e1ebf5b8cc6c65bb8ebf002c7d049032bf456860f25ec2dc1
+SIZE (tar-1.31.tar.xz) = 2101044

Added: head/archivers/gtar/files/patch-src_extract.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/gtar/files/patch-src_extract.c	Sun Jan 13 15:33:22 2019	(r490146)
@@ -0,0 +1,14 @@
+Remove erroneous abort() call
+https://git.savannah.gnu.org/cgit/tar.git/diff/?id=85c005ee1345c342f707f3c55317daf6cb050603
+
+--- src/extract.c.orig	2019-01-13 15:07:22 UTC
++++ src/extract.c
+@@ -787,7 +787,7 @@ maybe_recoverable (char *file_name, bool regular, bool
+ 	case UNLINK_FIRST_OLD_FILES:
+ 	  break;
+ 	}
+-      abort (); /* notreached */
++      FALLTHROUGH;
+ 
+     case ENOENT:
+       /* Attempt creating missing intermediate directories.  */

Modified: head/archivers/gtar/files/patch-src_utf8.c
==============================================================================
--- head/archivers/gtar/files/patch-src_utf8.c	Sun Jan 13 15:25:51 2019	(r490145)
+++ head/archivers/gtar/files/patch-src_utf8.c	Sun Jan 13 15:33:22 2019	(r490146)
@@ -1,14 +1,14 @@
 Work around an iconv(3) portability issue that trips up sparse07.at.
-https://lists.gnu.org/archive/html/bug-tar/2018-04/threads.html
+https://lists.gnu.org/archive/html/bug-tar/2018-04/msg00019.html
 
---- src/utf8.c.orig	2018-04-30 17:25:34 UTC
+--- src/utf8.c.orig	2019-01-11 17:46:41 UTC
 +++ src/utf8.c
-@@ -85,7 +85,7 @@ utf8_convert (bool to_utf, char const *i
+@@ -81,7 +81,7 @@ utf8_convert (bool to_utf, char const *input, char **o
+   outlen = inlen * MB_LEN_MAX + 1;
+   ob = ret = xmalloc (outlen);
    ib = (char ICONV_CONST *) input;
-   rc = iconv (cd, &ib, &inlen, &ob, &outlen);
-   *ob = 0;
--  return rc != -1;
-+  return rc == 0;
- }
- 
- 
+-  if (iconv (cd, &ib, &inlen, &ob, &outlen) == -1)
++  if (iconv (cd, &ib, &inlen, &ob, &outlen) != 0)
+     {
+       free (ret);
+       return false;

Added: head/archivers/gtar/files/patch-tests_multiv01.at
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/gtar/files/patch-tests_multiv01.at	Sun Jan 13 15:33:22 2019	(r490146)
@@ -0,0 +1,14 @@
+cmp(1) Capsicum error if stdin closed
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234885
+
+--- tests/multiv01.at.orig	2019-01-11 20:11:26 UTC
++++ tests/multiv01.at
+@@ -28,7 +28,7 @@ AT_KEYWORDS([multivolume multiv multiv01 chdir])
+ #  TRUSS=strace
+ 
+ AT_TAR_CHECK([
+-exec <&-
++#exec <&-
+ genfile --length 7168 --file file1
+ 
+ for block in " 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" \

Added: head/archivers/gtar/files/patch-tests_multiv03.at
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/gtar/files/patch-tests_multiv03.at	Sun Jan 13 15:33:22 2019	(r490146)
@@ -0,0 +1,14 @@
+cmp(1) Capsicum error if stdin closed
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234885
+
+--- tests/multiv03.at.orig	2019-01-11 20:11:26 UTC
++++ tests/multiv03.at
+@@ -47,7 +47,7 @@ EOF
+ 
+ genfile --length 15360 --file $AFILE
+ 
+-exec <&-
++#exec <&-
+ 
+ tar -M -L 10 -c -f arch.1 -f arch.2 $AFILE || exit 1
+ tar -tM -f arch.1 -f arch.2 || exit 1

Added: head/archivers/gtar/files/patch-tests_multiv05.at
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/gtar/files/patch-tests_multiv05.at	Sun Jan 13 15:33:22 2019	(r490146)
@@ -0,0 +1,14 @@
+cmp(1) Capsicum error if stdin closed
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234885
+
+--- tests/multiv05.at.orig	2019-01-11 20:11:26 UTC
++++ tests/multiv05.at
+@@ -28,7 +28,7 @@ AT_KEYWORDS([multivolume multiv multiv05 sync])
+ m4_pushdef([FILELIST],[jeden,dwa,trzy,cztery,piec,szesc])
+ 
+ AT_TAR_CHECK([
+-exec <&-
++#exec <&-
+ 
+ m4_foreach([f],
+   [FILELIST],



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