[csw-devel] SF.net SVN: gar:[13039] csw/mgar/pkg/gtar/trunk

[dmichelsen at users.sourceforge.net]

Revision: 13039
          http://gar.svn.sourceforge.net/gar/?rev=13039&view=rev
Author:   dmichelsen
Date:     2011-01-21 12:52:32 +0000 (Fri, 21 Jan 2011)

Log Message:
-----------
gtar: Add necessary patches

Modified Paths:
--------------
    csw/mgar/pkg/gtar/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/gtar/trunk/files/verify.diff
    csw/mgar/pkg/gtar/trunk/files/xgetcwd.diff

Modified: csw/mgar/pkg/gtar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtar/trunk/Makefile	2011-01-21 11:31:56 UTC (rev 13038)
+++ csw/mgar/pkg/gtar/trunk/Makefile	2011-01-21 12:52:32 UTC (rev 13039)
@@ -17,24 +17,32 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
+# These two patches are from
+#   http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/gtar/Patches/
+PATCHFILES += verify.diff
+PATCHFILES += xgetcwd.diff
+
 PACKAGES = CSWgtar
+CATALOGNAME_CSWgtar = gtar
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-SPKG_SOURCEURL = http://www.gnu.org/software/tar/
+VENDOR_URL = http://www.gnu.org/software/tar/
 
 BUILD_DEP_PKGS = CSWgcpio
-RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWgcpio
+RUNTIME_DEP_PKGS_CSWgtar += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWgtar += CSWiconv
+RUNTIME_DEP_PKGS_CSWgtar += CSWgcpio
 
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g
 CONFIGURE_ARGS += --with-rmt=/opt/csw/libexec/grmt
-TEST_SCRIPTS =
+TEST_TARGET = check
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
-CHECKPKG_OVERRIDES_CSWgtar += surplus-dependency|CSWgcpio
+CHECKPKG_OVERRIDES_CSWgtar += file-with-bad-content|/usr/local|root/opt/csw/share/info/tar.info-1
 
 include gar/category.mk
 

Added: csw/mgar/pkg/gtar/trunk/files/verify.diff
===================================================================
--- csw/mgar/pkg/gtar/trunk/files/verify.diff	                        (rev 0)
+++ csw/mgar/pkg/gtar/trunk/files/verify.diff	2011-01-21 12:52:32 UTC (rev 13039)
@@ -0,0 +1,25 @@
+From 24214ca5d506f56dc0cb2a2e1312256472039475 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert at 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);
+     }

Added: csw/mgar/pkg/gtar/trunk/files/xgetcwd.diff
===================================================================
--- csw/mgar/pkg/gtar/trunk/files/xgetcwd.diff	                        (rev 0)
+++ csw/mgar/pkg/gtar/trunk/files/xgetcwd.diff	2011-01-21 12:52:32 UTC (rev 13039)
@@ -0,0 +1,18 @@
+--- 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 @@
+ char *
+ xgetcwd (void)
+ {
+-  char *cwd = getcwd (NULL, 0);
++  char *cwd;
++#ifdef HAVE_PARTLY_WORKING_GETCWD
++  cwd = getcwd (NULL, 0);
++#else
++  cwd = malloc(PATH_MAX);
++  if (cwd)
++    getcwd (cwd, PATH_MAX);
++#endif
+   if (! cwd && errno == ENOMEM)
+     xalloc_die ();
+   return cwd;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.