From nobody Mon Apr 27 00:13:03 2026 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 4g3kYD4N35z6bJ5J for ; Mon, 27 Apr 2026 00:13:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3kYD0DJVz3MJj for ; Mon, 27 Apr 2026 00:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777248784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5OxxAz8KAamih0QHsO9JIstRsxChyxzpHtv0KgI2ay4=; b=t/0b4khP5rmUx0cDzdGjQIWV4ZtAXlcO/7cMszJy/BIsOJd1RHgnN3UWJUspDMDnyX1UFM PsTVY6wiOuO1bfmJOURq5nE4V7rqxsUumJkDYYI9XXxkONmtS86eU7mExdwwIlDOniHZo3 IowodkaoqahMIFogIdWw6Xkh9lWj/4byhlduHxPdMZILymqEn//gZfRi+QikIvpBI9M7Hq 0Kzd1JpBZ8Atm3ux2oQPJ/7FRUc0cXXTleD6e8Klw2L7zO0Uj9o+ElUlLAafxhqnW16dTw ObeW8vCqZCtplIeBuAP0tLU/yIq4oNpbn09e70+JYaFFvlmS+x8o4UveoaVSug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777248784; a=rsa-sha256; cv=none; b=he2sccjIF5dsFGNQuZQUzeiHqaHVPd3SAUx/6djj6Rt3HLSC7dGaBJh/K+HOs6U3q6AU/8 pKYjzD5Tq0ibRSWfowzCVlo+sd9zUBuyxR7SKieYu28vSwE9+yxWhZtUrGf3rvqH+QnTVK q90ZJT8KUa80ATHrpmgRFcu0pybOPLpIiDAIHc5HQazgCd1Qmt4PWZl6q1W50ux4VOfwVO ahYC6sN96cADB4sygZHpTQXFl+2YR+lHcUVltGifyfZTJmSs88cZLt/lYD7BKUxOMehYrg 3Pi3dB+IN+SyUZ+Zd3wjFKvtQbnfni8paFTRCreG217Artr7fPdLlNwjKFMtLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777248784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5OxxAz8KAamih0QHsO9JIstRsxChyxzpHtv0KgI2ay4=; b=vOPC3iwfj+uDL14go2q5aV6z9CLwdqETuGcUKeg0JtpjVJ3iLpYyesG51tg+oOK70+puO4 tH4r0jDnzZCHyzlDX/XTz4Jzo1mheH/D41YspM56PvrfKTBC52BJOW3pha4k9gylY8zHwR F2uyGtlhMsMuhUF1FX+fABnh1vz8sSAImW1yalgrtH4wlFa6Yyj9vc3NVDssTIxQvVY3Xo XI77f5/Gn15RlIWWi7C2DBhd/LZCJuMpN90RSKBAUvB/OUs6h/b3Rz1WiWQAavyRygSyVK Z7yaH4/7vAwCwzc0DUflXQPVwpwB+ze1/iDaODRADxE7cXtMJ6cCBK7OijjoDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3kYC6qN4zkLJ for ; Mon, 27 Apr 2026 00:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e1e7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Apr 2026 00:13:03 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Cc: Kirill From: Robert Clausecker Subject: git: 74c826b07d85 - 2026Q2 - net-mgmt/check_mysql_health: fix awk pipeline 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2026Q2 X-Git-Reftype: branch X-Git-Commit: 74c826b07d858c6c53d370f6aea121e1b66d5871 Auto-Submitted: auto-generated Date: Mon, 27 Apr 2026 00:13:03 +0000 Message-Id: <69eeaa0f.1e1e7.267c3774@gitrepo.freebsd.org> The branch 2026Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=74c826b07d858c6c53d370f6aea121e1b66d5871 commit 74c826b07d858c6c53d370f6aea121e1b66d5871 Author: Kirill AuthorDate: 2026-04-24 17:08:20 +0000 Commit: Robert Clausecker CommitDate: 2026-04-27 00:11:58 +0000 net-mgmt/check_mysql_health: fix awk pipeline PR: 285486 Reported by: Dave Hayes MFH: 2026Q2 Event: Wiesbaden Hackathon 202604 (cherry picked from commit ec78a0daf64cf1764be2906237ef21cf88124b3e) --- net-mgmt/check_mysql_health/Makefile | 9 ++++++++- .../files/extra-patch-plugins-scripts_subst.in | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/net-mgmt/check_mysql_health/Makefile b/net-mgmt/check_mysql_health/Makefile index 6cbb22ccdcb3..3d7e25248969 100644 --- a/net-mgmt/check_mysql_health/Makefile +++ b/net-mgmt/check_mysql_health/Makefile @@ -1,6 +1,6 @@ PORTNAME= check_mysql_health DISTVERSION= 3.0.0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= https://labs.consol.de/assets/downloads/nagios/ @@ -32,4 +32,11 @@ NAGIOSDIR?= /var/spool/nagios PLIST_FILES= libexec/nagios/check_mysql_health +.include + +# Change regexp for older awk +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400000 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-plugins-scripts_subst.in +.endif + .include diff --git a/net-mgmt/check_mysql_health/files/extra-patch-plugins-scripts_subst.in b/net-mgmt/check_mysql_health/files/extra-patch-plugins-scripts_subst.in new file mode 100644 index 000000000000..22497c07c761 --- /dev/null +++ b/net-mgmt/check_mysql_health/files/extra-patch-plugins-scripts_subst.in @@ -0,0 +1,11 @@ +--- plugins-scripts/subst.in.orig 2016-08-01 16:28:29.583644100 +0000 ++++ plugins-scripts/subst.in 2025-05-12 18:58:53.592280000 +0000 +@@ -41,7 +41,7 @@ + + /^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");} + /^#! ?\/.*\/perl/ {sub(/^#! ?\/.*\/perl/,"#! @PERL@");} +-/^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! @AWK@");} ++/^#! ?\/.*\/[a-z]?[a-z]?awk/ {sub(/^#! ?\/.*\/[a-z]?[a-z]?awk/,"#! @AWK@");} + /^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");} + + # add to libexecdir to INC for perl utils.pm