From 3a32e51ddc2f51fe3b983f1edafbb19fe04a5409 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Sun, 25 Oct 2009 11:13:29 +0000
Subject: [PATCH] Added script_security initialisation in initscript (#458594
 #c20)

---
 openvpn-script-security.patch | 3 ++-
 openvpn.spec                  | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/openvpn-script-security.patch b/openvpn-script-security.patch
index 693f0cf..6d5e15b 100644
--- a/openvpn-script-security.patch
+++ b/openvpn-script-security.patch
@@ -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 2"
 +            fi
diff --git a/openvpn.spec b/openvpn.spec
index c3c6b16..9b24650 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.36%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.37%{?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
@@ -170,6 +170,9 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Sun Oct 25 2009 Robert Scheck <robert@fedoraproject.org> 2.1-0.37.rc20
+- Added script_security initialisation in initscript (#458594 #c20)
+
 * Fri Oct 02 2009 Steven Pritchard <steve@kspei.com> 2.1-0.36.rc20
 - Update to 2.1_rc20.