From 72569ed79781c5c6a3d414adb5a70d9e07593336 Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Wed, 28 Jan 2015 14:17:07 -0500 Subject: [PATCH] New upstream release 5.10. --- .gitignore | 3 +++ sources | 6 +++--- stunnel-1155977.patch | 18 +++++++++--------- stunnel-5-authpriv.patch | 26 +++++++++++++------------- stunnel-5-sample.patch | 6 +++--- stunnel-configure-ac.patch | 8 ++++---- stunnel-systemd-service.patch | 6 +++--- stunnel.spec | 5 ++++- 8 files changed, 42 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index de7f0be..49d9cae 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,6 @@ stunnel-4.33.tar.gz.asc /stunnel-5.09.tar.gz /stunnel-5.09.tar.gz.asc /stunnel-5.09.tar.gz.sha256 +/stunnel-5.10.tar.gz +/stunnel-5.10.tar.gz.asc +/stunnel-5.10.tar.gz.sha256 diff --git a/sources b/sources index 1b6d810..ddfd20a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -deab04ec8b78ec3102b36113b28b4cce stunnel-5.09.tar.gz -8922fc83f531443eb6433e926aa5b5ad stunnel-5.09.tar.gz.asc -f3ae9083a6b0fef49e4b4bd62bbd4128 stunnel-5.09.tar.gz.sha256 +a0edda805eb7d6ea600a230fb0979ea1 stunnel-5.10.tar.gz +623449203c4c5067f915176dfd11fe68 stunnel-5.10.tar.gz.asc +dffe5818b5e9b771bbab897d5de7cbd2 stunnel-5.10.tar.gz.sha256 diff --git a/stunnel-1155977.patch b/stunnel-1155977.patch index 0484992..6b7d263 100644 --- a/stunnel-1155977.patch +++ b/stunnel-1155977.patch @@ -1,6 +1,6 @@ -diff -urNp stunnel-5.08/doc/stunnel.8 stunnel-5.08-patched/doc/stunnel.8 ---- stunnel-5.08/doc/stunnel.8 2014-11-23 01:08:57.684130905 -0500 -+++ stunnel-5.08-patched/doc/stunnel.8 2014-11-23 01:43:02.455507077 -0500 +diff -urNp stunnel-5.10/doc/stunnel.8 stunnel-5.10-patch/doc/stunnel.8 +--- stunnel-5.10/doc/stunnel.8 2015-01-28 13:47:05.690115387 -0500 ++++ stunnel-5.10-patch/doc/stunnel.8 2015-01-28 13:53:39.932197076 -0500 @@ -383,7 +383,7 @@ If no host specified, defaults to all IP To listen on all IPv6 addresses use: .Sp @@ -10,9 +10,9 @@ diff -urNp stunnel-5.08/doc/stunnel.8 stunnel-5.08-patched/doc/stunnel.8 .Ve .IP "\fBCApath\fR = \s-1DIRECTORY\s0" 4 .IX Item "CApath = DIRECTORY" -diff -urNp stunnel-5.08/doc/stunnel.html stunnel-5.08-patched/doc/stunnel.html ---- stunnel-5.08/doc/stunnel.html 2014-11-23 01:08:57.684130905 -0500 -+++ stunnel-5.08-patched/doc/stunnel.html 2014-11-23 01:43:25.815207858 -0500 +diff -urNp stunnel-5.10/doc/stunnel.html stunnel-5.10-patch/doc/stunnel.html +--- stunnel-5.10/doc/stunnel.html 2015-01-28 13:47:05.691115375 -0500 ++++ stunnel-5.10-patch/doc/stunnel.html 2015-01-28 13:53:39.933197064 -0500 @@ -426,7 +426,7 @@

To listen on all IPv6 addresses use:

