From nobody Fri Jan 17 21:47:43 2025 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 4YZYHh0HbPz5kHTJ; Fri, 17 Jan 2025 21:47:44 +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 4YZYHg2sMzz4HXt; Fri, 17 Jan 2025 21:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737150463; 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=tnD4PV7oAfHphJwZBUfs3J9F+KTIip7ahxZCV3Q9OQ4=; b=VXQV5dirPt6KurNq7qH1qHGPciMdhHC0UN/J+MfPs+55jooorrYaF1hv6ZiswigsRewJVp qpjsrpP7uBaNJ7logh9XoYucbKxN0nH32p8DzaHS8Bw1RHd8gmwrmoJ5xh81pyKRiwuXdk eTYNkr5QjTjSHuSHF9WE9YO7G+QUvJ7BackdXzNNlv3e5UzbQAi/Suh7fJH4fFAdqR6Gs5 gP0rWOch/WHDM/kYZHgykWHgPiOREiUXfpKtv5yE+Cbt0IF0zhWSleKl/XhSZcxWxBbiLm eKhQusYGe5QOi70qKLWj3wSIfl43TMHkeOtMGXXYFH15/hlm6IphtC7939FKgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737150463; 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=tnD4PV7oAfHphJwZBUfs3J9F+KTIip7ahxZCV3Q9OQ4=; b=XKgagP/oBb2ukBlSn4ZlOX0WIb0pu2HiFNwDjGLteyD5C9hI5Bsaz6CIzrrWko/NDUEAa2 nmo0nTz55UbbO5G51Hwt2os4kWzstEGj/5QWHk2Bd6t9wpCB+RyyKJZxgg200kVJOh6urj 2NizWY9Ib87ryIMXZ3mVzbU0AWrwP3g/sd00oZw8u2/nBHBmuyH+XlsFyipH6oK9sE+njC cqY/wCN9RGlTq6udGz1cNDGnswjL3NruLRjXGuBLeqjpNgk2DX8QX/zgJaw1WXOxW3hjlr swNXWUg6poaNERC94bCVEifYF0jHv3/6fEyLFtbJsjRipPVHg9wS/nbTsrlWjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737150463; a=rsa-sha256; cv=none; b=avxWCGivgT43XCxKnQNNNZcXmPpIflD0Nuq3pgn/p3QobUWaoFJvngbxT27CrAQ9OdYiMX k3WY0qVegdSFH/RSKVOm4iGL7OMd9OwgsV9+9LsjoZtscAIkwunkwG1h0uPJHpV2m0g7Gt TDH5diZ/l32lXyUQZPGxstOJGG9r5Sztg9NfVqUFpUPfsmPzNsPlQ+H2jBsIIWiRXryNCK 825piUbEa0PguPOiHxkMZChRQtw1XQ6FBV78Ttk5s0OYAFxYKGtM8vAyC1JG8df6YnnApr FIXCAmwTtwvgQL0mUqgafs3XOT4pAYNR2K9iXmymOCsfxF6z3yjIAIYIz+sIPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YZYHg2T4SzcJJ; Fri, 17 Jan 2025 21:47:43 +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 50HLlhX2064315; Fri, 17 Jan 2025 21:47:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HLlhIi064312; Fri, 17 Jan 2025 21:47:43 GMT (envelope-from git) Date: Fri, 17 Jan 2025 21:47:43 GMT Message-Id: <202501172147.50HLlhIi064312@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 26a36671be5b - main - net/ipsumdump: better bswap_32 fix 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26a36671be5b2a6b412835ca34e8b2c7b04e3193 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=26a36671be5b2a6b412835ca34e8b2c7b04e3193 commit 26a36671be5b2a6b412835ca34e8b2c7b04e3193 Author: Piotr Kubaj AuthorDate: 2025-01-17 21:20:47 +0000 Commit: Piotr Kubaj CommitDate: 2025-01-17 21:46:15 +0000 net/ipsumdump: better bswap_32 fix Just include byteswap.h, which defines bswap_32(). --- net/ipsumdump/files/patch-src_aggtree.cc | 11 +++++------ net/ipsumdump/files/patch-src_aggwtree.cc | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/net/ipsumdump/files/patch-src_aggtree.cc b/net/ipsumdump/files/patch-src_aggtree.cc index 23173ae98a0c..8b16683c92b7 100644 --- a/net/ipsumdump/files/patch-src_aggtree.cc +++ b/net/ipsumdump/files/patch-src_aggtree.cc @@ -1,14 +1,13 @@ --- src/aggtree.cc.orig 2014-05-02 12:23:53 UTC +++ src/aggtree.cc -@@ -11,9 +11,11 @@ +@@ -11,9 +11,7 @@ #ifdef HAVE_BYTEORDER_H #include #else -+#if !defined(__powerpc__) && !defined(POWERPC64) - static inline uint32_t bswap_32(uint32_t u) { - return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24)); - } -+#endif +-static inline uint32_t bswap_32(uint32_t u) { +- return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24)); +-} ++#include #endif diff --git a/net/ipsumdump/files/patch-src_aggwtree.cc b/net/ipsumdump/files/patch-src_aggwtree.cc index bea7755f858f..37513ac8817f 100644 --- a/net/ipsumdump/files/patch-src_aggwtree.cc +++ b/net/ipsumdump/files/patch-src_aggwtree.cc @@ -1,14 +1,13 @@ --- src/aggwtree.cc.orig 2014-05-02 12:23:53 UTC +++ src/aggwtree.cc -@@ -10,9 +10,11 @@ +@@ -10,9 +10,7 @@ #ifdef HAVE_BYTEORDER_H #include #else -+#if !defined(__powerpc__) && !defined(POWERPC64) - static inline uint32_t bswap_32(uint32_t u) { - return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24)); - } -+#endif +-static inline uint32_t bswap_32(uint32_t u) { +- return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24)); +-} ++#include #endif typedef AggregateWTree::WNode WNode;