Add ARPHRD_IEEE802154_PHY definition for musl (bug 549942).

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 106 insertions, 74 deletions

diff --git a/net-misc/radvd/ChangeLog b/net-misc/radvd/ChangeLog
index c47992c3c009..468cbf51ed4f 100644
--- a/net-misc/radvd/ChangeLog
+++ b/net-misc/radvd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/radvd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/ChangeLog,v 1.133 2015/05/21 13:29:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/ChangeLog,v 1.134 2015/06/14 12:09:14 xmw Exp $
+
+*radvd-2.11-r1 (14 Jun 2015)
+
+  14 Jun 2015; Michael Weber <xmw@gentoo.org>
+  +files/radvd-2.10-musl-libc-fix.patch, +radvd-2.11-r1.ebuild,
+  -radvd-2.5.ebuild, -radvd-2.8.ebuild:
+  Add ARPHRD_IEEE802154_PHY definition for musl (bug 549942).
 
   21 May 2015; Agostino Sarubbo <ago@gentoo.org> radvd-2.10.ebuild:
   Stable for amd64, wrt bug #547534
diff --git a/net-misc/radvd/files/radvd-2.10-musl-libc-fix.patch b/net-misc/radvd/files/radvd-2.10-musl-libc-fix.patch
new file mode 100644
index 000000000000..c44f28437be4
--- /dev/null
+++ b/net-misc/radvd/files/radvd-2.10-musl-libc-fix.patch
@@ -0,0 +1,87 @@
+From 1d8973e13d89802eee0b648451e2b97ac65cf9e0 Mon Sep 17 00:00:00 2001
+From: Reuben Hawkins <reubenhwk@gmail.com>
+Date: Sat, 16 May 2015 09:27:38 -0700
+Subject: [PATCH] device-linux.c: IEEE 802.15.4 musl libc fix
+
+The ARPHRD_IEEE802154 macro's definition and name have been recently
+moved around from kernel header to glibc headers.  Include linux/if_arp.h
+if available and then use either ARPHRD_IEEE802154_MONITOR or ARPHRD_IEEE802154_PHY,
+whichever comes first.
+---
+ configure.ac   | 1 +
+ device-linux.c | 8 ++++++++
+ includes.h     | 6 ++++++
+ 3 files changed, 15 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 0c1efd6..4bd4c9d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -156,6 +156,7 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS( \
+ 	getopt.h \
+ 	ifaddrs.h \
++	linux/if_arp.h \
+ 	machine/limits.h \
+ 	machine/param.h \
+ 	net/if_arp.h \
+diff --git a/device-linux.c b/device-linux.c
+index fa7d978..de83f2e 100644
+--- a/device-linux.c
++++ b/device-linux.c
+@@ -79,10 +79,12 @@ int update_device_info(int sock, struct Interface *iface)
+ 		iface->sllao.if_maxmtu = -1;
+ 		break;
+ #endif				/* ARPHDR_ARCNET */
++#ifdef ARPHRD_IEEE802154
+ 	case ARPHRD_IEEE802154:
+ 		iface->sllao.if_hwaddr_len = 64;
+ 		iface->sllao.if_prefix_len = 64;
+ 		break;
++#endif
+ 	default:
+ 		iface->sllao.if_hwaddr_len = -1;
+ 		iface->sllao.if_prefix_len = -1;
+@@ -371,9 +373,15 @@ static char const *hwstr(unsigned short sa_family)
+ 	case ARPHRD_IEEE802154:
+ 		rc = "ARPHRD_IEEE802154";
+ 		break;
++#if ARPHRD_IEEE802154_MONITOR
++	case ARPHRD_IEEE802154_MONITOR:
++		rc = "ARPHRD_IEEE802154_MONITOR";
++		break;
++#elif ARPHRD_IEEE802154_PHY
+ 	case ARPHRD_IEEE802154_PHY:
+ 		rc = "ARPHRD_IEEE802154_PHY";
+ 		break;
++#endif
+ 	case ARPHRD_VOID:
+ 		rc = "ARPHRD_VOID";
+ 		break;
+diff --git a/includes.h b/includes.h
+index 39a36d2..d2449c4 100644
+--- a/includes.h
++++ b/includes.h
+@@ -81,9 +81,11 @@
+ #ifdef HAVE_NET_IF_DL_H
+ #include <net/if_dl.h>
+ #endif
++
+ #ifdef HAVE_NET_IF_TYPES_H
+ #include <net/if_types.h>
+ #endif
++
+ #if defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER)
+ #include <net/if_arp.h>
+ #endif				/* defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) */
+@@ -100,3 +102,7 @@
+ #include <ifaddrs.h>
+ #endif
+ 
++#ifdef HAVE_LINUX_IF_ARP_H
++#include <linux/if_arp.h>
++#endif
++
+-- 
+2.3.6
+
diff --git a/net-misc/radvd/radvd-2.8.ebuild b/net-misc/radvd/radvd-2.11-r1.ebuild
index 75b7411b8758..624b372ec8cb 100644
--- a/net-misc/radvd/radvd-2.8.ebuild
+++ b/net-misc/radvd/radvd-2.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-2.8.ebuild,v 1.2 2014/11/02 09:16:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-2.11-r1.ebuild,v 1.1 2015/06/14 12:09:14 xmw Exp $
 
 EAPI=4
 
@@ -13,14 +13,14 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="kernel_FreeBSD selinux"
+IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
 DEPEND="${CDEPEND}
-	dev-libs/check
 	sys-devel/bison
 	sys-devel/flex
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-radvd )
 "
@@ -34,9 +34,14 @@ pkg_setup() {
 	[[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.10-musl-libc-fix.patch
+}
+
 src_configure() {
 	econf --with-pidfile=/var/run/radvd/radvd.pid \
-		--disable-silent-rules
+		--disable-silent-rules \
+		$(use_with test check)
 }
 
 src_install() {
diff --git a/net-misc/radvd/radvd-2.5.ebuild b/net-misc/radvd/radvd-2.5.ebuild
deleted file mode 100644
index 97a8e228e8ac..000000000000
--- a/net-misc/radvd/radvd-2.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-2.5.ebuild,v 1.2 2014/11/02 09:16:28 swift Exp $
-
-EAPI=4
-
-inherit systemd user eutils
-
-DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="http://v6web.litech.org/radvd/"
-SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="kernel_FreeBSD selinux"
-
-CDEPEND="dev-libs/libdaemon"
-DEPEND="${CDEPEND}
-	dev-libs/check
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-radvd )
-"
-DOCS=( CHANGES README TODO radvd.conf.example )
-
-pkg_setup() {
-	enewgroup radvd
-	enewuser radvd -1 -1 /dev/null radvd
-
-	# force ownership of radvd user and group (bug #19647)
-	[[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
-}
-
-src_configure() {
-	econf --with-pidfile=/var/run/radvd/radvd.pid \
-		--disable-silent-rules
-}
-
-src_install() {
-	default
-
-	dohtml INTRO.html
-
-	newinitd "${FILESDIR}"/${PN}-1.9.1.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	if use kernel_FreeBSD ; then
-		sed -i -e \
-			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
-			"${D}"/etc/init.d/${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	elog "Please create a configuratoion ${ROOT}etc/radvd.conf."
-	elog "See ${ROOT}usr/share/doc/${PF} for an example."
-	einfo
-	elog "grsecurity users should allow a specific group to read /proc"
-	elog "and add the radvd user to that group, otherwise radvd may"
-	elog "segfault on startup."
-}