@@ -22,9 +22,9 @@ diff -urNp stunnel-5.08/doc/stunnel.html stunnel-5.08-patched/doc/stunnel.html
CApath = DIRECTORY
-diff -urNp stunnel-5.08/doc/stunnel.pod stunnel-5.08-patched/doc/stunnel.pod ---- stunnel-5.08/doc/stunnel.pod 2014-11-23 01:08:57.684130905 -0500 -+++ stunnel-5.08-patched/doc/stunnel.pod 2014-11-23 01:43:36.634069279 -0500 +diff -urNp stunnel-5.10/doc/stunnel.pod stunnel-5.10-patch/doc/stunnel.pod +--- stunnel-5.10/doc/stunnel.pod 2015-01-28 13:47:05.692115362 -0500 ++++ stunnel-5.10-patch/doc/stunnel.pod 2015-01-28 13:53:39.934197051 -0500 @@ -393,7 +393,7 @@ If no host specified, defaults to all IP To listen on all IPv6 addresses use: diff --git a/stunnel-5-authpriv.patch b/stunnel-5-authpriv.patch index 477795f..325b426 100644 --- a/stunnel-5-authpriv.patch +++ b/stunnel-5-authpriv.patch @@ -1,6 +1,6 @@ -diff -urNp stunnel-5.08/doc/stunnel.8 stunnel-5.08-patched/doc/stunnel.8 ---- stunnel-5.08/doc/stunnel.8 2014-11-15 10:25:48.000000000 -0500 -+++ stunnel-5.08-patched/doc/stunnel.8 2014-11-23 01:06:17.213015545 -0500 +diff -urNp stunnel-5.10/doc/stunnel.8 stunnel-5.10-patch/doc/stunnel.8 +--- stunnel-5.10/doc/stunnel.8 2015-01-22 12:00:02.000000000 -0500 ++++ stunnel-5.10-patch/doc/stunnel.8 2015-01-28 13:45:17.090470207 -0500 @@ -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 \&\fIdebug = 7\fR for greatest debugging output. The default is notice (5). @@ -10,9 +10,9 @@ diff -urNp stunnel-5.08/doc/stunnel.8 stunnel-5.08-patched/doc/stunnel.8 (Facilities are not supported on Win32.) .Sp Case is ignored for both facilities and levels. -diff -urNp stunnel-5.08/doc/stunnel.html stunnel-5.08-patched/doc/stunnel.html ---- stunnel-5.08/doc/stunnel.html 2014-11-15 10:25:48.000000000 -0500 -+++ stunnel-5.08-patched/doc/stunnel.html 2014-11-23 01:07:01.905520548 -0500 +diff -urNp stunnel-5.10/doc/stunnel.html stunnel-5.10-patch/doc/stunnel.html +--- stunnel-5.10/doc/stunnel.html 2015-01-22 12:00:03.000000000 -0500 ++++ stunnel-5.10-patch/doc/stunnel.html 2015-01-28 13:45:17.091470194 -0500 @@ -202,7 +202,7 @@

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 debug = debug or debug = 7 for greatest debugging output. The default is notice (5).

@@ -22,9 +22,9 @@ diff -urNp stunnel-5.08/doc/stunnel.html stunnel-5.08-patched/doc/stunnel.html

Case is ignored for both facilities and levels.

