rpms/stunnel/devel stunnel-4.27-authpriv.patch, NONE, 1.1 stunnel-4.27-sample.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 sources, 1.26, 1.27 stunnel.spec, 1.56, 1.57 stunnel-4.08-authpriv.patch, 1.1, NONE stunnel-4.18-sample.patch, 1.1, NONE

Thu Apr 16 17:55:01 UTC 2009

Author: mitr

Update of /cvs/pkgs/rpms/stunnel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16329

Modified Files:
	.cvsignore sources stunnel.spec 
Added Files:
	stunnel-4.27-authpriv.patch stunnel-4.27-sample.patch 
Removed Files:
	stunnel-4.08-authpriv.patch stunnel-4.18-sample.patch 
Log Message:
* Thu Apr 16 2009 Miloslav TrmaÄ <mitr at redhat.com> - 4.27-1
- Update to stunnel-4.27.


stunnel-4.27-authpriv.patch:

--- NEW FILE stunnel-4.27-authpriv.patch ---
Change the default log facility from LOG_DAEMON to LOG_AUTHPRIV.
diff -urN stunnel/doc/stunnel.html stunnel-4.27/doc/stunnel.html
--- stunnel/doc/stunnel.html	2009-04-16 11:17:26.000000000 +0200
+++ stunnel-4.27/doc/stunnel.html	2009-04-16 18:09:06.000000000 +0200
@@ -189,7 +189,7 @@
 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 -urN stunnel/doc/stunnel.pod stunnel-4.27/doc/stunnel.pod
--- stunnel/doc/stunnel.pod	2009-04-16 10:38:41.000000000 +0200
+++ stunnel-4.27/doc/stunnel.pod	2009-04-16 18:08:49.000000000 +0200
@@ -139,7 +139,7 @@
 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 -urN stunnel/doc/stunnel.8 stunnel-4.27/doc/stunnel.8
--- stunnel/doc/stunnel.8	2009-04-16 11:17:25.000000000 +0200
+++ stunnel-4.27/doc/stunnel.8	2009-04-16 18:08:49.000000000 +0200
@@ -226,7 +226,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
-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 -urN stunnel/src/options.c stunnel-4.27/src/options.c
--- stunnel/src/options.c	2009-04-16 10:49:20.000000000 +0200
+++ stunnel-4.27/src/options.c	2009-04-16 18:08:49.000000000 +0200
@@ -136,8 +136,12 @@
     case CMD_INIT:
         options.debug_level=5;
 #if !defined (USE_WIN32) && !defined (__vms)
+#if defined(LOG_AUTHPRIV)
+        options.facility=LOG_AUTHPRIV;
+#else
         options.facility=LOG_DAEMON;
 #endif
+#endif
         break;
     case CMD_EXEC:
         if(strcasecmp(opt, "debug"))

stunnel-4.27-sample.patch:

--- NEW FILE stunnel-4.27-sample.patch ---
You shouldn't use the sample as-is, but people do.

diff -urN stunnel/tools/stunnel.conf-sample.in stunnel-4.27/tools/stunnel.conf-sample.in
--- stunnel/tools/stunnel.conf-sample.in	2009-04-16 11:10:09.000000000 +0200
+++ stunnel-4.27/tools/stunnel.conf-sample.in	2009-04-16 18:14:02.000000000 +0200
@@ -3,14 +3,14 @@
 ; Please make sure you understand them (especially the effect of the 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 = @sysconfdir@/stunnel/mail.crt
+;key = @sysconfdir@/stunnel/mail.key
 
 ; Protocol version (all, SSLv2, SSLv3, TLSv1)
 sslVersion = SSLv3
 
 ; Some security enhancements for UNIX systems - comment them out on Win32
-chroot = @prefix@/var/lib/stunnel/
+chroot = @localstatedir@/run/stunnel/
 setuid = nobody
 setgid = @DEFAULT_GROUP@
 ; PID is created inside the chroot jail
@@ -30,12 +30,13 @@
 ; 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 you can use CRLfile
-;CRLfile = @prefix@/etc/stunnel/crls.pem
+;CRLfile = @sysconfdir@/stunnel/crls.pem
 
 ; Some debugging stuff useful for troubleshooting
 ;debug = 7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	22 Sep 2008 19:46:14 -0000	1.26
+++ .cvsignore	16 Apr 2009 17:54:30 -0000	1.27
@@ -1,2 +1,2 @@
-stunnel-4.26.tar.gz
-stunnel-4.26.tar.gz.asc
+stunnel-4.27.tar.gz
+stunnel-4.27.tar.gz.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	22 Sep 2008 19:46:14 -0000	1.26
+++ sources	16 Apr 2009 17:54:30 -0000	1.27
@@ -1,2 +1,2 @@
-0f6706540fbe000513940f4860698405  stunnel-4.26.tar.gz
-a20f1fafdbfe58c60367618935702ff0  stunnel-4.26.tar.gz.asc
+3c655d815576f50046a1c28744b88681  stunnel-4.27.tar.gz
+1219d667d1a1306f392d180587c6b50e  stunnel-4.27.tar.gz.asc


Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- stunnel.spec	26 Feb 2009 03:26:23 -0000	1.56
+++ stunnel.spec	16 Apr 2009 17:54:31 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.26
-Release: 3
+Version: 4.27
+Release: 1
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -12,8 +12,8 @@
 Source4: stunnel-sfinger.conf
 Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
-Patch0: stunnel-4.08-authpriv.patch
-Patch1: stunnel-4.18-sample.patch
+Patch0: stunnel-4.27-authpriv.patch
+Patch1: stunnel-4.27-sample.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -30,8 +30,6 @@
 
 iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
 mv doc/stunnel.fr.8_ doc/stunnel.fr.8
-iconv -f iso-8859-2 -t utf-8 < doc/stunnel.pl.8 > doc/stunnel.pl.8_
-mv doc/stunnel.pl.8_ doc/stunnel.pl.8
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -81,6 +79,9 @@
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Thu Apr 16 2009 Miloslav TrmaÄ <mitr at redhat.com> - 4.27-1
+- Update to stunnel-4.27.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.26-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- stunnel-4.08-authpriv.patch DELETED ---


--- stunnel-4.18-sample.patch DELETED ---


