diff options
author | Benedikt Boehm <hollow@gentoo.org> | 2007-09-21 20:35:11 +0000 |
---|---|---|
committer | Benedikt Boehm <hollow@gentoo.org> | 2007-09-21 20:35:11 +0000 |
commit | 4afefc321a908e357c088bd10bd89ed4eb5e32a9 (patch) | |
tree | 1a97fe8f7b92b2e6790297dbc84c2f6e97696556 /www-apache | |
parent | Apply the FBSD fix on 2.14 too.. (diff) | |
download | gentoo-2-4afefc321a908e357c088bd10bd89ed4eb5e32a9.tar.gz gentoo-2-4afefc321a908e357c088bd10bd89ed4eb5e32a9.tar.bz2 gentoo-2-4afefc321a908e357c088bd10bd89ed4eb5e32a9.zip |
fix #192862, cleanup
(Portage version: 2.1.3.9)
Diffstat (limited to 'www-apache')
-rw-r--r-- | www-apache/mod_ftpd/ChangeLog | 9 | ||||
-rw-r--r-- | www-apache/mod_ftpd/files/0.14-r1/45_mod_ftpd.conf | 49 | ||||
-rw-r--r-- | www-apache/mod_ftpd/files/digest-mod_ftpd-0.13.0 | 3 | ||||
-rw-r--r-- | www-apache/mod_ftpd/files/digest-mod_ftpd-0.13.1 | 3 | ||||
-rw-r--r-- | www-apache/mod_ftpd/files/digest-mod_ftpd-0.14-r1 | 3 | ||||
-rw-r--r-- | www-apache/mod_ftpd/mod_ftpd-0.13.1.ebuild | 39 | ||||
-rw-r--r-- | www-apache/mod_ftpd/mod_ftpd-0.14-r1.ebuild (renamed from www-apache/mod_ftpd/mod_ftpd-0.13.0.ebuild) | 8 |
7 files changed, 64 insertions, 50 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/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" |