rpms/stunnel/devel stunnel-4.30-authpriv.patch, NONE, 1.1 stunnel-4.30-sample.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 stunnel.spec, 1.62, 1.63 stunnel-4.29-authpriv.patch, 1.1, NONE stunnel-4.29-sample.patch, 1.1, NONE

Tue Jan 26 20:15:11 UTC 2010

Author: avesh

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

Modified Files:
	.cvsignore sources stunnel.spec 
Added Files:
	stunnel-4.30-authpriv.patch stunnel-4.30-sample.patch 
Removed Files:
	stunnel-4.29-authpriv.patch stunnel-4.29-sample.patch 
Log Message:
* Tue Jan 26 2010 Avesh Agarwal <avagarwa at redhat.com> - 4.30-1
- New upstream realease 4.30
- Updated authpriv and sample patches for the new release


stunnel-4.30-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.30-authpriv.patch ---
diff -urNp stunnel-4.30-orig/doc/stunnel.8 stunnel-4.30/doc/stunnel.8
--- stunnel-4.30-orig/doc/stunnel.8	2010-01-21 06:26:39.000000000 -0500
+++ stunnel-4.30/doc/stunnel.8	2010-01-26 14:43:46.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.30-orig/doc/stunnel.html stunnel-4.30/doc/stunnel.html
--- stunnel-4.30-orig/doc/stunnel.html	2010-01-21 06:26:39.000000000 -0500
+++ stunnel-4.30/doc/stunnel.html	2010-01-26 14:43:46.000000000 -0500
@@ -193,7 +193,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.30-orig/doc/stunnel.pod stunnel-4.30/doc/stunnel.pod
--- stunnel-4.30-orig/doc/stunnel.pod	2010-01-21 06:26:37.000000000 -0500
+++ stunnel-4.30/doc/stunnel.pod	2010-01-26 14:43:46.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.30-orig/src/options.c stunnel-4.30/src/options.c
--- stunnel-4.30-orig/src/options.c	2010-01-21 05:52:43.000000000 -0500
+++ stunnel-4.30/src/options.c	2010-01-26 14:49:32.000000000 -0500
@@ -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.30-sample.patch:
 stunnel.conf-sample.in |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE stunnel-4.30-sample.patch ---
diff -urNp stunnel-4.30-orig/tools/stunnel.conf-sample.in stunnel-4.30/tools/stunnel.conf-sample.in
--- stunnel-4.30-orig/tools/stunnel.conf-sample.in	2010-01-18 08:17:49.000000000 -0500
+++ stunnel-4.30/tools/stunnel.conf-sample.in	2010-01-26 14:59:41.000000000 -0500
@@ -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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	9 Dec 2009 22:07:59 -0000	1.28
+++ .cvsignore	26 Jan 2010 20:15:10 -0000	1.29
@@ -2,3 +2,5 @@ stunnel-4.27.tar.gz
 stunnel-4.27.tar.gz.asc
 stunnel-4.29.tar.gz
 stunnel-4.29.tar.gz.asc
+stunnel-4.30.tar.gz
+stunnel-4.30.tar.gz.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	9 Dec 2009 22:07:59 -0000	1.28
+++ sources	26 Jan 2010 20:15:10 -0000	1.29
@@ -1,2 +1,2 @@
-14dc3f8412947f0548975cbce74d6863  stunnel-4.29.tar.gz
-655172db10aa297e2085009af22797fb  stunnel-4.29.tar.gz.asc
+3b171b8d3ac24a45c06cd280fe649bce  stunnel-4.30.tar.gz
+c2a9f6ffdce5b64a1f1ae00c0fa21c73  stunnel-4.30.tar.gz.asc


Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- stunnel.spec	9 Dec 2009 22:08:00 -0000	1.62
+++ stunnel.spec	26 Jan 2010 20:15:10 -0000	1.63
@@ -1,6 +1,6 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.29
+Version: 4.30
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -12,9 +12,8 @@ Source3: sfinger.xinetd
 Source4: stunnel-sfinger.conf
 Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
-Patch0: stunnel-4.29-authpriv.patch
-Patch1: stunnel-4.29-sample.patch
-#Patch2: stunnel-4.27-aliasing.patch
+Patch0: stunnel-4.30-authpriv.patch
+Patch1: stunnel-4.30-sample.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -28,7 +27,6 @@ in conjunction with imapd to create an S
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
-#%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,7 +79,11 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
-* Tue Dec 09 2009 Avesh Agrwal <avagarwa at redhat.com> - 4.29-1
+* Tue Jan 26 2010 Avesh Agarwal <avagarwa at redhat.com> - 4.30-1
+- New upstream realease 4.30
+- Updated authpriv and sample patches for the new release
+
+* Tue Dec 09 2009 Avesh Agarwal <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 DELETED ---


--- stunnel-4.29-sample.patch DELETED ---

