summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce A. Locke <blocke@gentoo.org>2002-05-04 10:36:33 +0000
committerBruce A. Locke <blocke@gentoo.org>2002-05-04 10:36:33 +0000
commit1450d196d62a4069d4845b87c069112a20e3a754 (patch)
treee65c80a6fb130089950a9e3545836626493a26b0 /sys-apps/fileutils
parentfix bug #1978: $KDEDIR/share/templates/.source/emptydir being removed on reme... (diff)
downloadgentoo-2-1450d196d62a4069d4845b87c069112a20e3a754.tar.gz
gentoo-2-1450d196d62a4069d4845b87c069112a20e3a754.tar.bz2
gentoo-2-1450d196d62a4069d4845b87c069112a20e3a754.zip
acl patch related fix
Diffstat (limited to 'sys-apps/fileutils')
-rw-r--r--sys-apps/fileutils/ChangeLog14
-rw-r--r--sys-apps/fileutils/files/digest-fileutils-4.1.8-r2 (renamed from sys-apps/fileutils/files/digest-fileutils-4.1.8-r1)0
-rw-r--r--sys-apps/fileutils/fileutils-4.1.8-r2.ebuild (renamed from sys-apps/fileutils/fileutils-4.1.8-r1.ebuild)10
3 files changed, 17 insertions, 7 deletions
diff --git a/sys-apps/fileutils/ChangeLog b/sys-apps/fileutils/ChangeLog
index adc045365a68..4c0ab4d3dbd5 100644
--- a/sys-apps/fileutils/ChangeLog
+++ b/sys-apps/fileutils/ChangeLog
@@ -1,14 +1,22 @@
# ChangeLog for sys-apps/fileutils
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/ChangeLog,v 1.4 2002/05/04 05:49:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/ChangeLog,v 1.5 2002/05/04 10:36:33 blocke Exp $
+
+*fileutils-4.1.8-r2 (04 May 2002)
+
+ 04 May 2002; Bruce A. Locke <blocke@shivan.org> fileutils-4.1.8-r2.ebuild:
+
+ ACL/NLS fix patch should only be applied if ACL support is actually
+ being compiled in. Bumping rev so people don't keep trying to merge
+ previous broken version.
+
+*fileutils-4.1.8-r1 (02 May 2002)
03 May 2002; Daniel Robbins <drobbins@gentoo.org>: Added acl.c.diff to fix
compilation with nls disabled. Blocke is sending this fix upstream to
acl.bestbits.at. No rev bump -- no need for a recompile if it worked for
people.
-*fileutils-4.1.8-r1 (02 May 2002)
-
02 May 2002; Daniel Robbins <drobbins@gentoo.org>: Added ACL support, closing
bug #2343 (USE="acl" must be set)
diff --git a/sys-apps/fileutils/files/digest-fileutils-4.1.8-r1 b/sys-apps/fileutils/files/digest-fileutils-4.1.8-r2
index 175111c6daf2..175111c6daf2 100644
--- a/sys-apps/fileutils/files/digest-fileutils-4.1.8-r1
+++ b/sys-apps/fileutils/files/digest-fileutils-4.1.8-r2
diff --git a/sys-apps/fileutils/fileutils-4.1.8-r1.ebuild b/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild
index 9293ae019ca3..a8303f81bc6e 100644
--- a/sys-apps/fileutils/fileutils-4.1.8-r1.ebuild
+++ b/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.8-r1.ebuild,v 1.2 2002/05/04 05:49:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild,v 1.1 2002/05/04 10:36:33 blocke Exp $
ACLPV=4.1.8acl-0.8.25
@@ -17,17 +17,19 @@ RDEPEND="virtual/glibc
src_unpack() {
if [ "`use acl`" ]; then
- echo "USING ACL"
cp ${DISTDIR}/${P}.tar.gz ${WORKDIR}/.
xdelta patch ${DISTDIR}/fileutils-${ACLPV}.xdelta ${WORKDIR}/${P}.tar.gz || die
tar xz --no-same-owner -f ${WORKDIR}/${P}acl.tar.gz || die
mv ${WORKDIR}/${P}acl ${WORKDIR}/${P}
+
+ # fix NLS include buglet
+ cd ${S}/lib
+ cat ${FILESDIR}/acl.c.diff | patch -p0 -l || die
+
cd ${S}
else
unpack ${P}.tar.gz ; cd ${S}
fi
- cd ${S}/lib
- cat ${FILESDIR}/acl.c.diff | patch -p0 -l || die
}
src_compile() {