rpms/openvpn/EL-4 openvpn-2.1.1-init.patch, NONE, 1.1 openvpn-2.1.1-initinfo.patch, NONE, 1.1 openvpn-script-security.patch, 1.2, 1.3 openvpn.spec, 1.16, 1.17 sources, 1.11, 1.12

Tue Jan 26 14:36:48 UTC 2010

Author: limb

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

Modified Files:
	openvpn-script-security.patch openvpn.spec sources 
Added Files:
	openvpn-2.1.1-init.patch openvpn-2.1.1-initinfo.patch 
Log Message:
Update to latest stable, BZ 520819.


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
+
+

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-4/openvpn-script-security.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openvpn-script-security.patch	25 Oct 2009 11:13:28 -0000	1.2
+++ openvpn-script-security.patch	26 Jan 2010 14:36:48 -0000	1.3
@@ -8,7 +8,7 @@
 +            # 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"
++                script_security="--script-security 2"
 +            fi
 +	    $openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work $script_security
  	    if [ $? = 0 ]; then


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/EL-4/openvpn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- openvpn.spec	25 Oct 2009 11:13:28 -0000	1.16
+++ openvpn.spec	26 Jan 2010 14:36:48 -0000	1.17
@@ -1,10 +1,10 @@
-%define prerelease rc15
+#define prerelease rc22
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
-Version:           2.1
-Release:           0.30%{?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,12 +18,15 @@ 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)
 BuildRequires:     lzo-devel
 BuildRequires:     openssl-devel
 BuildRequires:     pam-devel
+BuildRequires:     pkcs11-helper-devel
 # For /sbin/ip.
 BuildRequires:     iproute
 # We need /dev/net/tun.
@@ -53,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.
@@ -135,9 +141,10 @@ mkdir -m 755 -p $RPM_BUILD_ROOT%{_var}/r
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if ! id openvpn > /dev/null 2>&1 ; then
-    /usr/sbin/useradd -r -s /sbin/nologin -c OpenVPN -d /etc/openvpn openvpn
-fi
+getent group openvpn &>/dev/null || groupadd -r openvpn
+getent passwd openvpn &>/dev/null || \
+    /usr/sbin/useradd -r -g openvpn -s /sbin/nologin -c OpenVPN \
+        -d /etc/openvpn openvpn
 
 %post
 /sbin/chkconfig --add %{name}
@@ -168,13 +175,48 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
-* Sun Oct 25 2009 Robert Scheck <robert at fedoraproject.org> 2.1-0.30
+* 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)
 
-* Sat Nov 29 2008 Robert Scheck <robert at fedoraproject.org> 2.1-0.29
+* 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
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1-0.34.rc15
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-0.33.rc15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-0.32.rc15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.1-0.31.rc15
+- rebuild with new openssl
+
+* Thu Dec 11 2008 Steven Pritchard <steve at kspei.com> 2.1-0.30.rc15
+- Attempt to fix BZ#476129.
+
+* Sat Nov 29 2008 Robert Scheck <robert at fedoraproject.org> 2.1-0.29.rc15
 - Update to 2.1_rc15
 
-* Wed Aug 13 2008 Steven Pritchard <steve at kspei.com> 2.1-0.28
+* Wed Aug 13 2008 Steven Pritchard <steve at kspei.com> 2.1-0.28.rc9
 - Add "--script-security 2" by default for backwards compatibility
   (see bug #458594).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/EL-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	30 Nov 2008 14:39:00 -0000	1.11
+++ sources	26 Jan 2010 14:36:48 -0000	1.12
@@ -1,2 +1,2 @@
-14a35b05c5a16292d149592d1dad0302  openvpn-2.1_rc15.tar.gz
-148c13b3c0f6d5eef99755df7bf84526  openvpn-2.1_rc15.tar.gz.asc
+b273ed2b5ec8616fb9834cde8634bce7  openvpn-2.1.1.tar.gz
+83ab0bca3f051fc0b26673008c34aa20  openvpn-2.1.1.tar.gz.asc

