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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Oct 7 11:11:39 CEST 2013


Revision: 22152
          http://gar.svn.sourceforge.net/gar/?rev=22152&view=rev
Author:   dmichelsen
Date:     2013-10-07 09:11:38 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
gtar/trunk: Update to 1.27

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

Removed Paths:
-------------
    csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch
    csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch

Modified: csw/mgar/pkg/gtar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtar/trunk/Makefile	2013-10-07 06:51:07 UTC (rev 22151)
+++ csw/mgar/pkg/gtar/trunk/Makefile	2013-10-07 09:11:38 UTC (rev 22152)
@@ -1,5 +1,5 @@
 NAME = tar
-VERSION = 1.26
+VERSION = 1.27
 GARTYPE = v2
 
 DESCRIPTION = GNU tape archiver
@@ -16,19 +16,14 @@
 
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-PATCHFILES += 0001-Partial-working-xgetcwd.patch
 
-# Apply patch from
-#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8230#20
-PATCHFILES += 0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch
-
 VENDOR_URL = http://www.gnu.org/software/tar/
 
 PACKAGES = CSWgtar
 
 BUILD_DEP_PKGS = CSWgcpio
 RUNTIME_DEP_PKGS_CSWgtar += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgtar += CSWiconv
+RUNTIME_DEP_PKGS_CSWgtar += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWgtar += CSWgcpio
 
 NOISALIST = 1
@@ -37,11 +32,6 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
-CHECKPKG_OVERRIDES_CSWgtar += file-with-bad-content|/usr/local|root/opt/csw/share/info/tar.info-1
-
-# Test 56 is failing, reported upstream
-SKIPTEST ?= 1
-
 include gar/category.mk
 
 post-install-modulated:

Modified: csw/mgar/pkg/gtar/trunk/checksums
===================================================================
--- csw/mgar/pkg/gtar/trunk/checksums	2013-10-07 06:51:07 UTC (rev 22151)
+++ csw/mgar/pkg/gtar/trunk/checksums	2013-10-07 09:11:38 UTC (rev 22152)
@@ -1 +1 @@
-00d1e769c6af702c542cca54b728920d  tar-1.26.tar.gz
+9d4bc655d103b871248281db179eb0f5  tar-1.27.tar.gz

Deleted: csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch
===================================================================
--- csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch	2013-10-07 06:51:07 UTC (rev 22151)
+++ csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch	2013-10-07 09:11:38 UTC (rev 22152)
@@ -1,40 +0,0 @@
-From 8f6d3dd4fde6da12ea84807d0afc07ff56a62e10 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 29 Jun 2011 16:38:07 +0200
-Subject: [PATCH] Partial working xgetcwd
-
----
- gnu/xgetcwd.c |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/gnu/xgetcwd.c b/gnu/xgetcwd.c
-index 2f1da89..fd4c2f9 100644
---- a/gnu/xgetcwd.c
-+++ b/gnu/xgetcwd.c
-@@ -26,6 +26,7 @@
- 
- #include <errno.h>
- #include <unistd.h>
-+#include <limits.h>
- 
- #include "xalloc.h"
- 
-@@ -36,7 +37,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;
--- 
-1.7.5.4
-

Deleted: csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch
===================================================================
--- csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch	2013-10-07 06:51:07 UTC (rev 22151)
+++ csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch	2013-10-07 09:11:38 UTC (rev 22152)
@@ -1,63 +0,0 @@
-From 265b9d3dfad6bd260610413f3200f5050e81af49 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 29 Jun 2011 17:16:04 +0200
-Subject: [PATCH] Fix endless recursion when compiling on Solaris 9 and
- running on Solaris 10
-
----
- gnu/sys_stat.in.h |   16 ++++++++++++++--
- 1 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/gnu/sys_stat.in.h b/gnu/sys_stat.in.h
-index 70f43e2..6346bd4 100644
---- a/gnu/sys_stat.in.h
-+++ b/gnu/sys_stat.in.h
-@@ -357,7 +357,11 @@ _GL_WARN_ON_USE (fstatat, "fstatat is not portable - "
- 
- 
- #if @GNULIB_FUTIMENS@
--# if @REPLACE_FUTIMENS@
-+/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our futimens
-+   implementation relies on futimesat, which on Solaris 10 makes an invocation
-+   to futimens that is meant to invoke the libc's futimens(), not gnulib's
-+   futimens().  */
-+# if @REPLACE_FUTIMENS@ || defined __sun
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef futimens
- #   define futimens rpl_futimens
-@@ -370,7 +374,9 @@ _GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2]));
- #  endif
- _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2]));
- # endif
-+# if @HAVE_FUTIMENS@
- _GL_CXXALIASWARN (futimens);
-+# endif
- #elif defined GNULIB_POSIXCHECK
- # undef futimens
- # if HAVE_RAW_DECL_FUTIMENS
-@@ -614,7 +620,11 @@ _GL_WARN_ON_USE (stat, "stat is unportable - "
- 
- 
- #if @GNULIB_UTIMENSAT@
--# if @REPLACE_UTIMENSAT@
-+/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our utimensat
-+   implementation relies on futimesat, which on Solaris 10 makes an invocation
-+   to utimensat that is meant to invoke the libc's utimensat(), not gnulib's
-+   utimensat().  */
-+# if @REPLACE_UTIMENSAT@ || defined __sun
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef utimensat
- #   define utimensat rpl_utimensat
-@@ -633,7 +643,9 @@ _GL_FUNCDECL_SYS (utimensat, int, (int fd, char const *name,
- _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name,
-                                    struct timespec const times[2], int flag));
- # endif
-+# if @HAVE_UTIMENSAT@
- _GL_CXXALIASWARN (utimensat);
-+# endif
- #elif defined GNULIB_POSIXCHECK
- # undef utimensat
- # if HAVE_RAW_DECL_UTIMENSAT
--- 
-1.7.5.4
-

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