rpms/acl/F-8 acl-2.2.39-exitcode.patch, NONE, 1.1 acl-2.2.39-walk.patch, 1.3, 1.4 acl.spec, 1.45, 1.46

[Jiří Moskovčák (jmoskovc)]

Author: jmoskovc

Update of /cvs/extras/rpms/acl/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11737

Modified Files:
	acl-2.2.39-walk.patch acl.spec 
Added Files:
	acl-2.2.39-exitcode.patch 
Log Message:
Fixed setfacl exitcodes

acl-2.2.39-exitcode.patch:

--- NEW FILE acl-2.2.39-exitcode.patch ---
--- acl-2.2.39/setfacl/setfacl.c.exitcode	2007-11-08 14:45:01.000000000 +0100
+++ acl-2.2.39/setfacl/setfacl.c	2007-11-08 14:39:19.000000000 +0100
@@ -144,7 +144,7 @@ restore(
 		if (error < 0)
 			goto fail;
 		if (error == 0)
-			return 0;
+			return status;
 
 		if (path_p == NULL) {
 			if (filename) {
@@ -158,6 +158,7 @@ restore(
 						 "aborting\n"),
 					progname, backup_line);
 			}
+			status = 1;
 			goto getout;
 		}
 
@@ -176,6 +177,7 @@ restore(
 			fprintf(stderr, _("%s: %s: %s in line %d\n"),
 			        progname, xquote(filename), strerror(errno),
 				line);
+			status = 1;
 			goto getout;
 		}
 

acl-2.2.39-walk.patch:

Index: acl-2.2.39-walk.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/F-8/acl-2.2.39-walk.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- acl-2.2.39-walk.patch	7 Nov 2007 09:17:30 -0000	1.3
+++ acl-2.2.39-walk.patch	8 Nov 2007 13:56:28 -0000	1.4
@@ -1,5 +1,5 @@
---- acl-2.2.39/getfacl/getfacl.c	2007-11-07 09:49:56.000000000 +0100
-+++ ../devel/acl-2.2.45/getfacl/getfacl.c	2007-11-07 09:53:50.000000000 +0100
+--- acl-2.2.39/getfacl/getfacl.c.old	2007-11-08 14:38:56.000000000 +0100
++++ acl-2.2.39/getfacl/getfacl.c	2007-11-08 14:39:19.000000000 +0100
 @@ -598,17 +598,17 @@ int __do_print(const char *file, const s
  char *resolve_symlinks(const char *file)
  {
@@ -27,3 +27,32 @@
  	return path;
  }
  
+--- acl-2.2.39/setfacl/setfacl.c.old	2006-06-20 08:51:25.000000000 +0200
++++ acl-2.2.39/setfacl/setfacl.c	2007-11-08 14:39:19.000000000 +0100
+@@ -314,17 +316,17 @@ int __do_set(const char *file, const str
+ char *resolve_symlinks(const char *file)
+ {
+ 	static char buffer[4096];
++	struct stat stat;
+ 	char *path = NULL;
+-	ssize_t len;
+ 
+-	len = readlink(file, buffer, sizeof(buffer)-1);
+-	if (len < 0) {
+-		if (errno == EINVAL)	/* not a symlink, use given path */
+-			path = (char *)file;
+-	} else {
+-		buffer[len+1] = '\0';
+-		path = buffer;
+-	}
++	if (lstat(file, &stat) == -1)
++		return path;
++
++	if (S_ISLNK(stat.st_mode) && !opt_walk_physical)
++		path = realpath(file, buffer);
++	else
++		path = (char *)file;    /* not a symlink, use given path */
++
+ 	return path;
+ }
+ 


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/F-8/acl.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- acl.spec	7 Nov 2007 09:17:30 -0000	1.45
+++ acl.spec	8 Nov 2007 13:56:28 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.39
-Release: 11%{?dist}
+Release: 12%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
@@ -12,6 +12,7 @@
 Patch3: acl-2.2.39-walk.patch
 Patch4: acl-2.2.39-params.patch
 Patch5: acl-2.2.39-man.patch
+Patch6: acl-2.2.39-exitcode.patch
 License: GPL
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -52,6 +53,7 @@
 %patch3 -p1 -b .walk
 %patch4 -p1 -b .params
 %patch5 -p1 -b .man
+%patch6 -p1 -b .exitcode
 autoconf
 
 %build
@@ -107,6 +109,9 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Thu Nov  8 2007 Jiri Moskovcak <jmoskovc at redhat.com> 2.2.39-12
+- Fixed setfacl exitcodes
+
 * Wed Nov  7 2007 Jiri Moskovcak <jmoskovc at redhat.com> 2.2.39-11
 - New walk patch backported from upstream