update to tar-1.25

OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=20

tar-1.23.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9328372db62fbb1d94c9e4e3cefc961111af46de47085b635359c00a0eebe36
-size 2189324

tar-1.25.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3f6ce41b8e0f327abd05c95990f113ddafbae131e10f79a99728ed46458494b
+size 2327460

tar-disable-listed02-test.patch

@@ -1,12 +1,12 @@
-Index: tar-1.23/tests/testsuite.at
+Index: tar-1.25/tests/testsuite.at
 ===================================================================
---- tar-1.23.orig/tests/testsuite.at
+--- tar-1.25.orig/tests/testsuite.at
-+++ tar-1.23/tests/testsuite.at
++++ tar-1.25/tests/testsuite.at
-@@ -157,7 +157,6 @@ m4_include([incremental.at])
+@@ -172,7 +172,6 @@ m4_include([incremental.at])
  m4_include([incr01.at])
  m4_include([incr02.at])
  m4_include([listed01.at])
 -m4_include([listed02.at])
+ m4_include([listed03.at])
  m4_include([incr03.at])
  m4_include([incr04.at])
- m4_include([incr05.at])

tar-fortifysourcessigabrt.patch

@@ -1,8 +1,8 @@
-Index: tar-1.23/src/create.c
+Index: tar-1.25/src/create.c
 ===================================================================
