diff --git a/.gitignore b/.gitignore index ec6f29c..dee46c3 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,6 @@ stunnel-4.33.tar.gz.asc /stunnel-5.06.tar.gz /stunnel-5.06.tar.gz.asc /stunnel-5.06.tar.gz.sha256 +/stunnel-5.07.tar.gz +/stunnel-5.07.tar.gz.asc +/stunnel-5.07.tar.gz.sha256 diff --git a/sources b/sources index 40b00a9..f683c15 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -827901cd4690796eadf17f792b658573 stunnel-5.06.tar.gz -07d1fe45d4c31736544effcebbcf613f stunnel-5.06.tar.gz.asc -2338a68ef941c0eb2d15b11afa7460dd stunnel-5.06.tar.gz.sha256 +c10edd84ecbc676a5a48c7e34ab3d1c5 stunnel-5.07.tar.gz +093109004dac95ca55bb474adee367d4 stunnel-5.07.tar.gz.asc +5f04a5c7d4d683418dcc0c9627085ba8 stunnel-5.07.tar.gz.sha256 diff --git a/stunnel-5-authpriv.patch b/stunnel-5-authpriv.patch index 2987b11..0a86711 100644 --- a/stunnel-5-authpriv.patch +++ b/stunnel-5-authpriv.patch @@ -1,7 +1,7 @@ -diff -urNp stunnel-5.06/doc/stunnel.8 stunnel-5.06-patched/doc/stunnel.8 ---- stunnel-5.06/doc/stunnel.8 2014-10-15 07:40:09.000000000 -0400 -+++ stunnel-5.06-patched/doc/stunnel.8 2014-10-17 12:52:12.451980439 -0400 -@@ -202,7 +202,7 @@ info (6), or debug (7). All logs for th +diff -urNp stunnel-5.07/doc/stunnel.8 stunnel-5.07-patched/doc/stunnel.8 +--- stunnel-5.07/doc/stunnel.8 2014-11-01 09:50:37.000000000 -0400 ++++ stunnel-5.07-patched/doc/stunnel.8 2014-11-04 14:16:19.120854038 -0500 +@@ -193,7 +193,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). .Sp @@ -10,21 +10,21 @@ diff -urNp stunnel-5.06/doc/stunnel.8 stunnel-5.06-patched/doc/stunnel.8 (Facilities are not supported on Win32.) .Sp Case is ignored for both facilities and levels. -diff -urNp stunnel-5.06/doc/stunnel.html stunnel-5.06-patched/doc/stunnel.html ---- stunnel-5.06/doc/stunnel.html 2014-10-15 07:40:09.000000000 -0400 -+++ stunnel-5.06-patched/doc/stunnel.html 2014-10-17 12:54:46.116011603 -0400 -@@ -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).

- --

The syslog facility 'daemon' will be used unless a facility name is supplied. (Facilities are not supported on Win32.)

-+

The syslog facility 'authpriv' will be used unless a facility name is supplied. (Facilities are not supported on Win32.)

