pool/iproute2
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 518382 from home:mkubecek:branches:security:netfilter

Browse Source 
First of all, I would like to apologize for this submit request, if it was up
to me, I would never send it. I strongly believe it's package maintainer's job
to decide how a package should be organized, what should the specfile look
like, how should patches be named and what format to use etc. That's why
I really dislike the idea of pushing package maintainer to accept someone
else's preferences. I've been forced to submit it but you shouldn't feel
obliged to accept it unless you really like it.

Except for some minor differences, this is a cleanup I did for SLE15 iproute2
package submission. In order to effectively maintain the package throughout
the SLE15 lifetime (planned to be 13+ years), I'm using a git repository to
prepare, handle and track patches and prefer to have them in uniform format
with annotations similar to ones we use in openSUSE/SLE kernel packages. While
this workflow proved beneficial for SLE11 and SLE12 maintenance in last few
years, I don't think it's worth the extra work for Factory package with only
has few patches which are either permanent or only stay there for relatively
short time. Also, with random one-time contributors to Factory package, it
would be even more difficult to keep the package cleaned up.

The problem is that we have so-called "Factory first" policy. In theory, this
should mean no features or bugfixes should be added to SLE packages unless
they are also in the respective Factory package (and preferrably also
upstream) or at least submitted there. This idea sounds reasonable but the
SLE15 review team interprets the policy in rather different way: they want
even the contents Factory and SLE15 packages in OBS to look (almost) the same
and enforce that by declining submissions that differ from Factory in
non-trivial way. For six weeks I tried to appeal to common sense and explain
that those two packages only differ in "metadata coding style" and that if SLE
and openSUSE packages are maintained by different people, there is no need for
one of them to adopt the other's preferences (and that the packages will start
to differ soon anyway).

They were adamant and in the end, they made it absolutely clear that there is
no way the SLE15 submission can be accepted unless I at least submit my
cleanup to Factory devel project. They didn't say it has to be accepted,
though, so here it is but it's completely up to you if you want it or not.
Once again, I'm sorry about dragging you into this, I wanted to avoid it but
I ran out of options.

Summary of the changes:

  - patches are regenerated using git
  - patches are annotated the way we use in kernel packages (the annotations
    make more sense for upstream backports but we currently don't have any in
    Factory)
  - one patch (iproute2-HZ.diff) is split into two
  - Patch* lines are moved out of the rest of tags for easier orientation
  - conditionally applied patches are moved to the end of the series
  - all patches are applied in both specfiles so that both builds use the same
    source tree

OBS-URL: https://build.opensuse.org/request/show/518382
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=144
This commit is contained in:
Jan Engelhardt 2017-08-23 21:59:19 +00:00 committed by Git OBS Bridge
parent 519fa2226d
commit 067408d5f9
14 changed files with 248 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
revert-bison-fix.diff → Revert-emp-fix-warning-on-deprecated-bison-directive.patch
View File

