From: Roy Marples Date: Sun, 14 Jan 2007 08:33:45 +0000 (+0000) Subject: Fix building without the caps USE flag, #159488. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c594e82f229c91213109a6035b364fe8ad3e3e89;p=gentoo.git Fix building without the caps USE flag, #159488. Package-Manager: portage-2.1.2_rc4-r8 --- diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog index dbbac77aa86f..d91156e64c03 100644 --- a/net-ftp/vsftpd/ChangeLog +++ b/net-ftp/vsftpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/vsftpd -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.76 2006/11/23 14:06:44 uberlord Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.77 2007/01/14 08:33:45 uberlord Exp $ + + 14 Jan 2007; Roy Marples + +files/vsftpd-2.0.5-caps.patch, vsftpd-2.0.5.ebuild: + Fix building without the caps USE flag, #159488. 23 Nov 2006; Roy Marples vsftpd-2.0.5.ebuild: Support cross compiling, #155975 thanks to Attila Fazekas. diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest index 6c43d6140006..290c2bf59fe5 100644 --- a/net-ftp/vsftpd/Manifest +++ b/net-ftp/vsftpd/Manifest @@ -2,6 +2,10 @@ AUX vsftpd-2.0.3-gentoo.patch 7128 RMD160 99ef0aee94847405e6185cc95acbc72cba0df0 MD5 2008f701278d9e59c755433c8e987606 files/vsftpd-2.0.3-gentoo.patch 7128 RMD160 99ef0aee94847405e6185cc95acbc72cba0df0e0 files/vsftpd-2.0.3-gentoo.patch 7128 SHA256 8f3215d43948364d431312dd4109af09e9a83ebbafb7a1c388f2aefea4df9154 files/vsftpd-2.0.3-gentoo.patch 7128 +AUX vsftpd-2.0.5-caps.patch 1028 RMD160 258d8ac081d587738e198d4778f23b282c684f02 SHA1 dc375c1873be5cf26e11765a339781c37aa00af7 SHA256 43c6bd0e2fde1b28e6733162d6570c3bf22109a1edd4597057a164e49e57bd90 +MD5 b1804da1008a147d53d5f3bea50b3509 files/vsftpd-2.0.5-caps.patch 1028 +RMD160 258d8ac081d587738e198d4778f23b282c684f02 files/vsftpd-2.0.5-caps.patch 1028 +SHA256 43c6bd0e2fde1b28e6733162d6570c3bf22109a1edd4597057a164e49e57bd90 files/vsftpd-2.0.5-caps.patch 1028 AUX vsftpd.conf 3842 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 SHA1 ebd5847bb328d8df188d85ffc5ccd7fcd5983525 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0 MD5 d0f6c4bc146ade78fdcc3ecc94ffece2 files/vsftpd.conf 3842 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 files/vsftpd.conf 3842 @@ -18,20 +22,20 @@ AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325e MD5 8578d5c3f50e7b090ba023dfa626ec89 files/vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 files/vsftpd.xinetd 432 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f files/vsftpd.xinetd 432 -DIST vsftpd-2.0.4.tar.gz 154857 RMD160 e8f07c125c0c3a8f0d457b47fd0062d6431c480b SHA256 3bd3d8750460cf724b4589589eb37ab0d398f0c4d3d7492468c66d3617052af6 +DIST vsftpd-2.0.4.tar.gz 154857 RMD160 e8f07c125c0c3a8f0d457b47fd0062d6431c480b SHA1 6ffbcc08a91300664d527b3ac7c515421d5cd764 SHA256 3bd3d8750460cf724b4589589eb37ab0d398f0c4d3d7492468c66d3617052af6 DIST vsftpd-2.0.5.tar.gz 155985 RMD160 297c383aae9fd90f75d5d6a62b2ed5e54adf25d4 SHA1 9b6a079699aaeb01219665acf203c093f94faef0 SHA256 5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b EBUILD vsftpd-2.0.4-r1.ebuild 2866 RMD160 6e705c94776094aa5c0705bab7d3945e06b96e2c SHA1 a95926077d370760d50ca1b30c287008eb70d524 SHA256 b118ba0297c76bfcfc8dc7f5c49c3f4c2ba9131e1a91d9ec089eced0a9fa1fe9 MD5 e0aa86e4efb7660f393d5fae615e78ed vsftpd-2.0.4-r1.ebuild 2866 RMD160 6e705c94776094aa5c0705bab7d3945e06b96e2c vsftpd-2.0.4-r1.ebuild 2866 SHA256 b118ba0297c76bfcfc8dc7f5c49c3f4c2ba9131e1a91d9ec089eced0a9fa1fe9 vsftpd-2.0.4-r1.ebuild 2866 -EBUILD vsftpd-2.0.5.ebuild 2908 RMD160 edf1321ab4a57d218102c88b6071e2b8156ab2f7 SHA1 f8c7a39749ffd7844e159137c76f3cb0f3af30a9 SHA256 4aff76ecf5d279f293e280fcdca0de5e98f46f3bad18e051e3444634dff0fc3b -MD5 adf5ec9d27aabbb1b63a7346c1fbbb82 vsftpd-2.0.5.ebuild 2908 -RMD160 edf1321ab4a57d218102c88b6071e2b8156ab2f7 vsftpd-2.0.5.ebuild 2908 -SHA256 4aff76ecf5d279f293e280fcdca0de5e98f46f3bad18e051e3444634dff0fc3b vsftpd-2.0.5.ebuild 2908 -MISC ChangeLog 10833 RMD160 0ce778ca8bf84cd4caf5473457aceb87e5b59990 SHA1 1458002706c4b85e9ec94069481a75718d262ca9 SHA256 be1c36435b6dededc90302945155baf6516a951b99b26d2562985bb76a34a333 -MD5 f9601f5327d3fbdbf4bd242ee215d892 ChangeLog 10833 -RMD160 0ce778ca8bf84cd4caf5473457aceb87e5b59990 ChangeLog 10833 -SHA256 be1c36435b6dededc90302945155baf6516a951b99b26d2562985bb76a34a333 ChangeLog 10833 +EBUILD vsftpd-2.0.5.ebuild 2981 RMD160 7774c65f11dd507d6369af880edf0b65f0904b7e SHA1 94c49c7c6f5bcd30db073b2764fca587810ef123 SHA256 e5a57a5a287807efdc33322884e31eb26757be2f30f9a37b94c3c99692929c5f +MD5 3318794c66bac2de0986d971b6a691d8 vsftpd-2.0.5.ebuild 2981 +RMD160 7774c65f11dd507d6369af880edf0b65f0904b7e vsftpd-2.0.5.ebuild 2981 +SHA256 e5a57a5a287807efdc33322884e31eb26757be2f30f9a37b94c3c99692929c5f vsftpd-2.0.5.ebuild 2981 +MISC ChangeLog 10989 RMD160 673ce8d2cfb62dc225805b8cab5a8bd540894250 SHA1 1f6858c84dc290636e8f92810f914a490e1bf4c6 SHA256 30d7c8685b3b005780153a93b1c21314bdecf155b3ecb062b6c966b9f2760d85 +MD5 848989d5394a0346d98f4fd4f5f53676 ChangeLog 10989 +RMD160 673ce8d2cfb62dc225805b8cab5a8bd540894250 ChangeLog 10989 +SHA256 30d7c8685b3b005780153a93b1c21314bdecf155b3ecb062b6c966b9f2760d85 ChangeLog 10989 MISC metadata.xml 344 RMD160 eced9ee76c578ea2a2e96bc811ca610a6f40dbe4 SHA1 0cc8df9a4f8096179966d4c10b45715dcfdc600b SHA256 7737cc6af0c310b6f7aedd541391f1546f3dca50a900f6a49877d04a470ec6f0 MD5 0451b23327c004752edf415e25931d07 metadata.xml 344 RMD160 eced9ee76c578ea2a2e96bc811ca610a6f40dbe4 metadata.xml 344 diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.5-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.0.5-caps.patch new file mode 100644 index 000000000000..7eb76cc338d7 --- /dev/null +++ b/net-ftp/vsftpd/files/vsftpd-2.0.5-caps.patch @@ -0,0 +1,35 @@ +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 +@@ -154,11 +154,8 @@ + #include + + #if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP) +-#include + #include +-#include +-#include +-_syscall2(int, capset, cap_user_header_t, header, const cap_user_data_t, data) ++#include + /* 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/vsftpd-2.0.5.ebuild b/net-ftp/vsftpd/vsftpd-2.0.5.ebuild index 0f03e63fe5a0..9fe1dde54904 100644 --- a/net-ftp/vsftpd/vsftpd-2.0.5.ebuild +++ b/net-ftp/vsftpd/vsftpd-2.0.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.ebuild,v 1.2 2006/11/23 14:06:44 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.5.ebuild,v 1.3 2007/01/14 08:33:45 uberlord Exp $ inherit eutils toolchain-funcs @@ -30,7 +30,10 @@ src_unpack() { cd "${S}" # Patch the source, config and the manpage to use /etc/vsftpd/ - epatch "${FILESDIR}/vsftpd-2.0.3-gentoo.patch" + epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch" + + # Fix building without the libcap + epatch "${FILESDIR}/${P}-caps.patch" # Configure vsftpd build defaults use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h