- updated to 5.54

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

diff --git a/stunnel-config.patch b/stunnel-config.patch
index 57e47672927fed5fc72c0ec8b97d58d3e3d16f7a..181717e8bab1cd32ac2476e474f99f2900c23ce0 100644 (file)
--- a/stunnel-config.patch
+++ b/stunnel-config.patch
@@ -1,71 +1,17 @@
---- 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
-+;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 = @DEFAULT_GROUP@
-+;chroot = /var/lib/stunnel/
+--- stunnel-5.49/tools/stunnel.conf-sample.in~ 2018-04-06 16:25:10.000000000 +0200
++++ stunnel-5.49/tools/stunnel.conf-sample.in  2018-09-20 18:30:11.979864413 +0200
+@@ -8,11 +8,11 @@
+ ; **************************************************************************
+ 
+ ; It is recommended to drop root privileges if stunnel is started by root
+-;setuid = nobody
+-;setgid = @DEFAULT_GROUP@
 +setuid = stunnel
 +setgid = stunnel
- ; PID is created inside chroot jail
--pid = /stunnel.pid
-+pid = /var/run/stunnel/stunnel.pid
- 
- ; 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
- 
- ; Some debugging stuff useful for troubleshooting
- ;debug = 7
-@@ -46,17 +46,17 @@
- 
- ; Service-level configuration
  
--[pop3s]
--accept  = 995
--connect = 110
--
--[imaps]
--accept  = 993
--connect = 143
--
--[ssmtp]
--accept  = 465
--connect = 25
-+;[pop3s]
-+;accept  = 995
-+;connect = 110
-+
-+;[imaps]
-+;accept  = 993
-+;connect = 143
-+
-+;[ssmtp]
-+;accept  = 465
-+;connect = 25
+ ; PID file is created inside the chroot jail (if enabled)
+-;pid = @localstatedir@/run/stunnel.pid
++pid = @localstatedir@/run/stunnel/stunnel.pid
  
- ;[https]
- ;accept  = 443
+ ; Debugging stuff (may be useful for troubleshooting)
+ ;foreground = yes