Accepting request 887332 from security:Stunnel

OBS-URL: https://build.opensuse.org/request/show/887332
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/stunnel?expand=0&rev=26

stunnel-5.59_service_always_after_network.patch

@@ -0,0 +1,11 @@
+diff -ur stunnel-5.59/tools/stunnel.service.in stunnel-5.59_fix/tools/stunnel.service.in
+--- stunnel-5.59/tools/stunnel.service.in	2020-10-11 18:18:00.000000000 +0200
++++ stunnel-5.59_fix/tools/stunnel.service.in	2021-04-13 16:34:16.354160390 +0200
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=TLS tunnel for network daemons
+ After=syslog.target network-online.target
++Wants=syslog.target network-online.target
+ 
+ [Service]
+ ExecStart=@bindir@/stunnel

stunnel.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 13 14:35:20 UTC 2021 - Dirk Stoecker <opensuse@dstoecker.de>
+
+- ensure proper startup after network: stunnel-5.59_service_always_after_network.patch
+
 -------------------------------------------------------------------
 Thu Apr  8 09:24:35 UTC 2021 - Andreas Vetter <vetter@physik.uni-wuerzburg.de>
 

stunnel.spec

@@ -29,7 +29,7 @@ BuildRequires:  pkgconfig(systemd)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(pre):  %insserv_prereq
 Requires(pre):  /usr/sbin/useradd
-# %{_sbindir} does not work here!
+# macro _sbindir does not work here!
 
 %endif
 
@@ -51,6 +51,8 @@ Source2:        https://www.stunnel.org/pgp.asc#/%{name}.keyring
 Source3:        sysconfig.syslog-stunnel
 Source4:        stunnel.rc
 Source7:        stunnel.README
+# PATCH-FIX-UPSTREAM Fix service file, so it ensure we are starting after network is really up!
+Patch1:         stunnel-5.59_service_always_after_network.patch
 BuildRequires:  libopenssl-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  zlib-devel
@@ -84,6 +86,7 @@ This package contains additional documentation for the stunnel program.
 
 %prep
 %setup -q -n stunnel-%{version}
+%patch1 -p1
 chmod -x %{_builddir}/stunnel-%{version}/tools/ca.*
 chmod -x %{_builddir}/stunnel-%{version}/tools/importCA.*