9 files changed, 71 insertions, 56 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 8da74c6ddd05..ad4b61889a3b 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -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
diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo
index 02bebbddfac8..49bcaeb073b1 100644
--- a/archivers/gtar/distinfo
+++ b/archivers/gtar/distinfo
@@ -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
diff --git a/archivers/gtar/files/patch-gnu_error.c b/archivers/gtar/files/patch-gnu_error.c
deleted file mode 100644
index 1ecde609705e..000000000000
--- a/archivers/gtar/files/patch-gnu_error.c
+++ /dev/null
@@ -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
diff --git a/archivers/gtar/files/patch-src_extract.c b/archivers/gtar/files/patch-src_extract.c
new file mode 100644
index 000000000000..450335fa86a6
--- /dev/null
+++ b/archivers/gtar/files/patch-src_extract.c
@@ -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.  */
diff --git a/archivers/gtar/files/patch-src_utf8.c b/archivers/gtar/files/patch-src_utf8.c
index 9cd7de040625..5416b7776274 100644
--- a/archivers/gtar/files/patch-src_utf8.c
+++ b/archivers/gtar/files/patch-src_utf8.c
@@ -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;
diff --git a/archivers/gtar/files/patch-tests_difflink.at b/archivers/gtar/files/patch-tests_difflink.at
deleted file mode 100644
index 27517ecd18ad..000000000000
--- a/archivers/gtar/files/patch-tests_difflink.at
+++ /dev/null
@@ -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
diff --git a/archivers/gtar/files/patch-tests_multiv01.at b/archivers/gtar/files/patch-tests_multiv01.at
new file mode 100644
index 000000000000..40a92065e815
--- /dev/null
+++ b/archivers/gtar/files/patch-tests_multiv01.at
@@ -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" \
diff --git a/archivers/gtar/files/patch-tests_multiv03.at b/archivers/gtar/files/patch-tests_multiv03.at
new file mode 100644
index 000000000000..005e20568d2d
--- /dev/null
+++ b/archivers/gtar/files/patch-tests_multiv03.at
@@ -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
diff --git a/archivers/gtar/files/patch-tests_multiv05.at b/archivers/gtar/files/patch-tests_multiv05.at
new file mode 100644
index 000000000000..8a14510cb529
--- /dev/null
+++ b/archivers/gtar/files/patch-tests_multiv05.at
@@ -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],