rpms/vpnc/devel vpnc-0.3.3-ip-output.patch, 1.1, 1.2 vpnc.spec, 1.16, 1.17

[Tomas Mraz (tmraz)]

Author: tmraz

Update of /cvs/extras/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20936

Modified Files:
	vpnc-0.3.3-ip-output.patch vpnc.spec 
Log Message:
* Tue Sep 12 2006 Tomas Mraz <tmraz at redhat.com> - 0.3.3-12
- drop hoplimit from ip route output (#205923)
- let's try enabling -fstack-protector again, seems to work now


vpnc-0.3.3-ip-output.patch:

Index: vpnc-0.3.3-ip-output.patch
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc-0.3.3-ip-output.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vpnc-0.3.3-ip-output.patch	15 Jun 2005 18:17:55 -0000	1.1
+++ vpnc-0.3.3-ip-output.patch	12 Sep 2006 16:38:12 -0000	1.2
@@ -5,7 +5,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'
++		sed 's/cache//;s/metric[ 0-9]\+//g;s/hoplimit[ 0-9]\+//g'
  	}
  
  	set_vpngateway_route() {


Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vpnc.spec	7 Sep 2006 18:58:57 -0000	1.16
+++ vpnc.spec	12 Sep 2006 16:38:12 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.3.3
-Release:        11
+Release:        12
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -35,9 +35,6 @@
 %patch4 -p1 -b .rekeying
 
 %build
-%ifarch x86_64
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed s/-fstack-protector//g)
-%endif
 make PREFIX=/usr
 
 %install
@@ -68,6 +65,10 @@
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup
 
 %changelog
+* Tue Sep 12 2006 Tomas Mraz <tmraz at redhat.com> - 0.3.3-12
+- drop hoplimit from ip route output (#205923)
+- let's try enabling -fstack-protector again, seems to work now
+
 * Thu Sep  7 2006 Tomas Mraz <tmraz at redhat.com> - 0.3.3-11
 - rebuilt for FC6