logrotate support, #115320.

  New release, #118464.
Package-Manager: portage-2.1_pre3-r1

5 files changed, 111 insertions, 3 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 9defc8ce465b..b60906d30183 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/vsftpd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.64 2005/10/20 09:50:44 uberlord Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.65 2006/01/10 07:17:30 uberlord Exp $
+
+*vsftpd-2.0.4 (10 Jan 2006)
+
+  10 Jan 2006; Roy Marples <uberlord@gentoo.org> +files/vsftpd.logrotate,
+  +vsftpd-2.0.4.ebuild:
+  logrotate support, #115320.
+  New release, #118464.
 
 *vsftpd-2.0.3-r2 (20 Oct 2005)
 
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index c723b282a5fa..e3efcd2dc33d 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,13 +1,16 @@
-MD5 3b54910d381bac92f7784c3843d986e1 ChangeLog 9214
+MD5 47c90c2831d0aea91fc6e21d7d5a5d9d ChangeLog 9396
 MD5 c3af0a9f9ed1ea8eb162da439b88bf78 files/digest-vsftpd-2.0.3-r1 64
 MD5 c3af0a9f9ed1ea8eb162da439b88bf78 files/digest-vsftpd-2.0.3-r2 64
+MD5 c8e8bfd0ee59267bac7f7f981159ce96 files/digest-vsftpd-2.0.4 64
 MD5 10727329a1de642694a73e3655774015 files/vsftpd-2.0.3-gentoo.diff 5598
 MD5 2008f701278d9e59c755433c8e987606 files/vsftpd-2.0.3-gentoo.patch 7128
 MD5 d0f6c4bc146ade78fdcc3ecc94ffece2 files/vsftpd.conf 3842
 MD5 a61f83e896d2058a22f9fb3d2b2b1b25 files/vsftpd.conf.d 294
 MD5 8df8f4a0d1fac0ddf21aab9f9c11fa1c files/vsftpd.init 1628
 MD5 b0551ddc57103f1dcca71524691540a0 files/vsftpd.init.d 1038
+MD5 4b9dad8564a6cf38452350a1e5ba5664 files/vsftpd.logrotate 53
 MD5 8578d5c3f50e7b090ba023dfa626ec89 files/vsftpd.xinetd 432
 MD5 0451b23327c004752edf415e25931d07 metadata.xml 344
 MD5 dc7c446f859492b83b73eb59ee07e560 vsftpd-2.0.3-r1.ebuild 2032
 MD5 5a4c26e8f75ee0f92d48815bb9fb14e4 vsftpd-2.0.3-r2.ebuild 2409
+MD5 ee0270e6094ec9f071f47cba896a119c vsftpd-2.0.4.ebuild 2556
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.4 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.4
new file mode 100644
index 000000000000..5fa8abbef48c
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-2.0.4
@@ -0,0 +1 @@
+MD5 c0bf8c7b8e15ab15827172786fc56115 vsftpd-2.0.4.tar.gz 154857
diff --git a/net-ftp/vsftpd/files/vsftpd.logrotate b/net-ftp/vsftpd/files/vsftpd.logrotate
new file mode 100644
index 000000000000..f443e2eb8b0a
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.logrotate
@@ -0,0 +1,4 @@
+/var/log/vsftpd.log {
+    missingok
+    notifempty
+}
diff --git a/net-ftp/vsftpd/vsftpd-2.0.4.ebuild b/net-ftp/vsftpd/vsftpd-2.0.4.ebuild
new file mode 100644
index 000000000000..bae6efe09bce
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.0.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.4.ebuild,v 1.1 2006/01/10 07:17:30 uberlord Exp $
+
+inherit flag-o-matic eutils
+
+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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="logrotate pam tcpd ssl selinux xinetd"
+
+DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )"
+RDEPEND="${DEPEND}
+	net-ftp/ftpbase
+	logrotate? ( app-admin/logrotate )
+	selinux? ( sec-policy/selinux-ftpd )
+	xinetd? ( sys-apps/xinetd )"
+
+src_unpack() {
+	unpack "${A}" || die
+	cd "${S}" || die
+
+	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
+
+	# Patch the source, config and the manpage to use /etc/vsftpd/
+	epatch "${FILESDIR}/vsftpd-2.0.3-gentoo.patch"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	into /usr
+	doman vsftpd.conf.5 vsftpd.8
+	dosbin vsftpd
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL \
+		LICENSE README README.security REWARD SIZE \
+		SPEED TODO TUNING
+	newdoc vsftpd.conf vsftpd.conf.example
+
+	docinto security
+	dodoc SECURITY/*
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins -r EXAMPLE/*
+
+	insinto /etc/vsftpd
+	newins vsftpd.conf vsftpd.conf.example
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/vsftpd.logrotate" vsftpd
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
+	fi
+
+	newinitd "${FILESDIR}/vsftpd.init" vsftpd
+
+	keepdir /usr/share/vsftpd/empty
+}
+
+pkg_preinst() {
+	# 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' ${IMAGE}/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"
+}