| 1 |
armin76 08/02/26 17:39:48 |
| 2 |
|
| 3 |
Added: vsftpd-2.0.6-caps.patch vsftpd-2.0.6-libcap1.patch |
| 4 |
Removed: vsftpd-2.0.5-caps.patch |
| 5 |
Log: |
| 6 |
Finally fix the libcap mess, bug #210478 |
| 7 |
(Portage version: 2.1.4.4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: vsftpd-2.0.6-caps.patch |
| 16 |
=================================================================== |
| 17 |
diff -ur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c |
| 18 |
--- vsftpd-2.0.5.orig/sysdeputil.c 2007-01-05 17:58:28.000000000 +0000 |
| 19 |
+++ vsftpd-2.0.5/sysdeputil.c 2007-01-05 17:55:30.000000000 +0000 |
| 20 |
@@ -154,11 +154,8 @@ |
| 21 |
#include <sys/capability.h> |
| 22 |
|
| 23 |
#if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP) |
| 24 |
-#include <linux/unistd.h> |
| 25 |
#include <linux/capability.h> |
| 26 |
-#include <errno.h> |
| 27 |
-#include <syscall.h> |
| 28 |
-_syscall2(int, capset, cap_user_header_t, header, const cap_user_data_t, data) |
| 29 |
+#include <sys/syscall.h> |
| 30 |
/* Gross HACK to avoid warnings - linux headers overlap glibc headers */ |
| 31 |
#undef __NFDBITS |
| 32 |
#undef __FDMASK |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.1 net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch?rev=1.1&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch?rev=1.1&content-type=text/plain |
| 40 |
|
| 41 |
Index: vsftpd-2.0.6-libcap1.patch |
| 42 |
=================================================================== |
| 43 |
diff -ur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c |
| 44 |
--- vsftpd-2.0.5.orig/sysdeputil.c 2007-01-05 17:58:28.000000000 +0000 |
| 45 |
+++ vsftpd-2.0.5/sysdeputil.c 2007-01-05 17:55:30.000000000 +0000 |
| 46 |
@@ -508,6 +505,18 @@ |
| 47 |
} |
| 48 |
|
| 49 |
#ifndef VSF_SYSDEP_HAVE_LIBCAP |
| 50 |
+ |
| 51 |
+static int |
| 52 |
+capset(struct __user_cap_header_struct *header, |
| 53 |
+ const struct __user_cap_data_struct *data); |
| 54 |
+ |
| 55 |
+static int |
| 56 |
+capset(struct __user_cap_header_struct *header, |
| 57 |
+ const struct __user_cap_data_struct *data) |
| 58 |
+{ |
| 59 |
+ return syscall(__NR_capset, header, data); |
| 60 |
+} |
| 61 |
+ |
| 62 |
static int |
| 63 |
do_checkcap(void) |
| 64 |
{ |
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
-- |
| 69 |
gentoo-commits@l.g.o mailing list |
Archives