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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Jun 29 16:13:59 CEST 2011


Revision: 14939
          http://gar.svn.sourceforge.net/gar/?rev=14939&view=rev
Author:   dmichelsen
Date:     2011-06-29 14:13:59 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
gtar: Update to 1.26, remove artifacts

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

Removed 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-06-29 14:12:42 UTC (rev 14938)
+++ csw/mgar/pkg/gtar/trunk/Makefile	2011-06-29 14:13:59 UTC (rev 14939)
@@ -1,5 +1,5 @@
 NAME = tar
-VERSION = 1.25
+VERSION = 1.26
 CATEGORIES = utils
 
 DESCRIPTION = GNU tape archiver
@@ -17,34 +17,18 @@
 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
+VENDOR_URL = http://www.gnu.org/software/tar/
 
-PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
-
 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
-
-VENDOR_URL = http://www.gnu.org/software/tar/
-
 BUILD_DEP_PKGS = CSWgcpio
-RUNTIME_DEP_PKGS_CSWgtar += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWgtar += CSWlibintl8
 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
-# As suggested in http://lists.gnu.org/archive/html/bug-tar/2010-11/msg00073.html
-CONFIGURE_ARGS-sol5.9 += gl_cv_func_futimesat_works=yes
-CONFIGURE_ARGS += $(CONFIGURE_ARGS-sol$(GAROSREL))
-TEST_TARGET = check
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 

Modified: csw/mgar/pkg/gtar/trunk/checksums
===================================================================
--- csw/mgar/pkg/gtar/trunk/checksums	2011-06-29 14:12:42 UTC (rev 14938)
+++ csw/mgar/pkg/gtar/trunk/checksums	2011-06-29 14:13:59 UTC (rev 14939)
@@ -1 +1 @@
-0e48e9e473a72f135d0ebbc8af2762cc  tar-1.25.tar.gz
+00d1e769c6af702c542cca54b728920d  tar-1.26.tar.gz

Deleted: csw/mgar/pkg/gtar/trunk/files/verify.diff
===================================================================
--- csw/mgar/pkg/gtar/trunk/files/verify.diff	2011-06-29 14:12:42 UTC (rev 14938)
+++ csw/mgar/pkg/gtar/trunk/files/verify.diff	2011-06-29 14:13:59 UTC (rev 14939)
@@ -1,25 +0,0 @@
-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);
-     }

Deleted: csw/mgar/pkg/gtar/trunk/files/xgetcwd.diff
===================================================================
--- csw/mgar/pkg/gtar/trunk/files/xgetcwd.diff	2011-06-29 14:12:42 UTC (rev 14938)
+++ csw/mgar/pkg/gtar/trunk/files/xgetcwd.diff	2011-06-29 14:13:59 UTC (rev 14939)
@@ -1,18 +0,0 @@
---- 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.


More information about the devel mailing list