[csw-devel] SF.net SVN: gar:[9643] csw/mgar/pkg/coreutils/trunk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Thu Apr 15 05:00:39 CEST 2010
Revision: 9643
http://gar.svn.sourceforge.net/gar/?rev=9643&view=rev
Author: bdwalton
Date: 2010-04-15 03:00:39 +0000 (Thu, 15 Apr 2010)
Log Message:
-----------
coreutils: use sos12 now; tweak build deps; force link against -lgen; almost done...
Modified Paths:
--------------
csw/mgar/pkg/coreutils/trunk/Makefile
csw/mgar/pkg/coreutils/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch
Removed Paths:
-------------
csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch
csw/mgar/pkg/coreutils/trunk/files/autoconf.diff
Modified: csw/mgar/pkg/coreutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/coreutils/trunk/Makefile 2010-04-14 21:38:03 UTC (rev 9642)
+++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-04-15 03:00:39 UTC (rev 9643)
@@ -8,11 +8,12 @@
OPT_FLAGS_GCC = -O1 -pipe
# building with gcc gets us extra tools (eg: stdbuf)
-GARCOMPILER = GCC4
+# GARCOMPILER = GCC4
SHELL = /opt/csw/bin/bash
-BUILD_DEP_PKGS = CSWbash
+BUILD_DEP_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit
+BUILD_DEP_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash
RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt CSWlibgmp
@@ -25,11 +26,8 @@
MASTER_SITES = $(GNU_MIRROR)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch
+PATCHFILES = 0001-Enhance-Solaris-ACL-error-handling.patch
-BUILD_DEP_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit
-BUILD_DEP_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash
-
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -41,9 +39,11 @@
CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/
CONFIGURE_ARGS += --enable-no-install-program=chcon
-#TEST_TARGET = check
-TEST_TARGET =
+# required for eaccess and not picked up automatically.
+EXTRA_LDFLAGS = -lgen
+TEST_TARGET = check
+
include gar/category.mk
PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
Modified: csw/mgar/pkg/coreutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/coreutils/trunk/checksums 2010-04-14 21:38:03 UTC (rev 9642)
+++ csw/mgar/pkg/coreutils/trunk/checksums 2010-04-15 03:00:39 UTC (rev 9643)
@@ -1,2 +1,2 @@
-2d8837f7ca6d422837bcdb2be4ab28bb 0001-Fix-solaris-acl-support-breakage.patch
+f3903b1c38fd72456ae73af39ac2fec6 0001-Enhance-Solaris-ACL-error-handling.patch
56f549854d723d9dcebb77919019df55 coreutils-8.4.tar.gz
Added: csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch
===================================================================
--- csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch (rev 0)
+++ csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch 2010-04-15 03:00:39 UTC (rev 9643)
@@ -0,0 +1,58 @@
+From a06d449a84a393d2d764a0d7871840cb99f665d7 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at artsci.utoronto.ca>
+Date: Thu, 11 Feb 2010 04:43:29 +0100
+Subject: [PATCH] Enhance Solaris ACL error handling
+
+Gracefully handle EOPNOTSUPP in qcopy_acl and qset_acl. These
+functions, as used in coreutils, were causing the test suite to fail
+on Solaris 8 i386 with ZFS-backed NFSv3 mounts. The failures included
+errors such as:
+
+FAIL: cp/backup-dir
+cp: preserving permissions for `y/x': Operation not supported on
+transport endpoint
+
+Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
+---
+ lib/copy-acl.c | 4 ++--
+ lib/set-mode-acl.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/copy-acl.c b/lib/copy-acl.c
+index 1e82240..e187cda 100644
+--- a/lib/copy-acl.c
++++ b/lib/copy-acl.c
+@@ -294,7 +294,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
+
+ if (count < 0)
+ {
+- if (errno == ENOSYS || errno == ENOTSUP)
++ if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP)
+ {
+ count = 0;
+ entries = NULL;
+@@ -358,7 +358,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
+ if (ret < 0 && saved_errno == 0)
+ {
+ saved_errno = errno;
+- if (errno == ENOSYS && !acl_nontrivial (count, entries))
++ if ((errno == ENOSYS || errno == EOPNOTSUPP) && !acl_nontrivial (count, entries))
+ saved_errno = 0;
+ }
+ else
+diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c
+index c5b4726..2cd2c75 100644
+--- a/lib/set-mode-acl.c
++++ b/lib/set-mode-acl.c
+@@ -387,7 +387,7 @@ qset_acl (char const *name, int desc, mode_t mode)
+ ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries);
+ if (ret < 0)
+ {
+- if (errno == ENOSYS)
++ if (errno == ENOSYS || errno == EOPNOTSUPP)
+ return chmod_or_fchmod (name, desc, mode);
+ return -1;
+ }
+--
+1.6.6
+
Deleted: csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch
===================================================================
--- csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2010-04-14 21:38:03 UTC (rev 9642)
+++ csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2010-04-15 03:00:39 UTC (rev 9643)
@@ -1,55 +0,0 @@
-From 8d4aa48bc66f346db116dd2fe4aa524e1362897f Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Fri, 15 Jan 2010 03:43:16 +0100
-Subject: [PATCH] Fix solaris acl support breakage
-
-Solaris has support for ACL's on NFS, but only in certain combinations
-of client and server. When ACL operations are attempted in
-unsupported situations, EOPNOTSUPP can be returned instead of ENOSYS.
-This patch allows utilities that work with ACL's to handle the
-difference properly.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- lib/copy-acl.c | 4 ++--
- lib/set-mode-acl.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/copy-acl.c b/lib/copy-acl.c
-index 1e82240..6a21aeb 100644
---- a/lib/copy-acl.c
-+++ b/lib/copy-acl.c
-@@ -294,7 +294,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
-
- if (count < 0)
- {
-- if (errno == ENOSYS || errno == ENOTSUP)
-+ if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP)
- {
- count = 0;
- entries = NULL;
-@@ -358,7 +358,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
- if (ret < 0 && saved_errno == 0)
- {
- saved_errno = errno;
-- if (errno == ENOSYS && !acl_nontrivial (count, entries))
-+ if ((errno == ENOSYS || errno == EOPNOTSUPP) && !acl_nontrivial (count, entries))
- saved_errno = 0;
- }
- else
-diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c
-index c5b4726..2cd2c75 100644
---- a/lib/set-mode-acl.c
-+++ b/lib/set-mode-acl.c
-@@ -387,7 +387,7 @@ qset_acl (char const *name, int desc, mode_t mode)
- ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries);
- if (ret < 0)
- {
-- if (errno == ENOSYS)
-+ if (errno == ENOSYS || errno == EOPNOTSUPP)
- return chmod_or_fchmod (name, desc, mode);
- return -1;
- }
---
-1.6.5.1
-
Deleted: csw/mgar/pkg/coreutils/trunk/files/autoconf.diff
===================================================================
--- csw/mgar/pkg/coreutils/trunk/files/autoconf.diff 2010-04-14 21:38:03 UTC (rev 9642)
+++ csw/mgar/pkg/coreutils/trunk/files/autoconf.diff 2010-04-15 03:00:39 UTC (rev 9643)
@@ -1,12 +0,0 @@
-Binary files coreutils-5.94.orig/.NEWS.swp and coreutils-5.94/.NEWS.swp differ
-diff --speed-large-files --minimal -Nru coreutils-5.94.orig/Makefile.in coreutils-5.94/Makefile.in
---- coreutils-5.94.orig/Makefile.in 2006-02-17 17:48:18.641296000 -0500
-+++ coreutils-5.94/Makefile.in 2006-02-17 17:46:42.922854000 -0500
-@@ -384,7 +384,6 @@
- esac;
-
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-- $(SHELL) ./config.status --recheck
-
- $(top_srcdir)/configure: $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
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