From eb9d1ba5a1203e2b2e30ddb01f0fa53c6f79e5c8365af32ddee81da69587b8f5 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 11 Jul 2008 20:33:27 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=12 --- iproute2-2.6.23-iplink.diff | 12 ++++++++++++ iproute2.changes | 5 +++++ iproute2.spec | 6 +++++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 iproute2-2.6.23-iplink.diff diff --git a/iproute2-2.6.23-iplink.diff b/iproute2-2.6.23-iplink.diff new file mode 100644 index 0000000..930c70d --- /dev/null +++ b/iproute2-2.6.23-iplink.diff @@ -0,0 +1,12 @@ +--- ip/iplink.c 2008-07-11 11:00:24.000000000 +0200 ++++ ip/iplink.c 2008-07-11 11:02:05.000000000 +0200 +@@ -107,7 +107,8 @@ + { + struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(n); + +- if (n->nlmsg_type == NLMSG_ERROR && err->error == -EOPNOTSUPP) ++ if (n->nlmsg_type == NLMSG_ERROR && ++ (err->error == -EOPNOTSUPP || err->error == -EINVAL)) + have_rtnl_newlink = 0; + else + have_rtnl_newlink = 1; diff --git a/iproute2.changes b/iproute2.changes index e595a32..3c97d95 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 11 11:03:43 CEST 2008 - ms@suse.de + +- fixed RTM_NEWLINK check for older kernels (bnc #407954) + ------------------------------------------------------------------- Mon Jun 30 10:02:03 CEST 2008 - ms@suse.de diff --git a/iproute2.spec b/iproute2.spec index 7c1e028..cc968fa 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -18,7 +18,7 @@ Group: Productivity/Networking/Routing Provides: iproute AutoReqProv: on Version: 2.6.23 -Release: 78 +Release: 83 Summary: Advanced Routing Url: http://developer.osdl.org/dev/iproute2/ Source0: %name-%version.tar.bz2 @@ -31,6 +31,7 @@ Patch5: %name-2.6.23-fragtimeout.diff Patch6: %name-2.6.23-flushcheckuid.diff Patch7: %name-2.6.23-strip.diff Patch8: %name-2.6.23-qdisc.diff +Patch9: %name-2.6.23-iplink.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n libnlink @@ -68,6 +69,7 @@ Authors: %patch6 %patch7 %patch8 +%patch9 find . -name *.orig -print0 | xargs -r0 rm -v %build @@ -117,6 +119,8 @@ rm -rf $RPM_BUILD_ROOT %_libdir/lib* %changelog +* Fri Jul 11 2008 ms@suse.de +- fixed RTM_NEWLINK check for older kernels (bnc #407954) * Mon Jun 30 2008 ms@suse.de - fixed 'tc qdisc' segmentation fault (bnc #404755) * Thu May 08 2008 ms@suse.de