Date: Sat, 11 Sep 2021 01:43:03 GMT From: Kevin Bowling <kbowling@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 7aced36cec30 - 2021Q3 - net-mgmt/p0f2: Fix build with -fno-common Message-ID: <202109110143.18B1h3uP069322@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=7aced36cec305a97accaf3765f11cb1216e0a649 commit 7aced36cec305a97accaf3765f11cb1216e0a649 Author: Robert Clausecker <fuz@fuz.su> AuthorDate: 2021-09-11 01:35:22 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2021-09-11 01:42:15 +0000 net-mgmt/p0f2: Fix build with -fno-common PR: 258370 (cherry picked from commit 19d698844cc5956f11b6ac975b3e31ca04618de3) --- 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))) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109110143.18B1h3uP069322>