vsftpd: removed syscall patch, new dependency libcap

This commit is contained in:
Juergen Daubert 2008-10-28 13:27:53 +01:00
parent 8efb1f620b
commit a94ed4d4e8
3 changed files with 3 additions and 42 deletions

View File

@ -1,4 +1,3 @@
7a0ece0af8aefad4313270a8786e041e vsftpd
3e39cb7b0bee306ad7df8e3552e15297 vsftpd-2.0.7.tar.gz
d69ea2c7fe28d63a586f47deb5ea7726 vsftpd-config.patch
50909902ac4ee17700ae9f3cc712485b vsftpd-syscall.patch

View File

@ -1,18 +1,17 @@
# Description: Probably the most secure and fastest FTP server
# URL: http://vsftpd.beasts.org
# Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de
# Depends on: openssl
# Depends on: openssl libcap
name=vsftpd
version=2.0.7
release=1
release=2
source=(ftp://vsftpd.beasts.org/users/cevans/$name-$version.tar.gz \
$name-config.patch $name-syscall.patch vsftpd)
$name-config.patch vsftpd)
build () {
cd $name-$version
patch -p1 -i $SRC/$name-syscall.patch
patch -p1 -i $SRC/$name-config.patch
make

View File

@ -1,37 +0,0 @@
http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/
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 <sys/capability.h>
#if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP)
-#include <linux/unistd.h>
#include <linux/capability.h>
-#include <errno.h>
-#include <syscall.h>
-_syscall2(int, capset, cap_user_header_t, header, const cap_user_data_t, data)
+#include <sys/syscall.h>
/* 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)
{