rpms/acl/F-9 acl-2.2.47-params.patch,NONE,1.1 acl.spec,1.48,1.49

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

Author: jmoskovc

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

Modified Files:
	acl.spec 
Added Files:
	acl-2.2.47-params.patch 
Log Message:
Improved params patch (rhbz#457244)
Fixed license tag


acl-2.2.47-params.patch:

--- NEW FILE acl-2.2.47-params.patch ---
--- acl-2.2.47_old/getfacl/getfacl.c	2008-02-07 04:39:57.000000000 +0100
+++ acl-2.2.47/getfacl/getfacl.c	2008-07-31 12:23:10.000000000 +0200
@@ -43,7 +43,7 @@
 #define POSIXLY_CORRECT_STR "POSIXLY_CORRECT"
 
 #if !POSIXLY_CORRECT
-#  define CMD_LINE_OPTIONS "dRLP"
+#  define CMD_LINE_OPTIONS "aceEsRLPtpndvh"
 #endif
 #define POSIXLY_CMD_LINE_OPTIONS "d"
 
@@ -555,23 +555,23 @@ void help(void)
 #if !POSIXLY_CORRECT
 	} else {
 		printf(_(
-"      --access            display the file access control list only\n"
+"  -a,  --access           display the file access control list only\n"
 "  -d, --default           display the default access control list only\n"
-"      --omit-header       do not display the comment header\n"
-"      --all-effective     print all effective rights\n"
-"      --no-effective      print no effective rights\n"
-"      --skip-base         skip files that only have the base entries\n"
+"  -c, --omit-header       do not display the comment header\n"
+"  -e, --all-effective     print all effective rights\n"
+"  -E, --no-effective      print no effective rights\n"
+"  -s, --skip-base         skip files that only have the base entries\n"
 "  -R, --recursive         recurse into subdirectories\n"
 "  -L, --logical           logical walk, follow symbolic links\n"
 "  -P, --physical          physical walk, do not follow symbolic links\n"
-"      --tabular           use tabular output format\n"
-"      --numeric           print numeric user/group identifiers\n"
-"      --absolute-names    don't strip leading '/' in pathnames\n"));
+"  -t, --tabular           use tabular output format\n"
+"  -n, --numeric           print numeric user/group identifiers\n"
+"  -p, --absolute-names    don't strip leading '/' in pathnames\n"));
 	}
 #endif
 	printf(_(
-"      --version           print version and exit\n"
-"      --help              this help text\n"));
+"  -v, --version           print version and exit\n"
+"  -h, --help              this help text\n"));
 }
 
 int main(int argc, char *argv[])
--- acl-2.2.47_old/man/man1/getfacl.1	2008-02-07 04:39:57.000000000 +0100
+++ acl-2.2.47/man/man1/getfacl.1	2008-07-31 11:23:45.000000000 +0200
@@ -12,10 +12,10 @@ getfacl \- get file access control lists
 .SH SYNOPSIS
 
 .B getfacl
-[\-dRLPvh] file ...
+[\-aceEsRLPrpndvh] file ...
 
 .B getfacl
-[\-dRLPvh] \-
+[\-aceEsRLPrpndvh] \-
 
 .SH DESCRIPTION
 For each file, getfacl displays the file name, owner, the group,
@@ -78,22 +78,22 @@ accessing the file mode.
 
 .SS OPTIONS
 .TP 4
-.I \-\-access
+.I \-a, \-\-access
 Display the file access control list.
 .TP
 .I \-d, \-\-default
 Display the default access control list.
 .TP
