[csw-devel] SF.net SVN: gar:[7386] csw/mgar/pkg/coreutils/trunk

[bdwalton at users.sourceforge.net]

Revision: 7386
          http://gar.svn.sourceforge.net/gar/?rev=7386&view=rev
Author:   bdwalton
Date:     2009-11-22 22:02:52 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
coreutils: add patch to fix test breakages; add more configure options

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

Added Paths:
-----------
    csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch

Modified: csw/mgar/pkg/coreutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/coreutils/trunk/Makefile	2009-11-22 21:35:18 UTC (rev 7385)
+++ csw/mgar/pkg/coreutils/trunk/Makefile	2009-11-22 22:02:52 UTC (rev 7386)
@@ -9,9 +9,9 @@
 Previously these utilities were offered as three individual sets of GNU utilities, Fileutils, Shellutils, and Textutils. Those three have been combined into a single set of utilities called Coreutils.
 endef
 
-
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch
 
 PREREQUISITE_PKGS =  CSWautomake CSWautoconf CSWbison CSWggettext CSWgit
 PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash
@@ -22,7 +22,9 @@
 sysconfdir = /etc/opt/csw
 localstatedir = /var/opt/csw
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --disable-acl --program-prefix=g
+CONFIGURE_ARGS += --program-prefix=g
+CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/
+CONFIGURE_ARGS += --with-iconv-prefix=/opt/csw/
 
 TEST_ARGS = check
 

Modified: csw/mgar/pkg/coreutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/coreutils/trunk/checksums	2009-11-22 21:35:18 UTC (rev 7385)
+++ csw/mgar/pkg/coreutils/trunk/checksums	2009-11-22 22:02:52 UTC (rev 7386)
@@ -1 +1,2 @@
+ed529e3abbc0fb76d2e13f5202f59932  0001-Fix-solaris-acl-support-breakage.patch
 4cde9f31604f4da188ed302ca55545ea  coreutils-8.1.tar.gz

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch	2009-11-22 22:02:52 UTC (rev 7386)
@@ -0,0 +1,54 @@
+From 2f1eeb8502a426f38189d24760d52760448cd2ae Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sun, 22 Nov 2009 18:29:07 +0100
+Subject: [PATCH] Fix solaris acl support breakage
+
+In the standard solaris acl support, ENOSYS was handled cleanly. This
+patch makes the code path handle EOPNOTSUPP identically to ENOSYS,
+preventing errors when attempting to a pply acl's on filesystems that
+don't implement the acl api (NFS).
+
+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 af85a08..346dd5c 100644
+--- a/lib/copy-acl.c
++++ b/lib/copy-acl.c
+@@ -253,7 +253,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
+ 
+       if (ace_count < 0)
+ 	{
+-	  if (errno == ENOSYS || errno == EINVAL)
++	  if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
+ 	    {
+ 	      ace_count = 0;
+ 	      ace_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 ddac4df..fdc74f2 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
+


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