Index: head/archivers/gtar/Makefile =================================================================== --- head/archivers/gtar/Makefile (revision 490145) +++ head/archivers/gtar/Makefile (revision 490146) @@ -1,43 +1,42 @@ # Created by: Andreas Klemm # $FreeBSD$ PORTNAME= tar -PORTVERSION= 1.30 -PORTREVISION= 1 +PORTVERSION= 1.31 CATEGORIES= archivers sysutils MASTER_SITES= GNU PKGNAMEPREFIX= g MAINTAINER= naddy@FreeBSD.org COMMENT= GNU version of the traditional tape archiver LICENSE= GPLv3+ 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 CONFIGURE_ENV= DEFAULT_ARCHIVE=/dev/sa0 \ DEFAULT_RMT_COMMAND=/etc/rmt # supply result to skip a test that will abort configure if run as root CONFIGURE_ENV+= gl_cv_func_mknod_works=yes TEST_DEPENDS= autom4te:devel/autoconf TEST_TARGET= check OPTIONS_DEFINE= NLS STATIC OPTIONS_SUB= yes NLS_USES= gettext-runtime:${STATIC_ARGS} NLS_CONFIGURE_ENABLE= nls STATIC_LDFLAGS= -static STATIC_CONFIGURE_ENV= SHLIBEXT="" STATIC_VARS= STATIC_ARGS=build STATIC_VARS_OFF= STATIC_ARGS=lib .include Index: head/archivers/gtar/distinfo =================================================================== --- head/archivers/gtar/distinfo (revision 490145) +++ head/archivers/gtar/distinfo (revision 490146) @@ -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 Index: head/archivers/gtar/files/patch-tests_difflink.at =================================================================== --- head/archivers/gtar/files/patch-tests_difflink.at (revision 490145) +++ head/archivers/gtar/files/patch-tests_difflink.at (nonexistent) @@ -1,17 +0,0 @@ -https://git.savannah.gnu.org/cgit/tar.git/commit/?id=847a36f064efed676ae007b1def3c0db364cdddb - -https://lists.gnu.org/archive/html/bug-tar/2018-04/msg00012.html - ---- tests/difflink.at.orig 2017-11-10 03:55:18 UTC -+++ tests/difflink.at -@@ -20,8 +20,8 @@ AT_TAR_CHECK([ - mkdir a - genfile -f a/x - ln -s x a/y --ln a/y a/z --tar cf a.tar a -+ln -P a/y a/z -+tar cf a.tar a/x a/y a/z - rm a/z - ln -s x a/z - tar df a.tar Property changes on: head/archivers/gtar/files/patch-tests_difflink.at ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/gtar/files/patch-gnu_error.c =================================================================== --- head/archivers/gtar/files/patch-gnu_error.c (revision 490145) +++ head/archivers/gtar/files/patch-gnu_error.c (nonexistent) @@ -1,23 +0,0 @@ -Fix remfiles01.at and remfiles02.at: error() needs to fetch the -name set by set_program_name(). - ---- gnu/error.c.orig 2017-12-16 21:23:33 UTC -+++ gnu/error.c -@@ -42,8 +42,6 @@ - # define USE_UNLOCKED_IO 0 - # define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b) - # define _GL_ARG_NONNULL(a) --#else --# include "getprogname.h" - #endif - - #if USE_UNLOCKED_IO -@@ -119,7 +117,7 @@ int strerror_r (int errnum, char *buf, s - # endif - # endif - --#define program_name getprogname () -+extern char *program_name; - - # if GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r - # define __strerror_r strerror_r Property changes on: head/archivers/gtar/files/patch-gnu_error.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/gtar/files/patch-src_extract.c =================================================================== --- head/archivers/gtar/files/patch-src_extract.c (nonexistent) +++ head/archivers/gtar/files/patch-src_extract.c (revision 490146) @@ -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. */ Property changes on: head/archivers/gtar/files/patch-src_extract.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/gtar/files/patch-src_utf8.c =================================================================== --- head/archivers/gtar/files/patch-src_utf8.c (revision 490145) +++ head/archivers/gtar/files/patch-src_utf8.c (revision 490146) @@ -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; Index: head/archivers/gtar/files/patch-tests_multiv01.at =================================================================== --- head/archivers/gtar/files/patch-tests_multiv01.at (nonexistent) +++ head/archivers/gtar/files/patch-tests_multiv01.at (revision 490146) @@ -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" \ Property changes on: head/archivers/gtar/files/patch-tests_multiv01.at ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/gtar/files/patch-tests_multiv03.at =================================================================== --- head/archivers/gtar/files/patch-tests_multiv03.at (nonexistent) +++ head/archivers/gtar/files/patch-tests_multiv03.at (revision 490146) @@ -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 Property changes on: head/archivers/gtar/files/patch-tests_multiv03.at ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/gtar/files/patch-tests_multiv05.at =================================================================== --- head/archivers/gtar/files/patch-tests_multiv05.at (nonexistent) +++ head/archivers/gtar/files/patch-tests_multiv05.at (revision 490146) @@ -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], Property changes on: head/archivers/gtar/files/patch-tests_multiv05.at ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property