From 347e382da0700aea774c1f8a6a629081892fff863cdf18354f64897e0aae6239 Mon Sep 17 00:00:00 2001
From: Andreas Vetter <vetter@physik.uni-wuerzburg.de>
Date: Fri, 11 Dec 2020 19:52:27 +0000
Subject: [PATCH] Accepting request 851865 from
 home:asvetter:branches:security:Stunnel

- Remove pidfile from service file fixes start bug: boo#1178533

OBS-URL: https://build.opensuse.org/request/show/851865
OBS-URL: https://build.opensuse.org/package/show/security:Stunnel/stunnel?expand=0&rev=120
---
 stunnel.changes |  5 +++++
 stunnel.service | 14 --------------
 stunnel.spec    |  3 +--
 3 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 stunnel.service

diff --git a/stunnel.changes b/stunnel.changes
index f82e10a..84100e9 100644
--- a/stunnel.changes
+++ b/stunnel.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 30 14:36:45 UTC 2020 - Andreas Vetter <vetter@physik.uni-wuerzburg.de>
+
+- Remove pidfile from service file fixes start bug: boo#1178533
+
 -------------------------------------------------------------------
 Sun Oct 11 18:05:36 UTC 2020 - Michael Ströder <michael@stroeder.com>
 
diff --git a/stunnel.service b/stunnel.service
deleted file mode 100644
index e853cca..0000000
--- a/stunnel.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=TLS tunnel for network daemons
-Wants=network-online.target
-After=syslog.target network-online.target
-
-[Service]
-ExecStart=/usr/sbin/stunnel
-Type=forking
-# stunnel is chrooted, so pidpath is combination of 2 configfile options
-PIDFile=/var/lib/stunnel/var/run/stunnel.pid
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/stunnel.spec b/stunnel.spec
index 11d3ee3..b0efeeb 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -50,7 +50,6 @@ Source1:        https://www.stunnel.org/downloads/%{name}-%{version}.tar.gz.asc
 Source2:        stunnel.keyring
 Source3:        sysconfig.syslog-stunnel
 Source4:        stunnel.rc
-Source5:        stunnel.service
 Source7:        stunnel.README
 BuildRequires:  libopenssl-devel
 BuildRequires:  tcpd-devel
@@ -111,7 +110,7 @@ mkdir -p %{buildroot}%{_docdir}/stunnel/tools
 mkdir -p %{buildroot}%{_fillupdir}
 cp -p %{SOURCE3} %{buildroot}%{_fillupdir}/
 %if 0%{?has_systemd}
-install -D -m 0644 %{_sourcedir}/stunnel.service %{buildroot}/%{_unitdir}/stunnel.service
+install -D -m 0644 %{buildroot}%{_docdir}/stunnel/examples/stunnel.service %{buildroot}/%{_unitdir}/stunnel.service
 ln -s service %{buildroot}%{_sbindir}/rcstunnel
 %else
 mkdir -p %{buildroot}%{_initddir}/