stunnel: update to 4.41

This commit is contained in:
Juergen Daubert 2011-07-27 10:19:36 +02:00
parent 7dfeecc95b
commit 786c448bd4
3 changed files with 31 additions and 34 deletions

View File

@ -1,3 +1,3 @@
20d8078911733e4de22903034e725db6 stunnel
853739119a8364daea750154af6d7e79 stunnel-4.39.tar.gz
e93e41eee5571651e052e06782fc146c stunnel-config.patch
1ce3c7c491cabbda713af6ed6caf13f0 stunnel-4.41.tar.gz
cd966a989d43d1d4c6156186f6647bad stunnel-config.patch

View File

@ -4,7 +4,7 @@
# Depends on: openssl tcp_wrappers zlib
name=stunnel
version=4.39
version=4.41
release=1
source=(ftp://ftp.stunnel.org/stunnel/$name-$version.tar.gz \
$name-config.patch $name)

View File

@ -1,6 +1,6 @@
diff -Nru stunnel-4.39.orig/src/Makefile.in stunnel-4.39/src/Makefile.in
--- stunnel-4.39.orig/src/Makefile.in 2011-07-07 13:55:58.083872713 +0200
+++ stunnel-4.39/src/Makefile.in 2011-07-07 13:56:09.396802299 +0200
diff -Nru stunnel-4.40.orig/src/Makefile.in stunnel-4.40/src/Makefile.in
--- stunnel-4.40.orig/src/Makefile.in 2011-07-24 18:51:26.817760413 +0200
+++ stunnel-4.40/src/Makefile.in 2011-07-24 18:52:09.849519637 +0200
@@ -254,7 +254,7 @@
INCLUDES = -I/usr/kerberos/include
@ -9,41 +9,25 @@ diff -Nru stunnel-4.39.orig/src/Makefile.in stunnel-4.39/src/Makefile.in
+AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
# Win32 executable
EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak makew32.bat version.rc nogui.c os2.mak
diff -Nru stunnel-4.39.orig/tools/stunnel.conf-sample.in stunnel-4.39/tools/stunnel.conf-sample.in
--- stunnel-4.39.orig/tools/stunnel.conf-sample.in 2011-07-07 13:55:58.083872713 +0200
+++ stunnel-4.39/tools/stunnel.conf-sample.in 2011-07-07 13:56:09.396802299 +0200
@@ -5,20 +5,23 @@
; Certificate/key is needed in server mode and optional in client mode
; The default certificate is provided only for testing and should not
; be used in a production environment
-cert = @prefix@/etc/stunnel/mail.pem
-;key = @prefix@/etc/stunnel/mail.pem
+cert = /etc/ssl/certs/stunnel.crt
+key = /etc/ssl/keys/stunnel.key
EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak makew32.bat nogui.c os2.mak
diff -Nru stunnel-4.40.orig/tools/stunnel.conf-sample.in stunnel-4.40/tools/stunnel.conf-sample.in
--- stunnel-4.40.orig/tools/stunnel.conf-sample.in 2011-07-24 18:51:26.814427202 +0200
+++ stunnel-4.40/tools/stunnel.conf-sample.in 2011-07-24 18:58:14.352979341 +0200
@@ -8,25 +8,33 @@
; Security enhancements for UNIX systems - comment them out on Win32
; for chroot a copy of some devices and files is needed within the jail
; 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 = /var/run/stunnel/
; Chroot jail can be escaped if setuid option is not used
-setuid = nobody
-setgid = @DEFAULT_GROUP@
+chroot = /var/run/stunnel/
+setuid = stunnel
+setgid = stunnel
; PID is created inside the chroot jail
pid = /stunnel.pid
; Disable support for insecure SSLv2 protocol
options = NO_SSLv2
+; Enable or disable the use of libwrap
+libwrap = yes
+
; Workaround for Eudora bug
;options = DONT_INSERT_EMPTY_FRAGMENTS
@@ -38,7 +41,12 @@
; Debugging stuff (may useful for troubleshooting)
;debug = 7
+; logfile is created inside the chroot jail
@ -52,6 +36,19 @@ diff -Nru stunnel-4.39.orig/tools/stunnel.conf-sample.in stunnel-4.39/tools/stun
+;output = /var/log/stunnel.log
+; log via syslog
+syslog = yes
+
+; Enable or disable the use of libwrap
+libwrap = yes
; SSL client mode
;client = yes
; *****************************************************************************
; * Service Defaults (may also be specified in individual service sections) *
; *****************************************************************************
; 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
; Authentication stuff needs to be configured to prevent MITM attacks
; It is not enabled by default!