commit 51ef2828dbcdab489ab5340fd39ad2c4a64a1bc4 Author: Juergen Daubert <jue@jue.li> Date: Thu Jun 12 20:49:34 2014 +0200 stunnel: update to 5.02 diff --git a/stunnel/.md5sum b/stunnel/.md5sum index ddc8955..269964a 100644 --- a/stunnel/.md5sum +++ b/stunnel/.md5sum @@ -1,3 +1,3 @@ 20d8078911733e4de22903034e725db6 stunnel -7b63266b6fa05da696729e245100da65 stunnel-5.01.tar.gz -e7c5ad19e0c7268a571f3b1b95435fef stunnel-config.patch +bb48b1c18cfc0a42708ef996b1a26926 stunnel-5.02.tar.gz +1b60ebc3897072a5169d178483950f5b stunnel-config.patch diff --git a/stunnel/Pkgfile b/stunnel/Pkgfile index 47cd04e..ca2b140 100644 --- a/stunnel/Pkgfile +++ b/stunnel/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl tcp_wrappers zlib name=stunnel -version=5.01 +version=5.02 release=1 source=(http://stunnel.cybermirror.org/archive/5.x/$name-$version.tar.gz \ $name-config.patch $name) diff --git a/stunnel/stunnel-config.patch b/stunnel/stunnel-config.patch index 1764f68..0a1735a 100644 --- a/stunnel/stunnel-config.patch +++ b/stunnel/stunnel-config.patch @@ -1,6 +1,6 @@ -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 +diff -Nru stunnel-5.02.orig/src/Makefile.in stunnel-5.02/src/Makefile.in +--- stunnel-5.02.orig/src/Makefile.in 2014-06-12 20:42:46.103102496 +0200 ++++ stunnel-5.02/src/Makefile.in 2014-06-12 20:43:19.441948681 +0200 @@ -310,7 +310,7 @@ # Additional preprocesor definitions @@ -10,14 +10,14 @@ diff -Nru stunnel-5.00.orig/src/Makefile.in stunnel-5.00/src/Makefile.in # Win32 executable 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 +diff -Nru stunnel-5.02.orig/tools/stunnel.conf-sample.in stunnel-5.02/tools/stunnel.conf-sample.in +--- stunnel-5.02.orig/tools/stunnel.conf-sample.in 2014-06-12 20:42:46.106435713 +0200 ++++ stunnel-5.02/tools/stunnel.conf-sample.in 2014-06-12 20:43:34.534759673 +0200 @@ -9,25 +9,33 @@ ; A copy of some devices and system files is needed within the chroot jail ; Chroot conflicts with configuration file reload and many other features --chroot = @prefix@/var/lib/stunnel/ +-;chroot = @prefix@/var/lib/stunnel/ +chroot = /var/run/stunnel/ ; Chroot jail can be escaped if setuid option is not used -setuid = nobody @@ -25,17 +25,18 @@ diff -Nru stunnel-5.00.orig/tools/stunnel.conf-sample.in stunnel-5.00/tools/stun +setuid = stunnel +setgid = stunnel - ; PID is created inside the chroot jail - pid = /stunnel.pid + ; PID file is created inside the chroot jail (if enabled) +-;pid = @prefix@/var/run/stunnel.pid ++pid = /stunnel.pid - ; Debugging stuff (may useful for troubleshooting) + ; Debugging stuff (may be useful for troubleshooting) ;debug = 7 +; logfile is created inside the chroot jail ;output = stunnel.log +; without chroot +;output = /var/log/stunnel.log +; log via syslog -+syslog = yes ++syslog =yes + +; Enable or disable the use of libwrap +libwrap = yes @@ -47,8 +48,8 @@ diff -Nru stunnel-5.00.orig/tools/stunnel.conf-sample.in stunnel-5.00/tools/stun ; 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 ++cert = /etc/ssl/stunnel.crt ++key = /etc/ssl/stunnel.key ; Authentication stuff needs to be configured to prevent MITM attacks ; It is not enabled by default!