rpms/vpnc/FC-4 vpnc-0.3.3-ip-output.patch, NONE, 1.1 vpnc.spec, 1.7, 1.8

[Tomas Mraz (tmraz)]

Author: tmraz

Update of /cvs/extras/rpms/vpnc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9460

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.3.3-ip-output.patch 
Log Message:
* Wed Jun 15 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-2.1
- improve fix_ip_get_output in vpnc-script (#160364)


vpnc-0.3.3-ip-output.patch:

--- NEW FILE vpnc-0.3.3-ip-output.patch ---
--- vpnc-0.3.3/vpnc-script.ip-output	2005-06-15 19:56:12.000000000 +0200
+++ vpnc-0.3.3/vpnc-script	2005-06-15 19:58:29.000000000 +0200
@@ -73,7 +73,7 @@
 
 if [ -n "$IPROUTE" ]; then
 	fix_ip_get_output () {
-		sed 's/cache//;s/metric[0-9]\+ [0-9]\+//g'
+		sed 's/cache//;s/metric[ 0-9]\+//g'
 	}
 
 	set_vpngateway_route() {


Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/FC-4/vpnc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vpnc.spec	30 May 2005 08:24:08 -0000	1.7
+++ vpnc.spec	15 Jun 2005 18:18:50 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.3.3
-Release:        2
+Release:        2.1
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -11,6 +11,7 @@
 Source1:        generic-vpnc.conf
 Patch0:         vpnc-0.3.2-pie.patch
 Patch1:		vpnc-0.3.3-sbin-path.patch
+Patch2:		vpnc-0.3.3-ip-output.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgcrypt-devel > 1.1.90
@@ -24,8 +25,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .pie
+%patch1 -p1 -b .sbin-path
+%patch2 -p1 -b .ip-output
 
 %build
 make PREFIX=/usr
@@ -57,6 +59,9 @@
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup
 
 %changelog
+* Wed Jun 15 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-2.1
+- improve fix_ip_get_output in vpnc-script (#160364)
+
 * Mon May 30 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-2
 - package /var/run/vpnc and ghost files it can contain (#159015)
 - add /sbin /usr/sbin to the path in vpnc-script (#159099)