vsftpd: added patch for glibc 2.5
This commit is contained in:
parent
4b7aa11b89
commit
64f1376ec2
@ -1,3 +1,4 @@
|
|||||||
7a0ece0af8aefad4313270a8786e041e vsftpd
|
7a0ece0af8aefad4313270a8786e041e vsftpd
|
||||||
|
668dc128803434f149894834742fc543 vsftpd-2.0.5-syscall.patch
|
||||||
146062e8b2f93af43ff6c2c770feea94 vsftpd-2.0.5.tar.gz
|
146062e8b2f93af43ff6c2c770feea94 vsftpd-2.0.5.tar.gz
|
||||||
3376ee576fefef23d07b79ac1995710d vsftpd-config.patch
|
3376ee576fefef23d07b79ac1995710d vsftpd-config.patch
|
||||||
|
@ -5,13 +5,14 @@
|
|||||||
|
|
||||||
name=vsftpd
|
name=vsftpd
|
||||||
version=2.0.5
|
version=2.0.5
|
||||||
release=1
|
release=2
|
||||||
source=(ftp://vsftpd.beasts.org/users/cevans/$name-$version.tar.gz \
|
source=(ftp://vsftpd.beasts.org/users/cevans/$name-$version.tar.gz \
|
||||||
$name-config.patch vsftpd)
|
$name-config.patch $name-$version-syscall.patch vsftpd)
|
||||||
|
|
||||||
build () {
|
build () {
|
||||||
cd $name-$version
|
cd $name-$version
|
||||||
patch -p1 < $SRC/$name-config.patch
|
patch -p1 -i $SRC/$name-$version-syscall.patch
|
||||||
|
patch -p1 -i $SRC/$name-config.patch
|
||||||
make
|
make
|
||||||
make DESTDIR=$PKG install
|
make DESTDIR=$PKG install
|
||||||
|
|
||||||
|
29
vsftpd/vsftpd-2.0.5-syscall.patch
Normal file
29
vsftpd/vsftpd-2.0.5-syscall.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
# See http://www.mail-archive.com/lfs-dev@linuxfromscratch.org/msg08600.html
|
||||||
|
|
||||||
|
diff -pNur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c
|
||||||
|
--- vsftpd-2.0.5.orig/sysdeputil.c 2006-07-02 15:14:10.000000000 -0700
|
||||||
|
+++ vsftpd-2.0.5/sysdeputil.c 2006-10-19 23:41:58.000000000 -0700
|
||||||
|
@@ -155,14 +155,15 @@
|
||||||
|
#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)
|
||||||
|
-/* Gross HACK to avoid warnings - linux headers overlap glibc headers */
|
||||||
|
-#undef __NFDBITS
|
||||||
|
-#undef __FDMASK
|
||||||
|
+#include <sys/syscall.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
+int capset(cap_user_header_t header,
|
||||||
|
+ cap_user_data_t data)
|
||||||
|
+{
|
||||||
|
+ return syscall(SYS_capset, header, data);
|
||||||
|
+}
|
||||||
|
#endif /* VSF_SYSDEP_HAVE_CAPABILITIES */
|
||||||
|
|
||||||
|
#if defined(VSF_SYSDEP_HAVE_LINUX_SENDFILE) || \
|
||||||
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user