Fix ftpshut and SqlShowInfo, bug #100364

(Portage version: 2.0.51.22-r2)

6 files changed, 263 insertions, 26 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index ad651e20b597..2ea91f3c24c6 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.96 2005/07/09 12:35:11 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.97 2005/07/29 15:48:15 uberlord Exp $
+
+*proftpd-1.2.10-r7 (29 Jul 2005)
+
+  29 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  +files/proftpd-ftpshut.patch, +files/proftpd-sqlshowinfo.patch,
+  +proftpd-1.2.10-r7.ebuild:
+  # Fix ftpshut and SqlShowInfo, bug #100364
 
   09 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
   proftpd-1.2.10-r6.ebuild:
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 09bbd2016e1a..e835c504b095 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,35 +1,29 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a8c4e478e33928ef12d4786d72dbe3d0 proftpd-1.2.10-r6.ebuild 4444
-MD5 47c7909cf9d623eaa77933d997bdb7c1 proftpd-1.2.10-r1.ebuild 4422
-MD5 ccd3b0639bb673d4f542f42b1a9824b2 proftpd-1.2.10-r3.ebuild 4356
-MD5 9cd5b3f274033c4ed06ac8c36b143353 proftpd-1.2.10-r5.ebuild 4393
 MD5 0215c43fd279ba334fe05f9761ec8293 proftpd-1.2.10.ebuild 4166
+MD5 ccd3b0639bb673d4f542f42b1a9824b2 proftpd-1.2.10-r3.ebuild 4356
+MD5 1110b090b0bfc88819d0e71566206388 proftpd-1.2.10-r7.ebuild 4581
 MD5 49ff4274614a4ecc736e8674b47b9d2b proftpd-1.2.10-r2.ebuild 4505
+MD5 032f9750ce490f668ca047a660bd099b proftpd-1.2.9-r2.ebuild 3466
+MD5 9cd5b3f274033c4ed06ac8c36b143353 proftpd-1.2.10-r5.ebuild 4393
 MD5 3ac976269e5858c20659c63d76c613d3 ChangeLog 15614
+MD5 a8c4e478e33928ef12d4786d72dbe3d0 proftpd-1.2.10-r6.ebuild 4444
 MD5 b47207aedd0149443faa2152950714ed metadata.xml 401
-MD5 032f9750ce490f668ca047a660bd099b proftpd-1.2.9-r2.ebuild 3466
-MD5 b00999f820f1e46a501ce4fcaeb5fe23 files/proftpd-1.2.9-makefile.patch 434
-MD5 55ca24c9ee61b9ed94968c664baaeace files/proftpd.rc6 731
+MD5 47c7909cf9d623eaa77933d997bdb7c1 proftpd-1.2.10-r1.ebuild 4422
+MD5 cfe47c0d5f8fece1d36ca8d56d0f2b99 files/ftp.pamd 701
+MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
 MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
-MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275
-MD5 3f7725dfa4ff0f5b632ddf41104ba44b files/ftp.pamd-include 592
-MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
-MD5 fa041c7b343099eef454338152a04ea7 files/digest-proftpd-1.2.10 67
-MD5 50955f0d375360841d50a82b9589e435 files/proftpd-1.2.9-privescal-fix.patch 588
+MD5 f739a48054eabaf69f819f6e31bad069 files/proftpd-ftpshut.patch 897
 MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r1 213
 MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r2 213
+MD5 b00999f820f1e46a501ce4fcaeb5fe23 files/proftpd-1.2.9-makefile.patch 434
+MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275
+MD5 fa041c7b343099eef454338152a04ea7 files/digest-proftpd-1.2.10 67
 MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r3 142
-MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r5 142
+MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r7 142
+MD5 3f7725dfa4ff0f5b632ddf41104ba44b files/ftp.pamd-include 592
+MD5 55ca24c9ee61b9ed94968c664baaeace files/proftpd.rc6 731
 MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r6 142
+MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
+MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r5 142
 MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9-r2 66
-MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
-MD5 cfe47c0d5f8fece1d36ca8d56d0f2b99 files/ftp.pamd 701
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCz8Se8zY1VwezZiERAj0IAKCDhAduzSDfukFwPK9y0Ja5Exx3hACdGdAc
-fkXxTXgZZ3MAiDSgiTVNkok=
-=4Tni
------END PGP SIGNATURE-----
+MD5 098337e85fc8b71a16e91114ff54ece1 files/proftpd-sqlshowinfo.patch 1191
+MD5 50955f0d375360841d50a82b9589e435 files/proftpd-1.2.9-privescal-fix.patch 588
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r7 b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r7
new file mode 100644
index 000000000000..211d52a3fca3
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r7
@@ -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/proftpd-ftpshut.patch b/net-ftp/proftpd/files/proftpd-ftpshut.patch
new file mode 100644
index 000000000000..17a57f938eca
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-ftpshut.patch
@@ -0,0 +1,24 @@
+Index: src/response.c
+===================================================================
+RCS file: /cvsroot/proftp/proftpd/src/response.c,v
+retrieving revision 1.4
+diff -u -r1.4 response.c
+--- src/response.c	3 Jun 2003 16:25:23 -0000	1.4
++++ src/response.c	27 Jun 2005 23:03:35 -0000
+@@ -1,6 +1,6 @@
+ /*
+  * ProFTPD - FTP server daemon
+- * Copyright (c) 2001, 2002, 2003 The ProFTPD Project team
++ * Copyright (c) 2001-2005 The ProFTPD Project team
+  *  
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -169,7 +169,7 @@
+   buf[sizeof(buf) - 1] = '\0';
+   sstrcat(buf, "\r\n", sizeof(buf));
+ 
+-  RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, buf, strlen(buf))
++  RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, "%s", buf)
+ }
+ 
+ void pr_response_send(const char *resp_numeric, const char *fmt, ...) {
diff --git a/net-ftp/proftpd/files/proftpd-sqlshowinfo.patch b/net-ftp/proftpd/files/proftpd-sqlshowinfo.patch
new file mode 100644
index 000000000000..9bf501a3d2da
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-sqlshowinfo.patch
@@ -0,0 +1,38 @@
+--- /var/tmp/portage/proftpd-1.2.10-r7/work/proftpd-1.2.10/contrib/mod_sql.c	2004-08-03 01:44:31.000000000 +0100
++++ contrib/mod_sql.c	2005-07-29 16:36:08.251407235 +0100
+@@ -2036,7 +2036,7 @@
+       *outsp++ = 0;
+ 
+       /* add the response */
+-      pr_response_add( c->argv[0], outs);
++      pr_response_add(c->argv[0], "%s", outs);
+ 
+     } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL);
+ 
+@@ -2110,7 +2110,7 @@
+       *outsp++ = 0;
+ 
+       /* add the response */
+-      pr_response_add( c->argv[0], outs);
++      pr_response_add(c->argv[0], "%s", outs);
+ 
+     } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL);
+ 
+@@ -2201,7 +2201,7 @@
+       *outsp++ = 0;
+ 
+       /* add the response */
+-      pr_response_add_err( c->argv[0], outs);
++      pr_response_add_err(c->argv[0], "%s", outs);
+ 
+     } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL);
+ 
+@@ -2275,7 +2275,7 @@
+       *outsp++ = 0;
+ 
+       /* add the response */
+-      pr_response_add( c->argv[0], outs);
++      pr_response_add(c->argv[0], "%s", outs);
+ 
+     } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL);
+ 
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
new file mode 100644
index 000000000000..38871eef3b8f
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
@@ -0,0 +1,172 @@
+# 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-r7.ebuild,v 1.1 2005/07/29 15:48:15 uberlord Exp $
+
+inherit flag-o-matic eutils
+
+IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd
+	selinux sendfile noauthunix authfile ncurses xinetd"
+
+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? ( || ( virtual/pam sys-libs/pam ) )
+	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 )
+	ncurses? ( sys-libs/ncurses )
+	xinetd? ( sys-apps/xinetd )"
+
+RDEPEND="${DEPEND}
+		net-ftp/ftpbase
+		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
+
+	# Fix ftpshut and SqlShowInfo, bug #100364
+	epatch "${FILESDIR}/proftpd-ftpshut.patch"
+	epatch "${FILESDIR}/proftpd-sqlshowinfo.patch"
+}
+
+src_compile() {
+	addpredict /etc/krb5.conf
+	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 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
+
+	if use noauthunix ; then
+		myconf="${myconf} --disable-auth-unix"
+	else
+		myconf="${myconf} --enable-auth-unix"
+	fi
+
+	econf \
+		--sbindir=/usr/sbin \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc/proftpd \
+		--enable-shadow \
+		--enable-autoshadow \
+		--enable-ctrls \
+		--with-modules=${modules} \
+		$(use_enable authfile auth-file) \
+		$(use_enable ncurses) \
+		$(use_enable ipv6) \
+		$(use_with sendfile) \
+		${myconf} || 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 /var/run/proftpd
+
+	dodoc contrib/UPGRADE.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 xinetd; then
+		insinto /etc/xinetd.d
+		newins ${FILESDIR}/proftpd.xinetd proftpd
+	fi
+
+	newinitd ${FILESDIR}/proftpd.rc6 proftpd
+}
+
+pkg_postinst() {
+	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'
+	ewarn 'With introduction of net-ftp/ftpbase the ftp user is now ftp.'
+	ewarn 'Remember to change that in the configuration file.'
+}