From 519fa2226d2286035f5b10b035e0f544f547e27a4b6b13c9315330174d147555 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 31 Jul 2017 13:10:45 +0000 Subject: [PATCH] revert r141 (copyback r140) as per comments in SR513179 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=143 --- iproute2-doc.changes | 5 ----- iproute2-doc.spec | 2 -- iproute2.changes | 5 ----- iproute2.spec | 2 -- tc-headers.patch | 17 ----------------- 5 files changed, 31 deletions(-) delete mode 100644 tc-headers.patch diff --git a/iproute2-doc.changes b/iproute2-doc.changes index 36b26fc..73de2dc 100644 --- a/iproute2-doc.changes +++ b/iproute2-doc.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Jul 31 12:23:04 UTC 2017 - schwab@suse.de - -- tc-headers.patch: add missing header - ------------------------------------------------------------------- Tue Jul 11 12:26:19 UTC 2017 - mkubecek@suse.cz diff --git a/iproute2-doc.spec b/iproute2-doc.spec index c916285..f0c3b80 100644 --- a/iproute2-doc.spec +++ b/iproute2-doc.spec @@ -28,7 +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 -Patch2: tc-headers.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison @@ -59,7 +58,6 @@ as well as examples and other outdated files. %prep %setup -qn iproute2-%rversion %patch1 -p1 -%patch2 -p1 %build # build with -fPIC. For details see diff --git a/iproute2.changes b/iproute2.changes index 36b26fc..73de2dc 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Jul 31 12:23:04 UTC 2017 - schwab@suse.de - -- tc-headers.patch: add missing header - ------------------------------------------------------------------- Tue Jul 11 12:26:19 UTC 2017 - mkubecek@suse.cz diff --git a/iproute2.spec b/iproute2.spec index 5f45b8f..af0d82e 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -39,7 +39,6 @@ Patch4: revert-bison-fix.diff Patch5: kernel_xfrm6_raw.patch Patch6: man-fix-documentation-references-in-manual-pages.patch Patch7: iproute2-split-make.patch -Patch8: tc-headers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -92,7 +91,6 @@ bash command line completion support for iproute. %patch -P 4 -p1 %endif %patch -P 5 -P 6 -P 7 -p1 -%patch8 -p1 find . -name *.orig -delete %build diff --git a/tc-headers.patch b/tc-headers.patch deleted file mode 100644 index 7f6a63d..0000000 --- a/tc-headers.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Andreas Schwab -Date: Mon, 31 Jul 2017 12:24:30 +0000 - -add missing header - -Index: iproute2-4.11.0/tc/tc_core.c -=================================================================== ---- iproute2-4.11.0.orig/tc/tc_core.c -+++ iproute2-4.11.0/tc/tc_core.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #include "tc_core.h" - #include