2011-07-27 10:19:36 +02:00
|
|
|
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
|
2011-06-18 15:59:54 +02:00
|
|
|
@@ -254,7 +254,7 @@
|
2006-03-12 13:35:51 +01:00
|
|
|
INCLUDES = -I/usr/kerberos/include
|
|
|
|
|
|
|
|
|
|
# Additional compiler flags
|
2008-04-09 09:45:31 +02:00
|
|
|
-AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
|
|
|
|
|
+AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
|
2006-03-12 13:35:51 +01:00
|
|
|
|
|
|
|
|
# Win32 executable
|
2011-07-27 10:19:36 +02:00
|
|
|
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 @@
|
|
|
|
|
|
|
|
|
|
; A copy of some devices and system files is needed within the chroot jail
|
|
|
|
|
; Chroot conflicts with configuration file reload and many other features
|
2006-03-12 13:35:51 +01:00
|
|
|
-chroot = @prefix@/var/lib/stunnel/
|
2011-07-27 10:19:36 +02:00
|
|
|
+chroot = /var/run/stunnel/
|
|
|
|
|
; Chroot jail can be escaped if setuid option is not used
|
2011-06-18 15:59:54 +02:00
|
|
|
-setuid = nobody
|
2006-09-02 10:53:15 +02:00
|
|
|
-setgid = @DEFAULT_GROUP@
|
2011-06-18 15:59:54 +02:00
|
|
|
+setuid = stunnel
|
|
|
|
|
+setgid = stunnel
|
2011-07-27 10:19:36 +02:00
|
|
|
|
2009-04-17 13:25:55 +02:00
|
|
|
; PID is created inside the chroot jail
|
2006-03-12 13:35:51 +01:00
|
|
|
pid = /stunnel.pid
|
|
|
|
|
|
2011-06-18 15:59:54 +02:00
|
|
|
; Debugging stuff (may useful for troubleshooting)
|
2006-03-12 13:35:51 +01:00
|
|
|
;debug = 7
|
2010-03-25 10:41:00 +01:00
|
|
|
+; logfile is created inside the chroot jail
|
|
|
|
|
;output = stunnel.log
|
|
|
|
|
+; without chroot
|
|
|
|
|
+;output = /var/log/stunnel.log
|
|
|
|
|
+; log via syslog
|
|
|
|
|
+syslog = yes
|
2011-07-27 10:19:36 +02:00
|
|
|
+
|
|
|
|
|
+; Enable or disable the use of libwrap
|
|
|
|
|
+libwrap = 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
|
2010-03-25 10:41:00 +01:00
|
|
|
|
2011-07-27 10:19:36 +02:00
|
|
|
; Authentication stuff needs to be configured to prevent MITM attacks
|
|
|
|
|
; It is not enabled by default!
|
