rpms/acl/F-7 acl-2.2.39-exitcode.patch, NONE, 1.1 acl-2.2.39-walk.patch, 1.3, 1.4 acl.spec, 1.34, 1.35
Jiří Moskovčák (jmoskovc)
fedora-extras-commits at redhat.com
Thu Nov 8 14:08:32 UTC 2007
Author: jmoskovc
Update of /cvs/extras/rpms/acl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18924
Modified Files:
acl-2.2.39-walk.patch acl.spec
Added Files:
acl-2.2.39-exitcode.patch
Log Message:
Fixed setfacl exitcode
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-7/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:49:31 -0000 1.3
+++ acl-2.2.39-walk.patch 8 Nov 2007 14:08: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-7/acl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- acl.spec 7 Nov 2007 09:49:31 -0000 1.34
+++ acl.spec 8 Nov 2007 14:08:28 -0000 1.35
@@ -1,7 +1,7 @@
Summary: Access control list utilities
Name: acl
Version: 2.2.39
-Release: 5%{?dist}
+Release: 6%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libattr-devel >= 2.4.1
Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_%{version}-1.tar.gz
@@ -9,6 +9,7 @@
Patch1: acl-2.2.39-build.patch
Patch2: acl-2.2.39-path_max.patch
Patch3: acl-2.2.39-walk.patch
+Patch4: acl-2.2.39-exitcode.patch
BuildRequires: autoconf, libtool >= 1.5, gettext
License: GPL
Group: System Environment/Base
@@ -47,6 +48,7 @@
%patch1 -p1 -b .build
%patch2 -p1 -b .path_max
%patch3 -p1 -b .walk
+%patch4 -p1 -b .exitcode
autoconf
%build
@@ -102,6 +104,9 @@
/%{_lib}/libacl.so.*
%changelog
+* Thu Nov 8 2007 Jiri Moskovcak <jmoskovc at redhat.com> 2.2.39-6
+- Fixed setfacl exitcodes
+
* Wed Nov 7 2007 Jiri Moskovcak <jmoskovc at redhat.com> 2.2.39-5
- New walk patch backported from upstream - better symlink handling
More information about the fedora-extras-commits
mailing list