diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2008-02-26 17:39:47 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2008-02-26 17:39:47 +0000 |
| commit | bc7c964be1034d17cfa413f8f9af666377d83630 (patch) | |
| tree | d4a19b447823acc8da6b8301bb2de87819dd01fc /net-ftp/vsftpd/files | |
| parent | Duplicate license file (see bug #211534) (diff) | |
| download | historical-bc7c964be1034d17cfa413f8f9af666377d83630.tar.gz historical-bc7c964be1034d17cfa413f8f9af666377d83630.tar.bz2 historical-bc7c964be1034d17cfa413f8f9af666377d83630.zip | |
Finally fix the libcap mess, bug #210478
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-ftp/vsftpd/files')
| -rw-r--r-- | net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch (renamed from net-ftp/vsftpd/files/vsftpd-2.0.5-caps.patch) | 19 | ||||
| -rw-r--r-- | net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch | 22 |
2 files changed, 22 insertions, 19 deletions
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) + { |