mstpd: Update package to latest development version (r16).

Also update URL and fix a bug in the systemd unit file.

diff --git a/mstpd/bridge-stp b/mstpd/bridge-stp
deleted file mode 100644 (file)
index 947c12b..0000000
--- a/mstpd/bridge-stp
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007, 2008, 2009 Michael Tremer & Christian Schmidt           #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-#
-# This script always returns 0 to prevent the kernel
-# starting its own stp implementation.
-
-exit 0

diff --git a/mstpd/mstpd.nm b/mstpd/mstpd.nm
index 04a3876c724261cc0e3898f824b8547aa1f27847..55197baedf2b3eaea3fefa75d86506e5d6928469 100644 (file)
--- a/mstpd/mstpd.nm
+++ b/mstpd/mstpd.nm
@@ -5,12 +5,12 @@
 
 name       = mstpd
 version    = 0.01
-git_ver    = 0d06abf
-release    = 0.1-git%{git_ver}.1
-thisapp    = %{name}-%{version}-git%{git_ver}
+svn_ver    = 16
+release    = 0.2-svn%{svn_ver}.1
+thisapp    = %{name}-%{version}-svn%{svn_ver}
 
 groups     = Networking/Tools
-url        = http://git.ipfire.org/?p=thirdparty/mstpd.git;a=summary
+url        = http://sourceforge.net/projects/mstpd/
 license    = GPLv2+
 summary    = The Multiple Spanning Tree Protocol Daemon.
 
@@ -19,21 +19,27 @@ description
        running upon the Linux ethernet bridge.
 end
 
+# Tarballs are created as follows:
+# svn export http://svn.code.sf.net/p/mstpd/code/trunk mstpd-%{version}-svn%{svn_ver}
+# tar cvfz mstpd-%{version}-svn%{svn_ver}.tar.gz mstpd-%{version}-svn%{svn_ver}
+
 build
-       prepare_cmds
-               # Please do not ship code with -Werror enabled.
-               sed -i Makefile \
-                       -e "s/-Werror//"
-       end
+       # Compile for release.
+       make_build_targets += MODE=release
 
        install_cmds
-               install -v -m 755 %{DIR_SOURCE}/bridge-stp \
-                       %{BUILDROOT}/sbin/bridge-stp
+               rm -vf %{BUILDROOT}/sbin/bridge-stp
        end
 end
 
 packages
        package %{name}
+               requires = network
+
+               # A regression in the Linux kernel causes that no port
+               # was brought up. It was fixed in 3.0.4-11.
+               requires += kernel>=3.0.4-11
+
                script postin
                        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
                        /bin/systemctl --no-reload enable mstpd.service >/dev/null 2>&1 || :

diff --git a/mstpd/systemd/mstpd.service b/mstpd/systemd/mstpd.service
index 8a14d399d8fd676ff56771ec3ef4e0e8ac827bde..95b02545f1e71425cc395706eb5dfe573d26fa69 100644 (file)
--- a/mstpd/systemd/mstpd.service
+++ b/mstpd/systemd/mstpd.service
@@ -3,7 +3,6 @@ Description=Multiple Spanning Tree Protocol Daemon
 Before=network.service
 
 [Service]
-ExecStartPre=/sbin/modprobe net_pf_17
 ExecStart=/sbin/mstpd -d
 Restart=always