From d091f78ed58400bb2c6e7c9170d0008462bc2c41 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Jul 31 2013 16:56:40 +0000 Subject: Merge branch 'el6' into el5 --- diff --git a/openvpn.init b/openvpn.init index a21bf57..64bbae6 100644 --- a/openvpn.init +++ b/openvpn.init @@ -170,7 +170,7 @@ case "$1" in if [ -z "$( grep '^[[:space:]]*script-security[[:space:]]' $c )" ]; then script_security="--script-security 2" fi - $openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work $script_security + $openvpn --daemon --writepid $piddir/$bn.pid --cd $work --config $c $script_security if [ $? = 0 ]; then successes=1 else diff --git a/openvpn.spec b/openvpn.spec index 79aff39..cc98cae 100644 --- a/openvpn.spec +++ b/openvpn.spec @@ -4,7 +4,7 @@ Name: openvpn Version: 2.3.1 -Release: 3%{?prerelease:.%{prerelease}}%{?dist} +Release: 4%{?prerelease:.%{prerelease}}%{?dist} Summary: A full-featured SSL VPN solution URL: http://openvpn.net/ #Source0: http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz @@ -185,6 +185,9 @@ fi %config %dir %{_sysconfdir}/%{name}/ %changelog +* Wed Jul 31 2013 Jon Ciesla 2.3.1-4 +- init script fix, BZ 988755. + * Fri May 24 2013 Jon Ciesla 2.3.1-3 - Symlink to old plugin locations.