Fix for sandbox violation

4 files changed, 36 insertions, 20 deletions

diff --git a/net-fs/ncpfs/ChangeLog b/net-fs/ncpfs/ChangeLog
index bc62c8fe304e..1a8e65ed3bb9 100644
--- a/net-fs/ncpfs/ChangeLog
+++ b/net-fs/ncpfs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/ncpfs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ChangeLog,v 1.13 2004/12/01 21:28:57 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ChangeLog,v 1.14 2004/12/09 15:28:21 stuart Exp $
+
+  09 Dec 2004; Stuart Herbert <stuart@gentoo.org> ncpfs-2.2.5.ebuild:
+  Fix for sandbox violation when the PHP extension is built
 
 *ncpfs-2.2.5 (01 Dec 2004)
 
diff --git a/net-fs/ncpfs/Manifest b/net-fs/ncpfs/Manifest
index ef2ef47d7485..49c31a1ac0ae 100644
--- a/net-fs/ncpfs/Manifest
+++ b/net-fs/ncpfs/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 cd670cd7cfbfa993fc777567807e217e ChangeLog 1591
 MD5 c9e5871c825d1968d24662100bab7b2c metadata.xml 290
 MD5 cf30be0a3ca1f63ff991a9d69ac7c2ff ncpfs-2.2.0.19-r1.ebuild 945
 MD5 451a9ac75dcee32503b81434d3e830eb ncpfs-2.2.0.19-r2.ebuild 988
 MD5 57e7c70b0e8be0e9aaddf3efd63273bc ncpfs-2.2.0.19.ebuild 732
 MD5 fdd49676265cd6dc78bfc6de7d761a6e ncpfs-2.2.3.ebuild 957
-MD5 13d0da02d50be7bd870b6bd40fa18c2b ncpfs-2.2.5.ebuild 1083
-MD5 9735abb0eadcb8650c1df3c6b6e8b926 ChangeLog 1463
+MD5 1fcee879f573920d0c2db616aab90f55 ncpfs-2.2.5.ebuild 1346
 MD5 922a7aee31b05e5c9fe29c08ad41efbb files/digest-ncpfs-2.2.0.19 67
 MD5 922a7aee31b05e5c9fe29c08ad41efbb files/digest-ncpfs-2.2.0.19-r1 67
 MD5 922a7aee31b05e5c9fe29c08ad41efbb files/digest-ncpfs-2.2.0.19-r2 67
 MD5 26e01ffe1e892a30ca35b773ed1ad014 files/digest-ncpfs-2.2.3 64
 MD5 28e54a3c45d44a003fc1f5764a7e2b63 files/digest-ncpfs-2.2.5 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBrjeiMGnpIbeahxwRAsYeAJ9TTXRCmBxgycsALVLdtJPSfhJsQACgh80E
-1EgY69tc+RsZgnUnW6eTzL0=
-=MOjG
------END PGP SIGNATURE-----
+MD5 221f5197d914c3526e1d965bf62d9535 files/ncpfs-2.2.5-php.patch 555
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch b/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch
new file mode 100644
index 000000000000..f0143b2ceebc
--- /dev/null
+++ b/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch
@@ -0,0 +1,16 @@
+--- contrib/php/build/rules.mk.orig	2004-12-09 13:01:04.417854240 +0000
++++ contrib/php/build/rules.mk	2004-12-09 13:01:42.460070944 +0000
+@@ -63,10 +63,10 @@
+ 
+ install-modules:
+ 	@test -d modules && \
+-	$(mkinstalldirs) $(moduledir) && \
+-	echo "installing shared modules into $(moduledir)" && \
++	$(mkinstalldirs) $(DESTDIR)/$(moduledir) && \
++	echo "installing shared modules into $(DESTDIR)/$(moduledir)" && \
+ 	rm -f modules/*.la && \
+-	cp modules/* $(moduledir) || true
++	cp modules/* $(DESTDIR)/$(moduledir) || true
+ 
+ include $(builddir)/.deps
+ 
diff --git a/net-fs/ncpfs/ncpfs-2.2.5.ebuild b/net-fs/ncpfs/ncpfs-2.2.5.ebuild
index ab6557af1601..9fe3ea1afab0 100644
--- a/net-fs/ncpfs/ncpfs-2.2.5.ebuild
+++ b/net-fs/ncpfs/ncpfs-2.2.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ncpfs-2.2.5.ebuild,v 1.1 2004/12/01 21:28:57 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ncpfs-2.2.5.ebuild,v 1.2 2004/12/09 15:28:21 stuart Exp $
 
-inherit eutils
+inherit eutils confutils
 
-IUSE="nls pam"
+IUSE="nls pam php"
 
 DESCRIPTION="Provides Access to Netware services using the NCP protocol (Kernel support must be activated!)"
 SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz"
@@ -15,22 +15,28 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
 
 DEPEND="nls? ( sys-devel/gettext )
-		pam? ( sys-libs/pam )"
+		pam? ( sys-libs/pam )
+		php? || ( virtual/php virtual/http-php )"
 
 src_unpack() {
 	unpack ${A}
 
 	# Needed because the directory in the tar.gz is not readable for anyone
 	chmod a+r ${S}
+
+	# add patch for PHP extension sandbox violation
+	cd ${S} || die "Unable to cd to ${S}"
+	epatch ${FILESDIR}/${PN}-2.2.5-php.patch || die "Unable to apply PHP patch"
 }
 
 src_compile() {
 
 	local myconf
 
-	use nls || myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} `use_enable pam`"
+	myconf=
+	enable_extension_enable "nls" "nls" 0
+	enable_extension_enable "pam" "pam" 0
+	enable_extension_enable "php" "php" 0
 
 	econf ${myconf} || die "econf failed"
 	emake || die