- check-files cleanup

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

diff --git a/stunnel-config.patch b/stunnel-config.patch
index 3ff5cda918832131a1f448e26a6eee1baab93354..57e47672927fed5fc72c0ec8b97d58d3e3d16f7a 100644 (file)
--- a/stunnel-config.patch
+++ b/stunnel-config.patch
@@ -1,26 +1,48 @@
---- stunnel-4.05/tools/stunnel.conf-sample.in.orig     2004-05-09 02:40:26.000000000 +0200
-+++ stunnel-4.05/tools/stunnel.conf-sample.in  2004-05-09 02:42:32.000000000 +0200
-@@ -2,12 +2,12 @@
- # Copyright by Michal Trojnara 2002
+--- 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)
  
- # Comment it out on Win32
+ ; Certificate/key is needed in server mode and optional in client mode
 -cert = @prefix@/etc/stunnel/mail.pem
--chroot = @prefix@/var/run/stunnel/
-+#cert = /etc/stunnel/mail.pem
-+#chroot = @prefix@/var/run/stunnel/
- # PID is created inside chroot jail
--pid = /stunnel.pid
+-;key = @prefix@/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/lib/stunnel/
 -setuid = nobody
--setgid = nogroup
-+pid = /var/run/stunnel/stunnel.pid
+-setgid = @DEFAULT_GROUP@
++;chroot = /var/lib/stunnel/
 +setuid = stunnel
 +setgid = stunnel
+ ; PID is created inside chroot jail
+-pid = /stunnel.pid
++pid = /var/run/stunnel/stunnel.pid
  
- # Workaround for Eudora bug
- #options = DONT_INSERT_EMPTY_FRAGMENTS
-@@ -33,26 +33,26 @@
+ ; Some performance tunings
+ socket = l:TCP_NODELAY=1
+@@ -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
  
- # Service-level configuration
+ ; Some debugging stuff useful for troubleshooting
+ ;debug = 7
+@@ -46,17 +46,17 @@
+ 
+ ; Service-level configuration
  
 -[pop3s]
 -accept  = 995
@@ -33,35 +55,17 @@
 -[ssmtp]
 -accept  = 465
 -connect = 25
--
--[s1]
--accept  = 5000
--connect = mail.osw.pl:110
--# delay = yes
--
--[s2]
--accept  = 5001
--connect = mail.osw.pl:25
-+#[pop3s]
-+#accept  = 995
-+#connect = 110
-+
-+#[imaps]
-+#accept  = 993
-+#connect = 143
-+
-+#[ssmtp]
-+#accept  = 465
-+#connect = 25
++;[pop3s]
++;accept  = 995
++;connect = 110
 +
-+#[s1]
-+#accept  = 5000
-+#connect = mail.osw.pl:110
-+#delay = yes
++;[imaps]
++;accept  = 993
++;connect = 143
 +
-+#[s2]
-+#accept  = 5001
-+#connect = mail.osw.pl:25
++;[ssmtp]
++;accept  = 465
++;connect = 25
  
- #[https]
- #accept  = 443
+ ;[https]
+ ;accept  = 443