---- tar-1.23.orig/src/create.c
+--- tar-1.25.orig/src/create.c
-+++ tar-1.23/src/create.c
++++ tar-1.25/src/create.c
-@@ -530,8 +530,8 @@ start_private_header (const char *name,
+@@ -517,8 +517,8 @@ start_private_header (const char *name,
    GID_TO_CHARS (getgid (), header->header.gid);
    MAJOR_TO_CHARS (0, header->header.devmajor);
    MINOR_TO_CHARS (0, header->header.devminor);
@@ -13,33 +13,7 @@ Index: tar-1.23/src/create.c
    return header;
  }
  
-@@ -575,7 +575,10 @@ write_gnu_long_link (struct tar_stat_inf
+@@ -906,8 +906,8 @@ start_header (struct tar_stat_info *st)
-   GNAME_TO_CHARS (tmpname, header->header.gname);
-   free (tmpname);
- 
--  strcpy (header->header.magic, OLDGNU_MAGIC);
-+  /* OLDGNU_MAGIC is string with 7 chars + NULL */
-+  memcpy (header->header.magic, OLDGNU_MAGIC, sizeof(header->header.magic));
-+  memcpy (header->header.version, OLDGNU_MAGIC+sizeof(header->header.magic),
-+           sizeof(header->header.version));
-   header->header.typeflag = type;
-   finish_header (st, header, -1);
- 
-@@ -910,15 +913,19 @@ start_header (struct tar_stat_info *st)
-       break;
- 
-     case OLDGNU_FORMAT:
--    case GNU_FORMAT:   /*FIXME?*/
--      /* Overwrite header->header.magic and header.version in one blow.  */
--      strcpy (header->header.magic, OLDGNU_MAGIC);
-+    case GNU_FORMAT:
-+      /* OLDGNU_MAGIC is string with 7 chars + NULL */
-+      memcpy (header->header.magic, OLDGNU_MAGIC,
-+              sizeof(header->header.magic));
-+      memcpy (header->header.version,
-+              OLDGNU_MAGIC+sizeof(header->header.magic),
-+              sizeof(header->header.version));
-       break;
  
      case POSIX_FORMAT:
      case USTAR_FORMAT:

tar-manpage.patch

@@ -1,7 +1,7 @@
-Index: tar-1.23/doc/Makefile.am
+Index: tar-1.25/doc/Makefile.am
 ===================================================================
---- tar-1.23.orig/doc/Makefile.am
+--- tar-1.25.orig/doc/Makefile.am
-+++ tar-1.23/doc/Makefile.am
++++ tar-1.25/doc/Makefile.am
 @@ -32,6 +32,9 @@ tar_TEXINFOS = \
   sparse.texi\
   value.texi
@@ -23,10 +23,10 @@ Index: tar-1.23/doc/Makefile.am
  header.texi: $(top_srcdir)/src/tar.h
  	sed -f $(srcdir)/texify.sed $(top_srcdir)/src/tar.h \
  	  | expand >$@
-Index: tar-1.23/Makefile.am
+Index: tar-1.25/Makefile.am
 ===================================================================
---- tar-1.23.orig/Makefile.am
+--- tar-1.25.orig/Makefile.am
-+++ tar-1.23/Makefile.am
++++ tar-1.25/Makefile.am
 @@ -20,7 +20,7 @@
  
  ACLOCAL_AMFLAGS = -I m4
@@ -34,5 +34,5 @@ Index: tar-1.23/Makefile.am
 -SUBDIRS = doc gnu lib rmt src scripts po tests
 +SUBDIRS = gnu lib rmt src doc scripts po tests
  
- dist-hook: 
+ dist-hook:
  	$(MAKE) changelog_dir=$(distdir) ChangeLog

tar-wildcards.patch

@@ -1,9 +1,9 @@
-Index: tar-1.23/src/names.c
+Index: tar-1.25/src/names.c
 ===================================================================
---- tar-1.23.orig/src/names.c
+--- tar-1.25.orig/src/names.c
-+++ tar-1.23/src/names.c
++++ tar-1.25/src/names.c
-@@ -909,10 +909,6 @@ collect_and_sort_names (void)
+@@ -970,10 +970,6 @@ collect_and_sort_names (void)
-     {
+ 
        if (name->found_count || name->directory)
  	continue;
 -      if (name->matching_flags & EXCLUDE_WILDCARDS)

tar.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Tue Nov  9 13:05:29 UTC 2010 - puzel@novell.com
+
+- update to tar-1.25
+  * Fix extraction of empty directories with the -C option in effect.
+  * Fix extraction of device nodes.
+  * Make sure name matching occurs before eventual name transformation.
+  * Fix the behavior of tar -x --overwrite on hosts lacking O_NOFOLLOW.
+  * Support alternative decompression programs.
+- update to tar-1.24
+  * The new --full-time option instructs tar to output file
+    time stamps to the full resolution.
+  * More reliable directory traversal when creating archives
+  * When extracting symbolic links, tar now restores attributes
+    such as last-modified time and link permissions, if the
+    operating system supports this.
+  * The --dereference (-h) option now applies to files that are
+    copied into or out of archives, independently of other options. 
+  * When receiving SIGPIPE, tar would exit with error status and
+    "write error" diagnostics.
+- disable-silent-rules
+- updated tar-fortifysourcessigabrt.patch
+    
 -------------------------------------------------------------------
 Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de
 

tar.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package tar (Version 1.23)
+# spec file for package tar (Version 1.25)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -26,7 +26,7 @@ Group:          System/Base
 Provides:       base:/bin/tar
 PreReq:         %install_info_prereq
 AutoReqProv:    on
-Version:        1.23
+Version:        1.25
 Release:        2
 Summary:        GNU implementation of tar ((t)ape (ar)chiver)
 Source0:        %name-%version.tar.bz2
@@ -98,9 +98,14 @@ automake --force --add-missing
 %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter
 export CFLAGS="$RPM_OPT_FLAGS %my_cflags"
 export RSH="/usr/bin/rsh"
-./configure --prefix=%_prefix --bindir=%_bindir --mandir=%_mandir \
+./configure \
-	    --infodir=%_infodir --build=%{_target_cpu}-suse-linux \
+	--prefix=%_prefix \
-		--enable-backup-scripts
+	--bindir=%_bindir \
+	--mandir=%_mandir \
+	--infodir=%_infodir \
+	--build=%{_target_cpu}-suse-linux \
+	--enable-backup-scripts \
+	--disable-silent-rules
 make %{?_smp_mflags};
 
 %check