From 5c6deb1f07e2d08a5ef6ce7b8e19e77ddf32a89a Mon Sep 17 00:00:00 2001 From: zhuchengliang Date: Fri, 10 Jan 2020 15:24:06 +0800 Subject: [PATCH] delete patches --- bridge-utils-1.0.4-inc.patch | 10 ----- bridge-utils-1.6-add-missing-sys-time.patch | 33 ---------------- ...ils-1.6-fix-signed-unsigned-warnings.patch | 38 ------------------- ....patch => bridge-utils-option-cflags.patch | 9 +++-- bridge-utils.spec | 16 +++++--- 5 files changed, 16 insertions(+), 90 deletions(-) delete mode 100644 bridge-utils-1.0.4-inc.patch delete mode 100644 bridge-utils-1.6-add-missing-sys-time.patch delete mode 100644 bridge-utils-1.6-fix-signed-unsigned-warnings.patch rename bridge-utils-libbridge-cflags.patch => bridge-utils-option-cflags.patch (45%) diff --git a/bridge-utils-1.0.4-inc.patch b/bridge-utils-1.0.4-inc.patch deleted file mode 100644 index 1ae3f5b..0000000 --- a/bridge-utils-1.0.4-inc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- bridge-utils-1.0.4/libbridge/libbridge_private.h~ 2004-05-28 21:38:38.000000000 +0100 -+++ bridge-utils-1.0.4/libbridge/libbridge_private.h 2004-07-01 11:24:21.000000000 +0100 -@@ -22,6 +22,7 @@ - #include "config.h" - - #include -+#include - #include - #include - #include diff --git a/bridge-utils-1.6-add-missing-sys-time.patch b/bridge-utils-1.6-add-missing-sys-time.patch deleted file mode 100644 index c4ce4aa..0000000 --- a/bridge-utils-1.6-add-missing-sys-time.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b69811c054a55c241ce5628a32a62486eab491e5 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado -Date: Mon, 17 Jul 2017 17:21:38 -0700 -Subject: libbridge: add missing sys/time.h include in header Required to - define the 'struct timeval' type: - - In file included from external/bridge-utils/brctl/brctl.c:25: - external/bridge-utils/brctl/../libbridge/libbridge.h:44:17: error: field has incomplete type 'struct timeval' - struct timeval max_age; - ^ - -Signed-off-by: Aleksander Morgado ---- - libbridge/libbridge.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h -index ff047f9..c038b92 100644 ---- a/libbridge/libbridge.h -+++ b/libbridge/libbridge.h -@@ -21,7 +21,9 @@ - - #include - #include -+#include - #include -+ - #include - #include - --- -cgit v1.1 - diff --git a/bridge-utils-1.6-fix-signed-unsigned-warnings.patch b/bridge-utils-1.6-fix-signed-unsigned-warnings.patch deleted file mode 100644 index f08efec..0000000 --- a/bridge-utils-1.6-fix-signed-unsigned-warnings.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 42c1aefc303fdf891fbb099ea51f00dca83ab606 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger -Date: Mon, 17 Jul 2017 17:23:56 -0700 -Subject: brctl: fix signed/unsigned comparison warnings - -If built with warning enabled, Gcc would complain about -comparison of signed with unsigned. - -Signed-off-by: Stephen Hemminger ---- - brctl/brctl_cmd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/brctl/brctl_cmd.c b/brctl/brctl_cmd.c -index 5f12e6f..acd66be 100644 ---- a/brctl/brctl_cmd.c -+++ b/brctl/brctl_cmd.c -@@ -483,7 +483,7 @@ static const struct command commands[] = { - - const struct command *command_lookup(const char *cmd) - { -- int i; -+ unsigned int i; - - for (i = 0; i < sizeof(commands)/sizeof(commands[0]); i++) { - if (!strcmp(cmd, commands[i].name)) -@@ -495,7 +495,7 @@ const struct command *command_lookup(const char *cmd) - - void command_helpall(void) - { -- int i; -+ unsigned int i; - - for (i = 0; i < sizeof(commands)/sizeof(commands[0]); i++) { - printf("\t%-10s\t%s\n", commands[i].name, commands[i].help); --- -cgit v1.1 - diff --git a/bridge-utils-libbridge-cflags.patch b/bridge-utils-option-cflags.patch similarity index 45% rename from bridge-utils-libbridge-cflags.patch rename to bridge-utils-option-cflags.patch index 50bb27a..18d5fd1 100644 --- a/bridge-utils-libbridge-cflags.patch +++ b/bridge-utils-option-cflags.patch @@ -1,6 +1,8 @@ ---- bridge-utils-1.5/libbridge/Makefile.in.orig 2015-07-21 13:09:20.270079468 +0100 -+++ bridge-utils-1.5/libbridge/Makefile.in 2015-07-21 13:09:39.382036853 +0100 -@@ -5,7 +5,7 @@ +diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in +index 20512c4..f9c6e70 100644 +--- a/libbridge/Makefile.in ++++ b/libbridge/Makefile.in +@@ -5,7 +5,7 @@ AR=ar RANLIB=@RANLIB@ CC=@CC@ @@ -9,3 +11,4 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ + diff --git a/bridge-utils.spec b/bridge-utils.spec index b8aa8fd..ef3ca55 100644 --- a/bridge-utils.spec +++ b/bridge-utils.spec @@ -1,19 +1,17 @@ Summary: Utilities for configuring the linux ethernet bridge Name: bridge-utils Version: 1.6 -Release: 3 +Release: 4 License: GPLv2+ URL: https://wiki.linuxfoundation.org/networking/bridge Source0: https://www.kernel.org/pub/linux/utils/net/%{name}/%{name}-%{version}.tar.xz Source1: https://www.kernel.org/pub/linux/utils/net/%{name}/%{name}-%{version}.tar.sign -#The following four patches come from fedoraproject -Patch0000: bridge-utils-1.0.4-inc.patch -Patch0001: bridge-utils-libbridge-cflags.patch -Patch0002: bridge-utils-1.6-add-missing-sys-time.patch -Patch0003: bridge-utils-1.6-fix-signed-unsigned-warnings.patch + +Patch0000: bridge-utils-option-cflags.patch Patch9000: bugfix-bridge-not-check-parameters.patch Patch9001: bugfix-avoid-showmacs-memory-leak.patch + BuildRequires: libsysfs-devel autoconf automake libtool BuildRequires: kernel-headers >= 2.6.16 @@ -42,5 +40,11 @@ autoconf %{_mandir}/man8/brctl.8* %changelog +* Thu Jan 10 2020 openEuler Buildteam - 1.6.4 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: delete patches + * Wed Sep 18 2019 Alex Chao - 1.6-3 - Package init -- Gitee