From nobody Mon Mar 27 12:33:56 2023 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 4PlXLD4sl0z42Ccd; Mon, 27 Mar 2023 12:33:56 +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 4PlXLD4DhYz3kk9; Mon, 27 Mar 2023 12:33:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679920436; 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=F/7t6LuTfVCt/rEVo2NZe6S2oUAsbkdVuaxJU4z4O+4=; b=n04TdgfkOETV/rFuJvKTLV6JTyAMcHUIo8NLsh6Xuj2pqMEYhro62HMUjtNwhWK9cxHULE Y/BZViTV+NLrsHrbJsMDtFMfw9bZEF+KV8fThr6s9ozuFa8sJ/LXL4wUmaWHv+AECm+Ex+ 1B4HDuz/jAT+5i0t7rTXq6yPrylsPXIln7N2Q9kAGC88NWhOp1swanngZieb+DNHwk5/ix MhHV/J93BP8trzM8V1J93k135CazKxhfps3GQk4d9R2x7+ZIPghPp7XfYESIr1kCHV7jRP 4FyG+af892LVhuFwU1RpWm3zwEoKhMx+d03FTRnEu1Mr1yUAi+4N15YJfMjzzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679920436; 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=F/7t6LuTfVCt/rEVo2NZe6S2oUAsbkdVuaxJU4z4O+4=; b=PnLHYwEgfdg6K3vKTSRf0PfJmfMRR688jL7zrHQZdQF1K5rFsXsXyjwr7yaKIjMo1qMAWM VGMYeX7bG7gkbHFmNQslq9C9fuljYC61pBHysHQz7wLJSMTrTMeEF4K1rZSZSpHw5KTIzv gk98sQDJ5rF7H11h3AVfmWnI7dvtYgGEmrOHUEz8HbjornPfPMyFzYdQxsQ8n9SDOWGeec dqY+vs6fEioBMPz8QmyMs40lNxQ7YbOLj7hyvsfkay7+iWkkt3ZSQjdo3T+y1tF0hQn4Bz CYimDDudrLjmPiyYOCw2N4OVGaA2/yksVdicQrhjC7A4w9GqjiGQeVDf6VL9ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679920436; a=rsa-sha256; cv=none; b=bSly3sP9pfmkBH3eq71JR6FDfDAhDphhTis8+2TkHt6xgCEHD9hJEIUN/oJRMVu37njbNm JmqxysTucqE/7/S+B18MdBIJZGjFDs7bvkjEa1ppQoTX1TYdkn1bH6yjXAhIjWycTNPz/m 67OXW/unjDWTyAccwQd7/HGF67xBSNg9je2IET3fL/Ewpx1Ianon2eMpkctCIvm1y9Pmvo 8Y4glbAxfcD0mRhPgVa9vcOmdzJ0mAW4mTNjQzua1/kGl5IOWuf1L0EYHFYGZnupEzli9s RYRX1YkDDS11NGkH1Vaa91nMjjFWriymAvq82YAmYnM2OaRgmHyhNPrU4LPRkw== 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 4PlXLD3G0LzMvy; Mon, 27 Mar 2023 12:33:56 +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 32RCXusk074263; Mon, 27 Mar 2023 12:33:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RCXuxn074262; Mon, 27 Mar 2023 12:33:56 GMT (envelope-from git) Date: Mon, 27 Mar 2023 12:33:56 GMT Message-Id: <202303271233.32RCXuxn074262@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: fb22e1c2e365 - main - net/sflowtool: Update to 6.01 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb22e1c2e3653558065ffa0509c3c020834723db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb22e1c2e3653558065ffa0509c3c020834723db commit fb22e1c2e3653558065ffa0509c3c020834723db Author: Nuno Teixeira AuthorDate: 2023-03-27 12:30:18 +0000 Commit: Nuno Teixeira CommitDate: 2023-03-27 12:33:43 +0000 net/sflowtool: Update to 6.01 - Add patch to fix build on versions that do not have glibc/linux compatible byteswap.h ChangeLog: https://github.com/sflow/sflowtool/releases/tag/v6.01 --- net/sflowtool/Makefile | 9 ++++++++- net/sflowtool/distinfo | 6 +++--- net/sflowtool/files/extra-patch-src_sflowtool.c | 25 +++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/net/sflowtool/Makefile b/net/sflowtool/Makefile index e637ae85e1ab..9a237f54a1df 100644 --- a/net/sflowtool/Makefile +++ b/net/sflowtool/Makefile @@ -1,6 +1,6 @@ PORTNAME= sflowtool DISTVERSIONPREFIX= v -DISTVERSION= 5.08 +DISTVERSION= 6.01 CATEGORIES= net MAINTAINER= eduardo@FreeBSD.org @@ -26,6 +26,13 @@ PORTEXAMPLES= sflowenable OPTIONS_DEFINE= DOCS EXAMPLES +.include + +# Patch byteswap.h where not available +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1301511 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_sflowtool.c +.endif + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} diff --git a/net/sflowtool/distinfo b/net/sflowtool/distinfo index e092aaaf9da6..40a6a3f22490 100644 --- a/net/sflowtool/distinfo +++ b/net/sflowtool/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667822009 -SHA256 (sflow-sflowtool-v5.08_GH0.tar.gz) = 70a1930e1a99077c0cf92d4205c744aaeaadb794927bae8b98463075432b4a8a -SIZE (sflow-sflowtool-v5.08_GH0.tar.gz) = 79065 +TIMESTAMP = 1679650144 +SHA256 (sflow-sflowtool-v6.01_GH0.tar.gz) = 4cc9f4512a3dcb7da6a970b1de06e3f2fcb599a605e9cfeddd34bd7b9b687f3c +SIZE (sflow-sflowtool-v6.01_GH0.tar.gz) = 81155 diff --git a/net/sflowtool/files/extra-patch-src_sflowtool.c b/net/sflowtool/files/extra-patch-src_sflowtool.c new file mode 100644 index 000000000000..b851dddedd14 --- /dev/null +++ b/net/sflowtool/files/extra-patch-src_sflowtool.c @@ -0,0 +1,25 @@ +--- src/sflowtool.c.orig 2023-03-23 17:36:24 UTC ++++ src/sflowtool.c +@@ -29,13 +29,21 @@ extern "C" { + #include + #include + #include +-#include ++#include + #include + + #include "sflow.h" /* sFlow v5 */ + #include "sflow_v2v4.h" /* sFlow v2/4 */ + #include "assert.h" + #include "sflow_xdr.h" /* sFlow encode */ ++ ++#define __bswap_16(x) __bswap16(x) ++#define __bswap_32(x) __bswap32(x) ++#define __bswap_64(x) __bswap64(x) ++ ++#define bswap_16(x) __bswap16(x) ++#define bswap_32(x) __bswap32(x) ++#define bswap_64(x) __bswap64(x) + + #define SPOOFSOURCE 1 + #define YES 1