fix vroot issue

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 42 insertions, 49 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index c39312a99ec1..ee01dbc180d7 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.107 2006/06/23 15:28:34 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.108 2006/06/24 12:32:00 humpback Exp $
+
+  24 Jun 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  proftpd-1.3.0.ebuild:
+  Updated to fix vroot and ifesession issues. Comments in bug 111668
 
 *proftpd-1.3.0 (23 Jun 2006)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index e27a520d403c..70d66a2fb0e6 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.2.9_rc3-reversedns.diff 1974 RMD160 f060a6c7df6e0b75d5a7fc974c49f977b4242c0a SHA1 55eaf2f9c230f309602a728acb7f5a794398aa9c SHA256 c6065fbe185cc0b1194d765a59161eec7ea0e2312885a7440e80279899848efd
 MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
 RMD160 f060a6c7df6e0b75d5a7fc974c49f977b4242c0a files/1.2.9_rc3-reversedns.diff 1974
@@ -59,32 +56,30 @@ DIST proftpd-1.2.10.tar.bz2 920337
 DIST proftpd-1.3.0.tar.bz2 1386086 RMD160 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec SHA1 d117134035a3d8d130c5aa44d6b1788683a33410 SHA256 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe
 DIST proftpd-mod-shaper-0.5.5.tar.gz 18090
 DIST proftpd-mod-shaper-0.5.6.tar.gz 18099 RMD160 3727e4407728727da4e6546e01b86c6b2cb68657 SHA1 33af13cf95374e0118fd6fece63d5fa55779810a SHA256 b846b9f4d8601a7ce426afa049b26db4da4ee8226ff61af97b0ca86b2fb8c827
+DIST proftpd-mod-vroot-0.7.1.tar.gz 5613 RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 SHA1 e773f850d5736ecede45304eca7b3ff339fdcd8c SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1
 EBUILD proftpd-1.2.10-r7.ebuild 4574 RMD160 effd6fecf47e23a61548e785259109c2df4d0a29 SHA1 5e2d550670dbef122ab9a6c890007c9728e61d6e SHA256 d7b1b3255c6ccbed6a3ff12e6323a1ba6e0258d8931053e9ef06152573deaa47
 MD5 611edc7465c5c640b305903b21819046 proftpd-1.2.10-r7.ebuild 4574
 RMD160 effd6fecf47e23a61548e785259109c2df4d0a29 proftpd-1.2.10-r7.ebuild 4574
 SHA256 d7b1b3255c6ccbed6a3ff12e6323a1ba6e0258d8931053e9ef06152573deaa47 proftpd-1.2.10-r7.ebuild 4574
-EBUILD proftpd-1.3.0.ebuild 5640 RMD160 9ebf18540a3c7665b50192d97c3f23d2c3e7778a SHA1 ae910269c7ae1c6146210773a637f7efa97f875d SHA256 6e0c2811b1b3edffd2ca8b098e87e3b278e692b0a1095b8c9ec7d4804718e877
-MD5 4064d5c50ad722252ee076ad072951bb proftpd-1.3.0.ebuild 5640
-RMD160 9ebf18540a3c7665b50192d97c3f23d2c3e7778a proftpd-1.3.0.ebuild 5640
-SHA256 6e0c2811b1b3edffd2ca8b098e87e3b278e692b0a1095b8c9ec7d4804718e877 proftpd-1.3.0.ebuild 5640
-MISC ChangeLog 17145 RMD160 b31ace0a47a53647d23e186309589449c3b1d67a SHA1 5b11b0f5b1727a45bfc03e5555002254345d46ad SHA256 43f3b4b819bb69c434cd9ef1c05bebb21e5afcd0722ce256cd36509e36f20a02
-MD5 1cd1e9c4045913caa56e2ee703bef0d1 ChangeLog 17145
-RMD160 b31ace0a47a53647d23e186309589449c3b1d67a ChangeLog 17145
-SHA256 43f3b4b819bb69c434cd9ef1c05bebb21e5afcd0722ce256cd36509e36f20a02 ChangeLog 17145
+EBUILD proftpd-1.3.0.ebuild 5734 RMD160 ce0f795ada35bfd11068680b93734888d2b47a43 SHA1 3d588000b07b9fb1f45bf0489ad7193fcb4e8f16 SHA256 cc8617201991bc1a555f68c6a4cb132e03895caf6f3d373d76e566fe5595928b
+MD5 afc9614f46a2bcd1aec801c5d6ae38b2 proftpd-1.3.0.ebuild 5734
+RMD160 ce0f795ada35bfd11068680b93734888d2b47a43 proftpd-1.3.0.ebuild 5734
+SHA256 cc8617201991bc1a555f68c6a4cb132e03895caf6f3d373d76e566fe5595928b proftpd-1.3.0.ebuild 5734
+MISC ChangeLog 17296 RMD160 4f3102313842c112b4e86ac8ae895beb196a8607 SHA1 abcb7b3eee34d9a9c60c0e63e8f64904798ae614 SHA256 dbcbb944c631a4f37c8d4eb4e9a84b6082f2866bd9b5ed90e5f1378bdb00d920
+MD5 50bba71c253d4ccf4fcbc89a2996a62f ChangeLog 17296
+RMD160 4f3102313842c112b4e86ac8ae895beb196a8607 ChangeLog 17296
+SHA256 dbcbb944c631a4f37c8d4eb4e9a84b6082f2866bd9b5ed90e5f1378bdb00d920 ChangeLog 17296
 MISC metadata.xml 401 RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 SHA1 4de99423d6ea2dc602310a18e89e6f889aafe972 SHA256 035eb7c56b3e676e3549207650c993fe3c38762db55a57a40a9b479c3a8cdb2f
 MD5 5c73abc1fe44fb1d866736316d2c89ac metadata.xml 401
 RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 metadata.xml 401
 SHA256 035eb7c56b3e676e3549207650c993fe3c38762db55a57a40a9b479c3a8cdb2f metadata.xml 401