- +diff -urNp stunnel-5.07/doc/stunnel.html stunnel-5.07-patched/doc/stunnel.html +--- stunnel-5.07/doc/stunnel.html 2014-11-01 09:50:37.000000000 -0400 ++++ stunnel-5.07-patched/doc/stunnel.html 2014-11-04 14:17:31.654925879 -0500 +@@ -229,7 +229,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 + 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-5.06/doc/stunnel.pod stunnel-5.06-patched/doc/stunnel.pod ---- stunnel-5.06/doc/stunnel.pod 2014-10-15 07:40:09.000000000 -0400 -+++ stunnel-5.06-patched/doc/stunnel.pod 2014-10-17 12:52:12.453979963 -0400 + +diff -urNp stunnel-5.07/doc/stunnel.pod stunnel-5.07-patched/doc/stunnel.pod +--- stunnel-5.07/doc/stunnel.pod 2014-10-31 11:39:57.000000000 -0400 ++++ stunnel-5.07-patched/doc/stunnel.pod 2014-11-04 14:18:19.456314002 -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.06/doc/stunnel.pod stunnel-5.06-patched/doc/stunnel.pod (Facilities are not supported on Win32.) Case is ignored for both facilities and levels. -diff -urNp stunnel-5.06/src/options.c stunnel-5.06-patched/src/options.c ---- stunnel-5.06/src/options.c 2014-10-15 16:55:07.000000000 -0400 -+++ stunnel-5.06-patched/src/options.c 2014-10-17 12:52:12.455979492 -0400 -@@ -451,8 +451,12 @@ NOEXPORT char *parse_global_option(CMD c +diff -urNp stunnel-5.07/src/options.c stunnel-5.07-patched/src/options.c +--- stunnel-5.07/src/options.c 2014-11-01 09:47:18.000000000 -0400 ++++ stunnel-5.07-patched/src/options.c 2014-11-04 14:19:11.153652725 -0500 +@@ -461,8 +461,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 8fadc8a..352e011 100644 --- a/stunnel-5-sample.patch +++ b/stunnel-5-sample.patch @@ -1,16 +1,16 @@ -diff -urNp stunnel-5.06/tools/stunnel.conf-sample.in stunnel-5.06-patched/tools/stunnel.conf-sample.in ---- stunnel-5.06/tools/stunnel.conf-sample.in 2014-10-15 08:04:20.000000000 -0400 -+++ stunnel-5.06-patched/tools/stunnel.conf-sample.in 2014-10-17 12:57:26.867990547 -0400 -@@ -9,7 +9,7 @@ - +diff -urNp stunnel-5.07/tools/stunnel.conf-sample.in stunnel-5.07-patched/tools/stunnel.conf-sample.in +--- stunnel-5.07/tools/stunnel.conf-sample.in 2014-11-01 09:48:17.000000000 -0400 ++++ stunnel-5.07-patched/tools/stunnel.conf-sample.in 2014-11-04 14:12:38.382678119 -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 + ; Remember also to update the logrotate configuration. -;chroot = @prefix@/var/lib/stunnel/ +;chroot = @localstatedir@/run/stunnel/ ; Chroot jail can be escaped if setuid option is not used - setuid = nobody - setgid = @DEFAULT_GROUP@ -@@ -26,8 +26,8 @@ setgid = @DEFAULT_GROUP@ + ;setuid = nobody + ;setgid = @DEFAULT_GROUP@ +@@ -27,8 +27,8 @@ ; ************************************************************************** ; Certificate/key is needed in server mode and optional in client mode @@ -21,7 +21,7 @@ diff -urNp stunnel-5.06/tools/stunnel.conf-sample.in stunnel-5.06-patched/tools/ ; Authentication stuff needs to be configured to prevent MITM attacks ; It is not enabled by default! -@@ -36,12 +36,13 @@ cert = @prefix@/etc/stunnel/mail.pem +@@ -37,12 +37,13 @@ cert = @prefix@/etc/stunnel/mail.pem ; CApath is located inside chroot jail ;CApath = /certs ; It's often easier to use CAfile diff --git a/stunnel-systemd-service.patch b/stunnel-systemd-service.patch index 097982e..6c8ceca 100644 --- a/stunnel-systemd-service.patch +++ b/stunnel-systemd-service.patch @@ -1,6 +1,6 @@ -diff -urNp stunnel-5.06/tools/stunnel.service.in stunnel-5.06-patched/tools/stunnel.service.in ---- stunnel-5.06/tools/stunnel.service.in 2011-05-02 18:07:34.000000000 -0400 -+++ stunnel-5.06-patched/tools/stunnel.service.in 2014-10-17 12:35:58.563257947 -0400 +diff -urNp stunnel-5.07/tools/stunnel.service.in stunnel-5.07-patched/tools/stunnel.service.in +--- stunnel-5.07/tools/stunnel.service.in 2011-05-02 18:07:34.000000000 -0400 ++++ stunnel-5.07-patched/tools/stunnel.service.in 2014-11-04 14:21:15.825057474 -0500 @@ -1,10 +1,11 @@ [Unit] Description=SSL tunnel for network daemons diff --git a/stunnel.spec b/stunnel.spec index eb4a08f..a951c4c 100644 --- a/stunnel.spec +++ b/stunnel.spec @@ -1,6 +1,6 @@ Summary: An SSL-encrypting socket wrapper Name: stunnel -Version: 5.06 +Version: 5.07 Release: 1%{?dist} License: GPLv2 Group: Applications/Internet @@ -106,6 +106,9 @@ cp $RPM_BUILD_ROOT%{_datadir}/doc/stunnel/examples/%{name}.service $RPM_BUILD_RO %endif %changelog +* Tue Nov 04 2014 Avesh Agarwal - 5.07-1 +- New upstream release 5.07 + * Fri Oct 17 2014 Avesh Agarwal - 5.06-1 - New upstream release 5.06 - Addresses Poodle security issue