import upstream patch to fix ipv6 related segmentation fault for bug #523128

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

4 files changed, 151 insertions, 5 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 1ba160893e24..ed6ece47edd6 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.419 2014/09/16 22:25:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.420 2014/09/18 19:02:52 williamh Exp $
+
+*dhcpcd-6.4.4-r1 (18 Sep 2014)
+
+  18 Sep 2014; William Hubbs <williamh@gentoo.org> +dhcpcd-6.4.4-r1.ebuild,
+  +files/dhcpcd-6.4.4-fix-ipv6.patch:
+  import upstream patch to fix ipv6 related segmentation fault for bug #523128
 
 *dhcpcd-6.4.4 (16 Sep 2014)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index c35681fd385d..4fb8a3bddbfc 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA256
 
 AUX dhcpcd-6.4.3-uclibc-fix.patch 310 SHA256 6c78a9ae78a1701e28ac3fbfddb5c63cc464c7434bbf0701d1c7dcd726f0c1f8 SHA512 e3777c74a7a86462ca45e8a468f8d15a257c9744abc7b16cfcf2f2a33541972e1d024c64418a1f99109a1892dc754d7740776ad90bf094f934eff91e749ef618 WHIRLPOOL 99373c5625e49a74e84a563bdc3de43ef9eb156a9c90a1761e63c5d79b7a7d12a75fab28bbc6f57f153a265a33059d1fbe276a9657551b2a8c5800997019ac3b
+AUX dhcpcd-6.4.4-fix-ipv6.patch 437 SHA256 5d4be5361b1515d4f938e1f5788178f54d3d99b54fbc5b5331e3bc08be822e78 SHA512 b1facd4ba4ce42438ade24ab176a5a596fbcb3c6fd096c9837b159eaa5cef83605dd71cf7e78a345c4c8de76f41a1f1f2feb485efbbac2a9a453992d68c67e42 WHIRLPOOL 4322be2b0f85a4152a72524b060c1523a033ac962039f09ea56a35676361972863d5c904b458aefd017b4088033057cdf685f4c72a36577896b876a73b34d0ba
 AUX dhcpcd.initd 327 SHA256 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492 SHA512 0a188b67f0641a480ac6d3cf6a634dddc4b72b1b9b47df33b05fba5d802693dd88e0cece0bfe9b641009c03022c620595b1ce35cd53d5024ee87f4c81e9acf63 WHIRLPOOL b97b0cd52b52561e6726d5decd094a02dd046107b0647833f00635e3fc126ab9679b2a7f883f4d880c1221cdbd91b0b52efaaccfdfa44a5048cb28d47d022351
 AUX dhcpcd.service 183 SHA256 06aaf350b11b1cea6ced9e2b5c69011e1daf6eb0ac9b2a9f2c9f81a9be31f463 SHA512 9d4c99e984906fc80fca7f7dd436d2f12dfebec870e19cbc3c03c14b394ed81c664403c0ca3f3e3138572c54d1278c1a43d5495f963b442b1bbef229248b1dd4 WHIRLPOOL 1176c2d763f55a65a97a973bdfa907dfaa2e9b88e93013d749c1a492e06382a7f42fa23eb2bfe86f6eaabea6c65c34db138b6bf600e6c522336ec2d07f7d7044
 DIST dhcpcd-6.4.3.tar.bz2 149927 SHA256 36ad01619ee81ac3815467d0157c38a14f5db464371326e97f719be362d5ab9c SHA512 1dbc57b3fba001f7ed1d36a4efb611178db02aa2b83999b82de1a9c6fef62bc81d55dade83582fe2442469948a88f47e39edc0350f97866d5a8c6f468ae8d70d WHIRLPOOL 87b11e66b1bee81155d63e769bba9285396276da369240363de6eea9597580ab46d523a20b8148f22854ca6ceae8e942ec9b426c8647faae815be305ba679827
 DIST dhcpcd-6.4.4.tar.bz2 153505 SHA256 2317126a5d640442c689522a579563df8055f22433c27ee86874a368a20b6a82 SHA512 db89d2635d154483753b60313679afe976c7c68f48f31984eb359282f183637c33623bc2364dd09b2d8f52024d92c3d4bb8458bd1ed796ab155909da774dc317 WHIRLPOOL 83e1b34bed7384e1718dfa7fc477a4d9541a20c276ff99af316d14b8108b7da38ada3b078a8a57d8c79e23ed36eaae97496354f71516329c71807f0c3ef1a5e9
 EBUILD dhcpcd-6.4.3.ebuild 3424 SHA256 982c1d3c227a8b70139bbfe1823083708e6d1362cc7d734c84171d70e0c79597 SHA512 6712fe7fe9e116e422a862c33aba74f1e5678ce156f21960515bd1d970fd426bf2934aa9ab8388832006a027fa12b89a49518464ea7c10883a8c1199797d64d5 WHIRLPOOL 4473f61de5a40943a4e21064135a6f379777b8f272856c6c5953fea4e051bec76340ce0246664b55a62f05a0384e2d9befa03e767298669e1e601d2f35c326c2
