- updated for 4.30

Changed files:
    stunnel-authpriv.patch -> 1.3
    stunnel-config.patch -> 1.7

diff --git a/stunnel-authpriv.patch b/stunnel-authpriv.patch
index 5e4ba3ad7610d32eb4e8a98489143bd2b0760b17..cd220f84adbce6eb317723d3fb60ecf94da8a1e9 100644 (file)
--- a/stunnel-authpriv.patch
+++ b/stunnel-authpriv.patch
@@ -1,19 +1,7 @@
-*Shrug.*
-
---- stunnel-3.20/src/options.c Tue Aug 28 15:56:57 2001
-+++ stunnel-3.20/src/options.c Tue Aug 28 15:57:04 2001
-@@ -205,7 +205,7 @@
-     case CMD_INIT:
-         options.debug_level=5;
- #if !defined (USE_WIN32) && !defined (__vms)
--        options.facility=LOG_DAEMON;
-+        options.facility=LOG_AUTHPRIV;
- #endif
-         break;
-     case CMD_EXEC:
---- stunnel-3.20/doc/stunnel.8 Tue Aug 28 15:57:49 2001
-+++ stunnel-3.20/doc/stunnel.8 Tue Aug 28 15:58:04 2001
-@@ -238,7 +238,7 @@
+diff -ur stunnel-4.30/doc/stunnel.8 stunnel-4.30.new/doc/stunnel.8
+--- stunnel-4.30/doc/stunnel.8 2010-01-21 12:26:39.000000000 +0100
++++ stunnel-4.30.new/doc/stunnel.8     2010-01-21 15:14:16.687003848 +0100
+@@ -169,7 +169,7 @@
  all levels numerically less than it will be shown.  Use \fBdebug = debug\fR or
  \&\fBdebug = 7\fR for greatest debugging output.  The default is notice (5).
  .Sp
@@ -22,3 +10,15 @@
  (Facilities are not supported on Win32.)
  .Sp
  Case is ignored for both facilities and levels.
+diff -ur stunnel-4.30/src/options.c stunnel-4.30.new/src/options.c
+--- stunnel-4.30/src/options.c 2010-01-21 11:52:43.000000000 +0100
++++ stunnel-4.30.new/src/options.c     2010-01-21 15:13:50.470432283 +0100
+@@ -139,7 +139,7 @@
+     case CMD_INIT:
+         new_global_options.debug_level=LOG_NOTICE;
+ #if !defined (USE_WIN32) && !defined (__vms)
+-        new_global_options.facility=LOG_DAEMON;
++        new_global_options.facility=LOG_AUTHPRIV;
+ #endif
+         break;
+     case CMD_EXEC:

diff --git a/stunnel-config.patch b/stunnel-config.patch
index 845d335cd23e72f7ea5e95b8f5aadf4201f7abdc..3e4fb4c233877b33961c025b2d714e82ace7a272 100644 (file)
--- a/stunnel-config.patch
+++ b/stunnel-config.patch
@@ -1,18 +1,20 @@
---- stunnel-4.27/tools/stunnel.conf-sample.in.orig     2009-04-16 11:10:09.000000000 +0200
-+++ stunnel-4.27/tools/stunnel.conf-sample.in  2009-04-23 10:59:47.431971599 +0200
-@@ -3,18 +3,18 @@
- ; Please make sure you understand them (especially the effect of the chroot jail)
+diff -ur stunnel-4.30/tools/stunnel.conf-sample.in stunnel-4.30.new/tools/stunnel.conf-sample.in
+--- stunnel-4.30/tools/stunnel.conf-sample.in  2010-01-18 14:17:49.000000000 +0100
++++ stunnel-4.30.new/tools/stunnel.conf-sample.in      2010-01-21 15:17:41.173740613 +0100
+@@ -4,19 +4,19 @@
+ ; please read the manual and make sure you understand them
  
- ; Certificate/key is needed in server mode and optional in client mode
+ ; 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)
+ ; protocol version (all, SSLv2, SSLv3, TLSv1)
  sslVersion = SSLv3
  
- ; Some security enhancements for UNIX systems - comment them out on Win32
+ ; security enhancements for UNIX systems - comment them out on Win32
+ ; for chroot a copy of some devices and files is needed within the jail
 -chroot = @prefix@/var/lib/stunnel/
 -setuid = nobody
 -setgid = @DEFAULT_GROUP@
@@ -23,26 +25,26 @@
 -pid = /stunnel.pid
 +pid = /var/run/stunnel/stunnel.pid
  
- ; Some performance tunings
+ ; performance tunings
  socket = l:TCP_NODELAY=1
-@@ -30,12 +30,12 @@
+@@ -33,12 +33,12 @@
  ; CApath is located inside chroot jail
  ;CApath = /certs
- ; It's often easier to use CAfile
+ ; 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
++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
+ ; alternatively CRLfile can be used
 -;CRLfile = @prefix@/etc/stunnel/crls.pem
-+;CRLfile = /etc/stunnel/crls.pem
++CRLfile = /etc/stunnel/crls.pem
  
- ; Some debugging stuff useful for troubleshooting
+ ; debugging stuff (may useful for troubleshooting)
  ;debug = 7
-@@ -46,17 +46,17 @@
+@@ -49,17 +49,17 @@
  
- ; Service-level configuration
+ ; service-level configuration
  
 -[pop3s]
 -accept  = 995