From dfc71a923dfaa381fc8e70dd4a0756f968d39403 Mon Sep 17 00:00:00 2001
From: Jaroslav Reznik <jreznik@redhat.com>
Date: Mar 26 2013 13:48:00 +0000
Subject: fixed build with kernel 3.8.x using upstream fix by Russell Senior


---

diff --git a/bridge-utils-1.5-linux_3.8.x.patch b/bridge-utils-1.5-linux_3.8.x.patch
new file mode 100644
index 0000000..0455a90
--- /dev/null
+++ b/bridge-utils-1.5-linux_3.8.x.patch
@@ -0,0 +1,30 @@
+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.spec b/bridge-utils.spec
index 1c3414e..4d8520f 100644
--- a/bridge-utils.spec
+++ b/bridge-utils.spec
@@ -1,7 +1,7 @@
 Summary:        Utilities for configuring the linux ethernet bridge
 Name:           bridge-utils
 Version:        1.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        GPLv2+
 URL:            http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge
 Group:          System Environment/Base
@@ -10,6 +10,7 @@ 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
 BuildRequires:  libsysfs-devel autoconf
 BuildRequires:  kernel-headers >= 2.6.16
 
@@ -28,6 +29,7 @@ Install bridge-utils if you want to use the linux ethernet bridge.
 %patch1 -p1
 %patch2 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 autoconf
@@ -43,6 +45,9 @@ make DESTDIR=%{buildroot} SUBDIRS="brctl doc" install
 %{_mandir}/man8/brctl.8*
 
 %changelog
+* Tue Mar 26 2013 Thomas Woerner <twoerner@redhat.com> - 1.5-7
+- fixed build with kernel 3.8.x using upstream fix by Russell Senior
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild