Add support for socket activation (#483270 by Henry Gebhardt and Alexander Tsoy)

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 158 insertions, 16 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 1b55302bbee3..16cdeb18cd71 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.176 2013/08/29 19:51:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.177 2013/09/03 20:11:27 pacho Exp $
+
+*vsftpd-3.0.2-r2 (03 Sep 2013)
+
+  03 Sep 2013; Pacho Ramos <pacho@gentoo.org> +files/vsftpd.socket,
+  +files/vsftpd_at.service, +vsftpd-3.0.2-r2.ebuild:
+  Add support for socket activation (#483270 by Henry Gebhardt and Alexander
+  Tsoy)
 
   29 Aug 2013; Agostino Sarubbo <ago@gentoo.org> vsftpd-3.0.2-r1.ebuild:
   Stable for ia64, wrt bug #480078
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 269ac00cce1a..0d03a9f2b83c 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX vsftpd-2.1.0-caps.patch 575 SHA256 4888021a25625041746b91025af0c2a2cb1fde758eda1d6c94098d4de0c1e370 SHA512 aeb407d9d0cf3940bc0fb1ef76c23cd19f68293e64d8a6a64e2a271b624a237fa3721b6a3476d59f0c6fabf69a418f9577fde351aba0e9aa96dc1362c02e1524 WHIRLPOOL bfad7367797f0fd0da502d9ebdcf13364123742642d384fb44220c0af2370997c5fbf9e72bf9eaabf47a449650702b1b73ac165a49ebc8687cb624e0caccbf99
 AUX vsftpd-2.2.0-dont-link-caps.patch 806 SHA256 fd164d4702ae866cb06ad245653b4f25c73d1d701a211b1f972b45b98ab55dd2 SHA512 b162f3afcc135bdecea63ef24a1f321e6723a1218a96a8897b3db67338f5cdceb6178c7cd0a155dee80af3e7b9198610562de7cff6986e7dfc93df79b5ee501c WHIRLPOOL cd7c6a94cc094af32097031aeca93873604d86f1d2ddaeb4980a18c82ab0061e95ca36484f157b68db9f81456e71fa02a6d01520f7ca9487bd2a266458c5a4cd
@@ -15,28 +15,21 @@ AUX vsftpd.conf 3842 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f
 AUX vsftpd.init 1261 SHA256 e6cf3df546aae57bb10e2b4282a9ccd79741473ef9dbdbd7628a16c84622da06 SHA512 5270ed8dc2f7a0063b122cb694a6d72c97dbdb2be95d568577666792d237edc193cb9511637eac422a5269100c05d9c4f91102107ceb0cadbf960ba7af4c57b1 WHIRLPOOL 9099e4d3bc20e51e6aa66bece73cc5373f7f083d173483b7872f49776d2d6204a334850434cd349570f76d57ec6c004b1db872820cd1a8d13f239ca423f24802
 AUX vsftpd.logrotate 53 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3 SHA512 6b0d718ffdc0b6a68d5092b36a03106d2c4e4fa6873a178c85345acfb3847ef839a475eadb56171d79ec243ae2bf8725cae0ae486b182afe065b181f87c831c5 WHIRLPOOL e155b30b59319cc5dac69c7446273ab20b4e56f696cce6ab8c83c3310529e0da70969edefaf94c912f121d3df526368ad9aafd291c6cf2f6a9b2d7b69d88b0aa
 AUX vsftpd.service 218 SHA256 5c93a836c0be34d785197ba01541b6cd9db6f8992c4ea081c07a6111cc98290d SHA512 f032f64ed5fab15b1c9543579090cdca007d0a759073e7c4aa0f0ef0f852f6787610f776ce63d0d922ccfbadd480df81ed9a62e6e0f399327d770f9b70c34df9 WHIRLPOOL c91aabb3b89dc3faa002cd998329d44677f756ee2901492324e37b3f7dbcc29b83c53032891ef1d802ea70d01b060f091970c20a06b36d2cae9358269df6f4e4
+AUX vsftpd.socket 104 SHA256 9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9 SHA512 4c56607dde0ccc4773edf905c1d52b66fff774e6aa8b20a23f9443a04838a9ad8a1df535a0bb27660e9a4528d1d7c90b53fd6dd1fa3d4862e87ed06a1a8a87b7 WHIRLPOOL 435e23297ff200ab68cb2813d2024279ed7d21e7d03f1c732c8ef06baf4b92c330edd496798c197078f07b08c4680c9c70e8dcc8aa4d35872d0cc556298b9fc9
 AUX vsftpd.xinetd 432 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f SHA512 f5c232345c06a7f3a7b32ff0281c386e6956e1b91d0331436bf8eb39e479ad1e37335424c35f22f12fb70416caa1f6a317b03e701caa4e0499acd556db64e909 WHIRLPOOL 7ffd1ede197d387e38ffa6e584c86be2fc35c4938b75ebd793daff562f6e99e95aaf0c5e58ee0a74a76686115e5e32e19dd5b27d8a64dd255de1ad7aae74d5fc
+AUX vsftpd_at.service 328 SHA256 5239d00bafe9686b5ee454365e32ea383ea85af70434037fd3812245dc50e8cd SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1 WHIRLPOOL cac14417d2c47a7491653c5835e913f980a09934a00b08eeb47f40f15ba3927639ab1ec8efc8d5c28ea49c34391b30946dcb04771b3eefcea5a7b2429b33f6a8
 DIST vsftpd-2.3.5.tar.gz 187691 SHA256 d87ee2987df8f03e1dbe294905f7907b2798deb89c67ca965f6e2f60879e54f1 SHA512 7d58d601c4a14cf16c074f238d557fd28e080d7573a1257f742e43bf97cff455b6bf083d8e3594cc7f8865f9485b307b692e91c17426c7fed11af9e4b41a0643 WHIRLPOOL 2dba4ae125bbd66522f58ce4ffc9d5be8ea2a84876fe6751593b82aa2c3e5fe1e1ed076c1c09268054f7ea6831683a2be0dd4e269e321d572d859d0ae2535406
 DIST vsftpd-3.0.2.tar.gz 192808 SHA256 be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56 SHA512 d5b978e07d8b0a623b79a531824666fb9b970ad5989a8c34c21b545b62ba07cde4bfe3d77b40a8b6e92d17890c37cae209231af8f106da3404f6548e217bd023 WHIRLPOOL 7a74ab478880d021f7a82ffc6ec3989617003234e30d97063760bc06baeee2ab207861b440896b926b95eed7b3d902ab96c05c1bbd23d494d9ff168f98d3404a
 EBUILD vsftpd-2.3.5.ebuild 3184 SHA256 478fca0c1becd06f6e1a56372ec04a08b31be1ea242355c7005a9bd593126828 SHA512 36d69f37d53a20a05896edd9a619129507ebfe71e0074a010105824741ebf2def741b099760671ed2fcf2f6701336cd0578fe351646d53bd25db09c214f90394 WHIRLPOOL 6abbd34564d28f4776f9cdf7c39161872f199fc1ba9d5cc1c23a22f0747bd4a060514e48276b01749e82564dfcf8d25c73cdd6b2832535cfb67b877a28e07580
 EBUILD vsftpd-3.0.2-r1.ebuild 3378 SHA256 95fb860f44d87d7ff138bd1974b1bbde46cff647f8423249d0eff9d0378a9753 SHA512 6aa9006a65e27825b80d59ff64a495eb048c2aa37ee80adbfe7911ad3adb60d6d1acd31f7922411405c051d7b0a5fa86b7780b94754c7a29b036e7acb8725180 WHIRLPOOL c7dcbf981bbc4c7462b327bc1e162d71ed4f76e7d3e7f7bffffe5ab26429cd3cf3f7b16ee4161244b841f7a248f0b679f26c1fe4652395299e6f54890f2d0745
+EBUILD vsftpd-3.0.2-r2.ebuild 3502 SHA256 2c3d107ada1250b35e1276b4c1a2711440dd62931c64e38d2eb16c1543621a22 SHA512 6042e2f5376567e82305aa1a4211bf0a349eebc60b9dfbf37af3fd7357a47e35f4ba97f951d2eff7ad3dbc0d3c2e30512e5a117d1d99c85bc1707cc58d8b2f8f WHIRLPOOL f06a0de3911a7201c6b32d0be98c92ca18111488bf57c0709778c7af1e68217755b2d319949121128ce3a74207dbc1ff0e576332f9ce79b6741dc2a7c57ffd4c
 EBUILD vsftpd-3.0.2.ebuild 3261 SHA256 2fbe8a15ec3becfa9b6d026131910e0bbba05e441f529ae00700912118220186 SHA512 abbd58887a36cdcbfd384b2cfcb66f1fd7aaef465a1efc61a456ff62cbd24067d5056e35592ea445997ab5537c613e168481dbca52bd903c9ad2270ca80f2e78 WHIRLPOOL b7ea0221b0b49d61a5b45fec8f98fa63bb1fdb995cce08833163c11a052560b459897eac6db2943813bdd9324f62e8c98238475db0c1e821196e178fe989fff7
-MISC ChangeLog 24970 SHA256 e232a5bb779eb44ae6f9c7e149dffc323dfd2c0a074e41a0abfc2cb565a9c66f SHA512 3f49b5fc7be1fcdc923a23f149ff184fb63520c6ea250d828c65e20fec1aa01fac1b555f2f179f5cdedd001c2bada6f31ce57676c9540fdd277a930acc5b46ee WHIRLPOOL da20928336d7422245e33f345114f6d71d61cf08ab1966888e2fac1699ece70b70a0a83c2be807bfa517ebe8faef059f4091865273453af6533c912ef1e62a8d
+MISC ChangeLog 25211 SHA256 1d87af918ce8aed0406dca841f6305cc813d9c2c0f01af4fa909525374b82d93 SHA512 c4373343e2bfac66e2124d3879c72752d51f7f75409943c6f3f7a61a059d5ba2b8e41fd7fddbc0e73b2f3bdbd2feffcc434f909fa66acbbc5ddd849267394d0a WHIRLPOOL a0d4219bf66805d921e5d5dd5a9dd20e11c204ebd8cb75c9febf8e9a5b6135b9b244a1878c6541822b4c944bebfeaaf7b191c625ce97301d840486c675cbf31b
 MISC metadata.xml 664 SHA256 769529e78a4d3270ae5c627e09783ffd6e122e24c5e931317d0832b6273ee586 SHA512 84392c28c30904caba637a5f90fc73512f028f706f5a805c1181a9fc63b93e9794dc17ade2016d969796b32c6ab6b8530f549298b099ae67c65d03a62d64955b WHIRLPOOL a4690e0bf4b66e94d072b0f6d0297da7fd208277b3302862087f2d274438167c97f2a33a6ad43e76fea2f754190e2b40cfc6a7d7ee562538ef6c479d08f36d0c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSH6VrAAoJELp701BxlEWf7pAP/jXZcRrewdWC3OMi2xkcryL4
-YJQSmgilNlsaddJYArfFpE661eBY8b0mLe2zHICt00tP2FdyurEhwMaXyg3QqTn5
-pKCEwiuGn8ZoZ7+JAtnREpHBtoOsevR2h+srNQ8U9jJUFPjJ++6X9XnqIcau5fHp
-5TMYJcvsH56+xyenD/FbiqNPCHN5Rbpn7ndomW0wBzyloHY1KlDAmXWTTl7I7DHF
-ydUixdPbdQh9IcsDzL9VWmizXLbQaiQNi1t/EwJHtsBNaY029m84/qhST1j/OI3u
-BNGKs/k/47Se9z+x0VrBMQu7wVe7hI+ZE35FeNe3a5MF9U/tq4F1hqwwjBbcZsr5
-Ofkmygm5XJEzZ+NQGcFFNrApuIALTz+WJNVymyDkNj3IPoFJDS0TWBaD3FEvrpEg
-asM7USxqwRcZSVWBBwDjFp3LMvrKQkKPeP9Lm604tWu7muzcfXD/3FA21oPepUwS
-ltrpv49uWmcH2zqUtC97YHVJD5BHL37RDYV9RJD9GOdyhpbapdcBWqy/djt/qHqt
-D/Chjx46zyGSVWkREyYpWwSg+rPl/bDY/emUt2TdFJxE3DRDwnrHJZ51GKKZt3I8
-yAIltZUkZd/yujpNBIXNDmdn5l6yW8ClOcx7sA4VM2nmDhY0D43x7uMVntJgRIAB
-giJQy3A78rUEDrNQfVD5
-=f4mW
+iEYEAREIAAYFAlImQnEACgkQCaWpQKGI+9SiuACfR76o8HoyFgPZdGGPJFEN1FUd
+nVYAn3SWlojbJY6RsZvg4k9+lFHp9N4J
+=DN4x
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/vsftpd/files/vsftpd.socket b/net-ftp/vsftpd/files/vsftpd.socket
new file mode 100644
index 000000000000..cdc0d337efeb
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.socket
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=vsftpd.service
+
+[Socket]
+ListenStream=21
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/net-ftp/vsftpd/files/vsftpd_at.service b/net-ftp/vsftpd/files/vsftpd_at.service
new file mode 100644
index 000000000000..5380b83ffcfe
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd_at.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Very Secure FTP Daemon
+
+[Service]
+Type=simple
+# Note: Do not use ExecStartPre=/usr/libexec/vsftpd-checkconfig.sh, as it
+# requires one of the listen options to be enabled.
+ExecStart=/usr/sbin/vsftpd /etc/vsftpd/vsftpd.conf -obackground=NO -olisten=NO -olisten_ipv6=NO
+StandardInput=socket
+SuccessExitStatus=2
diff --git a/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild
new file mode 100644
index 000000000000..6cf1c048ba62
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild,v 1.1 2013/09/03 20:11:27 pacho Exp $
+
+EAPI="4"
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
+HOMEPAGE="http://vsftpd.beasts.org/"
+SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~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-ftp )
+	xinetd? ( sys-apps/xinetd )"
+
+src_prepare() {
+	# kerberos patch. bug #335980
+	epatch "${FILESDIR}/${PN}-2.3.2-kerberos.patch"
+
+	# Patch the source, config and the manpage to use /etc/vsftpd/
+	epatch "${FILESDIR}/${PN}-2.3.5-gentoo.patch"
+
+	# Fix building without the libcap
+	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
+
+	# Fix building on alpha. Bug #405829
+	epatch "${FILESDIR}/${PN}-3.0.2-alpha.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 || die
+		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
+	fi
+
+	# Let portage control stripping
+	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die
+
+	#Bug #335977
+	epatch "${FILESDIR}"/${PN}-3.0.0-Makefile.patch
+
+	#Bug #450536
+	epatch "${FILESDIR}"/${P}-remove-legacy-cap.patch
+}
+
+src_compile() {
+	CFLAGS="${CFLAGS}" \
+	CC="$(tc-getCC)" \
+	emake
+}
+
+src_install() {
+	into /usr
+	doman ${PN}.conf.5 ${PN}.8
+	dosbin ${PN} || die "disbin failed"
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
+		README README.security REWARD SIZE \
+		SPEED TODO TUNING || die "dodoc failed"
+	newdoc ${PN}.conf ${PN}.conf.example
+
+	docinto security
+	dodoc SECURITY/* || die "dodoc failed"
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins -r EXAMPLE/* || die "doins faileD"
+
+	insinto /etc/${PN}
+	newins ${PN}.conf{,.example}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/${PN}.xinetd" ${PN}
+	fi
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	keepdir /usr/share/${PN}/empty
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vsftpd-checkconfig.sh"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
+	systemd_dounit "${FILESDIR}/${PN}.socket"
+}
+
+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/${PN}/${PN}.conf.example
+	fi
+}
+
+pkg_postinst() {
+	einfo "vsftpd openRC 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"
+}