-.I \-\-omit-header
+.I \-c, \-\-omit-header
 Do not display the comment header (the first three lines of each file's output).
 .TP
-.I \-\-all-effective
+.I \-e, \-\-all-effective
 Print all effective rights comments, even if identical to the rights defined by the ACL entry.
 .TP
-.I \-\-no-effective
+.I \-E, \-\-no-effective
 Do not print effective rights comments.
 .TP
-.I \-\-skip-base
+.I \-s, \-\-skip-base
 Skip files that only have the base ACL entries (owner, group, others).
 .TP
 .I \-R, \-\-recursive
@@ -109,17 +109,20 @@ Physical walk, do not follow symbolic li
 link arguments.
 Only effective in combination with \-R.
 .TP
-.I \-\-tabular
+.I \-t, \-\-tabular
 Use an alternative tabular output format. The ACL and the default ACL are displayed side by side. Permissions that are ineffective due to the ACL mask entry are displayed capitalized. The entry tag names for the ACL_USER_OBJ and ACL_GROUP_OBJ entries are also displayed in capital letters, which helps in spotting those entries.
 .TP
-.I \-\-absolute-names
+.I \-p, \-\-absolute-names
 Do not strip leading slash characters (`/'). The default behavior is to
 strip leading slash characters.
 .TP
-.I \-\-version
+.I \-n, \-\-numeric
+List numeric user and group IDs
+.TP
+.I \-v, \-\-version
 Print the version of getfacl and exit.
 .TP
-.I \-\-help
+.I \-h, \-\-help
 Print help explaining the command line options.
 .TP
 .I \-\-
--- acl-2.2.47_old/man/man1/setfacl.1	2008-02-07 04:39:57.000000000 +0100
+++ acl-2.2.47/man/man1/setfacl.1	2008-07-31 13:53:29.000000000 +0200
@@ -115,10 +115,10 @@ This also skips symbolic link arguments.
 Only effective in combination with \-R.
 This option cannot be mixed with `\-\-restore'.
 .TP 4
-.I \-\-version
+.I \-v, \-\-version
 Print the version of setfacl and exit.
 .TP 4
-.I \-\-help
+.I \-h, \-\-help
 Print help explaining the command line options.
 .TP 4
 .I \-\-
--- acl-2.2.47_old/setfacl/setfacl.c	2008-07-31 11:23:18.000000000 +0200
+++ acl-2.2.47/setfacl/setfacl.c	2008-07-31 12:23:13.000000000 +0200
@@ -42,10 +42,10 @@ extern int do_set(const char *path_p, co
 
 /* '-' stands for `process non-option arguments in loop' */
 #if !POSIXLY_CORRECT
-#  define CMD_LINE_OPTIONS "-:bkndm:M:x:X:RLP"
+#  define CMD_LINE_OPTIONS "-:bkndvhm:M:x:X:RLP"
 #  define CMD_LINE_SPEC "[-bkndRLP] { -m|-M|-x|-X ... } file ..."
 #endif
-#define POSIXLY_CMD_LINE_OPTIONS "-:bkndm:M:x:X:"
+#define POSIXLY_CMD_LINE_OPTIONS "-:bkndvhm:M:x:X:"
 #define POSIXLY_CMD_LINE_SPEC "[-bknd] {-m|-M|-x|-X ... } file ..."
 
 struct option long_options[] = {
@@ -265,8 +265,8 @@ void help(void)
 	}
 #endif
 	printf(_(
-"      --version           print version and exit\n"
-"      --help              this help text\n"));
+"  -v, --version           print version and exit\n"
+"  -h, --help              this help text\n"));
 }
 
 

Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/F-9/acl.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- acl.spec	12 Feb 2008 15:37:16 -0000	1.48
+++ acl.spec	1 Aug 2008 10:46:57 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.47
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
@@ -9,10 +9,10 @@
 Patch0: acl-2.2.3-multilib.patch
 Patch1: acl-2.2.39-build.patch
 Patch2: acl-2.2.39-path_max.patch
-Patch3: acl-2.2.39-params.patch
+Patch3: acl-2.2.47-params.patch
 Patch4: acl-2.2.45-exitcode.patch
 Patch5: acl-2.2.39-segfault.patch
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
 
@@ -22,7 +22,7 @@
 
 %package -n libacl
 Summary: Dynamic library for access control list support
-License: LGPL
+License: LGPLv2
 Group: System Environment/Libraries
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -34,7 +34,7 @@
 
 %package -n libacl-devel
 Summary: Access control list static libraries and headers.
-License: LGPL
+License: LGPLv2
 Group: Development/Libraries
 Requires: libacl = %{version}-%{release}, libattr-devel
 Requires: nfs-utils-lib, openldap
@@ -107,6 +107,13 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Fri Aug  1 2008 Jiri Moskovcak <jmoskovc at redhat.com> 2.2.47-2
+- improved params patch to make get/setfacl honor the same cmdline
+  options
+- rework params patch to apply with fuzz=0 (tcallawa at redhat.com)
+- fix license tag (tcallawa at redhat.com)
+- Resolves: #457244
+
 * Tue Feb 12 2008 Jiri Moskovcak <jmoskovc at redhat.com> 2.2.47-1
 - new upstream version