From 92367f1593d8e28cf44c11a828bc8aed8e699e77 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Feb 23 2018 16:21:48 +0000
Subject: Update to 1.6 (RHBZ#1389966)


---

diff --git a/.gitignore b/.gitignore
index b1e4daf..ed0f454 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-bridge-utils-1.2.tar.gz
-/bridge-utils-1.5.tar.gz
+/bridge-utils-1.6.tar.sign
+/bridge-utils-1.6.tar.xz
diff --git a/bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch b/bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch
deleted file mode 100644
index ee71b4d..0000000
--- a/bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From bb9970a9df95837e39d680021b1f73d231e85406 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <shemminger@vyatta.com>
-Date: Tue, 3 May 2011 09:52:43 -0700
-Subject: [PATCH 3/3] Check error returns from write to sysfs
-
-Add helper function to check write to sysfs files.
-
-Signed-off-by: Petr Sabata <contyk@redhat.com>
----
- libbridge/libbridge_devif.c |   37 +++++++++++++++++++++++--------------
- 1 files changed, 23 insertions(+), 14 deletions(-)
-
-diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c
-index aa8bc36..1e83925 100644
---- a/libbridge/libbridge_devif.c
-+++ b/libbridge/libbridge_devif.c
-@@ -280,25 +280,38 @@ fallback:
- 	return old_get_port_info(brname, port, info);
- }
- 
-+static int set_sysfs(const char *path, unsigned long value)
-+{
-+	int fd, ret = 0, cc;
-+	char buf[32];
-+
-+	fd = open(path, O_WRONLY);
-+	if (fd < 0)
-+		return -1;
-+
-+	cc = snprintf(buf, sizeof(buf), "%lu\n", value);
-+	if (write(fd, buf, cc) < 0)
-+		ret = -1;
-+	close(fd);
-+
-+	return ret;
-+}
-+
- 
- static int br_set(const char *bridge, const char *name,
- 		  unsigned long value, unsigned long oldcode)
- {
- 	int ret;
- 	char path[SYSFS_PATH_MAX];
--	FILE *f;
- 
--	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/%s", bridge, name);
-+	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/%s",
-+		 bridge, name);
- 
--	f = fopen(path, "w");
--	if (f) {
--		ret = fprintf(f, "%ld\n", value);
--		fclose(f);
--	} else {
-+	if ((ret = set_sysfs(path, value)) < 0) {
- 		/* fallback to old ioctl */
- 		struct ifreq ifr;
- 		unsigned long args[4] = { oldcode, value, 0, 0 };
--		
-+
- 		strncpy(ifr.ifr_name, bridge, IFNAMSIZ);
- 		ifr.ifr_data = (char *) &args;
- 		ret = ioctl(br_socket_fd, SIOCDEVPRIVATE, &ifr);
-@@ -348,14 +361,10 @@ static int port_set(const char *bridge, const char *ifname,
- {
- 	int ret;
- 	char path[SYSFS_PATH_MAX];
--	FILE *f;
- 
- 	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/brport/%s", ifname, name);
--	f = fopen(path, "w");
--	if (f) {
--		ret = fprintf(f, "%ld\n", value);
--		fclose(f);
--	} else {
-+
-+	if ((ret = set_sysfs(path, value)) < 0) {
- 		int index = get_portno(bridge, ifname);
- 
- 		if (index < 0)
--- 
-1.7.5.2
-
diff --git a/bridge-utils-1.5-fix-error-message-for-incorrect-command.patch b/bridge-utils-1.5-fix-error-message-for-incorrect-command.patch
deleted file mode 100644
index 6f86a23..0000000
--- a/bridge-utils-1.5-fix-error-message-for-incorrect-command.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c7ed0996ef58b497d3d30be802ab5ae6c37099b5 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <shemminger@vyatta.com>
-Date: Tue, 3 May 2011 09:49:57 -0700
-Subject: [PATCH 2/3] Fix error message for incorrect command
-
-Debian bug 406907
-Error message was refering to incorrect command argument.
-
-Signed-off-by: Petr Sabata <contyk@redhat.com>
----
- brctl/brctl.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/brctl/brctl.c b/brctl/brctl.c
-index 454b8dd..46ca352 100644
---- a/brctl/brctl.c
-+++ b/brctl/brctl.c
-@@ -69,7 +69,7 @@ int main(int argc, char *const* argv)
- 	argc -= optind;
- 	argv += optind;
- 	if ((cmd = command_lookup(*argv)) == NULL) {
--		fprintf(stderr, "never heard of command [%s]\n", argv[1]);
-+		fprintf(stderr, "never heard of command [%s]\n", *argv);
- 		goto help;
- 	}
- 	
--- 
-1.7.5.2
-
diff --git a/bridge-utils-1.5-fix-incorrect-command-in-manual.patch b/bridge-utils-1.5-fix-incorrect-command-in-manual.patch
deleted file mode 100644
index 2fa9950..0000000
--- a/bridge-utils-1.5-fix-incorrect-command-in-manual.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8ef7b77562b636efcbd8b759eb324d6c069200f2 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <shemminger@vyatta.com>
-Date: Tue, 3 May 2011 09:48:40 -0700
-Subject: [PATCH 1/3] Fix incorrect command in manual
-
-Command is "setageing" not "setageingtime"; fix man page.
-Debian bug report.
-
-Signed-off-by: Petr Sabata <contyk@redhat.com>
----
- doc/brctl.8 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/doc/brctl.8 b/doc/brctl.8
-index d904047..771f323 100644
---- a/doc/brctl.8
-+++ b/doc/brctl.8
-@@ -89,7 +89,7 @@ data. Machines can move to other ports, network cards can be replaced
- .B brctl showmacs <brname>
- shows a list of learned MAC addresses for this bridge.
- 
--.B brctl setageingtime <brname> <time>
-+.B brctl setageing <brname> <time>
- sets the ethernet (MAC) address ageing time, in seconds. After <time>
- seconds of not having seen a frame coming from a certain address, the
- bridge will time out (delete) that address from the Forwarding
--- 
-1.7.5.2
-
diff --git a/bridge-utils-1.5-linux_3.8.x.patch b/bridge-utils-1.5-linux_3.8.x.patch
deleted file mode 100644
index 0455a90..0000000
--- a/bridge-utils-1.5-linux_3.8.x.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d
-Author: Russell Senior <russell@personaltelco.net>
-Date:   Wed Mar 6 12:49:42 2013 -0800
-
-    bridge-utils: Fix compile against linux-3.8.x
-    
-    Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a
-    struct in6_addr but doesn't define it.  The trivial seeming fix of
-    including the header that does define it causes more problems.  The
-    problem was discussed on mailing lists in January 2013.  The final
-    suggestion I found was here:
-    
-          http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
-    
-    This is intended to implement that suggestion.
-    
-    Signed-off-by: Russell Senior <russell@personaltelco.net>
-
-diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
-index 39964f2..dd14bae 100644
---- a/libbridge/libbridge.h
-+++ b/libbridge/libbridge.h
-@@ -20,6 +20,7 @@
- #define _LIBBRIDGE_H
- 
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <linux/if.h>
- #include <linux/if_bridge.h>
- 
diff --git a/bridge-utils-1.6-add-missing-sys-time.patch b/bridge-utils-1.6-add-missing-sys-time.patch
new file mode 100644
index 0000000..c4ce4aa
--- /dev/null
+++ b/bridge-utils-1.6-add-missing-sys-time.patch
@@ -0,0 +1,33 @@
+From b69811c054a55c241ce5628a32a62486eab491e5 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@aleksander.es>
+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 <aleksander@aleksander.es>
+---
+ 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 <sys/types.h>
+ #include <sys/socket.h>
++#include <sys/time.h>
+ #include <netinet/in.h>
++
+ #include <linux/if.h>
+ #include <linux/if_bridge.h>
+ 
+-- 
+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
new file mode 100644
index 0000000..f08efec
--- /dev/null
+++ b/bridge-utils-1.6-fix-signed-unsigned-warnings.patch
@@ -0,0 +1,38 @@
+From 42c1aefc303fdf891fbb099ea51f00dca83ab606 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <stephen@networkplumber.org>
+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 <stephen@networkplumber.org>
+---
+ 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.spec b/bridge-utils.spec
index b0ea811..7496e71 100644
--- a/bridge-utils.spec
+++ b/bridge-utils.spec
@@ -1,21 +1,20 @@
 Summary:        Utilities for configuring the linux ethernet bridge
 Name:           bridge-utils
-Version:        1.5
-Release:        17%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 License:        GPLv2+
-URL:            http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge
-Group:          System Environment/Base
+URL:            https://wiki.linuxfoundation.org/networking/bridge
 
-Source:         http://downloads.sourceforge.net/bridge/%{name}-%{version}.tar.gz
-Patch0:         bridge-utils-1.5-fix-incorrect-command-in-manual.patch
-Patch1:         bridge-utils-1.5-fix-error-message-for-incorrect-command.patch
-Patch2:         bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch
-Patch10:        bridge-utils-1.0.4-inc.patch
-Patch11:        bridge-utils-1.5-linux_3.8.x.patch
-Patch12:        bridge-utils-libbridge-cflags.patch
+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
+Patch0:         bridge-utils-1.0.4-inc.patch
+Patch1:         bridge-utils-libbridge-cflags.patch
+Patch2:         bridge-utils-1.6-add-missing-sys-time.patch
+Patch3:         bridge-utils-1.6-fix-signed-unsigned-warnings.patch
 
 BuildRequires:  libsysfs-devel
 BuildRequires:  autoconf automake libtool
+BuildRequires:  gcc
 BuildRequires:  kernel-headers >= 2.6.16
 
 %description
@@ -32,9 +31,7 @@ Install bridge-utils if you want to use the linux ethernet bridge.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1 -b libbridge
+%patch3 -p1
 
 %build
 autoconf
@@ -52,6 +49,9 @@ make DESTDIR=%{buildroot} SUBDIRS="brctl doc" install
 %{_mandir}/man8/brctl.8*
 
 %changelog
+* Fri Feb 23 2018 Michael Cronenworth <mike@cchtml.com> - 1.6-1
+- 1.6 bump
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 22ad9d9..5f537c1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-ec7b381160b340648dede58c31bb2238  bridge-utils-1.5.tar.gz
+SHA512 (bridge-utils-1.6.tar.sign) = 6a0c4cd89298cc580a1d2f8e8396a2d41618f380ce2188e50e7e5d3c1cbc2cb12a979862321fb32b6aa6cbe1ba715c575f77446316ed9834632d99cdbd9ed56d
+SHA512 (bridge-utils-1.6.tar.xz) = b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02