rpms/openvpn/EL-5 openvpn-script-security.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 openvpn.spec, 1.28, 1.29 sources, 1.17, 1.18

[Robert Scheck]

Author: robert

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

Modified Files:
	.cvsignore openvpn.spec sources 
Added Files:
	openvpn-script-security.patch 
Log Message:
- Update to 2.1_rc15
- Add "--script-security 2" by default for backwards compatibility (see bug #458594)


openvpn-script-security.patch:

--- NEW FILE openvpn-script-security.patch ---
--- 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 @@
 		. $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
+            if [ -z "$( grep '^[[:space:]]*script-security[[:space:]]' $c )" ]; then
+                script_security="--script-security 3"
+            fi
+	    $openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work $script_security
 	    if [ $? = 0 ]; then
 		successes=1
 	    else


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/EL-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Aug 2008 17:06:27 -0000	1.17
+++ .cvsignore	30 Nov 2008 14:37:40 -0000	1.18
@@ -1,2 +1,2 @@
-openvpn-2.1_rc9.tar.gz
-openvpn-2.1_rc9.tar.gz.asc
+openvpn-2.1_rc15.tar.gz
+openvpn-2.1_rc15.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/EL-5/openvpn.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- openvpn.spec	1 Aug 2008 17:06:27 -0000	1.28
+++ openvpn.spec	30 Nov 2008 14:37:40 -0000	1.29
@@ -1,10 +1,10 @@
-%define prerelease rc9
+%define prerelease rc15
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.27%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.29%{?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
@@ -17,6 +17,7 @@
 Source3:           roadwarrior-client.conf
 # Don't start openvpn by default.
 Patch0:            openvpn-init.patch
+Patch1:            openvpn-script-security.patch
 License:           GPLv2
 Group:             Applications/Internet
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-%(id -un)
@@ -51,6 +52,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease:_%{prerelease}}
 %patch0 -p0
+%patch1 -p1
 sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' openvpn.8
 
 # %%doc items shouldn't be executable.
@@ -166,6 +168,13 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Sat Nov 29 2008 Robert Scheck <robert at fedoraproject.org> 2.1-0.29
+- Update to 2.1_rc15
+
+* Wed Aug 13 2008 Steven Pritchard <steve at kspei.com> 2.1-0.28
+- Add "--script-security 2" by default for backwards compatibility
+  (see bug #458594).
+
 * Fri Aug 01 2008 Steven Pritchard <steve at kspei.com> 2.1-0.27.rc9
 - Update to 2.1_rc9.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/EL-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Aug 2008 17:06:27 -0000	1.17
+++ sources	30 Nov 2008 14:37:40 -0000	1.18
@@ -1,2 +1,2 @@
-f435e4ad43cf4323e942da570bae4951  openvpn-2.1_rc9.tar.gz
-8354d0c77fc5bfe12aa286a87efb6f71  openvpn-2.1_rc9.tar.gz.asc
+14a35b05c5a16292d149592d1dad0302  openvpn-2.1_rc15.tar.gz
+148c13b3c0f6d5eef99755df7bf84526  openvpn-2.1_rc15.tar.gz.asc