commit 36b846d9bc0cc2e3b4b2c20fd9fd56f0c0d5dc6f Author: Juergen Daubert <jue@jue.li> Date: Wed Nov 5 19:00:25 2014 +0100 stunnel: update to 5.07 diff --git a/stunnel/.md5sum b/stunnel/.md5sum index 51358ed..dd759ac 100644 --- a/stunnel/.md5sum +++ b/stunnel/.md5sum @@ -1,3 +1,3 @@ 20d8078911733e4de22903034e725db6 stunnel -39e2e678eb5572c9d86ae391db5da30b stunnel-5.05.tar.gz -1b60ebc3897072a5169d178483950f5b stunnel-config.patch +c10edd84ecbc676a5a48c7e34ab3d1c5 stunnel-5.07.tar.gz +1f4f1cad1434b7d8641bd2ebe2be6e1c stunnel-config.patch diff --git a/stunnel/Pkgfile b/stunnel/Pkgfile index 4d9cdd6..3e6f807 100644 --- a/stunnel/Pkgfile +++ b/stunnel/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl tcp_wrappers zlib name=stunnel -version=5.05 +version=5.07 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 0a1735a..0e24b93 100644 --- a/stunnel/stunnel-config.patch +++ b/stunnel/stunnel-config.patch @@ -1,6 +1,6 @@ -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 +diff -Nru stunnel-5.07.orig/src/Makefile.in stunnel-5.07/src/Makefile.in +--- stunnel-5.07.orig/src/Makefile.in 2014-11-02 13:28:56.464569838 +0100 ++++ stunnel-5.07/src/Makefile.in 2014-11-02 13:29:17.703827231 +0100 @@ -310,7 +310,7 @@ # Additional preprocesor definitions @@ -10,18 +10,18 @@ diff -Nru stunnel-5.02.orig/src/Makefile.in stunnel-5.02/src/Makefile.in # Win32 executable EXTRA_DIST = make.bat makece.bat makew32.bat mingw.mak evc.mak vc.mak \ -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 @@ - +diff -Nru stunnel-5.07.orig/tools/stunnel.conf-sample.in stunnel-5.07/tools/stunnel.conf-sample.in +--- stunnel-5.07.orig/tools/stunnel.conf-sample.in 2014-11-02 13:28:56.464569838 +0100 ++++ stunnel-5.07/tools/stunnel.conf-sample.in 2014-11-02 13:34:24.086448235 +0100 +@@ -10,25 +10,34 @@ ; A copy of some devices and system files is needed within the chroot jail ; Chroot conflicts with configuration file reload and many other features + ; Remember also to update the logrotate configuration. -;chroot = @prefix@/var/lib/stunnel/ +chroot = /var/run/stunnel/ ; Chroot jail can be escaped if setuid option is not used --setuid = nobody --setgid = @DEFAULT_GROUP@ +-;setuid = nobody +-;setgid = @DEFAULT_GROUP@ +setuid = stunnel +setgid = stunnel @@ -40,6 +40,7 @@ diff -Nru stunnel-5.02.orig/tools/stunnel.conf-sample.in stunnel-5.02/tools/stun + +; Enable or disable the use of libwrap +libwrap = yes ++ ; ************************************************************************** ; * Service defaults may also be specified in individual service sections *