+MISC proftpd-1.3.0.ebuild.orig 5640 RMD160 9ebf18540a3c7665b50192d97c3f23d2c3e7778a SHA1 ae910269c7ae1c6146210773a637f7efa97f875d SHA256 6e0c2811b1b3edffd2ca8b098e87e3b278e692b0a1095b8c9ec7d4804718e877
+MD5 4064d5c50ad722252ee076ad072951bb proftpd-1.3.0.ebuild.orig 5640
+RMD160 9ebf18540a3c7665b50192d97c3f23d2c3e7778a proftpd-1.3.0.ebuild.orig 5640
+SHA256 6e0c2811b1b3edffd2ca8b098e87e3b278e692b0a1095b8c9ec7d4804718e877 proftpd-1.3.0.ebuild.orig 5640
 MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r7 142
 RMD160 0ca845195d9659ea72d00d5755ffce659a7df751 files/digest-proftpd-1.2.10-r7 142
 SHA256 f85d284ae51d8763204788be6fc821d9daa429876f141cee641cf2cdcdf312c4 files/digest-proftpd-1.2.10-r7 142
-MD5 4f43f60fd33e764737591320dba0b8f7 files/digest-proftpd-1.3.0 949
-RMD160 031753d5c3c21be2f9a9282ddd190f70e9b45015 files/digest-proftpd-1.3.0 949
-SHA256 80628a5d403ae1b385f1fa432748b91807ba39ef416fd191f584c1becc71c3a5 files/digest-proftpd-1.3.0 949
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEnAiz8zY1VwezZiERAiOuAJ0TPjtukuECt0iUs1vgR8SESHe/PwCfQJcv
-nhDHRWdNOORkmxcDm1iwcTM=
-=UHKm
------END PGP SIGNATURE-----
+MD5 35995cbe20ae79ce7bfe3c607082f42d files/digest-proftpd-1.3.0 1214
+RMD160 a3b3282020c26af5c1725d10c26e98bcccda3d36 files/digest-proftpd-1.3.0 1214
+SHA256 6c4adc001a19e749394cc9b3a8356c02451e4c3cabac659af921a8e628e84416 files/digest-proftpd-1.3.0 1214
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.0 b/net-ftp/proftpd/files/digest-proftpd-1.3.0
index b54252a9e91e..080bbeb3944e 100644
--- a/net-ftp/proftpd/files/digest-proftpd-1.3.0
+++ b/net-ftp/proftpd/files/digest-proftpd-1.3.0
@@ -10,3 +10,6 @@ SHA256 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe proftpd-
 MD5 a81c3ed2d45f7c938416a970fd559703 proftpd-mod-shaper-0.5.6.tar.gz 18099
 RMD160 3727e4407728727da4e6546e01b86c6b2cb68657 proftpd-mod-shaper-0.5.6.tar.gz 18099
 SHA256 b846b9f4d8601a7ce426afa049b26db4da4ee8226ff61af97b0ca86b2fb8c827 proftpd-mod-shaper-0.5.6.tar.gz 18099