@ -1,7 +1,7 @@
From 184ea2afa279c94248db86f74a3f4fd3ba3cded1 Mon Sep 17 00:00:00 2001
From: Michal Kubecek <mkubecek@suse.cz> From: Michal Kubecek <mkubecek@suse.cz>
Date: Tue, 25 Nov 2014 08:39:36 +0100 Date: Tue, 25 Nov 2014 08:39:36 +0100
Subject: [PATCH] Revert "emp: fix warning on deprecated bison directive" Subject: Revert "emp: fix warning on deprecated bison directive"
Patch-mainline: Never, temporary workaround
This reverts commit edd3979272e46d17456a4dabc3e9acf59e561d5a. This reverts commit edd3979272e46d17456a4dabc3e9acf59e561d5a.
@ -11,7 +11,7 @@ For SLE11 only. Its bison [version 2.3] does not allow new syntax.
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tc/emp_ematch.y b/tc/emp_ematch.y diff --git a/tc/emp_ematch.y b/tc/emp_ematch.y
index bc08da2..7043a80 100644 index 2e6cf3530ef2..753e3075df71 100644
--- a/tc/emp_ematch.y --- a/tc/emp_ematch.y
+++ b/tc/emp_ematch.y +++ b/tc/emp_ematch.y
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
@ -24,5 +24,5 @@ index bc08da2..7043a80 100644
%union { %union {
unsigned int i; unsigned int i;
-- --
1.8.4.5 2.14.1

27
add-explicit-typecast-to-avoid-gcc-warning.patch Normal file
View File

@ -0,0 +1,27 @@
From: Michal Kubecek <mkubecek@suse.cz>
Date: Fri, 15 Jan 2016 07:31:30 +0100
Subject: add explicit typecast to avoid gcc warning
Patch-mainline: No
---
lib/utils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/utils.c b/lib/utils.c
index 0919bb201229..8709e82de5bc 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -707,8 +707,8 @@ int matches(const char *cmd, const char *pattern)
int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
{
- const __u32 *a1 = a->data;
- const __u32 *a2 = b->data;
+ const __u32 *a1 = (__u32*)a->data;
+ const __u32 *a2 = (__u32*)b->data;
int words = bits >> 0x05;
bits &= 0x1f;
--
2.14.1

41
iproute2-dirs.diff → adjust-installation-directories-for-openSUSE-SLE.patch
View File

@ -1,13 +1,19 @@
From: Michal Kubecek <mkubecek@suse.cz>
Date: Fri, 15 Jan 2016 07:29:44 +0100
Subject: adjust installation directories for openSUSE/SLE
Patch-mainline: Never, SUSE specific
Match the directory layout of openSUSE and SLE.
--- ---
Makefile | 4 ++-- Makefile | 4 ++--
netem/Makefile | 6 ++++-- netem/Makefile | 6 ++++--
tc/q_netem.c | 2 +- tc/q_netem.c | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-) 3 files changed, 7 insertions(+), 5 deletions(-)
Index: iproute2-4.11.0/Makefile diff --git a/Makefile b/Makefile
=================================================================== index 18de7dcb315b..d8702a769a07 100644
--- iproute2-4.11.0.orig/Makefile --- a/Makefile
+++ iproute2-4.11.0/Makefile +++ b/Makefile
@@ -9,7 +9,7 @@ endif @@ -9,7 +9,7 @@ endif
PREFIX?=/usr PREFIX?=/usr
@ -26,10 +32,10 @@ Index: iproute2-4.11.0/Makefile
ifneq ($(SHARED_LIBS),y) ifneq ($(SHARED_LIBS),y)
DEFINES+= -DNO_SHARED_LIBS DEFINES+= -DNO_SHARED_LIBS
endif endif
Index: iproute2-4.11.0/netem/Makefile diff --git a/netem/Makefile b/netem/Makefile
=================================================================== index a68e2fdb3037..efff5850d9c1 100644
--- iproute2-4.11.0.orig/netem/Makefile --- a/netem/Makefile
+++ iproute2-4.11.0/netem/Makefile +++ b/netem/Makefile
@@ -5,6 +5,8 @@ HOSTCC ?= $(CC) @@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
CCOPTS = $(CBUILD_CFLAGS) CCOPTS = $(CBUILD_CFLAGS)
LDLIBS += -lm LDLIBS += -lm
@ -51,11 +57,11 @@ Index: iproute2-4.11.0/netem/Makefile
done done
clean: clean:
Index: iproute2-4.11.0/tc/q_netem.c diff --git a/tc/q_netem.c b/tc/q_netem.c
=================================================================== index 0975ae111de9..3a7084563eaf 100644
--- iproute2-4.11.0.orig/tc/q_netem.c --- a/tc/q_netem.c
+++ iproute2-4.11.0/tc/q_netem.c +++ b/tc/q_netem.c
@@ -113,7 +113,7 @@ static int get_distribution(const char * @@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata)
char *line = NULL; char *line = NULL;
char name[128]; char name[128];
@ -64,3 +70,6 @@ Index: iproute2-4.11.0/tc/q_netem.c
if ((f = fopen(name, "r")) == NULL) { if ((f = fopen(name, "r")) == NULL) {
fprintf(stderr, "No distribution data for %s (%s: %s)\n", fprintf(stderr, "No distribution data for %s (%s: %s)\n",
type, name, strerror(errno)); type, name, strerror(errno));
--
2.14.1

13
revert-pdf-creation.diff → doc-revert-PDF-creation.patch
View File

@ -1,11 +1,19 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 9 Oct 2012 14:27:11 +0200
Subject: doc: revert PDF creation
Patch-mainline: Never, temporary workaround
Revert 0ecf26fc7d2f24570b4c04a668c437b8656a40a7, since it Revert 0ecf26fc7d2f24570b4c04a668c437b8656a40a7, since it
makes PDF creation fail on SUSE <= 12.2. makes PDF creation fail on SUSE <= 12.2.
(cannot find linuxdoc-sgml.sty; seems like /usr/lib/sgml-tool (cannot find linuxdoc-sgml.sty; seems like /usr/lib/sgml-tool
is not in the search path with texlive 2011/suse122.) is not in the search path with texlive 2011/suse122.)
---
doc/Makefile | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/doc/Makefile b/doc/Makefile diff --git a/doc/Makefile b/doc/Makefile
index b92957e..1df6081 100644 index 0c51872afac5..e7514e4c3c9a 100644
--- a/doc/Makefile --- a/doc/Makefile
+++ b/doc/Makefile +++ b/doc/Makefile
@@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rt @@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rt
@ -52,3 +60,6 @@ index b92957e..1df6081 100644
%.ps: %.dvi %.ps: %.dvi
$(DVIPS) $< -o $@ $(DVIPS) $< -o $@
--
2.14.1

19
iproute2-3.16.0-fix-bashisms.patch → examples-fix-bashisms-in-example-script.patch
View File

@ -1,14 +1,18 @@
From: Oleksandr Chumachenko <ledest@gmail.com> From: Oleksandr Chumachenko <ledest@gmail.com>
Date: Sun, 28 Dec 2014 17:35:02 +0100 Date: Thu, 18 Dec 2014 17:35:02 +0100
Subject: examples: fix bashisms in example script
Patch-mainline: Not yet, waiting for author's response
As the script is declared to be for /bin/sh, it shouldn't use bash
specific syntax.
--- ---
examples/gaiconf | 8 ++++---- examples/gaiconf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
Index: iproute2-3.17.0/examples/gaiconf diff --git a/examples/gaiconf b/examples/gaiconf
=================================================================== index d75292b900cc..c87778f88f3b 100644
--- iproute2-3.17.0.orig/examples/gaiconf --- a/examples/gaiconf
+++ iproute2-3.17.0/examples/gaiconf +++ b/examples/gaiconf
@@ -11,7 +11,7 @@ DEFAULT_GAICONF=/etc/gai.conf @@ -11,7 +11,7 @@ DEFAULT_GAICONF=/etc/gai.conf
verbose= verbose=
debug= debug=
@ -44,3 +48,6 @@ Index: iproute2-3.17.0/examples/gaiconf
{ {
echo "Usage: $0 [-v] {--list | --config [ ${DEFAULT_GAICONF} ] | --default}" echo "Usage: $0 [-v] {--list | --config [ ${DEFAULT_GAICONF} ] | --default}"
exit 1 exit 1
--
2.14.1

30
iproute2-HZ.diff
View File

@ -1,30 +0,0 @@
---
lib/utils.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
Index: iproute2-4.8.0/lib/utils.c
===================================================================
--- iproute2-4.8.0.orig/lib/utils.c
+++ iproute2-4.8.0/lib/utils.c
@@ -49,6 +49,10 @@ int get_hex(char c)
return -1;
}
+#ifndef HZ
+#define HZ sysconf(_SC_CLK_TCK)
+#endif
+
int get_integer(int *val, const char *arg, int base)
{
long res;
@@ -683,8 +687,8 @@ int matches(const char *cmd, const char
int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
{
- const __u32 *a1 = a->data;
- const __u32 *a2 = b->data;
+ const __u32 *a1 = (__u32*)a->data;
+ const __u32 *a2 = (__u32*)b->data;
int words = bits >> 0x05;
bits &= 0x1f;

26
iproute2-doc.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Tue Aug 22 12:58:39 UTC 2017 - mkubecek@suse.cz
- patch cleanup for SLE15 package:
* iproute2-dirs.diff
-> adjust-installation-directories-for-SLE.patch
* iproute2-HZ.diff
split into
use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch
add-explicit-typecast-to-avoid-gcc-warning.patch
* revert-pdf-creation.diff
-> doc-revert-PDF-creation.patch
* revert-bison-fix.diff
-> Revert-emp-fix-warning-on-deprecated-bison-directive.patch
* kernel_xfrm6_raw.patch
-> xfrm-support-displaying-transformations-used-for-Mob.patch
* man-fix-documentation-references-in-manual-pages.patch
refresh
* iproute2-split-make.patch
-> split-link-and-compile-steps-for-binaries.patch
* iproute2-3.16.0-fix-bashisms.patch
-> examples-fix-bashisms-in-example-script.patch
- apply all patches in both specfiles to make sure everything is
built from fully patched sources
- move SLE11 workarounds to the end of the series
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 11 12:26:19 UTC 2017 - mkubecek@suse.cz Tue Jul 11 12:26:19 UTC 2017 - mkubecek@suse.cz

24
iproute2-doc.spec
View File

@ -27,7 +27,6 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/networking
Source: http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%rversion.tar.xz 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 Source2: http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%rversion.tar.sign
Patch1: iproute2-3.16.0-fix-bashisms.patch
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison BuildRequires: bison
@ -51,6 +50,16 @@ BuildRequires: pkgconfig(libmnl)
BuildRequires: pkgconfig(xtables) >= 1.4.11 BuildRequires: pkgconfig(xtables) >= 1.4.11
%endif %endif
Patch1: adjust-installation-directories-for-openSUSE-SLE.patch
Patch2: use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch
Patch3: add-explicit-typecast-to-avoid-gcc-warning.patch
Patch4: xfrm-support-displaying-transformations-used-for-Mob.patch
Patch5: man-fix-documentation-references-in-manual-pages.patch
Patch6: split-link-and-compile-steps-for-binaries.patch
Patch7: examples-fix-bashisms-in-example-script.patch
Patch101: doc-revert-PDF-creation.patch
Patch102: Revert-emp-fix-warning-on-deprecated-bison-directive.patch
%description %description
This package contains the PDF documentation from iproute2, This package contains the PDF documentation from iproute2,
as well as examples and other outdated files. as well as examples and other outdated files.
@ -58,6 +67,19 @@ as well as examples and other outdated files.
%prep %prep
%setup -qn iproute2-%rversion %setup -qn iproute2-%rversion
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220)
%patch101 -p1
%endif
%if 0%{?sles_version} == 11
%patch102 -p1
%endif
find . -name *.orig -delete
%build %build
# build with -fPIC. For details see # build with -fPIC. For details see

26
iproute2.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Tue Aug 22 12:58:39 UTC 2017 - mkubecek@suse.cz
- patch cleanup for SLE15 package:
* iproute2-dirs.diff
-> adjust-installation-directories-for-SLE.patch
* iproute2-HZ.diff
split into
use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch
add-explicit-typecast-to-avoid-gcc-warning.patch
* revert-pdf-creation.diff
-> doc-revert-PDF-creation.patch
* revert-bison-fix.diff
-> Revert-emp-fix-warning-on-deprecated-bison-directive.patch
* kernel_xfrm6_raw.patch
-> xfrm-support-displaying-transformations-used-for-Mob.patch
* man-fix-documentation-references-in-manual-pages.patch
refresh
* iproute2-split-make.patch
-> split-link-and-compile-steps-for-binaries.patch
* iproute2-3.16.0-fix-bashisms.patch
-> examples-fix-bashisms-in-example-script.patch
- apply all patches in both specfiles to make sure everything is
built from fully patched sources
- move SLE11 workarounds to the end of the series
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 11 12:26:19 UTC 2017 - mkubecek@suse.cz Tue Jul 11 12:26:19 UTC 2017 - mkubecek@suse.cz

30
iproute2.spec
View File

@ -32,13 +32,6 @@ Source: http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.t
Source2: http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.sign Source2: http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.sign
Source666: pre_checkin.sh Source666: pre_checkin.sh
Source667: %name.keyring Source667: %name.keyring
Patch1: iproute2-dirs.diff
Patch2: iproute2-HZ.diff
Patch3: revert-pdf-creation.diff
Patch4: revert-bison-fix.diff
Patch5: kernel_xfrm6_raw.patch
Patch6: man-fix-documentation-references-in-manual-pages.patch
Patch7: iproute2-split-make.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison BuildRequires: bison
BuildRequires: db-devel BuildRequires: db-devel
@ -55,6 +48,16 @@ BuildRequires: pkgconfig(xtables) >= 1.4.11
Provides: iproute = %version-%release Provides: iproute = %version-%release
Provides: %name(xfrm6_raw) = %version-%release Provides: %name(xfrm6_raw) = %version-%release
Patch1: adjust-installation-directories-for-openSUSE-SLE.patch
Patch2: use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch
Patch3: add-explicit-typecast-to-avoid-gcc-warning.patch
Patch4: xfrm-support-displaying-transformations-used-for-Mob.patch
Patch5: man-fix-documentation-references-in-manual-pages.patch
Patch6: split-link-and-compile-steps-for-binaries.patch
Patch7: examples-fix-bashisms-in-example-script.patch
Patch101: doc-revert-PDF-creation.patch
Patch102: Revert-emp-fix-warning-on-deprecated-bison-directive.patch
%description %description
iproute2 is a collection of user-space utilities to set up networking iproute2 is a collection of user-space utilities to set up networking
under Linux from the command-line. It can inspect and configure, under Linux from the command-line. It can inspect and configure,
@ -83,14 +86,19 @@ bash command line completion support for iproute.
%prep %prep
%setup -qn %name-%rversion %setup -qn %name-%rversion
%patch -P 1 -P 2 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220) %if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220)
%patch -P 3 -p1 %patch101 -p1
%endif %endif
%if 0%{?sles_version} == 11 %if 0%{?sles_version} == 11
%patch -P 4 -p1 %patch102 -p1
%endif %endif
%patch -P 5 -P 6 -P 7 -p1
find . -name *.orig -delete find . -name *.orig -delete
%build %build

8
man-fix-documentation-references-in-manual-pages.patch
View File

@ -25,10 +25,10 @@ index acd5f4a20522..738acd545f6a 100644
.SH AUTHOR .SH AUTHOR
lnstat was written by Harald Welte <laforge@gnumonks.org>. lnstat was written by Harald Welte <laforge@gnumonks.org>.
diff --git a/man/man8/ss.8 b/man/man8/ss.8 diff --git a/man/man8/ss.8 b/man/man8/ss.8
index f4d5264f3036..2be5295d58f3 100644 index 81de69de8042..092570884cf6 100644
--- a/man/man8/ss.8 --- a/man/man8/ss.8
+++ b/man/man8/ss.8 +++ b/man/man8/ss.8
@@ -131,7 +131,7 @@ Read filter information from FILE. @@ -142,7 +142,7 @@ Read filter information from FILE.
Each line of FILE is interpreted like single command line option. If FILE is - stdin is used. Each line of FILE is interpreted like single command line option. If FILE is - stdin is used.
.TP .TP
.B FILTER := [ state STATE-FILTER ] [ EXPRESSION ] .B FILTER := [ state STATE-FILTER ] [ EXPRESSION ]
@ -37,7 +37,7 @@ index f4d5264f3036..2be5295d58f3 100644
.SH STATE-FILTER .SH STATE-FILTER
@@ -186,7 +186,7 @@ Find all local processes connected to X server. @@ -197,7 +197,7 @@ Find all local processes connected to X server.
List all the tcp sockets in state FIN-WAIT-1 for our apache to network 193.233.7/24 and look at their timers. List all the tcp sockets in state FIN-WAIT-1 for our apache to network 193.233.7/24 and look at their timers.
.SH SEE ALSO .SH SEE ALSO
.BR ip (8), .BR ip (8),
@ -47,5 +47,5 @@ index f4d5264f3036..2be5295d58f3 100644
.BR RFC " 793 " .BR RFC " 793 "
- https://tools.ietf.org/rfc/rfc793.txt (TCP states) - https://tools.ietf.org/rfc/rfc793.txt (TCP states)
-- --
2.7.0 2.14.1

25
iproute2-split-make.patch → split-link-and-compile-steps-for-binaries.patch
View File

@ -1,12 +1,24 @@
Index: iproute2-4.9.0/misc/Makefile From: Marcus Meissner <meissner@suse.com>
=================================================================== Date: Sat, 10 Jun 2017 14:29:22 +0000
--- iproute2-4.9.0.orig/misc/Makefile Subject: split link and compile steps for binaries
+++ iproute2-4.9.0/misc/Makefile Patch-mainline: Submitted - 20170804
Do not compile and link in one step so that CFLAGS and LDFLAGS are only
applied to the phase they are intended for. This is needed for PIE default
to work.
---
misc/Makefile | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/misc/Makefile b/misc/Makefile
index 72807678054b..bb9009bdb1f8 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -17,23 +17,24 @@ endif @@ -17,23 +17,24 @@ endif
ifeq ($(IP_CONFIG_SETNS),y) ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS CFLAGS += -DHAVE_SETNS
endif endif
+CFLAGS += -I$(DBM_INCLUDE) +CFLAGS += -I$(DBM_INCLUDE)
all: $(TARGETS) all: $(TARGETS)
@ -35,3 +47,6 @@ Index: iproute2-4.9.0/misc/Makefile
ssfilter.c: ssfilter.y ssfilter.c: ssfilter.y
$(QUIET_YACC)bison ssfilter.y -o ssfilter.c $(QUIET_YACC)bison ssfilter.y -o ssfilter.c
--
2.14.1

27
use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch Normal file
View File

@ -0,0 +1,27 @@
From: Michal Kubecek <mkubecek@suse.cz>
Date: Fri, 15 Jan 2016 07:30:15 +0100
Subject: use sysconf(_SC_CLK_TCK) if HZ undefined
Patch-mainline: No
---
lib/utils.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/utils.c b/lib/utils.c
index e77bd302530b..0919bb201229 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -49,6 +49,10 @@ int get_hex(char c)
return -1;
}
+#ifndef HZ
+#define HZ sysconf(_SC_CLK_TCK)
+#endif
+
int get_integer(int *val, const char *arg, int base)
{
long res;
--
2.14.1

42
kernel_xfrm6_raw.patch → xfrm-support-displaying-transformations-used-for-Mob.patch
View File

@ -1,21 +1,20 @@
From: Jan Engelhardt <jengelh@inai.de> From: Jan Engelhardt <jengelh@inai.de>
Date: 2015-01-21 22:57:10.562539816 +0100 Date: Wed, 21 Jan 2015 22:57:10 +0100
Subject: xfrm: support displaying transformations used for Mobile IPv6
xfrm: support displaying transformations used for Mobile IPv6 Patch-mainline: No
Patch taken from mip6d-ng c397c3b4a16bb2e31a86f6c5e344a1278d1577c5 Patch taken from mip6d-ng c397c3b4a16bb2e31a86f6c5e344a1278d1577c5
and included in openSUSE so as to facilitate mip6d-ng. and included in openSUSE so as to facilitate mip6d-ng.
--- ---
ip/ipxfrm.c | 2 +- ip/ipxfrm.c | 2 +-
ip/xfrm_policy.c | 1 + ip/xfrm_policy.c | 1 +
ip/xfrm_state.c | 1 + ip/xfrm_state.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-) 3 files changed, 3 insertions(+), 1 deletion(-)
Index: iproute2-4.6.0/ip/ipxfrm.c diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
=================================================================== index d5eb22e25476..b72858d8a210 100644
--- iproute2-4.6.0.orig/ip/ipxfrm.c --- a/ip/ipxfrm.c
+++ iproute2-4.6.0/ip/ipxfrm.c +++ b/ip/ipxfrm.c
@@ -114,7 +114,7 @@ struct typeent { @@ -114,7 +114,7 @@ struct typeent {
static const struct typeent xfrmproto_types[] = { static const struct typeent xfrmproto_types[] = {
{ "esp", IPPROTO_ESP }, { "ah", IPPROTO_AH }, { "comp", IPPROTO_COMP }, { "esp", IPPROTO_ESP }, { "ah", IPPROTO_AH }, { "comp", IPPROTO_COMP },
@ -25,10 +24,10 @@ Index: iproute2-4.6.0/ip/ipxfrm.c
{ NULL, -1 } { NULL, -1 }
}; };
Index: iproute2-4.6.0/ip/xfrm_policy.c diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c
=================================================================== index de689c4d86c4..6ee2ec6abeba 100644
--- iproute2-4.6.0.orig/ip/xfrm_policy.c --- a/ip/xfrm_policy.c
+++ iproute2-4.6.0/ip/xfrm_policy.c +++ b/ip/xfrm_policy.c
@@ -93,6 +93,7 @@ static void usage(void) @@ -93,6 +93,7 @@ static void usage(void)
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP)); fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP));
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH)); fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH));
@ -37,11 +36,11 @@ Index: iproute2-4.6.0/ip/xfrm_policy.c
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING)); fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING));
fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS)); fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS));
fprintf(stderr, "MODE := transport | tunnel | beet | ro | in_trigger\n"); fprintf(stderr, "MODE := transport | tunnel | beet | ro | in_trigger\n");
Index: iproute2-4.6.0/ip/xfrm_state.c diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
=================================================================== index e11c93bf1c3b..b501e6d04727 100644
--- iproute2-4.6.0.orig/ip/xfrm_state.c --- a/ip/xfrm_state.c
+++ iproute2-4.6.0/ip/xfrm_state.c +++ b/ip/xfrm_state.c
@@ -72,6 +72,7 @@ static void usage(void) @@ -73,6 +73,7 @@ static void usage(void)
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP)); fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP));
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH)); fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH));
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_COMP)); fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_COMP));
@ -49,3 +48,6 @@ Index: iproute2-4.6.0/ip/xfrm_state.c
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING)); fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING));
fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS)); fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS));
fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] ALGO\n"); fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] ALGO\n");
--
2.14.1