From nobody Sat Jun 04 17:53:47 2022 X-Original-To: dev-commits-ports-main@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 373AF1BE4C14; Sat, 4 Jun 2022 17:53:48 +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 4LFnRv52Jwz3qsJ; Sat, 4 Jun 2022 17:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654365227; 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=Yh/upPSGj52x4tI39veKa65WRrMylSZyvqjlj8fav8k=; b=PAc7rWKeg31S8BDDvQn4+Le5xfNG45mXepuT0usMoPmxa3ByjeE3ONFqXcRY/r3N0ZPkod 2wHFic3TsR/NVVjISDxyo4vmzdeamGHsHd0o0cKMw4NTwkvRxJBIVDCpC4kGBkZoxtcONG oT5xMmGxc+J5d2bK4+Mh6OAaLyD76PUei+Cu63+luHgFS9uaGyDs4PpKauvevW4su0DXPc OcQda0UvaBqmxzbdSkUJC6iF2NOyiB5g4qS84eyjO6hx7NSyfL61bLav3zqPz1S0W88HXe ht49GAgmdMQlT7lasgMFLTCdQB/mk9osEStYPwIjE1+A4RcZJBg99OHqhPQX4Q== 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 842F62215A; Sat, 4 Jun 2022 17:53:47 +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 254Hrlqb070166; Sat, 4 Jun 2022 17:53:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 254HrlRT070165; Sat, 4 Jun 2022 17:53:47 GMT (envelope-from git) Date: Sat, 4 Jun 2022 17:53:47 GMT Message-Id: <202206041753.254HrlRT070165@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: 2a039d20f859 - main - net-mgmt/check_nwc_health: Work around port scout failure List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 2a039d20f859058d97089c6d5a8945d2304ecc64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654365227; 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=Yh/upPSGj52x4tI39veKa65WRrMylSZyvqjlj8fav8k=; b=Xnc+66m9RTrKOua2dV0z0lID7i9vjkOt8cXpiFCcWc7llpyIm36OftRmNOZoKGN2ijpXzZ 8C8q/AobtReWw9pIhxOAbZYL5hbJerhD+4PafChoMQTGHT0pD58CmklGN9IYrO6SnTtDmq RHas79t6yKXuCuEipikJlvsGbhKY99n3cOZkbJxM0m1QMD5Bfz9ubYAk07iVNs4gtqA8Wz KlV9PSdJoo+t+H+5Eot2+nCGQ/m4FM2EF7wMlXbHwXoPrymHKyl13CGj6bGkT6yBtF9q6+ 5z69XIquY3F4vN/mXkU6xEuO5L681kDqgmrWmw+ct/Z2Rb+yfOGScbgi8reInw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654365227; a=rsa-sha256; cv=none; b=LxvCcgVfMiNb6nVAQHoafeIWK0EmJkgP5T+B5udbGdldjJS4bOXPjJgvK0pooJHEUuQ1gW gdK0uahCNsTynoOzV/QxDGK/NX06TQdnn41XrDk0+Bcgv8Sp1e9Pkwgisg2zgfAW1HIa2O cQenqCBoad1tbCDcgqxxlyaAcl0dOLRCYIxvGJ8vc4hYcbwrYxO5SNIWib1F9z6JStqDGb ybr8I8ZnrC2gVRazyOiqsC+J5D1u/raRWh4359PxElCI1C4gwlcCpdA4upGDMVgskxJ2/k ijZPrH8HxHAFOV3xo9jI/gNyUpUZvBBX6RghmW5pz0MqX7Jt0KceCoklnfAJyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a039d20f859058d97089c6d5a8945d2304ecc64 commit 2a039d20f859058d97089c6d5a8945d2304ecc64 Author: Craig Leres AuthorDate: 2022-06-04 17:53:21 +0000 Commit: Craig Leres CommitDate: 2022-06-04 17:53:21 +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 --- 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