From 43ba7c1af8f89be7092516cada8e95e147f79e72 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2011 09:39:19 -0300 Subject: proftpd: security bump to version 1.3.3g Security bump version to 1.3.3g, fix for CVE-2011-4130 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...proftpd-1.3.3e-fix-kernel-header-capability-version.patch | 12 ------------ ...proftpd-1.3.3g-fix-kernel-header-capability-version.patch | 12 ++++++++++++ package/proftpd/proftpd.mk | 3 ++- 3 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 package/proftpd/proftpd-1.3.3e-fix-kernel-header-capability-version.patch create mode 100644 package/proftpd/proftpd-1.3.3g-fix-kernel-header-capability-version.patch (limited to 'package/proftpd') diff --git a/package/proftpd/proftpd-1.3.3e-fix-kernel-header-capability-version.patch b/package/proftpd/proftpd-1.3.3e-fix-kernel-header-capability-version.patch deleted file mode 100644 index 4401c9aea..000000000 --- a/package/proftpd/proftpd-1.3.3e-fix-kernel-header-capability-version.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/lib/libcap/libcap.h 2008-08-22 19:49:48.000000000 -0700 -+++ b/lib/libcap/libcap.h 2010-10-06 15:31:11.000000000 -0700 -@@ -65,7 +65,8 @@ struct _cap_struct { - */ - - #if !defined(_LINUX_CAPABILITY_VERSION_1) || \ -- (_LINUX_CAPABILITY_VERSION_1 != 0x19980330) -+ ((_LINUX_CAPABILITY_VERSION_1 != 0x19980330) && \ -+ (_LINUX_CAPABILITY_VERSION_1 != 0x20071026)) - - # error "Kernel does not match library" - # error "file "libcap.h" --> fix and recompile libcap" diff --git a/package/proftpd/proftpd-1.3.3g-fix-kernel-header-capability-version.patch b/package/proftpd/proftpd-1.3.3g-fix-kernel-header-capability-version.patch new file mode 100644 index 000000000..4401c9aea --- /dev/null +++ b/package/proftpd/proftpd-1.3.3g-fix-kernel-header-capability-version.patch @@ -0,0 +1,12 @@ +--- a/lib/libcap/libcap.h 2008-08-22 19:49:48.000000000 -0700 ++++ b/lib/libcap/libcap.h 2010-10-06 15:31:11.000000000 -0700 +@@ -65,7 +65,8 @@ struct _cap_struct { + */ + + #if !defined(_LINUX_CAPABILITY_VERSION_1) || \ +- (_LINUX_CAPABILITY_VERSION_1 != 0x19980330) ++ ((_LINUX_CAPABILITY_VERSION_1 != 0x19980330) && \ ++ (_LINUX_CAPABILITY_VERSION_1 != 0x20071026)) + + # error "Kernel does not match library" + # error "file "libcap.h" --> fix and recompile libcap" diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 2523dd20d..5352ea717 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -3,7 +3,8 @@ # proftpd # ############################################################# -PROFTPD_VERSION = 1.3.3e + +PROFTPD_VERSION = 1.3.3g PROFTPD_SOURCE = proftpd-$(PROFTPD_VERSION).tar.bz2 PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source/ -- cgit v1.2.3