aboutsummaryrefslogtreecommitdiffstats
path: root/archivers
diff options
context:
space:
mode:
authornaddy <naddy@FreeBSD.org>2018-05-02 18:49:13 +0800
committernaddy <naddy@FreeBSD.org>2018-05-02 18:49:13 +0800
commit20d89ea18b3c55513083a20db34beec58ded87b4 (patch)
treec872c0de341a4c5f41e83d2752be247619d0f388 /archivers
parentaf644818b3ad3a3c80b91463998bb1ea290f693e (diff)
downloadfreebsd-ports-graphics-20d89ea18b3c55513083a20db34beec58ded87b4.tar.gz
freebsd-ports-graphics-20d89ea18b3c55513083a20db34beec58ded87b4.tar.zst
freebsd-ports-graphics-20d89ea18b3c55513083a20db34beec58ded87b4.zip
Update to 1.30. Noteworthy changes:
* Member names containing '..' components are now skipped when extracting. * Report erroneous use of position-sensitive options. * --numeric-owner now affects private headers too. * Fixed the --delay-directory-restore option * The --warnings=failed-read option * The --warnings=none option now suppresses all warnings * Fix reporting of hardlink mismatches during compare
Diffstat (limited to 'archivers')
-rw-r--r--archivers/gtar/Makefile6
-rw-r--r--archivers/gtar/distinfo6
-rw-r--r--archivers/gtar/files/patch-configure4
-rw-r--r--archivers/gtar/files/patch-gnu_error.c23
-rw-r--r--archivers/gtar/files/patch-po_Makefile.in.in13
-rw-r--r--archivers/gtar/files/patch-src_utf8.c14
-rw-r--r--archivers/gtar/files/patch-tests_difflink.at17
7 files changed, 60 insertions, 23 deletions
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 2ded2ccdc8f..9f26afe5830 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tar
-PORTVERSION= 1.29
+PORTVERSION= 1.30
CATEGORIES= archivers sysutils
MASTER_SITES= GNU
PKGNAMEPREFIX= g
@@ -39,8 +39,4 @@ STATIC_CONFIGURE_ENV= SHLIBEXT=""
STATIC_VARS= STATIC_ARGS=build
STATIC_VARS_OFF= STATIC_ARGS=lib
-# do not rebuild tar.info
-post-patch:
- ${TOUCH} -r ${WRKSRC}/doc/stamp-vti ${WRKSRC}/configure
-
.include <bsd.port.mk>
diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo
index 4a6e19f0164..02bebbddfac 100644
--- a/archivers/gtar/distinfo
+++ b/archivers/gtar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464968876
-SHA256 (tar-1.29.tar.xz) = 402dcfd0022fd7a1f2c5611f5c61af1cd84910a760a44a688e18ddbff4e9f024
-SIZE (tar-1.29.tar.xz) = 1996000
+TIMESTAMP = 1525097977
+SHA256 (tar-1.30.tar.xz) = f1bf92dbb1e1ab27911a861ea8dde8208ee774866c46c0bb6ead41f4d1f4d2d3
+SIZE (tar-1.30.tar.xz) = 2108028
diff --git a/archivers/gtar/files/patch-configure b/archivers/gtar/files/patch-configure
index 720b96132b4..7b12371abf1 100644
--- a/archivers/gtar/files/patch-configure
+++ b/archivers/gtar/files/patch-configure
@@ -1,9 +1,9 @@
Hack to disable shared library detection, so configure won't try
to link with "/usr/local/lib/libiconv.so -static".
---- configure.orig 2016-05-16 08:52:00 UTC
+--- configure.orig 2017-12-17 11:25:08 UTC
+++ configure
-@@ -35630,7 +35630,7 @@ fi
+@@ -37451,7 +37451,7 @@ fi
$as_echo "$acl_cv_rpath" >&6; }
wl="$acl_cv_wl"
acl_libext="$acl_cv_libext"
diff --git a/archivers/gtar/files/patch-gnu_error.c b/archivers/gtar/files/patch-gnu_error.c
new file mode 100644
index 00000000000..1ecde609705
--- /dev/null
+++ b/archivers/gtar/files/patch-gnu_error.c
@@ -0,0 +1,23 @@
+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-po_Makefile.in.in b/archivers/gtar/files/patch-po_Makefile.in.in
deleted file mode 100644
index 2639d9b2fd9..00000000000
--- a/archivers/gtar/files/patch-po_Makefile.in.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Work around a bug in FreeBSD 9 make(1).
-http://docs.freebsd.org/cgi/mid.cgi?slrnmvro62.94q.naddy
-
---- po/Makefile.in.in.orig 2016-04-06 04:59:54 UTC
-+++ po/Makefile.in.in
-@@ -78,6 +78,7 @@ CATALOGS = @CATALOGS@
- POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
- POFILESDEPS_yes = $(POFILESDEPS_)
- POFILESDEPS_no =
-+PO_DEPENDS_ON_POT =
- POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
-
- DISTFILESDEPS_ = update-po
diff --git a/archivers/gtar/files/patch-src_utf8.c b/archivers/gtar/files/patch-src_utf8.c
new file mode 100644
index 00000000000..9cd7de04062
--- /dev/null
+++ b/archivers/gtar/files/patch-src_utf8.c
@@ -0,0 +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
+
+--- src/utf8.c.orig 2018-04-30 17:25:34 UTC
++++ src/utf8.c
+@@ -85,7 +85,7 @@ utf8_convert (bool to_utf, char const *i
+ ib = (char ICONV_CONST *) input;
+ rc = iconv (cd, &ib, &inlen, &ob, &outlen);
+ *ob = 0;
+- return rc != -1;
++ return rc == 0;
+ }
+
+
diff --git a/archivers/gtar/files/patch-tests_difflink.at b/archivers/gtar/files/patch-tests_difflink.at
new file mode 100644
index 00000000000..27517ecd18a
--- /dev/null
+++ b/archivers/gtar/files/patch-tests_difflink.at
@@ -0,0 +1,17 @@
+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