[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-474-gc58ee82

[Julien B a. A. <ar...@us...>]

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 "armadeus".

The branch, master has been updated
       via  c58ee8252d4b2c5ec4f50c4aa455a022489ebd9f (commit)
      from  43ca45411a3e80492df631e2ef8f505a2874c1d1 (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 c58ee8252d4b2c5ec4f50c4aa455a022489ebd9f
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Sep 30 21:32:31 2013 +0200

    [BUILDROOT] 2013.05: busybox: fixes an ifplugd problem with recent Linux kernels

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

Summary of changes:
 .../147-busybox-ifplugd-fixes-netlink-buffer.patch |   62 ++++++++++++++++++++
 patches/buildroot/2013.05/cleanup_buildroot.sh     |    5 +-
 2 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 patches/buildroot/2013.05/147-busybox-ifplugd-fixes-netlink-buffer.patch

diff --git a/patches/buildroot/2013.05/147-busybox-ifplugd-fixes-netlink-buffer.patch b/patches/buildroot/2013.05/147-busybox-ifplugd-fixes-netlink-buffer.patch
new file mode 100644
index 0000000..4b226f0
--- /dev/null
+++ b/patches/buildroot/2013.05/147-busybox-ifplugd-fixes-netlink-buffer.patch
@@ -0,0 +1,62 @@
+Index: buildroot/package/busybox/1.21.0/busybox-1.21.0-ifplugd-netlink-buffer.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/busybox/1.21.0/busybox-1.21.0-ifplugd-netlink-buffer.patch	2013-09-30 16:56:15.151579379 +0200
+@@ -0,0 +1,57 @@
++From da331d779c19d7d5d4ef05152ee467d617913a01 Mon Sep 17 00:00:00 2001
++From: Tito Ragusa <far...@ti...>
++Date: Sun, 04 Aug 2013 16:08:40 +0000
++Subject: ifplugd: use a larger netlink buffer
++
++function                                             old     new   delta
++check_existence_through_netlink                      310     321     +11
++
++Signed-off-by: Tito Ragusa <far...@ti...>
++Signed-off-by: Denys Vlasenko <vda...@go...>
++---
++(limited to 'networking/ifplugd.c')
++
++diff --git a/networking/ifplugd.c b/networking/ifplugd.c
++index 3cdc2c9..b578f4c 100644
++--- a/networking/ifplugd.c
+++++ b/networking/ifplugd.c
++@@ -451,20 +451,24 @@ static smallint detect_link(void)
++ static NOINLINE int check_existence_through_netlink(void)
++ {
++ 	int iface_len;
++-	char replybuf[1024];
+++	/* Buffer was 1K, but on linux-3.9.9 it was reported to be too small.
+++	 * netlink.h: "limit to 8K to avoid MSG_TRUNC when PAGE_SIZE is very large".
+++	 * Note: on error returns (-1) we exit, no need to free replybuf.
+++	 */
+++	enum { BUF_SIZE = 8 * 1024 };
+++	char *replybuf = xmalloc(BUF_SIZE);
++ 
++ 	iface_len = strlen(G.iface);
++ 	while (1) {
++ 		struct nlmsghdr *mhdr;
++ 		ssize_t bytes;
++ 
++-		bytes = recv(netlink_fd, &replybuf, sizeof(replybuf), MSG_DONTWAIT);
+++		bytes = recv(netlink_fd, replybuf, BUF_SIZE, MSG_DONTWAIT);
++ 		if (bytes < 0) {
++ 			if (errno == EAGAIN)
++-				return G.iface_exists;
+++				goto ret;
++ 			if (errno == EINTR)
++ 				continue;
++-
++ 			bb_perror_msg("netlink: recv");
++ 			return -1;
++ 		}
++@@ -507,6 +511,8 @@ static NOINLINE int check_existence_through_netlink(void)
++ 		}
++ 	}
++ 
+++ ret:
+++	free(replybuf);
++ 	return G.iface_exists;
++ }
++ 
++--
++cgit v0.9.1
diff --git a/patches/buildroot/2013.05/cleanup_buildroot.sh b/patches/buildroot/2013.05/cleanup_buildroot.sh
index 4e8d879..e8998e9 100755
--- a/patches/buildroot/2013.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.05/cleanup_buildroot.sh
@@ -73,10 +73,7 @@ rm -rf buildroot/package/cunit/
 rm -rf buildroot/package/gnokii/
 rm -rf buildroot/package/smstools3/
 rm -rf buildroot/package/wpa_supplicant/
-rm -f buildroot/package/busybox/1.19.4/busybox-1.19.4-stty_add_rs485_config.patch
-rm -f buildroot/package/busybox/1.20.2/busybox-1.20.2-stty_add_rs485_config.patch
-rm -f buildroot/package/busybox/1.21.0/busybox-1.21.0-stty_add_rs485_config.patch
-rm -f buildroot/package/busybox/snapshot/busybox-stty_add_rs485_config.patch
+rm -rf buildroot/package/busybox/
 rm -rf buildroot/package/joe/
 rm -rf buildroot/package/gpsd/
 rm -rf buildroot/linux/


hooks/post-receive
-- 
armadeus