From nobody Thu May 11 23:26:32 2023 X-Original-To: dev-commits-ports-all@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 4QHShS39Q1z4BB73; Thu, 11 May 2023 23:26:32 +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 4QHShS2h0nz3LHn; Thu, 11 May 2023 23:26:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683847592; 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=4Bo2nkYdrOVaWjizI4YD4yJe8nW4lLTOIGJXcU3XjMA=; b=WhTFYKSxZKg3E1zIdUUSd72d1xBvhJAoShJccDn4UHfacYSj9r9wCE64PXKagtUDVdE8JK x3S+YsI/JJqnSMYoc+fdxrSEG4uOuk/7ZkO5XR6TWOVccshFLdytYSNzd5MqdRodP837Nz PgyYXzq9WsJ7j7DNSz7xS8vhdiR/clyIaRFz6zDIwp1vzSfRnQmVkdP6bT+qKoCs++4d9x gysB2wCh/6jYmahUgKCi87wWC09pdLwsclqefJT7XW8OAE4BH+Uwlxy7wWHnYtYNV7uPBx G5m/hCACuxVrDIoQqrC1Ay4NDixH8C8ttCiHq/onuwv/DXTKBKTV/3FEYaY8eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683847592; 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=4Bo2nkYdrOVaWjizI4YD4yJe8nW4lLTOIGJXcU3XjMA=; b=Eb9zZg4ZZHlV4ulj7R9H27pKj28VzEUbLT33NTEtVp212YDVFe3j0Qg71WuF5b2rbTtI0v YjAZtoFAZto+Ewywf9VplCfMDgseGW4sYMfniNl1aOxRHTe0qh4Y9vIr9gTD2AKmH/OWTY IRTtIZN/2e2q2x/d5za+YsIYZNQl6mLZjXAbUwhU+fve8cyTzTwzflgpVIseqq4EBjiR7Q 2cJAU89iodwuTtzBVPS9fWqu3cRhtZXe5Ol4JsczwoQam4wrhrdbCm41k8ZoMlaQQnbl7L IjJDO6qtSeYCfLZiyCzmWf/tIL7QB9+/GA0jAmLf5CUIzhbBPJ9fnv6X41WkNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683847592; a=rsa-sha256; cv=none; b=f234j8n0vx3bumuZ2g+ujOf3O17KX1qRRsJogXNZR6RoJBiq2UfPxpNI/4rv7uh18hYVEt 2yfrRhcsjQ4zsRCg9RL0WsyFwU3ORIzMy03Vta8+FMAt/Bc685byWhiWT7P/5BOkszUejm BNboDDDu28cAOpCofiwmavFlesVqcYCOtetSNXqFe+VYXboJwMNk/zFEVZHC2CLu4L5wht pyM8KXGVwxY4zaWtinwaj7uGZGuDLo0iHAtmq7IHT0+OdCBJUa8AGFqo+vzXtR5Q7mNFjc jO/BgVv5PnbfhVuE+cvW67aiabndEVdFuDM0Yj+alWjm3zHu1mtqyhGUDEGLWg== 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 4QHShS1kqkz1BkW; Thu, 11 May 2023 23:26:32 +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 34BNQWPZ048536; Thu, 11 May 2023 23:26:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BNQWuZ048535; Thu, 11 May 2023 23:26:32 GMT (envelope-from git) Date: Thu, 11 May 2023 23:26:32 GMT Message-Id: <202305112326.34BNQWuZ048535@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 02cd17e8ffbd - main - sysutils/pflogx: unbreak, fix compiler errors and warnings List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02cd17e8ffbdf3ea10417c42821611b44d3d3866 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=02cd17e8ffbdf3ea10417c42821611b44d3d3866 commit 02cd17e8ffbdf3ea10417c42821611b44d3d3866 Author: Peter Libassi AuthorDate: 2023-02-06 13:36:48 +0000 Commit: Robert Clausecker CommitDate: 2023-05-11 23:23:27 +0000 sysutils/pflogx: unbreak, fix compiler errors and warnings Submitter becomes maintainer. PR: 269371 --- sysutils/pflogx/Makefile | 6 +----- sysutils/pflogx/files/patch-src_CmdLineParser.cpp | 5 ++++- sysutils/pflogx/files/patch-src_LogEntryFormat.cpp | 8 ++++++-- sysutils/pflogx/files/patch-src_LogParser.cpp | 13 +++++++++++++ sysutils/pflogx/files/patch-src_Makefile | 11 +++++++++++ 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/sysutils/pflogx/Makefile b/sysutils/pflogx/Makefile index 49b7bbbeb895..c9a71cbebae9 100644 --- a/sysutils/pflogx/Makefile +++ b/sysutils/pflogx/Makefile @@ -4,17 +4,13 @@ CATEGORIES= sysutils MASTER_SITES= http://akldev.free.fr/pflogx/releases/ DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= peter@libassi.se COMMENT= Simple tool to export pf (packet filter) logs to XML files WWW= http://akldev.free.fr/pflogx/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build -BROKEN_FreeBSD_13= does not build: error: unknown type name 'LIST_ENTRY' -BROKEN_FreeBSD_14= does not build: error: unknown type name 'LIST_ENTRY' - WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= EXPAT DOCS EXAMPLES diff --git a/sysutils/pflogx/files/patch-src_CmdLineParser.cpp b/sysutils/pflogx/files/patch-src_CmdLineParser.cpp index e191cc8f195e..958b33342564 100644 --- a/sysutils/pflogx/files/patch-src_CmdLineParser.cpp +++ b/sysutils/pflogx/files/patch-src_CmdLineParser.cpp @@ -1,9 +1,12 @@ --- src/CmdLineParser.cpp.orig 2006-05-08 10:21:40 UTC +++ src/CmdLineParser.cpp -@@ -31,6 +31,7 @@ +@@ -31,6 +31,10 @@ #include "CmdLineParser.h" #include "LogEntry.h" #include "StrTools.h" ++#include ++#include ++#include +#include #include #include diff --git a/sysutils/pflogx/files/patch-src_LogEntryFormat.cpp b/sysutils/pflogx/files/patch-src_LogEntryFormat.cpp index 521f92e0d571..7752521b5a77 100644 --- a/sysutils/pflogx/files/patch-src_LogEntryFormat.cpp +++ b/sysutils/pflogx/files/patch-src_LogEntryFormat.cpp @@ -1,10 +1,14 @@ --- src/LogEntryFormat.cpp.orig 2006-05-08 10:23:07 UTC +++ src/LogEntryFormat.cpp -@@ -34,6 +34,7 @@ +@@ -34,7 +34,10 @@ #include #include #include +- ++#include ++#include ++#include +#include - #define STATIC_BUFFER_LEN 128 + diff --git a/sysutils/pflogx/files/patch-src_LogParser.cpp b/sysutils/pflogx/files/patch-src_LogParser.cpp new file mode 100644 index 000000000000..c35445bcc3d5 --- /dev/null +++ b/sysutils/pflogx/files/patch-src_LogParser.cpp @@ -0,0 +1,13 @@ +--- src/LogParser.cpp.orig 2006-02-17 15:40:13 UTC ++++ src/LogParser.cpp +@@ -240,8 +240,8 @@ bool cLogParser::FeedEntry(const struct pfloghdr* pfHe + return false; + + +- if (pfHeader->ifname) +- entry.SetIfName(pfHeader->ifname); ++ /* if (pfHeader->ifname) */ ++ entry.SetIfName(pfHeader->ifname); + + entry.SetRuleNumber(ntohl(pfHeader->rulenr)); + entry.SetAction(pfHeader->action); diff --git a/sysutils/pflogx/files/patch-src_Makefile b/sysutils/pflogx/files/patch-src_Makefile new file mode 100644 index 000000000000..65ff43b8ed54 --- /dev/null +++ b/sysutils/pflogx/files/patch-src_Makefile @@ -0,0 +1,11 @@ +--- src/Makefile.orig 2006-04-25 19:27:56 UTC ++++ src/Makefile +@@ -8,7 +8,7 @@ OS!=uname -s + .if defined(DEBUG_MODE) + CXXFLAGS += -g -DDEBUG_MODE + .else +-CXXFLAGS += -s ++CXXFLAGS += -s -Qunused-arguments + .endif + + # pf's include directory