stunnel: update to 4.32

3 files changed, 29 insertions, 22 deletions

diff --git a/stunnel/.md5sum b/stunnel/.md5sum
index f9ca368ab..80ec0a203 100644
--- a/stunnel/.md5sum
+++ b/stunnel/.md5sum
@@ -1,3 +1,3 @@
 20d8078911733e4de22903034e725db6  stunnel
-14dc3f8412947f0548975cbce74d6863  stunnel-4.29.tar.gz
-f49c3a49c5b17f416aa5c44a3d27e796  stunnel-config.patch
+72379c615c5a4986c7981d0941ed2e6b  stunnel-4.32.tar.gz
+0189bd3a589317b9339176ce26198709  stunnel-config.patch
diff --git a/stunnel/Pkgfile b/stunnel/Pkgfile
index ec2a71b04..21a228576 100644
--- a/stunnel/Pkgfile
+++ b/stunnel/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  openssl, zlib
 
 name=stunnel
-version=4.29
+version=4.32
 release=1
 source=(http://www.stunnel.org/download/stunnel/src/$name-$version.tar.gz \
         $name-config.patch $name)
@@ -18,7 +18,7 @@ build () {
                 --sysconfdir=/etc \
                 --localstatedir=/var \
                 --with-ssl=/usr \
-                --enable-ipv6 
+                --enable-ipv6
     make
 
     install -D -m 0755 src/stunnel $PKG/usr/sbin/stunnel
diff --git a/stunnel/stunnel-config.patch b/stunnel/stunnel-config.patch
index eb6ba9bac..077a0cccc 100644
--- a/stunnel/stunnel-config.patch
+++ b/stunnel/stunnel-config.patch
@@ -1,6 +1,6 @@
-diff -Nru stunnel-4.27.orig/src/Makefile.in stunnel-4.27/src/Makefile.in
---- stunnel-4.27.orig/src/Makefile.in	2009-04-17 09:52:04.000000000 +0200
-+++ stunnel-4.27/src/Makefile.in	2009-04-17 09:52:19.000000000 +0200
+diff -Nru stunnel-4.32.orig/src/Makefile.in stunnel-4.32/src/Makefile.in
+--- stunnel-4.32.orig/src/Makefile.in	2010-03-24 18:40:21.000000000 +0100
++++ stunnel-4.32/src/Makefile.in	2010-03-24 18:40:41.000000000 +0100
 @@ -227,7 +227,7 @@
  INCLUDES = -I/usr/kerberos/include
  
@@ -10,22 +10,26 @@ diff -Nru stunnel-4.27.orig/src/Makefile.in stunnel-4.27/src/Makefile.in
  
  # Win32 executable
  EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c os2.mak
-diff -Nru stunnel-4.27.orig/tools/stunnel.conf-sample.in stunnel-4.27/tools/stunnel.conf-sample.in
---- stunnel-4.27.orig/tools/stunnel.conf-sample.in	2009-04-17 09:52:04.000000000 +0200
-+++ stunnel-4.27/tools/stunnel.conf-sample.in	2009-04-17 09:56:22.000000000 +0200
-@@ -3,16 +3,16 @@
- ; Please make sure you understand them (especially the effect of the chroot jail)
+diff -Nru stunnel-4.32.orig/tools/stunnel.conf-sample.in stunnel-4.32/tools/stunnel.conf-sample.in
+--- stunnel-4.32.orig/tools/stunnel.conf-sample.in	2010-03-24 18:40:21.000000000 +0100
++++ stunnel-4.32/tools/stunnel.conf-sample.in	2010-03-24 19:09:56.000000000 +0100
+@@ -4,17 +4,20 @@
+ ; please read the manual and make sure you understand them
  
- ; Certificate/key is needed in server mode and optional in client mode
+ ; certificate/key is needed in server mode and optional in client mode
 -cert = @prefix@/etc/stunnel/mail.pem
 -;key = @prefix@/etc/stunnel/mail.pem
 +cert = /etc/ssl/certs/stunnel.crt
 +key = /etc/ssl/keys/stunnel.key
  
- ; Protocol version (all, SSLv2, SSLv3, TLSv1)
+ ; protocol version (all, SSLv2, SSLv3, TLSv1)
  sslVersion = SSLv3
  
- ; Some security enhancements for UNIX systems - comment them out on Win32
++; Enable or disable the use of libwrap
++libwrap = yes
++
+ ; security enhancements for UNIX systems - comment them out on Win32
+ ; for chroot a copy of some devices and files is needed within the jail
 -chroot = @prefix@/var/lib/stunnel/
 +chroot = /var/run/stunnel/
  setuid = nobody
@@ -34,13 +38,16 @@ diff -Nru stunnel-4.27.orig/tools/stunnel.conf-sample.in stunnel-4.27/tools/stun
  ; PID is created inside the chroot jail
  pid = /stunnel.pid
  
-@@ -39,7 +39,8 @@
+@@ -42,7 +45,12 @@
  
- ; Some debugging stuff useful for troubleshooting
+ ; debugging stuff (may useful for troubleshooting)
  ;debug = 7
--;output = stunnel.log
-+output = /var/log/stunnel.log
-+syslog = no
- 
- ; Use it for client mode
++; logfile is created inside the chroot jail
+ ;output = stunnel.log
++; without chroot
++;output = /var/log/stunnel.log
++; log via syslog
++syslog = yes
+ 
+ ; SSL client mode
  ;client = yes