projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b7876e7)
proftpd: bump version
authorPeter Korsgaard <jacmet@sunsite.dk>
Mon, 18 Jul 2011 14:01:37 +0000 (16:01 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Mon, 18 Jul 2011 14:01:37 +0000 (16:01 +0200)
Fixes several security-related issues.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/proftpd/proftpd-1.3.3b-fix-kernel-header-capability-version.patch [deleted file] patch | blob | history
package/proftpd/proftpd-1.3.3e-fix-kernel-header-capability-version.patch [new file with mode: 0644] patch | blob
package/proftpd/proftpd.mk patch | blob | history

diff --git a/package/proftpd/proftpd-1.3.3b-fix-kernel-header-capability-version.patch b/package/proftpd/proftpd-1.3.3b-fix-kernel-header-capability-version.patch
deleted file mode 100644 (file)
index 4401c9a..0000000
--- a/package/proftpd/proftpd-1.3.3b-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 <linux/capability.h> does not match library"
- # error "file "libcap.h" --> fix and recompile libcap"
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
new file mode 100644 (file)
index 0000000..4401c9a
--- /dev/null
+++ b/package/proftpd/proftpd-1.3.3e-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 <linux/capability.h> 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 75ab930ff6db0e827061aaa66ab963b12b605366..3733cd643b0c00ae087ea0b471a7ca96231b917c 100644 (file)
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -3,7 +3,7 @@
 # proftpd
 #
 #############################################################
-PROFTPD_VERSION = 1.3.3b
+PROFTPD_VERSION = 1.3.3e
 PROFTPD_SOURCE = proftpd-$(PROFTPD_VERSION).tar.bz2
 PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source/