2011-12-05 16:52:11 +01:00
|
|
|
diff -Nru stunnel-4.50.orig/src/Makefile.in stunnel-4.50/src/Makefile.in
|
|
|
|
|
--- stunnel-4.50.orig/src/Makefile.in 2011-12-04 09:43:44.928367692 +0100
|
|
|
|
|
+++ stunnel-4.50/src/Makefile.in 2011-12-04 09:44:40.733021677 +0100
|
2011-09-18 12:04:39 +02:00
|
|
|
@@ -271,7 +271,7 @@
|
2006-03-12 13:35:51 +01:00
|
|
|
|
2011-09-18 12:04:39 +02:00
|
|
|
# Additional preprocesor definitions
|
|
|
|
|
stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \
|
|
|
|
|
- -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' \
|
|
|
|
|
+ -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' \
|
|
|
|
|
-DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
|
2006-03-12 13:35:51 +01:00
|
|
|
|
|
|
|
|
# Win32 executable
|
2011-12-05 16:52:11 +01:00
|
|
|
diff -Nru stunnel-4.50.orig/tools/stunnel.conf-sample.in stunnel-4.50/tools/stunnel.conf-sample.in
|
|
|
|
|
--- stunnel-4.50.orig/tools/stunnel.conf-sample.in 2011-12-04 09:43:44.931700905 +0100
|
|
|
|
|
+++ stunnel-4.50/tools/stunnel.conf-sample.in 2011-12-04 09:48:22.478352458 +0100
|
|
|
|
|
@@ -9,25 +9,33 @@
|
2011-07-27 10:19:36 +02:00
|
|
|
|
|
|
|
|
; 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
|
|
|
|
|
|
2011-12-05 16:52:11 +01:00
|
|
|
; **************************************************************************
|
|
|
|
|
; * Service defaults may also be specified in individual service sections *
|
|
|
|
|
; **************************************************************************
|
2011-07-27 10:19:36 +02:00
|
|
|
|
|
|
|
|
; 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!
|
