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

Package-Manager: portage-2.1.6.11/cvs/Linux i686
RepoMan-Options: --force

6 files changed, 53 insertions, 38 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/Manifest b/net-ftp/vsftpd/Manifest
index be5fc374b4d9..aaa5d4a99d21 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -4,16 +4,17 @@ AUX vsftpd-2.0.6-libcap1.patch 582 RMD160 239fa2c23770e81a0b45f8df154a52b42af1f5
 AUX vsftpd-2.0.7-uclibc.patch 582 RMD160 7e1a930162d0936076a6e4601585d73b649073d8 SHA1 d47b6b0ac66c7ebfc08b472c04c4fc8b076be4ef SHA256 adef1463cb329454706cf094b453f41d70dee8a46b72ef144f94b938de319002
 AUX vsftpd-2.1.0-caps.patch 575 RMD160 a7b27df472ccbb5068d5f9961fe6bb010063e98c SHA1 f98d3cfbc1eb68f6e852cf9cbf5ad80407be5557 SHA256 4888021a25625041746b91025af0c2a2cb1fde758eda1d6c94098d4de0c1e370
 AUX vsftpd-2.1.0-dont-link-caps.patch 682 RMD160 fff89775de0d95562603b890e181703acb5dd6ce SHA1 c18bc7639643fe2b1ea91717d97eae191e73660c SHA256 6662a7961043e2888ff377a7689b31934f75d0ebf4bfad916a5432ff05cfcb52
-AUX vsftpd-2.1.0-gentoo.patch 7575 RMD160 0695c1e679a8b0a7f1a4d599ee01571c7db0049b SHA1 69cd031c3f958f94ff64b573d4af235e79d84051 SHA256 3bacbc4828edf8d24f08600090ca60c9af8c1603032fc6cf3748960ac971f2bd
+AUX vsftpd-2.1.0-gentoo.patch 7253 RMD160 1b44cca4bed7d141a32e08e5a8542e61591531a6 SHA1 8a1fb53936d97e03e950068ac9dbab40cdb18b65 SHA256 23c1e87348176a5ac813debd68a853b065027df765480c3d6298de7a0cb58eaa
+AUX vsftpd-2.1.2-dont-link-caps.patch 754 RMD160 6e7858526a84e948a96c1989cf41af148b1c251e SHA1 b638f95d1bea48122ad1c36ee62376bdbb2163f9 SHA256 e4b19b35bf42cf618127b6aa107d7d765507ab6c4d2309e8abe4399c65f0b509
 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
 AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f
-DIST vsftpd-2.0.6.tar.gz 158516 RMD160 33e9782e2c99986c2c8b60fc29880cedad7ba1fa SHA1 23fcc21996cd1404f6957d83bfb2e8004401a858 SHA256 8e35c3962477c5c539d9be489d0d3794840f5eda15690e492a6f1f256398ce30
 DIST vsftpd-2.0.7.tar.gz 162801 RMD160 8947c7ae00214fb30c9d7d2cfba5116643e1d8c7 SHA1 760afe849d1ebe10592ef29032b6e00e7f1bbf79 SHA256 5d86a6d627f2d8e35dbdefdbd445f6016d349955107b247076bbcc36cde1046b
 DIST vsftpd-2.1.0.tar.gz 178636 RMD160 0066ac526bb184e3ada9d4e53e520d82dfc71633 SHA1 3edd0868e03164eac11ab1fa9eac3ca4a30cd33a SHA256 82fdb75d44f1bbf1ee7930265a772dd13ebd314d389692c6788e9e2b4b116c87
-EBUILD vsftpd-2.0.6.ebuild 3044 RMD160 cf2e521ad9956cd0012d3f96142f94fdcf8224da SHA1 8b398867467e17bf923739214ce129f3badd8c9b SHA256 04be29d36f762c17711cfb0fed0beced92ec3d43cc3efc461742387b7c3cd8e9
+DIST vsftpd-2.1.2.tar.gz 180958 RMD160 7ec448d445218829401162d31f2910c933563d91 SHA1 dc67e28dd23808c0824105d24a8e426515496dfa SHA256 7964df745247897ed5f57901d4a24ac1ed2f2eafb08f9b5d181028d699b7fbe4
 EBUILD vsftpd-2.0.7-r1.ebuild 3044 RMD160 6a0d8b83e13fea5bf8b2a7f8003c0b0f18588ca3 SHA1 92bdbbc14060324db6893b27e5bb3fca534ecc14 SHA256 baee7c94d0f811b09045cf6552a93f0bfbe4eb3a77ca381c4e5aad8b21303488
-EBUILD vsftpd-2.1.0.ebuild 2985 RMD160 8fddc3db88d2dadacb716ff7f2ec50c8a74581c3 SHA1 e38fd735fd2d246d268c567ce282e5f8d52f2fef SHA256 56b6cb30b77e36bf6ba01f7f865545602ebb57fd01a483d9310ae3130319181d
-MISC ChangeLog 15981 RMD160 52da302b64eb9d7defea43c707ce98ffdbfb09c6 SHA1 e1431d0d04f50589b0f830f2897ebe891078bc08 SHA256 dbca023893d6509ee6a7cffd509d74eaa60f4fc3eab3e639300605f03881f492
+EBUILD vsftpd-2.1.0-r1.ebuild 2903 RMD160 c24a353606a41e58580c0b7b2aeff9cf18ccfcf2 SHA1 97e8745c659384a88f5e8a46ee674819b5102b14 SHA256 639b42f9827a12034fbd8941ca91bc3b4c3dad4b4d4fe954c7d562ebe1406c7e
+EBUILD vsftpd-2.1.2.ebuild 2910 RMD160 f0e796918dd4b90312d346d00c8733b852ae0f8e SHA1 1123705c7ab58024d2811cdd69c97592fe13b783 SHA256 5fdf9617ac727881e7a42e81455637a19a51961f7d0185724271f2271c7d2bc7
+MISC ChangeLog 16355 RMD160 8aa16e907080a556d27adc2db763ca776dec5412 SHA1 cf7383ef5d8b2122696666ec365cc71eca1a64ca SHA256 66b8cd01365bae48e55dda9d48ea3fce81625b28dfa8a774f471b2fa34c54f42
 MISC metadata.xml 461 RMD160 278f77b63e921b04c1f5dbba5ccdce9a9ea102ba SHA1 ab6b6b939d90e49d290a562dda3a053b9aaba3bd SHA256 c317698005dced22f4bfe2b4cc97d1671db4ba337d6452501e842c385ae9a433
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
 }