rpms/stunnel/devel stunnel-4.32-authpriv.patch, NONE, 1.1 stunnel-4.32-sample.patch, NONE, 1.1

[avesh agarwal]

Author: avesh

Update of /cvs/pkgs/rpms/stunnel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17209

Added Files:
	stunnel-4.32-authpriv.patch stunnel-4.32-sample.patch 
Log Message:
* Mon Mar 29 2010 Avesh Agarwal <avagarwa at redhat.com> - 4.32-1
- New upstream realease 4.32
- Updated authpriv and sample patches to match the new release


stunnel-4.32-authpriv.patch:
 doc/stunnel.8    |    2 +-
 doc/stunnel.html |    2 +-
 doc/stunnel.pod  |    2 +-
 src/options.c    |    4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE stunnel-4.32-authpriv.patch ---
diff -urNp stunnel-4.32/doc/stunnel.8 stunnel-4.32-modified/doc/stunnel.8
--- stunnel-4.32/doc/stunnel.8	2010-03-23 11:11:56.000000000 -0400
+++ stunnel-4.32-modified/doc/stunnel.8	2010-03-29 15:07:16.000000000 -0400
@@ -165,7 +165,7 @@ info (6), or debug (7).  All logs for th
 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
-The syslog facility 'daemon' will be used unless a facility name is supplied.
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
 (Facilities are not supported on Win32.)
 .Sp
 Case is ignored for both facilities and levels.
diff -urNp stunnel-4.32/doc/stunnel.html stunnel-4.32-modified/doc/stunnel.html
--- stunnel-4.32/doc/stunnel.html	2010-03-23 11:11:57.000000000 -0400
+++ stunnel-4.32-modified/doc/stunnel.html	2010-03-29 15:07:38.000000000 -0400
@@ -190,7 +190,7 @@ emerg (0), alert (1), crit (2), err (3),
 info (6), or debug (7).  All logs for the specified level and
 all levels numerically less than it will be shown.  Use <strong>debug = debug</strong> or
 <strong>debug = 7</strong> for greatest debugging output.  The default is notice (5).</p>
-<p>The syslog facility 'daemon' will be used unless a facility name is supplied.
+<p>The syslog facility 'authpriv' will be used unless a facility name is supplied.
 (Facilities are not supported on Win32.)</p>
 <p>Case is ignored for both facilities and levels.</p>
 </dd>
diff -urNp stunnel-4.32/doc/stunnel.pod stunnel-4.32-modified/doc/stunnel.pod
--- stunnel-4.32/doc/stunnel.pod	2010-03-23 11:11:27.000000000 -0400
+++ stunnel-4.32-modified/doc/stunnel.pod	2010-03-29 15:07:59.000000000 -0400
@@ -132,7 +132,7 @@ info (6), or debug (7).  All logs for th
 all levels numerically less than it will be shown.  Use B<debug = debug> or
 B<debug = 7> for greatest debugging output.  The default is notice (5).
 
-The syslog facility 'daemon' will be used unless a facility name is supplied.
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
 (Facilities are not supported on Win32.)
 
 Case is ignored for both facilities and levels.
diff -urNp stunnel-4.32/src/options.c stunnel-4.32-modified/src/options.c
--- stunnel-4.32/src/options.c	2010-03-23 10:58:34.000000000 -0400
+++ stunnel-4.32-modified/src/options.c	2010-03-29 15:08:50.000000000 -0400
@@ -139,8 +139,12 @@ static char *parse_global_option(CMD cmd
     case CMD_INIT:
         new_global_options.debug_level=LOG_NOTICE;
 #if !defined (USE_WIN32) && !defined (__vms)
+#if defined(LOG_AUTHPRIV)
+        new_global_options.facility=LOG_AUTHPRIV;
+#else
         new_global_options.facility=LOG_DAEMON;
 #endif
+#endif
         break;
     case CMD_EXEC:
         if(strcasecmp(opt, "debug"))

stunnel-4.32-sample.patch:
 stunnel.conf-sample.in |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE stunnel-4.32-sample.patch ---
diff -urNp stunnel-4.32/tools/stunnel.conf-sample.in stunnel-4.32-modified/tools/stunnel.conf-sample.in
--- stunnel-4.32/tools/stunnel.conf-sample.in	2010-01-18 08:17:49.000000000 -0500
+++ stunnel-4.32-modified/tools/stunnel.conf-sample.in	2010-03-29 15:09:33.000000000 -0400
@@ -4,15 +4,15 @@
 ; please read the manual and make sure you understand them
 
 ; 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 = @sysconfdir@/stunnel/mail.crt
+;key = @sysconfdir@/stunnel/mail.key
 
 ; protocol version (all, SSLv2, SSLv3, TLSv1)
 sslVersion = SSLv3
 
 ; 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/
+chroot = @localstatedir@/run/stunnel/
 setuid = nobody
 setgid = @DEFAULT_GROUP@
 ; PID is created inside the chroot jail
@@ -33,12 +33,13 @@ socket = r:TCP_NODELAY=1
 ; CApath is located inside chroot jail
 ;CApath = /certs
 ; it's often easier to use CAfile
-;CAfile = @prefix@/etc/stunnel/certs.pem
+;CAfile = @sysconfdir@/stunnel/certs.pem
+;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt
 ; don't forget to c_rehash CRLpath
 ; CRLpath is located inside chroot jail
 ;CRLpath = /crls
 ; alternatively CRLfile can be used
-;CRLfile = @prefix@/etc/stunnel/crls.pem
+;CRLfile = @sysconfdir@/stunnel/crls.pem
 
 ; debugging stuff (may useful for troubleshooting)
 ;debug = 7