This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 426ef9664001ecc2b6624579476eac8991843620 (commit) via aaacf0a65d4dd92f183be51d9dd9c177a2079cc8 (commit) via 076fd4881774dfe7960a503e912e1c9b641eabdb (commit) via 5fe3c5562443efdcad2e3e255ef84577574ff7f8 (commit) via a4469535c383febd090102b4d9d95e6f76da8b73 (commit) from e13e787b8dc0285db4a7ddd235b9235b768610a2 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 426ef9664001ecc2b6624579476eac8991843620 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 14 14:21:17 2011 +0100
rstp: systemd unit file had an invalid command.
commit aaacf0a65d4dd92f183be51d9dd9c177a2079cc8 Merge: 5fe3c55 076fd48 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 14 13:36:26 2011 +0100
Merge branch 'mstpd'
commit 076fd4881774dfe7960a503e912e1c9b641eabdb Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 14 13:35:26 2011 +0100
mstpd: Update package to latest development version (r16).
Also update URL and fix a bug in the systemd unit file.
commit 5fe3c5562443efdcad2e3e255ef84577574ff7f8 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 14 10:35:07 2011 +0100
kernel: Fix regression for user-space STP in bridging code.
The patch was proposed to be included in IPFire by Vitalii Demianets vitas@nppfactor.kiev.ua.
He says: Thank you for the logs. The problem is clear now. As I suspected the bridge interface red0 is not running (in NO-CARRIER, DOWN state).
That's because of this patch: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=patch;h=1... which appeared in 2.6.39
Stephen obviously did not take into account user-space stp when submitted this patch, because in the case of user-space stp bridge interface have no chance to call netif_carrier_on(), so it will always be down, as we see it.
This regression was reverted by this patch: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=patch;h=b... which appeared in 3.0.9.
commit a4469535c383febd090102b4d9d95e6f76da8b73 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 9 22:31:13 2011 +0100
mstpd: New package.
-----------------------------------------------------------------------
Summary of changes: kernel/kernel.nm | 2 +- kernel/patches/linux-3.0-bridge-no-carrier.patch | 44 ++++++++++++++++ mstpd/mstpd.nm | 58 ++++++++++++++++++++++ mstpd/systemd/mstpd.service | 10 ++++ rstp/rstp.nm | 7 ++- rstp/systemd/rstp.service | 1 - 6 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 kernel/patches/linux-3.0-bridge-no-carrier.patch create mode 100644 mstpd/mstpd.nm create mode 100644 mstpd/systemd/mstpd.service
Difference in files: diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 347a3f6..c8b1b45 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@
name = kernel version = 3.0.4 -release = 10 +release = 11 thisapp = linux-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org diff --git a/kernel/patches/linux-3.0-bridge-no-carrier.patch b/kernel/patches/linux-3.0-bridge-no-carrier.patch new file mode 100644 index 0000000..42f2010 --- /dev/null +++ b/kernel/patches/linux-3.0-bridge-no-carrier.patch @@ -0,0 +1,44 @@ +From b64b73d7d0c480f75684519c6134e79d50c1b341 Mon Sep 17 00:00:00 2001 +From: stephen hemminger shemminger@vyatta.com +Date: Mon, 3 Oct 2011 18:14:45 +0000 +Subject: [PATCH] bridge: leave carrier on for empty bridge + +This resolves a regression seen by some users of bridging. +Some users use the bridge like a dummy device. +They expect to be able to put an IPv6 address on the device +with no ports attached. Although there are better ways of doing +this, there is no reason to not allow it. + +Note: the bridge still will reflect the state of ports in the +bridge if there are any added. + +Signed-off-by: Stephen Hemminger shemminger@vyatta.com +Signed-off-by: David S. Miller davem@davemloft.net +--- + net/bridge/br_device.c | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c +index 32b8f9f..ff3ed60 100644 +--- a/net/bridge/br_device.c ++++ b/net/bridge/br_device.c +@@ -91,7 +91,6 @@ static int br_dev_open(struct net_device *dev) + { + struct net_bridge *br = netdev_priv(dev); + +- netif_carrier_off(dev); + netdev_update_features(dev); + netif_start_queue(dev); + br_stp_enable_bridge(br); +@@ -108,8 +107,6 @@ static int br_dev_stop(struct net_device *dev) + { + struct net_bridge *br = netdev_priv(dev); + +- netif_carrier_off(dev); +- + br_stp_disable_bridge(br); + br_multicast_stop(br); + +-- +1.7.6.2 + diff --git a/mstpd/mstpd.nm b/mstpd/mstpd.nm new file mode 100644 index 0000000..55197ba --- /dev/null +++ b/mstpd/mstpd.nm @@ -0,0 +1,58 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = mstpd +version = 0.01 +svn_ver = 16 +release = 0.2-svn%{svn_ver}.1 +thisapp = %{name}-%{version}-svn%{svn_ver} + +groups = Networking/Tools +url = http://sourceforge.net/projects/mstpd/ +license = GPLv2+ +summary = The Multiple Spanning Tree Protocol Daemon. + +description + A daemon that implements the Multiple Spanning Tree Protocol + 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 + # Compile for release. + make_build_targets += MODE=release + + install_cmds + 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 || : + end + + script preun + /bin/systemctl --no-reload disable mstpd.service >/dev/null 2>&1 || : + /bin/systemctl stop rstp.service >/dev/null 2>&1 || : + end + + script postup + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart mstpd.service >/dev/null 2>&1 || : + end + end +end diff --git a/mstpd/systemd/mstpd.service b/mstpd/systemd/mstpd.service new file mode 100644 index 0000000..95b0254 --- /dev/null +++ b/mstpd/systemd/mstpd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Multiple Spanning Tree Protocol Daemon +Before=network.service + +[Service] +ExecStart=/sbin/mstpd -d +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/rstp/rstp.nm b/rstp/rstp.nm index 6bbc3ff..9903d1e 100644 --- a/rstp/rstp.nm +++ b/rstp/rstp.nm @@ -5,7 +5,7 @@
name = rstp version = 0.21 -release = 7 +release = 8
groups = Networking/Tools url = http://git.ipfire.org/?p=thirdparty/rstp.git;a=summary @@ -25,12 +25,15 @@ build
install make install INSTALLPREFIX=%{BUILDROOT} - 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 + script postin /bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl --no-reload enable rstp.service >/dev/null 2>&1 || : diff --git a/rstp/systemd/rstp.service b/rstp/systemd/rstp.service index d322a39..b9d6021 100644 --- a/rstp/systemd/rstp.service +++ b/rstp/systemd/rstp.service @@ -4,7 +4,6 @@ Before=network.service
[Service] RemainAfterExit=yes -ExecStartPre=/sbin/modprobe net_pf_17 ExecStart=/sbin/rstpd -d
[Install]
hooks/post-receive -- IPFire 3.x development tree