From: George McCollister <george.mccollister@gmail.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 2/3] proftpd: bump to 1.3.3g for security
Date: Thu, 15 Mar 2012 16:09:49 -0500 [thread overview]
Message-ID: <1331845790-23028-2-git-send-email-george.mccollister@gmail.com> (raw)
In-Reply-To: <1331845790-23028-1-git-send-email-george.mccollister@gmail.com>
Bumping proftpd from 1.3.3e to 1.3.3g to include the newest upstream
bug and security fixes.
Includes fix for:
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4130
http://bugs.proftpd.org/show_bug.cgi?id=3711
Release Notes:
1.3.3g
---------
+ New "NoEmptyFragments" TLSOption added; see the TLSOptions
documentation for details.
+ Fixed mod_sql_mysql "Alarm clock" bug on FreeBSD.
1.3.3f
---------
+ Fixes segfault if mod_sql_mysql and "SQLAuthenticate groupsetfast"
configuration used.
+ Fixes mod_wrap syslog level (regression from Bug#3317).
+ Fixes mod_ifsession segfault if regular expression patterns used in
a <VirtualHost> section
Signed-off-by: George McCollister <george.mccollister@gmail.com>
---
patches/proftpd-1.3.3e/proftpd-1.3.0rc1-ptx.diff | 37 ----------------------
patches/proftpd-1.3.3e/series | 1 -
patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff | 37 ++++++++++++++++++++++
patches/proftpd-1.3.3g/series | 1 +
rules/proftpd.make | 4 +-
5 files changed, 40 insertions(+), 40 deletions(-)
delete mode 100644 patches/proftpd-1.3.3e/proftpd-1.3.0rc1-ptx.diff
delete mode 100644 patches/proftpd-1.3.3e/series
create mode 100644 patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff
create mode 100644 patches/proftpd-1.3.3g/series
diff --git a/patches/proftpd-1.3.3e/proftpd-1.3.0rc1-ptx.diff b/patches/proftpd-1.3.3e/proftpd-1.3.0rc1-ptx.diff
deleted file mode 100644
index 9244f38..0000000
--- a/patches/proftpd-1.3.3e/proftpd-1.3.0rc1-ptx.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Robert Schwebel <rsc@pengutronix.de>
-Subject: Makefile is trying to compile host tool with cross compiler
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
-# mkl: added standard patch header, quilt refresh'ed
-# wsa: 20091227: OE uses BUILD_CC here, buildroot doesn't have such a patch (why?)
-# How to solve for upstream?
-
- lib/libcap/Makefile | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-Index: proftpd-1.3.2/lib/libcap/Makefile
-===================================================================
---- proftpd-1.3.2.orig/lib/libcap/Makefile
-+++ proftpd-1.3.2/lib/libcap/Makefile
-@@ -9,6 +9,10 @@
- #
- topdir=$(shell pwd)/..
- include ../../Make.rules
-+ifndef CC_FOR_BUILD
-+CC_FOR_BUILD=$(CC)
-+endif
-+
- #
- # Library version
- #
-@@ -26,7 +30,7 @@ OBJS=$(addsuffix .o, $(FILES))
- all: $(LIBNAME)
-
- _makenames: _makenames.c cap_names.sed
-- $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
-+ $(CC_FOR_BUILD) $< -o $@
-
- cap_names.h: _makenames
- ./_makenames > cap_names.h
diff --git a/patches/proftpd-1.3.3e/series b/patches/proftpd-1.3.3e/series
deleted file mode 100644
index f8bc8e1..0000000
--- a/patches/proftpd-1.3.3e/series
+++ /dev/null
@@ -1 +0,0 @@
-proftpd-1.3.0rc1-ptx.diff
diff --git a/patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff b/patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff
new file mode 100644
index 0000000..9244f38
--- /dev/null
+++ b/patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff
@@ -0,0 +1,37 @@
+From: Robert Schwebel <rsc@pengutronix.de>
+Subject: Makefile is trying to compile host tool with cross compiler
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+---
+# mkl: added standard patch header, quilt refresh'ed
+# wsa: 20091227: OE uses BUILD_CC here, buildroot doesn't have such a patch (why?)
+# How to solve for upstream?
+
+ lib/libcap/Makefile | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+Index: proftpd-1.3.2/lib/libcap/Makefile
+===================================================================
+--- proftpd-1.3.2.orig/lib/libcap/Makefile
++++ proftpd-1.3.2/lib/libcap/Makefile
+@@ -9,6 +9,10 @@
+ #
+ topdir=$(shell pwd)/..
+ include ../../Make.rules
++ifndef CC_FOR_BUILD
++CC_FOR_BUILD=$(CC)
++endif
++
+ #
+ # Library version
+ #
+@@ -26,7 +30,7 @@ OBJS=$(addsuffix .o, $(FILES))
+ all: $(LIBNAME)
+
+ _makenames: _makenames.c cap_names.sed
+- $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
++ $(CC_FOR_BUILD) $< -o $@
+
+ cap_names.h: _makenames
+ ./_makenames > cap_names.h
diff --git a/patches/proftpd-1.3.3g/series b/patches/proftpd-1.3.3g/series
new file mode 100644
index 0000000..f8bc8e1
--- /dev/null
+++ b/patches/proftpd-1.3.3g/series
@@ -0,0 +1 @@
+proftpd-1.3.0rc1-ptx.diff
diff --git a/rules/proftpd.make b/rules/proftpd.make
index 5297a8a..021b29c 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_PROFTPD) += proftpd
#
# Paths and names
#
-PROFTPD_VERSION := 1.3.3e
-PROFTPD_MD5 := f7a40961b7b677961659632386292fb0
+PROFTPD_VERSION := 1.3.3g
+PROFTPD_MD5 := 8d7cb79cecfd81acec755c6130a8ddd5
PROFTPD := proftpd-$(PROFTPD_VERSION)
PROFTPD_SUFFIX := tar.gz
PROFTPD_URL := ftp://ftp.proftpd.org/distrib/source/$(PROFTPD).$(PROFTPD_SUFFIX)
--
1.7.8.4
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2012-03-15 21:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 21:09 [ptxdist] [PATCH 1/3] openssl: bump to 1.0.0h George McCollister
2012-03-15 21:09 ` George McCollister [this message]
2012-03-15 21:09 ` [ptxdist] [PATCH 3/3] memcached: bump to 1.4.13 George McCollister
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331845790-23028-2-git-send-email-george.mccollister@gmail.com \
--to=george.mccollister@gmail.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox