2008-04-09 09:45:31 +02:00
|
|
|
diff -Nru stunnel-4.22.orig/src/Makefile.in stunnel-4.22/src/Makefile.in
|
|
|
|
--- stunnel-4.22.orig/src/Makefile.in 2008-04-07 20:12:07.000000000 +0200
|
|
|
|
+++ stunnel-4.22/src/Makefile.in 2008-04-07 20:13:35.000000000 +0200
|
|
|
|
@@ -224,7 +224,7 @@
|
2006-03-12 12:35:51 +00: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 12:35:51 +00:00
|
|
|
|
|
|
|
# Win32 executable
|
2006-09-02 08:53:15 +00:00
|
|
|
EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c os2.mak
|
2008-04-09 09:45:31 +02:00
|
|
|
diff -Nru stunnel-4.22.orig/tools/stunnel.conf-sample.in stunnel-4.22/tools/stunnel.conf-sample.in
|
|
|
|
--- stunnel-4.22.orig/tools/stunnel.conf-sample.in 2008-04-07 20:12:07.000000000 +0200
|
|
|
|
+++ stunnel-4.22/tools/stunnel.conf-sample.in 2008-04-08 13:14:40.000000000 +0200
|
2006-09-02 08:53:15 +00:00
|
|
|
@@ -3,16 +3,16 @@
|
2006-03-12 12:35:51 +00:00
|
|
|
; Please make sure you understand them (especially the effect of chroot jail)
|
|
|
|
|
|
|
|
; 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
|
|
|
|
|
2006-09-02 08:53:15 +00:00
|
|
|
; Protocol version (all, SSLv2, SSLv3, TLSv1)
|
|
|
|
sslVersion = SSLv3
|
|
|
|
|
2006-03-12 12:35:51 +00:00
|
|
|
; Some security enhancements for UNIX systems - comment them out on Win32
|
|
|
|
-chroot = @prefix@/var/lib/stunnel/
|
|
|
|
+chroot = /var/run/stunnel/
|
|
|
|
setuid = nobody
|
2006-09-02 08:53:15 +00:00
|
|
|
-setgid = @DEFAULT_GROUP@
|
2006-03-12 12:35:51 +00:00
|
|
|
+setgid = nobody
|
|
|
|
; PID is created inside chroot jail
|
|
|
|
pid = /stunnel.pid
|
|
|
|
|
2008-04-09 09:45:31 +02:00
|
|
|
@@ -39,7 +39,8 @@
|
2006-03-12 12:35:51 +00:00
|
|
|
|
|
|
|
; Some debugging stuff useful for troubleshooting
|
|
|
|
;debug = 7
|
|
|
|
-;output = stunnel.log
|
|
|
|
+output = /var/log/stunnel.log
|
2008-04-09 09:45:31 +02:00
|
|
|
+syslog = no
|
2006-03-12 12:35:51 +00:00
|
|
|
|
|
|
|
; Use it for client mode
|
|
|
|
;client = yes
|