From: carsten.schlote@gmx.net
To: ptxdist@pengutronix.de
Cc: Carsten Schlote <schlote@vahanus.net>
Subject: [ptxdist] [PATCH 1/2] proftpd: Bumped version to 1.3.5
Date: Thu, 26 Mar 2015 14:11:44 +0100 [thread overview]
Message-ID: <1427375505-4658-2-git-send-email-carsten.schlote@gmx.net> (raw)
In-Reply-To: <1427375505-4658-1-git-send-email-carsten.schlote@gmx.net>
From: Carsten Schlote <schlote@vahanus.net>
Signed-off-by: Carsten Schlote <schlote@vahanus.net>
---
patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff | 37 ------------------------
patches/proftpd-1.3.3g/series | 1 -
patches/proftpd-1.3.5/proftpd-1.3.0rc1-ptx.diff | 37 ++++++++++++++++++++++++
patches/proftpd-1.3.5/series | 1 +
rules/proftpd.make | 4 +--
5 files changed, 40 insertions(+), 40 deletions(-)
delete mode 100644 patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff
delete mode 100644 patches/proftpd-1.3.3g/series
create mode 100644 patches/proftpd-1.3.5/proftpd-1.3.0rc1-ptx.diff
create mode 100644 patches/proftpd-1.3.5/series
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
deleted file mode 100644
index 9244f38..0000000
--- a/patches/proftpd-1.3.3g/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.3g/series b/patches/proftpd-1.3.3g/series
deleted file mode 100644
index f8bc8e1..0000000
--- a/patches/proftpd-1.3.3g/series
+++ /dev/null
@@ -1 +0,0 @@
-proftpd-1.3.0rc1-ptx.diff
diff --git a/patches/proftpd-1.3.5/proftpd-1.3.0rc1-ptx.diff b/patches/proftpd-1.3.5/proftpd-1.3.0rc1-ptx.diff
new file mode 100644
index 0000000..9244f38
--- /dev/null
+++ b/patches/proftpd-1.3.5/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.5/series b/patches/proftpd-1.3.5/series
new file mode 100644
index 0000000..f8bc8e1
--- /dev/null
+++ b/patches/proftpd-1.3.5/series
@@ -0,0 +1 @@
+proftpd-1.3.0rc1-ptx.diff
diff --git a/rules/proftpd.make b/rules/proftpd.make
index 1c2332d..bd735da 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_PROFTPD) += proftpd
#
# Paths and names
#
-PROFTPD_VERSION := 1.3.3g
-PROFTPD_MD5 := 8d7cb79cecfd81acec755c6130a8ddd5
+PROFTPD_VERSION := 1.3.5
+PROFTPD_MD5 := aff1bff40e675244d72c4667f203e5bb
PROFTPD := proftpd-$(PROFTPD_VERSION)
PROFTPD_SUFFIX := tar.gz
PROFTPD_URL := ftp://ftp.proftpd.org/distrib/source/$(PROFTPD).$(PROFTPD_SUFFIX)
--
2.3.4
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2015-03-26 13:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-26 13:11 [ptxdist] (no subject) carsten.schlote
2015-03-26 13:11 ` carsten.schlote [this message]
2015-03-26 13:11 ` [ptxdist] [PATCH 2/2] stunnel: Version bump to 5.02 carsten.schlote
2015-04-02 16:22 ` [ptxdist] (no subject) Michael Olbrich
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=1427375505-4658-2-git-send-email-carsten.schlote@gmx.net \
--to=carsten.schlote@gmx.net \
--cc=ptxdist@pengutronix.de \
--cc=schlote@vahanus.net \
/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