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 71858032e55cf8620a69033f6897a2152eb142d9 (commit) via 85cfb6743bf061beed3820b914e9bfb5c8075c56 (commit) via 173c3b05242b028b420eb5112d7917c5548d0698 (commit) via 5bc4053916f3c6ab246e60ff1fcefd70b57baaa1 (commit) from 43a405aa48216dc988314fc35253358ffc2e53c8 (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 71858032e55cf8620a69033f6897a2152eb142d9 Merge: 85cfb67 5bc4053 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 27 11:46:14 2011 +0100

Merge remote-tracking branch 'stevee/m4'

commit 85cfb6743bf061beed3820b914e9bfb5c8075c56 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 27 11:43:23 2011 +0100

kernel: Make all kernels provide kernel=<version>.

This is required if a specific feature is only provided by a specific version of the kernel. This will allow to install a different version of the kernel (e.g. kernel-PAE) without having dependency problems.

All kernel packages do fully replace the main kernel.

commit 173c3b05242b028b420eb5112d7917c5548d0698 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 27 11:42:45 2011 +0100

mstpd: Update to latest SVN version (20).

Add script to easily generate tarballs directly from SVN.

commit 5bc4053916f3c6ab246e60ff1fcefd70b57baaa1 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Nov 25 19:21:23 2011 +0100

m4: Add readlink-einval.patch / Activate testsuite.

-----------------------------------------------------------------------

Summary of changes: kernel/kernel.nm | 4 +- m4/m4.nm | 15 +- m4/patches/m4-1.4.16-readlink-einval.patch | 12 ++ mstpd/mstpd.nm | 11 +- .../ignore-carrier-state-on-bridge-device.patch0 | 140 -------------------- mstpd/svn-export.sh | 20 +++ 6 files changed, 44 insertions(+), 158 deletions(-) create mode 100644 m4/patches/m4-1.4.16-readlink-einval.patch delete mode 100644 mstpd/patches/ignore-carrier-state-on-bridge-device.patch0 create mode 100755 mstpd/svn-export.sh

Difference in files: diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 0db132d..f24a474 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@

name = kernel version = 3.1.1 -release = 1 +release = 2 thisapp = linux-%{version}

maintainer = Michael Tremer michael.tremer@ipfire.org @@ -249,7 +249,7 @@ packages summary = The Linux kernel %{kernel_release}.

prerequires = dracut grubby module-init-tools - provides = kernel + provides = kernel=%{kernel_release} requires %{prerequires} linux-firmware diff --git a/m4/m4.nm b/m4/m4.nm index 837951a..cd2c64d 100644 --- a/m4/m4.nm +++ b/m4/m4.nm @@ -5,7 +5,7 @@

name = m4 version = 1.4.16 -release = 1 +release = 2

groups = Applications/Text url = http://www.gnu.org/software/m4/ @@ -21,15 +21,14 @@ description configure scripts, but not for running configure scripts. end

-source_dl = +source_dl = http://ftp.gnu.org/gnu/m4/ sources = %{thisapp}.tar.xz

-# Testsuite is broken ( readlink ) -#build -# test -# make check -# end -#end +build + test + make check + end +end

packages package %{name} diff --git a/m4/patches/m4-1.4.16-readlink-einval.patch b/m4/patches/m4-1.4.16-readlink-einval.patch new file mode 100644 index 0000000..6a98751 --- /dev/null +++ b/m4/patches/m4-1.4.16-readlink-einval.patch @@ -0,0 +1,12 @@ +diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h +--- m4-1.4.16/tests/test-readlink.h.orig 2011-09-19 12:44:58.745546826 +0200 ++++ m4-1.4.16/tests/test-readlink.h 2011-09-19 12:46:00.079548410 +0200 +@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con + ASSERT (errno == ENOENT); + errno = 0; + ASSERT (func ("", buf, sizeof buf) == -1); +- ASSERT (errno == ENOENT); ++ ASSERT (errno == ENOENT || errno == EINVAL); + errno = 0; + ASSERT (func (".", buf, sizeof buf) == -1); + ASSERT (errno == EINVAL); diff --git a/mstpd/mstpd.nm b/mstpd/mstpd.nm index 24fd092..11698f3 100644 --- a/mstpd/mstpd.nm +++ b/mstpd/mstpd.nm @@ -5,8 +5,8 @@

name = mstpd version = 0.01 -svn_ver = 16 -release = 0.2-svn%{svn_ver}.4 +svn_ver = 20 +release = 0.2-svn%{svn_ver}.1 thisapp = %{name}-%{version}-svn%{svn_ver}

groups = Networking/Tools @@ -20,8 +20,7 @@ description 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} +# ./svn-export.sh %{version} %{svn_ver}

