From owner-dev-commits-ports-main@freebsd.org Sat Sep 11 01:36:01 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6E8AD668AE6; Sat, 11 Sep 2021 01:36:01 +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 4H5wLT2VZqz4rpj; Sat, 11 Sep 2021 01:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3745817C8B; Sat, 11 Sep 2021 01:36:01 +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 18B1a16E055581; Sat, 11 Sep 2021 01:36:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18B1a1qe055580; Sat, 11 Sep 2021 01:36:01 GMT (envelope-from git) Date: Sat, 11 Sep 2021 01:36:01 GMT Message-Id: <202109110136.18B1a1qe055580@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 19d698844cc5 - main - net-mgmt/p0f2: Fix build with -fno-common MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19d698844cc5956f11b6ac975b3e31ca04618de3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Sep 2021 01:36:01 -0000 The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=19d698844cc5956f11b6ac975b3e31ca04618de3 commit 19d698844cc5956f11b6ac975b3e31ca04618de3 Author: Robert Clausecker AuthorDate: 2021-09-11 01:35:22 +0000 Commit: Kevin Bowling CommitDate: 2021-09-11 01:35:22 +0000 net-mgmt/p0f2: Fix build with -fno-common PR: 258370 --- net-mgmt/p0f2/Makefile | 13 ++++++------- net-mgmt/p0f2/distinfo | 1 + net-mgmt/p0f2/files/patch-p0f-query.c | 13 +++++++++++++ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/net-mgmt/p0f2/Makefile b/net-mgmt/p0f2/Makefile index cdaae9f87738..deb2da618d55 100644 --- a/net-mgmt/p0f2/Makefile +++ b/net-mgmt/p0f2/Makefile @@ -1,24 +1,23 @@ PORTNAME= p0f2 PORTVERSION= 2.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt security MASTER_SITES= http://lcamtuf.coredump.cx/p0f3/releases/old/2.x/ DISTNAME= p0f-${DISTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fuz@fuz.su COMMENT= Passive OS fingerprinting tool -BROKEN_FreeBSD_13= ld: error: duplicate symbol: file_cksum -BROKEN_FreeBSD_14= ld: error: duplicate symbol: file_cksum - -CONFLICTS= p0f-3.* +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/doc/COPYING USES= gmake tar:tgz USE_RC_SUBR= p0f2 ALL_TARGET= all p0fq tools -PORTDOCS= COPYING CREDITS ChangeLog KNOWN_BUGS README TODO win-memleak.txt +CONFLICTS= p0f-3.* WRKSRC= ${WRKDIR}/p0f +PORTDOCS= COPYING CREDITS ChangeLog KNOWN_BUGS README TODO win-memleak.txt OPTIONS_DEFINE= DOCS post-patch: diff --git a/net-mgmt/p0f2/distinfo b/net-mgmt/p0f2/distinfo index 83db343aca06..72fbe16eb7eb 100644 --- a/net-mgmt/p0f2/distinfo +++ b/net-mgmt/p0f2/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1631114743 SHA256 (p0f-2.0.8.tgz) = 6c4d8745f04e59f2ba68d56fd1554551592f08a0497c9fc21b84498f47d1aee0 SIZE (p0f-2.0.8.tgz) = 136877 diff --git a/net-mgmt/p0f2/files/patch-p0f-query.c b/net-mgmt/p0f2/files/patch-p0f-query.c new file mode 100644 index 000000000000..0a7655a80953 --- /dev/null +++ b/net-mgmt/p0f2/files/patch-p0f-query.c @@ -0,0 +1,13 @@ +--- p0f-query.c.orig 2021-09-08 15:25:07 UTC ++++ p0f-query.c +@@ -46,8 +46,8 @@ static _u16 flags; + static _s16 score = NO_SCORE; + + /* Imports for statistics */ +-_u32 packet_count, matched_packets, st_time, file_cksum; +-_u8 operating_mode; ++extern _u32 packet_count, matched_packets, st_time, file_cksum; ++extern _u8 operating_mode; + + #define SAD_HASH(a) ((((a) << 16) ^ ((a) << 8) ^ (a))) +