diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-25 06:55:56 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-25 06:55:56 +0000 |
| commit | 7da0823d27eedeb665d59f106f704cdf79ac6cd6 (patch) | |
| tree | c03c2bd16d0811f983b63d6de480cf9a1c9b1fcf /packages/vsftpd | |
| parent | 72edffd0fb9f14bafb3d025d8739dc06ca44f560 (diff) | |
| parent | db6f1c786efb1b7ffec5f84b8a11c6066370c59c (diff) | |
merge of '1edfaf9475dc24132fc44dd0420ed442888b7467'
and '3524b1de858df7cc6c88667817fb70332cf4b03e'
Diffstat (limited to 'packages/vsftpd')
| -rw-r--r-- | packages/vsftpd/vsftpd-2.0.5/syscall.patch | 12 | ||||
| -rw-r--r-- | packages/vsftpd/vsftpd_2.0.5.bb | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/packages/vsftpd/vsftpd-2.0.5/syscall.patch b/packages/vsftpd/vsftpd-2.0.5/syscall.patch new file mode 100644 index 0000000000..b91cd5392b --- /dev/null +++ b/packages/vsftpd/vsftpd-2.0.5/syscall.patch @@ -0,0 +1,12 @@ +Index: vsftpd-2.0.5/sysdeputil.c +=================================================================== +--- vsftpd-2.0.5.orig/sysdeputil.c 2007-05-20 21:20:01.000000000 +0200 ++++ vsftpd-2.0.5/sysdeputil.c 2007-05-20 21:20:28.000000000 +0200 +@@ -159,7 +159,6 @@ + #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 diff --git a/packages/vsftpd/vsftpd_2.0.5.bb b/packages/vsftpd/vsftpd_2.0.5.bb index 81aec46845..fc10d27f08 100644 --- a/packages/vsftpd/vsftpd_2.0.5.bb +++ b/packages/vsftpd/vsftpd_2.0.5.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Secure ftp daemon" SECTION = "console/network" LICENSE = "GPL" -DEPENDS = "openssl" -PR = "r0" +PR = "r1" SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \ file://makefile.patch;patch=1 \ file://nopam.patch;patch=1 \ + file://syscall.patch;patch=1 \ file://init \ file://vsftpd.conf" @@ -20,7 +20,7 @@ do_configure() { } do_compile() { - oe_runmake "LIBS=-lssl -lcrypto -lcrypt -L${STAGING_LIBDIR}" + oe_runmake "LIBS=-lcrypt -L${STAGING_LIBDIR}" } do_install() { |