[rstp] Resolves: bz 914445

[Neil Horman]

commit 41ab742fede81c5d0f58261392591fd4cc5bbb83
Author: Neil Horman <nhorman at tuxdriver.com>
Date:   Fri Feb 22 08:56:16 2013 -0500

    Resolves: bz 914445

 rstp-ftbfs-bz914445.patch |   59 +++++++++++++++++++++++++++++++++++++++++++++
 rstp.spec                 |    7 ++++-
 2 files changed, 65 insertions(+), 1 deletions(-)
---
diff --git a/rstp-ftbfs-bz914445.patch b/rstp-ftbfs-bz914445.patch
new file mode 100644
index 0000000..e0adb94
--- /dev/null
+++ b/rstp-ftbfs-bz914445.patch
@@ -0,0 +1,59 @@
+diff -up ./bridge_track.c.orig ./bridge_track.c
+--- ./bridge_track.c.orig	2013-02-22 08:48:21.432055073 -0500
++++ ./bridge_track.c	2013-02-22 08:48:48.015792033 -0500
+@@ -29,6 +29,7 @@
+ #include <unistd.h>
+ #include <net/if.h>
+ #include <stdlib.h>
++#include <netinet/in.h>
+ #include <linux/if_bridge.h>
+ #include <arpa/inet.h>
+ #include <sys/types.h>
+diff -up ./rstplib/rolesel.c.orig ./rstplib/rolesel.c
+--- ./rstplib/rolesel.c.orig	2010-03-02 14:10:22.000000000 -0500
++++ ./rstplib/rolesel.c	2013-02-22 08:47:37.565838959 -0500
+@@ -70,6 +70,7 @@ setRoleSelected (char* reason, STPM_T* s
+   if (newRole == port->role)
+     return;
+ 
++#ifdef STP_DBG
+   switch (newRole) {
+     case DisabledPort:
+       new_role_name = "Disabled";
+@@ -96,10 +97,25 @@ setRoleSelected (char* reason, STPM_T* s
+       return;
+   }
+ 
+-#ifdef STP_DBG
+   if (port->roletrns->debug)
+     stp_trace ("%s(%s-%s) => %s",
+                reason, stpm->name, port->port_name, new_role_name);
++#else
++  switch (newRole) {
++    case DisabledPort:
++    case AlternatePort:
++    case BackupPort:
++    case RootPort:
++    case DesignatedPort:
++	break;
++    case NonStpPort:
++	port->role = newRole;
++	break;
++    default:
++      stp_trace ("%s-%s:port %s => Unknown (%d ?)",
++                 reason, stpm->name, port->port_name, (int) newRole);
++      return;
++  }
+ #endif
+ }
+ 
+@@ -177,7 +193,9 @@ updtRolesBridge (STATE_MACH_T* this)
+   PORT_ID old_root_port; /* for tracing of root port changing */
+ 
+   stpm = this->owner.stpm;
++#ifdef STP_DBG
+   old_root_port = stpm->rootPortId;
++#endif
+ 
+   STP_VECT_create (&stpm->rootPrio, &stpm->BrId, 0, &stpm->BrId, 0, 0);
+   STP_copy_times (&stpm->rootTimes, &stpm->BrTimes);
diff --git a/rstp.spec b/rstp.spec
index e2e1a73..0651bcb 100644
--- a/rstp.spec
+++ b/rstp.spec
@@ -1,7 +1,7 @@
 Name:		rstp
 Summary:	Rapid Spanning Tree User Space Daemon
 Version:	04012009git
-Release:	9%{dist}
+Release:	10%{dist}
 # Note the lack of a URL tag here.  rstp has no official upstream project page,
 # just a git repository, so we don't include the URL here. rpmlint will yell
 # about this, rpmlint is wrong,
@@ -20,6 +20,7 @@ Source0:	%{name}-%{version}.tar.bz2
 # Submitted upstream, no reply yet
 Patch0:	rstp-type-punning.patch
 Patch1: rstp-unused-fix.patch
+Patch2: rstp-ftbfs-bz914445.patch
 
 %description
 rstp is a user space implementation of the rapid spanning tree protocol.  It
@@ -30,6 +31,7 @@ replaces the in-kernel STP implementation
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make %{?_smp_mflags}
@@ -47,6 +49,9 @@ install -m 755 bridge-stp $RPM_BUILD_ROOT/sbin
 
 
 %changelog
+* Fri Feb 22 2013 Neil Horman <nhorman at redhat.com> - 04012009git-10
+- Fixed FTBFS (bz 914445)
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 04012009git-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild