Accepting request 761802 from security:netfilter
- Add no-double-definitions.patch [boo#1160271] OBS-URL: https://build.opensuse.org/request/show/761802 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=106
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
09e5ea78db
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 8 10:05:13 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Add no-double-definitions.patch [boo#1160271]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 3 12:28:37 UTC 2019 - Michal Kubeček <mkubecek@suse.cz>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package iproute2
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -23,7 +23,7 @@ Release: 0
|
||||
Summary: Linux network configuration utilities
|
||||
License: GPL-2.0-only
|
||||
Group: Productivity/Networking/Routing
|
||||
Url: https://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
|
||||
URL: https://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
|
||||
# Using GPL-2.0 instead of GPL-2.0+ because of tc_skbedit.h and tc/q_multiq.c
|
||||
|
||||
#DL-URL: https://kernel.org/pub/linux/utils/net/iproute2/
|
||||
@ -37,6 +37,7 @@ Patch3: add-explicit-typecast-to-avoid-gcc-warning.patch
|
||||
Patch4: xfrm-support-displaying-transformations-used-for-Mob.patch
|
||||
Patch6: split-link-and-compile-steps-for-binaries.patch
|
||||
Patch7: ss-fix-end-of-line-printing-in-misc-ss.c.patch
|
||||
Patch8: no-double-definitions.patch
|
||||
Patch101: Revert-tc-ematch-fix-deprecated-yacc-warning.patch
|
||||
Patch102: Revert-emp-fix-warning-on-deprecated-bison-directive.patch
|
||||
Patch201: bpf-data-section-support-poc.patch
|
||||
@ -87,7 +88,7 @@ bash command line completion support for iproute.
|
||||
|
||||
%prep
|
||||
%setup -qn %name-%rversion
|
||||
%patch -P 1 -P 2 -P 3 -P 4 -P 6 -P 7 -P 201 -P 202 -p1
|
||||
%patch -P 1 -P 2 -P 3 -P 4 -P 6 -P 7 -P 8 -P 201 -P 202 -p1
|
||||
%if 0%{?suse_version} < 1500
|
||||
%patch -P 101 -p1
|
||||
%endif
|
||||
|
||||
116
no-double-definitions.patch
Normal file
116
no-double-definitions.patch
Normal file
@ -0,0 +1,116 @@
|
||||
From 3346c4e96148c4fea1113aab40ab4cdab11bb2f5 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Wed, 8 Jan 2020 10:56:59 +0100
|
||||
Subject: [PATCH] build: fix build failure with -fno-common
|
||||
Message-Id: <20200108100424.26642-1-jengelh@inai.de>
|
||||
X-Mailer: git-send-email 2.24.1
|
||||
|
||||
$ make CCOPTS=-fno-common
|
||||
gcc ... -o ip
|
||||
ld: rt_names.o (symbol from plugin): in function "rtnl_rtprot_n2a":
|
||||
(.text+0x0): multiple definition of "numeric"; ip.o (symbol from plugin):(.text+0x0): first defined here
|
||||
|
||||
gcc ... -o tipc
|
||||
ld: ../lib/libutil.a(utils.o):(.bss+0xc): multiple definition of `pretty';
|
||||
tipc.o:tipc.c:28: first defined here
|
||||
|
||||
References: https://bugzilla.opensuse.org/1160244
|
||||
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
|
||||
---
|
||||
include/rt_names.h | 2 ++
|
||||
ip/ip.c | 2 +-
|
||||
misc/ss.c | 2 +-
|
||||
tc/tc.c | 2 +-
|
||||
tipc/tipc.c | 2 +-
|
||||
5 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/rt_names.h b/include/rt_names.h
|
||||
index 62ebbd6a..7afce170 100644
|
||||
--- a/include/rt_names.h
|
||||
+++ b/include/rt_names.h
|
||||
@@ -33,4 +33,6 @@ int ll_proto_a2n(unsigned short *id, const char *buf);
|
||||
const char *nl_proto_n2a(int id, char *buf, int len);
|
||||
int nl_proto_a2n(__u32 *id, const char *arg);
|
||||
|
||||
+extern int numeric;
|
||||
+
|
||||
#endif
|
||||
diff --git a/ip/ip.c b/ip/ip.c
|
||||
index fed26f8d..90392c2a 100644
|
||||
--- a/ip/ip.c
|
||||
+++ b/ip/ip.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include "ip_common.h"
|
||||
#include "namespace.h"
|
||||
#include "color.h"
|
||||
+#include "rt_names.h"
|
||||
|
||||
int preferred_family = AF_UNSPEC;
|
||||
int human_readable;
|
||||
@@ -36,7 +37,6 @@ int timestamp;
|
||||
int force;
|
||||
int max_flush_loops = 10;
|
||||
int batch_mode;
|
||||
-int numeric;
|
||||
bool do_all;
|
||||
|
||||
struct rtnl_handle rth = { .fd = -1 };
|
||||
diff --git a/misc/ss.c b/misc/ss.c
|
||||
index 95f1d37a..1e8bca5a 100644
|
||||
--- a/misc/ss.c
|
||||
+++ b/misc/ss.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "libnetlink.h"
|
||||
#include "namespace.h"
|
||||
#include "SNAPSHOT.h"
|
||||
+#include "rt_names.h"
|
||||
|
||||
#include <linux/tcp.h>
|
||||
#include <linux/sock_diag.h>
|
||||
@@ -121,7 +122,6 @@ static int follow_events;
|
||||
static int sctp_ino;
|
||||
static int show_tipcinfo;
|
||||
static int show_tos;
|
||||
-int numeric;
|
||||
int oneline;
|
||||
|
||||
enum col_id {
|
||||
diff --git a/tc/tc.c b/tc/tc.c
|
||||
index 37294b31..b72657ec 100644
|
||||
--- a/tc/tc.c
|
||||
+++ b/tc/tc.c
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "tc_util.h"
|
||||
#include "tc_common.h"
|
||||
#include "namespace.h"
|
||||
+#include "rt_names.h"
|
||||
|
||||
int show_stats;
|
||||
int show_details;
|
||||
@@ -43,7 +44,6 @@ bool use_names;
|
||||
int json;
|
||||
int color;
|
||||
int oneline;
|
||||
-int numeric;
|
||||
|
||||
static char *conf_file;
|
||||
|
||||
diff --git a/tipc/tipc.c b/tipc/tipc.c
|
||||
index f85ddee0..60176a04 100644
|
||||
--- a/tipc/tipc.c
|
||||
+++ b/tipc/tipc.c
|
||||
@@ -22,10 +22,10 @@
|
||||
#include "node.h"
|
||||
#include "peer.h"
|
||||
#include "cmdl.h"
|
||||
+#include "utils.h"
|
||||
|
||||
int help_flag;
|
||||
int json;
|
||||
-int pretty;
|
||||
|
||||
static void about(struct cmdl *cmdl)
|
||||
{
|
||||
--
|
||||
2.24.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user