New upstream release 5.50

.gitignore

@@ -108,3 +108,5 @@ stunnel-4.33.tar.gz.asc
 /stunnel-5.46.tar.gz.asc
 /stunnel-5.48.tar.gz
 /stunnel-5.48.tar.gz.asc
+/stunnel-5.50.tar.gz
+/stunnel-5.50.tar.gz.asc

sources

@@ -1,2 +1,2 @@
-SHA512 (stunnel-5.48.tar.gz) = 5e6669ecd6e9b49aa6ef82b9a4dc6a2193c975eef85262aba70c7f264ef1b4d15dc287a2baa94b71be063deddcd07a20a5347ed5280f044fc6f68c61429a24fa
+SHA512 (stunnel-5.50.tar.gz) = 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
-SHA512 (stunnel-5.48.tar.gz.asc) = 67c62523159fd9ac0c303fcf57128460ff459434c10a21adf548663c69935f0c695cb980b5bb9f205db786c628da17762876a3b37770f770b068c50ac55e0cb6
+SHA512 (stunnel-5.50.tar.gz.asc) = 033402ab2a47bd6d8594b8bf714f41bf80ecc59aceacdc5a741ed8fce3b1b563cc10db46e9ebe8fcb70f36c899c7cf5df9531c55f47194cc2180d9376022a86a

stunnel-5.40-systemd-service.patch

@@ -1,17 +0,0 @@
-diff --git a/tools/stunnel.service.in b/tools/stunnel.service.in
-index 53ad3e7..620a0e7 100644
---- a/tools/stunnel.service.in
-+++ b/tools/stunnel.service.in
-@@ -1,10 +1,11 @@
- [Unit]
- Description=TLS tunnel for network daemons
--After=syslog.target
-+After=syslog.target network.target
- 
- [Service]
- ExecStart=@bindir@/stunnel
- Type=forking
-+PrivateTmp=true
- 
- [Install]
- WantedBy=multi-user.target

stunnel-5.50-authpriv.patch

@@ -1,8 +1,7 @@
-diff --git a/doc/stunnel.8.in b/doc/stunnel.8.in
+diff -up stunnel-5.50/doc/stunnel.8.in.authpriv stunnel-5.50/doc/stunnel.8.in
-index a00cc78..85a0123 100644
+--- stunnel-5.50/doc/stunnel.8.in.authpriv	2018-12-02 23:47:20.000000000 +0100
---- a/doc/stunnel.8.in
++++ stunnel-5.50/doc/stunnel.8.in	2019-01-14 12:15:05.135100163 +0100
-+++ b/doc/stunnel.8.in
+@@ -200,7 +200,7 @@ info (6), or debug (7).  All logs for th
-@@ -204,7 +204,7 @@ info (6), or debug (7).  All logs for the specified level and
  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
@@ -11,10 +10,9 @@ index a00cc78..85a0123 100644
  (Facilities are not supported on Win32.)
  .Sp
  Case is ignored for both facilities and levels.
-diff --git a/doc/stunnel.html.in b/doc/stunnel.html.in
+diff -up stunnel-5.50/doc/stunnel.html.in.authpriv stunnel-5.50/doc/stunnel.html.in
-index b7a0663..6bb01cd 100644
+--- stunnel-5.50/doc/stunnel.html.in.authpriv	2018-12-02 23:47:21.000000000 +0100
---- a/doc/stunnel.html.in
++++ stunnel-5.50/doc/stunnel.html.in	2019-01-14 12:15:05.136100146 +0100
-+++ b/doc/stunnel.html.in
 @@ -244,7 +244,7 @@
  
  <p>Level is 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>
@@ -24,11 +22,10 @@ index b7a0663..6bb01cd 100644
  
  <p>Case is ignored for both facilities and levels.</p>
  
-diff --git a/doc/stunnel.pod.in b/doc/stunnel.pod.in
+diff -up stunnel-5.50/doc/stunnel.pod.in.authpriv stunnel-5.50/doc/stunnel.pod.in
-index 42d3a33..3806b5a 100644
+--- stunnel-5.50/doc/stunnel.pod.in.authpriv	2018-12-02 23:47:18.000000000 +0100
---- a/doc/stunnel.pod.in
++++ stunnel-5.50/doc/stunnel.pod.in	2019-01-14 12:15:05.136100146 +0100
-+++ b/doc/stunnel.pod.in
+@@ -192,7 +192,7 @@ info (6), or debug (7).  All logs for th
-@@ -192,7 +192,7 @@ 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> or
  I<debug = 7> for greatest debugging output.  The default is notice (5).
  
@@ -37,12 +34,11 @@ index 42d3a33..3806b5a 100644
  (Facilities are not supported on Win32.)
  
  Case is ignored for both facilities and levels.
-diff --git a/src/options.c b/src/options.c
+diff -up stunnel-5.50/src/options.c.authpriv stunnel-5.50/src/options.c
-index 5881486..345d274 100644
+--- stunnel-5.50/src/options.c.authpriv	2019-01-14 12:15:05.136100146 +0100
---- a/src/options.c
++++ stunnel-5.50/src/options.c	2019-01-14 12:16:25.537727511 +0100
-+++ b/src/options.c
+@@ -1745,8 +1745,12 @@ NOEXPORT char *parse_service_option(CMD
-@@ -1554,8 +1554,12 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS *section,
+     case CMD_SET_DEFAULTS:
-     case CMD_BEGIN:
          section->log_level=LOG_NOTICE;
  #if !defined (USE_WIN32) && !defined (__vms)
 +#if defined(LOG_AUTHPRIV)
@@ -52,5 +48,5 @@ index 5881486..345d274 100644
  #endif
 +#endif
          break;
-     case CMD_EXEC:
+     case CMD_SET_COPY:
-         if(strcasecmp(opt, "debug"))
+         section->log_level=new_service_options.log_level;

stunnel-5.50-systemd-service.patch

@@ -0,0 +1,11 @@
+diff -up stunnel-5.50/tools/stunnel.service.in.systemd-service stunnel-5.50/tools/stunnel.service.in
+--- stunnel-5.50/tools/stunnel.service.in.systemd-service	2019-01-14 12:17:15.826868965 +0100
++++ stunnel-5.50/tools/stunnel.service.in	2019-01-14 12:18:21.186753131 +0100
+@@ -5,6 +5,7 @@ After=syslog.target network.target
+ [Service]
+ ExecStart=@bindir@/stunnel
+ Type=forking
++PrivateTmp=true
+ 
+ [Install]
+ WantedBy=multi-user.target

stunnel.spec

@@ -9,7 +9,7 @@
 
 Summary: A TLS-encrypting socket wrapper
 Name: stunnel
-Version: 5.48
+Version: 5.50
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -22,8 +22,8 @@ Source4: stunnel-sfinger.conf
 Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
 Source7: stunnel@.service
-Patch0: stunnel-5.40-authpriv.patch
+Patch0: stunnel-5.50-authpriv.patch
-Patch1: stunnel-5.40-systemd-service.patch
+Patch1: stunnel-5.50-systemd-service.patch
 Patch3: stunnel-5.46-system-ciphers.patch
 # util-linux is needed for rename
 BuildRequires: gcc
@@ -135,6 +135,9 @@ make test
 %systemd_postun_with_restart %{name}.service
 
 %changelog
+* Mon Jan 14 2019 Tomáš Mráz <tmraz@redhat.com> - 5.50-1
+- New upstream release 5.50
+
 * Tue Jul 24 2018 Tomáš Mráz <tmraz@redhat.com> - 5.48-1
 - New upstream release 5.48