- check-files cleanup

[packages/stunnel.git] / stunnel-config.patch

diff --git a/stunnel-config.patch b/stunnel-config.patch
index c8ce9dced13ef1c5b9e51e959f810b2dd4d00e47..57e47672927fed5fc72c0ec8b97d58d3e3d16f7a 100644 (file)
--- a/stunnel-config.patch
+++ b/stunnel-config.patch
@@ -1,20 +1,22 @@
-diff -burN stunnel-4.06.orig/tools/stunnel.conf-sample.in stunnel-4.06/tools/stunnel.conf-sample.in
---- stunnel-4.06.orig/tools/stunnel.conf-sample.in     2004-12-26 18:33:15.119066912 +0100
-+++ stunnel-4.06/tools/stunnel.conf-sample.in  2004-12-26 19:14:48.552007488 +0100
-@@ -3,15 +3,15 @@
+--- stunnel-4.16/tools/stunnel.conf-sample.in.orig     2006-08-31 19:02:30.000000000 +0000
++++ stunnel-4.16/tools/stunnel.conf-sample.in  2006-09-02 12:08:51.776623500 +0000
+@@ -3,18 +3,18 @@
  ; 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/stunnel/mail.pem
++cert = /etc/stunnel/mail.pem
 +;key = /etc/stunnel/mail.pem
  
+ ; Protocol version (all, SSLv2, SSLv3, TLSv1)
+ sslVersion = SSLv3
+ 
  ; Some security enhancements for UNIX systems - comment them out on Win32
--chroot = @prefix@/var/stunnel/
+-chroot = @prefix@/var/lib/stunnel/
 -setuid = nobody
--setgid = nogroup
-+;chroot = @prefix@/var/stunnel/
+-setgid = @DEFAULT_GROUP@
++;chroot = /var/lib/stunnel/
 +setuid = stunnel
 +setgid = stunnel
  ; PID is created inside chroot jail
@@ -23,7 +25,22 @@ diff -burN stunnel-4.06.orig/tools/stunnel.conf-sample.in stunnel-4.06/tools/stu
  
  ; Some performance tunings
  socket = l:TCP_NODELAY=1
-@@ -41,17 +41,17 @@
+@@ -30,12 +30,12 @@
+ ; CApath is located inside chroot jail
+ ;CApath = /certs
+ ; It's often easier to use CAfile
+-;CAfile = @prefix@/etc/stunnel/certs.pem
++;CAfile = /etc/stunnel/certs.pem
+ ; Don't forget to c_rehash CRLpath
+ ; CRLpath is located inside chroot jail
+ ;CRLpath = /crls
+ ; Alternatively you can use CRLfile
+-;CRLfile = @prefix@/etc/stunnel/crls.pem
++;CRLfile = /etc/stunnel/crls.pem
+ 
+ ; Some debugging stuff useful for troubleshooting
+ ;debug = 7
+@@ -46,17 +46,17 @@
  
  ; Service-level configuration