update to 1.32 for some bug and testsuite fixes

This commit is contained in:
naddy 2019-02-25 21:01:58 +00:00
parent 8782750738
commit 1ced722082
6 changed files with 4 additions and 105 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.81 2019/01/13 15:34:55 naddy Exp $
# $OpenBSD: Makefile,v 1.82 2019/02/25 21:01:58 naddy Exp $
COMMENT= GNU version of the traditional tape archiver
DISTNAME= tar-1.31
DISTNAME= tar-1.32
PKGNAME= g${DISTNAME}
CATEGORIES= archivers
HOMEPAGE= https://www.gnu.org/software/tar/
@ -45,13 +45,6 @@ LIB_DEPENDS+= devel/gettext
LDSTATIC=
.endif
# autom4te
TEST_DEPENDS= devel/autoconf/2.69
TEST_ENV= AUTOCONF_VERSION=2.69
# without GNU m4, commands with leading parenthesis are mis-expanded
TEST_DEPENDS+= devel/m4
TEST_ENV+= M4=${LOCALBASE}/bin/gm4
# do not rebuild tar.info
post-patch:
touch -r ${WRKSRC}/doc/stamp-vti ${WRKSRC}/configure

View File

@ -1,2 +1,2 @@
SHA256 (tar-1.31.tar.xz) = N/PvHO69i34ev1uMxsZbuOvwAsfQSQMr9FaGDyXsLcE=
SIZE (tar-1.31.tar.xz) = 2101044
SHA256 (tar-1.32.tar.xz) = 0NOuB/EDMjvoCbw+rA3MOG1SxSYkmf4FURrEeIrx/dg=
SIZE (tar-1.32.tar.xz) = 2103348

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_extract_c,v 1.7 2019/01/13 15:34:55 naddy Exp $
Remove erroneous abort() call
https://git.savannah.gnu.org/cgit/tar.git/diff/?id=85c005ee1345c342f707f3c55317daf6cb050603
Index: src/extract.c
--- src/extract.c.orig
+++ 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. */

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-tests_dirrem01_at,v 1.2 2019/01/15 15:23:51 naddy Exp $
Fix expected output in dirrem tests.
https://git.savannah.gnu.org/cgit/tar.git/commit/?id=f86722c34c92f265bc9a20cb171d2fcfeab7d341
Index: tests/dirrem01.at
--- tests/dirrem01.at.orig
+++ tests/dirrem01.at
@@ -48,13 +48,14 @@ esac
genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
tar --blocking-factor=1 -c -f archive.tar \
- --listed-incremental db -v dir >/dev/null
+ --listed-incremental db \
+ --warning=no-file-changed \
+ -v dir >/dev/null
],
[1],
[ignore],
[tar: dir: Directory is new
tar: dir/sub: Directory is new
-tar: dir/sub: file changed as we read it
tar: dir/sub: File removed before we read it
],[],[],[gnu,posix])

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-tests_dirrem02_at,v 1.2 2019/01/15 15:23:51 naddy Exp $
Fix expected output in dirrem tests.
https://git.savannah.gnu.org/cgit/tar.git/commit/?id=f86722c34c92f265bc9a20cb171d2fcfeab7d341
Index: tests/dirrem02.at
--- tests/dirrem02.at.orig
+++ tests/dirrem02.at
@@ -45,13 +45,14 @@ esac
genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
tar --blocking-factor=1 -c -f archive.tar \
- --listed-incremental db -v dir dir/sub >/dev/null
+ --listed-incremental db \
+ --warning=no-file-changed \
+ -v dir dir/sub >/dev/null
],
[2],
[ignore],
[tar: dir: Directory is new
tar: dir/sub: Directory is new
-tar: dir/sub: file changed as we read it
tar: dir/sub: Cannot open: No such file or directory
tar: Exiting with failure status due to previous errors
],[],[],[gnu,posix])

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-tests_numeric_at,v 1.2 2019/01/15 15:23:51 naddy Exp $
https://git.savannah.gnu.org/cgit/tar.git/commit/?id=c697d625982df4941ed51b6478256f9e7c7b8840
Index: tests/numeric.at
--- tests/numeric.at.orig
+++ tests/numeric.at
@@ -27,13 +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])