rpms/openvpn/EL-5 openvpn-script-security.patch, 1.1, 1.2 openvpn.spec, 1.29, 1.30

[Robert Scheck]

Author: robert

Update of /cvs/pkgs/rpms/openvpn/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5662/EL-5

Modified Files:
	openvpn-script-security.patch openvpn.spec 
Log Message:
Added script_security initialisation in initscript (#458594 #c20)


openvpn-script-security.patch:
 openvpn.init |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: openvpn-script-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/EL-5/openvpn-script-security.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openvpn-script-security.patch	30 Nov 2008 14:37:40 -0000	1.1
+++ openvpn-script-security.patch	25 Oct 2009 11:13:28 -0000	1.2
@@ -1,11 +1,12 @@
 --- openvpn-2.1_rc9/sample-scripts/openvpn.init.orig	2008-06-13 02:54:58.000000000 -0500
 +++ openvpn-2.1_rc9/sample-scripts/openvpn.init	2008-08-13 13:51:46.000000000 -0500
-@@ -151,7 +151,11 @@
+@@ -151,7 +151,12 @@
  		. $bn.sh
  	    fi
  	    rm -f $piddir/$bn.pid
 -	    $openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work
 +            # Handle backward compatibility, see Red Hat Bugzilla ID #458594
++            script_security=''
 +            if [ -z "$( grep '^[[:space:]]*script-security[[:space:]]' $c )" ]; then
 +                script_security="--script-security 3"
 +            fi


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/EL-5/openvpn.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- openvpn.spec	30 Nov 2008 14:37:40 -0000	1.29
+++ openvpn.spec	25 Oct 2009 11:13:28 -0000	1.30
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.29%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.30%{?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
@@ -168,6 +168,9 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Sun Oct 25 2009 Robert Scheck <robert at fedoraproject.org> 2.1-0.30
+- Added script_security initialisation in initscript (#458594 #c20)
+
 * Sat Nov 29 2008 Robert Scheck <robert at fedoraproject.org> 2.1-0.29
 - Update to 2.1_rc15