Index: head/archivers/gtar/Makefile =================================================================== --- head/archivers/gtar/Makefile (revision 561855) +++ head/archivers/gtar/Makefile (revision 561856) @@ -1,42 +1,42 @@ # Created by: Andreas Klemm # $FreeBSD$ PORTNAME= tar -PORTVERSION= 1.32 +PORTVERSION= 1.33 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 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 561855) +++ head/archivers/gtar/distinfo (revision 561856) @@ -1,3 +1,3 @@ -TIMESTAMP = 1551128587 -SHA256 (tar-1.32.tar.xz) = d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8 -SIZE (tar-1.32.tar.xz) = 2103348 +TIMESTAMP = 1610637337 +SHA256 (tar-1.33.tar.xz) = 66a8344b1dc83a411d311bd1547e0176e56cc311f28ee94a30f84dafb3d9067e +SIZE (tar-1.33.tar.xz) = 2224824 Index: head/archivers/gtar/files/patch-configure =================================================================== --- head/archivers/gtar/files/patch-configure (revision 561855) +++ head/archivers/gtar/files/patch-configure (revision 561856) @@ -1,14 +1,14 @@ Hack to disable shared library detection, so configure won't try to link with "/usr/local/lib/libiconv.so -static". ---- configure.orig 2017-12-17 11:25:08 UTC +--- configure.orig 2021-01-07 14:30:44 UTC +++ configure -@@ -37451,7 +37451,7 @@ fi +@@ -40537,7 +40537,7 @@ fi $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" + acl_shlibext="${SHLIBEXT-$acl_cv_shlibext}" acl_libname_spec="$acl_cv_libname_spec" acl_library_names_spec="$acl_cv_library_names_spec" acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" Index: head/archivers/gtar/files/patch-src_tar.c =================================================================== --- head/archivers/gtar/files/patch-src_tar.c (nonexistent) +++ head/archivers/gtar/files/patch-src_tar.c (revision 561856) @@ -0,0 +1,14 @@ +Fix improper argument reference. +https://git.savannah.gnu.org/cgit/tar.git/commit/?id=2251317e3fe971fd34608cf312c8120141d8fce4 + +--- src/tar.c.orig 2021-01-17 15:26:53 UTC ++++ src/tar.c +@@ -2248,7 +2248,7 @@ parse_default_options (struct tar_args *args) + if (argp_parse (&argp, + ws.ws_offs + ws.ws_wordc, + ws.ws_wordv, +- ARGP_IN_ORDER|ARGP_NO_EXIT, &idx, &args)) ++ ARGP_IN_ORDER|ARGP_NO_EXIT, &idx, args)) + abort (); /* shouldn't happen */ + args->loc = save_loc_ptr; + if (name_more_files ()) Property changes on: head/archivers/gtar/files/patch-src_tar.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-tests_multiv01.at =================================================================== --- head/archivers/gtar/files/patch-tests_multiv01.at (revision 561855) +++ head/archivers/gtar/files/patch-tests_multiv01.at (revision 561856) @@ -1,14 +1,15 @@ +# Remove after FreeBSD 12.1 EOL 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" \ Index: head/archivers/gtar/files/patch-tests_multiv03.at =================================================================== --- head/archivers/gtar/files/patch-tests_multiv03.at (revision 561855) +++ head/archivers/gtar/files/patch-tests_multiv03.at (revision 561856) @@ -1,14 +1,15 @@ +# Remove after FreeBSD 12.1 EOL 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 Index: head/archivers/gtar/files/patch-tests_multiv05.at =================================================================== --- head/archivers/gtar/files/patch-tests_multiv05.at (revision 561855) +++ head/archivers/gtar/files/patch-tests_multiv05.at (revision 561856) @@ -1,14 +1,15 @@ +# Remove after FreeBSD 12.1 EOL 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],