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

[bdwalton at users.sourceforge.net]

Revision: 8007
          http://gar.svn.sourceforge.net/gar/?rev=8007&view=rev
Author:   bdwalton
Date:     2010-01-15 02:54:14 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
coreutils: update patch for new version

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

Modified: csw/mgar/pkg/coreutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/coreutils/trunk/checksums	2010-01-15 02:35:56 UTC (rev 8006)
+++ csw/mgar/pkg/coreutils/trunk/checksums	2010-01-15 02:54:14 UTC (rev 8007)
@@ -1,2 +1,2 @@
-0fde2b11f34c49995765566acf6cd5b4  0001-Fix-solaris-acl-support-breakage.patch
+2d8837f7ca6d422837bcdb2be4ab28bb  0001-Fix-solaris-acl-support-breakage.patch
 56f549854d723d9dcebb77919019df55  coreutils-8.4.tar.gz

Modified: 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-01-15 02:35:56 UTC (rev 8006)
+++ csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch	2010-01-15 02:54:14 UTC (rev 8007)
@@ -1,7 +1,7 @@
-From bd8c66a7789d05bee45a162adf3f6f488fde75bf Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at artsci.utoronto.ca>
-Date: Wed, 25 Nov 2009 04:59:51 +0100
-Subject: [PATCH 1/2] Fix solaris acl support breakage
+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
@@ -9,46 +9,46 @@
 This patch allows utilities that work with ACL's to handle the
 difference properly.
 
-Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
+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..bfacf20 100644
+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;
+         {
+-          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;
- 	}
+         {
+           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
+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;
+-        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.