[rstp] Resolves: bz 716119

[Neil Horman]

commit aab1d38b05e5cd232250e25a8cf2dc0300e94d0c
Author: Neil Horman <nhorman at tuxdriver.com>
Date:   Thu Jun 23 15:45:11 2011 -0400

    Resolves: bz 716119

 rstp-unused-fix.patch |   20 ++++++++++++++++++++
 rstp.spec             |    7 ++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/rstp-unused-fix.patch b/rstp-unused-fix.patch
new file mode 100644
index 0000000..d6895b0
--- /dev/null
+++ b/rstp-unused-fix.patch
@@ -0,0 +1,20 @@
+diff -up rstp/libnetlink.c.orig rstp/libnetlink.c
+--- rstp/libnetlink.c.orig	2011-06-23 15:42:29.496645524 -0400
++++ rstp/libnetlink.c	2011-06-23 15:42:41.636027065 -0400
+@@ -449,7 +449,7 @@ int rtnl_from_file(FILE * rtnl, rtnl_fil
+ 	nladdr.nl_groups = 0;
+ 
+ 	while (1) {
+-		int err, len, type;
++		int err, len;
+ 		int l;
+ 
+ 		status = fread(&buf, 1, sizeof(*h), rtnl);
+@@ -464,7 +464,6 @@ int rtnl_from_file(FILE * rtnl, rtnl_fil
+ 			return 0;
+ 
+ 		len = h->nlmsg_len;
+-		type = h->nlmsg_type;
+ 		l = len - sizeof(*h);
+ 
+ 		if (l < 0 || len > sizeof(buf)) {
diff --git a/rstp.spec b/rstp.spec
index c2914ff..774fcce 100644
--- a/rstp.spec
+++ b/rstp.spec
@@ -1,7 +1,7 @@
 Name:		rstp
 Summary:	Rapid Spanning Tree User Space Daemon
 Version:	04012009git
-Release:	5%{dist}
+Release:	6%{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,
@@ -19,6 +19,7 @@ Source0:	%{name}-%{version}.tar.bz2
 # http://patchwork.ozlabs.org/patch/46803/
 # Submitted upstream, no reply yet
 Patch0:	rstp-type-punning.patch
+Patch1: rstp-unused-fix.patch
 
 %description
 rstp is a user space implementation of the rapid spanning tree protocol.  It
@@ -28,6 +29,7 @@ replaces the in-kernel STP implementation
 %setup -q -n rstp
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 make %{?_smp_mflags}
@@ -45,6 +47,9 @@ install -m 755 bridge-stp $RPM_BUILD_ROOT/sbin
 
 
 %changelog
+* Thu Jun 23 2011 Neil Horman <nhorman at redhat.com> - 041209git-6
+- Fixed unused variable build error (bz 716119)
+ 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 04012009git-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild