Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5357984EA2 for ; Tue, 7 Nov 2023 22:31:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id imPvbAP9CJ2P for ; Tue, 7 Nov 2023 22:31:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B759B84E65 for ; Tue, 7 Nov 2023 22:31:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B0FE9FA2D; Tue, 7 Nov 2023 22:31:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169939627121030" MIME-Version: 1.0 Date: Tue, 7 Nov 2023 22:31:11 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/net/ndpi To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20231107223111.B0FE9FA2D@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169939627121030 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: he Date: Tue Nov 7 22:31:11 UTC 2023 Modified Files: pkgsrc/net/ndpi: Makefile distinfo Added Files: pkgsrc/net/ndpi/patches: patch-src_lib_third__party_include_gcrypt_common.h Log Message: net/ndpi: in gcrypt, don't conditionalize definition of bswap_64(). This fixes the build for NetBSD/macppc. OK'ed by adam@ Bup PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/ndpi/Makefile pkgsrc/net/ndpi/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/net/ndpi/patches/patch-src_lib_third__party_include_gcrypt_common.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169939627121030 Content-Disposition: inline Content-Length: 2400 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/ndpi/Makefile diff -u pkgsrc/net/ndpi/Makefile:1.11 pkgsrc/net/ndpi/Makefile:1.12 --- pkgsrc/net/ndpi/Makefile:1.11 Thu Jun 29 18:03:17 2023 +++ pkgsrc/net/ndpi/Makefile Tue Nov 7 22:31:11 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2023/06/29 18:03:17 adam Exp $ +# $NetBSD: Makefile,v 1.12 2023/11/07 22:31:11 he Exp $ DISTNAME= nDPI-4.6 PKGNAME= ${DISTNAME:tl} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=ntop/} GITHUB_PROJECT= nDPI Index: pkgsrc/net/ndpi/distinfo diff -u pkgsrc/net/ndpi/distinfo:1.11 pkgsrc/net/ndpi/distinfo:1.12 --- pkgsrc/net/ndpi/distinfo:1.11 Thu Jun 29 18:03:17 2023 +++ pkgsrc/net/ndpi/distinfo Tue Nov 7 22:31:11 2023 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.11 2023/06/29 18:03:17 adam Exp $ +$NetBSD: distinfo,v 1.12 2023/11/07 22:31:11 he Exp $ BLAKE2s (nDPI-4.6.tar.gz) = 43db6d82a24789622f8afe1f18ba3dcd33f5eb92b76f23932732789f47e50937 SHA512 (nDPI-4.6.tar.gz) = 12dd50eeaae0aa5c2e3c89cb53cdb9989036759bd900312d3875eaba296646c2e42be31dc2b003cbc2401ccef8fbf8d2e460b9a604d7bece360f17f937d60cad Size (nDPI-4.6.tar.gz) = 29705235 bytes SHA1 (patch-src_include_ndpi__includes.h) = db5da9ca24ecf32fd8c264e193af280814dc74c6 SHA1 (patch-src_lib_Makefile.in) = 2f0dd8c5bacf1f1036bfb81b1139e48131122592 +SHA1 (patch-src_lib_third__party_include_gcrypt_common.h) = 257a2c9b08793f8bca564dc7c6229f1d5168b5e1 Added files: Index: pkgsrc/net/ndpi/patches/patch-src_lib_third__party_include_gcrypt_common.h diff -u /dev/null pkgsrc/net/ndpi/patches/patch-src_lib_third__party_include_gcrypt_common.h:1.1 --- /dev/null Tue Nov 7 22:31:11 2023 +++ pkgsrc/net/ndpi/patches/patch-src_lib_third__party_include_gcrypt_common.h Tue Nov 7 22:31:11 2023 @@ -0,0 +1,17 @@ +$NetBSD: patch-src_lib_third__party_include_gcrypt_common.h,v 1.1 2023/11/07 22:31:11 he Exp $ + +Don't conditionalize definition of bswap_64(). +This leaves it undefined on macppc, and you get link errors. + +--- src/lib/third_party/include/gcrypt/common.h.orig 2023-02-01 17:29:59.000000000 +0000 ++++ src/lib/third_party/include/gcrypt/common.h +@@ -53,9 +53,7 @@ + + #include + #include +- #if defined(__BSWAP_RENAME) && !defined(__bswap_32) + #define bswap_64(x) bswap64(x) +- #endif + #elif defined(__MINGW32__) || defined(__MINGW64__) + #define bswap_64(x) __builtin_bswap64(x) + #else --_----------=_169939627121030--