diff --git a/rstp-fix-warnings.patch b/rstp-fix-warnings.patch new file mode 100644 index 0000000..c21f002 --- /dev/null +++ b/rstp-fix-warnings.patch @@ -0,0 +1,34 @@ +diff -up ./brmon.c.warning ./brmon.c +--- ./brmon.c.warning 2016-02-15 09:50:33.524977085 -0500 ++++ ./brmon.c 2016-02-15 09:53:31.580975481 -0500 +@@ -28,7 +28,7 @@ + + #include "bridge_ctl.h" + +-static const char SNAPSHOT[] = "v0.1"; ++static const char SNAPSHOT[] __attribute__((unused)) = "v0.1"; + + + /* RFC 2863 operational status */ +diff -up ./rstplib/rolesel.c.warning ./rstplib/rolesel.c +--- ./rstplib/rolesel.c.warning 2016-02-15 09:51:04.682851751 -0500 ++++ ./rstplib/rolesel.c 2016-02-15 09:53:06.430269449 -0500 +@@ -63,7 +63,7 @@ static void + setRoleSelected (char* reason, STPM_T* stpm, PORT_T* port, + PORT_ROLE_T newRole) + { +- char* new_role_name; ++ char* new_role_name __attribute__((unused)); + + port->selectedRole = newRole; + +@@ -190,7 +190,9 @@ updtRolesBridge (STATE_MACH_T* this) + { /* 17.19.21 */ + register PORT_T* port; + register STPM_T* stpm; ++#ifdef STP_DBG + PORT_ID old_root_port; /* for tracing of root port changing */ ++#endif + + stpm = this->owner.stpm; + #ifdef STP_DBG diff --git a/rstp.spec b/rstp.spec index dd207e9..9bcbc14 100644 --- a/rstp.spec +++ b/rstp.spec @@ -1,7 +1,7 @@ Name: rstp Summary: Rapid Spanning Tree User Space Daemon Version: 04012009git -Release: 15%{dist} +Release: 16%{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, @@ -21,6 +21,7 @@ Source0: %{name}-%{version}.tar.bz2 Patch0: rstp-type-punning.patch Patch1: rstp-unused-fix.patch Patch2: rstp-ftbfs-bz914445.patch +Patch3: rstp-fix-warnings.patch %description rstp is a user space implementation of the rapid spanning tree protocol. It @@ -32,6 +33,7 @@ replaces the in-kernel STP implementation %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make %{?_smp_mflags} @@ -49,6 +51,9 @@ install -m 755 bridge-stp $RPM_BUILD_ROOT/sbin %changelog +* Mon Feb 15 2016 Neil Horman - 04012009git-16 +- Fix FTBFS (bz 1307998) + * Thu Feb 04 2016 Fedora Release Engineering - 04012009git-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild @@ -96,6 +101,6 @@ install -m 755 bridge-stp $RPM_BUILD_ROOT/sbin - remove URL tag - add requested docs -* Mon Mar 03 2010 Neil Horman - 04012009git-1 +* Mon Mar 01 2010 Neil Horman - 04012009git-1 - Initial Build