fix #192862, cleanup

Package-Manager: portage-2.1.3.9

8 files changed, 83 insertions, 74 deletions

diff --git a/www-apache/mod_ftpd/ChangeLog b/www-apache/mod_ftpd/ChangeLog
index 3b074284d16c..79af4a20740a 100644
--- a/www-apache/mod_ftpd/ChangeLog
+++ b/www-apache/mod_ftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_ftpd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ftpd/ChangeLog,v 1.2 2007/08/04 17:17:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ftpd/ChangeLog,v 1.3 2007/09/21 20:35:10 hollow Exp $
+
+*mod_ftpd-0.14-r1 (21 Sep 2007)
+
+  21 Sep 2007; Benedikt Böhm <hollow@gentoo.org>
+  +files/0.14-r1/45_mod_ftpd.conf, -mod_ftpd-0.13.0.ebuild,
+  -mod_ftpd-0.13.1.ebuild, +mod_ftpd-0.14-r1.ebuild:
+  fix #192862, cleanup
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org> +files/45_mod_ftpd.conf,
   +metadata.xml, +mod_ftpd-0.13.0.ebuild, +mod_ftpd-0.13.1.ebuild,
diff --git a/www-apache/mod_ftpd/Manifest b/www-apache/mod_ftpd/Manifest
index 3c568e52445f..38a273f4850f 100644
--- a/www-apache/mod_ftpd/Manifest
+++ b/www-apache/mod_ftpd/Manifest
@@ -1,46 +1,41 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.14-r1/45_mod_ftpd.conf 1246 RMD160 3d70e44542ebe997c3e561a1e11ebc9aa95bf689 SHA1 1fac503d5c8fe30c15adb05192065b98d408a977 SHA256 de6bd055a19c7d19a0cceb85af00639e3ef54a77442c3ad661bd935fdd32116a
+MD5 f9130a11b67c4ccbd945a47c0f6033d7 files/0.14-r1/45_mod_ftpd.conf 1246
+RMD160 3d70e44542ebe997c3e561a1e11ebc9aa95bf689 files/0.14-r1/45_mod_ftpd.conf 1246
+SHA256 de6bd055a19c7d19a0cceb85af00639e3ef54a77442c3ad661bd935fdd32116a files/0.14-r1/45_mod_ftpd.conf 1246
 AUX 45_mod_ftpd.conf 1644 RMD160 c2bff0a0ab8a94bfe83e19928ed5f4aa58bfe812 SHA1 60628936bf069cf80d576d97d64e3b98cad6abcd SHA256 2c4ecefc7438fcce8c43b354e05edc26e70d40aaadd5e5f32713532e9bf67e7e
 MD5 a19bb3dea57c7efbb399e53762e5e5fd files/45_mod_ftpd.conf 1644
 RMD160 c2bff0a0ab8a94bfe83e19928ed5f4aa58bfe812 files/45_mod_ftpd.conf 1644
 SHA256 2c4ecefc7438fcce8c43b354e05edc26e70d40aaadd5e5f32713532e9bf67e7e files/45_mod_ftpd.conf 1644
-DIST mod_ftpd-0.13.0.tar.bz2 327372 RMD160 6f9d39add3ec340403d0fc4b6b9a4b2ccd0a9f3c SHA1 08b6c455e7fd49601487071f5603a715a9d6b520 SHA256 512ae313d606dc8f2cda9efb3cffe9685f573807a1fcd1e2f8604cad3c131e49
-DIST mod_ftpd-0.13.1.tar.bz2 325493 RMD160 43bda3c1932a7cdc1a98da99ee314a94d88d8757 SHA1 18ba4999e93d9fffa11274892d2b2d60088661a7 SHA256 780d0de38a865c0dbb44df49dfc675d769c90b14dd60600858137f0cf21059a6
 DIST mod_ftpd-0.14.tar.bz2 330410 RMD160 01823f02b2ae27952eef13946201e1ca9e55285c SHA1 d91b6f4706c73c5fd2fcb28f834d244efbf94cd4 SHA256 f36d3b65a5a200fca0c58e453246635e0f8e94c7f870d2b2f1946fa4a8b06d09
