pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers (pkgsrc)



details:   https://anonhg.NetBSD.org/pkgsrc/rev/050c677eb3ff
branches:  trunk
changeset: 347841:050c677eb3ff
user:      mef <mef%pkgsrc.org@localhost>
date:      Tue May 31 15:04:51 2016 +0000

description:
(pkgsrc)
- two patches are removed, upstream change
(upstream)
- Updated archivers/gtar      to 1.29
  Updated archivers/gtar-base to 1.29
  Updated archivers/gtar-info to 1.29
------------------------------------
version 1.29 - Sergey Poznyakoff, 2016-05-16

* New options: --verbatim-files-from, --no-verbatim-files-from

The --verbatim-files-from option instructs tar to treat each line read
from a file list as a file name, even if it starts with a dash.

File lists are supplied with the --files-from (-T) option.  By
default, each line read from a file list is first stripped off the
leading and trailing whitespace and, if the result begins with a dash,
it is treated as tar command line option.

Use the --verbatim-files-from option to disable this special handling.
This facilitates the use of tar with file lists created automatically
(e.g. by find(1) command).

This option affects all --files-from options that occur after it in
the command line.  Its effect is reverted by the
--no-verbatim-files-from option.

* --null option reads file names verbatim

The --null option implies --verbatim-files-from.  I.e. each line
read from null-delimited file lists is treated as a file name.

This restores the documented behavior, which was broken in version
1.27.

* New options: --owner-map=FILE and --group-map=FILE

These two options provide fine-grained control over what user/group
names (or IDs) should be mapped when adding files to archive.

For both options, FILE is a plain text file with user or group
mappings.  Empty lines are ignored.  Comments are introduced with
# sign (unless quoted) and extend to the end of the corresponding
line.  Each non-empty line defines translation for a single UID (GID).
It must consist of two fields, delimited by any amount of whitespace:

     OLDNAME NEWNAME[:NEWID]

OLDNAME is either a valid user (group) name or a ID prefixed with +.  Unless
NEWID is supplied, NEWNAME must also be either a valid name or a
+ID.  Otherwise, both NEWNAME and NEWID need not be listed in the
system user database.

* New option --clamp-mtime

The new --clamp-mtime option changes the behavior of --mtime to only
use the time specified if the file mtime is newer than the given time.
The --clamp-mtime option can only be used together with --mtime.

Typical use case is to make builds reproducible: to loose less
information, it's better to keep the original date of an archive,
except for files modified during the build process. In that case, using
reference (and thus reproducible) timestamps for the latter is good
enough.

See <https://wiki.debian.org/ReproducibleBuilds> for more information.

* Deprecated --preserve option removed

* Sparse file detection

Tar now uses SEEK_DATA/SEEK_HOLE on systems that support it.  This
allows for considerable speed-up in sparse-file detection.

New option --hole-detection is provided, that allows the user to
select the algorithm used for hole detection.  Available arguments
are:

  --hole-detection=seek
     Use lseek(2) SEEK_DATA and SEEK_HOLE "whence" parameters.

  --hole-detection=raw
     Scan entire file before storing it to determine where holes
     are located.

The default is to use "seek" whenever possible, and fall back to
"raw" otherwise.

diffstat:

 archivers/gtar-base/Makefile                       |    3 +-
 archivers/gtar-base/distinfo                       |   14 +-
 archivers/gtar-base/patches/patch-configure        |  207 ---------------------
 archivers/gtar-base/patches/patch-gnu_readlinkat.c |   22 +-
 archivers/gtar-base/patches/patch-src_Makefile.in  |   29 --
 archivers/gtar/Makefile.common                     |    4 +-
 6 files changed, 20 insertions(+), 259 deletions(-)

diffs (truncated from 328 to 300 lines):

diff -r b08c6fc34d65 -r 050c677eb3ff archivers/gtar-base/Makefile
--- a/archivers/gtar-base/Makefile      Tue May 31 14:06:04 2016 +0000
+++ b/archivers/gtar-base/Makefile      Tue May 31 15:04:51 2016 +0000
@@ -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 -r b08c6fc34d65 -r 050c677eb3ff archivers/gtar-base/distinfo
--- a/archivers/gtar-base/distinfo      Tue May 31 14:06:04 2016 +0000
+++ b/archivers/gtar-base/distinfo      Tue May 31 15:04:51 2016 +0000
@@ -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 -r b08c6fc34d65 -r 050c677eb3ff archivers/gtar-base/patches/patch-configure
--- a/archivers/gtar-base/patches/patch-configure       Tue May 31 14:06:04 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r b08c6fc34d65 -r 050c677eb3ff archivers/gtar-base/patches/patch-gnu_readlinkat.c
--- a/archivers/gtar-base/patches/patch-gnu_readlinkat.c        Tue May 31 14:06:04 2016 +0000
+++ b/archivers/gtar-base/patches/patch-gnu_readlinkat.c        Tue May 31 15:04:51 2016 +0000
@@ -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 -r b08c6fc34d65 -r 050c677eb3ff archivers/gtar-base/patches/patch-src_Makefile.in
--- a/archivers/gtar-base/patches/patch-src_Makefile.in Tue May 31 14:06:04 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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



Home | Main Index | Thread Index | Old Index