Need new version of caps-disabling patch to apply cleanly to 2.2.0

  (bug #282494, reported by Sergey Plyukhin)
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 32 insertions, 5 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 08cbbe6b5f11..51cf4e6d953b 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.117 2009/08/23 16:11:13 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.118 2009/08/24 05:37:00 wormo Exp $
+
+  24 Aug 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  +files/vsftpd-2.2.0-dont-link-caps.patch:
+  Need new version of caps-disabling patch to apply cleanly to 2.2.0
+  (bug #282494, reported by Sergey Plyukhin)
 
 *vsftpd-2.2.0 (23 Aug 2009)
 
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 2edbd77cb7c0..0c1a229dfb4c 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -6,6 +6,7 @@ AUX vsftpd-2.1.0-caps.patch 575 RMD160 a7b27df472ccbb5068d5f9961fe6bb010063e98c
 AUX vsftpd-2.1.0-dont-link-caps.patch 682 RMD160 fff89775de0d95562603b890e181703acb5dd6ce SHA1 c18bc7639643fe2b1ea91717d97eae191e73660c SHA256 6662a7961043e2888ff377a7689b31934f75d0ebf4bfad916a5432ff05cfcb52
 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-2.2.0-dont-link-caps.patch 806 RMD160 670bfa8433ea5c9769d238aaebb9fce1d43e9e40 SHA1 d28260190d4613dae798d0f09d267be1ffcbc0a7 SHA256 fd164d4702ae866cb06ad245653b4f25c73d1d701a211b1f972b45b98ab55dd2
 AUX vsftpd-2.2.0-gentoo.patch 11049 RMD160 ef4fafea61a4ecf37d771f2da75bb10570dec898 SHA1 8846603f85f9515a154cfd8c1823c3e2e4e7e0e9 SHA256 e1737c941837aaf8e060a649903934174528704feffd100f86180a7ec68f3760
 AUX vsftpd.conf 3842 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 SHA1 ebd5847bb328d8df188d85ffc5ccd7fcd5983525 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0
 AUX vsftpd.init 1922 RMD160 50925ca15a4f94662790244546454c523b6e4f95 SHA1 ef453f4925e941e21075be678387076e57246b3d SHA256 78941ea7744d65d4674b4df8ecee6df91e6ed601c47d64ce1f489af56ea250e2
@@ -18,6 +19,6 @@ DIST vsftpd-2.2.0.tar.gz 184700 RMD160 9acb3a0e3102dde0d587ee9ad5d4ccb8b731e1ef
 EBUILD vsftpd-2.0.7-r1.ebuild 3044 RMD160 6a0d8b83e13fea5bf8b2a7f8003c0b0f18588ca3 SHA1 92bdbbc14060324db6893b27e5bb3fca534ecc14 SHA256 baee7c94d0f811b09045cf6552a93f0bfbe4eb3a77ca381c4e5aad8b21303488
 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
-EBUILD vsftpd-2.2.0.ebuild 2904 RMD160 ea89aa31da7227be9a7178f051c30a1ab76d416b SHA1 4ace6c999715a7a23f44da1edb230a1cb27c2edf SHA256 da580bf1ebcbbb0f568a4da16f16f882c0af53a3926ed62d3435dd0e930d0f12
-MISC ChangeLog 16521 RMD160 cb6e50962c64f8ffdff848e5f8512c50deb3485d SHA1 9557a04b07760e673928ac3592bb3f6a0ef03b5f SHA256 2c89ae47cc74709ed6f77adb4e2d34891d0f7b726e392fbdfe06f09948c18a3d
+EBUILD vsftpd-2.2.0.ebuild 2894 RMD160 10e0682607be1377e077f539bcb734028aa54933 SHA1 adee87e81acbbba946c006a51729b6652b6ba1c2 SHA256 1efd258b38a62de2c257bf90347efa91e271726bc79e952e984937f0e9a03547
+MISC ChangeLog 16737 RMD160 764a493d3f04e9e8b40f44ed399d7d09158dab69 SHA1 4a84dd025a9213845dd2a750cb32a91ff3d55f76 SHA256 a319aadbdbbb67c4785e46074aafcbaa52802ecf8c980ec0eeace38df3398cdb
 MISC metadata.xml 358 RMD160 f8ffc0942c689c54a62b078a9a5bcd44702a5e68 SHA1 a252bf60d812dad06cbe00c324671cfba7b4e991 SHA256 cdc354a30f912a068432b3de197b3886ac05661869e7a0f67ac29f1da04b3b0d
diff --git a/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch
new file mode 100644
index 000000000000..debcf06279e3
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch
@@ -0,0 +1,21 @@
+diff -ur vsftpd-2.2.0.orig/vsf_findlibs.sh vsftpd-2.2.0/vsf_findlibs.sh
+--- vsftpd-2.2.0.orig/vsf_findlibs.sh	2009-08-23 22:15:39.000000000 -0700
++++ vsftpd-2.2.0/vsf_findlibs.sh	2009-08-23 22:16:31.000000000 -0700
+@@ -44,17 +44,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";
+-  locate_library /lib64/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.2.0.ebuild b/net-ftp/vsftpd/vsftpd-2.2.0.ebuild
index bdd57d0a30ce..12ab4b9b98e9 100644
--- a/net-ftp/vsftpd/vsftpd-2.2.0.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.2.0.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.2.0.ebuild,v 1.1 2009/08/23 16:11:13 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.2.0.ebuild,v 1.2 2009/08/24 05:37:00 wormo Exp $
 
 inherit eutils toolchain-funcs
 
@@ -40,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
-		epatch "${FILESDIR}"/${PN}-2.1.2-dont-link-caps.patch
+		epatch "${FILESDIR}"/${P}-dont-link-caps.patch
 	fi
 
 	# Let portage control stripping