New upstream realease 4.42

Updated local patches
Fixes #732069
This commit is contained in:
Avesh Agarwal 2011-08-19 13:40:54 -04:00
parent 975866d709
commit 8c65aaf0be
5 changed files with 28 additions and 20 deletions

3
.gitignore vendored
View File

@ -10,3 +10,6 @@ stunnel-4.33.tar.gz.asc
/stunnel-4.41.tar.gz
/stunnel-4.41.tar.gz.asc
/stunnel-4.41.tar.gz.sha256
/stunnel-4.42.tar.gz
/stunnel-4.42.tar.gz.asc
/stunnel-4.42.tar.gz.sha256

View File

@ -1,3 +1,3 @@
1ce3c7c491cabbda713af6ed6caf13f0 stunnel-4.41.tar.gz
4920e0eb2c3ac515e1adfa52283894dc stunnel-4.41.tar.gz.asc
a22cb3e1657f50eeed951b3e96273697 stunnel-4.41.tar.gz.sha256
f64a7426166d397dd826deef33bb6aa0 stunnel-4.42.tar.gz
011dc68c245c465d120e8bfad10cc891 stunnel-4.42.tar.gz.asc
cae8c555fe7be6e17194b8fc84f28ae7 stunnel-4.42.tar.gz.sha256

View File

@ -1,6 +1,6 @@
diff -urNp stunnel-4.41/doc/stunnel.8 stunnel-4.41-cvs-patched/doc/stunnel.8
--- stunnel-4.41/doc/stunnel.8 2011-07-23 14:48:00.000000000 -0400
+++ stunnel-4.41-cvs-patched/doc/stunnel.8 2011-08-01 17:49:25.568689794 -0400
diff -urNp stunnel-4.42/doc/stunnel.8 stunnel-4.42-cvs-patched/doc/stunnel.8
--- stunnel-4.42/doc/stunnel.8 2011-08-18 13:56:01.000000000 -0400
+++ stunnel-4.42-cvs-patched/doc/stunnel.8 2011-08-19 13:30:51.218600480 -0400
@@ -168,7 +168,7 @@ info (6), or debug (7). All logs for th
all levels numerically less than it will be shown. Use \fIdebug = debug\fR or
\&\fIdebug = 7\fR for greatest debugging output. The default is notice (5).
@ -10,10 +10,10 @@ diff -urNp stunnel-4.41/doc/stunnel.8 stunnel-4.41-cvs-patched/doc/stunnel.8
(Facilities are not supported on Win32.)
.Sp
Case is ignored for both facilities and levels.
diff -urNp stunnel-4.41/doc/stunnel.html stunnel-4.41-cvs-patched/doc/stunnel.html
--- stunnel-4.41/doc/stunnel.html 2011-07-23 14:48:03.000000000 -0400
+++ stunnel-4.41-cvs-patched/doc/stunnel.html 2011-08-01 17:49:41.002542620 -0400
@@ -195,7 +195,7 @@ emerg (0), alert (1), crit (2), err (3),
diff -urNp stunnel-4.42/doc/stunnel.html stunnel-4.42-cvs-patched/doc/stunnel.html
--- stunnel-4.42/doc/stunnel.html 2011-08-18 13:56:02.000000000 -0400
+++ stunnel-4.42-cvs-patched/doc/stunnel.html 2011-08-19 13:30:51.218600480 -0400
@@ -196,7 +196,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 <em>debug = debug</em> or
<em>debug = 7</em> for greatest debugging output. The default is notice (5).</p>
@ -22,9 +22,9 @@ diff -urNp stunnel-4.41/doc/stunnel.html stunnel-4.41-cvs-patched/doc/stunnel.ht
(Facilities are not supported on Win32.)</p>
<p>Case is ignored for both facilities and levels.</p>
</dd>
diff -urNp stunnel-4.41/doc/stunnel.pod stunnel-4.41-cvs-patched/doc/stunnel.pod
--- stunnel-4.41/doc/stunnel.pod 2011-07-23 14:47:52.000000000 -0400
+++ stunnel-4.41-cvs-patched/doc/stunnel.pod 2011-08-01 17:50:00.238359179 -0400
diff -urNp stunnel-4.42/doc/stunnel.pod stunnel-4.42-cvs-patched/doc/stunnel.pod
--- stunnel-4.42/doc/stunnel.pod 2011-08-18 13:49:51.000000000 -0400
+++ stunnel-4.42-cvs-patched/doc/stunnel.pod 2011-08-19 13:30:51.219600478 -0400
@@ -136,7 +136,7 @@ info (6), or debug (7). All logs for th
all levels numerically less than it will be shown. Use I<debug = debug> or
I<debug = 7> for greatest debugging output. The default is notice (5).
@ -34,9 +34,9 @@ diff -urNp stunnel-4.41/doc/stunnel.pod stunnel-4.41-cvs-patched/doc/stunnel.pod
(Facilities are not supported on Win32.)
Case is ignored for both facilities and levels.
diff -urNp stunnel-4.41/src/options.c stunnel-4.41-cvs-patched/src/options.c
--- stunnel-4.41/src/options.c 2011-07-23 16:48:18.000000000 -0400
+++ stunnel-4.41-cvs-patched/src/options.c 2011-08-01 17:50:20.884162301 -0400
diff -urNp stunnel-4.42/src/options.c stunnel-4.42-cvs-patched/src/options.c
--- stunnel-4.42/src/options.c 2011-08-18 13:15:17.000000000 -0400
+++ stunnel-4.42-cvs-patched/src/options.c 2011-08-19 13:30:51.221600474 -0400
@@ -140,8 +140,12 @@ static char *parse_global_option(CMD cmd
case CMD_INIT:
new_global_options.debug_level=LOG_NOTICE;

View File

@ -1,6 +1,6 @@
diff -urNp stunnel-4.41/tools/stunnel.conf-sample.in stunnel-4.41-cvs-patched/tools/stunnel.conf-sample.in
--- stunnel-4.41/tools/stunnel.conf-sample.in 2011-07-24 01:51:56.000000000 -0400
+++ stunnel-4.41-cvs-patched/tools/stunnel.conf-sample.in 2011-08-01 17:54:00.032071605 -0400
diff -urNp stunnel-4.42/tools/stunnel.conf-sample.in stunnel-4.42-cvs-patched/tools/stunnel.conf-sample.in
--- stunnel-4.42/tools/stunnel.conf-sample.in 2011-07-24 01:51:56.000000000 -0400
+++ stunnel-4.42-cvs-patched/tools/stunnel.conf-sample.in 2011-08-19 13:30:58.823586297 -0400
@@ -8,7 +8,7 @@
; A copy of some devices and system files is needed within the chroot jail

View File

@ -1,6 +1,6 @@
Summary: An SSL-encrypting socket wrapper
Name: stunnel
Version: 4.41
Version: 4.42
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
@ -79,6 +79,11 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_sysconfdir}/stunnel/*
%changelog
* Fri Aug 19 2011 Avesh Agarwal <avagarwa@redhat.com> - 4.42-1
- New upstream realease 4.42
- Updated local patches
- Fixes #732069
* Mon Aug 1 2011 Avesh Agarwal <avagarwa@redhat.com> - 4.41-1
- New upstream realease 4.41
- Updated local patches to match the new release