New upstream release 5.12.

This commit is contained in:
Avesh Agarwal 2015-03-30 15:41:21 -04:00
parent bfc27db6e8
commit d71d61f538
4 changed files with 26 additions and 20 deletions

3
.gitignore vendored
View File

@ -69,3 +69,6 @@ stunnel-4.33.tar.gz.asc
/stunnel-5.11.tar.gz /stunnel-5.11.tar.gz
/stunnel-5.11.tar.gz.asc /stunnel-5.11.tar.gz.asc
/stunnel-5.11.tar.gz.sha256 /stunnel-5.11.tar.gz.sha256
/stunnel-5.12.tar.gz
/stunnel-5.12.tar.gz.asc
/stunnel-5.12.tar.gz.sha256

View File

@ -1,3 +1,3 @@
213df05124cda9bd0a6c9eaa0c25a48a stunnel-5.11.tar.gz 43685457503bb24144d03dc307b3211b stunnel-5.12.tar.gz
94fac46f9b39c87d4688af1225de439f stunnel-5.11.tar.gz.asc 793d13180a6e75fec21871ec61cdd2f5 stunnel-5.12.tar.gz.asc
2e9c5fae1a020eb287718aad92616759 stunnel-5.11.tar.gz.sha256 f3296624071ee7f20f46b7d2750f3e89 stunnel-5.12.tar.gz.sha256

View File

