From b7014731ac44f689f293e739da288eae0f86ee5f Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Fri, 7 Mar 2014 11:16:28 +0100
Subject: [PATCH] stunnel: update to 5.00

---
 stunnel/.md5sum              |  4 ++--
 stunnel/Pkgfile              |  5 +++--
 stunnel/stunnel-config.patch | 20 ++++++++++----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/stunnel/.md5sum b/stunnel/.md5sum
index 918cc281b..221fd81f4 100644
--- a/stunnel/.md5sum
+++ b/stunnel/.md5sum
@@ -1,3 +1,3 @@
 20d8078911733e4de22903034e725db6  stunnel
-ac4c4a30bd7a55b6687cbd62d864054c  stunnel-4.56.tar.gz
-b557cb1f0a946560481791c7a5aa8c6a  stunnel-config.patch
+4f00fd0faf99e3c9cf258a19dd83d14a  stunnel-5.00.tar.gz
+e7c5ad19e0c7268a571f3b1b95435fef  stunnel-config.patch
diff --git a/stunnel/Pkgfile b/stunnel/Pkgfile
index f48e6bb31..4b4a207a2 100644
--- a/stunnel/Pkgfile
+++ b/stunnel/Pkgfile
@@ -4,9 +4,9 @@
 # Depends on:  openssl tcp_wrappers zlib
 
 name=stunnel
-version=4.56
+version=5.00
 release=1
-source=(http://stunnel.cybermirror.org/archive/4.x/$name-$version.tar.gz \
+source=(http://stunnel.cybermirror.org/archive/5.x/$name-$version.tar.gz \
         $name-config.patch $name)
 
 build () {
@@ -26,6 +26,7 @@ build () {
     install -D -m 0644 doc/stunnel.8 $PKG/usr/man/man8/stunnel.8
     install -D -m 0755 $SRC/stunnel  $PKG/etc/rc.d/stunnel
     install -m 0644 tools/stunnel.conf-sample $PKG/etc/stunnel.conf
+
     install -d $PKG/{var/run,etc/ssl/{certs,keys}}
     install -d -m 770 -o stunnel -g stunnel $PKG/var/run/stunnel
     touch $PKG/etc/ssl/{certs/stunnel.crt,keys/stunnel.key}
diff --git a/stunnel/stunnel-config.patch b/stunnel/stunnel-config.patch
index 3dc5e4687..1764f685e 100644
--- a/stunnel/stunnel-config.patch
+++ b/stunnel/stunnel-config.patch
@@ -1,18 +1,18 @@
-diff -Nru stunnel-4.50.orig/src/Makefile.in stunnel-4.50/src/Makefile.in
---- stunnel-4.50.orig/src/Makefile.in	2011-12-04 09:43:44.928367692 +0100
-+++ stunnel-4.50/src/Makefile.in	2011-12-04 09:44:40.733021677 +0100
-@@ -271,7 +271,7 @@
+diff -Nru stunnel-5.00.orig/src/Makefile.in stunnel-5.00/src/Makefile.in
+--- stunnel-5.00.orig/src/Makefile.in	2014-03-07 10:30:11.982768737 +0100
++++ stunnel-5.00/src/Makefile.in	2014-03-07 10:31:17.433779070 +0100
+@@ -310,7 +310,7 @@
  
  # Additional preprocesor definitions
  stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \
--	-DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' \
-+	-DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' \
- 	-DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
+-	-DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"'
++	-DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"'
  
  # Win32 executable
-diff -Nru stunnel-4.50.orig/tools/stunnel.conf-sample.in stunnel-4.50/tools/stunnel.conf-sample.in
---- stunnel-4.50.orig/tools/stunnel.conf-sample.in	2011-12-04 09:43:44.931700905 +0100
-+++ stunnel-4.50/tools/stunnel.conf-sample.in	2011-12-04 09:48:22.478352458 +0100
+ EXTRA_DIST = make.bat makece.bat makew32.bat mingw.mak evc.mak vc.mak \
+diff -Nru stunnel-5.00.orig/tools/stunnel.conf-sample.in stunnel-5.00/tools/stunnel.conf-sample.in
+--- stunnel-5.00.orig/tools/stunnel.conf-sample.in	2014-03-07 10:30:11.986101953 +0100
++++ stunnel-5.00/tools/stunnel.conf-sample.in	2014-03-07 10:30:40.365094717 +0100
 @@ -9,25 +9,33 @@
  
  ; A copy of some devices and system files is needed within the chroot jail