From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 82E1A1382C5 for ; Fri, 5 Jun 2020 10:25:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9494FE093A; Fri, 5 Jun 2020 10:25:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6AAFDE093A for ; Fri, 5 Jun 2020 10:25:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A9CF034ED3D for ; Fri, 5 Jun 2020 10:25:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5564F31 for ; Fri, 5 Jun 2020 10:25:27 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1591352724.63f5f9a2207c30b2222e91e2db7c014479de9dce.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/, net-misc/dhcpcd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dhcpcd/dhcpcd-9.1.1-r1.ebuild net-misc/dhcpcd/dhcpcd-9.1.1.ebuild net-misc/dhcpcd/files/dhcpcd-9.1.1-embedded_config.patch net-misc/dhcpcd/files/dhcpcd-9.1.1-typo_fix.patch X-VCS-Directories: net-misc/dhcpcd/files/ net-misc/dhcpcd/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 63f5f9a2207c30b2222e91e2db7c014479de9dce X-VCS-Branch: master Date: Fri, 5 Jun 2020 10:25:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ebfb3a2e-088f-4fe5-bfd3-a47eac6c001b X-Archives-Hash: 908e081b54ec617ade17710117a052bd commit: 63f5f9a2207c30b2222e91e2db7c014479de9dce Author: Lars Wendler gentoo org> AuthorDate: Fri Jun 5 10:25:00 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Jun 5 10:25:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f5f9a2 net-misc/dhcpcd: Revbump to fix installation of embedded config Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Lars Wendler gentoo.org> ...{dhcpcd-9.1.1.ebuild => dhcpcd-9.1.1-r1.ebuild} | 2 +- .../files/dhcpcd-9.1.1-embedded_config.patch | 43 ++++++++++++++++++++++ net-misc/dhcpcd/files/dhcpcd-9.1.1-typo_fix.patch | 11 ------ 3 files changed, 44 insertions(+), 12 deletions(-) diff --git a/net-misc/dhcpcd/dhcpcd-9.1.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.1.1-r1.ebuild similarity index 99% rename from net-misc/dhcpcd/dhcpcd-9.1.1.ebuild rename to net-misc/dhcpcd/dhcpcd-9.1.1-r1.ebuild index c4339429d80..0942b0cd043 100644 --- a/net-misc/dhcpcd/dhcpcd-9.1.1.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9.1.1-r1.ebuild @@ -34,7 +34,7 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-typo_fix.patch" + "${FILESDIR}/${P}-embedded_config.patch" ) src_configure() { diff --git a/net-misc/dhcpcd/files/dhcpcd-9.1.1-embedded_config.patch b/net-misc/dhcpcd/files/dhcpcd-9.1.1-embedded_config.patch new file mode 100644 index 00000000000..10e8520116f --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-9.1.1-embedded_config.patch @@ -0,0 +1,43 @@ +From fa1cd0004e0d3267a1217ada46e53df38824da2d Mon Sep 17 00:00:00 2001 +From: Roy Marples +Date: Thu, 4 Jun 2020 21:49:37 +0100 +Subject: Fix installing the embedded config as a file. + +--- + src/if-options.c | 4 ++-- + src/privsep-root.c | 4 ++++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/if-options.c b/src/if-options.c +index 212e71d8..3dde04bf 100644 +--- a/src/if-options.c ++++ b/src/if-options.c +@@ -2366,8 +2366,8 @@ read_config(struct dhcpcd_ctx *ctx, + return ifo; + } + if (buf[buflen - 1] != '\0') { +- if (buflen < sizeof(buf) - 1) +- bulen++; ++ if ((size_t)buflen < sizeof(buf) - 1) ++ buflen++; + buf[buflen - 1] = '\0'; + } + #else +diff --git a/src/privsep-root.c b/src/privsep-root.c +index fdf43856..512dfcc0 100644 +--- a/src/privsep-root.c ++++ b/src/privsep-root.c +@@ -297,6 +297,10 @@ ps_root_validpath(const struct dhcpcd_ctx *ctx, uint16_t cmd, const char *path) + return false; + + if (cmd == PS_READFILE) { ++#ifdef EMBEDDED_CONFIG ++ if (strcmp(ctx->cffile, EMBEDDED_CONFIG) == 0) ++ return true; ++#endif + if (strcmp(ctx->cffile, path) == 0) + return true; + } +-- +cgit v1.2.3 + diff --git a/net-misc/dhcpcd/files/dhcpcd-9.1.1-typo_fix.patch b/net-misc/dhcpcd/files/dhcpcd-9.1.1-typo_fix.patch deleted file mode 100644 index 0d97b7f8275..00000000000 --- a/net-misc/dhcpcd/files/dhcpcd-9.1.1-typo_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dhcpcd-9.1.1/src/if-options.c -+++ dhcpcd-9.1.1/src/if-options.c -@@ -2367,7 +2367,7 @@ - } - if (buf[buflen - 1] != '\0') { - if (buflen < sizeof(buf) - 1) -- bulen++; -+ buflen++; - buf[buflen - 1] = '\0'; - } - #else