lots of closed bugs

(Portage version: 2.0.51-r15)

5 files changed, 198 insertions, 5 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index e6bf74e5d443..1c9ca2dd9f6e 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.85 2005/01/21 11:28:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.86 2005/03/02 23:19:46 humpback Exp $
+
+*proftpd-1.2.10-r3 (02 Mar 2005)
+
+  02 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +proftpd-1.2.10-r3.ebuild:
+  As seen on bug #75072 and others mod_delay is causing lots of problems, and
+  seems impossible to backport it to 1.2.10 as it is being developed for the cvs
+  version. Also am fixing small issue with softquota as reported in #80002 by
+  Michael Cramer. Also fixing bug #83312 and #63196 pam related credits Roy
+  Marples <uberlord@gentoo.org>
 
   21 Jan 2005; Markus Rothe <corsair@gentoo.org> proftpd-1.2.10-r2.ebuild:
   Added ~ppc64 to KEYWORDS; bug #78927
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 876fcf057761..687b17963794 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,11 +1,15 @@
 MD5 1fbaa06b9a30491ace3a24642d0a6417 ChangeLog 13559
 MD5 b47207aedd0149443faa2152950714ed metadata.xml 401
-MD5 6fc1a218a29c9fc20ee69100d1f8888a proftpd-1.2.10.ebuild 4139
-MD5 58abdaa0274915af4dcc12046c752afb proftpd-1.2.9-r2.ebuild 3439
 MD5 0da1408981233bd78976ee644a3a5e84 proftpd-1.2.10-r1.ebuild 4395
 MD5 77ab83f5b6de2298739b5d6b6c792a78 proftpd-1.2.10-r2.ebuild 4478
+MD5 e28395cb810f5ed557b3a946e9be90fc proftpd-1.2.10-r3.ebuild 4299
+MD5 6fc1a218a29c9fc20ee69100d1f8888a proftpd-1.2.10.ebuild 4139
+MD5 58abdaa0274915af4dcc12046c752afb proftpd-1.2.9-r2.ebuild 3439
 MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
 MD5 fa041c7b343099eef454338152a04ea7 files/digest-proftpd-1.2.10 67
+MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r1 213
+MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r2 213
+MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r3 142
 MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9-r2 66
 MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275
 MD5 b00999f820f1e46a501ce4fcaeb5fe23 files/proftpd-1.2.9-makefile.patch 434
@@ -13,5 +17,3 @@ MD5 50955f0d375360841d50a82b9589e435 files/proftpd-1.2.9-privescal-fix.patch 588
 MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
 MD5 55ca24c9ee61b9ed94968c664baaeace files/proftpd.rc6 731
 MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
-MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r1 213
-MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r2 213
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r3 b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r3
new file mode 100644
index 000000000000..211d52a3fca3
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r3
@@ -0,0 +1,2 @@
+MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
+MD5 ca3d63ffbc6ad5b6a9063f79b36d1b55 proftpd-mod-shaper-0.5.5.tar.gz 18090
diff --git a/net-ftp/proftpd/files/ftp.pamd b/net-ftp/proftpd/files/ftp.pamd
new file mode 100644
index 000000000000..9f7b8c6489bb
--- /dev/null
+++ b/net-ftp/proftpd/files/ftp.pamd
@@ -0,0 +1,17 @@
+#%PAM-1.0
+
+auth       required     /lib/security/pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
+auth       required     /lib/security/pam_stack.so service=system-auth
+
+# If this is enabled, anonymous logins will fail because the 'ftp' user does
+# not have a "valid" shell, as listed in /etc/shells.
+#
+# If you enable this, it is recommended that you do *not* give the 'ftp'
+# user a real shell. Instead, give the 'ftp' user /bin/false for a shell and
+# add /bin/false to /etc/shells.
+#auth       required	/lib/security/pam_shells.so
+
+account    required     /lib/security/pam_stack.so service=system-auth
+
+session    required     /lib/security/pam_stack.so service=system-auth
+
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild
new file mode 100644
index 000000000000..3fb5ddbca31e
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild,v 1.1 2005/03/02 23:19:46 humpback Exp $
+
+inherit flag-o-matic eutils
+
+#Mod shaper is giving problems on some machines
+IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux sendfile"
+#IUSE="hardened ipv6 ldap mysql pam postgres softquota ssl tcpd selinux"
+
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="An advanced and very configurable FTP server"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
+		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.5.tar.gz )"
+HOMEPAGE="http://www.proftpd.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64 ~ppc64"
+
+DEPEND="pam? ( >=sys-libs/pam-0.75 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( >=dev-db/postgresql-7.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6f )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
+
+RDEPEND="selinux? ( sec-policy/selinux-ftpd )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	cd ${S}
+	if use shaper; then
+		unpack ${PN}-mod-shaper-0.5.5.tar.gz
+		mv mod_shaper/mod_shaper.c contrib/
+	fi
+}
+
+src_compile() {
+	local modules myconf
+
+	modules="mod_ratio:mod_readme"
+	use pam && modules="${modules}:mod_auth_pam"
+	use tcpd && modules="${modules}:mod_wrap"
+	use shaper && modules="${modules}:mod_shaper"
+
+	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 mysql && use postgres
+	then
+		ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules."
+		ewarn "Presently this ebuild defaults to mysql. If you would like to"
+		ewarn "change the default behaviour, merge ProFTPD with;"
+		ewarn "USE=\"-mysql postgres\" emerge proftpd"
+		epause 5
+	fi
+
+	if use mysql; then
+		modules="${modules}:mod_sql:mod_sql_mysql"
+		myconf="${myconf} --with-includes=/usr/include/mysql"
+	elif use postgres; then
+		modules="${modules}:mod_sql:mod_sql_postgres"
+		myconf="${myconf} --with-includes=/usr/include/postgresql"
+	fi
+
+	if use sendfile; then
+		myconf="${myconf} --with-sendfile"
+	fi
+
+	if use softquota; then
+		modules="${modules}:mod_quotatab"
+		if use mysql || use postgres; then
+			modules="${modules}:mod_quotatab_sql"
+		fi
+		if use ldap; then
+			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
+		else
+			modules="${modules}:mod_quotatab_file"
+		fi
+	fi
+
+	# New modules for 1.2.9
+	# Not sure how these should be enabled yet as no use variables
+	# apply currently.  Uncomment if you want to use them though.
+	# -raker 06/16/2003
+	#
+	# modules="${modules}:mod_ifsession"
+	# modules="${modules}:mod_radius"
+	# modules="${modules}:mod_rewrite"
+
+	# bug #30359
+	use hardened && echo > lib/libcap/cap_sys.c
+	has_pic && echo > lib/libcap/cap_sys.c
+
+	econf \
+		--sbindir=/usr/sbin \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc/proftpd \
+		--enable-shadow \
+		--enable-autoshadow \
+		--enable-ctrls \
+		--with-modules=${modules} \
+		${myconf} $( use_enable ipv6 ) || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	# Note rundir needs to be specified to avoid sandbox violation
+	# on initial install. See Make.rules
+	make DESTDIR=${D} install || die
+
+	keepdir /home/ftp
+	keepdir /var/run/proftpd
+
+	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
+		COPYING CREDITS ChangeLog NEWS README* \
+		doc/{license.txt,GetConf}
+	dohtml doc/*.html
+
+	use shaper && dohtml mod_shaper/mod_shaper.html
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib
+
+	insinto /etc/proftpd
+	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
+
+	if use pam; then
+		insinto /etc/pam.d
+		newins ${FILESDIR}/ftp.pamd ftp
+	fi
+
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/proftpd.xinetd proftpd
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
+}
+
+pkg_postinst() {
+	groupadd proftpd &>/dev/null
+	id proftpd &>/dev/null || \
+		useradd -g proftpd -d /home/ftp -s /bin/false proftpd
+	einfo
+	einfo 'You can find the config files in /etc/proftpd'
+	einfo
+	einfo 'mod_delay has been causing more bad than good and has been removed'
+	einfo 'see Changelog for more info'
+}