-diff -urNp stunnel-5.08/doc/stunnel.pod stunnel-5.08-patched/doc/stunnel.pod ---- stunnel-5.08/doc/stunnel.pod 2014-11-15 10:25:48.000000000 -0500 -+++ stunnel-5.08-patched/doc/stunnel.pod 2014-11-23 01:07:13.002397392 -0500 +diff -urNp stunnel-5.10/doc/stunnel.pod stunnel-5.10-patch/doc/stunnel.pod +--- stunnel-5.10/doc/stunnel.pod 2015-01-22 11:56:11.000000000 -0500 ++++ stunnel-5.10-patch/doc/stunnel.pod 2015-01-28 13:45:17.091470194 -0500 @@ -188,7 +188,7 @@ info (6), or debug (7). All logs for th all levels numerically less than it will be shown. Use I or I for greatest debugging output. The default is notice (5). @@ -34,10 +34,10 @@ diff -urNp stunnel-5.08/doc/stunnel.pod stunnel-5.08-patched/doc/stunnel.pod (Facilities are not supported on Win32.) Case is ignored for both facilities and levels. -diff -urNp stunnel-5.08/src/options.c stunnel-5.08-patched/src/options.c ---- stunnel-5.08/src/options.c 2014-11-14 13:55:39.000000000 -0500 -+++ stunnel-5.08-patched/src/options.c 2014-11-23 01:07:36.967131425 -0500 -@@ -461,8 +461,12 @@ NOEXPORT char *parse_global_option(CMD c +diff -urNp stunnel-5.10/src/options.c stunnel-5.10-patch/src/options.c +--- stunnel-5.10/src/options.c 2015-01-22 11:03:06.000000000 -0500 ++++ stunnel-5.10-patch/src/options.c 2015-01-28 13:45:17.092470182 -0500 +@@ -465,8 +465,12 @@ NOEXPORT char *parse_global_option(CMD c case CMD_BEGIN: new_global_options.debug_level=LOG_NOTICE; #if !defined (USE_WIN32) && !defined (__vms) diff --git a/stunnel-5-sample.patch b/stunnel-5-sample.patch index ec33264..368f9fb 100644 --- a/stunnel-5-sample.patch +++ b/stunnel-5-sample.patch @@ -1,6 +1,6 @@ -diff -urNp stunnel-5.08/tools/stunnel.conf-sample.in stunnel-5.08-patched/tools/stunnel.conf-sample.in ---- stunnel-5.08/tools/stunnel.conf-sample.in 2014-11-01 09:48:17.000000000 -0400 -+++ stunnel-5.08-patched/tools/stunnel.conf-sample.in 2014-11-23 01:09:28.393727451 -0500 +diff -urNp stunnel-5.10/tools/stunnel.conf-sample.in stunnel-5.10-patch/tools/stunnel.conf-sample.in +--- stunnel-5.10/tools/stunnel.conf-sample.in 2015-01-02 09:29:55.000000000 -0500 ++++ stunnel-5.10-patch/tools/stunnel.conf-sample.in 2015-01-28 13:47:25.946862677 -0500 @@ -10,7 +10,7 @@ ; A copy of some devices and system files is needed within the chroot jail ; Chroot conflicts with configuration file reload and many other features diff --git a/stunnel-configure-ac.patch b/stunnel-configure-ac.patch index fb11a61..ac5d44a 100644 --- a/stunnel-configure-ac.patch +++ b/stunnel-configure-ac.patch @@ -1,7 +1,7 @@ -diff -urNp stunnel-5.08/configure.ac stunnel-5.08-patched/configure.ac ---- stunnel-5.08/configure.ac 2014-11-10 05:39:19.000000000 -0500 -+++ stunnel-5.08-patched/configure.ac 2014-11-23 01:20:36.100644932 -0500 -@@ -361,7 +361,7 @@ AC_ARG_ENABLE(fips, +diff -urNp stunnel-5.10/configure.ac stunnel-5.10-patch/configure.ac +--- stunnel-5.10/configure.ac 2015-01-20 09:30:22.000000000 -0500 ++++ stunnel-5.10-patch/configure.ac 2015-01-28 13:50:46.282363420 -0500 +@@ -273,7 +273,7 @@ AC_ARG_ENABLE(fips, [ --disable-fips disable OpenSSL FIPS support], [ case "$enableval" in diff --git a/stunnel-systemd-service.patch b/stunnel-systemd-service.patch index 3a92ce5..edd918f 100644 --- a/stunnel-systemd-service.patch +++ b/stunnel-systemd-service.patch @@ -1,6 +1,6 @@ -diff -urNp stunnel-5.08/tools/stunnel.service.in stunnel-5.08-patched/tools/stunnel.service.in ---- stunnel-5.08/tools/stunnel.service.in 2011-05-02 18:07:34.000000000 -0400 -+++ stunnel-5.08-patched/tools/stunnel.service.in 2014-11-23 01:09:38.778591018 -0500 +diff -urNp stunnel-5.10/tools/stunnel.service.in stunnel-5.10-patch/tools/stunnel.service.in +--- stunnel-5.10/tools/stunnel.service.in 2011-05-02 18:07:34.000000000 -0400 ++++ stunnel-5.10-patch/tools/stunnel.service.in 2015-01-28 13:50:29.051578380 -0500 @@ -1,10 +1,11 @@ [Unit] Description=SSL tunnel for network daemons diff --git a/stunnel.spec b/stunnel.spec index bb61316..5a9c9b4 100644 --- a/stunnel.spec +++ b/stunnel.spec @@ -1,6 +1,6 @@ Summary: An SSL-encrypting socket wrapper Name: stunnel -Version: 5.09 +Version: 5.10 Release: 1%{?dist} License: GPLv2 Group: Applications/Internet @@ -113,6 +113,9 @@ cp $RPM_BUILD_ROOT%{_datadir}/doc/stunnel/examples/%{name}.service $RPM_BUILD_RO %endif %changelog +* Wed Jan 28 2015 Avesh Agarwal - 5.10-1 +- New upstream release 5.10. + * Thu Jan 8 2015 Avesh Agarwal - 5.09-1 - 1163349: New upstream release 5.09.