46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
diff -Nru stunnel-4.16.orig/src/Makefile.in stunnel-4.16/src/Makefile.in
|
|
--- stunnel-4.16.orig/src/Makefile.in 2006-09-02 10:26:19.000000000 +0200
|
|
+++ stunnel-4.16/src/Makefile.in 2006-09-02 10:26:34.000000000 +0200
|
|
@@ -223,7 +223,7 @@
|
|
INCLUDES = -I/usr/kerberos/include
|
|
|
|
# Additional compiler flags
|
|
-AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(prefix)/var/run/stunnel/stunnel.pid"'
|
|
+AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"/var/run/stunnel/stunnel.pid"'
|
|
|
|
# Win32 executable
|
|
EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c os2.mak
|
|
diff -Nru stunnel-4.16.orig/tools/stunnel.conf-sample.in stunnel-4.16/tools/stunnel.conf-sample.in
|
|
--- stunnel-4.16.orig/tools/stunnel.conf-sample.in 2006-09-02 10:26:19.000000000 +0200
|
|
+++ stunnel-4.16/tools/stunnel.conf-sample.in 2006-09-02 10:29:27.000000000 +0200
|
|
@@ -3,16 +3,16 @@
|
|
; 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
|
|
|
|
; Protocol version (all, SSLv2, SSLv3, TLSv1)
|
|
sslVersion = SSLv3
|
|
|
|
; Some security enhancements for UNIX systems - comment them out on Win32
|
|
-chroot = @prefix@/var/lib/stunnel/
|
|
+chroot = /var/run/stunnel/
|
|
setuid = nobody
|
|
-setgid = @DEFAULT_GROUP@
|
|
+setgid = nobody
|
|
; PID is created inside chroot jail
|
|
pid = /stunnel.pid
|
|
|
|
@@ -39,7 +39,7 @@
|
|
|
|
; Some debugging stuff useful for troubleshooting
|
|
;debug = 7
|
|
-;output = stunnel.log
|
|
+output = /var/log/stunnel.log
|
|
|
|
; Use it for client mode
|
|
;client = yes
|