3.11 bump
This commit is contained in:
parent
34466f116e
commit
1a254c6d5e
1
.gitignore
vendored
1
.gitignore
vendored
@ -15,3 +15,4 @@ iproute2-2.6.35.tar.bz2
|
||||
/iproute2-3.8.0.tar.gz
|
||||
/iproute2-3.9.0.tar.gz
|
||||
/iproute2-3.10.0.tar.gz
|
||||
/iproute2-3.11.0.tar.gz
|
||||
|
35
iproute.spec
35
iproute.spec
@ -1,8 +1,8 @@
|
||||
%global cbq_version v0.7.3
|
||||
Summary: Advanced IP routing and network device configuration tools
|
||||
Name: iproute
|
||||
Version: 3.10.0
|
||||
Release: 8%{?dist}
|
||||
Version: 3.11.0
|
||||
Release: 1%{?dist}
|
||||
Group: Applications/System
|
||||
URL: http://kernel.org/pub/linux/utils/net/%{name}2/
|
||||
Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.gz
|
||||
@ -10,21 +10,20 @@ Source1: cbq-0000.example
|
||||
Source2: avpkt
|
||||
Patch0: man-pages.patch
|
||||
Patch1: iproute2-3.4.0-kernel.patch
|
||||
Patch2: iproute2-3.8.0-optflags.patch
|
||||
Patch2: iproute2-3.11.0-optflags.patch
|
||||
Patch3: iproute2-3.9.0-IPPROTO_IP_for_SA.patch
|
||||
Patch4: iproute2-example-cbq-service.patch
|
||||
Patch5: iproute2-2.6.35-print-route.patch
|
||||
Patch6: iproute2-2.6.39-create-peer-veth-without-a-name.patch
|
||||
Patch7: iproute2-2.6.39-lnstat-dump-to-stdout.patch
|
||||
Patch8: iproute2-3.8.0-unused-result.patch
|
||||
Patch9: iproute2-3.10.0-xfrm-state-overflow.patch
|
||||
Patch10: iproute2-3.10.0-lnstat-interval.patch
|
||||
Patch11: iproute2-3.10.0-rtnl_send.patch
|
||||
Patch8: iproute2-3.10.0-xfrm-state-overflow.patch
|
||||
Patch9: iproute2-3.10.0-lnstat-interval.patch
|
||||
Patch10: iproute2-3.10.0-rtnl_send.patch
|
||||
# Rejected by upstream <http://thread.gmane.org/gmane.linux.network/284101>
|
||||
Patch12: iproute2-3.11.0-tc-ok.patch
|
||||
Patch13: iproute2-3.11.0-iproute2-bridge-document-mdb.patch
|
||||
Patch11: iproute2-3.11.0-tc-ok.patch
|
||||
Patch12: iproute2-3.11.0-iproute2-bridge-document-mdb.patch
|
||||
# Bug #1011822, in upstream after 3.11.0
|
||||
Patch14: iproute2-3.11.0-iproute2-bridge-Close-file-with-bridge-monitor-file.patch
|
||||
Patch13: iproute2-3.11.0-iproute2-bridge-Close-file-with-bridge-monitor-file.patch
|
||||
License: GPLv2+ and Public Domain
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
@ -77,13 +76,12 @@ The libnetlink static library.
|
||||
%patch5 -p1 -b .print-route
|
||||
%patch6 -p1 -b .peer-veth-without-name
|
||||
%patch7 -p1 -b .lnstat-dump-to-stdout
|
||||
%patch8 -p1 -b .unused-result
|
||||
%patch9 -p1 -b .xfrm-state
|
||||
%patch10 -p1 -b .lnstat-interval
|
||||
%patch11 -p1 -b .rtnl_send
|
||||
%patch12 -p1 -b .tc_ok
|
||||
%patch13 -p1 -b .bridge_mdb_doc
|
||||
%patch14 -p1 -b .bridge_monitor_close
|
||||
%patch8 -p1 -b .xfrm-state
|
||||
%patch9 -p1 -b .lnstat-interval
|
||||
%patch10 -p1 -b .rtnl_send
|
||||
%patch11 -p1 -b .tc_ok
|
||||
%patch12 -p1 -b .bridge_mdb_doc
|
||||
%patch13 -p1 -b .bridge_monitor_close
|
||||
sed -i 's/^LIBDIR=/LIBDIR?=/' Makefile
|
||||
|
||||
%build
|
||||
@ -183,6 +181,9 @@ done
|
||||
%{_includedir}/libnetlink.h
|
||||
|
||||
%changelog
|
||||
* Tue Oct 22 2013 Petr Šabata <contyk@redhat.com> - 3.11.0-1
|
||||
- 3.11 bump
|
||||
|
||||
* Tue Oct 01 2013 Petr Pisar <ppisar@redhat.com> - 3.10.0-8
|
||||
- Close file with bridge monitor file (bug #1011822)
|
||||
|
||||
|
13
iproute2-3.11.0-optflags.patch
Normal file
13
iproute2-3.11.0-optflags.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 95266f5..1876ec4 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -34,7 +34,7 @@ CCOPTS = -O2
|
||||
WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes
|
||||
WFLAGS += -Wmissing-declarations -Wold-style-definition
|
||||
|
||||
-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
|
||||
+CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(RPM_OPT_FLAGS)
|
||||
YACCFLAGS = -d -t -v
|
||||
|
||||
SUBDIRS=lib ip tc bridge misc netem genl man
|
@ -1,13 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 898b572..70a6e14 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -31,7 +31,7 @@ CC = gcc
|
||||
HOSTCC = gcc
|
||||
DEFINES += -D_GNU_SOURCE
|
||||
CCOPTS = -O2
|
||||
-WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
|
||||
+WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes
|
||||
WFLAGS += -Wmissing-declarations -Wold-style-definition
|
||||
|
||||
CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(RPM_OPT_FLAGS)
|
Loading…
Reference in New Issue
Block a user