diff --git a/.gitignore b/.gitignore index f08c07c..1f89a63 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ stunnel-4.33.tar.gz stunnel-4.33.tar.gz.asc /stunnel-4.34.tar.gz /stunnel-4.34.tar.gz.asc +/stunnel-4.35.tar.gz +/stunnel-4.35.tar.gz.asc diff --git a/sources b/sources index 5dc2b91..9cf46bc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bbd274e8364ea3ceca0ee5190e13edd1 stunnel-4.34.tar.gz -4b6f7bf07e4574a974a9a46ab77b74cb stunnel-4.34.tar.gz.asc +2c8e153caee9d954fb7d00980968b50d stunnel-4.35.tar.gz +d556ceb125e21ef19011db93484ae5a0 stunnel-4.35.tar.gz.asc diff --git a/stunnel-4-authpriv.patch b/stunnel-4-authpriv.patch index adaf657..434e702 100644 --- a/stunnel-4-authpriv.patch +++ b/stunnel-4-authpriv.patch @@ -1,6 +1,6 @@ -diff -urNp stunnel-4.34-orig/doc/stunnel.8 stunnel-4.34/doc/stunnel.8 ---- stunnel-4.34-orig/doc/stunnel.8 2010-10-04 11:28:17.197406956 -0400 -+++ stunnel-4.34/doc/stunnel.8 2010-10-04 11:29:54.500398560 -0400 +diff -urNp stunnel-4.35-orig/doc/stunnel.8 stunnel-4.35-current/doc/stunnel.8 +--- stunnel-4.35-orig/doc/stunnel.8 2011-02-05 16:36:59.000000000 -0500 ++++ stunnel-4.35-current/doc/stunnel.8 2011-04-04 13:44:09.715498378 -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). @@ -10,9 +10,9 @@ diff -urNp stunnel-4.34-orig/doc/stunnel.8 stunnel-4.34/doc/stunnel.8 (Facilities are not supported on Win32.) .Sp Case is ignored for both facilities and levels. -diff -urNp stunnel-4.34-orig/doc/stunnel.html stunnel-4.34/doc/stunnel.html ---- stunnel-4.34-orig/doc/stunnel.html 2010-10-04 11:28:17.198407489 -0400 -+++ stunnel-4.34/doc/stunnel.html 2010-10-04 11:30:24.549148361 -0400 +diff -urNp stunnel-4.35-orig/doc/stunnel.html stunnel-4.35-current/doc/stunnel.html +--- stunnel-4.35-orig/doc/stunnel.html 2011-02-05 16:36:59.000000000 -0500 ++++ stunnel-4.35-current/doc/stunnel.html 2011-04-04 13:44:09.717498254 -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 debug = debug or @@ -22,9 +22,9 @@ diff -urNp stunnel-4.34-orig/doc/stunnel.html stunnel-4.34/doc/stunnel.html (Facilities are not supported on Win32.)

Case is ignored for both facilities and levels.

-diff -urNp stunnel-4.34-orig/doc/stunnel.pod stunnel-4.34/doc/stunnel.pod ---- stunnel-4.34-orig/doc/stunnel.pod 2010-10-04 11:28:17.197406956 -0400 -+++ stunnel-4.34/doc/stunnel.pod 2010-10-04 11:31:02.659398482 -0400 +diff -urNp stunnel-4.35-orig/doc/stunnel.pod stunnel-4.35-current/doc/stunnel.pod +--- stunnel-4.35-orig/doc/stunnel.pod 2011-02-05 16:36:31.000000000 -0500 ++++ stunnel-4.35-current/doc/stunnel.pod 2011-04-04 13:44:09.719498136 -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 or B for greatest debugging output. The default is notice (5). @@ -34,9 +34,9 @@ diff -urNp stunnel-4.34-orig/doc/stunnel.pod stunnel-4.34/doc/stunnel.pod (Facilities are not supported on Win32.) Case is ignored for both facilities and levels. -diff -urNp stunnel-4.34-orig/src/options.c stunnel-4.34/src/options.c ---- stunnel-4.34-orig/src/options.c 2010-10-04 11:28:17.192398749 -0400 -+++ stunnel-4.34/src/options.c 2010-10-04 11:35:34.047161189 -0400 +diff -urNp stunnel-4.35-orig/src/options.c stunnel-4.35-current/src/options.c +--- stunnel-4.35-orig/src/options.c 2011-01-24 17:30:07.000000000 -0500 ++++ stunnel-4.35-current/src/options.c 2011-04-04 13:44:09.720498079 -0400 @@ -140,8 +140,12 @@ static char *parse_global_option(CMD cmd case CMD_INIT: new_global_options.debug_level=LOG_NOTICE; diff --git a/stunnel-4-sample.patch b/stunnel-4-sample.patch index 79c9bb7..39624d7 100644 --- a/stunnel-4-sample.patch +++ b/stunnel-4-sample.patch @@ -1,6 +1,6 @@ -diff -urNp stunnel-4.34-orig/tools/stunnel.conf-sample.in stunnel-4.34/tools/stunnel.conf-sample.in ---- stunnel-4.34-orig/tools/stunnel.conf-sample.in 2010-10-04 11:28:17.196407053 -0400 -+++ stunnel-4.34/tools/stunnel.conf-sample.in 2010-10-04 11:38:18.545425374 -0400 +diff -urNp stunnel-4.35-orig/tools/stunnel.conf-sample.in stunnel-4.35-current/tools/stunnel.conf-sample.in +--- stunnel-4.35-orig/tools/stunnel.conf-sample.in 2011-01-24 16:45:36.000000000 -0500 ++++ stunnel-4.35-current/tools/stunnel.conf-sample.in 2011-04-04 13:44:12.920429210 -0400 @@ -4,15 +4,15 @@ ; please read the manual and make sure you understand them diff --git a/stunnel.spec b/stunnel.spec index 07ee270..5173f65 100644 --- a/stunnel.spec +++ b/stunnel.spec @@ -1,7 +1,7 @@ Summary: An SSL-encrypting socket wrapper Name: stunnel -Version: 4.34 -Release: 2%{?dist} +Version: 4.35 +Release: 1%{?dist} License: GPLv2 Group: Applications/Internet URL: http://stunnel.mirt.net/ @@ -79,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_sysconfdir}/stunnel/* %changelog +* Mon Apr 4 2011 Avesh Agarwal - 4.35-1 +- New upstream realease 4.35 +- Updated authpriv and sample patches to match the new release + * Wed Feb 09 2011 Fedora Release Engineering - 4.34-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild