Accepting request 317178 from security:netfilter

- Update to version 4.1.1:

OBS-URL: https://build.opensuse.org/request/show/317178
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=79
This commit is contained in:
Stephan Kulow 2015-07-20 13:14:30 +00:00 committed by Git OBS Bridge
commit a4d3c9cbd4
10 changed files with 40 additions and 310 deletions

Binary file not shown.

View File

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

BIN
iproute2-4.1.1.tar.sign Normal file

Binary file not shown.

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

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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Jul 15 14:25:28 UTC 2015 - dimstar@opensuse.org
- Update to version 4.1.1:
* tipc: make build conditional on having libmnl.
* build: must honor pkg-config flags for libmnl.
* include: add copy of tipc.h.
* Fix MPLS support.
- Drop iproute2-tipc-headers.patch, iproute2-pkgconfig.diff
(fixed upstream)
-------------------------------------------------------------------
Mon Jun 29 09:28:01 UTC 2015 - mkubecek@suse.cz

View File

@ -17,9 +17,9 @@
Name: iproute2-doc
Version: 4.1
Version: 4.1.1
Release: 0
%define rversion 4.1.0
%define rversion 4.1.1
Summary: Documentation to iproute2
License: GPL-2.0+
Group: Documentation/Other
@ -28,8 +28,6 @@ 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
@ -57,8 +55,6 @@ 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
@ -71,19 +67,19 @@ cd doc
make pdf
%install
make install DESTDIR="%{buildroot}" LIBDIR="%_libdir" \
make install DESTDIR="%buildroot" LIBDIR="%_libdir" \
MODDESTDIR="$b/%_libdir/tc" DOCDIR="%_docdir/iproute2"
mkdir -p "%{buildroot}/%_docdir/iproute2";
cp -an ip/{ifcfg,routef,routel} doc/*.pdf "%{buildroot}/%_docdir/iproute2/"
mkdir -p "%buildroot/%_docdir/iproute2";
cp -an ip/{ifcfg,routef,routel} doc/*.pdf "%buildroot/%_docdir/iproute2/"
t=$$
mkdir $t
mv %{buildroot}/%_docdir $t
rm -rf %{buildroot}/*
mkdir -p %{buildroot}/%_docdir
mv $t/packages/* %{buildroot}/%_docdir
rm -rf $t
t="$$"
mkdir "$t"
mv "%buildroot/%_docdir" "$t/"
rm -rf "%buildroot"/*
mkdir -p "%buildroot/%_docdir"
mv "$t/packages"/* "%buildroot/%_docdir"
rm -rf "$t"
%files
%defattr(-,root,root)

View File

@ -1,31 +0,0 @@
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

View File

@ -1,255 +0,0 @@
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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Jul 15 14:25:28 UTC 2015 - dimstar@opensuse.org
- Update to version 4.1.1:
* tipc: make build conditional on having libmnl.
* build: must honor pkg-config flags for libmnl.
* include: add copy of tipc.h.
* Fix MPLS support.
- Drop iproute2-tipc-headers.patch, iproute2-pkgconfig.diff
(fixed upstream)
-------------------------------------------------------------------
Mon Jun 29 09:28:01 UTC 2015 - mkubecek@suse.cz

View File

@ -17,9 +17,9 @@
Name: iproute2
Version: 4.1
Version: 4.1.1
Release: 0
%define rversion 4.1.0
%define rversion 4.1.1
Summary: Linux network configuration utilities
License: GPL-2.0
Group: Productivity/Networking/Routing
@ -37,8 +37,6 @@ 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
@ -80,7 +78,7 @@ New programs should use libmnl-devel instead.
%if 0%{?sles_version} == 11
%patch -P 4 -p1
%endif
%patch -P 5 -P 6 -P 7 -p1
%patch -P 5 -p1
find . -name *.orig -delete
%build