+EBUILD dhcpcd-6.4.4-r1.ebuild 3433 SHA256 b61ac2a4101b643fd4cacfb1002d8aabbe1e8d47db195eda676f150c8d90f78d SHA512 d843d842f6635038c56b7f1639d8f7ef56d212324501d9b6aa72e22d84319950b2c4d6565bb814a70bc51d3b44d6a2eab9a141a7bb6bcbf0383f805a5fd176fb WHIRLPOOL 301dcf1370122fbfdd30445b9e56ef00862c4816af69a2def1575741a7097ae075dfb1071f5d75c16196bc16a919f6bb37b955d365acdef7d57aba881ad9574d
 EBUILD dhcpcd-6.4.4.ebuild 3388 SHA256 cbe773584c07cdc81bb64c2fa9839767a1752afdd5544ae9140fa3ccfbac26fb SHA512 4c0e45a5a56a9339e5166116e2dc35ef9be17b0a8fdb7e91780bce178a381696efb8ebf5703e9ad54e621e969dc26a9e21454ca0849eb3487fcde6bb7226894f WHIRLPOOL 41dafd4132deb8e3d558d83d26720aa205d8be13e08699253885334599f81e127998ba824d0b6d385a77e26148fc786e4c004e1c6b4c5c063350d7d2bccbf66b
 EBUILD dhcpcd-9999.ebuild 3388 SHA256 f825a3bfaada9525ec3e6aa58789752234cd3c07ccfb9f1310461091cee04fbd SHA512 4212c13c007e761df723ef8608f404e7d26bd31ce073e0f5c36e2a4bdd199b80400c8773a58791304ed113b40199de8ae0b8462d07835d1f8ec6dc32ce004690 WHIRLPOOL 464e4093620829ad39422d23d5babf99432c31f75f60a4beead9948a5cb6b5ca9ac82aa4add0358603c9810ba54afd284b8645121bcd2d6ce0a012b74466bae9
-MISC ChangeLog 58915 SHA256 8ca7786241a1066df2c85bf6b1a5727768ba3f84dfc3cc841ba74b844b4a40ed SHA512 a3e060ceda17653c84d325bbac3180f7fe9274378cda8cbb5b22ae2ac39c186448e046bff3e4e7edc566b37f22099952079862d2e2fbf59c4f71f3561275432d WHIRLPOOL 8f50d2685336a9cf102244b961c0a9325e79236382b4473bca5223d77540ef9ee9654a4757195bccb674f072b6cad8fcd56e301ec1d8eb84968d920b2a4a7507
+MISC ChangeLog 59141 SHA256 25c3de8b55ace649f896be1087d875010b40c1a4f9304de593f3d88574ba0265 SHA512 3c1fade8c31ef8337f487eb176edc2a01143116b5ad1b353536f000ae0620958a25cf6053a9f721c799290066e545518413a3a2dea6731c9c90847fda4b98a04 WHIRLPOOL 9f8d45a34754961e2f7a8fcf4bde3932d24a998f2a779c22fb043bbe70ef77c86046dec99c96b4b4ce2ae08dcbd259af1b6c6b26460419113dc1e84175816046
 MISC metadata.xml 358 SHA256 d2755afa7df7488d44b4904fd1922746bd9ecae448fd73496600e03fd0938707 SHA512 a592a6368f8dc90795b2972fff1c79775de8739d214a4c4403f0528aa1caf993f6e10eb374cb1a38accc915b5cd26c7fac723a712c4570f8a71848d3d9854eac WHIRLPOOL 481a14009c01f31e40ee09d81c273adc1da21b45b5976167cbada8a774775679de5b8233d3effc3f043794cc9f78b7a1705eaa59de4829c150ebe786c46097a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQYuO0ACgkQblQW9DDEZTilZwCghvTGi13QnEnMFEPqmGdpKkbI
-N6YAoKRafOVFTbF4gMuN8E7gI+FPXk84
-=WlyA
+iEYEAREIAAYFAlQbLGkACgkQblQW9DDEZTj2egCeKUMFJmik2/ut6e0Ol7jS27P0
+iWwAoJTI5fi/2UnsI8yJd8cTzaoYv0ez
+=vG2V
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpcd/dhcpcd-6.4.4-r1.ebuild b/net-misc/dhcpcd/dhcpcd-6.4.4-r1.ebuild
new file mode 100644
index 000000000000..0509f4ad85fd
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-6.4.4-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-6.4.4-r1.ebuild,v 1.1 2014/09/18 19:02:52 williamh Exp $
+
+EAPI=5
+
+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.bz2"
+	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 eutils 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 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
+
+src_prepare()
+{
+	epatch "${FILESDIR}"/${P}-fix-ipv6.patch
+	epatch_user
+}
+
+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 ipv6) \
+		${dev} \
+		${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.4.4-fix-ipv6.patch b/net-misc/dhcpcd/files/dhcpcd-6.4.4-fix-ipv6.patch
new file mode 100644
index 000000000000..ae070bf16463
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-6.4.4-fix-ipv6.patch
@@ -0,0 +1,19 @@
+Index: ipv6nd.c
+==================================================================
+--- ipv6nd.c
++++ ipv6nd.c
+@@ -394,10 +394,13 @@
+ int
+ ipv6nd_addrexists(struct dhcpcd_ctx *ctx, const struct ipv6_addr *addr)
+ {
+ 	struct ra *rap;
+ 	struct ipv6_addr *ap;
++
++	if (ctx->ipv6 == NULL)
++		return 0;
+ 
+ 	TAILQ_FOREACH(rap, ctx->ipv6->ra_routers, next) {
+ 		TAILQ_FOREACH(ap, &rap->addrs, next) {
+ 			if (addr == NULL) {
+ 				if ((ap->flags &
+