From nobody Fri Aug 16 17:27:51 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 4Wlppv3TRRz5TGXS; Fri, 16 Aug 2024 17:27:51 +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 4Wlppv2nHnz4rRj; Fri, 16 Aug 2024 17:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723829271; 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=8vwnXQLKDJ4PQLOlfECDprBLm2HnxBYdiyQ8zOx2Ihg=; b=NNvnuvMIwNFOp1LXvduC7Jgv0eVUSlFjo87nCuvQ9Ept8hWwoxj1nGWM1U3Y1y61wjXWhL o+03SMC50NUJ4iBLptxXbUhWLK0U4YvUvIIlDp6EmY0SZdERLGffTxHXZgRkdw+iV0khwE CvtoRMvaOuRzhAHJobxK0F9bqxP8IgFc9WgqICGA0SMewE8F4FwCLRBGaDi3Ur78zOLYgU ZPYmxiCotVLvsr5GOlatK+aBMeDnQ9kJIcWAgVa6vI783P5MCTSJuXxM/9L8sVHA2Fv/6Y W0yUUQd6rOgQKb9wCi2VFe2FrI3n7I9+QpGeG5msicDP1dUpiBgPl1cJic8GnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723829271; a=rsa-sha256; cv=none; b=tbNs8u8NINwHd8Rvkk41TxDemJa+g9XrTz2ueqTU68iTyTIm4Dt59AnxVsZvx3uruQ+zjs QtddPVXrckleTQqoYTGyhdWiKni53xGl1kvCBVoJTT7YVWAI6eIRdlUtIfikDnNcAuGAP9 6DckPjtO2TcM2HK06Ar9PclG4CcXKfxal9OVtdCvXNhJyxwWb8accDI8RZOL2jSvzTUnIV HJl5Gw9dlcmYT9yR7kcLqKNXK8L6VPDJ9f7RPymF4O8N4EfMJWgsyn6fYQTGDcmqz2MPSk duBqzpxR0Ak8S6HZsDFeLzwpc80qsvwCIE1ujf0M5TRt65YCy4bz8AX5K2UTdA== 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=1723829271; 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=8vwnXQLKDJ4PQLOlfECDprBLm2HnxBYdiyQ8zOx2Ihg=; b=WB9C7szic9XXd+OS6p/nRvH8WjKUoggn1i189eM8t9ufe9oSwiixtUj3M3HzkKOIsuQ8u/ COY1vXOXzNxHNeBJY6zsa/+5PWrEzMiCmURF7avjmyoymvq9f/qBhJS/F9TJTkkzrrZr7E yvL7NylRoMf7eB9Ar0dgB71xH1ra65BhXxyZlNYl+JaXk9Wll0vZH35L+RkbjWMtwptlGy dF87bZ2mm7vN6qrJGySpCAG8zGwrvx6+k8aUwjtYLBnoo+/5wugsdqXWY658kMscosH/Qr SRODlrpO28zJhizY0mqsgGoOc3C1V5V6cBSAHRxMgoCVXNiWb9kZqnEKGGu25Q== 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 4Wlppv220xzG1r; Fri, 16 Aug 2024 17:27:51 +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 47GHRpsK066764; Fri, 16 Aug 2024 17:27:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GHRp2r066761; Fri, 16 Aug 2024 17:27:51 GMT (envelope-from git) Date: Fri, 16 Aug 2024 17:27:51 GMT Message-Id: <202408161727.47GHRp2r066761@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: f31a65e8b225 - main - net-mgmt/ipfixcol2: mark this port as suitable only for few architectures, improve port 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f31a65e8b225b1e5665aaa7801fd6a31d2437157 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f31a65e8b225b1e5665aaa7801fd6a31d2437157 commit f31a65e8b225b1e5665aaa7801fd6a31d2437157 Author: Vladimir Druzenko AuthorDate: 2024-08-16 17:23:19 +0000 Commit: Vladimir Druzenko CommitDate: 2024-08-16 17:23:19 +0000 net-mgmt/ipfixcol2: mark this port as suitable only for few architectures, improve port Port require SSE2 and also 64bit time_t. It work on amd64 and possible on aarch64 and armv7 (not tested). Pet portclippy, align lines in Makefile, add substitution for %%USER%% in start script. PR: 280850 Approved by: Marek Zarychta (maintainer) --- net-mgmt/ipfixcol2/Makefile | 40 ++++++++++++++++++++--------------- net-mgmt/ipfixcol2/files/ipfixcol2.in | 2 +- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/net-mgmt/ipfixcol2/Makefile b/net-mgmt/ipfixcol2/Makefile index f2bb7613e465..34b823dd40bb 100644 --- a/net-mgmt/ipfixcol2/Makefile +++ b/net-mgmt/ipfixcol2/Makefile @@ -1,39 +1,45 @@ -PORTNAME= ipfixcol2 +PORTNAME= ipfixcol2 DISTVERSIONPREFIX= v DISTVERSION= 2.6.0 -CATEGORIES= net-mgmt +CATEGORIES= net-mgmt MAINTAINER= zarychtam@plan-b.pwste.edu.pl COMMENT= NetFlow v5/v9 and IPFIX flow (RFC 7011) data collector WWW= https://github.com/CESNET/ipfixcol2 -LICENSE= GPLv2 +LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= librdkafka.so:net/librdkafka \ - libepoll-shim.so:devel/libepoll-shim \ - libfds.so:net-mgmt/libfds +ONLY_FOR_ARCHS= aarch64 amd64 armv7 +ONLY_FOR_ARCHS_REASON= Require SSE2 and static_assert(sizeof(uint64_t) == sizeof(time_t), "Assumed that time_t is uint64_t, but it's not") -BUILD_DEPENDS= rst2man:textproc/py-docutils -USES= cmake localbase:ldflags pkgconfig +BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR} +LIB_DEPENDS= librdkafka.so:net/librdkafka \ + libepoll-shim.so:devel/libepoll-shim \ + libfds.so:net-mgmt/libfds +USES= cmake localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= CESNET -USE_RC_SUBR=${PORTNAME} -USERS= ${PORTNAME} -GROUPS= ${PORTNAME} -PORTEXAMPLES= * +USE_RC_SUBR= ${PORTNAME} + +CXXFLAGS+= -D_GNU_SOURCE +LDFLAGS+= -rdynamic -LDFLAGS+= -rdynamic -CXXFLAGS+= -D_GNU_SOURCE +SUB_LIST= USER=${USERS:[0]} +USERS= ${PORTNAME} +GROUPS= ${PORTNAME} +PORTEXAMPLES= * -OPTIONS_DEFINE= EXAMPLES +OPTIONS_DEFINE= EXAMPLES post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/run/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/doc/data/configs/udp2json.xml ${STAGEDIR}${ETCDIR}/startup.xml.sample + ${INSTALL_DATA} ${WRKSRC}/doc/data/configs/udp2json.xml \ + ${STAGEDIR}${ETCDIR}/startup.xml.sample post-install-EXAMPLES-on: - cd ${WRKSRC}/doc/data && ${COPYTREE_SHARE} "configs" ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/doc/data && ${COPYTREE_SHARE} "configs" \ + ${STAGEDIR}${EXAMPLESDIR}) .include diff --git a/net-mgmt/ipfixcol2/files/ipfixcol2.in b/net-mgmt/ipfixcol2/files/ipfixcol2.in index 56e21238f8e6..8e50be3fa610 100644 --- a/net-mgmt/ipfixcol2/files/ipfixcol2.in +++ b/net-mgmt/ipfixcol2/files/ipfixcol2.in @@ -21,7 +21,7 @@ load_rc_config "$name" : ${ipfixcol2_enable:=NO} : ${ipfixcol2_conf:=%%PREFIX%%/etc/$name.conf} : ${ipfixcol2_flags:=""} -: ${ipfixcol2_user:=ipfixcol2} +: ${ipfixcol2_user:=%%USER%%} command=%%PREFIX%%/bin/ipfixcol2 command_args="-d -P /var/run/$name/$name.pid ${ipfixcol2_flags}"