Revbump to fix bug #335977 and bug #335980. Thanks to Joakim Tjernlund <Joakim.Tjernlund@transmode.se>

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

5 files changed, 159 insertions, 5 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index b24e49fa4e29..5999eb848ef3 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.129 2010/08/20 19:20:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.130 2010/09/27 17:19:35 hwoarang Exp $
+
+*vsftpd-2.3.2-r1 (27 Sep 2010)
+
+  27 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
+  +vsftpd-2.3.2-r1.ebuild, +files/vsftpd-2.3.2-as-needed.patch,
+  +files/vsftpd-2.3.2-kerberos.patch:
+  Revbump to fix -as-needed behavior(Bug #335977) and kerberos authentcation
+  (Bug #335980). Thanks to Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
 
   20 Aug 2010; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add Dane Smith <smithdanea@gmail.com> as proxy maintainer
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 3dba958c3b48..42a086301052 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -4,6 +4,8 @@ Hash: SHA1
 AUX vsftpd-2.1.0-caps.patch 575 RMD160 a7b27df472ccbb5068d5f9961fe6bb010063e98c SHA1 f98d3cfbc1eb68f6e852cf9cbf5ad80407be5557 SHA256 4888021a25625041746b91025af0c2a2cb1fde758eda1d6c94098d4de0c1e370
 AUX vsftpd-2.2.0-dont-link-caps.patch 806 RMD160 670bfa8433ea5c9769d238aaebb9fce1d43e9e40 SHA1 d28260190d4613dae798d0f09d267be1ffcbc0a7 SHA256 fd164d4702ae866cb06ad245653b4f25c73d1d701a211b1f972b45b98ab55dd2
 AUX vsftpd-2.2.0-gentoo.patch 11049 RMD160 ef4fafea61a4ecf37d771f2da75bb10570dec898 SHA1 8846603f85f9515a154cfd8c1823c3e2e4e7e0e9 SHA256 e1737c941837aaf8e060a649903934174528704feffd100f86180a7ec68f3760
+AUX vsftpd-2.3.2-as-needed.patch 423 RMD160 36b79388cd7f7c6e7e9f8b4903622f4a1fa48762 SHA1 5e33ee6613715f84fa67e6bd09aec1be13aac95c SHA256 ad393655b30887294dfcf46fe63ea24e3339f027a84fe7de03364500829496d9
+AUX vsftpd-2.3.2-kerberos.patch 842 RMD160 01a77e587615e4367f2740ea52631fd115c8ea0a SHA1 ff1ef2088b960a77051b4cf83491f1c4ce70c621 SHA256 d86bed62c0fd22372f4704a12d7f75ce42fc15765ceec802b4b0c5680bc9c200
 AUX vsftpd.conf 3842 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 SHA1 ebd5847bb328d8df188d85ffc5ccd7fcd5983525 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0
 AUX vsftpd.init 1922 RMD160 50925ca15a4f94662790244546454c523b6e4f95 SHA1 ef453f4925e941e21075be678387076e57246b3d SHA256 78941ea7744d65d4674b4df8ecee6df91e6ed601c47d64ce1f489af56ea250e2
 AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3
@@ -11,13 +13,14 @@ AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325e
 DIST vsftpd-2.2.2.tar.gz 185562 RMD160 2703291a9ce76f68cc8ef82f04cb28c471946f53 SHA1 43976c6dbffe8e4bdc5f4add73a0c1431662a6c6 SHA256 05665dfa43a268e6fe422b89f6c3cb1a63e4e989b456922508f3f89d4b276eab
 DIST vsftpd-2.3.2.tar.gz 187229 RMD160 27bdc9d3065390a9dc85b3ef5926ad16d3544d2d SHA1 d525974514ecf61cbbf9cb51066aa68d5a52033b SHA256 a4e04836d8e271f361030e6a679ad001046c3e37f59e9fee5114189f9e065336
 EBUILD vsftpd-2.2.2.ebuild 2900 RMD160 2eacd78fe47174ef7689485b097375ddf304953f SHA1 ebd0cc1cfd7c54564752005c623e6832b91953d2 SHA256 d1fe9acd8219e8284f4de9153f526e3c12cb91d73bdfe156c67d52fcf9ea9fc1
+EBUILD vsftpd-2.3.2-r1.ebuild 3285 RMD160 ebc971326153509f655e923b50f9f31cf0461c16 SHA1 44326711cc5fa818154b90b6e558ad30fc74b40b SHA256 bcf0e3c9ea972ccd2da5e60713099cbbd5595dcc50cc5bdb88691a75fd13905e
 EBUILD vsftpd-2.3.2.ebuild 3132 RMD160 f6788a86d59e82998f52d9b084693addac5b537e SHA1 b545a3ad50aa82f934e3d3f7111602d8debe6d99 SHA256 d4c2b375812e0c36887e05880fdfc5bce26518290312f47449cd1b96434a6d02
-MISC ChangeLog 18461 RMD160 1d51a364b36c1375bb7765023a6a6b32d1a29f71 SHA1 4e4924d94513b0ced4dd403cbd52135c8a730f79 SHA256 4baf5fa114b021795bae0bf51624a80e642b1fbd3ea6d7f2f0c62d06718111a3
+MISC ChangeLog 18802 RMD160 5bcad64b50b7c51397dcea833a1b38d067377c98 SHA1 bd7361c0b868d19aefa986f3b8c85b0783797344 SHA256 e6486ae22de1bbc2949e46a332bd621bc02970288ceb83b9598975f339fbbf38
 MISC metadata.xml 787 RMD160 7dd2ce11a4b159f3ff13dfada4c3f64dfbdc2b65 SHA1 934d6bca5ca09d532a8035d0e8af2fccb7779f7f SHA256 e6454f27f20a66c40a8a4937d9ea920ce8c370a7363cf8a6370570ed47d16c86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxu1i4ACgkQ9/cejkQaxBBDWwCePNvnEBiHTCeFuw29ha1h68mN
-N5kAn3wh0vm6JWDdxYTTKpAYbaskB6Nk
-=IBD6
+iEYEARECAAYFAkyg0bEACgkQ9/cejkQaxBBf0QCfUsO125SuCG2iHJU2UteoHux6
+KGAAnAglXfKdpMwWpIY6fr3V1BPfRk0/
+=lAzt
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch b/net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch
new file mode 100644
index 000000000000..330026e47e94
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch
@@ -0,0 +1,13 @@
+Index: vsftpd-2.3.2/Makefile
+===================================================================
+--- vsftpd-2.3.2.orig/Makefile
++++ vsftpd-2.3.2/Makefile
+@@ -21,7 +21,7 @@ OBJS	=	main.o utility.o prelogin.o ftpcm
+ 	$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
+ 
+ vsftpd: $(OBJS) 
+-	$(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)
++	$(CC) -o vsftpd $(LDFLAGS) $(OBJS) $(LINK) $(LIBS)
+ 
+ install:
+ 	if [ -x /usr/local/sbin ]; then \
diff --git a/net-ftp/vsftpd/files/vsftpd-2.3.2-kerberos.patch b/net-ftp/vsftpd/files/vsftpd-2.3.2-kerberos.patch
new file mode 100644
index 000000000000..702363ee472b
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.3.2-kerberos.patch
@@ -0,0 +1,20 @@
+Index: vsftpd-2.3.2/twoprocess.c
+===================================================================
+--- vsftpd-2.3.2.orig/twoprocess.c
++++ vsftpd-2.3.2/twoprocess.c
+@@ -284,6 +284,7 @@ process_login_req(struct vsf_session* p_
+ {
+   enum EVSFPrivopLoginResult e_login_result = kVSFLoginNull;
+   char cmd;
++  vsf_sysutil_install_null_sighandler(kVSFSysUtilSigCHLD);
+   /* Blocks */
+   cmd = priv_sock_get_cmd(p_sess->parent_fd);
+   if (cmd != PRIV_SOCK_LOGIN)
+@@ -363,7 +364,6 @@ common_do_login(struct vsf_session* p_se
+   int was_anon = anon;
+   const struct mystr* p_orig_user_str = p_user_str;
+   int newpid;
+-  vsf_sysutil_install_null_sighandler(kVSFSysUtilSigCHLD);
+   /* Tells the pre-login child all is OK (it may exit in response) */
+   priv_sock_send_result(p_sess->parent_fd, PRIV_SOCK_RESULT_OK);
+   if (!p_sess->control_use_ssl)
diff --git a/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..b69d89fe6fd6
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild,v 1.1 2010/09/27 17:19:35 hwoarang Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
+HOMEPAGE="http://vsftpd.beasts.org/"
+SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps pam tcpd ssl selinux xinetd"
+
+DEPEND="caps? ( >=sys-libs/libcap-2 )
+	pam? ( virtual/pam )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )"
+RDEPEND="${DEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftpd )
+	xinetd? ( sys-apps/xinetd )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# as-needed patch. Bug #335977
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	# kerberos patch. bug #335980
+	epatch "${FILESDIR}/${P}-kerberos.patch"
+
+	# Patch the source, config and the manpage to use /etc/vsftpd/
+	epatch "${FILESDIR}/${PN}-2.2.0-gentoo.patch"
+
+	# Fix building without the libcap
+	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
+
+	# Configure vsftpd build defaults
+	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
+	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
+	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
+
+	# Ensure that we don't link against libcap unless asked
+	if ! use caps ; then
+		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
+		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
+	fi
+
+	# Let portage control stripping
+	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	into /usr
+	doman vsftpd.conf.5 vsftpd.8 || die "doman failed"
+	dosbin vsftpd || die "disbin failed"
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
+		README README.security REWARD SIZE \
+		SPEED TODO TUNING || die "dodoc failed"
+	newdoc vsftpd.conf vsftpd.conf.example || die "newdoc failed"
+
+	docinto security
+	dodoc SECURITY/* || die "dodoc failed"
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins -r EXAMPLE/* || die "doins faileD"
+
+	insinto /etc/vsftpd
+	newins vsftpd.conf vsftpd.conf.example || die "newins failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/vsftpd.logrotate" vsftpd || die "newins failed"
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/vsftpd.xinetd" vsftpd || die "newins failed"
+	fi
+
+	newinitd "${FILESDIR}/vsftpd.init" vsftpd || die "newinitd failed"
+
+	keepdir /usr/share/vsftpd/empty
+}
+
+pkg_preinst() {
+	# If we use xinetd, then we set listen=NO
+	# so that our default config works under xinetd - fixes #78347
+	if use xinetd ; then
+		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
+	fi
+}
+
+pkg_postinst() {
+	einfo "vsftpd init script can now be multiplexed."
+	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
+	einfo "If you symlink the init script to another one, say vsftpd.foo"
+	einfo "then that uses /etc/vsftpd/foo.conf instead."
+	einfo
+	einfo "Example:"
+	einfo "   cd /etc/init.d"
+	einfo "   ln -s vsftpd vsftpd.foo"
+	einfo "You can now treat vsftpd.foo like any other service"
+}