-EBUILD mod_ftpd-0.13.0.ebuild 1018 RMD160 33f06ce11ac8c1879eef94f7ce3bbd9b7967eea7 SHA1 3d78a96dad9937bbe6ab13e29add4d17121b117c SHA256 16a75ebdebd3bae247f103d699746299a2f2872334e3bfa54a330816879893fc
-MD5 92037ab224fb7671b01468204435df45 mod_ftpd-0.13.0.ebuild 1018
-RMD160 33f06ce11ac8c1879eef94f7ce3bbd9b7967eea7 mod_ftpd-0.13.0.ebuild 1018
-SHA256 16a75ebdebd3bae247f103d699746299a2f2872334e3bfa54a330816879893fc mod_ftpd-0.13.0.ebuild 1018
-EBUILD mod_ftpd-0.13.1.ebuild 1019 RMD160 f41dc5b5af7e6c55ee1b5c11bafe1c76a2e0a55d SHA1 ce4772978fb6fc8c81a2c1e1d10895f02eec4e01 SHA256 09d81408951b46d1ff6e46fd011cd31c36762b234c06f497133c1382bfda0d57
-MD5 e3321dbed97900c7162248f674cdcf9f mod_ftpd-0.13.1.ebuild 1019
-RMD160 f41dc5b5af7e6c55ee1b5c11bafe1c76a2e0a55d mod_ftpd-0.13.1.ebuild 1019
-SHA256 09d81408951b46d1ff6e46fd011cd31c36762b234c06f497133c1382bfda0d57 mod_ftpd-0.13.1.ebuild 1019
+EBUILD mod_ftpd-0.14-r1.ebuild 1037 RMD160 8dba3198f4ba49eda537952da466ae005f95b885 SHA1 2d21d2b2bf86a6435bcbf3a10bd581be382aa2b2 SHA256 5e52cd1aa580fd8e0361d9a2fd4ef0ead446155f65073cb8dea09c6685066643
+MD5 c67aaf1e1999b56d98403a5877596b90 mod_ftpd-0.14-r1.ebuild 1037
+RMD160 8dba3198f4ba49eda537952da466ae005f95b885 mod_ftpd-0.14-r1.ebuild 1037
+SHA256 5e52cd1aa580fd8e0361d9a2fd4ef0ead446155f65073cb8dea09c6685066643 mod_ftpd-0.14-r1.ebuild 1037
 EBUILD mod_ftpd-0.14.ebuild 1017 RMD160 fa9c189d1cd6bcd9f1086f2551e5c6f557c2dd98 SHA1 5d0cb9a86b7bb87c5eae8cd0b0937735911d1503 SHA256 83c193b48b3bba9aa57f6e7d8542cc60dea69a3532247d4126b757fc4e88bb4b
 MD5 f01f40116dda6ce1479ded61fa441c85 mod_ftpd-0.14.ebuild 1017
 RMD160 fa9c189d1cd6bcd9f1086f2551e5c6f557c2dd98 mod_ftpd-0.14.ebuild 1017
 SHA256 83c193b48b3bba9aa57f6e7d8542cc60dea69a3532247d4126b757fc4e88bb4b mod_ftpd-0.14.ebuild 1017
-MISC ChangeLog 2209 RMD160 a75ab28da1fe2cc05b85b71ff86f61dd5428eecf SHA1 fbe8317a57e0d077abec9cd21b63a70edadda790 SHA256 7fc78c76d258f0b515521c9d3b6b161820636c53dfb96986b07e25a5b52ee0a5
-MD5 7814ad6a6796d418bf57a3c135d55c36 ChangeLog 2209
-RMD160 a75ab28da1fe2cc05b85b71ff86f61dd5428eecf ChangeLog 2209
-SHA256 7fc78c76d258f0b515521c9d3b6b161820636c53dfb96986b07e25a5b52ee0a5 ChangeLog 2209
+MISC ChangeLog 2427 RMD160 3bf4467af480f9745dcbc8ab69b90b02351d1103 SHA1 eac5bfb225055cad4dfacb6bbca4056ec953477c SHA256 db85c80c84f441f826a7616cfd9f011b7992c7fba011df63f981b5180e0ba2a2
+MD5 fb4072b4cb44e167fdda72503ae7ccd1 ChangeLog 2427
+RMD160 3bf4467af480f9745dcbc8ab69b90b02351d1103 ChangeLog 2427
+SHA256 db85c80c84f441f826a7616cfd9f011b7992c7fba011df63f981b5180e0ba2a2 ChangeLog 2427
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
 SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
