From nobody Wed Jun 12 11:34:18 2024 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 4Vzk2y2jYTz5M3kf; Wed, 12 Jun 2024 11:34:18 +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 4Vzk2y27HRz4tgh; Wed, 12 Jun 2024 11:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718192058; 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=DbUl9RH0YLrB2UsENyFyHRLUBuv3b+dgsUVQPPjRkaA=; b=JojEcgxCyEcqln597pavz3027cNLwwdJkSAKDU4JCq1E45G/l/iJkFjJgnEs77W6usI7Lo sVzge90yFWUooGrHje5ZK3AB8k2sN6aY0VCfAAnXsm/ubChXtmovpJWO2cxoMuYvEPGt1K gLdBxS/dGZPyQ7WwufIIy/dR/50NBYGBBgGDMEiP0Un2CtOHXIlNFP8em8vUisGZwl8Duf 9PBLPO8BBzXGZxIt7Q2r1UswPQGYCiTv59mn57G46tbkE9rO8hQL9k4irt9XGXC7yoKMTe Wt2dM2HuyWVJa7425HNoWopzu6YSVHxEKF/4TwxH68CcDzkIXbRqPLqmhKOtnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718192058; a=rsa-sha256; cv=none; b=jDo58r3RvNCWtrJcKRNHw6AoMFAQV2AOey1NTchERxqkD6il63TLFRe37IfkcBEb0dwaZW UsmszkojxOfgAd9Zv1AppPibFVfwMibAEzCiKIsptDMOR53JV1Jjdj2xlxyAZhDxmqgC+3 kQFUDbRBVX9jIIdOUPGiAZehRxRGQLybZydL6hPed9kID+ABCTdVRytqlFV/61TyILSo+5 YqQfBETWR8/h0PoXt8hiALfX3ot3ki1HcWzsnrRMeA6qd7WYRFOegFQDyNkMsfDNc8dt1i tR+I8vsArTu6IIXCMBhkKUeLfd3pklZEZDo2+YBk4Jyla4+bP2aaGgcHhtgFuw== 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=1718192058; 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=DbUl9RH0YLrB2UsENyFyHRLUBuv3b+dgsUVQPPjRkaA=; b=pzLzUf3lETLizhBpaIBA9EpL72kwj+0sVUfUAVOoL20Wl/l0Oqtsn6oq3wTnydzU5w/swC DQBR5woSHmXfoFNkqfboPh4ZpHqe+WOdgWlAGWnMFNyCGIpouuTixNnU58evhLLTPsZXah abNMvGd/ANlFtNwb/qs6lixPqKuKjnBlqjPeUY5Prtwt1DKU2u4ArS0+53aK4E9AMSKLzl AhfsWk+YgyqNwhvL0XMtcn7PvypBiPDXA8XCX3mk3hH1eeCRkc36djGXiT2YFxmdvDFx9l xxEAX0Xck1mBTfPOcp573wV7qRUIXaYu5H4nLLHChWMr+5M4sWiKI8ljOF/kVg== 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 4Vzk2y1k1Yzr4L; Wed, 12 Jun 2024 11:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45CBYIOI025510; Wed, 12 Jun 2024 11:34:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CBYIxc025507; Wed, 12 Jun 2024 11:34:18 GMT (envelope-from git) Date: Wed, 12 Jun 2024 11:34:18 GMT Message-Id: <202406121134.45CBYIxc025507@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 0a0b8a9fe86c - main - net-mgmt/collectd5: Fix build with python 3.11 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a0b8a9fe86c4c4b065f0327c08f30db48c078ba Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a0b8a9fe86c4c4b065f0327c08f30db48c078ba commit 0a0b8a9fe86c4c4b065f0327c08f30db48c078ba Author: Krzysztof AuthorDate: 2024-06-12 11:28:55 +0000 Commit: Nuno Teixeira CommitDate: 2024-06-12 11:28:55 +0000 net-mgmt/collectd5: Fix build with python 3.11 While here: - Put SLURM option as broken, doesn't compile with slurm-wlm >= 21.x See also: https://github.com/collectd/collectd/issues/3959 - Update VARNISH lib depends: www/varnish6 -> www/varnish7 PR: 278686 --- net-mgmt/collectd5/Makefile | 7 ++++--- net-mgmt/collectd5/files/patch-src__pf.c | 11 +++++------ net-mgmt/collectd5/files/patch-src_cpython.h | 11 +++++++++++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index cd679679e3e6..4b570d907cd4 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -1,6 +1,6 @@ PORTNAME= collectd PORTVERSION= 5.12.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= net-mgmt MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/ PKGNAMESUFFIX= 5 @@ -71,7 +71,7 @@ SNMP_DESC= Enable SNMP plugin STATSD_DESC= Enable statsd plugin TOKYOTYRANT_DESC= Enable tokyotyrant plugin TSDB_DESC= Enable write_tsdb plugin -VARNISH_DESC= Enable varnish 6.x cache statistics +VARNISH_DESC= Enable varnish 7.x cache statistics VIRT_DESC= Enable libvirt plugin (requires XML) XML_DESC= Enable XML plugins ZOOKEEPER_DESC= Enable zookeeper plugin @@ -242,6 +242,7 @@ SIGROK_CONFIGURE_ENABLE= sigrok SIGROK_USES= gettext-runtime SIGROK_BROKEN= working only with sigrok < 0.4 +SLURM_BROKEN= Does not compile with slurm-wlm >= 21.x SLURM_LIB_DEPENDS= libslurm.so:sysutils/slurm-wlm SLURM_CONFIGURE_ENABLE= slurm SLURM_CONFIGURE_WITH= libslurm=${LOCALBASE} @@ -259,7 +260,7 @@ TOKYOTYRANT_CONFIGURE_WITH= libtokyotyrant=${LOCALBASE} TSDB_CONFIGURE_ENABLE= write_tsdb -VARNISH_LIB_DEPENDS= libvarnishapi.so:www/varnish6 +VARNISH_LIB_DEPENDS= libvarnishapi.so:www/varnish7 VARNISH_CONFIGURE_ENABLE= varnish VIRT_IMPLIES= XML diff --git a/net-mgmt/collectd5/files/patch-src__pf.c b/net-mgmt/collectd5/files/patch-src__pf.c index 136a8d307c6b..1c046465d4c4 100644 --- a/net-mgmt/collectd5/files/patch-src__pf.c +++ b/net-mgmt/collectd5/files/patch-src__pf.c @@ -4,9 +4,7 @@ Date: Tue Nov 7 03:35:47 2023 -0700 FreeBSD's PF has a new interface so leverage libpfctl to access it so the right interface is used depending on the version -diff --git src/pf.c src/pf.c -index 9681d366..eef9540d 100644 ---- src/pf.c +--- src/pf.c.orig 2020-07-20 09:50:14 UTC +++ src/pf.c @@ -35,6 +35,9 @@ #endif @@ -18,12 +16,12 @@ index 9681d366..eef9540d 100644 #ifndef FCNT_NAMES #if FCNT_MAX != 3 -@@ -76,6 +79,56 @@ static void pf_submit(char const *type, char const *type_instance, uint64_t val, +@@ -76,7 +79,57 @@ static void pf_submit(char const *type, char const *ty plugin_dispatch_values(&vl); } /* void pf_submit */ +#ifdef __FreeBSD__ -+static int pf_read(void) { + static int pf_read(void) { + struct pfctl_status *state; + int fd; + @@ -72,9 +70,10 @@ index 9681d366..eef9540d 100644 + return 0; +} /* int pf_read */ +#else - static int pf_read(void) { ++static int pf_read(void) { struct pf_status state; int fd; + int status; @@ -119,5 +172,6 @@ static int pf_read(void) { return 0; diff --git a/net-mgmt/collectd5/files/patch-src_cpython.h b/net-mgmt/collectd5/files/patch-src_cpython.h new file mode 100644 index 000000000000..78fc41236fb8 --- /dev/null +++ b/net-mgmt/collectd5/files/patch-src_cpython.h @@ -0,0 +1,11 @@ +--- src/cpython.h.orig 2020-07-20 09:50:14 UTC ++++ src/cpython.h +@@ -26,7 +26,7 @@ + + /* Some python versions don't include this by default. */ + +-#include ++#include + + /* These two macros are basically Py_BEGIN_ALLOW_THREADS and + * Py_BEGIN_ALLOW_THREADS