Version bump, fix xinetd example, bug #266881, force libcap-2, bug #266806, bug #268353

(Portage version: 2.1.6.11/cvs/Linux i686, RepoMan options: --force)

5 files changed, 47 insertions, 33 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 9c6ad8cf5a3d..f9865fc593c6 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.115 2009/04/25 17:34:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.116 2009/05/30 11:28:41 armin76 Exp $
+
+*vsftpd-2.1.2 (30 May 2009)
+*vsftpd-2.1.0-r1 (30 May 2009)
+
+  30 May 2009; Raúl Porcel <armin76@gentoo.org>
+  files/vsftpd-2.1.0-gentoo.patch, +files/vsftpd-2.1.2-dont-link-caps.patch,
+  -vsftpd-2.0.6.ebuild, -vsftpd-2.1.0.ebuild, +vsftpd-2.1.0-r1.ebuild,
+  +vsftpd-2.1.2.ebuild:
+  Version bump, fix xinetd example, bug #266881, force libcap-2, bug #266806,
+  bug #268353
 
   25 Apr 2009; Raúl Porcel <armin76@gentoo.org> vsftpd-2.1.0.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #266664
diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch b/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch
index f428fb41beca..b3589920721d 100644
--- a/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch
+++ b/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch
@@ -75,17 +75,6 @@ diff -ur vsftpd-2.1.0.orig/vsftpd.conf vsftpd-2.1.0/vsftpd.conf
  #
  # The default compiled in settings are fairly paranoid. This sample file
  # loosens things up a bit, to make the ftp daemon more usable.
-@@ -8,6 +8,10 @@
- # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
- # capabilities.
- #
-+# Listen on IPv4. xinet users must set NO or comment out
-+# otherwise it must be set YES
-+listen=YES
-+#
- # Allow anonymous FTP? (Beware - allowed by default if you comment this out).
- anonymous_enable=YES
- #
 @@ -87,14 +91,14 @@
  # useful for combatting certain DoS attacks.
  #deny_email_enable=YES
diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch
new file mode 100644
index 000000000000..d36fa37ffe40
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch
@@ -0,0 +1,20 @@
+diff -ur vsftpd-2.1.2.orig/vsf_findlibs.sh vsftpd-2.1.2/vsf_findlibs.sh
+--- vsftpd-2.1.2.orig/vsf_findlibs.sh	2009-05-30 12:43:33.000000000 +0200
++++ vsftpd-2.1.2/vsf_findlibs.sh	2009-05-30 12:44:41.000000000 +0200
+@@ -42,16 +42,6 @@
+ # For older HP-UX...
+ locate_library /usr/lib/libsec.sl && echo "-lsec";
+ 
+-# Look for libcap (capabilities)
+-if locate_library /lib/libcap.so.1; then
+-  echo "/lib/libcap.so.1";
+-elif locate_library /lib/libcap.so.2; then
+-  echo "/lib/libcap.so.2";
+-else
+-  locate_library /usr/lib/libcap.so && echo "-lcap";
+-  locate_library /lib/libcap.so && echo "-lcap";
+-fi
+-
+ # Solaris needs this for nanosleep()..
+ locate_library /lib/libposix4.so && echo "-lposix4";
+ locate_library /usr/lib/libposix4.so && echo "-lposix4";
diff --git a/net-ftp/vsftpd/vsftpd-2.1.0.ebuild b/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild
index dacaefe43329..0967ad4d4367 100644
--- a/net-ftp/vsftpd/vsftpd-2.1.0.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.0.ebuild,v 1.5 2009/04/25 17:34:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild,v 1.1 2009/05/30 11:28:41 armin76 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,7 @@ 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 )
+DEPEND="caps? ( >=sys-libs/libcap-2 )
 	pam? ( virtual/pam )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )"
@@ -31,7 +31,6 @@ src_unpack() {
 
 	# Fix building without the libcap
 	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
-	has_version "<sys-libs/libcap-2" && epatch "${FILESDIR}"/${PN}-2.0.6-libcap1.patch
 
 	# Configure vsftpd build defaults
 	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
@@ -85,10 +84,10 @@ src_install() {
 }
 
 pkg_preinst() {
-	# If we use xinetd, then we comment out listen=YES
+	# 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 '/\listen=YES/s/^/#/g' "${D}"/etc/vsftpd/vsftpd.conf.example
+		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
 	fi
 }
 
diff --git a/net-ftp/vsftpd/vsftpd-2.0.6.ebuild b/net-ftp/vsftpd/vsftpd-2.1.2.ebuild
index 0614381d1eda..4f933f49e1f5 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.6.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.6.ebuild,v 1.10 2008/11/06 02:31:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.2.ebuild,v 1.1 2009/05/30 11:28:41 armin76 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,16 +10,15 @@ 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 logrotate pam tcpd ssl selinux xinetd"
+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 )
+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
-	logrotate? ( app-admin/logrotate )
 	selinux? ( sec-policy/selinux-ftpd )
 	xinetd? ( sys-apps/xinetd )"
 
@@ -28,11 +27,10 @@ src_unpack() {
 	cd "${S}"
 
 	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-2.1.0-gentoo.patch"
 
 	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.0.6-caps.patch"
-	has_version "<sys-libs/libcap-2" && epatch "${FILESDIR}"/${PN}-2.0.6-libcap1.patch
+	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
 
 	# Configure vsftpd build defaults
 	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
@@ -42,7 +40,7 @@ src_unpack() {
 	# Ensure that we don't link against libcap unless asked
 	if ! use caps ; then
 		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
-		sed -i '/libcap/ d' vsf_findlibs.sh
+		epatch "${FILESDIR}"/${PN}-2.1.2-dont-link-caps.patch
 	fi
 
 	# Let portage control stripping
@@ -72,10 +70,8 @@ src_install() {
 	insinto /etc/vsftpd
 	newins vsftpd.conf vsftpd.conf.example
 
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/vsftpd.logrotate" vsftpd
-	fi
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/vsftpd.logrotate" vsftpd
 
 	if use xinetd ; then
 		insinto /etc/xinetd.d
@@ -88,10 +84,10 @@ src_install() {
 }
 
 pkg_preinst() {
-	# If we use xinetd, then we comment out listen=YES
+	# 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 '/\listen=YES/s/^/#/g' "${D}"/etc/vsftpd/vsftpd.conf.example
+		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
 	fi
 }