cleanup

(Portage version: 2.1.4_rc11)

5 files changed, 50 insertions, 136 deletions

diff --git a/www-apache/mod_ftpd/ChangeLog b/www-apache/mod_ftpd/ChangeLog
index 79af4a20740a..d61183277e0d 100644
--- a/www-apache/mod_ftpd/ChangeLog
+++ b/www-apache/mod_ftpd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.3 2007/09/21 20:35:10 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ftpd/ChangeLog,v 1.4 2007/12/31 11:51:59 hollow Exp $
+
+  31 Dec 2007; Benedikt Böhm <hollow@gentoo.org>
+  files/0.14-r1/45_mod_ftpd.conf, -files/45_mod_ftpd.conf,
+  -mod_ftpd-0.14.ebuild:
+  cleanup
 
 *mod_ftpd-0.14-r1 (21 Sep 2007)
 
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
index 430337bfd348..ab6b39e8ee2a 100644
--- 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
@@ -1,49 +1,51 @@
 <IfDefine FTPD>
-	LoadModule ftpd_module modules/mod_ftpd.so
+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
+# 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
+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>
+	<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>
+	# 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>
+	# 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>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_ftpd/files/45_mod_ftpd.conf b/www-apache/mod_ftpd/files/45_mod_ftpd.conf
deleted file mode 100644
index c7619c4a6a09..000000000000
--- a/www-apache/mod_ftpd/files/45_mod_ftpd.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-<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_Authoritative On
-	                AuthAuthoritative Off
-	                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.14 b/www-apache/mod_ftpd/files/digest-mod_ftpd-0.14
deleted file mode 100644
index abbffcf0b729..000000000000
--- a/www-apache/mod_ftpd/files/digest-mod_ftpd-0.14
+++ /dev/null
@@ -1,3 +0,0 @@
-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.14.ebuild b/www-apache/mod_ftpd/mod_ftpd-0.14.ebuild
deleted file mode 100644
index 755a43a97b8d..000000000000
--- a/www-apache/mod_ftpd/mod_ftpd-0.14.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.14.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"
-}