diff options
| -rw-r--r-- | archivers/gtar-base/Makefile | 3 | ||||
| -rw-r--r-- | archivers/gtar-base/distinfo | 14 | ||||
| -rw-r--r-- | archivers/gtar-base/patches/patch-configure | 207 | ||||
| -rw-r--r-- | archivers/gtar-base/patches/patch-gnu_readlinkat.c | 22 | ||||
| -rw-r--r-- | archivers/gtar-base/patches/patch-src_Makefile.in | 29 | ||||
| -rw-r--r-- | archivers/gtar/Makefile.common | 4 |
6 files changed, 20 insertions, 259 deletions
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile index 1efa71792df..6085d1e1348 100644 --- a/archivers/gtar-base/Makefile +++ b/archivers/gtar-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2016/02/25 09:28:36 jperkin Exp $ +# $NetBSD: Makefile,v 1.92 2016/05/31 15:04:51 mef Exp $ # # Please run 'make files/gtar.1' when updating version of this package # to regenerate the man page. converters/help2man is needed. @@ -6,7 +6,6 @@ .include "../../archivers/gtar/Makefile.common" PKGNAME= ${DISTNAME:S/tar/gtar-base/} -PKGREVISION= 1 COMMENT= The GNU tape archiver with remote magnetic tape support LICENSE= gnu-gpl-v3 diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo index 68608da40df..e2dadacde16 100644 --- a/archivers/gtar-base/distinfo +++ b/archivers/gtar-base/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.39 2015/11/03 00:56:21 agc Exp $ +$NetBSD: distinfo,v 1.40 2016/05/31 15:04:51 mef Exp $ -SHA1 (tar-1.28.tar.bz2) = 668ea52014ef7e70afc4ff7324410ee32f2970ef -RMD160 (tar-1.28.tar.bz2) = a2edf2a854fa9a7bc7383638038a7465ae8bba51 -SHA512 (tar-1.28.tar.bz2) = 4f66a236a2d9185114e2b358a09f3d38c3c38e984e5fca4bedc4d7eb461bdaace6a7a9fc62aafb70428b1f3dc617fb0d0553558fb29cad33f0cb53ba081521c4 -Size (tar-1.28.tar.bz2) = 2693989 bytes +SHA1 (tar-1.29.tar.bz2) = 057977c86293fddcbb04075ca70f41079e044949 +RMD160 (tar-1.29.tar.bz2) = 27a18fd2a557fb6dc37218c96b3c3223527604a4 +SHA512 (tar-1.29.tar.bz2) = d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b +Size (tar-1.29.tar.bz2) = 2715993 bytes SHA1 (patch-Makefile.in) = 78cc142b9370317c52215c106ea1e7217e71f9b5 -SHA1 (patch-configure) = 9d3b26ab03c8a0a30c3dbfbdeadae4d14b7fd8dc -SHA1 (patch-gnu_readlinkat.c) = b1ddbf5159db92df9186354f27db5c9cb93b9afa +SHA1 (patch-gnu_readlinkat.c) = ce9869bfcd75005bb4ddac4e3223df01a26a2b29 SHA1 (patch-lib_xattr-at.c) = c69631c118558c0c056feb5b55188b2b4c92cc19 -SHA1 (patch-src_Makefile.in) = 2e6c93b00f4c291a68884663968625e784103c3b SHA1 (patch-src_system.c) = cd9f7358fa93ed0ba4a1b3fffdae5d7f84ef4791 diff --git a/archivers/gtar-base/patches/patch-configure b/archivers/gtar-base/patches/patch-configure deleted file mode 100644 index a928dde333b..00000000000 --- a/archivers/gtar-base/patches/patch-configure +++ /dev/null @@ -1,207 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2014/08/21 20:44:16 wiz Exp $ - -* Make GNU tar 1.28 detect the presence of the GNU/Linux xattrs - interface it expects. - - Upstream report: - - https://lists.gnu.org/archive/html/bug-tar/2014-08/msg00001.html - ---- configure.orig 2014-07-27 20:33:47.000000000 +0000 -+++ configure -@@ -663,8 +663,6 @@ RSH - LIBOBJS - TAR_COND_GRANTPT_FALSE - TAR_COND_GRANTPT_TRUE --TAR_LIB_ATTR_FALSE --TAR_LIB_ATTR_TRUE - TAR_COND_XATTR_H_FALSE - TAR_COND_XATTR_H_TRUE - GNULIB_TEST_WARN_CFLAGS -@@ -34994,41 +34975,6 @@ else - TAR_COND_XATTR_H_FALSE= - fi - -- if false; then -- TAR_LIB_ATTR_TRUE= -- TAR_LIB_ATTR_FALSE='#' --else -- TAR_LIB_ATTR_TRUE='#' -- TAR_LIB_ATTR_FALSE= --fi -- -- if test "$ac_cv_header_sys_xattr_h" = yes; then -- for ac_func in getxattr fgetxattr lgetxattr \ -- setxattr fsetxattr lsetxattr \ -- listxattr flistxattr llistxattr --do : -- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" --if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- # only when functions are present -- --$as_echo "#define HAVE_SYS_XATTR_H 1" >>confdefs.h -- -- if test "$with_xattrs" != no; then -- --$as_echo "#define HAVE_XATTRS /**/" >>confdefs.h -- -- fi -- --fi --done -- -- fi -- -- # If <sys/xattr.h> is not found, then check for <attr/xattr.h> - if test "$ac_cv_header_sys_xattr_h" != yes; then - for ac_header in attr/xattr.h - do : -@@ -35050,13 +34996,20 @@ else - TAR_COND_XATTR_H_FALSE= - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgetxattr in -lattr" >&5 --$as_echo_n "checking for fgetxattr in -lattr... " >&6; } --if ${ac_cv_lib_attr_fgetxattr+:} false; then : -+ fi -+ -+ if test "$with_xattrs" != no; then -+ for i in getxattr fgetxattr lgetxattr \ -+ setxattr fsetxattr lsetxattr \ -+ listxattr flistxattr llistxattr -+ do -+ as_ac_Search=`$as_echo "ac_cv_search_$i" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing $i" >&5 -+$as_echo_n "checking for library containing $i... " >&6; } -+if eval \${$as_ac_Search+:} false; then : - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lattr $LIBS" -+ ac_func_search_save_LIBS=$LIBS - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -35066,68 +35019,57 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ - #ifdef __cplusplus - extern "C" - #endif --char fgetxattr (); -+char $i (); - int - main () - { --return fgetxattr (); -+return $i (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_attr_fgetxattr=yes --else -- ac_cv_lib_attr_fgetxattr=no -+for ac_lib in '' attr; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ eval "$as_ac_Search=\$ac_res" - fi - rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_fgetxattr" >&5 --$as_echo "$ac_cv_lib_attr_fgetxattr" >&6; } --if test "x$ac_cv_lib_attr_fgetxattr" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBATTR 1 --_ACEOF -- -- LIBS="-lattr $LIBS" -- -+ conftest$ac_exeext -+ if eval \${$as_ac_Search+:} false; then : -+ break - fi -+done -+if eval \${$as_ac_Search+:} false; then : - -- if test "$ac_cv_lib_attr_fgetxattr" = yes; then -- TAR_LIB_ATTR_TRUE= -- TAR_LIB_ATTR_FALSE='#' - else -- TAR_LIB_ATTR_TRUE='#' -- TAR_LIB_ATTR_FALSE= -+ eval "$as_ac_Search=no" -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS - fi -+eval ac_res=\$$as_ac_Search -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+eval ac_res=\$$as_ac_Search -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -- if test "$ac_cv_header_attr_xattr_h" = yes; then -- for ac_func in getxattr fgetxattr lgetxattr \ -- setxattr fsetxattr lsetxattr \ -- listxattr flistxattr llistxattr --do : -- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" --if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- # only when functions are present -+fi - --$as_echo "#define HAVE_ATTR_XATTR_H 1" >>confdefs.h -+ eval found=\$ac_cv_search_$i -+ test "$found" = "no" && break -+ done - -- if test "$with_xattrs" != no; then -+ if test "$found" != no; then - - $as_echo "#define HAVE_XATTRS /**/" >>confdefs.h - - fi -- --fi --done -- -- fi - fi - - -@@ -38187,18 +37836,10 @@ if test -z "${TAR_COND_XATTR_H_TRUE}" && - as_fn_error $? "conditional \"TAR_COND_XATTR_H\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi --if test -z "${TAR_LIB_ATTR_TRUE}" && test -z "${TAR_LIB_ATTR_FALSE}"; then -- as_fn_error $? "conditional \"TAR_LIB_ATTR\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 --fi - if test -z "${TAR_COND_XATTR_H_TRUE}" && test -z "${TAR_COND_XATTR_H_FALSE}"; then - as_fn_error $? "conditional \"TAR_COND_XATTR_H\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi --if test -z "${TAR_LIB_ATTR_TRUE}" && test -z "${TAR_LIB_ATTR_FALSE}"; then -- as_fn_error $? "conditional \"TAR_LIB_ATTR\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 --fi - if test -z "${TAR_COND_GRANTPT_TRUE}" && test -z "${TAR_COND_GRANTPT_FALSE}"; then - as_fn_error $? "conditional \"TAR_COND_GRANTPT\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/archivers/gtar-base/patches/patch-gnu_readlinkat.c b/archivers/gtar-base/patches/patch-gnu_readlinkat.c index 7f4e82cb1ce..b0de14710c1 100644 --- a/archivers/gtar-base/patches/patch-gnu_readlinkat.c +++ b/archivers/gtar-base/patches/patch-gnu_readlinkat.c @@ -1,14 +1,14 @@ -$NetBSD: patch-gnu_readlinkat.c,v 1.1 2014/03/18 09:03:26 obache Exp $ +$NetBSD: patch-gnu_readlinkat.c,v 1.2 2016/05/31 15:04:51 mef Exp $ * workaround for NetBSD-5.x, readlink is defined as a macro. ---- gnu/readlinkat.c.orig 2013-06-29 05:54:25.000000000 +0000 -+++ gnu/readlinkat.c -@@ -41,6 +41,7 @@ - #define AT_FUNC_POST_FILE_PARAM_DECLS , char *buf, size_t len - #define AT_FUNC_POST_FILE_ARGS , buf, len - #define AT_FUNC_RESULT ssize_t -+#undef readlink - #include "at-func.c" - #undef AT_FUNC_NAME - #undef AT_FUNC_F1 +--- gnu/readlinkat.c.orig 2015-08-24 19:08:25.000000000 +0900 ++++ gnu/readlinkat.c 2016-05-31 23:53:11.000000000 +0900 +@@ -69,6 +69,7 @@ rpl_readlinkat (int fd, char const *file + # define AT_FUNC_POST_FILE_PARAM_DECLS , char *buf, size_t len + # define AT_FUNC_POST_FILE_ARGS , buf, len + # define AT_FUNC_RESULT ssize_t ++# undef readlink + # include "at-func.c" + # undef AT_FUNC_NAME + # undef AT_FUNC_F1 diff --git a/archivers/gtar-base/patches/patch-src_Makefile.in b/archivers/gtar-base/patches/patch-src_Makefile.in deleted file mode 100644 index 86cfc2ff0c2..00000000000 --- a/archivers/gtar-base/patches/patch-src_Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-src_Makefile.in,v 1.3 2014/08/21 20:44:16 wiz Exp $ - -* Make GNU tar 1.28 detect the presence of the GNU/Linux xattrs - interface it expects. - - Upstream report: - - https://lists.gnu.org/archive/html/bug-tar/2014-08/msg00001.html - ---- src/Makefile.in.orig 2014-07-27 20:33:48.000000000 +0000 -+++ src/Makefile.in -@@ -99,7 +99,6 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - bin_PROGRAMS = tar$(EXEEXT) --@TAR_LIB_ATTR_TRUE@am__append_1 = -lattr - subdir = src - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS) -@@ -1225,8 +1224,7 @@ tar_SOURCES = \ - AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../ -I../gnu -I$(top_srcdir)/lib -I../lib - AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) - LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV) --tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) \ -- $(LIB_SELINUX) $(am__append_1) -+tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) - all: all-am - - .SUFFIXES: diff --git a/archivers/gtar/Makefile.common b/archivers/gtar/Makefile.common index 215b155e1a3..c493dd412c1 100644 --- a/archivers/gtar/Makefile.common +++ b/archivers/gtar/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.1 2014/08/17 16:28:18 wiz Exp $ +# $NetBSD: Makefile.common,v 1.2 2016/05/31 15:04:51 mef Exp $ # # used by archivers/gtar-base/Makefile # used by archivers/gtar-info/Makefile # used by archivers/gtar/Makefile -DISTNAME= tar-1.28 +DISTNAME= tar-1.29 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_GNU:=tar/} EXTRACT_SUFX= .tar.bz2 |