build # Compile for release. @@ -36,10 +35,6 @@ 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. - conflicts += kernel<3.0.4-11 - # Replace rstp. provides += rstp=0.21-9 obsoletes += rstp<0.21-9 diff --git a/mstpd/patches/ignore-carrier-state-on-bridge-device.patch0 b/mstpd/patches/ignore-carrier-state-on-bridge-device.patch0 deleted file mode 100644 index 189bf96..0000000 --- a/mstpd/patches/ignore-carrier-state-on-bridge-device.patch0 +++ /dev/null @@ -1,140 +0,0 @@ -Index: bridge_ctl.h -=================================================================== ---- bridge_ctl.h (revision 16) -+++ bridge_ctl.h (working copy) -@@ -81,7 +81,7 @@ - - int init_bridge_ops(void); - --int bridge_notify(int br_index, int if_index, bool newlink, bool up); -+int bridge_notify(int br_index, int if_index, bool newlink, unsigned flags); - - void bridge_bpdu_rcv(int ifindex, const unsigned char *data, int len); - -Index: brmon.c -=================================================================== ---- brmon.c (revision 16) -+++ brmon.c (working copy) -@@ -66,7 +66,7 @@ - int len = n->nlmsg_len; - char b1[IFNAMSIZ]; - int af_family = ifi->ifi_family; -- bool newlink, up; -+ bool newlink; - int br_index; - - if(n->nlmsg_type == NLMSG_DONE) -@@ -154,12 +154,6 @@ - fflush(fp); - - newlink = (n->nlmsg_type == RTM_NEWLINK); -- up = false; -- if(newlink && tb[IFLA_OPERSTATE]) -- { -- int state = *(uint8_t*)RTA_DATA(tb[IFLA_OPERSTATE]); -- up = (state == IF_OPER_UP) || (state == IF_OPER_UNKNOWN); -- } - - if(tb[IFLA_MASTER]) - br_index = *(int*)RTA_DATA(tb[IFLA_MASTER]); -@@ -168,7 +162,7 @@ - else - br_index = -1; - -- bridge_notify(br_index, ifi->ifi_index, newlink, up); -+ bridge_notify(br_index, ifi->ifi_index, newlink, ifi->ifi_flags); - - return 0; - } -Index: bridge_track.c -=================================================================== ---- bridge_track.c (revision 16) -+++ bridge_track.c (working copy) -@@ -279,13 +279,15 @@ - } - - /* br_index == if_index means: interface is bridge master */ --int bridge_notify(int br_index, int if_index, bool newlink, bool up) -+int bridge_notify(int br_index, int if_index, bool newlink, unsigned flags) - { - port_t *ifc; - bridge_t *br = NULL, *other_br; -+ bool up = !!(flags & IFF_UP); -+ bool running = up && (flags & IFF_RUNNING); - -- LOG("br_index %d, if_index %d, newlink %d, up %d", -- br_index, if_index, newlink, up); -+ LOG("br_index %d, if_index %d, newlink %d, up %d, running %d", -+ br_index, if_index, newlink, up, running); - - if((br_index >= 0) && (br_index != if_index)) - { -@@ -296,9 +298,9 @@ - ERROR("Couldn't create data for bridge interface %d", br_index); - return -1; - } -- int br_up = ethtool_get_link(br->sysdeps.name); -- if(br_up >= 0) -- set_br_up(br, !!br_up); -+ int br_flags = get_flags(br->sysdeps.name); -+ if(br_flags >= 0) -+ set_br_up(br, !!(flags & IFF_UP)); - } - - if(br) -@@ -336,7 +338,7 @@ - delete_if(ifc); - return 0; - } -- set_if_up(ifc, up); /* And speed and duplex */ -+ set_if_up(ifc, running); /* And speed and duplex */ - } - else - { /* Interface is not a bridge slave */ -Index: netif_utils.c -=================================================================== ---- netif_utils.c (revision 16) -+++ netif_utils.c (working copy) -@@ -65,23 +65,17 @@ - return 0; - } - --int ethtool_get_link(char *ifname) -+int get_flags(char *ifname) - { - struct ifreq ifr; - memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, ifname, IFNAMSIZ); -- struct ethtool_value eval; -- -- eval.cmd = ETHTOOL_GLINK; -- ifr.ifr_data = (caddr_t)&eval; -- if(0 > ioctl(netsock, SIOCETHTOOL, &ifr)) -+ if(0 > ioctl(netsock, SIOCGIFFLAGS, &ifr)) - { -- ERROR("Cannot get link status for %s: %m\n", ifname); -+ ERROR("%s: get interface flags failed: %m", ifname); - return -1; - } -- if(eval.data) -- return 1; -- return 0; -+ return ifr.ifr_flags; - } - - int ethtool_get_speed_duplex(char *ifname, int *speed, int *duplex) -Index: netif_utils.h -=================================================================== ---- netif_utils.h (revision 16) -+++ netif_utils.h (working copy) -@@ -31,9 +31,9 @@ - int netsock_init(void); - - int get_hwaddr(char *ifname, unsigned char *hwaddr); -+int get_flags(char *ifname); - - int ethtool_get_speed_duplex(char *ifname, int *speed, int *duplex); --int ethtool_get_link(char *ifname); - - bool is_bridge(char *if_name); - diff --git a/mstpd/svn-export.sh b/mstpd/svn-export.sh new file mode 100755 index 0000000..662d3d3 --- /dev/null +++ b/mstpd/svn-export.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +version=${1} +revision=${2} + +if [ -z "${version}" ] || [ -z "${revision}" ]; then + echo "Usage ${0}: <version> <revision>" >&2 + exit 1 +fi + +export_dir=mstpd-${version}-svn${revision} +rm -rf ${export_dir} + +set -x + +svn export http://svn.code.sf.net/p/mstpd/code/trunk ${export_dir} +tar cfz mstpd-${version}-svn${revision}.tar.gz ${export_dir} +rm -rf ${export_dir} + +exit 0

hooks/post-receive -- IPFire 3.x development tree