Fix bug #218850.

Package-Manager: portage-2.1.5_rc6

4 files changed, 25 insertions, 4 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index bf90e881251b..053533c4c6ba 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.169 2008/04/21 09:48:27 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.170 2008/04/24 18:04:56 chtekk Exp $
+
+  24 Apr 2008; Luca Longinotti <chtekk@gentoo.org>
+  +files/proftpd-1.3.1-bug218850.patch, proftpd-1.3.1.ebuild:
+  Fix bug #218850.
 
   21 Apr 2008; Luca Longinotti <chtekk@gentoo.org> metadata.xml:
   Metadata update.
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index c78e5aa1fd4d..2ee1abf6403a 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,4 +1,5 @@
 AUX proftpd-1.3.1-bug208840.patch 1000 RMD160 f8cc6aadf4496c3d88a2968d18479f021d40abb8 SHA1 4de215408ec6be835133c41db3015f4dd24a7774 SHA256 b0c0d16ffaeb12e118c929e535e5d8297b8265894ee80b4c8ea32c8c0f0fbb5e
+AUX proftpd-1.3.1-bug218850.patch 482 RMD160 934f1a9efdae189df9b30390d1b579a96a7ed99e SHA1 6a4c5225de5a15958868eca42cc44e034e5b28df SHA256 383c1146f40d57845532147e0c28f8df4b116603e6d089d46c5b4c5691f62be4
 AUX proftpd-1.3.1_rc2-bug164612.patch 779 RMD160 3bb73beff421ff27d153a6051299ada6bc532330 SHA1 cbf74c1c6a2ed794b1558e39cc85a41650bac21d SHA256 68b0bb47c3f46b931ff1887f299028803a15888641dfaad47865615bb0d6952c
 AUX proftpd-1.3.1_rc2-bug167003.patch 316 RMD160 7fcade6de378727081d0a14775b2e240f2a5aa31 SHA1 14439ace9c84932c460df3baace3fcbb10968c03 SHA256 55b87a0da8df2c4f257cbeb090d7a6fafda142a9db88c97728281358ac4792ff
 AUX proftpd-1.3.1_rc2-bug175082.patch 9671 RMD160 ab5144464b0b0c618ed51d1907694a56f2f72f5c SHA1 65ea3a861dc493439a8b2e2d3271dba57825bbac SHA256 018077db323cb370dd68fb30c284090316a041f53e02e07478cb1e07e22f30dc
@@ -17,7 +18,7 @@ DIST proftpd-mod-deflate-0.3.tar.gz 7704 RMD160 dd51a966942642b2a5ae1cd1c3b3b6f4
 DIST proftpd-mod-shaper-0.6.2.tar.gz 19002 RMD160 3d1fdb82596672c9177009ebb30459a017e74c53 SHA1 930d6dc6b8785da48dc7102db5f1eb20546ccd75 SHA256 59f39bca40462c3bba20feb7be031d7453c366adb4b7fa6d8f50974eb45ae99e
 DIST proftpd-mod-shaper-0.6.3.tar.gz 19040 RMD160 9978fda37d0099c48d755e53132482506c948c05 SHA1 a5c9a1889c441b9290f2c571ad7fc06bebaf9326 SHA256 a6947836461872adca53dab2708b1e140fa6ce7a8b93ccbe2dafbc3ca63fde67
 DIST proftpd-mod-vroot-0.7.2.tar.gz 6071 RMD160 b152162b3714910d5b9378611313041c3e7e17d4 SHA1 3fc4c5874deba4bbe989b0bd54a7478a47f3d876 SHA256 cab5a42390eac4e0b8bdcbe1e6d15804c8029d51da9ad3bd428b46a80cd69d5a
-EBUILD proftpd-1.3.1.ebuild 6887 RMD160 fc5f9a852511621607f7ec594846d53550edbc13 SHA1 0ebae0110cc9e3507a6498afbebda94f9e03e330 SHA256 deea88acc377fd1e40b010d68a5768309277d7c8a203d63e0a88c4aaadfaac2b
+EBUILD proftpd-1.3.1.ebuild 6951 RMD160 f2d030f82d5c73d2312d413aa9ba2f9f8174219d SHA1 69618caa7299ec3a9b4ae935aa71b0096b937b62 SHA256 f8b1ba70aba8cbb6c5b296731e0ed748c7659eac3935ffe2758df0c3363dab1f
 EBUILD proftpd-1.3.1_rc2-r3.ebuild 6340 RMD160 f199bb8c2b239237e50020d6c06b9f55b48b1105 SHA1 7f387d202c3d7cfcf4abaaf3a0594b1fdf41e498 SHA256 3caf1efa45d4a4de7006bb369a5cff0607387dc256eecc79bcee30d843314e2f
-MISC ChangeLog 27863 RMD160 bbe82e3a9059ee7baba846ada998f27bcb1e854a SHA1 db0f4d45f8ffea2ad0fbfccec4cae8abac42a28a SHA256 58ea90bfe2c122554e70fd08ff781ba4daee894c9402200ddf01a184be601e76
+MISC ChangeLog 27996 RMD160 7ec663e4020d01979194322fa68d426247a84d8c SHA1 8bc5ceafcb99b800acc8e0308500fb01172f329d SHA256 4ea4fe18035348a39500abf63ff85916ac5da7111d83d6abb2d8a2cb62419489
 MISC metadata.xml 427 RMD160 3556b7a0e59208cd27f428249f788cd1d69b65ad SHA1 b9a09ae205d90f6bf655dbca9a559bc8743acaf7 SHA256 83315ac9ba181d9d4a7084a305824a844e32980c92dcf29025aef5689995326a
diff --git a/net-ftp/proftpd/files/proftpd-1.3.1-bug218850.patch b/net-ftp/proftpd/files/proftpd-1.3.1-bug218850.patch
new file mode 100644
index 000000000000..3e2adf34ea5c
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.1-bug218850.patch
@@ -0,0 +1,12 @@
+--- lib/libcap/libcap.h	2008-04-24 19:46:29.475883739 +0200
++++ lib/libcap/libcap.h	2008-04-24 19:48:31.116088563 +0200
+@@ -52,7 +52,8 @@
+  */
+ 
+ #if !defined(_LINUX_CAPABILITY_VERSION) || \
+-            (_LINUX_CAPABILITY_VERSION != 0x19980330)
++           ((_LINUX_CAPABILITY_VERSION != 0x19980330) && \
++            (_LINUX_CAPABILITY_VERSION != 0x20071026))
+ 
+ # error "Kernel <linux/capability.h> does not match library"
+ # error "file "libcap.h" --> fix and recompile libcap"
diff --git a/net-ftp/proftpd/proftpd-1.3.1.ebuild b/net-ftp/proftpd/proftpd-1.3.1.ebuild
index 9de5a79d7996..b8faf7d85d01 100644
--- a/net-ftp/proftpd/proftpd-1.3.1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1.ebuild,v 1.2 2008/04/17 09:32:05 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1.ebuild,v 1.3 2008/04/24 18:04:56 chtekk Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -93,8 +93,12 @@ src_unpack() {
 		cp -f mod_vroot/mod_vroot.html doc/
 	fi
 
+	# Fix bug #218850
+	epatch "${FILESDIR}/${P}-bug218850.patch"
+
 	# Fix bug #208840
 	epatch "${FILESDIR}/${P}-bug208840.patch"
+
 	eautoreconf
 }