Finally fix the libcap mess, bug #210478

(Portage version: 2.1.4.4)

5 files changed, 35 insertions, 24 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 48c2c03998a3..211a7d8b1efc 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.91 2008/02/21 17:28:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.92 2008/02/26 17:39:46 armin76 Exp $
+
+  26 Feb 2008; Raúl Porcel <armin76@gentoo.org>
+  -files/vsftpd-2.0.5-caps.patch, +files/vsftpd-2.0.6-caps.patch,
+  +files/vsftpd-2.0.6-libcap1.patch, vsftpd-2.0.5-r3.ebuild,
+  vsftpd-2.0.6.ebuild:
+  Finally fix the libcap mess, bug #210478
 
   21 Feb 2008; Raúl Porcel <armin76@gentoo.org> vsftpd-2.0.5-r3.ebuild,
   vsftpd-2.0.6.ebuild:
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.5-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch
index 7eb76cc338d7..fed9f8a3809b 100644
--- a/net-ftp/vsftpd/files/vsftpd-2.0.5-caps.patch
+++ b/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch
@@ -14,22 +14,3 @@ diff -ur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c
  /* Gross HACK to avoid warnings - linux headers overlap glibc headers */
  #undef __NFDBITS
  #undef __FDMASK
-@@ -508,6 +505,18 @@
- }
-   
-   #ifndef VSF_SYSDEP_HAVE_LIBCAP
-+
-+static int
-+capset(struct __user_cap_header_struct *header,
-+       const struct __user_cap_data_struct *data);
-+
-+static int
-+capset(struct __user_cap_header_struct *header,
-+       const struct __user_cap_data_struct *data)
-+{
-+  return syscall(__NR_capset, header, data);
-+}
-+
- static int
- do_checkcap(void)
- {
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch b/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch
new file mode 100644
index 000000000000..467a7fb01220
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch
@@ -0,0 +1,22 @@
+diff -ur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c
+--- vsftpd-2.0.5.orig/sysdeputil.c	2007-01-05 17:58:28.000000000 +0000
++++ vsftpd-2.0.5/sysdeputil.c	2007-01-05 17:55:30.000000000 +0000
+@@ -508,6 +505,18 @@
+ }
+   
+   #ifndef VSF_SYSDEP_HAVE_LIBCAP
++
++static int
++capset(struct __user_cap_header_struct *header,
++       const struct __user_cap_data_struct *data);
++
++static int
++capset(struct __user_cap_header_struct *header,
++       const struct __user_cap_data_struct *data)
++{
++  return syscall(__NR_capset, header, data);
++}
++
+ static int
+ do_checkcap(void)
+ {
diff --git a/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild b/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild
index 53e23d1f6e4e..87c22c0c0591 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.5-r3.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/vsftpd/vsftpd-2.0.5-r3.ebuild,v 1.3 2008/02/21 17:28:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild,v 1.4 2008/02/26 17:39:46 armin76 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -31,7 +31,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch"
 
 	# Fix building without the libcap
-	! use caps && epatch "${FILESDIR}/${P}-caps.patch"
+	epatch "${FILESDIR}/${PN}-2.0.6-caps.patch"
+	has_version "<sys-libs/libcap-2" && epatch "${FILESDIR}"/${PN}-2.0.6-libcap1.patch
 
 	# Fix anon umask uploads, #183213.
 	epatch "${FILESDIR}/${P}-anon-upload-umask.patch"
diff --git a/net-ftp/vsftpd/vsftpd-2.0.6.ebuild b/net-ftp/vsftpd/vsftpd-2.0.6.ebuild
index 198bf1ae0d21..da7a495b4427 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.6.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.6.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/vsftpd/vsftpd-2.0.6.ebuild,v 1.2 2008/02/21 17:28:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.6.ebuild,v 1.3 2008/02/26 17:39:46 armin76 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -31,7 +31,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch"
 
 	# Fix building without the libcap
-	! use caps && epatch "${FILESDIR}/${PN}-2.0.5-caps.patch"
+	epatch "${FILESDIR}/${PN}-2.0.6-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