-MD5 585e24fe1e4c15664173b5e9e9ffd068 files/digest-mod_ftpd-0.13.0 250
-RMD160 c7695e195617f08aad7aa27d858f02b6fd2a6fc9 files/digest-mod_ftpd-0.13.0 250
-SHA256 0143d8b2a89926b738f008768c33deb34394ca6277e4dc12a914a0f575d1792e files/digest-mod_ftpd-0.13.0 250
-MD5 758a17ff5ada4ea57854448cd1bac3b8 files/digest-mod_ftpd-0.13.1 250
-RMD160 68a51ce60316dc2b2957d477d56ff3f9b338434e files/digest-mod_ftpd-0.13.1 250
-SHA256 266cabd8d4d855f920bc428e24b6d526d38b11e5c8bb33d4ae84a75a51d7d97d files/digest-mod_ftpd-0.13.1 250
 MD5 e7ba5179f1753b9cad4e184626b727fc files/digest-mod_ftpd-0.14 244
 RMD160 86addf43fd8382d556301dad7f16954ef1597962 files/digest-mod_ftpd-0.14 244
 SHA256 c382355f93b98db46abfc73d0678150561cd2bd0b9a501af970ccdf8f25fb649 files/digest-mod_ftpd-0.14 244
+MD5 e7ba5179f1753b9cad4e184626b727fc files/digest-mod_ftpd-0.14-r1 244
+RMD160 86addf43fd8382d556301dad7f16954ef1597962 files/digest-mod_ftpd-0.14-r1 244
+SHA256 c382355f93b98db46abfc73d0678150561cd2bd0b9a501af970ccdf8f25fb649 files/digest-mod_ftpd-0.14-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGtLTFI1lqEGTUzyQRAgdVAKC9Q5ohbAyPAkM1qU9EU215x1Y+WgCgg46Z
-6HQ4CsXWRxyCXmQVinVVwqY=
-=z0VK
+iD8DBQFG9CsKmPFBzbX68WERAq3sAKCXTDonsELIkBXwXNmIBn40O2hc6QCdGcRe
+vvAGQCr059XDVhGYN+HFn4g=
+=vaAu
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_ftpd/files/0.14-r1/45_mod_ftpd.conf b/www-apache/mod_ftpd/files/0.14-r1/45_mod_ftpd.conf
new file mode 100644
index 000000000000..430337bfd348
--- /dev/null
+++ b/www-apache/mod_ftpd/files/0.14-r1/45_mod_ftpd.conf
@@ -0,0 +1,49 @@
+<IfDefine FTPD>
+	LoadModule ftpd_module modules/mod_ftpd.so
+
+	# Load any of the provider modules here (for user specific chroots)
+	#LoadModule ftpd_dbm_module modules/mod_ftpd_dbm.so
+	#LoadModule ftpd_dbi_module modules/mod_ftpd_dbi.so
+	LoadModule ftpd_default_module modules/mod_ftpd_default.so
+	#LoadModule ftpd_fail_module modules/mod_ftpd_fail.so
+
+	Listen 21
+	<VirtualHost *:21>
+		DocumentRoot /home/ftp
+		FtpProtocol On
+		FtpShowRealPermissions Off
+		FtpAllowActive On
+		FtpPasvMinPort 1024
+		FtpPasvMaxPort 65535
+		FtpLimitOrder default
+		FtpDefaultMaxLogins 100
+
+		<Directory /home/ftp>
+			Anonymous_NoUserID Off
+			Anonymous_MustGiveEmail Off
+			Anonymous_VerifyEmail Off
+			Anonymous_LogEmail Off
+			Anonymous anonymous
+			AuthName ftp
+			AuthType Basic
+			Require valid-user
+			Order allow,deny
+			Allow from all
+		</Directory>
+
+		# only allow changing, retrieving files, and listing on the site
+		<Location />
+			<LimitExcept CHDIR GET LIST>
+				Deny from all
+			</LimitExcept>
+		</Location>
+
+		# allow making directories, listing, chdir, and uploading files.
+		# But don't allow retrieving files.
+		<Location /upload>
+			<LimitExcept LIST PUT MKCOL CHDIR>
+				Deny from all
+			</LimitExcept>
+		</Location>
+	</VirtualHost>
+</IfDefine>
diff --git a/www-apache/mod_ftpd/files/digest-mod_ftpd-0.13.0 b/www-apache/mod_ftpd/files/digest-mod_ftpd-0.13.0
deleted file mode 100644
index 227f39b71255..000000000000
--- a/www-apache/mod_ftpd/files/digest-mod_ftpd-0.13.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d92a3a31c5baef53acc06dca13bb27cb mod_ftpd-0.13.0.tar.bz2 327372
-RMD160 6f9d39add3ec340403d0fc4b6b9a4b2ccd0a9f3c mod_ftpd-0.13.0.tar.bz2 327372
-SHA256 512ae313d606dc8f2cda9efb3cffe9685f573807a1fcd1e2f8604cad3c131e49 mod_ftpd-0.13.0.tar.bz2 327372
diff --git a/www-apache/mod_ftpd/files/digest-mod_ftpd-0.13.1 b/www-apache/mod_ftpd/files/digest-mod_ftpd-0.13.1
deleted file mode 100644
index a5ab90c8f3a9..000000000000
--- a/www-apache/mod_ftpd/files/digest-mod_ftpd-0.13.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 236bbacd61d434069d71493de916609f mod_ftpd-0.13.1.tar.bz2 325493
-RMD160 43bda3c1932a7cdc1a98da99ee314a94d88d8757 mod_ftpd-0.13.1.tar.bz2 325493
-SHA256 780d0de38a865c0dbb44df49dfc675d769c90b14dd60600858137f0cf21059a6 mod_ftpd-0.13.1.tar.bz2 325493
diff --git a/www-apache/mod_ftpd/files/digest-mod_ftpd-0.14-r1 b/www-apache/mod_ftpd/files/digest-mod_ftpd-0.14-r1
new file mode 100644
index 000000000000..abbffcf0b729
--- /dev/null
+++ b/www-apache/mod_ftpd/files/digest-mod_ftpd-0.14-r1
@@ -0,0 +1,3 @@
+MD5 073532fb7837657cf52adecbb43a2f68 mod_ftpd-0.14.tar.bz2 330410
+RMD160 01823f02b2ae27952eef13946201e1ca9e55285c mod_ftpd-0.14.tar.bz2 330410
+SHA256 f36d3b65a5a200fca0c58e453246635e0f8e94c7f870d2b2f1946fa4a8b06d09 mod_ftpd-0.14.tar.bz2 330410
diff --git a/www-apache/mod_ftpd/mod_ftpd-0.13.1.ebuild b/www-apache/mod_ftpd/mod_ftpd-0.13.1.ebuild
deleted file mode 100644
index 563f5696c098..000000000000
--- a/www-apache/mod_ftpd/mod_ftpd-0.13.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ftpd/mod_ftpd-0.13.1.ebuild,v 1.1 2007/07/29 14:24:52 phreak Exp $
-
-inherit apache-module
-
-KEYWORDS="~ppc ~x86"
-
-DESCRIPTION="Apache2 module which provides an FTP server."
-HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_ftpd/"
-SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="dbi gdbm"
-
-DEPEND="dbi? ( dev-db/libdbi )
-		gdbm? ( sys-libs/gdbm )"
-RDEPEND="${DEPEND}"
-
-APACHE2_EXECFILES="providers/*/.libs/*.so"
-APACHE2_MOD_CONF="45_${PN}"
-APACHE2_MOD_DEFINE="FTPD"
-
-DOCFILES="docs/manual.html AUTHORS ChangeLog NOTICE README TODO"
-
-need_apache2
-
-src_compile() {
-	local providers="default fail"
-
-	use dbi && providers="dbi ${providers}"
-	use gdbm && providers="dbm ${providers}"
-
-	econf \
-		--with-apxs=${APXS2} \
-		--enable-providers="${providers}" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
diff --git a/www-apache/mod_ftpd/mod_ftpd-0.13.0.ebuild b/www-apache/mod_ftpd/mod_ftpd-0.14-r1.ebuild
index 730ef44686dd..9e5251f68aaf 100644
--- a/www-apache/mod_ftpd/mod_ftpd-0.13.0.ebuild
+++ b/www-apache/mod_ftpd/mod_ftpd-0.14-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ftpd/mod_ftpd-0.13.0.ebuild,v 1.1 2007/07/29 14:24:52 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ftpd/mod_ftpd-0.14-r1.ebuild,v 1.1 2007/09/21 20:35:10 hollow Exp $
 
 inherit apache-module
 
-KEYWORDS="~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DESCRIPTION="Apache2 module which provides an FTP server."
 HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_ftpd/"
@@ -18,12 +18,12 @@ DEPEND="dbi? ( dev-db/libdbi )
 RDEPEND="${DEPEND}"
 
 APACHE2_EXECFILES="providers/*/.libs/*.so"
-APACHE2_MOD_CONF="45_${PN}"
+APACHE2_MOD_CONF="0.14-r1/45_${PN}"
 APACHE2_MOD_DEFINE="FTPD"
 
 DOCFILES="docs/manual.html AUTHORS ChangeLog NOTICE README TODO"
 
-need_apache2
+need_apache2_2
 
 src_compile() {
 	local providers="default fail"