Accepting request 830245 from network:vpn

OBS-URL: https://build.opensuse.org/request/show/830245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openvpn?expand=0&rev=88

openvpn.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Aug 26 17:12:44 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Modernize openvpn.service
+  * /var/run has been obsoleted since a long time.
+  * on reload, send HUP signal directly rather than relying on
+    killproc to look for the main process.
+
+-------------------------------------------------------------------
+Wed Aug 26 17:00:43 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Explicitly requires sysvinit-tools as some of the tools shipped by
+  this package are used in various places regardless of whether
+  openvpn is built for systemd or non systemd systems.
+
+  For the context: sysvinit-tools was pulled in by systemd since 2014
+  but it's no longer the case so better to be safe than sorry.
+
 -------------------------------------------------------------------
 Wed Mar  4 07:30:38 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
 

openvpn.service

@@ -6,10 +6,10 @@ PartOf=openvpn.target
 [Service]
 Type=notify
 PrivateTmp=true
-PIDFile=/var/run/openvpn/%i.pid
+PIDFile=/run/openvpn/%i.pid
-ExecStart=/usr/sbin/openvpn --daemon openvpn@%i --suppress-timestamps --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf
+ExecStart=/usr/sbin/openvpn --daemon openvpn@%i --suppress-timestamps --writepid /run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf
 # boo#1142830: "reload" does not work if openvpn drops root privileges after startup.
-ExecReload=/sbin/killproc -p /var/run/openvpn/%i.pid -HUP /usr/sbin/openvpn
+ExecReload=/usr/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target openvpn.target

openvpn.spec

@@ -62,6 +62,7 @@ BuildRequires:  pkcs11-helper-devel >= 1.11
 BuildRequires:  xz
 Requires:       iproute2
 Requires:       pkcs11-helper >= 1.11
+Requires:       sysvinit-tools
 %if %{with_systemd}
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(systemd)