2014-11-05 19:00:25 +01:00
|
|
|
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
|
2014-03-07 11:16:28 +01:00
|
|
|
@@ -310,7 +310,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 \
|
2014-03-07 11:16:28 +01:00
|
|
|
- -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"'
|
|
|
|
|
+ -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"'
|
2006-03-12 13:35:51 +01:00
|
|
|
|
|
|
|
|
# Win32 executable
|
2014-03-07 11:16:28 +01:00
|
|
|
EXTRA_DIST = make.bat makece.bat makew32.bat mingw.mak evc.mak vc.mak \
|
2014-11-05 19:00:25 +01:00
|
|
|
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 @@
|
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
|
2014-11-05 19:00:25 +01:00
|
|
|
; Remember also to update the logrotate configuration.
|
2014-06-12 20:49:34 +02: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
|
2014-11-05 19:00:25 +01:00
|
|
|
-;setuid = nobody
|
|
|
|
|
-;setgid = @DEFAULT_GROUP@
|
2011-06-18 15:59:54 +02:00
|
|
|
+setuid = stunnel
|
|
|
|
|
+setgid = stunnel
|
2011-07-27 10:19:36 +02:00
|
|
|
|
2014-06-12 20:49:34 +02:00
|
|
|
; PID file is created inside the chroot jail (if enabled)
|
|
|
|
|
-;pid = @prefix@/var/run/stunnel.pid
|
|
|
|
|
+pid = /stunnel.pid
|
2006-03-12 13:35:51 +01:00
|
|
|
|
2014-06-12 20:49:34 +02:00
|
|
|
; Debugging stuff (may be 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
|
2014-06-12 20:49:34 +02:00
|
|
|
+syslog =yes
|
2011-07-27 10:19:36 +02:00
|
|
|
+
|
|
|
|
|
+; Enable or disable the use of libwrap
|
|
|
|
|
+libwrap = yes
|
2014-11-05 19:00:25 +01:00
|
|
|
+
|
2011-07-27 10:19:36 +02:00
|
|
|
|
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
|
2014-06-12 20:49:34 +02:00
|
|
|
+cert = /etc/ssl/stunnel.crt
|
|
|
|
|
+key = /etc/ssl/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!
|
