[ptxdist] (no subject)

[ptxdist] (no subject)

[carsten.schlote]

I updated the proftpd and stunnel packages to newer version.        

Carsten

[PATCH 1/2] proftpd: Bumped version to 1.3.5
[PATCH 2/2] stunnel: Version bump to 5.02

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/2] proftpd: Bumped version to 1.3.5

[carsten.schlote]

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

[ptxdist] [PATCH 2/2] stunnel: Version bump to 5.02

[carsten.schlote]

From: Carsten Schlote <schlote@vahanus.net>

Signed-off-by: Carsten Schlote <schlote@vahanus.net>
---
 rules/stunnel.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/stunnel.make b/rules/stunnel.make
index e3b6f51..f793f04 100644
--- a/rules/stunnel.make
+++ b/rules/stunnel.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_STUNNEL) += stunnel
 #
 # Paths and names
 #
-STUNNEL_VERSION	:= 5.01
-STUNNEL_MD5	:= 7b63266b6fa05da696729e245100da65
+STUNNEL_VERSION	:= 5.02
+STUNNEL_MD5	:= bb48b1c18cfc0a42708ef996b1a26926
 STUNNEL		:= stunnel-$(STUNNEL_VERSION)
 STUNNEL_SUFFIX	:= tar.gz
 STUNNEL_URL	:= \
-- 
2.3.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] (no subject)

[Michael Olbrich]

On Thu, Mar 26, 2015 at 02:11:43PM +0100, carsten.schlote@gmx.net wrote:
> I updated the proftpd and stunnel packages to newer version.        

Thanks, both applied.

Michael

> Carsten
> 
> [PATCH 1/2] proftpd: Bumped version to 1.3.5
> [PATCH 2/2] stunnel: Version bump to 5.02
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de