net-misc/dhcpcd: 6.11.1-r1 bump for #588724

Package-Manager: portage-2.2.28

2 files changed, 180 insertions, 0 deletions

diff --git a/net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild
new file mode 100644
index 000000000000..35f6dffa0de9
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	FOSSIL_URI="http://roy.marples.name/projects/dhcpcd"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" dev-vcs/fossil"
+
+	src_unpack()
+	{
+		local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
+		local repo=${distdir}/fossil/${PN}.fossil
+
+		addwrite "${distdir}"
+
+		if [[ -e "${repo}" ]]; then
+			fossil pull "${FOSSIL_URI}" -R "${repo}" || die
+		else
+			mkdir -p "${distdir}/fossil" || die
+			fossil clone "${FOSSIL_URI}" "${repo}" || die
+		fi
+
+		mkdir -p "${S}" || die
+		cd "${S}" || die
+		fossil open "${repo}" || die
+	}
+fi
+
+PATCHES=(
+"${FILESDIR}"/${P}-arp-conflict.patch
+)
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	# Upgrade the duid file to the new format if needed
+	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local new_duid="${ROOT}"/etc/dhcpcd.duid
+	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
+		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
+	fi
+
+	# Move the duid to /etc, a more sensible location
+	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
+		cp -p "${old_duid}" "${new_duid}"
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+	 elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch b/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch
new file mode 100644
index 000000000000..ae7da3fbd8a9
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch
@@ -0,0 +1,61 @@
+Index: ipv4ll.c
+==================================================================
+--- a/ipv4ll.c
++++ b/ipv4ll.c
+@@ -242,31 +242,33 @@
+ 	assert(astate != NULL);
+ 	assert(astate->iface != NULL);
+ 	ifp = astate->iface;
+ 	state = IPV4LL_STATE(ifp);
+ 	assert(state != NULL);
+-	assert(state->addr != NULL);
+ 
+ 	fail = 0;
+ 	/* RFC 3927 2.2.1, Probe Conflict Detection */
+ 	if (amsg == NULL ||
+ 	    (amsg->sip.s_addr == astate->addr.s_addr ||
+ 	    (amsg->sip.s_addr == 0 && amsg->tip.s_addr == astate->addr.s_addr)))
+ 		fail = astate->addr.s_addr;
+ 
+ 	/* RFC 3927 2.5, Conflict Defense */
+-	if (IN_LINKLOCAL(ntohl(state->addr->addr.s_addr)) &&
++	if (state->addr != NULL &&
++	    IN_LINKLOCAL(ntohl(state->addr->addr.s_addr)) &&
+ 	    amsg && amsg->sip.s_addr == state->addr->addr.s_addr)
+ 		fail = state->addr->addr.s_addr;
+ 
+ 	if (fail == 0)
+ 		return;
+ 
+ 	astate->failed.s_addr = fail;
+ 	arp_report_conflicted(astate, amsg);
+ 
+-	if (astate->failed.s_addr == state->addr->addr.s_addr) {
++	if (state->addr != NULL &&
++	    astate->failed.s_addr == state->addr->addr.s_addr)
++	{
+ 		struct timespec now, defend;
+ 
+ 		/* RFC 3927 Section 2.5 says a defence should
+ 		 * broadcast an ARP announcement.
+ 		 * Because the kernel will also unicast a reply to the
+@@ -378,16 +380,18 @@
+ 	astate->conflicted_cb = ipv4ll_conflicted;
+ 	astate->free_cb = ipv4ll_arpfree;
+ 
+ 	/* Find an existing IPv4LL address and ensure we can work with it. */
+ 	ia = ipv4_iffindlladdr(ifp);
++
+ #ifdef IN_IFF_TENTATIVE
+ 	if (ia != NULL && ia->addr_flags & IN_IFF_DUPLICATED) {
+ 		ipv4_deladdr(ia, 0);
+ 		ia = NULL;
+ 	}
+ #endif
++
+ 	if (ia != NULL) {
+ 		astate->addr = ia->addr;
+ #ifdef IN_IFF_TENTATIVE
+ 		if (ia->addr_flags & (IN_IFF_TENTATIVE | IN_IFF_DETACHED)) {
+ 			logger(ifp->ctx, LOG_INFO,
+