From c6736e9e8e1ef9310deb8dcaf78c978b1c94dbce Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: May 20 2013 12:13:55 +0000 Subject: upstream release - 2.2.52 --- diff --git a/.gitignore b/.gitignore index 18b7762..043c8b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ acl-2.2.49.src.tar.gz /acl-2.2.50.src.tar.gz /acl-2.2.51.src.tar.gz +/acl-2.2.52.src.tar.gz diff --git a/0001-acl-2.2.49-bz675451.patch b/0001-acl-2.2.49-bz675451.patch new file mode 100644 index 0000000..cc04380 --- /dev/null +++ b/0001-acl-2.2.49-bz675451.patch @@ -0,0 +1,28 @@ +From 320b3ca0a544fd5024ddfeca6f491a0344b9ecd2 Mon Sep 17 00:00:00 2001 +From: John Bradshaw +Date: Sat, 5 Feb 2011 18:14:27 +0000 +Subject: [PATCH] setfacl.1: fix typo 'inclu de' -> 'include' + +Bug: https://bugzilla.redhat.com/675451 +--- + man/man1/setfacl.1 | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/man/man1/setfacl.1 b/man/man1/setfacl.1 +index 64f0e33..0c7c046 100644 +--- a/man/man1/setfacl.1 ++++ b/man/man1/setfacl.1 +@@ -240,8 +240,8 @@ owner, owning group, or others entry, a copy of the ACL owner, owning group, or + .IP * 4 + If a Default ACL contains named user entries or named group entries, and no mask entry exists, a mask entry containing the same permissions as the default Default ACL's group entry is added. Unless the + .I \-n +-option is given, the permissions of the mask entry are further adjusted to inclu +-de the union of all permissions affected by the mask entry. (See the ++option is given, the permissions of the mask entry are further adjusted to ++include the union of all permissions affected by the mask entry. (See the + .I \-n + option description). + .PP +-- +1.7.1 + diff --git a/0002-acl-2.2.52-docdir.patch b/0002-acl-2.2.52-docdir.patch new file mode 100644 index 0000000..21857a9 --- /dev/null +++ b/0002-acl-2.2.52-docdir.patch @@ -0,0 +1,25 @@ +From b4e37109d66d698772e2513c0f79e818b4235897 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Mon, 20 May 2013 13:17:14 +0200 +Subject: [PATCH] builddefs.in: use pkg version in $(PKG_DOC_DIR) + +--- + include/builddefs.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/builddefs.in b/include/builddefs.in +index d9931db..47bfdd6 100644 +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -34,7 +34,7 @@ PKG_LIB_DIR = @libdir@@libdirsuffix@ + PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ + PKG_INC_DIR = @includedir@ + PKG_MAN_DIR = @mandir@ +-PKG_DOC_DIR = @datadir@/doc/@pkg_name@ ++PKG_DOC_DIR = @datadir@/doc/@pkg_name@-@pkg_version@ + PKG_LOCALE_DIR = @datadir@/locale + + CC = @cc@ +-- +1.7.1 + diff --git a/0003-acl-2.2.52-tests.patch b/0003-acl-2.2.52-tests.patch new file mode 100644 index 0000000..fb367ea --- /dev/null +++ b/0003-acl-2.2.52-tests.patch @@ -0,0 +1,77 @@ +From cfd9ba83811189d9e12c86d32b06b5fd15b5f358 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Mon, 20 May 2013 13:49:34 +0200 +Subject: [PATCH] make the tests ready for SELinux + +--- + test/root/permissions.test | 8 ++++---- + test/root/restore.test | 2 +- + test/root/setfacl.test | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/test/root/permissions.test b/test/root/permissions.test +index afaf5f0..4880bd2 100644 +--- a/test/root/permissions.test ++++ b/test/root/permissions.test +@@ -20,7 +20,7 @@ defined permissions. + $ cd d + $ umask 027 + $ touch f +- $ ls -l f | awk -- '{ print $1, $3, $4 }' ++ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/' + > -rw-r----- root root + + +@@ -40,7 +40,7 @@ Now, change the ownership of the file to bin:bin and verify that this + gives user bin write access. + + $ chown bin:bin f +- $ ls -l f | awk -- '{ print $1, $3, $4 }' ++ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/' + > -rw-r----- bin bin + $ su bin + $ echo bin >> f +@@ -257,12 +257,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them. + $ mkdir -m 600 x + $ chown daemon:daemon x + $ echo j > x/j +- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' ++ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/' + > -rw-r----- root root + + $ setfacl -m u:daemon:r x + +- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' ++ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/' + > -rw-r----- root root + (With the bug this gives: `ls: x/j: Permission denied'.) + +diff --git a/test/root/restore.test b/test/root/restore.test +index 6003cd4..5dbf73c 100644 +--- a/test/root/restore.test ++++ b/test/root/restore.test +@@ -17,7 +17,7 @@ Ensure setuid bit is restored when the owner changes + $ chown bin passwd + $ chmod u+s passwd + $ setfacl --restore passwd.acl +- $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' ++ $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\\. root/ root/' + > -rwsr-xr-x root root + + $ rm passwd passwd.acl +diff --git a/test/root/setfacl.test b/test/root/setfacl.test +index 630e9fb..dd7fe08 100644 +--- a/test/root/setfacl.test ++++ b/test/root/setfacl.test +@@ -8,7 +8,7 @@ Setfacl utility tests. Run these tests on a filesystem with ACL support. + $ sg bin + $ umask 027 + $ touch g +- $ ls -dl g | awk '{print $1}' ++ $ ls -dl g | awk '{print $1}' | sed 's/\\.$//' + > -rw-r----- + + $ setfacl -m m:- g +-- +1.7.1 + diff --git a/0004-acl-2.2.52-libdir.patch b/0004-acl-2.2.52-libdir.patch new file mode 100644 index 0000000..93a410e --- /dev/null +++ b/0004-acl-2.2.52-libdir.patch @@ -0,0 +1,28 @@ +From 3dee229914dc17beef900d16175a877697119911 Mon Sep 17 00:00:00 2001 +From: Kamil Rytarowski +Date: Sat, 27 Apr 2013 22:43:31 +0200 +Subject: [PATCH] Install the libraries to the appropriate directory + +[upstream commit 2971df45020e39516c9b3d6217195b4029026f7a] + +Signed-off-by: Kamil Dudka +--- + include/builddefs.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/builddefs.in b/include/builddefs.in +index 2ef6173..876a735 100644 +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -31,7 +31,7 @@ PKG_DISTRIBUTION= @pkg_distribution@ + PKG_BIN_DIR = @bindir@ + PKG_SBIN_DIR = @sbindir@ + PKG_LIB_DIR = @libdir@@libdirsuffix@ +-PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ ++PKG_DEVLIB_DIR = @libdir@@libdirsuffix@ + PKG_INC_DIR = @includedir@ + PKG_MAN_DIR = @mandir@ + PKG_DOC_DIR = @datadir@/doc/@pkg_name@-@pkg_version@ +-- +1.7.1 + diff --git a/acl-2.2.39-build.patch b/acl-2.2.39-build.patch deleted file mode 100644 index fbe608a..0000000 --- a/acl-2.2.39-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/include/builddefs.in b/include/builddefs.in -index d054a56..10b0cd4 100644 ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -28,14 +28,14 @@ PKG_RELEASE = @pkg_release@ - PKG_VERSION = @pkg_version@ - PKG_PLATFORM = @pkg_platform@ - PKG_DISTRIBUTION= @pkg_distribution@ --PKG_BIN_DIR = @bindir@ --PKG_SBIN_DIR = @sbindir@ --PKG_LIB_DIR = @libdir@@libdirsuffix@ --PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ --PKG_INC_DIR = @includedir@ --PKG_MAN_DIR = @mandir@ --PKG_DOC_DIR = @datadir@/doc/@pkg_name@ --PKG_LOCALE_DIR = @datadir@/locale -+PKG_BIN_DIR = $(DESTDIR)@bindir@ -+PKG_SBIN_DIR = $(DESTDIR)@sbindir@ -+PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@ -+PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@ -+PKG_INC_DIR = $(DESTDIR)@includedir@ -+PKG_MAN_DIR = $(DESTDIR)@mandir@ -+PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@ -+PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale - - CC = @cc@ - AWK = @awk@ -diff --git a/include/buildmacros b/include/buildmacros -index 17423c0..3118a17 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = $(TOPDIR)/include/install-sh - - SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images diff --git a/acl-2.2.49-bz675451.patch b/acl-2.2.49-bz675451.patch deleted file mode 100644 index cb742b4..0000000 --- a/acl-2.2.49-bz675451.patch +++ /dev/null @@ -1,18 +0,0 @@ - man/man1/setfacl.1 | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/man/man1/setfacl.1 b/man/man1/setfacl.1 -index 25908e2..776f22d 100644 ---- a/man/man1/setfacl.1 -+++ b/man/man1/setfacl.1 -@@ -240,8 +240,8 @@ owner, owning group, or others entry, a copy of the ACL owner, owning group, or - .IP * 4 - If a Default ACL contains named user entries or named group entries, and no mask entry exists, a mask entry containing the same permissions as the default Default ACL's group entry is added. Unless the - .I \-n --option is given, the permissions of the mask entry are further adjusted to inclu --de the union of all permissions affected by the mask entry. (See the -+option is given, the permissions of the mask entry are further adjusted to -+include the union of all permissions affected by the mask entry. (See the - .I \-n - option description). - .PP diff --git a/acl-2.2.49-tests.patch b/acl-2.2.49-tests.patch deleted file mode 100644 index 1ceabf8..0000000 --- a/acl-2.2.49-tests.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/test/cp.test b/test/cp.test -index a888c04..4a75ffd 100644 ---- a/test/cp.test -+++ b/test/cp.test -@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given. - > -rw-rw-r--+ - - $ cp f g -- $ ls -l g | awk -- '{ print $1 }' -+ $ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//' - > -rw-r--r-- - - $ rm g -diff --git a/test/getfacl-recursive.test b/test/getfacl-recursive.test -index b88c211..a72192e 100644 ---- a/test/getfacl-recursive.test -+++ b/test/getfacl-recursive.test -@@ -1,5 +1,6 @@ - Tests for proper path recursion - -+ $ umask 022 - $ mkdir -p 1/2/3 - $ mkdir 1/link - $ touch 1/link/file -diff --git a/test/misc.test b/test/misc.test -index 7c62c64..e6140da 100644 ---- a/test/misc.test -+++ b/test/misc.test -@@ -254,7 +254,7 @@ Add some users and groups - Symlink in directory with default ACL? - - $ ln -s d d/l -- $ ls -dl d/l | awk '{print $1}' -+ $ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//' - > lrwxrwxrwx - - $ ls -dl -L d/l | awk '{print $1}' -@@ -343,7 +343,7 @@ Remove the default ACL - Reset to base entries - - $ setfacl -b d -- $ ls -dl d | awk '{print $1}' -+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//' - > drwxr-x--- - - $ getfacl --omit-header d -@@ -355,7 +355,7 @@ Reset to base entries - Now, chmod should change the group_obj entry - - $ chmod 775 d -- $ ls -dl d | awk '{print $1}' -+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//' - > drwxrwxr-x - - $ getfacl --omit-header d -diff --git a/test/root/permissions.test b/test/root/permissions.test -index afaf5f0..4880bd2 100644 ---- a/test/root/permissions.test -+++ b/test/root/permissions.test -@@ -20,7 +20,7 @@ defined permissions. - $ cd d - $ umask 027 - $ touch f -- $ ls -l f | awk -- '{ print $1, $3, $4 }' -+ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/' - > -rw-r----- root root - - -@@ -40,7 +40,7 @@ Now, change the ownership of the file to bin:bin and verify that this - gives user bin write access. - - $ chown bin:bin f -- $ ls -l f | awk -- '{ print $1, $3, $4 }' -+ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/' - > -rw-r----- bin bin - $ su bin - $ echo bin >> f -@@ -257,12 +257,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them. - $ mkdir -m 600 x - $ chown daemon:daemon x - $ echo j > x/j -- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' -+ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/' - > -rw-r----- root root - - $ setfacl -m u:daemon:r x - -- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' -+ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/' - > -rw-r----- root root - (With the bug this gives: `ls: x/j: Permission denied'.) - -diff --git a/test/root/restore.test b/test/root/restore.test -index 6003cd4..5dbf73c 100644 ---- a/test/root/restore.test -+++ b/test/root/restore.test -@@ -17,7 +17,7 @@ Ensure setuid bit is restored when the owner changes - $ chown bin passwd - $ chmod u+s passwd - $ setfacl --restore passwd.acl -- $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' -+ $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\\. root/ root/' - > -rwsr-xr-x root root - - $ rm passwd passwd.acl -diff --git a/test/root/setfacl.test b/test/root/setfacl.test -index 630e9fb..dd7fe08 100644 ---- a/test/root/setfacl.test -+++ b/test/root/setfacl.test -@@ -8,7 +8,7 @@ Setfacl utility tests. Run these tests on a filesystem with ACL support. - $ sg bin - $ umask 027 - $ touch g -- $ ls -dl g | awk '{print $1}' -+ $ ls -dl g | awk '{print $1}' | sed 's/\\.$//' - > -rw-r----- - - $ setfacl -m m:- g -diff --git a/test/sbits-restore.test b/test/sbits-restore.test -index e5e4fb2..abdb58a 100644 ---- a/test/sbits-restore.test -+++ b/test/sbits-restore.test -@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works - $ touch d/g - $ touch d/u - $ setfacl --restore d.acl -- $ ls -dl d | awk '{print $1}' -+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//' - > drwxr-xr-t -- $ ls -dl d/u | awk '{print $1}' -+ $ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//' - > -rwSr--r-- -- $ ls -dl d/g | awk '{print $1}' -+ $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//' - > -rw-r-Sr-- - $ rm -Rf d diff --git a/acl-2.2.51.src.tar.gz.sig b/acl-2.2.51.src.tar.gz.sig deleted file mode 100644 index aa2f6af..0000000 Binary files a/acl-2.2.51.src.tar.gz.sig and /dev/null differ diff --git a/acl-2.2.52.src.tar.gz.sig b/acl-2.2.52.src.tar.gz.sig new file mode 100644 index 0000000..f9d1b9e Binary files /dev/null and b/acl-2.2.52.src.tar.gz.sig differ diff --git a/acl.spec b/acl.spec index e3a8d3e..795837d 100644 --- a/acl.spec +++ b/acl.spec @@ -1,7 +1,7 @@ Summary: Access control list utilities Name: acl -Version: 2.2.51 -Release: 9%{?dist} +Version: 2.2.52 +Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk BuildRequires: gettext @@ -9,13 +9,18 @@ BuildRequires: libattr-devel BuildRequires: libtool Requires: libacl = %{version}-%{release} Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz -Patch1: acl-2.2.39-build.patch + +# fix a typo in setfacl(1) man page (#675451) +Patch1: 0001-acl-2.2.49-bz675451.patch + +# use pkg version in $(PKG_DOC_DIR) +Patch2: 0002-acl-2.2.52-docdir.patch # prepare the test-suite for SELinux and arbitrary umask -Patch4: acl-2.2.49-tests.patch +Patch3: 0003-acl-2.2.52-tests.patch -# fix typos in setfacl(1) man page (#675451) -Patch6: acl-2.2.49-bz675451.patch +# Install the libraries to the appropriate directory +Patch4: 0004-acl-2.2.52-libdir.patch License: GPLv2+ Group: System Environment/Base @@ -52,13 +57,12 @@ defined in POSIX 1003.1e draft standard 17. %prep %setup -q %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %patch4 -p1 -%patch6 -p1 %build -touch .census -# acl abuses libexecdir -%configure --libexecdir=%{_libdir} +%configure # uncomment to turn on optimizations # sed -i 's/-O2/-O0/' libtool include/builddefs @@ -85,8 +89,6 @@ make install-lib DESTDIR=$RPM_BUILD_ROOT # get rid of libacl.a and libacl.la rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.la -rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a -rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.la chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.* @@ -116,6 +118,10 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.* %{_libdir}/libacl.so.* %changelog +* Mon May 20 2013 Kamil Dudka 2.2.52-1 +- new upstream release, drop applied patches +- drop workarounds that are no longer necessary + * Wed Feb 13 2013 Fedora Release Engineering - 2.2.51-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 2ae99e1..051eb9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3fc0ce99dc5253bdcce4c9cd437bc267 acl-2.2.51.src.tar.gz +a61415312426e9c2212bd7dc7929abda acl-2.2.52.src.tar.gz