From nobody Sat Jun 04 17:58:37 2022 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 6D9F11BE5B99; Sat, 4 Jun 2022 17:58:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LFnYW6k2Fz3rl4; Sat, 4 Jun 2022 17:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654365520; 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=7hNaHcJ6cfkx2yd25TnBAORzEIu0TjMEJsso+Fl/IuQ=; b=nNa1tBuOZecVOEJTi0P4Twkw2cphaVz6jVHcdbpNshObRY2UONDKP9bvKLW8YMgpBi59mf sfKKwGiFhI8BVVI+JWIgmb7AhS4qybWzOZv56PaRXzSQp6l5QBX4y2Pu3ZCeo13Qg7hNr6 cd4xYSgu6SGrYb++RF3k+i/khSO6y7fEYTgh9T3GAyXkH11LsrhigSVUwyYLO4+7Zl69tR N4pTqYQ9HBtNpqGH+hlXBs1ygmLFwXhJsGHDeQ3X0vHIwO/0J13um0y913AjG4vqBFbGQ2 qSPTgRwpVysmCQBz91eSE3F5lComrWTNkT89CY2qbEyjwT1wIMcA7NgenqI+xg== 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 CE27A2215D; Sat, 4 Jun 2022 17:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 254HwbJv070935; Sat, 4 Jun 2022 17:58:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 254HwbSp070934; Sat, 4 Jun 2022 17:58:37 GMT (envelope-from git) Date: Sat, 4 Jun 2022 17:58:37 GMT Message-Id: <202206041758.254HwbSp070934@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Craig Leres Subject: git: 01e744d358b7 - 2022Q2 - net-mgmt/check_nwc_health: Work around port scout failure 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 01e744d358b7fe52c9d8daa076853aa4b26d08d0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654365520; 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=7hNaHcJ6cfkx2yd25TnBAORzEIu0TjMEJsso+Fl/IuQ=; b=YI0wWALRZbDan4HCnDDZsiNt182KfUoc3aucm6PecL1sMgXDuGxnhfCCMc4PPYWfLVL55r njnq+fOjLxM+wpiJikghZZblmYZJiW518Rin9i1pTFsWCd0NK4Nu1KuYesHHV3zBmXSxiT tdU6JnamFRuXUeMqmdVEEf4MVQAHK3nGDIQWqCAXtshsLvb65tQc7CHklkmxTLV/WA7xc+ qRvJhaEQ/HmL+Fgb3AWEHHc3wIQTaa1YKQ0tiOFjeo8p+dj6PP32jHbDw/o70vRBfIKNsz AxY1sR17+8h54OKlkvyMMYBk410mDUXIAihacqDpaSRl+6U2+92a+nQoQqyFhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654365520; a=rsa-sha256; cv=none; b=sNIkyN9VYfNurySeGvc0+beJCcyfNSAW2/FLn7w6ngf2lWGvWRxeAySs8ggVE5xCouGzX6 5vlA+TozUdOn+sKhGetB7cU8aPdogK4y87O0OQ2X+WwlF4aEX/AN1FOidxqsxGo6Kuwmmh B61mVuW1T3E+bel0YJQ0NXbQ89Xw3g57xzi9EabUwXkpY3Y4g6HrbwI6p3/7T0fJzOE5bF TaJboAvFSZWpTwBjOW6L2vuoxfQpu8PZdNtfFE2+YEsohaQGebYImf+kt+94bwCpNQPwFf zLlbTO3dPGQfkeTt5Qk6Z/H9jIOSJcEZ1WOk28l1PTBeKiYK9yGmmyWYR+035A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=01e744d358b7fe52c9d8daa076853aa4b26d08d0 commit 01e744d358b7fe52c9d8daa076853aa4b26d08d0 Author: Craig Leres AuthorDate: 2022-06-04 17:53:21 +0000 Commit: Craig Leres CommitDate: 2022-06-04 17:58:25 +0000 net-mgmt/check_nwc_health: Work around port scout failure Out of the blue (on 6-Apr-2022) pkg-fallout started objecting to an awk expression in a support script: /usr/bin/awk: syntax error in regular expression ^#! ?\/.*\/[a-z]{0,2}awk at 0 source line number 44 source file ./subst context is /^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! >>> /usr/bin/awk") <<< ;} *** [check_nwc_health] Error code 2 This only happens with 12.3 and the amd64 and arm64 architectures and I have never been able to reproduce the error in a poudriere jail. Remove the offending expression (which is not used by check_nwc_health). Reported by: portscout (cherry picked from commit 2a039d20f859058d97089c6d5a8945d2304ecc64) --- net-mgmt/check_nwc_health/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net-mgmt/check_nwc_health/Makefile b/net-mgmt/check_nwc_health/Makefile index 5f47bd9bc8be..0b73fe3d34e9 100644 --- a/net-mgmt/check_nwc_health/Makefile +++ b/net-mgmt/check_nwc_health/Makefile @@ -1,5 +1,6 @@ PORTNAME= check_nwc_health PORTVERSION= 10.1.0.3 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://labs.consol.de/assets/downloads/nagios/ @@ -27,5 +28,8 @@ PLIST_FILES= libexec/check_nwc_health post-patch: ${REINPLACE_CMD} -e "s| /bin/sed| ${SED}|" -e "s| /bin/grep| ${GREP}|" \ ${WRKSRC}/plugins-scripts/Makefile.in + # Remove unused expression that is problematic for pkg-fallout + # under 12.3 but causes no problems anywhere else + ${REINPLACE_CMD} -e "/@AWK@/d" ${WRKSRC}/plugins-scripts/subst.in .include