From f33ffa2f739bdc658c874703ea2dd835d97038d051a89272461c05fa76d0677b Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Tue, 13 Feb 2018 18:21:21 +0000
Subject: [PATCH] - Add --askpass to ExecStart, so that the user name and
 password   are correctly being queried from the user.   (bsc#1078026,
 boo#985798, boo#1031748) - Use %service_add/del macros throughout
 (bsc#1038406).

OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=131
---
 openvpn.changes | 8 ++++++++
 openvpn.service | 2 +-
 openvpn.spec    | 7 +++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/openvpn.changes b/openvpn.changes
index bb7c8f6..9f1f1db 100644
--- a/openvpn.changes
+++ b/openvpn.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Feb 13 17:49:09 UTC 2018 - max@suse.com
+
+- Add --askpass to ExecStart, so that the user name and password
+  are correctly being queried from the user.
+  (bsc#1078026, boo#985798, boo#1031748)
+- Use %service_add/del macros throughout (bsc#1038406).
+
 -------------------------------------------------------------------
 Thu Nov 23 13:52:15 UTC 2017 - rbrown@suse.com
 
diff --git a/openvpn.service b/openvpn.service
index 71ec1d8..496d838 100644
--- a/openvpn.service
+++ b/openvpn.service
@@ -7,7 +7,7 @@ PartOf=openvpn.target
 Type=forking
 PrivateTmp=true
 PIDFile=/var/run/openvpn/%i.pid
-ExecStart=/usr/sbin/openvpn --daemon --suppress-timestamps --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf
+ExecStart=/usr/sbin/openvpn --daemon --askpass --suppress-timestamps --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf
 ExecReload=/sbin/killproc -p /var/run/openvpn/%i.pid -HUP /usr/sbin/openvpn
 
 [Install]
diff --git a/openvpn.spec b/openvpn.spec
index 7927647..943fa8c 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openvpn
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -211,6 +211,9 @@ install -m 755 $RPM_SOURCE_DIR/client-netconfig.down sample/sample-scripts/clien
 rm -rf %{buildroot}%{_datadir}/doc/{OpenVPN,%{name}}
 find sample -name .gitignore | xargs rm -f
 
+%pre
+%service_add_pre %{name}.target
+
 %post
 %if %{with_systemd}
 systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf ||:
@@ -262,7 +265,7 @@ rm -f %{_sysconfdir}/sysconfig/openvpn || :
 
 %postun
 %if %{with_systemd}
-/bin/systemctl --system daemon-reload &>/dev/null || :
+%service_del_postun %{name}.target
 %else
 %{?insserv_cleanup:%insserv_cleanup}
 %endif