rpms/stunnel/devel stunnel-4.29-authpriv.patch, NONE, 1.1 stunnel-4.29-sample.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 sources, 1.27, 1.28 stunnel.spec, 1.61, 1.62 stunnel-4.27-aliasing.patch, 1.2, NONE stunnel-4.27-authpriv.patch, 1.1, NONE stunnel-4.27-sample.patch, 1.1, NONE

Wed Dec 9 22:08:00 UTC 2009

Author: avesh

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

Modified Files:
	.cvsignore sources stunnel.spec 
Added Files:
	stunnel-4.29-authpriv.patch stunnel-4.29-sample.patch 
Removed Files:
	stunnel-4.27-aliasing.patch stunnel-4.27-authpriv.patch 
	stunnel-4.27-sample.patch 
Log Message:
* Tue Dec 09 2009 Avesh Agrwal <avagarwa at redhat.com> - 4.29-1
- New upstream realease 4.29
- Updated authpriv and sample patches for the new release
- Modified spec file to include dist tag


stunnel-4.29-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.29-authpriv.patch ---
diff -urNp stunnel-4.29-orig/doc/stunnel.8 stunnel-4.29/doc/stunnel.8
--- stunnel-4.29-orig/doc/stunnel.8	2009-11-20 15:50:52.000000000 -0500
+++ stunnel-4.29/doc/stunnel.8	2009-12-09 16:44:25.000000000 -0500
@@ -169,7 +169,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.29-orig/doc/stunnel.html stunnel-4.29/doc/stunnel.html
--- stunnel-4.29-orig/doc/stunnel.html	2009-11-20 15:50:52.000000000 -0500
+++ stunnel-4.29/doc/stunnel.html	2009-12-09 16:43:09.000000000 -0500
@@ -192,7 +192,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.29-orig/doc/stunnel.pod stunnel-4.29/doc/stunnel.pod
--- stunnel-4.29-orig/doc/stunnel.pod	2009-11-20 15:48:33.000000000 -0500
+++ stunnel-4.29/doc/stunnel.pod	2009-12-09 16:43:52.000000000 -0500
@@ -144,7 +144,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.29-orig/src/options.c stunnel-4.29/src/options.c
--- stunnel-4.29-orig/src/options.c	2009-11-20 15:55:12.000000000 -0500
+++ stunnel-4.29/src/options.c	2009-12-09 16:45:57.000000000 -0500
@@ -136,8 +136,12 @@ static char *global_options(CMD cmd, cha
     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.29-sample.patch:
 stunnel.conf-sample.in |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE stunnel-4.29-sample.patch ---
diff -urNp stunnel-4.29-orig/tools/stunnel.conf-sample.in stunnel-4.29/tools/stunnel.conf-sample.in
--- stunnel-4.29-orig/tools/stunnel.conf-sample.in	2009-11-08 14:40:24.000000000 -0500
+++ stunnel-4.29/tools/stunnel.conf-sample.in	2009-12-09 16:51:38.000000000 -0500
@@ -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@/etc/stunnel/mail.pem
+;key = @sysconfdir@/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/
+chroot = @localstatedir@/var/lib/stunnel/
 setuid = nobody
 setgid = @DEFAULT_GROUP@
 ; PID is created inside the chroot jail
@@ -30,12 +30,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@/etc/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@/etc/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.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	16 Apr 2009 17:54:30 -0000	1.27
+++ .cvsignore	9 Dec 2009 22:07:59 -0000	1.28
@@ -1,2 +1,4 @@
 stunnel-4.27.tar.gz
 stunnel-4.27.tar.gz.asc
+stunnel-4.29.tar.gz
+stunnel-4.29.tar.gz.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	16 Apr 2009 17:54:30 -0000	1.27
+++ sources	9 Dec 2009 22:07:59 -0000	1.28
@@ -1,2 +1,2 @@
-3c655d815576f50046a1c28744b88681  stunnel-4.27.tar.gz
-1219d667d1a1306f392d180587c6b50e  stunnel-4.27.tar.gz.asc
+14dc3f8412947f0548975cbce74d6863  stunnel-4.29.tar.gz
+655172db10aa297e2085009af22797fb  stunnel-4.29.tar.gz.asc


Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- stunnel.spec	21 Aug 2009 16:01:09 -0000	1.61
+++ stunnel.spec	9 Dec 2009 22:08:00 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.27
-Release: 5
+Version: 4.29
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -12,9 +12,9 @@ Source3: sfinger.xinetd
 Source4: stunnel-sfinger.conf
 Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
-Patch0: stunnel-4.27-authpriv.patch
-Patch1: stunnel-4.27-sample.patch
-Patch2: stunnel-4.27-aliasing.patch
+Patch0: stunnel-4.29-authpriv.patch
+Patch1: stunnel-4.29-sample.patch
+#Patch2: stunnel-4.27-aliasing.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -28,7 +28,7 @@ in conjunction with imapd to create an S
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
-%patch2 -p1 -b .aliasing
+#%patch2 -p1 -b .aliasing
 
 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
@@ -81,6 +81,11 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Tue Dec 09 2009 Avesh Agrwal <avagarwa at redhat.com> - 4.29-1
+- New upstream realease 4.29
+- Updated authpriv and sample patches for the new release
+- Modified spec file to include dist tag
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.27-5
 - rebuilt with new openssl
 


--- stunnel-4.27-aliasing.patch DELETED ---


--- stunnel-4.27-authpriv.patch DELETED ---


--- stunnel-4.27-sample.patch DELETED ---


