diff options
| author |   William Hubbs <williamh@gentoo.org> | 2013-08-17 19:55:14 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2013-08-17 19:55:14 +0000 |
| commit | 405198ead90ce2fac396a2e3c45ee82bcaf6684a (patch) | |
| tree | 2f72bf5de33fc497168d7c7e6c0003e84e5410e6 /net-misc | |
| parent | Stable for amd64, wrt bug #481402 (diff) | |
| download | gentoo-2-405198ead90ce2fac396a2e3c45ee82bcaf6684a.tar.gz gentoo-2-405198ead90ce2fac396a2e3c45ee82bcaf6684a.tar.bz2 gentoo-2-405198ead90ce2fac396a2e3c45ee82bcaf6684a.zip | |
apply upstream patch for bug #481330.
(Portage version: 2.2.0/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/dhcpcd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/dhcpcd/dhcpcd-6.0.5.ebuild | 3 | ||||
| -rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-6.0.5-fix-build-without-ipv6.patch | 25 |
3 files changed, 32 insertions, 2 deletions
diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog index 9105ac45da66..e338a4b9e782 100644 --- a/net-misc/dhcpcd/ChangeLog +++ b/net-misc/dhcpcd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/dhcpcd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.367 2013/08/16 05:59:09 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.368 2013/08/17 19:55:14 williamh Exp $ + + 17 Aug 2013; William Hubbs <williamh@gentoo.org> + +files/dhcpcd-6.0.5-fix-build-without-ipv6.patch, dhcpcd-6.0.5.ebuild: + apply upstream patch for bug #481330. 16 Aug 2013; William Hubbs <williamh@gentoo.org> dhcpcd-6.0.5.ebuild, dhcpcd-9999.ebuild: diff --git a/net-misc/dhcpcd/dhcpcd-6.0.5.ebuild b/net-misc/dhcpcd/dhcpcd-6.0.5.ebuild index 812dbe525260..6378f32f921a 100644 --- a/net-misc/dhcpcd/dhcpcd-6.0.5.ebuild +++ b/net-misc/dhcpcd/dhcpcd-6.0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-6.0.5.ebuild,v 1.4 2013/08/16 05:59:09 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-6.0.5.ebuild,v 1.5 2013/08/17 19:55:14 williamh Exp $ EAPI=5 @@ -29,6 +29,7 @@ RDEPEND="" src_prepare() { + epatch "${FILESDIR}"/${P}-fix-build-without-ipv6.patch epatch_user } diff --git a/net-misc/dhcpcd/files/dhcpcd-6.0.5-fix-build-without-ipv6.patch b/net-misc/dhcpcd/files/dhcpcd-6.0.5-fix-build-without-ipv6.patch new file mode 100644 index 000000000000..78722fcc552f --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-6.0.5-fix-build-without-ipv6.patch @@ -0,0 +1,25 @@ +From 37708a7001c287ea0d86baf8110e2531a1057326 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Sat, 17 Aug 2013 11:00:07 +0100 +Subject: [PATCH] Fix build without IPv6 + +--- + platform.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/platform.h b/platform.h +index 36086b5..46797c1 100644 +--- a/platform.h ++++ b/platform.h +@@ -33,7 +33,7 @@ char *hardware_platform(void); + int check_ipv6(const char *, int); + int ipv6_dadtransmits(const char *); + #else +-#define check_ipv6(a) 0 ++#define check_ipv6(a, b) -1 + #endif + + #endif +-- +1.8.1.5 + |