From c6736e9e8e1ef9310deb8dcaf78c978b1c94dbce Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Mon, 20 May 2013 13:52:12 +0200 Subject: [PATCH] upstream release - 2.2.52 --- .gitignore | 1 + ...51.patch => 0001-acl-2.2.49-bz675451.patch | 12 ++- 0002-acl-2.2.52-docdir.patch | 25 +++++ ...tests.patch => 0003-acl-2.2.52-tests.patch | 87 +++--------------- 0004-acl-2.2.52-libdir.patch | 28 ++++++ acl-2.2.39-build.patch | 40 -------- acl-2.2.51.src.tar.gz.sig | Bin 72 -> 0 bytes acl-2.2.52.src.tar.gz.sig | Bin 0 -> 543 bytes acl.spec | 30 +++--- sources | 2 +- 10 files changed, 98 insertions(+), 127 deletions(-) rename acl-2.2.49-bz675451.patch => 0001-acl-2.2.49-bz675451.patch (73%) create mode 100644 0002-acl-2.2.52-docdir.patch rename acl-2.2.49-tests.patch => 0003-acl-2.2.52-tests.patch (50%) create mode 100644 0004-acl-2.2.52-libdir.patch delete mode 100644 acl-2.2.39-build.patch delete mode 100644 acl-2.2.51.src.tar.gz.sig create mode 100644 acl-2.2.52.src.tar.gz.sig 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/acl-2.2.49-bz675451.patch b/0001-acl-2.2.49-bz675451.patch similarity index 73% rename from acl-2.2.49-bz675451.patch rename to 0001-acl-2.2.49-bz675451.patch index cb742b4..cc04380 100644 --- a/acl-2.2.49-bz675451.patch +++ b/0001-acl-2.2.49-bz675451.patch @@ -1,8 +1,15 @@ +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 25908e2..776f22d 100644 +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 @@ -16,3 +23,6 @@ index 25908e2..776f22d 100644 .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/acl-2.2.49-tests.patch b/0003-acl-2.2.52-tests.patch similarity index 50% rename from acl-2.2.49-tests.patch rename to 0003-acl-2.2.52-tests.patch index 1ceabf8..fb367ea 100644 --- a/acl-2.2.49-tests.patch +++ b/0003-acl-2.2.52-tests.patch @@ -1,58 +1,14 @@ -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 +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 @@ -116,21 +72,6 @@ index 630e9fb..dd7fe08 100644 > -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 +-- +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.51.src.tar.gz.sig b/acl-2.2.51.src.tar.gz.sig deleted file mode 100644 index aa2f6af1c8942158b3cfac19aa828ebc00a0d3d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0!^*W#sCTl5JJdf$yIAc)=Yx{poZ_Y5_t?tUoRxW;C}{N eNYVCCUI3u#9cvv@97$Fwc{83L2RJ 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 0000000000000000000000000000000000000000..f9d1b9e6351a28b93138f6a862257af3b45a7da0 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-l+Y(xMG2@n-SLnZ}6-!y|Q5CENYXMobghqZ}i)J}BR z_>y#Qzx3R1Z8CaPk(UR>)+kj)KQ7h34yc+{8E>;U4J=6?R%*v+;_T{kzlXr5lCBy&E;dfps_9OVK zo^+jV9q+3j1tNF>m(Q^YoRC}&jZ>(gv-e4HS1wX23!;ZLV2bQvw*o=^ zD(6~%*xL579AXU1wuBbLV2e=tw5j%HMs6~lR3dlmmof0|8jqE;yoM^;iNr)Chv;%L zGG+tFR>}dr1s~@O;YE#8#cqo7-!Ga@{wYnl7t#eqIX-gCC?iHy>q1@D^@0=R4BSQT zrKz5DG;h5?agTk zT$59dfA 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