rpm/openvpn
SHA256
1
0
Fork 0
forked from pool/openvpn
Code Pull Requests Activity

- Add --askpass to ExecStart, so that the user name and password

Browse Source 
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
This commit is contained in:
Reinhard Max 2018-02-13 18:21:21 +00:00 committed by Git OBS Bridge
parent 2481fda7a6
commit f33ffa2f73
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openvpn.changes
View File

@ -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 Thu Nov 23 13:52:15 UTC 2017 - rbrown@suse.com

2
openvpn.service
View File

@ -7,7 +7,7 @@ PartOf=openvpn.target
Type=forking Type=forking
PrivateTmp=true PrivateTmp=true
PIDFile=/var/run/openvpn/%i.pid 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 ExecReload=/sbin/killproc -p /var/run/openvpn/%i.pid -HUP /usr/sbin/openvpn
[Install] [Install]

7
openvpn.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package openvpn # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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}} rm -rf %{buildroot}%{_datadir}/doc/{OpenVPN,%{name}}
find sample -name .gitignore | xargs rm -f find sample -name .gitignore | xargs rm -f
%pre
%service_add_pre %{name}.target
%post %post
%if %{with_systemd} %if %{with_systemd}
systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf ||: systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf ||:
@ -262,7 +265,7 @@ rm -f %{_sysconfdir}/sysconfig/openvpn || :
%postun %postun
%if %{with_systemd} %if %{with_systemd}
/bin/systemctl --system daemon-reload &>/dev/null || : %service_del_postun %{name}.target
%else %else
%{?insserv_cleanup:%insserv_cleanup} %{?insserv_cleanup:%insserv_cleanup}
%endif %endif