From 9d170c0889b9d68eb5239babef62081976139ab6 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Mar 15 2013 10:40:43 +0000 Subject: import acl-2.2.51-9.el7.src.rpm --- diff --git a/.acl.metadata b/.acl.metadata new file mode 100644 index 0000000..40bb2e3 --- /dev/null +++ b/.acl.metadata @@ -0,0 +1 @@ +60d0b055949c2ba6155187f05ed2b0f89cb895b9 SOURCES/acl-2.2.51.src.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/acl-2.2.39-build.patch b/SOURCES/acl-2.2.39-build.patch new file mode 100644 index 0000000..fbe608a --- /dev/null +++ b/SOURCES/acl-2.2.39-build.patch @@ -0,0 +1,40 @@ +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/SOURCES/acl-2.2.49-bz675451.patch b/SOURCES/acl-2.2.49-bz675451.patch new file mode 100644 index 0000000..cb742b4 --- /dev/null +++ b/SOURCES/acl-2.2.49-bz675451.patch @@ -0,0 +1,18 @@ + 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/SOURCES/acl-2.2.49-tests.patch b/SOURCES/acl-2.2.49-tests.patch new file mode 100644 index 0000000..1ceabf8 --- /dev/null +++ b/SOURCES/acl-2.2.49-tests.patch @@ -0,0 +1,136 @@ +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/SPECS/acl.spec b/SPECS/acl.spec new file mode 100644 index 0000000..e3a8d3e --- /dev/null +++ b/SPECS/acl.spec @@ -0,0 +1,368 @@ +Summary: Access control list utilities +Name: acl +Version: 2.2.51 +Release: 9%{?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 + +# prepare the test-suite for SELinux and arbitrary umask +Patch4: acl-2.2.49-tests.patch + +# fix typos in setfacl(1) man page (#675451) +Patch6: acl-2.2.49-bz675451.patch + +License: GPLv2+ +Group: System Environment/Base +URL: http://acl.bestbits.at/ + +%description +This package contains the getfacl and setfacl utilities needed for +manipulating access control lists. + +%package -n libacl +Summary: Dynamic library for access control list support +License: LGPLv2+ +Group: System Environment/Libraries +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Conflicts: filesystem < 3 + +%description -n libacl +This package contains the libacl.so dynamic library which contains +the POSIX 1003.1e draft standard 17 functions for manipulating access +control lists. + +%package -n libacl-devel +Summary: Files needed for building programs with libacl +License: LGPLv2+ +Group: Development/Libraries +Requires: libacl = %{version}-%{release}, libattr-devel + +%description -n libacl-devel +This package contains header files and documentation needed to develop +programs which make use of the access control list programming interface +defined in POSIX 1003.1e draft standard 17. + +%prep +%setup -q +%patch1 -p1 +%patch4 -p1 +%patch6 -p1 + +%build +touch .census +# acl abuses libexecdir +%configure --libexecdir=%{_libdir} + +# uncomment to turn on optimizations +# sed -i 's/-O2/-O0/' libtool include/builddefs +# unset CFLAGS + +make %{?_smp_mflags} LIBTOOL="libtool --tag=CC" + +%check +if ./setfacl/setfacl -m u:`id -u`:rwx .; then + make tests || exit $? + if test 0 = `id -u`; then + make root-tests || exit $? + fi +else + echo '*** ACLs are probably not supported by the file system,' \ + 'the test-suite will NOT run ***' +fi + +%install +make install DESTDIR=$RPM_BUILD_ROOT +make install-dev DESTDIR=$RPM_BUILD_ROOT +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.*.*.* + +%find_lang %{name} + +%post -n libacl -p /sbin/ldconfig + +%postun -n libacl -p /sbin/ldconfig + +%files -f %{name}.lang +%{_bindir}/chacl +%{_bindir}/getfacl +%{_bindir}/setfacl +%{_datadir}/doc/acl-%{version} +%{_mandir}/man1/chacl.1* +%{_mandir}/man1/getfacl.1* +%{_mandir}/man1/setfacl.1* +%{_mandir}/man5/acl.5* + +%files -n libacl-devel +%{_libdir}/libacl.so +%{_includedir}/acl +%{_includedir}/sys/acl.h +%{_mandir}/man3/acl_* + +%files -n libacl +%{_libdir}/libacl.so.* + +%changelog +* Wed Feb 13 2013 Fedora Release Engineering - 2.2.51-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Aug 28 2012 Kamil Dudka 2.2.51-8 +- fix specfile issues reported by the fedora-review script + +* Wed Jul 18 2012 Fedora Release Engineering - 2.2.51-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed May 02 2012 Kamil Dudka 2.2.51-6 +- do not mention static libraries in the summary of libacl{,-devel} (#817952) + +* Wed Jan 25 2012 Harald Hoyer 2.2.51-5 +- add filesystem guard + +* Wed Jan 25 2012 Harald Hoyer 2.2.51-4 +- install everything in /usr + https://fedoraproject.org/wiki/Features/UsrMove + +* Thu Jan 12 2012 Fedora Release Engineering - 2.2.51-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri May 06 2011 Kamil Dudka 2.2.51-2 +- update project URL (#699058) + +* Thu Apr 21 2011 Kamil Dudka 2.2.51-1 +- new upstream release + +* Tue Apr 19 2011 Kamil Dudka 2.2.50-1 +- new upstream release + +* Wed Apr 06 2011 Kamil Dudka 2.2.49-11 +- add function acl_extended_file_nofollow() (#692982) + +* Tue Mar 29 2011 Kamil Dudka 2.2.49-10 +- fix typos in setfacl(1) man page (#675451) + +* Mon Feb 07 2011 Fedora Release Engineering - 2.2.49-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jul 08 2010 Kamil Dudka 2.2.49-8 +- remove dependency of libacl-devel on nfs-utils-lib and openldap + +* Tue May 25 2010 Kamil Dudka 2.2.49-7 +- let acl depend on the same version of libacl (#595674) + +* Wed Mar 24 2010 Kamil Dudka 2.2.49-6 +- prevent setfacl --restore from SIGSEGV on malformed restore file (#576550) + +* Wed Mar 10 2010 Kamil Dudka 2.2.49-5 +- run the test-suite if possible + +* Tue Jan 19 2010 Kamil Dudka 2.2.49-4 +- do not package a static library (#556036) +- remove multilib patch no longer useful +- cleanup in BuildRequires + +* Tue Jan 05 2010 Kamil Dudka 2.2.49-3 +- upstream patch for setfacl --restore SUID/SGID bits handling (#467936) + +* Sat Dec 26 2009 Kamil Dudka 2.2.49-2 +- tweaked setfacl tree walk flags (#488674), thanks to Markus Steinborn + +* Sun Dec 20 2009 Kamil Dudka 2.2.49-1 +- new upstream bugfix release +- big cleanup in patches + +* Fri Jul 24 2009 Fedora Release Engineering - 2.2.47-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 2.2.47-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jul 31 2008 Jiri Moskovcak 2.2.47-3 +- little improvement to params patch +- Resolves: #457244 + +* 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 + +* Mon Jan 28 2008 Jiri Moskovcak 2.2.45-3 +- Fixed segfault when using only "--" as parameter +- Resolves: #430458 + +* Wed Nov 7 2007 Jiri Moskovcak 2.2.45-2 +- Fixed setfacl exitcodes +- Resolves: #368451 + +* Wed Oct 31 2007 Jiri Moskovcak - 2.2.45-1 +- New version +- dropped walk patch + +* Thu Sep 20 2007 Jiri Moskovcak 2.2.39-10 +- Rewriten path_max patch to support long UTF8 names +- Resolves #287701, #183181 + +* Fri Aug 31 2007 Steve Dickson - 2.2.39-9 +- Removed NFS4 ACL patch since it was rejected by upstream. + +* Thu Aug 30 2007 Jeremy Katz - 2.2.39-8 +- disable nfs patch; linking libacl against libs in /usr will lead to breakage + +* Wed Aug 29 2007 Fedora Release Engineering - 2.2.39-7 +- Build Require gawk + +* Wed Aug 29 2007 Fedora Release Engineering - 2.2.39-6 +- Rebuild for selinux ppc32 issue. + +* Mon Aug 27 2007 Steve Dickson 2.2.39-5 +- Added NFS v4 ACL support + +* Thu Jul 26 2007 Jiri Moskovcak 2.2.39-4.1 +- Updated man page for getfacl + +* Wed Jul 25 2007 Jiri Moskovcak 2.2.39-4 +- Added support fort short params to getfacl +- Resolves: #204087 + +* Wed Mar 21 2007 Thomas Woerner 2.2.39-3.1 +- new improved walk patch with fixed getfacl exit code (rhbz#232884) + +* Fri Feb 23 2007 Karsten Hopp 2.2.39-3 +- fix buildroot +- remove trailing dot from summary +- -devel requires same version of libacl +- escape macro in changelog +- make .so symlink relative + +* Thu Feb 22 2007 Steve Grubb 2.2.39-2 +- Apply patch to make order consistent. + +* Wed Jul 12 2006 Jesse Keating - 2.2.39-1.1 +- rebuild + +* Wed Jul 5 2006 Thomas Woerner 2.2.39-1 +- new version 2.2.39 +- fixed usage of long UTF-8 filenames (#183181) + Thanks to Andrey for the initial patch. + +* Wed Jun 7 2006 Jeremy Katz - 2.2.34-2 +- rebuild for -devel deps + +* Fri Feb 10 2006 Jesse Keating - 2.2.34-1.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.2.34-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Feb 3 2006 Thomas Woerner 2.2.34-1 +- new version 2.2.34 + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Tue Dec 6 2005 Thomas Woerner 2.2.32-2.1 +- fixed permissions of libacl + +* Tue Dec 6 2005 Thomas Woerner 2.2.32-2 +- spec file cleanup +- mark po files as lang specific + +* Sun Nov 06 2005 Florian La Roche +- 2.2.32 + +* Wed Sep 28 2005 Than Ngo 2.2.31-1 +- update to 2.2.31 + +* Wed Sep 28 2005 Than Ngo 2.2.23-9 +- get rid of *.la files +- remove duplicate doc files + +* Wed Feb 9 2005 Stephen C. Tweedie 2.2.23-6 +- Rebuild + +* Thu Sep 16 2004 Jeremy Katz - 2.2.23-5 +- make the libs executable so that we find their dependencies (#132696) + +* Fri Sep 10 2004 Stephen C. Tweedie 2.2.23-4 +- libacl-devel Requires: libattr-devel for libattr.la + +* Fri Sep 10 2004 Stephen C. Tweedie 2.2.23-3 +- Requires libtool >= 1.5 for building + +* Thu Aug 19 2004 Phil Knirsch 2.2.23-2 +- Make libacl.so.* executable. + +* Thu Aug 19 2004 Phil Knirsch 2.2.23-1 +- Update to latest upstream version. + +* Sun Aug 8 2004 Alan Cox 2.2.7-7 +- Close bug #125300 (Steve Grubb: build requires libtool,gettext) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Mar 31 2004 Stephen C. Tweedie 2.2.7-5 +- Add missing %%defattr + +* Tue Mar 30 2004 Stephen C. Tweedie 2.2.7-3 +- Add /usr/include/acl to files manifest +- Fix location of doc files, add main doc dir to files manifest + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Aug 5 2003 Elliot Lee 2.2.7-2 +- Fix libtool invocation + +* Tue Jun 3 2003 Stephen C. Tweedie 2.2.7-1 +- Update to acl-2.2.7 + +* Wed Mar 26 2003 Michael K. Johnson 2.2.3-2 +- include patch from Jay Berkenbilt to print better error messages + +* Tue Jan 28 2003 Michael K. Johnson 2.2.3-1 +- udpate/rebuild + +* Sat Jan 4 2003 Jeff Johnson 2.0.11-7 +- set execute bits on library so that requires are generated. + +* Tue Nov 19 2002 Elliot Lee 2.0.11-5 +- Correct patch in previous fix so that shared libraries go in /lib* + instead of /usr/lib* + +* Tue Nov 19 2002 Elliot Lee 2.0.11-4 +- Fix multilibbing + +* Wed Sep 11 2002 Than Ngo 2.0.11-3 +- Added fix to install libs in correct directory on 64bit machine + +* Thu Aug 08 2002 Michael K. Johnson 2.0.11-2 +- Made the package only own the one directory that is unique to it: + /usr/include/acl + +* Mon Jun 24 2002 Michael K. Johnson 2.0.11-1 +- Initial Red Hat package + Made as few changes as possible relative to upstream packaging to + make it easier to maintain long-term. This means that some of + the techniques used here are definitely not standard Red Hat + techniques. If you are looking for an example package to fit + into Red Hat Linux transparently, this would not be the one to + pick. +- acl-devel -> libacl-devel