changeset 154:55225e51a9cb

7027121 GNU tar 1.26 7025094 gtar version 1.25 in 139100-05 creates empty incremental backup files when run with --one-filesystem
author Petr Sumbera <petr.sumbera@oracle.com>
date Mon, 28 Mar 2011 11:53:26 -0700
parents b6b8b3648e20
children 0727b36f1770
files components/gtar/Makefile components/gtar/gtar.license components/gtar/gtar.p5m components/gtar/patches/verify.patch components/gtar/patches/xgetcwd.patch
diffstat 5 files changed, 16 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/components/gtar/Makefile	Sat Mar 12 16:08:04 2011 -0800
+++ b/components/gtar/Makefile	Mon Mar 28 11:53:26 2011 -0700
@@ -23,10 +23,10 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tar
-COMPONENT_VERSION=	1.25
+COMPONENT_VERSION=	1.26
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
-COMPONENT_ARCHIVE_HASH=	sha1:0f0c090e51d127cbeffbb9aeeb90db1181d82aed
+COMPONENT_ARCHIVE_HASH=	sha1:70f298c3cd997b694864c55e6d8655324c87a0cc
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/tar/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
@@ -51,9 +51,7 @@
 
 build:		$(BUILD_32)
 
-install: $(PROTOUSRSHAREMAN1DIR) $(INSTALL_32) \
-    $(PROTOGNULINKS) $(PROTOGNUMAN1LINKS) $(PROTOSFWLINKS)
-	$(CP) -f $(COMPONENT_DIR)/gtar.1.sunman $(PROTOUSRSHAREMAN1DIR)/gtar.1
+install:	$(INSTALL_32)
 
 test: build
 	@cd $(BUILD_DIR_32); $(MAKE) check
--- a/components/gtar/gtar.license	Sat Mar 12 16:08:04 2011 -0800
+++ b/components/gtar/gtar.license	Mon Mar 28 11:53:26 2011 -0700
@@ -5,8 +5,7 @@
 the language indicating that GPLv3 or any later version may be used.
 =============================================================================
 
-Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001,
-2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 
 
 		    GNU GENERAL PUBLIC LICENSE
--- a/components/gtar/gtar.p5m	Sat Mar 12 16:08:04 2011 -0800
+++ b/components/gtar/gtar.p5m	Mon Mar 28 11:53:26 2011 -0700
@@ -154,7 +154,7 @@
 file path=usr/share/locale/vi/LC_MESSAGES/tar.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/tar.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/tar.mo
-file path=usr/share/man/man1/gtar.1
+file gtar.1.sunman path=usr/share/man/man1/gtar.1
 link path=usr/gnu/bin/tar target=../../bin/gtar
 link path=usr/gnu/share/man/man1/tar.1 \
     target=../../../../share/man/man1/gtar.1
--- a/components/gtar/patches/verify.patch	Sat Mar 12 16:08:04 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-From 24214ca5d506f56dc0cb2a2e1312256472039475 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 15 Nov 2010 08:07:53 +0000
-Subject: tar: fix --verify option, which broke in 1.24
-
-* src/compare.c (verify_volume): Decode the header before invoking
-diff_archive, as diff_archive no longer does this as of the
-2010-06-28 commit.  Also, don't try to invoke diff_archive on a
-zero block.
----
-diff --git a/src/compare.c b/src/compare.c
-index 6b7e6d8..f3112c6 100644
---- a/src/compare.c
-+++ b/src/compare.c
-@@ -611,8 +611,10 @@ verify_volume (void)
- 		       (0, 0, _("A lone zero block at %s"),
- 			STRINGIFY_BIGINT (current_block_ordinal (), buf)));
-             }
-+	  continue;
- 	}
- 
-+      decode_header (current_header, &current_stat_info, &current_format, 1);
-       diff_archive ();
-       tar_stat_destroy (&current_stat_info);
-     }
--- a/components/gtar/patches/xgetcwd.patch	Sat Mar 12 16:08:04 2011 -0800
+++ b/components/gtar/patches/xgetcwd.patch	Mon Mar 28 11:53:26 2011 -0700
@@ -1,6 +1,14 @@
---- tar-1.25/gnu/xgetcwd.c.orig	Mon Nov  8 06:23:04 2010
-+++ tar-1.25/gnu/xgetcwd.c	Mon Nov  8 06:29:04 2010
-@@ -36,7 +36,14 @@
+--- tar-1.26/gnu/xgetcwd.c.orig	Thu Mar 17 12:53:26 2011
++++ tar-1.26/gnu/xgetcwd.c	Thu Mar 17 12:53:35 2011
+@@ -26,6 +26,7 @@
+ 
+ #include <errno.h>
+ #include <unistd.h>
++#include <limits.h>
+ 
+ #include "xalloc.h"
+ 
+@@ -36,7 +37,14 @@
  char *
  xgetcwd (void)
  {