rpms/openvpn/F-12 openvpn-2.1.1-init.patch, NONE, 1.1 openvpn-2.1.1-initinfo.patch, NONE, 1.1 openvpn.spec, 1.48, 1.49 sources, 1.26, 1.27

[Jon Ciesla]

Author: limb

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

Modified Files:
	openvpn.spec sources 
Added Files:
	openvpn-2.1.1-init.patch openvpn-2.1.1-initinfo.patch 
Log Message:
- Fix init script *.sh sourcing, BZ 498348.
- Added init script info block, BZ 392991, BZ 541219.


openvpn-2.1.1-init.patch:
 openvpn.init |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openvpn-2.1.1-init.patch ---
--- sample-scripts/openvpn.init~	2010-01-04 08:30:35.000000000 -0600
+++ sample-scripts/openvpn.init	2010-01-04 15:53:29.503900367 -0600
@@ -153 +153 @@
-		. $bn.sh
+		. ./$bn.sh

openvpn-2.1.1-initinfo.patch:
 openvpn.init |   13 +++++++++++++
 1 file changed, 13 insertions(+)

--- NEW FILE openvpn-2.1.1-initinfo.patch ---
--- sample-scripts/openvpn.init~	2010-01-04 16:52:25.000000000 -0600
+++ sample-scripts/openvpn.init	2010-01-05 05:48:24.043085950 -0600
@@ -15,0 +16,13 @@
+### BEGIN INIT INFO
+# Provides: openvpn
+# Required-Start: $network
+# Required-Stop: $network
+# Short-Description: start and stop openvpn
+# Description: OpenVPN is a robust and highly flexible tunneling \
+#              application that uses all of the encryption, \
+#              authentication, and certification features of the OpenSSL \
+#              library to securely tunnel IP networks over a single UDP \
+#              port.
+### END INIT INFO
+
+


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/F-12/openvpn.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- openvpn.spec	25 Oct 2009 11:13:29 -0000	1.48
+++ openvpn.spec	5 Jan 2010 15:09:39 -0000	1.49
@@ -1,10 +1,10 @@
-%define prerelease rc20
+#define prerelease rc22
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
-Version:           2.1
-Release:           0.37%{?prerelease:.%{prerelease}}%{?dist}
+Version:           2.1.1
+Release:           2%{?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
@@ -18,6 +18,8 @@ Source3:           roadwarrior-client.co
 # Don't start openvpn by default.
 Patch0:            openvpn-init.patch
 Patch1:            openvpn-script-security.patch
+Patch2:            openvpn-2.1.1-init.patch
+Patch3:            openvpn-2.1.1-initinfo.patch
 License:           GPLv2
 Group:             Applications/Internet
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-%(id -un)
@@ -54,6 +56,9 @@ for compression.
 %setup -q -n %{name}-%{version}%{?prerelease:_%{prerelease}}
 %patch0 -p0
 %patch1 -p1
+%patch2 -p0
+%patch3 -p0
+
 sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' openvpn.8
 
 # %%doc items shouldn't be executable.
@@ -170,6 +175,19 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Mon Jan 04 2010 Jon Ciesla <limb at jcomserv.net> 2.1.1-2
+- Fix init script *.sh sourcing, BZ 498348.
+- Added init script info block, BZ 392991, BZ 541219.
+
+* Fri Dec 11 2009 Steven Pritchard <steve at kspei.com> 2.1.1-1
+- Update to 2.1.1.
+
+* Sat Nov 21 2009 Steven Pritchard <steve at kspei.com> 2.1-0.39.rc22
+- Update to 2.1_rc22.
+
+* Thu Nov 12 2009 Steven Pritchard <steve at kspei.com> 2.1-0.38.rc21
+- Update to 2.1_rc21.
+
 * Sun Oct 25 2009 Robert Scheck <robert at fedoraproject.org> 2.1-0.37.rc20
 - Added script_security initialisation in initscript (#458594 #c20)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	25 Oct 2009 11:13:29 -0000	1.26
+++ sources	5 Jan 2010 15:09:39 -0000	1.27
@@ -1,2 +1,2 @@
-552038d36980470448bf1d701c9effc3  openvpn-2.1_rc20.tar.gz
-b04b1d058cb5dc3f65ca696bc5021278  openvpn-2.1_rc20.tar.gz.asc
+b273ed2b5ec8616fb9834cde8634bce7  openvpn-2.1.1.tar.gz
+83ab0bca3f051fc0b26673008c34aa20  openvpn-2.1.1.tar.gz.asc