@ -1,6 +1,6 @@
diff -urNp stunnel-5.10/doc/stunnel.8 stunnel-5.10-patch/doc/stunnel.8 diff -urNp stunnel-5.12/doc/stunnel.8 stunnel-5.12-patched/doc/stunnel.8
--- stunnel-5.10/doc/stunnel.8 2015-01-22 12:00:02.000000000 -0500 --- stunnel-5.12/doc/stunnel.8 2015-03-30 15:38:22.517507692 -0400
+++ stunnel-5.10-patch/doc/stunnel.8 2015-01-28 13:45:17.090470207 -0500 +++ stunnel-5.12-patched/doc/stunnel.8 2015-03-30 15:29:30.440215517 -0400
@@ -202,7 +202,7 @@ info (6), or debug (7). All logs for th @@ -202,7 +202,7 @@ info (6), or debug (7). All logs for th
all levels numerically less than it will be shown. Use \fIdebug = debug\fR or 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). \&\fIdebug = 7\fR for greatest debugging output. The default is notice (5).
@ -10,9 +10,9 @@ diff -urNp stunnel-5.10/doc/stunnel.8 stunnel-5.10-patch/doc/stunnel.8
(Facilities are not supported on Win32.) (Facilities are not supported on Win32.)
.Sp .Sp
Case is ignored for both facilities and levels. Case is ignored for both facilities and levels.
diff -urNp stunnel-5.10/doc/stunnel.html stunnel-5.10-patch/doc/stunnel.html diff -urNp stunnel-5.12/doc/stunnel.html stunnel-5.12-patched/doc/stunnel.html
--- stunnel-5.10/doc/stunnel.html 2015-01-22 12:00:03.000000000 -0500 --- stunnel-5.12/doc/stunnel.html 2015-03-30 15:38:22.517507692 -0400
+++ stunnel-5.10-patch/doc/stunnel.html 2015-01-28 13:45:17.091470194 -0500 +++ stunnel-5.12-patched/doc/stunnel.html 2015-03-30 15:29:30.440215517 -0400
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
<p>Level is a one of the syslog level names or numbers emerg (0), alert (1), crit (2), err (3), warning (4), notice (5), info (6), or debug (7). All logs for the specified level and all levels numerically less than it will be shown. Use <i>debug = debug</i> or <i>debug = 7</i> for greatest debugging output. The default is notice (5).</p> <p>Level is a one of the syslog level names or numbers emerg (0), alert (1), crit (2), err (3), warning (4), notice (5), info (6), or debug (7). All logs for the specified level and all levels numerically less than it will be shown. Use <i>debug = debug</i> or <i>debug = 7</i> for greatest debugging output. The default is notice (5).</p>
@ -22,9 +22,9 @@ diff -urNp stunnel-5.10/doc/stunnel.html stunnel-5.10-patch/doc/stunnel.html
<p>Case is ignored for both facilities and levels.</p> <p>Case is ignored for both facilities and levels.</p>
diff -urNp stunnel-5.10/doc/stunnel.pod stunnel-5.10-patch/doc/stunnel.pod diff -urNp stunnel-5.12/doc/stunnel.pod stunnel-5.12-patched/doc/stunnel.pod
--- stunnel-5.10/doc/stunnel.pod 2015-01-22 11:56:11.000000000 -0500 --- stunnel-5.12/doc/stunnel.pod 2015-03-30 15:38:22.517507692 -0400
+++ stunnel-5.10-patch/doc/stunnel.pod 2015-01-28 13:45:17.091470194 -0500 +++ stunnel-5.12-patched/doc/stunnel.pod 2015-03-30 15:29:30.440215517 -0400
@@ -188,7 +188,7 @@ info (6), or debug (7). All logs for th @@ -188,7 +188,7 @@ info (6), or debug (7). All logs for th
all levels numerically less than it will be shown. Use I<debug = debug> or 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). I<debug = 7> for greatest debugging output. The default is notice (5).
@ -34,17 +34,17 @@ diff -urNp stunnel-5.10/doc/stunnel.pod stunnel-5.10-patch/doc/stunnel.pod
(Facilities are not supported on Win32.) (Facilities are not supported on Win32.)
Case is ignored for both facilities and levels. Case is ignored for both facilities and levels.
diff -urNp stunnel-5.10/src/options.c stunnel-5.10-patch/src/options.c diff -urNp stunnel-5.12/src/options.c stunnel-5.12-patched/src/options.c
--- stunnel-5.10/src/options.c 2015-01-22 11:03:06.000000000 -0500 --- stunnel-5.12/src/options.c 2015-03-19 05:51:04.000000000 -0400
+++ stunnel-5.10-patch/src/options.c 2015-01-28 13:45:17.092470182 -0500 +++ stunnel-5.12-patched/src/options.c 2015-03-30 15:35:45.269490096 -0400
@@ -465,8 +465,12 @@ NOEXPORT char *parse_global_option(CMD c @@ -468,8 +468,12 @@ NOEXPORT char *parse_global_option(CMD c
case CMD_BEGIN: case CMD_BEGIN:
new_global_options.debug_level=LOG_NOTICE; new_service_options.log_level=LOG_NOTICE;
#if !defined (USE_WIN32) && !defined (__vms) #if !defined (USE_WIN32) && !defined (__vms)
+#if defined(LOG_AUTHPRIV) +#if defined(LOG_AUTHPRIV)
+ new_global_options.facility=LOG_AUTHPRIV; + new_global_options.log_facility=LOG_AUTHPRIV;
+#else +#else
new_global_options.facility=LOG_DAEMON; new_global_options.log_facility=LOG_DAEMON;
#endif #endif
+#endif +#endif
break; break;

View File

@ -1,6 +1,6 @@
Summary: An SSL-encrypting socket wrapper Summary: An SSL-encrypting socket wrapper
Name: stunnel Name: stunnel
Version: 5.11 Version: 5.12
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/Internet Group: Applications/Internet
@ -113,6 +113,9 @@ cp $RPM_BUILD_ROOT%{_datadir}/doc/stunnel/examples/%{name}.service $RPM_BUILD_RO
%endif %endif
%changelog %changelog
* Sat Mar 28 2015 Avesh Agarwal <avagarwa@redhat.com> - 5.12-1
- New upstream release 5.12.
* Fri Mar 27 2015 Avesh Agarwal <avagarwa@redhat.com> - 5.11-1 * Fri Mar 27 2015 Avesh Agarwal <avagarwa@redhat.com> - 5.11-1
- New upstream release 5.11. - New upstream release 5.11.