jengelh/iproute2
SHA256
1
0
Fork 0
forked from pool/iproute2
Code Pull Requests Activity

Accepting request 314513 from security:netfilter

Browse Source 
- Update to new upstream release 4.1

OBS-URL: https://build.opensuse.org/request/show/314513
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=78
This commit is contained in:
Stephan Kulow 2015-07-05 15:54:37 +00:00 committed by Git OBS Bridge
commit 5e8ad67fd3
11 changed files with 364 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
iproute2-4.0.0.tar.sign
View File

Binary file not shown.

3
iproute2-4.0.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618
size 459364

BIN
iproute2-4.1.0.tar.sign Normal file
View File

Binary file not shown.

3
iproute2-4.1.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d1326696c6a8f81ba66aaf48d858005cf280c81d3284d8d2c99748e3d0746146
size 495312

43
iproute2-dirs.diff
View File

@ -5,20 +5,19 @@
tc/q_netem.c | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
Index: iproute2-4.0.0/Makefile
Index: iproute2-4.1.0/Makefile
===================================================================
--- iproute2-4.0.0.orig/Makefile
+++ iproute2-4.0.0/Makefile
@@ -1,7 +1,7 @@
ROOTDIR=$(DESTDIR)
PREFIX=/usr
LIBDIR=$(PREFIX)/lib
-SBINDIR=/sbin
+SBINDIR=/usr/sbin
CONFDIR=/etc/iproute2
DATADIR=$(PREFIX)/share
DOCDIR=$(DATADIR)/doc/iproute2
@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(ROOTDIR)/usr/include
--- iproute2-4.1.0.orig/Makefile
+++ iproute2-4.1.0/Makefile
@@ -1,6 +1,6 @@
PREFIX?=/usr
LIBDIR?=$(PREFIX)/lib
-SBINDIR?=/sbin
+SBINDIR?=/usr/sbin
CONFDIR?=/etc/iproute2
DATADIR?=$(PREFIX)/share
DOCDIR?=$(DATADIR)/doc/iproute2
@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include
SHARED_LIBS = y
@ -27,10 +26,10 @@ Index: iproute2-4.0.0/Makefile
ifneq ($(SHARED_LIBS),y)
DEFINES+= -DNO_SHARED_LIBS
endif
Index: iproute2-4.0.0/include/iptables.h
Index: iproute2-4.1.0/include/iptables.h
===================================================================
--- iproute2-4.0.0.orig/include/iptables.h
+++ iproute2-4.0.0/include/iptables.h
--- iproute2-4.1.0.orig/include/iptables.h
+++ iproute2-4.1.0/include/iptables.h
@@ -5,7 +5,7 @@
#include "libiptc/libiptc.h"
@ -40,10 +39,10 @@ Index: iproute2-4.0.0/include/iptables.h
#endif
#ifndef IPPROTO_SCTP
Index: iproute2-4.0.0/netem/Makefile
Index: iproute2-4.1.0/netem/Makefile
===================================================================
--- iproute2-4.0.0.orig/netem/Makefile
+++ iproute2-4.0.0/netem/Makefile
--- iproute2-4.1.0.orig/netem/Makefile
+++ iproute2-4.1.0/netem/Makefile
@@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
CCOPTS = $(CBUILD_CFLAGS)
LDLIBS += -lm
@ -65,10 +64,10 @@ Index: iproute2-4.0.0/netem/Makefile
done
clean:
Index: iproute2-4.0.0/tc/q_netem.c
Index: iproute2-4.1.0/tc/q_netem.c
===================================================================
--- iproute2-4.0.0.orig/tc/q_netem.c
+++ iproute2-4.0.0/tc/q_netem.c
--- iproute2-4.1.0.orig/tc/q_netem.c
+++ iproute2-4.1.0/tc/q_netem.c
@@ -113,7 +113,7 @@ static int get_distribution(const char *
char *line = NULL;
char name[128];

20
iproute2-doc.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Jun 29 09:28:01 UTC 2015 - mkubecek@suse.cz
- iproute2-tipc-headers.patch:
fix build on systems with pre-3.16 kernel headers
- apply build fixes also in iproute2-doc.spec
-------------------------------------------------------------------
Sun Jun 28 23:01:23 UTC 2015 - jengelh@inai.de
- Update to new upstream release 4.1
* ip: support RFC4191 router preference
* xfrm: add command for configuring SPD hash table
* tipc: add new TIPC configuration tool
* BPF support in tc
* Lots of RED (tc scheduler) cleanup work
* color option to ip command
- Add iproute2-pkgconfig.diff: work around continued ignorance of
pkg-config
-------------------------------------------------------------------
Tue Jun 16 08:46:47 UTC 2015 - jengelh@inai.de

9
iproute2-doc.spec
View File

@ -17,9 +17,9 @@
Name: iproute2-doc
Version: 4.0
Version: 4.1
Release: 0
%define rversion 4.0.0
%define rversion 4.1.0
Summary: Documentation to iproute2
License: GPL-2.0+
Group: Documentation/Other
@ -28,6 +28,8 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/networking
Source: http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%rversion.tar.xz
Source2: http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%rversion.tar.sign
Patch1: iproute2-3.16.0-fix-bashisms.patch
Patch6: iproute2-pkgconfig.diff
Patch7: iproute2-tipc-headers.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison
@ -44,6 +46,7 @@ BuildRequires: texlive-latex
BuildRequires: tex(english.ldf)
%define with_xt 1
%if 0%{?with_xt}
BuildRequires: pkgconfig(libmnl)
BuildRequires: pkgconfig(xtables) >= 1.4.11
%endif
@ -54,6 +57,8 @@ as well as examples and other outdated files.
%prep
%setup -qn iproute2-%rversion
%patch1 -p1
%patch6 -p1
%patch7 -p1
%build
# build with -fPIC. For details see

31
iproute2-pkgconfig.diff Normal file
View File

@ -0,0 +1,31 @@
From 2417e995230c16d63fe62f904d5e5db832c37459 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 29 Jun 2015 09:58:11 +0200
Subject: [PATCH] build: must honor pkg-config flags for libmnl
The build otherwise fails if libmnl does not directly live in a
standard search path.
---
tipc/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tipc/Makefile b/tipc/Makefile
index 4bda8c5..d4637f8 100644
--- a/tipc/Makefile
+++ b/tipc/Makefile
@@ -5,8 +5,11 @@ TIPCOBJ=bearer.o \
node.o socket.o \
tipc.o
+include ../Config
+
TARGETS=tipc
-LDLIBS += -lmnl
+CFLAGS += $(shell $(PKG_CONFIG) libmnl --cflags)
+LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
all: $(TARGETS) $(LIBS)
--
2.4.3

255
iproute2-tipc-headers.patch Normal file
View File

@ -0,0 +1,255 @@
From: Michal Kubecek <mkubecek@suse.cz>
Date: Mon, 29 Jun 2015 10:33:31 +0200
Subject: include: add copy of tipc.h
Patch-mainline: Submitted - 2015-06-29
Copy of kernel include/uapi/linux/tipc.h is needed to build on systems
with pre-3.16 kernel headers.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
---
include/linux/tipc.h | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 232 insertions(+)
create mode 100644 include/linux/tipc.h
diff --git a/include/linux/tipc.h b/include/linux/tipc.h
new file mode 100644
index 000000000000..6f71b9b41595
--- /dev/null
+++ b/include/linux/tipc.h
@@ -0,0 +1,232 @@
+/*
+ * include/uapi/linux/tipc.h: Header for TIPC socket interface
+ *
+ * Copyright (c) 2003-2006, Ericsson AB
+ * Copyright (c) 2005, 2010-2011, Wind River Systems
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _LINUX_TIPC_H_
+#define _LINUX_TIPC_H_
+
+#include <linux/types.h>
+#include <linux/sockios.h>
+
+/*
+ * TIPC addressing primitives
+ */
+
+struct tipc_portid {
+ __u32 ref;
+ __u32 node;
+};
+
+struct tipc_name {
+ __u32 type;
+ __u32 instance;
+};
+
+struct tipc_name_seq {
+ __u32 type;
+ __u32 lower;
+ __u32 upper;
+};
+
+static inline __u32 tipc_addr(unsigned int zone,
+ unsigned int cluster,
+ unsigned int node)
+{
+ return (zone << 24) | (cluster << 12) | node;
+}
+
+static inline unsigned int tipc_zone(__u32 addr)
+{
+ return addr >> 24;
+}
+
+static inline unsigned int tipc_cluster(__u32 addr)
+{
+ return (addr >> 12) & 0xfff;
+}
+
+static inline unsigned int tipc_node(__u32 addr)
+{
+ return addr & 0xfff;
+}
+
+/*
+ * Application-accessible port name types
+ */
+
+#define TIPC_CFG_SRV 0 /* configuration service name type */
+#define TIPC_TOP_SRV 1 /* topology service name type */
+#define TIPC_LINK_STATE 2 /* link state name type */
+#define TIPC_RESERVED_TYPES 64 /* lowest user-publishable name type */
+
+/*
+ * Publication scopes when binding port names and port name sequences
+ */
+
+#define TIPC_ZONE_SCOPE 1
+#define TIPC_CLUSTER_SCOPE 2
+#define TIPC_NODE_SCOPE 3
+
+/*
+ * Limiting values for messages
+ */
+
+#define TIPC_MAX_USER_MSG_SIZE 66000U
+
+/*
+ * Message importance levels
+ */
+
+#define TIPC_LOW_IMPORTANCE 0
+#define TIPC_MEDIUM_IMPORTANCE 1
+#define TIPC_HIGH_IMPORTANCE 2
+#define TIPC_CRITICAL_IMPORTANCE 3
+
+/*
+ * Msg rejection/connection shutdown reasons
+ */
+
+#define TIPC_OK 0
+#define TIPC_ERR_NO_NAME 1
+#define TIPC_ERR_NO_PORT 2
+#define TIPC_ERR_NO_NODE 3
+#define TIPC_ERR_OVERLOAD 4
+#define TIPC_CONN_SHUTDOWN 5
+
+/*
+ * TIPC topology subscription service definitions
+ */
+
+#define TIPC_SUB_PORTS 0x01 /* filter for port availability */
+#define TIPC_SUB_SERVICE 0x02 /* filter for service availability */
+#define TIPC_SUB_CANCEL 0x04 /* cancel a subscription */
+
+#define TIPC_WAIT_FOREVER (~0) /* timeout for permanent subscription */
+
+struct tipc_subscr {
+ struct tipc_name_seq seq; /* name sequence of interest */
+ __u32 timeout; /* subscription duration (in ms) */
+ __u32 filter; /* bitmask of filter options */
+ char usr_handle[8]; /* available for subscriber use */
+};
+
+#define TIPC_PUBLISHED 1 /* publication event */
+#define TIPC_WITHDRAWN 2 /* withdraw event */
+#define TIPC_SUBSCR_TIMEOUT 3 /* subscription timeout event */
+
+struct tipc_event {
+ __u32 event; /* event type */
+ __u32 found_lower; /* matching name seq instances */
+ __u32 found_upper; /* " " " " */
+ struct tipc_portid port; /* associated port */
+ struct tipc_subscr s; /* associated subscription */
+};
+
+/*
+ * Socket API
+ */
+
+#ifndef AF_TIPC
+#define AF_TIPC 30
+#endif
+
+#ifndef PF_TIPC
+#define PF_TIPC AF_TIPC
+#endif
+
+#ifndef SOL_TIPC
+#define SOL_TIPC 271
+#endif
+
+#define TIPC_ADDR_NAMESEQ 1
+#define TIPC_ADDR_MCAST 1
+#define TIPC_ADDR_NAME 2
+#define TIPC_ADDR_ID 3
+
+struct sockaddr_tipc {
+ unsigned short family;
+ unsigned char addrtype;
+ signed char scope;
+ union {
+ struct tipc_portid id;
+ struct tipc_name_seq nameseq;
+ struct {
+ struct tipc_name name;
+ __u32 domain;
+ } name;
+ } addr;
+};
+
+/*
+ * Ancillary data objects supported by recvmsg()
+ */
+
+#define TIPC_ERRINFO 1 /* error info */
+#define TIPC_RETDATA 2 /* returned data */
+#define TIPC_DESTNAME 3 /* destination name */
+
+/*
+ * TIPC-specific socket option values
+ */
+
+#define TIPC_IMPORTANCE 127 /* Default: TIPC_LOW_IMPORTANCE */
+#define TIPC_SRC_DROPPABLE 128 /* Default: based on socket type */
+#define TIPC_DEST_DROPPABLE 129 /* Default: based on socket type */
+#define TIPC_CONN_TIMEOUT 130 /* Default: 8000 (ms) */
+#define TIPC_NODE_RECVQ_DEPTH 131 /* Default: none (read only) */
+#define TIPC_SOCK_RECVQ_DEPTH 132 /* Default: none (read only) */
+
+/*
+ * Maximum sizes of TIPC bearer-related names (including terminating NULL)
+ * The string formatting for each name element is:
+ * media: media
+ * interface: media:interface name
+ * link: Z.C.N:interface-Z.C.N:interface
+ *
+ */
+
+#define TIPC_MAX_MEDIA_NAME 16
+#define TIPC_MAX_IF_NAME 16
+#define TIPC_MAX_BEARER_NAME 32
+#define TIPC_MAX_LINK_NAME 60
+
+#define SIOCGETLINKNAME SIOCPROTOPRIVATE
+
+struct tipc_sioc_ln_req {
+ __u32 peer;
+ __u32 bearer_id;
+ char linkname[TIPC_MAX_LINK_NAME];
+};
+#endif
--
2.4.5

20
iproute2.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Jun 29 09:28:01 UTC 2015 - mkubecek@suse.cz
- iproute2-tipc-headers.patch:
fix build on systems with pre-3.16 kernel headers
- apply build fixes also in iproute2-doc.spec
-------------------------------------------------------------------
Sun Jun 28 23:01:23 UTC 2015 - jengelh@inai.de
- Update to new upstream release 4.1
* ip: support RFC4191 router preference
* xfrm: add command for configuring SPD hash table
* tipc: add new TIPC configuration tool
* BPF support in tc
* Lots of RED (tc scheduler) cleanup work
* color option to ip command
- Add iproute2-pkgconfig.diff: work around continued ignorance of
pkg-config
-------------------------------------------------------------------
Tue Jun 16 08:46:47 UTC 2015 - jengelh@inai.de

15
iproute2.spec
View File

@ -17,9 +17,9 @@
Name: iproute2
Version: 4.0
Version: 4.1
Release: 0
%define rversion 4.0.0
%define rversion 4.1.0
Summary: Linux network configuration utilities
License: GPL-2.0
Group: Productivity/Networking/Routing
@ -37,6 +37,8 @@ Patch2: iproute2-HZ.diff
Patch3: revert-pdf-creation.diff
Patch4: revert-bison-fix.diff
Patch5: kernel_xfrm6_raw.patch
Patch6: iproute2-pkgconfig.diff
Patch7: iproute2-tipc-headers.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison
BuildRequires: db-devel
@ -45,13 +47,9 @@ BuildRequires: pkgconfig >= 0.21
BuildRequires: xz
%define with_xt 1
%if 0%{?with_xt}
%if 0%{?suse_version} >= 1140
BuildRequires: pkgconfig(libmnl)
BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(xtables) >= 1.4.11
%else
BuildRequires: libselinux-devel
BuildRequires: libxtables-devel >= 1.4.11
%endif
%endif
Provides: iproute = %version-%release
Provides: %name(xfrm6_raw) = %version-%release
@ -71,6 +69,7 @@ Provides: libnetlink = %version-%release
%description -n libnetlink-devel
libnetlink provides a higher-level interface to rtnetlink(7).
New programs should use libmnl-devel instead.
%prep
%setup -qn %name-%rversion
@ -81,7 +80,7 @@ libnetlink provides a higher-level interface to rtnetlink(7).
%if 0%{?sles_version} == 11
%patch -P 4 -p1
%endif
%patch -P 5 -p1
%patch -P 5 -P 6 -P 7 -p1
find . -name *.orig -delete
%build