+++ /dev/null
-commit 55a9d4458dafd04ad9021f2a8aed7dcc2ccd7171
-Author: Mike Frysinger <vapier@gentoo.org>
-Date: Fri Jan 8 22:03:36 2010 -0500
-
- improve AC_PATH_PROG usage
-
- Use AC_PATH_PROG unconditionally and append the search PATH instead of
- forcing lookup in a few dirs. This way we can find the binaries on more
- systems where things don't live in the expected locations.
-
- Signed-off-by: Mike Frysinger <vapier@gentoo.org>
- Signed-off-by: Brandon Philips <brandon@ifup.org>
-
-diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
-index d8f0726..4de3d3b 100644
---- a/m4/package_utilies.m4
-+++ b/m4/package_utilies.m4
-@@ -36,55 +36,38 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
- AC_SUBST(cc)
- AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
-
-- if test -z "$MAKE"; then
-- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
-- fi
-- if test -z "$MAKE"; then
-- AC_PATH_PROG(MAKE, make,, /usr/bin)
-- fi
-+ search_path="$PATH$PATH_SEPARATOR/usr/freeware/bin$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR/usr/local/bin"
-+
-+ AC_PATH_PROGS(MAKE, gmake make,, $search_path)
- make=$MAKE
- AC_SUBST(make)
- AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
-
-- if test -z "$TAR"; then
-- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
-- fi
-+ AC_PATH_PROG(TAR, tar,, $search_path)
- tar=$TAR
- AC_SUBST(tar)
-- if test -z "$ZIP"; then
-- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
-- fi
-
-+ AC_PATH_PROG(ZIP, gzip,, $search_path)
- zip=$ZIP
- AC_SUBST(zip)
-
-- if test -z "$MAKEDEPEND"; then
-- AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
-- fi
-+ AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
- makedepend=$MAKEDEPEND
- AC_SUBST(makedepend)
-
-- if test -z "$AWK"; then
-- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
-- fi
-+ AC_PATH_PROG(AWK, awk,, $search_path)
- awk=$AWK
- AC_SUBST(awk)
-
-- if test -z "$SED"; then
-- AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
-- fi
-+ AC_PATH_PROG(SED, sed,, $search_path)
- sed=$SED
- AC_SUBST(sed)
-
-- if test -z "$ECHO"; then
-- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
-- fi
-+ AC_PATH_PROG(ECHO, echo,, $search_path)
- echo=$ECHO
- AC_SUBST(echo)
-
-- if test -z "$SORT"; then
-- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
-- fi
-+ AC_PATH_PROG(SORT, sort,, $search_path)
- sort=$SORT
- AC_SUBST(sort)
-
-@@ -92,23 +75,17 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
- AC_PROG_LN_S
-
- if test "$enable_gettext" = yes; then
-- if test -z "$MSGFMT"; then
-- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
-- fi
-+ AC_PATH_PROG(MSGFMT, msgfmt,, $search_path)
- msgfmt=$MSGFMT
- AC_SUBST(msgfmt)
- AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
-
-- if test -z "$MSGMERGE"; then
-- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
-- fi
-+ AC_PATH_PROG(MSGMERGE, msgmerge,, $search_path)
- msgmerge=$MSGMERGE
- AC_SUBST(msgmerge)
- AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
-
-- if test -z "$XGETTEXT"; then
-- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
-- fi
-+ AC_PATH_PROG(XGETTEXT, xgettext,, $search_path)
- xgettext=$XGETTEXT
- AC_SUBST(xgettext)
- AC_PACKAGE_NEED_UTILITY($1, "$xgettext", xgettext, gettext)
-@@ -116,9 +93,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
- AC_DEFINE([ENABLE_GETTEXT], 1, [enable gettext])
- fi
-
-- if test -z "$RPM"; then
-- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
-- fi
-+ AC_PATH_PROG(RPM, rpm,, $search_path)
- rpm=$RPM
- AC_SUBST(rpm)
-
+++ /dev/null
-#
-# Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-TOPDIR = ..
-include $(TOPDIR)/include/builddefs
-
-LIBPKG = lib$(PKG_NAME)1
-LSRCFILES = changelog compat control copyright rules watch
-DEV_DOC_DIR = $(PKG_DOC_DIR)/../$(LIBPKG)-dev
-LIB_DOC_DIR = $(PKG_DOC_DIR)/../$(LIBPKG)
-
-default:
-
-include $(BUILDRULES)
-
-install: default
-ifeq ($(PKG_DISTRIBUTION), debian)
- $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
- $(INSTALL) -m 644 changelog $(PKG_DOC_DIR)/changelog.Debian
-endif
-
-install-dev: default
-ifeq ($(PKG_DISTRIBUTION), debian)
- $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
- $(INSTALL) -m 755 -d $(DEV_DOC_DIR)
- $(INSTALL) -m 644 copyright $(DEV_DOC_DIR)
- $(INSTALL) -m 644 changelog $(DEV_DOC_DIR)/changelog.Debian
-endif
-
-install-lib: default
-ifeq ($(PKG_DISTRIBUTION), debian)
- $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
- $(INSTALL) -m 755 -d $(LIB_DOC_DIR)
- $(INSTALL) -m 644 copyright $(LIB_DOC_DIR)
- $(INSTALL) -m 644 changelog $(LIB_DOC_DIR)/changelog.Debian
-endif
+++ /dev/null
-acl (2.2.49-3) unstable; urgency=low
-
- * Add upstream patches
- 03-re-stat_file_after_chown.patch
- 04-print_useful_error_from_read_acl_comments.patch
- 05-restore_crash_on_malformed_input.patch
- 06-fix_potential_null_pointer_dereference.patch
- 09-prevent_setfacl_--restore_from_SIGSEGV.patch
-
- -- Anibal Monsalve Salazar <anibal@debian.org> Tue, 08 Jun 2010 17:44:21 +1000
-
-acl (2.2.49-2) unstable; urgency=low
-
- * Debian source format is 3.0 (quilt)
- Add 01-Makefile.patch
- * Fix CVE-2009-4411
- Refer to https://savannah.nongnu.org/bugs/?28131
- Add 02-499076-physical-walk.patch
- Patch by Markus Steinborn
- Closes: 499076
- * Fix debhelper-but-no-misc-depends
- * Fix out-of-date-standards-version
- * Fix no-upstream-changelog
-
- -- Anibal Monsalve Salazar <anibal@debian.org> Tue, 02 Feb 2010 11:40:55 +1100
-
-acl (2.2.49-1) unstable; urgency=low
-
- * New upstream release
-
- -- Anibal Monsalve Salazar <anibal@debian.org> Tue, 24 Nov 2009 21:39:57 +1100
-
-acl (2.2.48-1) unstable; urgency=low
-
- * New upstream release
- * Fix out-of-date-standards-version
- * Update homepage in debian/control
- * Add Vcs-Git and Vcs-Browser to debian/control
- * Update download page in debian/copyright
- * Update debian/watch
- * Add automake as a build-dependency
-
- -- Anibal Monsalve Salazar <anibal@debian.org> Tue, 25 Aug 2009 10:29:59 +1000
-
-acl (2.2.47-3) unstable; urgency=low
-
- * DH compatibility level is 7
- * Fix out-of-date-standards-version
- * Fix incorrect-libdir-in-la-file
-
- -- Anibal Monsalve Salazar <anibal@debian.org> Fri, 03 Jul 2009 20:44:21 +1000
-
-acl (2.2.47-2) unstable; urgency=low
-
- * Acknowledge NMU. Closes: #477515
-
- -- Anibal Monsalve Salazar <anibal@debian.org> Thu, 24 Apr 2008 06:47:12 +1000
-
-acl (2.2.47-1.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Don't call configure with --enable-lib64=yes. (Closes: #477515)
- This fixes the lib64 rpaths, so no need to call chrpath anymore.
-
- -- Kurt Roeckx <kurt@roeckx.be> Wed, 23 Apr 2008 18:58:41 +0200
-
-acl (2.2.47-1) unstable; urgency=low
-
- * New upstream release
- * Update debian/watch
- * Remove empty directories. Closes: #445902, #222534
- * Fix the following lintian issues:
- W: acl source: package-uses-deprecated-debhelper-compat-version 1
- W: acl source: out-of-date-standards-version 3.7.2 (current is 3.7.3)
- W: libacl1-dev: package-contains-empty-directory usr/share/doc/acl/
- W: libacl1-dev: description-contains-homepage
- W: libacl1: package-contains-empty-directory usr/share/doc/acl/
- W: libacl1: description-contains-homepage
- W: acl: description-contains-homepage
- W: acl: binary-or-shlib-defines-rpath ./usr/bin/chacl /lib64
- W: acl: binary-or-shlib-defines-rpath ./usr/bin/getfacl /lib64
- W: acl: binary-or-shlib-defines-rpath ./usr/bin/setfacl /lib64
-
- -- Anibal Monsalve Salazar <anibal@debian.org> Wed, 23 Apr 2008 21:48:29 +1000
-
-acl (2.2.45-1) unstable; urgency=low
-
- * New upstream release
- * debian/control:
- - Added homepage
- - Added myself as comaintainer
- - Set Standards-Version to 3.7.2
- - libacl1-dev depends on libacl1 (= ${binary:Version})
- - acl and libacl1 depend on ${misc:Depends}
- * debian/rules: Regenerate acl.pot
- * debian/watch: Added
-
- -- Anibal Monsalve Salazar <anibal@debian.org> Sat, 15 Sep 2007 14:28:33 +1000
-
-acl (2.2.42-1) unstable; urgency=low
-
- * New upstream release
- * Incorporate Petr Salinger's GNU/kFreeBSD patch (closes: #401511)
-
- -- Nathan Scott <nathans@debian.org> Fri, 08 Dec 2006 14:21:40 +1100
-
-acl (2.2.41-1) unstable; urgency=low
-
- * New upstream release
- * Rework translation Makefile slightly (closes: #375796)
-
- -- Nathan Scott <nathans@debian.org> Fri, 21 Jul 2006 09:37:35 +1000
-
-acl (2.2.39-1) unstable; urgency=low
-
- * New upstream release
- * Add Swedish translation from Daniel Nylander (closes: #368656)
- * Fix get/setfacl segfault on non-existant files (closes: #370826)
-
- -- Nathan Scott <nathans@debian.org> Wed, 07 Jun 2006 09:30:45 +1000
-
-acl (2.2.37-1) unstable; urgency=low
-
- * New upstream release
- * Fix tree walking with symbolic links (closes: #333160)
-
- -- Nathan Scott <nathans@debian.org> Tue, 02 May 2006 09:41:15 +1000
-
-acl (2.2.36-1) unstable; urgency=low
-
- * New upstream release
- * Fixed build dependency on libc-dev (closes: #358788)
-
- -- Nathan Scott <nathans@debian.org> Tue, 28 Mar 2006 09:14:25 +1100
-
-acl (2.2.35-1) unstable; urgency=low
-
- * New upstream release
- * Switch from debmake to debhelper
-
- -- Nathan Scott <nathans@debian.org> Wed, 15 Feb 2006 20:43:49 +1100
-
-acl (2.2.34-1) unstable; urgency=low
-
- * New upstream release
- * Add libacl1-dev dependency on libattr1-dev (closes: #339786, #341711)
-
- -- Nathan Scott <nathans@debian.org> Mon, 05 Dec 2005 11:15:41 +1100
-
-acl (2.2.33-1) unstable; urgency=low
-
- * New upstream release
-
- -- Nathan Scott <nathans@debian.org> Thu, 10 Nov 2005 07:59:12 +1100
-
-acl (2.2.32-1) unstable; urgency=low
-
- * New upstream release
- * Added French translation (closes: #330596)
-
- -- Nathan Scott <nathans@debian.org> Thu, 29 Sep 2005 09:47:28 +1000
-
-acl (2.2.29-1) unstable; urgency=low
-
- * New upstream release
- * Replace use of _POSIX_PATH_MAX with PATH_MAX (closes: #292819)
-
- -- Nathan Scott <nathans@debian.org> Mon, 31 Jan 2005 20:13:02 +1100
-
-acl (2.2.28-1) unstable; urgency=low
-
- * New upstream release
-
- -- Nathan Scott <nathans@debian.org> Tue, 30 Nov 2004 15:29:29 +1100
-
-acl (2.2.26-1) unstable; urgency=low
-
- * New upstream release
- * acl.5 man page user/group typo fixed (closes: #272186)
-
- -- Nathan Scott <nathans@debian.org> Fri, 10 Sep 2004 10:51:19 +1000
-
-acl (2.2.23-1) unstable; urgency=low
-
- * New upstream release
-
- -- Nathan Scott <nathans@debian.org> Mon, 02 Feb 2004 12:35:56 +1100
-
-acl (2.2.21-1) unstable; urgency=low
-
- * New upstream release
- * Make libacl1-dev conflict on kerberos4kth versioned (closes: #219715)
-
- -- Nathan Scott <nathans@debian.org> Mon, 10 Nov 2003 09:23:21 +1100
-
-acl (2.2.20-1) unstable; urgency=low
-
- * New upstream release
- * Fix incorrect man page entry (closes: #213244)
- * Fix GNU/Hurd build issues, thanks to Robert Millan (closes: #215153)
-
- -- Nathan Scott <nathans@debian.org> Mon, 13 Oct 2003 13:07:43 +1000
-
-acl (2.2.15-1) unstable; urgency=low
-
- * New upstream release
-
- -- Nathan Scott <nathans@debian.org> Fri, 08 Aug 2003 16:39:10 +1000
-
-acl (2.2.14-1) unstable; urgency=low
-
- * New upstream release
-
- -- Nathan Scott <nathans@debian.org> Mon, 04 Aug 2003 09:18:00 +1000
-
-acl (2.2.13-1) unstable; urgency=low
-
- * New upstream release
-
- -- Nathan Scott <nathans@debian.org> Tue, 29 Jul 2003 11:27:53 +1000
-
-acl (2.2.12-1) unstable; urgency=low
-
- * Don't always call msgmerge, fix from Steve Langasek (closes: #199277)
-
- -- Nathan Scott <nathans@debian.org> Thu, 3 Jul 2003 10:55:01 +1000
-
-acl (2.2.11-1) unstable; urgency=low
-
- * New upstream release
- * Fix lib package dependencies, thanks to Steve Langasek (closes: #193149)
-
- -- Nathan Scott <nathans@debian.org> Wed, 04 Jun 2003 15:50:50 +1000
-
-acl (2.2.10-1) unstable; urgency=low
-
- * New upstream release
- * Added runtime conflict with libacl1-kerberos4kth, as the
- presence of this package breaks Samba's use of libacl1.
-
- -- Nathan Scott <nathans@debian.org> Mon, 26 May 2003 11:38:53 +1000
-
-acl (2.2.9-1) unstable; urgency=low
-
- * New upstream release
- * Updated policy version to which this package conforms
- * Fine-tuned the libacl1-dev dependencies a bit (closes: #188068)
-
- -- Nathan Scott <nathans@debian.org> Sat, 26 Apr 2003 04:36:01 +1000
-
-acl (2.2.4-1) unstable; urgency=low
-
- * New upstream release
-
- -- Nathan Scott <nathans@debian.org> Mon, 10 Feb 2003 16:15:18 +1100
-
-acl (2.2.1-1) unstable; urgency=low
-
- * Clarify acl(5) with respect to fileutils support (closes: #172642)
- * Fix a bash-ism in debian/rules (closes: #173025)
-
- -- Nathan Scott <nathans@debian.org> Mon, 16 Dec 2002 09:40:50 +1100
-
-acl (2.2.0-1) unstable; urgency=low
-
- * New upstream release
- * Added runtime conflict with kerberos4kth-dev (closes: #172169)
-
- -- Nathan Scott <nathans@debian.org> Mon, 9 Dec 2002 08:09:15 +1100
-
-acl (2.1.1-1) unstable; urgency=low
-
- * Fix Debian package dependency rules for acl (closes: #166709)
- * Fix the group for libacl1, was "utils" now "libs" (closes: #166835)
-
- -- Nathan Scott <nathans@debian.org> Tue, 29 Oct 2002 09:29:52 +1100
-
-acl (2.1.0-1) unstable; urgency=low
-
- * New upstream release, changing dev package name (closes: #141756)
-
- -- Nathan Scott <nathans@debian.org> Sat, 19 Oct 2002 08:40:38 +1000
-
-acl (2.0.19-1) unstable; urgency=low
-
- * New upstream release
-
- -- Nathan Scott <nathans@debian.org> Thu, 5 Sep 2002 09:12:02 +1000
-
-acl (2.0.17-1) unstable; urgency=low
-
- * New upstream bugfix release
-
- -- Nathan Scott <nathans@debian.org> Tue, 13 Aug 2002 07:52:54 +1000
-
-acl (2.0.15-1) unstable; urgency=low
-
- * New upstream release (build-related and docs changes only)
- * Follow Steve Langasek's advice to fix libattr issue (closes: #150854)
-
- -- Nathan Scott <nathans@debian.org> Thu, 4 Jul 2002 12:10:38 +1000
-
-acl (2.0.14-1) unstable; urgency=low
-
- * New upstream release (build-related changes only)
-
- -- Nathan Scott <nathans@debian.org> Thu, 4 Jul 2002 12:10:38 +1000
-
-acl (2.0.13-1) unstable; urgency=low
-
- * New upstream release for (even) closer standard compliance
- * Increment the libacl version from 1.0.1 to 1.0.2
-
- -- Nathan Scott <nathans@debian.org> Tue, 25 Jun 2002 17:08:03 +1000
-
-acl (2.0.12-1) unstable; urgency=low
-
- * Increment the libacl version from 1.0.0 to 1.0.1 (closes: #150854)
-
- -- Nathan Scott <nathans@debian.org> Tue, 25 Jun 2002 08:27:20 +1000
-
-acl (2.0.11-1) unstable; urgency=low
-
- * New upstream bugfix release
-
- -- Nathan Scott <nathans@debian.org> Wed, 1 May 2002 09:30:54 +1000
-
-acl (2.0.10-1) unstable; urgency=low
-
- * New upstream bugfix release
- * Add accidentally removed dependency of libacl on libattr
-
- -- Nathan Scott <nathans@debian.org> Mon, 22 Apr 2002 15:12:21 +1000
-
-acl (2.0.9-1) unstable; urgency=low
-
- * New upstream bugfix release (affects 64 bit platforms only)
-
- -- Nathan Scott <nathans@debian.org> Tue, 16 Apr 2002 08:31:48 +1000
-
-acl (2.0.8-1) unstable; urgency=low
-
- * New upstream bugfix release
-
- -- Nathan Scott <nathans@debian.org> Sat, 13 Apr 2002 09:45:06 +1000
-
-acl (2.0.7-1) unstable; urgency=low
-
- * New upstream bugfix release
-
- -- Nathan Scott <nathans@debian.org> Wed, 10 Apr 2002 09:50:24 +1100
-
-acl (2.0.6-1) unstable; urgency=low
-
- * New upstream bugfix release
-
- -- Nathan Scott <nathans@debian.org> Mon, 8 Apr 2002 08:56:34 +1100
-
-acl (2.0.5-1) unstable; urgency=low
-
- * New upstream release
-
- -- Nathan Scott <nathans@debian.org> Wed, 27 Mar 2002 08:47:58 +1100
-
-acl (2.0.4-2) unstable; urgency=low
-
- * Fix attr-dev build dependency issue (closes: #138280)
-
- -- Nathan Scott <nathans@debian.org> Fri, 15 Mar 2002 07:08:50 +1100
-
-acl (2.0.4-1) unstable; urgency=low
-
- * New upstream bugfix release
-
- -- Nathan Scott <nathans@debian.org> Tue, 12 Mar 2002 09:47:50 +1100
-
-acl (2.0.2-1) unstable; urgency=low
-
- * Initial release (closes: #97686)
- * Uses the official Linux extended attributes interfaces (currently
- supported by ext2, ext3, and XFS)
-
- -- Nathan Scott <nathans@debian.org> Tue, 26 Feb 2002 13:25:26 +1100
-
-Local variables:
-mode: debian-changelog
-End:
+++ /dev/null
-Source: acl
-Section: utils
-Priority: optional
-Maintainer: Nathan Scott <nathans@debian.org>
-Uploaders: Anibal Monsalve Salazar <anibal@debian.org>
-Build-Depends: autoconf, automake, debhelper (>= 7), gettext, libtool, libattr1-dev (>= 2.4.4)
-Standards-Version: 3.8.4
-Homepage: http://savannah.nongnu.org/projects/acl/
-Vcs-Git: git://git.savannah.nongnu.org/acl.git
-Vcs-Browser: http://git.savannah.gnu.org/cgit/acl.git
-
-Package: acl
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
-Description: Access control list utilities
- This package contains the getfacl and setfacl utilities needed for
- manipulating access control lists.
-
-Package: libacl1-dev
-Section: libdevel
-Priority: extra
-Depends: ${misc:Depends}, libc6-dev | libc-dev, libacl1 (= ${binary:Version}), libattr1-dev (>= 2.4.4)
-Provides: acl-dev
-Replaces: acl-dev
-Conflicts: acl-dev, acl (<< 2.0.0), kerberos4kth-dev (<< 1.2.2-4)
-Architecture: any
-Description: Access control list static libraries and headers
- This package contains the static libraries and header files needed
- for developing programs which make use of the access control list
- programming interface defined in POSIX 1003.1e draft standard 17.
-
-Package: libacl1
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Section: libs
-Priority: required
-Conflicts: acl (<< 2.0.0), libacl1-kerberos4kth
-Architecture: any
-Description: Access control list shared library
- This package contains the libacl.so dynamic library containing
- the POSIX 1003.1e draft standard 17 functions for manipulating
- access control lists.
+++ /dev/null
-This package was debianized by Nathan Scott nathans@debian.org on
-Tue, 26 Feb 2002 13:25:26 +1100
-
-It can be downloaded from http://mirror.its.uidaho.edu/pub/savannah/acl/
-
-Copyright:
-
-Copyright (C) 2001 Andreas Gruenbacher.
-Copyright (C) 2001-2002 Silicon Graphics, Inc. All Rights Reserved.
-
-You are free to distribute this software under Version 2.1
-of the GNU Lesser General Public License.
-On Debian systems, refer to /usr/share/common-licenses/LGPL-2.1
-for the complete text of the GNU Lesser General Public License.
-
-Certain components (as annotated in the source) are licensed
-under the terms of the GNU General Public License.
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+++ /dev/null
---- a/Makefile 2009-07-06 16:44:30.000000000 +1000
-+++ b/Makefile 2009-08-25 10:29:10.000000000 +1000
-@@ -74,7 +74,6 @@ configure include/builddefs:
- --bindir=/usr/bin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
-- --enable-lib64=yes \
- --includedir=/usr/include \
- --mandir=/usr/share/man \
- --datadir=/usr/share \
+++ /dev/null
-commit d539830d19b35df0c12c0b7d36c1f6c428f34a91
-Author: M. Steinborn <gnugv_maintainer@yahoo.de>
-Date: Fri Jan 22 14:37:04 2010 -0800
-
- setfacl: make sure that -R only calls stat(2) on symlinks when it needs to
-
- Fixes http://savannah.nongnu.org/bugs/?28131
-
- Signed-off-by: Brandon Philips <bphilips@suse.de>
-
-diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
-index 802f060..731e417 100644
---- a/setfacl/setfacl.c
-+++ b/setfacl/setfacl.c
-@@ -76,7 +76,7 @@ struct option long_options[] = {
- const char *progname;
- const char *cmd_line_options, *cmd_line_spec;
-
--int walk_flags = WALK_TREE_DEREFERENCE;
-+int walk_flags = WALK_TREE_DEREFERENCE_TOPLEVEL;
- int opt_recalculate; /* recalculate mask entry (0=default, 1=yes, -1=no) */
- int opt_promote; /* promote access ACL to default ACL */
- int opt_test; /* do not write to the file system.
-@@ -590,13 +590,15 @@ int main(int argc, char *argv[])
- break;
-
- case 'L': /* follow symlinks */
-- walk_flags |= WALK_TREE_LOGICAL;
-+ walk_flags |= WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE;
- walk_flags &= ~WALK_TREE_PHYSICAL;
- break;
-
- case 'P': /* do not follow symlinks */
- walk_flags |= WALK_TREE_PHYSICAL;
-- walk_flags &= ~WALK_TREE_LOGICAL;
-+ walk_flags |= WALK_TREE_PHYSICAL;
-+ walk_flags &= ~(WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE |
-+ WALK_TREE_DEREFERENCE_TOPLEVEL);
- break;
-
- case 't': /* test mode */
-diff --git a/test/misc.test b/test/misc.test
-index 7c62c64..d5d7680 100644
---- a/test/misc.test
-+++ b/test/misc.test
-@@ -424,3 +424,31 @@ Now, chmod should change the group_obj entry
- >
-
- $ rmdir d
-+
-+Dangling symlink test http://savannah.nongnu.org/bugs/?28131
-+
-+ $ mkdir d
-+ $ ln -s d/a d/b
-+ $ getfacl -R d
-+ > # file: d
-+ > # owner: %TUSER
-+ > # group: %TGROUP
-+ > user::rwx
-+ > group::rwx
-+ > other::r-x
-+ >
-+ $ setfacl -R -m u:bin:rw d
-+ $ getfacl -RL d
-+ > getfacl: d/b: No such file or directory
-+ > # file: d
-+ > # owner: %TUSER
-+ > # group: %TGROUP
-+ > user::rwx
-+ > user:bin:rw-
-+ > group::rwx
-+ > mask::rwx
-+ > other::r-x
-+ >
-+ $ setfacl -RL -m u:bin:rw d
-+ > setfacl: d/b: No such file or directory
-+ $ rm -R d
+++ /dev/null
-commit 16230023e5afcb0b42b8d01207e3449d22772c31
-Author: Brandon Philips <brandon@ifup.org>
-Date: Thu Dec 17 14:28:04 2009 -0800
-
- setfacl: changing owner and when S_ISUID should be set --restore fix
-
- Fix a problem in setfacl --restore when the owner or group is changed
- and the S_ISUID and S_ISGID are to be set.
-
- The root of the problem is that chown() can clear the S_ISUID and
- S_ISGID bits as described in chown(2):
-
- When the owner or group of an executable file are changed by a
- non- superuser, the S_ISUID and S_ISGID mode bits are cleared. POSIX
- does not specify whether this also should happen when root does the
- chown(); the Linux behavior depends on the kernel version. In case of
- a non- group-executable file (i.e., one for which the S_IXGRP bit is
- not set) the S_ISGID bit indicates mandatory locking, and is not
- cleared by a chown().
-
- To fix the issue re-stat() the file after chown() so that the logic
- surrounding the chmod() has the updated mode of the file.
-
- Signed-off-by: Brandon Philips <bphilips@suse.de>
-
-diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
-index 091b9cc..56b0aa4 100644
---- a/setfacl/setfacl.c
-+++ b/setfacl/setfacl.c
-@@ -128,6 +128,7 @@ restore(
- struct do_set_args args;
- int line = 0, backup_line;
- int error, status = 0;
-+ int chmod_required = 0;
-
- memset(&st, 0, sizeof(st));
-
-@@ -206,10 +207,15 @@ restore(
- strerror(errno));
- status = 1;
- }
-+
-+ /* chown() clears setuid/setgid so force a chmod if
-+ * S_ISUID/S_ISGID was expected */
-+ if ((st.st_mode & flags) & (S_ISUID | S_ISGID))
-+ chmod_required = 1;
- }
-
- mask = S_ISUID | S_ISGID | S_ISVTX;
-- if ((st.st_mode & mask) != (flags & mask)) {
-+ if (chmod_required || ((st.st_mode & mask) != (flags & mask))) {
- if (!args.mode)
- args.mode = st.st_mode;
- args.mode &= (S_IRWXU | S_IRWXG | S_IRWXO);
-diff --git a/test/root/restore.test b/test/root/restore.test
-new file mode 100644
-index 0000000..6003cd4
---- /dev/null
-+++ b/test/root/restore.test
-@@ -0,0 +1,23 @@
-+Ensure setuid bit is restored when the owner changes
-+ https://bugzilla.redhat.com/show_bug.cgi?id=467936#c7
-+
-+ $ touch passwd
-+ $ chmod 755 passwd
-+ $ chmod u+s passwd
-+ $ getfacl passwd > passwd.acl
-+ $ cat passwd.acl
-+ > # file: passwd
-+ > # owner: root
-+ > # group: root
-+ > # flags: s--
-+ > user::rwx
-+ > group::r-x
-+ > other::r-x
-+ >
-+ $ chown bin passwd
-+ $ chmod u+s passwd
-+ $ setfacl --restore passwd.acl
-+ $ ls -dl passwd | awk '{print $1 " " $3 " " $4}'
-+ > -rwsr-xr-x root root
-+
-+ $ rm passwd passwd.acl
+++ /dev/null
-commit fd34ef53234f465bf12cd51ca3a7bb056856e3dd
-Author: Brandon Philips <brandon@ifup.org>
-Date: Thu Dec 17 13:36:57 2009 -0800
-
- setfacl: print useful error from read_acl_comments
-
- restore()'s fail path expects errno to contain the error but that is not
- the case with read_acl_comments().
-
- Fix up the error path in restore() and have read_acl_comments() return
- EINVAL which makes more sense in this case.
-
- Signed-off-by: Brandon Philips <bphilips@suse.de>
-
-diff --git a/setfacl/parse.c b/setfacl/parse.c
-index 4df1a19..b333beb 100644
---- a/setfacl/parse.c
-+++ b/setfacl/parse.c
-@@ -527,7 +527,7 @@ read_acl_comments(
- fail:
- if (path_p && *path_p)
- free(*path_p);
-- return -1;
-+ return -EINVAL;
- }
-
-
-diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
-index 56b0aa4..802f060 100644
---- a/setfacl/setfacl.c
-+++ b/setfacl/setfacl.c
-@@ -136,8 +136,10 @@ restore(
- backup_line = line;
- error = read_acl_comments(file, &line, &path_p, &uid, &gid,
- &flags);
-- if (error < 0)
-+ if (error < 0) {
-+ error = -error;
- goto fail;
-+ }
- if (error == 0)
- return status;
-
-@@ -158,10 +160,10 @@ restore(
- }
-
- if (!(args.seq = seq_init()))
-- goto fail;
-+ goto fail_errno;
- if (seq_append_cmd(args.seq, CMD_REMOVE_ACL, ACL_TYPE_ACCESS) ||
- seq_append_cmd(args.seq, CMD_REMOVE_ACL, ACL_TYPE_DEFAULT))
-- goto fail;
-+ goto fail_errno;
-
- error = read_acl_seq(file, args.seq, CMD_ENTRY_REPLACE,
- SEQ_PARSE_WITH_PERM |
-@@ -249,9 +251,11 @@ getout:
- }
- return status;
-
-+fail_errno:
-+ error = errno;
- fail:
- fprintf(stderr, "%s: %s: %s\n", progname, xquote(filename, "\n\r"),
-- strerror(errno));
-+ strerror(error));
- status = 1;
- goto getout;
- }
+++ /dev/null
-commit a1815d4ad4ffe84e8f7d128a38955e3dab306e0d
-Author: Markus Steinborn <msteinbo>
-Date: Thu Dec 17 16:24:17 2009 -0800
-
- setfacl: fix restore crash on malformed input
-
- Malformed input to setfacl --restore can cause a crash due to a double
- free.
-
- Ensure that freed memory is set to NULL.
-
- Fixes this bug:
- https://savannah.nongnu.org/bugs/index.php?28185
-
- Signed-off-by: Brandon Philips <bphilips@suse.de>
-
-diff --git a/setfacl/parse.c b/setfacl/parse.c
-index b333beb..e7e6add 100644
---- a/setfacl/parse.c
-+++ b/setfacl/parse.c
-@@ -525,8 +525,10 @@ read_acl_comments(
- return -1;
- return comments_read;
- fail:
-- if (path_p && *path_p)
-+ if (path_p && *path_p) {
- free(*path_p);
-+ *path_p = NULL;
-+ }
- return -EINVAL;
- }
-
-diff --git a/test/Makefile b/test/Makefile
-index 828b6a4..0c6ee3e 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -22,7 +22,8 @@ include $(TOPDIR)/include/builddefs
- TESTS = $(wildcard *.test)
- ROOT = $(wildcard root/*.test)
- NFS = $(wildcard nfs/*.test)
--LSRCFILES = sort-getfacl-output run make-tree $(TESTS) $(ROOT) $(NFS)
-+LSRCFILES = sort-getfacl-output run make-tree $(TESTS) $(ROOT) $(NFS) \
-+ test/malformed-restore-double-owner.acl
-
- include $(BUILDRULES)
-
-diff --git a/test/malformed-restore-double-owner.acl b/test/malformed-restore-double-owner.acl
-new file mode 100644
-index 0000000..1981de2
---- /dev/null
-+++ b/test/malformed-restore-double-owner.acl
-@@ -0,0 +1,8 @@
-+# file: tmp
-+# owner: USER
-+# owner: USER
-+# group: GROUP
-+user::rwx
-+group::rwx
-+other::rwx
-+
-diff --git a/test/malformed-restore.test b/test/malformed-restore.test
-new file mode 100644
-index 0000000..e92b75b
---- /dev/null
-+++ b/test/malformed-restore.test
-@@ -0,0 +1,19 @@
-+Test for malformed input to --restore
-+ https://savannah.nongnu.org/bugs/index.php?28185
-+
-+ $ cp malformed-restore-double-owner.acl tmp.acl
-+ $ sed -i "s/USER/%TUSER/g" tmp.acl
-+ $ sed -i "s/GROUP/%TGROUP/g" tmp.acl
-+ $ touch tmp
-+ $ setfacl --restore tmp.acl
-+ > setfacl: tmp.acl: Invalid argument
-+ $ rm tmp.acl tmp
-+
-+ $ mkdir tmp
-+ $ chmod 1777 tmp
-+ $ getfacl tmp > tmp.acl
-+ $ sed -i 's/--t/--x/g' tmp.acl
-+ $ setfacl --restore tmp.acl
-+ > setfacl: tmp.acl: Invalid argument
-+ $ rmdir tmp
-+ $ rm tmp.acl
+++ /dev/null
-commit 2e8f820c8c5ab0ab9444398cc122e3a63fa4bc3e
-Author: Brandon Philips <brandon@ifup.org>
-Date: Thu Dec 17 16:30:43 2009 -0800
-
- libacl: fix potential null pointer dereference
-
- stanse found that acl_copy_int() derefences ext_acl when initializing
- ent_p and then later checks if ext_acl is NULL.
-
- Delay initializing ent_p and size until the NULL check has been made on
- ext_acl.
-
- Fix this bug:
- https://bugzilla.novell.com/show_bug.cgi?id=564733
-
- Signed-off-by: Brandon Philips <bphilips@suse.de>
-
-diff --git a/libacl/acl_copy_int.c b/libacl/acl_copy_int.c
-index e58bbe3..7bcb0c9 100644
---- a/libacl/acl_copy_int.c
-+++ b/libacl/acl_copy_int.c
-@@ -27,17 +27,18 @@ acl_t
- acl_copy_int(const void *buf_p)
- {
- const struct __acl *ext_acl = (struct __acl *)buf_p;
-- const struct __acl_entry *ent_p = ext_acl->x_entries, *end_p;
-- size_t size = ext_acl ? ext_acl->x_size : 0;
-+ const struct __acl_entry *ent_p, *end_p;
-+ size_t size;
- int entries;
- acl_obj *acl_obj_p;
- acl_entry_obj *entry_obj_p;
-
-- if (!ext_acl || size < sizeof(struct __acl)) {
-+ if (!ext_acl || ext_acl->x_size < sizeof(struct __acl)) {
- errno = EINVAL;
- return NULL;
- }
-- size -= sizeof(struct __acl);
-+ ent_p = ext_acl->x_entries;
-+ size = ext_acl->x_size - sizeof(struct __acl);
- if (size % sizeof(struct __acl_entry)) {
- errno = EINVAL;
- return NULL;
+++ /dev/null
-commit 340a70e71c690902cd7f15d07ae76f332064a5d9
-Author: Kamil Dudka <kdudka@redhat.com>
-Date: Wed Mar 24 15:36:08 2010 +0100
-
- Prevent setfacl --restore from SIGSEGV on malformed restore file
-
- originally reported at:
- https://bugzilla.redhat.com/576550
-
-diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
-index 731e417..4f4ff27 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 = { };
- int line = 0, backup_line;
- int error, status = 0;
- int chmod_required = 0;
-diff --git a/test/misc.test b/test/misc.test
-index d5d7680..2cf0360 100644
---- a/test/misc.test
-+++ b/test/misc.test
-@@ -452,3 +452,9 @@ Dangling symlink test http://savannah.nongnu.org/bugs/?28131
- $ setfacl -RL -m u:bin:rw d
- > setfacl: d/b: No such file or directory
- $ rm -R d
-+
-+Malformed restore file
-+
-+ $ echo "# owner: root" > f
-+ $ setfacl --restore=f 2>&1
-+ >setfacl: f: No filename found in line 0, aborting
+++ /dev/null
-01-Makefile.patch
-03-re-stat_file_after_chown.patch
-04-print_useful_error_from_read_acl_comments.patch
-05-restore_crash_on_malformed_input.patch
-06-fix_potential_null_pointer_dereference.patch
-02-499076-physical-walk.patch
-09-prevent_setfacl_--restore_from_SIGSEGV.patch
+++ /dev/null
-#!/usr/bin/make -f
-
-export DH_VERBOSE=1
-
-package = acl
-develop = lib$(package)1-dev
-library = lib$(package)1
-
-dirme = debian/$(package)
-dirdev = debian/$(develop)
-dirlib = debian/$(library)
-pkgme = DIST_ROOT=`pwd`/$(dirme); export DIST_ROOT;
-pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT;
-pkglib = DIST_ROOT=`pwd`/$(dirlib); export DIST_ROOT;
-stdenv = @GZIP=-q; export GZIP;
-
-options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
- INSTALL_USER=root INSTALL_GROUP=root ;
-checkdir = test -f debian/rules
-
-build: built
-built: config
- @echo "== dpkg-buildpackage: build" 1>&2
- $(MAKE) default
- cd po; rm -rf acl.pot; make acl.pot
- touch built
-
-config: .census
-.census:
- @echo "== dpkg-buildpackage: configure" 1>&2
- $(checkdir)
- $(options) $(MAKE) configure
- touch .census
-
-clean:
- @echo "== dpkg-buildpackage: clean" 1>&2
- $(checkdir)
- -rm -f built .census
- $(MAKE) distclean
- -rm -rf $(dirme) $(dirdev) $(dirlib)
- -rm -f debian/*substvars debian/files* debian/*.debhelper changelog
-
-binary-indep:
-
-binary-arch: checkroot built
- @echo "== dpkg-buildpackage: binary-arch" 1>&2
- $(checkdir)
- -rm -rf $(dirme) $(dirdev) $(dirlib)
- $(pkgme) $(MAKE) -C . install
- $(pkgdev) $(MAKE) -C . install-dev
- $(pkglib) $(MAKE) -C . install-lib
- $(pkgme) $(MAKE) -C build src-manifest
- sed "s/^libdir='\/lib'$$/libdir='\/usr\/lib'/" $(dirdev)/usr/lib/libacl.la > $(dirdev)/usr/lib/libacl.la.new
- mv $(dirdev)/usr/lib/libacl.la.new $(dirdev)/usr/lib/libacl.la
- rmdir debian/libacl1-dev/usr/share/doc/acl
- rmdir debian/libacl1/usr/share/doc/acl
- cp -p doc/CHANGES changelog
- dh_installdocs -A changelog
- dh_installchangelogs
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs -N $(library)
- dh_makeshlibs -p $(library) -V 'libacl1 (>= 2.2.11-1)'
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-
-checkroot:
- test 0 -eq `id -u`
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+++ /dev/null
-3.0 (quilt)
+++ /dev/null
-compression = "bzip2"
-compression-level = 9
+++ /dev/null
-version=3
-http://mirror.its.uidaho.edu/pub/savannah/acl/ acl-([\d]+[\d\.]*).src.tar.gz
projects / framework / base / acl.git / commitdiff