commit: 65f86cdce2f35d916c5f3c41fd41900f3bf6bedb Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Nov 20 19:29:17 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Nov 20 19:29:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f86cdc
net-misc/dhcp: backport build fix Closes: https://bugs.gentoo.org/752402 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-misc/dhcp/dhcp-4.4.2-r3.ebuild | 1 + net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild index 0257824a08f..6cad24e7519 100644 --- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild +++ b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild @@ -70,6 +70,7 @@ PATCHES=( # Possible upstream candidates "${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194 + "${FILESDIR}/dhcp-4.4.2-variable-name.patch" #752402 ) src_prepare() { diff --git a/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch new file mode 100644 index 00000000000..9f5085dd5e2 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch @@ -0,0 +1,25 @@ +From 261c84d91d1b4581df9f7f0ec031908299de7726 Mon Sep 17 00:00:00 2001 +From: Mark Andrews <ma...@isc.org> +Date: Thu, 19 Dec 2019 09:27:44 +1100 +Subject: [PATCH] fix variable name in conditional block + +--- + lib/isc/stats.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/isc/stats.c b/lib/isc/stats.c +index 5bce3c1100..a7ab97ce53 100644 +--- a/bind/bind-9.11.14/lib/isc/stats.c ++++ b/bind/bind-9.11.14/lib/isc/stats.c +@@ -297,7 +297,7 @@ setcounter(isc_stats_t *stats, + isc_atomic_store((int32_t *)&stats->counters[counter].lo, + (uint32_t)(value & 0xffffffff)); + # else +- stats->counters[counter] = val; ++ stats->counters[counter] = value; + # endif + #endif + } +-- +GitLab +
