3.8.0 bump
This commit is contained in:
Petr Šabata
parent
39ececf662
commit
4232d64e26
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@ iproute2-2.6.35.tar.bz2
|
||||
/iproute2-3.5.1.tar.gz
|
||||
/iproute2-3.6.0.tar.gz
|
||||
/iproute2-3.7.0.tar.gz
|
||||
/iproute2-3.8.0.tar.gz
|
||||
|
||||
38
iproute.spec
38
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.7.0
|
||||
Release: 2%{?dist}
|
||||
Version: 3.8.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,20 +10,20 @@ Source1: cbq-0000.example
|
||||
Source2: avpkt
|
||||
Patch0: man-pages.patch
|
||||
Patch1: iproute2-3.4.0-kernel.patch
|
||||
Patch2: iproute2-3.5.0-optflags.patch
|
||||
Patch2: iproute2-3.8.0-optflags.patch
|
||||
Patch3: iproute2-3.4.0-sharepath.patch
|
||||
Patch4: iproute2-2.6.31-tc_modules.patch
|
||||
Patch5: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
|
||||
Patch6: iproute2-example-cbq-service.patch
|
||||
Patch7: iproute2-2.6.35-print-route.patch
|
||||
Patch8: iproute2-2.6.39-create-peer-veth-without-a-name.patch
|
||||
Patch9: iproute2-2.6.39-lnstat-dump-to-stdout.patch
|
||||
Patch10: iproute2-3.7.0-Don-t-propogate-mounts-out-of-ip.patch
|
||||
Patch4: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
|
||||
Patch5: iproute2-example-cbq-service.patch
|
||||
Patch6: iproute2-2.6.35-print-route.patch
|
||||
Patch7: iproute2-2.6.39-create-peer-veth-without-a-name.patch
|
||||
Patch8: iproute2-2.6.39-lnstat-dump-to-stdout.patch
|
||||
Patch9: iproute2-3.8.0-unused-result.patch
|
||||
License: GPLv2+ and Public Domain
|
||||
BuildRequires: tex(latex) tex(dvips) tex(ecrm1000.tfm) tex(cm-super-t1.enc) linuxdoc-tools
|
||||
BuildRequires: flex linux-atm-libs-devel psutils libdb-devel bison
|
||||
BuildRequires: iptables-devel >= 1.4.5
|
||||
BuildRequires: libnl-devel
|
||||
BuildRequires: pkgconfig
|
||||
# For the UsrMove transition period
|
||||
Conflicts: filesystem < 3
|
||||
Provides: /sbin/ip
|
||||
@ -51,19 +51,18 @@ Provides: iproute-static = %{version}-%{release}
|
||||
The libnetlink static library.
|
||||
|
||||
%prep
|
||||
%setup -q -n iproute-%{version}
|
||||
%setup -q -n %{name}2-%{version}
|
||||
%patch0 -p1
|
||||
sed -i "s/_VERSION_/%{version}/" man/man8/ss.8
|
||||
%patch1 -p1 -b .kernel
|
||||
%patch2 -p1 -b .opt_flags
|
||||
%patch3 -p1 -b .share
|
||||
%patch4 -p1 -b .ipt
|
||||
%patch5 -p1 -b .ipproto
|
||||
%patch6 -p1 -b .fix_cbq
|
||||
%patch7 -p1 -b .print-route
|
||||
%patch8 -p1 -b .peer-veth-without-name
|
||||
%patch9 -p1 -b .lnstat-dump-to-stdout
|
||||
%patch10 -p1 -b .netns-mount
|
||||
%patch4 -p1 -b .ipproto
|
||||
%patch5 -p1 -b .fix_cbq
|
||||
%patch6 -p1 -b .print-route
|
||||
%patch7 -p1 -b .peer-veth-without-name
|
||||
%patch8 -p1 -b .lnstat-dump-to-stdout
|
||||
%patch9 -p1 -b .unused-result
|
||||
|
||||
%build
|
||||
export LIBDIR=/%{_libdir}
|
||||
@ -173,6 +172,9 @@ done
|
||||
%{_includedir}/libnetlink.h
|
||||
|
||||
%changelog
|
||||
* Tue Feb 26 2013 Petr Šabata <contyk@redhat.com> - 3.8.0-1
|
||||
- 3.8.0 bump
|
||||
|
||||
* Fri Feb 08 2013 Petr Šabata <contyk@redhat.com> - 3.7.0-2
|
||||
- Don't propogate mounts out of ip (#882047)
|
||||
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From 144e6ce1679a768e987230efb4afa402a5ab58ac Mon Sep 17 00:00:00 2001
|
||||
From: "Eric W. Biederman" <ebiederm@xmission.com>
|
||||
Date: Thu, 17 Jan 2013 14:45:33 +0000
|
||||
Subject: [PATCH] iproute2: Don't propogate mounts out of ip
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Some systems are now following the advice in
|
||||
linux/Documentation/sharedsubtrees.txt and running with all mount
|
||||
points shared between all mount namespaces by default.
|
||||
|
||||
After creating the mount namespace call mount on / with
|
||||
MS_SLAVE|MS_REC to modify all mounts in the new mount namespace to
|
||||
slave mounts if they are shared or private mounts otherwise.
|
||||
Guarnateeing that changes to the mount namespace created with
|
||||
"ip netns exec" don't propgate to other namespaces.
|
||||
|
||||
Reported-by: Petr Šabata <contyk@redhat.com>
|
||||
Tested-by: Petr Šabata <contyk@redhat.com>
|
||||
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
|
||||
Signed-off-by: Petr Šabata <contyk@redhat.com>
|
||||
---
|
||||
ip/ipnetns.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/ip/ipnetns.c b/ip/ipnetns.c
|
||||
index e41a598..f2c42ba 100644
|
||||
--- a/ip/ipnetns.c
|
||||
+++ b/ip/ipnetns.c
|
||||
@@ -152,6 +152,12 @@ static int netns_exec(int argc, char **argv)
|
||||
fprintf(stderr, "unshare failed: %s\n", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
+ /* Don't let any mounts propogate back to the parent */
|
||||
+ if (mount("", "/", "none", MS_SLAVE | MS_REC, NULL)) {
|
||||
+ fprintf(stderr, "mount --make-rslave / failed: %s\n",
|
||||
+ strerror(errno));
|
||||
+ return -1;
|
||||
+ }
|
||||
/* Mount a version of /sys that describes the network namespace */
|
||||
if (umount2("/sys", MNT_DETACH) < 0) {
|
||||
fprintf(stderr, "umount of /sys failed: %s\n", strerror(errno));
|
||||
--
|
||||
1.8.1
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index ea0f994..2cc8e6a 100644
|
||||
index 5edffc0..898b572 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -36,7 +36,7 @@ HOSTCC = gcc
|
||||
DEFINES += -D_GNU_SOURCE
|
||||
CCOPTS = -O2
|
||||
WFLAGS = -Wall -Wstrict-prototypes
|
||||
@@ -34,7 +34,7 @@ CCOPTS = -O2
|
||||
WFLAGS := -Wall -Wstrict-prototypes -Werror -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
|
||||
13
iproute2-3.8.0-unused-result.patch
Normal file
13
iproute2-3.8.0-unused-result.patch
Normal file
@ -0,0 +1,13 @@
|
||||
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