rpms/iproute/F-9 iproute-2.6.26-ip-abbreviation.patch, NONE, 1.1 iproute.spec, 1.83, 1.84

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5595

Modified Files:
	iproute.spec 
Added Files:
	iproute-2.6.26-ip-abbreviation.patch 
Log Message:
* Tue Oct 14 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.26-2
- ip: abbreviation of network-prefix is no longer possible with ip route
- Related: bz#460580


iproute-2.6.26-ip-abbreviation.patch:

--- NEW FILE iproute-2.6.26-ip-abbreviation.patch ---
>From 2ca4abdcb823e708b88156f947fa5b493055618a Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas at fatal.se>
Date: Fri, 29 Aug 2008 19:26:42 +0200
Subject: [PATCH] ip: abbreviation of network-prefix is no longer possible with ip route

Commit 516ffb6b7724e97ca035293dcfd9f94cf6ce3a47 says:

Stephen Hemminger [Thu, 22 May 2008 20:41:40 +0000 (13:41 -0700)]
> Use the standard POSIX inet_pton to convert from string to IPV4
> address. This avoids problems where ip parses "127.2" wrong.

Apparently inet_pton doesn't support abbreviated/shortened/classful
ipv4 addresses at all, but inet_aton does.
Since the function only deals with AF_INET anyway maybe using
inet_aton "to increse backwards compatability" (please those
who still want to use the format) could be considered?
(This will still not restore the 10/8 format which apparently used
to work in iproute, so people would have to settle for 10.0/8)

diff -up iproute-2.6.26/iproute2-2.6.26/lib/utils.c.abbrev iproute-2.6.26/iproute2-2.6.26/lib/utils.c
--- iproute-2.6.26/iproute2-2.6.26/lib/utils.c.abbrev	2008-07-25 22:46:07.000000000 +0200
+++ iproute-2.6.26/iproute2-2.6.26/lib/utils.c	2008-10-14 16:18:28.000000000 +0200
@@ -284,7 +284,7 @@ int get_addr_1(inet_prefix *addr, const 
 	addr->family = AF_INET;
 	if (family != AF_UNSPEC && family != AF_INET)
 		return -1;
-	if (inet_pton(AF_INET, name, addr->data) <= 0)
+	if (inet_aton(name, addr->data) <= 0)
 		return -1;
 	addr->bytelen = 4;
 	addr->bitlen = -1;


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-9/iproute.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- iproute.spec	12 Aug 2008 13:13:55 -0000	1.83
+++ iproute.spec	14 Oct 2008 14:29:18 -0000	1.84
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.26
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 #Source1: iproute-doc-2.6.22.tar.gz
@@ -15,6 +15,7 @@
 Patch4: iproute2-movelib.patch
 Patch5: iproute2-2.6.25-aead.patch
 Patch6: iproute2-2.6.25-segfault.patch
+Patch7: iproute-2.6.26-ip-abbreviation.patch 
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,6 +35,7 @@
 %patch4 -p1 -b .movelib
 %patch5 -p1 -b .aead
 %patch6 -p1 -b .seg
+%patch7 -p1 -b .abbrev
 
 %build
 export LIBDIR=%{_libdir}
@@ -109,6 +111,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
 %changelog
+* Tue Oct 14 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.26-2
+- ip: abbreviation of network-prefix is no longer possible with ip route
+- Related: bz#460580
+
 * Tue Aug 12 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.26-1
 - update to 2.6.26
 - clean patches