rpms/stunnel/F-13 stunnel-4.33-authpriv.patch, NONE, 1.1 stunnel-4.33-sample.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 sources, 1.31, 1.32 stunnel.spec, 1.65, 1.66 stunnel-4.32-authpriv.patch, 1.1, NONE stunnel-4.32-sample.patch, 1.1, NONE
avesh agarwal
avesh at fedoraproject.org
Wed Apr 7 16:37:41 UTC 2010
Author: avesh
Update of /cvs/pkgs/rpms/stunnel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12556
Modified Files:
.cvsignore sources stunnel.spec
Added Files:
stunnel-4.33-authpriv.patch stunnel-4.33-sample.patch
Removed Files:
stunnel-4.32-authpriv.patch stunnel-4.32-sample.patch
Log Message:
* Wed Apr 7 2010 Avesh Agarwal <avagarwa at redhat.com> - 4.33-1
- New upstream realease 4.33
- Updated authpriv and sample patches to match the new release
- Addresses bz 580117 (inted mode support issue)
stunnel-4.33-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.33-authpriv.patch ---
diff -urNp stunnel-4.33-orig/doc/stunnel.8 stunnel-4.33/doc/stunnel.8
--- stunnel-4.33-orig/doc/stunnel.8 2010-03-26 16:03:54.000000000 -0400
+++ stunnel-4.33/doc/stunnel.8 2010-04-07 12:13:03.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.33-orig/doc/stunnel.html stunnel-4.33/doc/stunnel.html
--- stunnel-4.33-orig/doc/stunnel.html 2010-03-26 16:03:55.000000000 -0400
+++ stunnel-4.33/doc/stunnel.html 2010-04-07 12:13:03.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.33-orig/doc/stunnel.pod stunnel-4.33/doc/stunnel.pod
--- stunnel-4.33-orig/doc/stunnel.pod 2010-03-26 16:03:41.000000000 -0400
+++ stunnel-4.33/doc/stunnel.pod 2010-04-07 12:13:03.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.33-orig/src/options.c stunnel-4.33/src/options.c
--- stunnel-4.33-orig/src/options.c 2010-04-05 14:44:43.000000000 -0400
+++ stunnel-4.33/src/options.c 2010-04-07 12:13:03.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.33-sample.patch:
stunnel.conf-sample.in | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--- NEW FILE stunnel-4.33-sample.patch ---
diff -urNp stunnel-4.33-orig/tools/stunnel.conf-sample.in stunnel-4.33/tools/stunnel.conf-sample.in
--- stunnel-4.33-orig/tools/stunnel.conf-sample.in 2010-01-18 08:17:49.000000000 -0500
+++ stunnel-4.33/tools/stunnel.conf-sample.in 2010-04-07 12:13:11.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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/F-13/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore 29 Mar 2010 19:40:37 -0000 1.31
+++ .cvsignore 7 Apr 2010 16:37:40 -0000 1.32
@@ -1,2 +1,2 @@
-stunnel-4.32.tar.gz
-stunnel-4.32.tar.gz.asc
+stunnel-4.33.tar.gz
+stunnel-4.33.tar.gz.asc
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/F-13/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources 29 Mar 2010 19:40:37 -0000 1.31
+++ sources 7 Apr 2010 16:37:40 -0000 1.32
@@ -1,2 +1,2 @@
-72379c615c5a4986c7981d0941ed2e6b stunnel-4.32.tar.gz
-093bc62b5b1aed74dd8a88ff6033cb72 stunnel-4.32.tar.gz.asc
+559a864066d8cc4afd8a97682c90d41c stunnel-4.33.tar.gz
+254638b0a97b4086915a92d5faa77b1a stunnel-4.33.tar.gz.asc
Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/F-13/stunnel.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- stunnel.spec 29 Mar 2010 19:40:40 -0000 1.65
+++ stunnel.spec 7 Apr 2010 16:37:41 -0000 1.66
@@ -1,6 +1,6 @@
Summary: An SSL-encrypting socket wrapper
Name: stunnel
-Version: 4.32
+Version: 4.33
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
@@ -12,8 +12,8 @@ Source3: sfinger.xinetd
Source4: stunnel-sfinger.conf
Source5: pop3-redirect.xinetd
Source6: stunnel-pop3s-client.conf
-Patch0: stunnel-4.32-authpriv.patch
-Patch1: stunnel-4.32-sample.patch
+Patch0: stunnel-4.33-authpriv.patch
+Patch1: stunnel-4.33-sample.patch
Buildroot: %{_tmppath}/stunnel-root
# util-linux is needed for rename
BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -79,6 +79,11 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_sysconfdir}/stunnel/*
%changelog
+* Wed Apr 7 2010 Avesh Agarwal <avagarwa at redhat.com> - 4.33-1
+- New upstream realease 4.33
+- Updated authpriv and sample patches to match the new release
+- Addresses bz 580117 (inted mode support issue)
+
* 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 DELETED ---
--- stunnel-4.32-sample.patch DELETED ---
More information about the scm-commits
mailing list