rpms/acl/F-8 acl-2.2.39-params.patch,1.1,1.2 acl.spec,1.47,1.48

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

Author: jmoskovc

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

Modified Files:
	acl-2.2.39-params.patch acl.spec 
Log Message:
Improved params patch rhbz#457244


acl-2.2.39-params.patch:

Index: acl-2.2.39-params.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/F-8/acl-2.2.39-params.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acl-2.2.39-params.patch	25 Jul 2007 12:03:35 -0000	1.1
+++ acl-2.2.39-params.patch	4 Aug 2008 12:32:37 -0000	1.2
@@ -1,7 +1,6 @@
-diff -urp acl-2.2.39/getfacl/getfacl.c acl-2.2.39mzk/getfacl/getfacl.c
---- acl-2.2.39/getfacl/getfacl.c	2007-07-25 13:12:13.000000000 +0200
-+++ acl-2.2.39mzk/getfacl/getfacl.c	2007-07-25 12:51:14.000000000 +0200
-@@ -42,7 +42,7 @@
+--- 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
@@ -10,12 +9,12 @@
  #endif
  #define POSIXLY_CMD_LINE_OPTIONS "d"
  
-@@ -540,18 +540,18 @@ void help(void)
+@@ -541,23 +541,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"
++"  -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"
@@ -38,9 +37,15 @@
  	}
  #endif
  	printf(_(
-diff -urp acl-2.2.39/man/man1/getfacl.1 acl-2.2.39mzk/man/man1/getfacl.1
---- acl-2.2.39/man/man1/getfacl.1	2006-06-20 08:51:25.000000000 +0200
-+++ acl-2.2.39mzk/man/man1/getfacl.1	2007-07-25 13:17:17.000000000 +0200
+-"      --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
  
@@ -82,9 +87,9 @@
  Skip files that only have the base ACL entries (owner, group, others).
  .TP
  .I \-R, \-\-recursive
-@@ -108,17 +108,17 @@ subdirectories.
- Physical walk, skip all symbolic links. This also skips symbolic link
- arguments.
+@@ -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
@@ -96,6 +101,9 @@
  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
@@ -104,3 +112,44 @@
  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"));
+ }
+ 
+ 
\ No newline at end of file


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/F-8/acl.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- acl.spec	28 Jan 2008 15:04:41 -0000	1.47
+++ acl.spec	4 Aug 2008 12:32:37 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.39
-Release: 13%{?dist}
+Release: 14%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
@@ -11,9 +11,8 @@
 Patch2: acl-2.2.39-path_max.patch
 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
-Patch7: acl-2.2.39-segfault.patch
+Patch5: acl-2.2.39-exitcode.patch
+Patch6: acl-2.2.39-segfault.patch
 License: GPL
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -53,9 +52,8 @@
 %patch2 -p1 -b .path_max
 %patch3 -p1 -b .walk
 %patch4 -p1 -b .params
-%patch5 -p1 -b .man
-%patch6 -p1 -b .exitcode
-%patch7 -p1 -b .segfault
+%patch5 -p1 -b .exitcode
+%patch6 -p1 -b .segfault
 autoconf
 
 %build
@@ -111,6 +109,13 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Fri Aug  1 2008 Jiri Moskovcak <jmoskovc at redhat.com>  2.2.39-14
+- 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
+  
 * Mon Jan 28 2008 Jiri Moskovcak <jmoskovc at redhat.com> 2.2.39-13
 - Fixed segfault when using only "--" as parameter
 - Resolves: #430458