diff options
author | Christian Weisgerber <naddy@FreeBSD.org> | 2019-02-25 22:14:46 +0000 |
---|---|---|
committer | Christian Weisgerber <naddy@FreeBSD.org> | 2019-02-25 22:14:46 +0000 |
commit | b6a4dec374484928507fd02930358a1b9c584def (patch) | |
tree | 76d830c685660859f794fff3a0698c249d1bfbb6 | |
parent | 0335c38a4b27892d8da53dbbdb70b1fffc6aba0b (diff) | |
download | ports-b6a4dec374484928507fd02930358a1b9c584def.tar.gz ports-b6a4dec374484928507fd02930358a1b9c584def.zip |
Notes
-rw-r--r-- | archivers/gtar/Makefile | 2 | ||||
-rw-r--r-- | archivers/gtar/distinfo | 6 | ||||
-rw-r--r-- | archivers/gtar/files/patch-src_extract.c | 14 | ||||
-rw-r--r-- | archivers/gtar/files/patch-src_utf8.c | 14 | ||||
-rw-r--r-- | archivers/gtar/files/patch-tests_numeric.at | 24 |
5 files changed, 4 insertions, 56 deletions
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index ad4b61889a3b..a3b80d3ccf30 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tar -PORTVERSION= 1.31 +PORTVERSION= 1.32 CATEGORIES= archivers sysutils MASTER_SITES= GNU PKGNAMEPREFIX= g diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo index 49bcaeb073b1..99f63b3272dd 100644 --- a/archivers/gtar/distinfo +++ b/archivers/gtar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547218928 -SHA256 (tar-1.31.tar.xz) = 37f3ef1ceebd8b7e1ebf5b8cc6c65bb8ebf002c7d049032bf456860f25ec2dc1 -SIZE (tar-1.31.tar.xz) = 2101044 +TIMESTAMP = 1551128587 +SHA256 (tar-1.32.tar.xz) = d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8 +SIZE (tar-1.32.tar.xz) = 2103348 diff --git a/archivers/gtar/files/patch-src_extract.c b/archivers/gtar/files/patch-src_extract.c deleted file mode 100644 index 450335fa86a6..000000000000 --- a/archivers/gtar/files/patch-src_extract.c +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 5416b7776274..000000000000 --- a/archivers/gtar/files/patch-src_utf8.c +++ /dev/null @@ -1,14 +0,0 @@ -Work around an iconv(3) portability issue that trips up sparse07.at. -https://lists.gnu.org/archive/html/bug-tar/2018-04/msg00019.html - ---- src/utf8.c.orig 2019-01-11 17:46:41 UTC -+++ src/utf8.c -@@ -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; -- 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_numeric.at b/archivers/gtar/files/patch-tests_numeric.at deleted file mode 100644 index b312662670a0..000000000000 --- a/archivers/gtar/files/patch-tests_numeric.at +++ /dev/null @@ -1,24 +0,0 @@ -https://lists.gnu.org/archive/html/bug-tar/2016-06/txt9bP0DVvYnu.txt - ---- tests/numeric.at.orig 2016-03-18 17:23:55 UTC -+++ tests/numeric.at -@@ -27,14 +27,16 @@ tar $1 -vvf a dir |dnl - ]) - - AT_TAR_CHECK([ --mkdir dir --genfile --file dir/file -- - MYUID=$(id -u) || AT_SKIP_TEST - MYGID=$(id -g) || AT_SKIP_TEST - MYUSR=$(id -un) || AT_SKIP_TEST - MYGRP=$(id -gn) || AT_SKIP_TEST - -+mkdir dir -+# Ensure correct group id on BSDs. -+chown :$MYGID dir >/dev/null 2>/dev/null -+genfile --file dir/file -+ - TESTOP([--create]) - TESTOP([--list]) - TESTOP([--diff]) |