From 95420551e810bf1fadb6bd59c0abfd7ca3f9959f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:50:03 +0000 Subject: [PATCH 1/4] Initialize branch F-13 for acl --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From d4fb3d28d2705cedc6c4ac267487f87e100edabc Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 24 Mar 2010 16:51:27 +0000 Subject: [PATCH 2/4] - prevent setfacl --restore from SIGSEGV on malformed restore file (#576550) --- acl-2.2.49-setfacl-restore.patch | 27 +++++++++++++++++++++++++++ acl.spec | 7 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 acl-2.2.49-setfacl-restore.patch diff --git a/acl-2.2.49-setfacl-restore.patch b/acl-2.2.49-setfacl-restore.patch new file mode 100644 index 0000000..8490091 --- /dev/null +++ b/acl-2.2.49-setfacl-restore.patch @@ -0,0 +1,27 @@ +diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c +index 7142af0..23784a7 100644 +--- a/setfacl/setfacl.c ++++ b/setfacl/setfacl.c +@@ -125,7 +125,7 @@ restore( + uid_t uid; + gid_t gid; + mode_t mask, flags; +- struct do_set_args args; ++ struct do_set_args args = { 0 }; + int line = 0, backup_line; + int error, status = 0; + int chmod_required = 0; +diff --git a/test/misc.test b/test/misc.test +index e6140da..a910bd0 100644 +--- a/test/misc.test ++++ b/test/misc.test +@@ -424,3 +424,9 @@ Now, chmod should change the group_obj entry + > + + $ rmdir d ++ ++Malformed restore file ++ ++ $ echo "# owner: root" > f ++ $ setfacl --restore=f 2>&1 ++ >setfacl: f: No filename found in line 0, aborting diff --git a/acl.spec b/acl.spec index 418984a..b5f9c6c 100644 --- a/acl.spec +++ b/acl.spec @@ -1,7 +1,7 @@ Summary: Access control list utilities Name: acl Version: 2.2.49 -Release: 4%{?dist} +Release: 5%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk BuildRequires: gettext @@ -11,6 +11,7 @@ Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}. Patch1: acl-2.2.39-build.patch Patch2: acl-2.2.49-setfacl-walk.patch Patch3: acl-2.2.49-bz467936.patch +Patch4: acl-2.2.49-setfacl-restore.patch License: GPLv2+ Group: System Environment/Base URL: http://oss.sgi.com/projects/xfs/ @@ -48,6 +49,7 @@ defined in POSIX 1003.1e draft standard 17. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build touch .census @@ -105,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT /%{_lib}/libacl.so.* %changelog +* Wed Mar 24 2010 Kamil Dudka 2.2.49-5 +- prevent setfacl --restore from SIGSEGV on malformed restore file (#576550) + * Tue Jan 19 2010 Kamil Dudka 2.2.49-4 - do not package a static library (#556036) - remove multilib patch no longer useful From 32e0950a0a272c8599ee8df831e31193dc20fae2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:34:34 +0000 Subject: [PATCH 3/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d4a739a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: acl -# $Id: Makefile,v 1.2 2007/10/15 18:35:20 notting Exp $ -NAME := acl -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From dd0b62fe8daa40df7e49b0617c03aef5e292ea90 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 4 Aug 2010 00:05:32 +0200 Subject: [PATCH 4/4] get fixes for #595674 and #613336 into Fedora 13 - let acl depend on the same version of libacl (#595674) - remove dependency of libacl-devel on nfs-utils-lib and openldap (#613336) --- acl.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/acl.spec b/acl.spec index b5f9c6c..d1a382c 100644 --- a/acl.spec +++ b/acl.spec @@ -1,16 +1,23 @@ Summary: Access control list utilities Name: acl Version: 2.2.49 -Release: 5%{?dist} +Release: 6%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk BuildRequires: gettext 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 + +# bz #488674 Patch2: acl-2.2.49-setfacl-walk.patch + +# bz #467936 Patch3: acl-2.2.49-bz467936.patch + +# bz #576550 Patch4: acl-2.2.49-setfacl-restore.patch License: GPLv2+ Group: System Environment/Base @@ -33,11 +40,10 @@ the POSIX 1003.1e draft standard 17 functions for manipulating access control lists. %package -n libacl-devel -Summary: Access control list static libraries and headers. +Summary: Access control list static libraries and headers License: LGPLv2+ Group: Development/Libraries Requires: libacl = %{version}-%{release}, libattr-devel -Requires: nfs-utils-lib, openldap %description -n libacl-devel This package contains static libraries and header files needed to develop @@ -107,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT /%{_lib}/libacl.so.* %changelog +* Wed Aug 04 2010 Kamil Dudka 2.2.49-6 +- let acl depend on the same version of libacl (#595674) +- remove dependency of libacl-devel on nfs-utils-lib and openldap (#613336) + * Wed Mar 24 2010 Kamil Dudka 2.2.49-5 - prevent setfacl --restore from SIGSEGV on malformed restore file (#576550)