2.6.39 bump
This commit is contained in:
parent
1dd73644a2
commit
b493ea7107
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ iproute2-2.6.35.tar.bz2
|
|||||||
/iproute2-2.6.37.tar.bz2
|
/iproute2-2.6.37.tar.bz2
|
||||||
/iproute2-2.6.38.tar.bz2
|
/iproute2-2.6.38.tar.bz2
|
||||||
/iproute2-2.6.38.1.tar.bz2
|
/iproute2-2.6.38.1.tar.bz2
|
||||||
|
/iproute2-2.6.39.tar.gz
|
||||||
|
11
iproute.spec
11
iproute.spec
@ -1,11 +1,11 @@
|
|||||||
%global cbq_version v0.7.3
|
%global cbq_version v0.7.3
|
||||||
Summary: Advanced IP routing and network device configuration tools
|
Summary: Advanced IP routing and network device configuration tools
|
||||||
Name: iproute
|
Name: iproute
|
||||||
Version: 2.6.38.1
|
Version: 2.6.39
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/%{name}2
|
URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/%{name}2
|
||||||
Source0: http://devresources.linuxfoundation.org/dev/iproute2/download/%{name}2-%{version}.tar.bz2
|
Source0: http://devresources.linuxfoundation.org/dev/iproute2/download/%{name}2-%{version}.tar.gz
|
||||||
Source1: cbq-0000.example
|
Source1: cbq-0000.example
|
||||||
Source2: avpkt
|
Source2: avpkt
|
||||||
Patch0: man-pages.patch
|
Patch0: man-pages.patch
|
||||||
@ -18,7 +18,7 @@ Patch6: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
|
|||||||
Patch7: iproute2-example-cbq-service.patch
|
Patch7: iproute2-example-cbq-service.patch
|
||||||
Patch8: iproute2-2.6.35-print-route.patch
|
Patch8: iproute2-2.6.35-print-route.patch
|
||||||
Patch9: iproute2-print-route-u32.patch
|
Patch9: iproute2-print-route-u32.patch
|
||||||
Patch10: iproute2-2.6.33-create-peer-veth-without-a-name.patch
|
Patch10: iproute2-2.6.39-create-peer-veth-without-a-name.patch
|
||||||
|
|
||||||
License: GPLv2+ and Public Domain
|
License: GPLv2+ and Public Domain
|
||||||
BuildRequires: tex(latex) tex(dvips) linuxdoc-tools
|
BuildRequires: tex(latex) tex(dvips) linuxdoc-tools
|
||||||
@ -183,6 +183,9 @@ done
|
|||||||
%{_includedir}/libnetlink.h
|
%{_includedir}/libnetlink.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 30 2011 Petr Sabata <contyk@redhat.com> - 2.6.39-1
|
||||||
|
- 2.6.39 bump
|
||||||
|
|
||||||
* Wed Apr 27 2011 Petr Sabata <psabata@redhat.com> - 2.6.38.1-4
|
* Wed Apr 27 2011 Petr Sabata <psabata@redhat.com> - 2.6.38.1-4
|
||||||
- Link [cr]tstat to lnstat
|
- Link [cr]tstat to lnstat
|
||||||
|
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
--- iproute2-2.6.33/ip/link_veth.c 2010-02-25 04:56:50.000000000 +0100
|
|
||||||
+++ iproute2-2.6.33/ip/link_veth.c.new 2010-10-12 17:25:01.159138225 +0200
|
|
||||||
@@ -27,7 +27,7 @@
|
|
||||||
static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
||||||
struct nlmsghdr *hdr)
|
|
||||||
{
|
|
||||||
- char *name, *type, *link, *dev;
|
|
||||||
+ char *name = NULL, *type = NULL, *link = NULL, *dev = NULL;
|
|
||||||
int err, len;
|
|
||||||
struct rtattr * data;
|
|
||||||
|
|
17
iproute2-2.6.39-create-peer-veth-without-a-name.patch
Normal file
17
iproute2-2.6.39-create-peer-veth-without-a-name.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
diff --git a/ip/.link_veth.c.swp b/ip/.link_veth.c.swp
|
||||||
|
deleted file mode 100644
|
||||||
|
index e3b5480..0000000
|
||||||
|
Binary files a/ip/.link_veth.c.swp and /dev/null differ
|
||||||
|
diff --git a/ip/link_veth.c b/ip/link_veth.c
|
||||||
|
index 3d19b01..eb0f41e 100644
|
||||||
|
--- a/ip/link_veth.c
|
||||||
|
+++ b/ip/link_veth.c
|
||||||
|
@@ -27,7 +27,7 @@ static void usage(void)
|
||||||
|
static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
|
||||||
|
struct nlmsghdr *hdr)
|
||||||
|
{
|
||||||
|
- char *name, *type, *link, *dev;
|
||||||
|
+ char *name = NULL, *type = NULL, *link = NULL, *dev = NULL;
|
||||||
|
int err, len;
|
||||||
|
struct rtattr * data;
|
||||||
|
int group;
|
Loading…
Reference in New Issue
Block a user