rpms/openvpn/F-12 .cvsignore, 1.25, 1.26 openvpn-script-security.patch, 1.1, 1.2 openvpn.spec, 1.47, 1.48 sources, 1.25, 1.26

[Robert Scheck]

Author: robert

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	7 Sep 2009 06:28:03 -0000	1.25
+++ .cvsignore	25 Oct 2009 11:13:29 -0000	1.26
@@ -1,2 +1,2 @@
-openvpn-2.1_rc19.tar.gz
-openvpn-2.1_rc19.tar.gz.asc
+openvpn-2.1_rc20.tar.gz
+openvpn-2.1_rc20.tar.gz.asc

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/F-12/openvpn-script-security.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openvpn-script-security.patch	13 Aug 2008 19:06:32 -0000	1.1
+++ openvpn-script-security.patch	25 Oct 2009 11:13:29 -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 2"
 +            fi


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/F-12/openvpn.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- openvpn.spec	7 Sep 2009 06:28:04 -0000	1.47
+++ openvpn.spec	25 Oct 2009 11:13:29 -0000	1.48
@@ -1,10 +1,10 @@
-%define prerelease rc19
+%define prerelease rc20
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.35%{?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,12 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Sun Oct 25 2009 Robert Scheck <robert at fedoraproject.org> 2.1-0.37.rc20
+- Added script_security initialisation in initscript (#458594 #c20)
+
+* Fri Oct 02 2009 Steven Pritchard <steve at kspei.com> 2.1-0.36.rc20
+- Update to 2.1_rc20.
+
 * Sun Sep 06 2009 Kalev Lember <kalev at smartlink.ee> - 2.1-0.35.rc19
 - Update to 2.1_rc19
 - Build with pkcs11-helper


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	7 Sep 2009 06:28:04 -0000	1.25
+++ sources	25 Oct 2009 11:13:29 -0000	1.26
@@ -1,2 +1,2 @@
-ba2ee667a8b7606b125b7d32f47ca578  openvpn-2.1_rc19.tar.gz
-60dd63b0b37cabb5f467e1ededd013ce  openvpn-2.1_rc19.tar.gz.asc
+552038d36980470448bf1d701c9effc3  openvpn-2.1_rc20.tar.gz
+b04b1d058cb5dc3f65ca696bc5021278  openvpn-2.1_rc20.tar.gz.asc