From nobody Wed Oct 02 10:45:25 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJWfs6H6nz5YLdS; Wed, 02 Oct 2024 10:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJWfs5FJdz4MPJ; Wed, 2 Oct 2024 10:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727865925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=INuZouLkUe2Ihb5Fr449uaSLNLl5v1IkG5gyLb58Vtw=; b=tRT6k7T9gOoxKrGRhwDck/fvuck2Qj1BgUA4KTeXbZ3myXH3qJftzvKKWw3K32LkLdMjGt x/WVobFNUoudn2MiSWwtzvghrD/j7M59d0vs7hIsxkNDdaXQ0PepHd3pA9VEXdHkd9/aTg jdgN4G8iW52ydYAtid3JV13UKvpP6NuO5gqki8vpEmuwJIUk39KplqTFjIdV4oNB6booO4 85pyx1qRAtm8nPl1WPRo938ebTKsLtm7djp8mz8JjiDrkUJYxdly4FDRJgBrD4HWryaOyh z0sSj8kahR9kqdfOw4vF7ivi7M/I/0MfRRh0V+uMtR8CEPp5de/G1SEFu1oi5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727865925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=INuZouLkUe2Ihb5Fr449uaSLNLl5v1IkG5gyLb58Vtw=; b=pocSTZsDLgh4Fw/Zm8xvaLgBVWmK9R6Q1iMEqdHMwUC4pIeFupbay2Swl5xnLsTCjZ3wjH wnSEoMtVh+0btbJ2DkI0mTz3GgBM3HQ3KC9VUmTYITojXxK+SI++CisLDWsZ3LDKVjqnnq irjk7ulT79YQHcIy4i3kVl/4x+Rm5cdgqyMtXrv4BPdC+mSwzHT19m+IA6dryJ2tTLIBw5 NEIQNWPcYGr99nHByA4trn8irYG0+FDV12DZ1iAFiVoqCPuY/of4XeypG4VZxxS35IIrY5 pr+7PGAuODC8FgvZWrI5H03XoE2/T2MormJsR2Q/N1rXWd8JCct8yizTwA30/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727865925; a=rsa-sha256; cv=none; b=t1yj/vfhukel9QqrdbirioT9sdZAwADAtVpZHk3PZOeSMbj0tnBKDeau+7uwvv1XpO/3bh dWAY7FFjNkdqbVSL9bUo+ZfD7k3dGDU8CU1rID6GiysfxyQ/2bP+i9JMKuvXfbTI4w2jPG AT/Xk8hKbni12UbZz+ghwkca98OU93BRoOboqbaa/TfxzEenb/nHfIifi6NJc8rpJaPiM/ hWLkambjzdsHP/TEoGdH5q9RWS21On1DhSH46EVnst7wSSezqeaxedKSYAK50zb6s9se2X JZbTmNpnR/wnYSe2bW/v9q2TeTe9GcoUy5KRqLCT3XOOJ5gbJekadAygcdsPCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJWfs4bzrz1H1b; Wed, 2 Oct 2024 10:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 492AjPCj024787; Wed, 2 Oct 2024 10:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492AjPWx024784; Wed, 2 Oct 2024 10:45:25 GMT (envelope-from git) Date: Wed, 2 Oct 2024 10:45:25 GMT Message-Id: <202410021045.492AjPWx024784@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6725d1053614 - main - net/isc-dhcp44-server: Fix checkconfig command. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6725d10536142ea378a9207aecb99c2d2e1a9229 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/ports/commit/?id=6725d10536142ea378a9207aecb99c2d2e1a9229 commit 6725d10536142ea378a9207aecb99c2d2e1a9229 Author: Dag-Erling Smørgrav AuthorDate: 2024-10-02 10:37:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-02 10:37:30 +0000 net/isc-dhcp44-server: Fix checkconfig command. This adds an undocumented -Q flag which cancels out any -q option that may be present in dhcpd_flags, avoiding the need for a fragile sed command. It also adds a comment explaining why we are running the check twice and what the -q and -Q are for. PR: 281701 --- net/isc-dhcp44-server/Makefile | 2 +- net/isc-dhcp44-server/files/isc-dhcpd.in | 19 +++++++++---------- net/isc-dhcp44-server/files/patch-server_dhcpd.c | 12 ++++++++++++ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/net/isc-dhcp44-server/Makefile b/net/isc-dhcp44-server/Makefile index b25044874a60..208d09a1191f 100644 --- a/net/isc-dhcp44-server/Makefile +++ b/net/isc-dhcp44-server/Makefile @@ -19,7 +19,7 @@ USES= cpe gmake CPE_VENDOR= isc -PORTREVISION_SERVER= 1 +PORTREVISION_SERVER= 2 PORTREVISION_CLIENT= 1 PORTREVISION_RELAY= 1 diff --git a/net/isc-dhcp44-server/files/isc-dhcpd.in b/net/isc-dhcp44-server/files/isc-dhcpd.in index b92fad444b43..25def60b3ada 100644 --- a/net/isc-dhcp44-server/files/isc-dhcpd.in +++ b/net/isc-dhcp44-server/files/isc-dhcpd.in @@ -499,16 +499,15 @@ dhcpd_restartprecmd () dhcpd_checkconfig () { - local rc_flags_mod - setup_flags - rc_flags_mod="$rc_flags" - # Eliminate '-q' flag if it is present - case "$rc_flags" in - *-q*) rc_flags_mod=`echo "${rc_flags}" | sed -Ee 's/(^-q | -q | -q$)//'` ;; - esac - if ! ${command} -t -q ${rc_flags_mod}; then - err 1 "`${command} -t ${rc_flags_mod}` Configuration file sanity check failed" - fi + setup_flags + # Run dhcpcd -t quietly to check for errors. If this fails, + # run it again unquietly so the errors are shown to the user, + # then error out. The -q and -Q flags need to be at the end + # to override contradictory flags in ${rc_flags}. + if ! ${command} -t ${rc_flags} -q; then + ${command} -t ${rc_flags} -Q + err 1 "Configuration file sanity check failed" + fi } rcvar=${name}_enable diff --git a/net/isc-dhcp44-server/files/patch-server_dhcpd.c b/net/isc-dhcp44-server/files/patch-server_dhcpd.c new file mode 100644 index 000000000000..17e6c79025bb --- /dev/null +++ b/net/isc-dhcp44-server/files/patch-server_dhcpd.c @@ -0,0 +1,12 @@ +--- server/dhcpd.c.orig 2022-09-28 14:39:15 UTC ++++ server/dhcpd.c +@@ -492,6 +492,9 @@ main(int argc, char **argv) { + cftest = 1; + lftest = 1; + log_perror = -1; ++ } else if (!strcmp (argv [i], "-Q")) { ++ quiet = 0; ++ quiet_interface_discovery = 0; + } else if (!strcmp (argv [i], "-q")) { + quiet = 1; + quiet_interface_discovery = 1;