Attachment 227767 Details for Bug 258370 – net-mgmt/p0f2: patch and unbreak with -fno-common

[patch] net-mgmt/p0f2: patch and unbreak with -fno-common

0001-net-mgmt-p0f2-fix-and-unbreak-with-fno-common.patch (text/plain), 2.37 KB, created by Robert Clausecker on 2021-09-08 15:40:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2021-09-08 15:40:44 UTC

Size: 2.37 KB

patch

obsolete

>From b0485fae36a8c1c350698d9a8fc3c787c05144c9 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Wed, 8 Sep 2021 17:34:17 +0200
>Subject: [PATCH] net-mgmt/p0f2: fix and unbreak with -fno-common
>
>---
> 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(-)
> create mode 100644 net-mgmt/p0f2/files/patch-p0f-query.c
>
>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)))
>+ 
>-- 
>2.32.0
>

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 258370: 227767 | 227782