From ec4b6432a0d82bfb924349a9300b16d28e99abc7 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 14 Jul 2008 17:03:26 +0000 Subject: [PATCH] fix license tag, fix params patch to apply with fuzz=0 --- acl-2.2.47-params.patch | 108 ++++++++++++++++++++++++++++++++++++++++ acl.spec | 14 ++++-- 2 files changed, 117 insertions(+), 5 deletions(-) create mode 100644 acl-2.2.47-params.patch diff --git a/acl-2.2.47-params.patch b/acl-2.2.47-params.patch new file mode 100644 index 0000000..4db38db --- /dev/null +++ b/acl-2.2.47-params.patch @@ -0,0 +1,108 @@ +diff -up acl-2.2.47/getfacl/getfacl.c.params acl-2.2.47/getfacl/getfacl.c +--- acl-2.2.47/getfacl/getfacl.c.params 2008-02-06 22:39:57.000000000 -0500 ++++ acl-2.2.47/getfacl/getfacl.c 2008-07-14 12:33:25.000000000 -0400 +@@ -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,18 +555,18 @@ 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(_( +diff -up acl-2.2.47/man/man1/getfacl.1.params acl-2.2.47/man/man1/getfacl.1 +--- acl-2.2.47/man/man1/getfacl.1.params 2008-02-06 22:39:57.000000000 -0500 ++++ acl-2.2.47/man/man1/getfacl.1 2008-07-14 12:40:04.000000000 -0400 +@@ -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 \-\- diff --git a/acl.spec b/acl.spec index 10ca641..cecb09c 100644 --- a/acl.spec +++ b/acl.spec @@ -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 @@ Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_%{version}-1.tar.gz 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 @@ manipulating access control lists. %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 @@ control lists. %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,10 @@ rm -rf $RPM_BUILD_ROOT /%{_lib}/libacl.so.* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway 2.2.47-2 +- rework params patch to apply with fuzz=0 +- fix license tag + * Tue Feb 12 2008 Jiri Moskovcak 2.2.47-1 - new upstream version