version bump

svn path=/sunrise/; revision=8897

3 files changed, 110 insertions, 1 deletions

diff --git a/net-ftp/vsftpd-devnet/ChangeLog b/net-ftp/vsftpd-devnet/ChangeLog
index 794afb61e..7d22ca6ee 100644
--- a/net-ftp/vsftpd-devnet/ChangeLog
+++ b/net-ftp/vsftpd-devnet/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Jul 2009; KostyaSha (integer) <gentoo.integer@gmail.com>
+  +vsftpd-devnet-2.1.2_p1.ebuild:
+  version bump
+
   15 Apr 2009; KostyaSha (integer) <gentoo.integer@gmail.com>
   vsftpd-devnet-2.1.0_p1.ebuild, files/vsftpd-devnet-2.1.0-gentoo.patch,
   files/vsftpd.init:
diff --git a/net-ftp/vsftpd-devnet/Manifest b/net-ftp/vsftpd-devnet/Manifest
index 1c26d5b12..b1523b3af 100644
--- a/net-ftp/vsftpd-devnet/Manifest
+++ b/net-ftp/vsftpd-devnet/Manifest
@@ -5,6 +5,8 @@ AUX vsftpd.init 1922 RMD160 50925ca15a4f94662790244546454c523b6e4f95 SHA1 ef453f
 AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3
 AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f
 DIST vsftpd-2.1.0-ext1.tar.gz 199926 RMD160 840d955cc4234c1b28ce300d3f018c47143a999b SHA1 0c67a2c696905da393e0412f85aee4d9e4623182 SHA256 fd137f98a67705c6cdce733c23bc7ebab14664b904b9b0f8b13669739c1d8a88
+DIST vsftpd-2.1.2-ext1.tgz 201357 RMD160 3fb5d5efe7738e22014648427a6f31bb8f2f72a3 SHA1 b604a70cba29fec2fa7f9ff5221c3d4f7b60cfb6 SHA256 7b358dcbf3fcabcfab24b7690b37036e07a02e675b2354c9610f048c184218c2
 EBUILD vsftpd-devnet-2.1.0_p1.ebuild 2882 RMD160 a5dfa8f13bed55e3af53f6029c04b822eb2ac1ea SHA1 75d21ab20c9ff7a33c33e335317ed2aa035bc6bd SHA256 ba51070558a0ca37a3f183cee496b3a64c4eac9a8ee6321cba9e8edf2aa27447
-MISC ChangeLog 720 RMD160 16c799cad8f73241473115386d0b73e194e5e70c SHA1 6888517d7a2a799ebb7f3c51d74ae6ad0f1a3fc0 SHA256 968583eea7e9b39057727cc3bbaca80f6e5698886b37f4ddb81b730321e505f8
+EBUILD vsftpd-devnet-2.1.2_p1.ebuild 2879 RMD160 4c24521633edacf7bb5332a08d5c1086c7cb981f SHA1 b82f31340af3b44134b3dde1e94ad384578e9732 SHA256 6854589078dcd32198be7e25e1394bd59d88631ed81fad828b80e6dd55c96578
+MISC ChangeLog 832 RMD160 2d8c37a7b7d8f527bcb689c5c4834aec3c41f06c SHA1 0d34336090d084abb01cb15c68b3b62387a2c23b SHA256 502781fc58c7b987d31bd0ca22c01aff501e42546b37c36ebe76b8c3406ad2b0
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-ftp/vsftpd-devnet/vsftpd-devnet-2.1.2_p1.ebuild b/net-ftp/vsftpd-devnet/vsftpd-devnet-2.1.2_p1.ebuild
new file mode 100644
index 000000000..159b13088
--- /dev/null
+++ b/net-ftp/vsftpd-devnet/vsftpd-devnet-2.1.2_p1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Very Secure FTP Daemon with devnet patchset"
+HOMEPAGE="http://vsftpd.devnet.ru/"
+SRC_URI="http://vsftpd.devnet.ru/files/${PV%_p*}/ext.${PV#*_p}/${PN%-*}-${PV%_p*}-ext${PV#*_p}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps pam tcpd ssl selinux xinetd"
+
+DEPEND="caps? ( sys-libs/libcap )
+	pam? ( virtual/pam )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )"
+RDEPEND="${DEPEND}
+	!net-ftp/vsftpd
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftpd )
+	xinetd? ( sys-apps/xinetd )"
+
+S=${WORKDIR}/${PN%-*}-${PV%_p*}-ext.${PV#*_p}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Patch the source, config and the manpage to use /etc/vsftpd/
+	epatch "${FILESDIR}/${PN}-2.1.0-gentoo.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.1.0-dont-link-caps.patch
+	fi
+
+	# Let portage control stripping
+	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
+	# disabling background by default 
+	sed -i 's/background = 1/background = 0/' tunables.c
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	doman vsftpd.conf.5 vsftpd.8 || die
+	dosbin vsftpd || die
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
+		README README.security REWARD SIZE \
+		SPEED TODO TUNING || die
+	newdoc vsftpd.conf vsftpd.conf.example || die
+
+	docinto security
+	dodoc SECURITY/* || die
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins -r EXAMPLE/* || die
+
+	insinto /etc/vsftpd
+	newins vsftpd.conf vsftpd.conf.example || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/vsftpd.logrotate" vsftpd || die
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/vsftpd.xinetd" vsftpd || die
+	fi
+
+	newinitd "${FILESDIR}/vsftpd.init" vsftpd || die
+
+	keepdir /usr/share/vsftpd/empty
+}
+
+pkg_postinst() {
+	# If we use xinetd, then we comment out listen=YES
+	# so that our default config works under xinetd - fixes #78347
+	if use xinetd ; then
+		sed -i '/\listen=YES/s/^/#/g' "${D}"/etc/vsftpd/vsftpd.conf.example
+	fi
+
+	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"
+}