[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/files/

[William Hubbs]

commit:     fb8d7b766fb3e0f02e70361001a0c637aa8e033e
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 04:17:23 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat May  7 04:17:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8d7b76

net-misc/dhcpcd:  update service script to use /sbin/openrc-run

Package-Manager: portage-2.2.26

 net-misc/dhcpcd/files/dhcpcd.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dhcpcd/files/dhcpcd.initd b/net-misc/dhcpcd/files/dhcpcd.initd
index d88b061..d3f4d76 100644
--- a/net-misc/dhcpcd/files/dhcpcd.initd
+++ b/net-misc/dhcpcd/files/dhcpcd.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 

[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/files/

[William Hubbs]

commit:     775b840692930eb0216b709a5dfa96d8ffa84ca6
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 01:46:49 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu May 12 15:48:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775b8406

net-misc/dhcpcd: make dhcpcd.service block until a lease is obtained

This makes the systemd unit behave more like the init script, and should
resolve issues with NFS mounts.

Bug: https://bugs.gentoo.org/582484

 net-misc/dhcpcd/files/dhcpcd.service | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-misc/dhcpcd/files/dhcpcd.service b/net-misc/dhcpcd/files/dhcpcd.service
index 2ac9adc..8430214 100644
--- a/net-misc/dhcpcd/files/dhcpcd.service
+++ b/net-misc/dhcpcd/files/dhcpcd.service
@@ -1,10 +1,12 @@
 [Unit]
 Description=Lightweight DHCP client daemon
 Wants=network.target
-Before=network.target
+Before=network.target network-online.target
 
 [Service]
-ExecStart=/sbin/dhcpcd -q --nobackground
+Type=forking
+ExecStart=/sbin/dhcpcd -q
+PIDFile=/run/dhcpcd.pid
 
 [Install]
 WantedBy=multi-user.target

[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/files/

[Robin H. Johnson]

commit:     0a20aa6ea5ad8fdbf769888c340e4c17bae39231
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jan 19 17:25:13 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 21:09:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a20aa6e

net-misc/dhcpcd: remove unused patch

(cherry picked from commit 136eb80cdccd213cfd041cc9132e0efdab65a346)
Fixes: https://github.com/gentoo/gentoo/pull/3542
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 .../dhcpcd/files/dhcpcd-6.10.2-fix-configure.patch | 45 ----------------------
 1 file changed, 45 deletions(-)

diff --git a/net-misc/dhcpcd/files/dhcpcd-6.10.2-fix-configure.patch b/net-misc/dhcpcd/files/dhcpcd-6.10.2-fix-configure.patch
deleted file mode 100644
index 97cc2fa..00000000
--- a/net-misc/dhcpcd/files/dhcpcd-6.10.2-fix-configure.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: configure
-==================================================================
---- a/configure
-+++ b/configure
-@@ -360,19 +360,10 @@
- 	esac
- else
- 	echo "CPPFLAGS+=	-DNDEBUG" >>$CONFIG_MK
- fi
- 
--if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then
--	echo "dhcpcd-definitions.conf will be embedded in dhcpcd itself"
--	echo "DHCPCD_SRCS+=	dhcpcd-embedded.c" >>$CONFIG_MK
--else
--	echo "dhcpcd-definitions.conf will be installed to $LIBEXECDIR"
--	echo "CFLAGS+= -DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK
--	echo "EMBEDDEDINSTALL=	_embeddedinstall" >>$CONFIG_MK
--fi
--
- if [ -n "$FORK" -a "$FORK" != yes -a "$FORK" != true ]; then
- 	echo "There is no fork"
- 	echo "CPPFLAGS+=	-DTHERE_IS_NO_FORK" >>$CONFIG_MK
- fi
- 
-@@ -460,10 +451,19 @@
- 	echo "$CC does not create executables" >&2
- 	exit 1
- fi
- [ "$CC" != cc ] && echo "CC=	$CC" >>$CONFIG_MK
- $CC --version | $SED -e '1!d'
-+
-+if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then
-+	echo "dhcpcd-definitions.conf will be embedded in dhcpcd itself"
-+	echo "DHCPCD_SRCS+=	dhcpcd-embedded.c" >>$CONFIG_MK
-+else
-+	echo "dhcpcd-definitions.conf will be installed to $LIBEXECDIR"
-+	echo "CPPFLAGS+=	-DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK
-+	echo "EMBEDDEDINSTALL=	_embeddedinstall" >>$CONFIG_MK
-+fi
- 
- if [ "$OS" = linux ]; then
- 	printf "Testing for nl80211 ... "
- 	cat <<EOF >_nl80211.c
- #include <linux/nl80211.h>
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/files/

[Lars Wendler]

commit:     0f847be6f00208fc3d9ed5f17a3102644c1986f2
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Mar 16 11:33:13 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 18:28:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f847be6

net-misc/dhcpcd: remove unused patch

 .../dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch  | 61 ----------------------
 1 file changed, 61 deletions(-)

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
deleted file mode 100644
index ae7da3fbd8a..00000000000
--- a/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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,
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/files/

[Lars Wendler]

commit:     033ac2d0285c659dd6e2aef0854b1a05c6029b67
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 21:04:06 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 21:04:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=033ac2d0

net-misc/dhcpcd: Removed unused patches

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/dhcpcd-7.1.1-disable_inet6_fix.patch     |  24 ---
 net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch | 213 ---------------------
 .../files/dhcpcd-7.1.1-v6_read_overflow.patch      | 120 ------------
 3 files changed, 357 deletions(-)

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
deleted file mode 100644
index 2fd3a17428f..00000000000
--- a/net-misc/dhcpcd/files/dhcpcd-7.1.1-disable_inet6_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6db54edd1427823dcb3924be78c042915a825fb1 Mon Sep 17 00:00:00 2001
-From: Chris Clayton <chris2553@googlemail.com>
-Date: Fri, 8 Feb 2019 16:35:36 +0000
-Subject: fix build with --disable-inet6
-
----
- src/dhcpcd.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/dhcpcd.c b/src/dhcpcd.c
-index a2cd04e..6fe60ea 100644
---- a/src/dhcpcd.c
-+++ b/src/dhcpcd.c
-@@ -54,6 +54,7 @@ const char dhcpcd_copyright[] = "Copyright (c) 2006-2019 Roy Marples";
- #include "dev.h"
- #include "dhcp-common.h"
- #include "dhcpcd.h"
-+#include "dhcp.h"
- #include "dhcp6.h"
- #include "duid.h"
- #include "eloop.h"
--- 
-cgit v1.1
-

diff --git a/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch b/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch
deleted file mode 100644
index 6ec780936a8..00000000000
--- a/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-https://roy.marples.name/git/dhcpcd.git/patch/?id=23525884a346ed81c808c1ed90e3c56a8bf0cc68
-
-From 8d11b33f6c60e2db257130fa383ba76b6018bcf6 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 19 Apr 2019 09:45:02 +0100
-Subject: DHCPv6: Fix a potential buffer overflow reading NA/TA addresses
-
-Only copy upto the size of the address option rather than the
-option length.
-
-Found by Maxime Villard <max@m00nbsd.net>
----
- src/dhcp6.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/dhcp6.c b/src/dhcp6.c
-index 99a452b..8fc4f00 100644
---- a/src/dhcp6.c
-+++ b/src/dhcp6.c
-@@ -2029,12 +2029,12 @@ dhcp6_findna(struct interface *ifp, uint16_t ot, const uint8_t *iaid,
- 		nd = o + ol;
- 		l -= (size_t)(nd - d);
- 		d = nd;
--		if (ol < 24) {
-+		if (ol < sizeof(ia)) {
- 			errno = EINVAL;
- 			logerrx("%s: IA Address option truncated", ifp->name);
- 			continue;
- 		}
--		memcpy(&ia, o, ol);
-+		memcpy(&ia, o, sizeof(ia));
- 		ia.pltime = ntohl(ia.pltime);
- 		ia.vltime = ntohl(ia.vltime);
- 		/* RFC 3315 22.6 */
--- 
-cgit v1.1
-
-
-From 4b67f6f1038fd4ad5ca7734eaaeba1b2ec4816b8 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 19 Apr 2019 21:00:19 +0100
-Subject: DHCP: Fix a potential 1 byte read overflow with DHO_OPTSOVERLOADED
-
-This fix basically moves the option length check up and also
-corrects an off by one error with it.
-
-Thanks to Maxime Villard <max@m00nbsd.net>
----
- src/dhcp.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/dhcp.c b/src/dhcp.c
-index f7cdefc..e13d1b4 100644
---- a/src/dhcp.c
-+++ b/src/dhcp.c
-@@ -215,6 +215,12 @@ get_option(struct dhcpcd_ctx *ctx,
- 		}
- 		l = *p++;
- 
-+		/* Check we can read the option data, if present */
-+		if (p + l > e) {
-+			errno = EINVAL;
-+			return NULL;
-+		}
-+
- 		if (o == DHO_OPTSOVERLOADED) {
- 			/* Ensure we only get this option once by setting
- 			 * the last bit as well as the value.
-@@ -249,10 +255,6 @@ get_option(struct dhcpcd_ctx *ctx,
- 				bp += ol;
- 			}
- 			ol = l;
--			if (p + ol >= e) {
--				errno = EINVAL;
--				return NULL;
--			}
- 			op = p;
- 			bl += ol;
- 		}
--- 
-cgit v1.1
-
-
-From 7121040790b611ca3fbc400a1bbcd4364ef57233 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 19 Apr 2019 21:40:14 +0100
-Subject: auth: Use consttime_memequal(3) to compare hashes
-
-This stops any attacker from trying to infer secrets from latency.
-
-Thanks to Maxime Villard <max@m00nbsd.net>
----
- src/auth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/auth.c b/src/auth.c
-index 9e24998..ce97051 100644
---- a/src/auth.c
-+++ b/src/auth.c
-@@ -354,7 +354,7 @@ gottoken:
- 	}
- 
- 	free(mm);
--	if (memcmp(d, &hmac_code, dlen)) {
-+	if (!consttime_memequal(d, &hmac_code, dlen)) {
- 		errno = EPERM;
- 		return NULL;
- 	}
--- 
-cgit v1.1
-
-
-From cfde89ab66cb4e5957b1c4b68ad6a9449e2784da Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 19 Apr 2019 21:42:07 +0100
-Subject: compat: Provide consttime_memequal if not in libc
-
-Public domain version by Matthias Drochner <drochner@netbsd.org>
----
- configure | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/configure b/configure
-index 570e65f..4f58f0f 100755
---- a/configure
-+++ b/configure
-@@ -13,6 +13,7 @@ IPV4LL=
- INET6=
- ARC4RANDOM=
- CLOSEFROM=
-+CONSTTIME_MEMEQUAL=
- STRLCPY=
- UDEV=
- OS=
-@@ -846,6 +847,27 @@ if [ "$STRTOI" = no ]; then
- 	echo "#include			\"compat/strtoi.h\"" >>$CONFIG_H
- fi
- 
-+if [ -z "$CONSTTIME_MEMEQUAL" ]; then
-+	printf "Testing for consttime_memequal ... "
-+	cat <<EOF >_consttime_memequal.c
-+#include <string.h>
-+int main(void) {
-+	return consttime_memequal("deadbeef", "deadbeef", 8);
-+}
-+EOF
-+	if $XCC _consttime_memequal.c -o _consttime_memequal 2>&3; then
-+		CONSTTIME_MEMEQUAL=yes
-+	else
-+		CONSTTIME_MEMEQUAL=no
-+	fi
-+	echo "$CONSTTIME_MEMEQUAL"
-+	rm -f _consttime_memequal.c _consttime_memequal
-+fi
-+if [ "$CONSTTIME_MEMEQUAL" = no ]; then
-+	echo "#include			\"compat/consttime_memequal.h\"" \
-+	    >>$CONFIG_H
-+fi
-+
- if [ -z "$DPRINTF" ]; then
- 	printf "Testing for dprintf ... "
- 	cat <<EOF >_dprintf.c
--- 
-cgit v1.1
-
-
-From aee631aadeef4283c8a749c1caf77823304acf5e Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 19 Apr 2019 21:47:37 +0100
-Subject: Really add consttime_memequal
-
----
- compat/consttime_memequal.h | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
- create mode 100644 compat/consttime_memequal.h
-
-diff --git a/compat/consttime_memequal.h b/compat/consttime_memequal.h
-new file mode 100644
-index 0000000..9830648
---- /dev/null
-+++ b/compat/consttime_memequal.h
-@@ -0,0 +1,28 @@
-+/*
-+ * Written by Matthias Drochner <drochner@NetBSD.org>.
-+ * Public domain.
-+ */
-+
-+#ifndef CONSTTIME_MEMEQUAL_H
-+#define CONSTTIME_MEMEQUAL_H
-+inline static int
-+consttime_memequal(const void *b1, const void *b2, size_t len)
-+{
-+	const unsigned char *c1 = b1, *c2 = b2;
-+	unsigned int res = 0;
-+
-+	while (len--)
-+		res |= *c1++ ^ *c2++;
-+
-+	/*
-+	 * Map 0 to 1 and [1, 256) to 0 using only constant-time
-+	 * arithmetic.
-+	 *
-+	 * This is not simply `!res' because although many CPUs support
-+	 * branchless conditional moves and many compilers will take
-+	 * advantage of them, certain compilers generate branches on
-+	 * certain CPUs for `!res'.
-+	 */
-+	return (1 & ((res - 1) >> 8));
-+}
-+#endif /* CONSTTIME_MEMEQUAL_H */
--- 
-cgit v1.1
-

diff --git a/net-misc/dhcpcd/files/dhcpcd-7.1.1-v6_read_overflow.patch b/net-misc/dhcpcd/files/dhcpcd-7.1.1-v6_read_overflow.patch
deleted file mode 100644
index 54b559fcd87..00000000000
--- a/net-misc/dhcpcd/files/dhcpcd-7.1.1-v6_read_overflow.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From c1ebeaafeb324bac997984abdcee2d4e8b61a8a8 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 3 May 2019 14:44:06 +0100
-Subject: DHCPv6: Fix a potential read overflow with D6_OPTION_PD_EXCLUDE
-
-dhcpcd only checks that the prefix length of the exclusion
-matches the prefix length of the ia and equals the length of the
-data in the option.
-This could potentially overrun the in6_addr structure.
-
-This is fixed by enforcing RFC 6603 section 4.2 option limits
-more clearly.
-
-Thanks to Maxime Villard <max@m00nbsd.net> for finding this.
----
- src/dhcp6.c | 44 +++++++++++++++++++++-----------------------
- 1 file changed, 21 insertions(+), 23 deletions(-)
-
-diff --git a/src/dhcp6.c b/src/dhcp6.c
-index dee8d4b6..583f3b3f 100644
---- a/src/dhcp6.c
-+++ b/src/dhcp6.c
-@@ -2166,40 +2166,38 @@ dhcp6_findpd(struct interface *ifp, const uint8_t *iaid,
- 			state->expire = a->prefix_vltime;
- 		i++;
- 
--		o = dhcp6_findoption(o, ol, D6_OPTION_PD_EXCLUDE, &ol);
- 		a->prefix_exclude_len = 0;
- 		memset(&a->prefix_exclude, 0, sizeof(a->prefix_exclude));
--#if 0
--		if (ex == NULL) {
--			struct dhcp6_option *w;
--			uint8_t *wp;
--
--			w = calloc(1, 128);
--			w->len = htons(2);
--			wp = D6_OPTION_DATA(w);
--			*wp++ = 64;
--			*wp++ = 0x78;
--			ex = w;
--		}
--#endif
-+		o = dhcp6_findoption(o, ol, D6_OPTION_PD_EXCLUDE, &ol);
- 		if (o == NULL)
- 			continue;
--		if (ol < 2) {
--			logerrx("%s: truncated PD Exclude", ifp->name);
-+
-+		/* RFC 6603 4.2 says option length MUST be between 2 and 17.
-+		 * This allows 1 octet for prefix length and 16 for the
-+		 * subnet ID. */
-+		if (ol < 2 || ol > 17) {
-+			logerrx("%s: invalid PD Exclude option", ifp->name);
- 			continue;
- 		}
--		a->prefix_exclude_len = *o++;
--		ol--;
--		if (((a->prefix_exclude_len - a->prefix_len - 1) / NBBY) + 1
--		    != ol)
--		{
-+
-+		/* RFC 6603 4.2 says prefix length MUST be between the
-+		 * length of the IAPREFIX prefix length + 1 and 128. */
-+		if (*o < a->prefix_len + 1 || *o > 128) {
-+			logerrx("%s: invalid PD Exclude length", ifp->name);
-+			continue;
-+		}
-+
-+		/* Check option length matches prefix length. */
-+		if (((*o - a->prefix_len - 1) / NBBY) + 1 != ol) {
- 			logerrx("%s: PD Exclude length mismatch", ifp->name);
--			a->prefix_exclude_len = 0;
- 			continue;
- 		}
--		nb = a->prefix_len % NBBY;
-+
-+		a->prefix_exclude_len = *o++;
-+		ol--;
- 		memcpy(&a->prefix_exclude, &a->prefix,
- 		    sizeof(a->prefix_exclude));
-+		nb = a->prefix_len % NBBY;
- 		if (nb)
- 			ol--;
- 		pw = a->prefix_exclude.s6_addr +
--- 
-cgit v1.2.1
-
-From 896ef4a54b0578985e5e1360b141593f1d62837b Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Sat, 4 May 2019 10:19:02 +0100
-Subject: DHCPv6: Fix exclude prefix length check.
-
----
- src/dhcp6.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/dhcp6.c b/src/dhcp6.c
-index 583f3b3f..7f26129f 100644
---- a/src/dhcp6.c
-+++ b/src/dhcp6.c
-@@ -2187,14 +2187,14 @@ dhcp6_findpd(struct interface *ifp, const uint8_t *iaid,
- 			continue;
- 		}
- 
-+		ol--;
- 		/* Check option length matches prefix length. */
- 		if (((*o - a->prefix_len - 1) / NBBY) + 1 != ol) {
- 			logerrx("%s: PD Exclude length mismatch", ifp->name);
- 			continue;
- 		}
--
- 		a->prefix_exclude_len = *o++;
--		ol--;
-+
- 		memcpy(&a->prefix_exclude, &a->prefix,
- 		    sizeof(a->prefix_exclude));
- 		nb = a->prefix_len % NBBY;
--- 
-cgit v1.2.1
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/files/

[Mike Gilbert]

commit:     315e511189328f8da4dc810f919b1232ecc50400
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu May 21 00:49:15 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu May 21 00:49:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315e5111

net-misc/dhcpcd: redirect stdio to /dev/null in dhcpcd.service

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/dhcpcd/files/dhcpcd.service | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-misc/dhcpcd/files/dhcpcd.service b/net-misc/dhcpcd/files/dhcpcd.service
index 8430214d59b..8f9ad25e4d0 100644
--- a/net-misc/dhcpcd/files/dhcpcd.service
+++ b/net-misc/dhcpcd/files/dhcpcd.service
@@ -7,6 +7,9 @@ Before=network.target network-online.target
 Type=forking
 ExecStart=/sbin/dhcpcd -q
 PIDFile=/run/dhcpcd.pid
+# Avoid duplicate output on stderr/syslog
+StandardOutput=null
+StandardError=null
 
 [Install]
 WantedBy=multi-user.target

[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/files/

[Mike Gilbert]

commit:     9ee1e167059a0398145af9b38425b861bcb00db1
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu May 21 13:27:46 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu May 21 13:27:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ee1e167

net-misc/dhcpcd: update copyright notice in init script

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/dhcpcd/files/dhcpcd.initd    | 4 ++--
 net-misc/dhcpcd/files/dhcpcd.initd-r1 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/dhcpcd/files/dhcpcd.initd b/net-misc/dhcpcd/files/dhcpcd.initd
index d3f4d76b4c9..b89b785fd23 100644
--- a/net-misc/dhcpcd/files/dhcpcd.initd
+++ b/net-misc/dhcpcd/files/dhcpcd.initd
@@ -1,6 +1,6 @@
 #!/sbin/openrc-run
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Copyright 2007-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 command=/sbin/dhcpcd
 pidfile=/var/run/dhcpcd.pid

diff --git a/net-misc/dhcpcd/files/dhcpcd.initd-r1 b/net-misc/dhcpcd/files/dhcpcd.initd-r1
index 5a872351ab9..2616a743b0d 100644
--- a/net-misc/dhcpcd/files/dhcpcd.initd-r1
+++ b/net-misc/dhcpcd/files/dhcpcd.initd-r1
@@ -1,6 +1,6 @@
 #!/sbin/openrc-run
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Copyright 2007-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 command=${RC_PREFIX}/sbin/dhcpcd
 pidfile=${RC_PREFIX}/var/run/dhcpcd/pid

[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/files/

[Aaron Bauman]

commit:     66c9c433232eb9e1c2f786e1ca0e8eff527fd9fb
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jul  5 11:26:52 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 01:35:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c9c433

net-misc/dhcpcd: remove unused patch

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16598
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/dhcpcd-9.1.2-embedded_config.patch       | 49 ----------------------
 1 file changed, 49 deletions(-)

diff --git a/net-misc/dhcpcd/files/dhcpcd-9.1.2-embedded_config.patch b/net-misc/dhcpcd/files/dhcpcd-9.1.2-embedded_config.patch
deleted file mode 100644
index 5401317a2ec..00000000000
--- a/net-misc/dhcpcd/files/dhcpcd-9.1.2-embedded_config.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 9dc6d4b7c8df8425c9b1e893e86b8463abb2053c Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Mon, 15 Jun 2020 22:04:37 +0100
-Subject: configure: Fix fallout with disabling embedded config
-
----
- configure | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/configure b/configure
-index 8398ad69..a3701726 100755
---- a/configure
-+++ b/configure
-@@ -545,15 +545,6 @@ if [ -z "$AUTH" -o "$AUTH" = yes ]; then
- 	echo "SRCS+=		auth.c" >>$CONFIG_MK
- fi
- 
--if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then
--	echo "$DHCPCD_DEFS will be embedded in dhcpcd itself"
--	echo "DHCPCD_SRCS+=	dhcpcd-embedded.c" >>$CONFIG_MK
--else
--	echo "$DHCPCD_DEFS will be installed to $LIBEXECDIR"
--	echo "CPPFLAGS+=	-DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK
--	echo "EMBEDDEDINSTALL=	_embeddedinstall" >>$CONFIG_MK
--fi
--
- if [ -z "$PRIVSEP" ]; then
- 	# privilege separation works fine .... except on Solaris
- 	case "$OS" in
-@@ -665,6 +656,16 @@ EOF
-         rm -f _pledge.c _pledge
- fi
- 
-+# This block needs to be after the compiler test due to embedded quotes.
-+if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then
-+	echo "$DHCPCD_DEFS will be embedded in dhcpcd itself"
-+	echo "DHCPCD_SRCS+=	dhcpcd-embedded.c" >>$CONFIG_MK
-+else
-+	echo "$DHCPCD_DEFS will be installed to $LIBEXECDIR"
-+	echo "CPPFLAGS+=	-DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK
-+	echo "EMBEDDEDINSTALL=	_embeddedinstall" >>$CONFIG_MK
-+fi
-+
- if [ "$OS" = linux ]; then
- 	printf "Testing for nl80211 ... "
- 	cat <<EOF >_nl80211.c
--- 
-cgit v1.2.3
-