Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/files/, net-misc/dhcpcd/
Date: Fri, 08 Feb 2019 19:18:03
Message-Id: 1549653470.2e6db7aca3449f4e15bbe917a0eacbe1859a8dbb.polynomial-c@gentoo
1 commit: 2e6db7aca3449f4e15bbe917a0eacbe1859a8dbb
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 8 19:17:28 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 8 19:17:50 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6db7ac
7
8 net-misc/dhcpcd: Revbump to fix USE="-ipv6" build.
9
10 Closes: https://bugs.gentoo.org/677508
11 Package-Manager: Portage-2.3.59, Repoman-2.3.12
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 ...{dhcpcd-7.1.1.ebuild => dhcpcd-7.1.1-r1.ebuild} | 4 ++++
15 .../files/dhcpcd-7.1.1-disable_inet6_fix.patch | 24 ++++++++++++++++++++++
16 2 files changed, 28 insertions(+)
17
18 diff --git a/net-misc/dhcpcd/dhcpcd-7.1.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild
19 similarity index 98%
20 rename from net-misc/dhcpcd/dhcpcd-7.1.1.ebuild
21 rename to net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild
22 index 48ba26275d0..c8f7876e781 100644
23 --- a/net-misc/dhcpcd/dhcpcd-7.1.1.ebuild
24 +++ b/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild
25 @@ -27,6 +27,10 @@ COMMON_DEPEND="udev? ( virtual/udev )"
26 DEPEND="${COMMON_DEPEND}"
27 RDEPEND="${COMMON_DEPEND}"
28
29 +PATCHES=(
30 + "${FILESDIR}"/${P}-disable_inet6_fix.patch #677508
31 +)
32 +
33 src_configure() {
34 local dev hooks=() rundir
35 use udev || dev="--without-dev --without-udev"
36
37 diff --git a/net-misc/dhcpcd/files/dhcpcd-7.1.1-disable_inet6_fix.patch b/net-misc/dhcpcd/files/dhcpcd-7.1.1-disable_inet6_fix.patch
38 new file mode 100644
39 index 00000000000..2fd3a17428f
40 --- /dev/null
41 +++ b/net-misc/dhcpcd/files/dhcpcd-7.1.1-disable_inet6_fix.patch
42 @@ -0,0 +1,24 @@
43 +From 6db54edd1427823dcb3924be78c042915a825fb1 Mon Sep 17 00:00:00 2001
44 +From: Chris Clayton <chris2553@××××××××××.com>
45 +Date: Fri, 8 Feb 2019 16:35:36 +0000
46 +Subject: fix build with --disable-inet6
47 +
48 +---
49 + src/dhcpcd.c | 1 +
50 + 1 file changed, 1 insertion(+)
51 +
52 +diff --git a/src/dhcpcd.c b/src/dhcpcd.c
53 +index a2cd04e..6fe60ea 100644
54 +--- a/src/dhcpcd.c
55 ++++ b/src/dhcpcd.c
56 +@@ -54,6 +54,7 @@ const char dhcpcd_copyright[] = "Copyright (c) 2006-2019 Roy Marples";
57 + #include "dev.h"
58 + #include "dhcp-common.h"
59 + #include "dhcpcd.h"
60 ++#include "dhcp.h"
61 + #include "dhcp6.h"
62 + #include "duid.h"
63 + #include "eloop.h"
64 +--
65 +cgit v1.1
66 +