+MD5 bafd6c9ecfdf352641465b866be12f27 proftpd-mod-vroot-0.7.1.tar.gz 5613
+RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 proftpd-mod-vroot-0.7.1.tar.gz 5613
+SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1 proftpd-mod-vroot-0.7.1.tar.gz 5613
diff --git a/net-ftp/proftpd/proftpd-1.3.0.ebuild b/net-ftp/proftpd/proftpd-1.3.0.ebuild
index 4347ffc10d49..955a93fc4d0c 100644
--- a/net-ftp/proftpd/proftpd-1.3.0.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.0.ebuild
@@ -1,19 +1,23 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.0.ebuild,v 1.1 2006/06/23 15:28:34 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.0.ebuild,v 1.2 2006/06/24 12:32:00 humpback Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
 IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd
-	selinux sendfile noauthunix authfile ncurses xinetd acl sitemisc rewrite clamav opensslcrypt ifsession radius vroot"
+	selinux sendfile noauthunix authfile ncurses xinetd acl sitemisc rewrite clamav opensslcrypt
+	  ifsession radius vroot"
 
 SHAPER_VER="0.5.6"
+VROOT_VER="0.7.1"
+
 S=${WORKDIR}/${P}
 
 DESCRIPTION="An advanced and very configurable FTP server"
 SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2
 		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
-		clamav? ( http://www.uglyboxindustries.com/mod_clamav.c http://www.uglyboxindustries.com/mod_clamav.html )"
+		clamav? ( http://www.uglyboxindustries.com/mod_clamav.c http://www.uglyboxindustries.com/mod_clamav.html )
+		vroot?	 ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
 HOMEPAGE="http://www.proftpd.org/
 		http://www.castaglia.org/proftpd/
 		http://www.uglyboxindustries.com/open-source.php"
@@ -45,12 +49,17 @@ src_unpack() {
 	epatch "${FILESDIR}"/mod_sql_mysql.diff
 	if use shaper; then
 		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
-		mv mod_shaper/mod_shaper.c contrib/
+		cp mod_shaper/mod_shaper.c contrib/
 	fi
 	if use clamav; then
 		cp "${DISTDIR}"/mod_clamav.c contrib/
 		cp "${DISTDIR}"/mod_clamav.html doc/
 	fi
+	if use vroot; then
+		unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz
+		cp mod_vroot/mod_vroot.c contrib/
+		cp mod_vroot/mod_vroot.html doc/
+	fi
 }
 
 src_compile() {
@@ -65,22 +74,16 @@ src_compile() {
 	use sitemisc && modules="${modules}:mod_site_misc"
 	use rewrite && modules="${modules}:mod_rewrite"
 	use clamav && modules="${modules}:mod_clamav"
+	use radius && modules="${modules}:mod_radius"
+	use vroot && modules="${modules}:mod_vroot"
+	use ssl && modules="${modules}:mod_tls"
 
 	if use ldap; then
-		einfo ldap
 		modules="${modules}:mod_ldap"
 		append-ldflags "-lresolv"
 	fi
 
-	if use ssl; then
-		einfo ssl
-		# enable mod_tls
-		modules="${modules}:mod_tls"
-	fi
-
 	if use opensslcrypt; then
-		einfo OpenSSL crypt
-		# enable OpenSSL crypt
 		append-ldflags "-lcrypto"
 		myconf="${myconf} --with-includes=/usr/include/openssl"
 		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
@@ -115,20 +118,8 @@ src_compile() {
 		fi
 	fi
 
-	if use ifsession; then
-		einfo ifsession
-		modules="${modules}:mod_ifsession"
-	fi
-
-	if use radius; then
-		einfo radius
-		modules="${modules}:mod_radius"
-	fi
-
-	if use vroot; then
-		einfo radius
-		modules="${modules}:mod_vroot"
-	fi
+	#This should be the last module
+	use ifsession && modules="${modules}:mod_ifsession"
 
 	# bug #30359
 	use hardened && echo > lib/libcap/cap_sys.c