Attachment 228518 Details for Bug 259006 – net-mgmt/sdig: fix build with -fno-common

[patch] net-mgmt/sdig: fix build with -fno-common

0001-net-mgmt-sdig-fix-build-with-fno-common.patch (text/plain), 3.89 KB, created by Robert Clausecker on 2021-10-08 14:53:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2021-10-08 14:53:14 UTC

Size: 3.89 KB

patch

obsolete

>From fdae78e2bb6e1f7570c40a79f4f88b3797c2f870 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Fri, 8 Oct 2021 16:38:45 +0200
>Subject: [PATCH] net-mgmt/sdig: fix build with -fno-common
>
>---
> net-mgmt/sdig/Makefile                 |  8 ++++----
> net-mgmt/sdig/files/patch-sdig.conf    |  6 +++---
> net-mgmt/sdig/files/patch-sdig.conf.5  |  8 ++++----
> net-mgmt/sdig/files/patch-src-output.c |  4 ++--
> net-mgmt/sdig/files/patch-src_sdig.h   | 17 +++++++++++++++++
> 5 files changed, 30 insertions(+), 13 deletions(-)
> create mode 100644 net-mgmt/sdig/files/patch-src_sdig.h
>
>diff --git a/net-mgmt/sdig/Makefile b/net-mgmt/sdig/Makefile
>index 06ad83875039..24325e959832 100644
>--- a/net-mgmt/sdig/Makefile
>+++ b/net-mgmt/sdig/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	sdig
> PORTVERSION=	0.45
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF \
> 		ZI
>@@ -10,12 +10,12 @@ MASTER_SITES=	SF \
> MAINTAINER=	zi@FreeBSD.org
> COMMENT=	Translate IP/DNS/WINS/MAC address into port description
> 
>-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: result
>-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: result
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
> 
>-USES=		gmake
>+USES=		autoreconf gmake
> GNU_CONFIGURE=	yes
> CFLAGS+=	-D_WANT_SEMUN
> 
>diff --git a/net-mgmt/sdig/files/patch-sdig.conf b/net-mgmt/sdig/files/patch-sdig.conf
>index 3782e5499972..49334e2ea236 100644
>--- a/net-mgmt/sdig/files/patch-sdig.conf
>+++ b/net-mgmt/sdig/files/patch-sdig.conf
>@@ -1,5 +1,5 @@
>---- sdig.conf.orig	2011-05-30 17:18:03.000000000 -0400
>-+++ sdig.conf	2011-05-30 17:18:25.000000000 -0400
>+--- sdig.conf.orig	2010-07-12 19:57:40 UTC
>++++ sdig.conf
> @@ -55,7 +55,7 @@
>  #
>  # Usual path is /usr/local/samba/bin
>@@ -9,7 +9,7 @@
>  
>  # ---------------------------------------------------------------------------
>  # MACTABLE <path to MAC table file>
>-@@ -68,7 +68,7 @@
>+@@ -68,7 +68,7 @@ NMBLOOKUP /usr/local/samba/bin/nmblookup
>  # rarely changes.  If you want to use this feature, get it from the
>  # main web site: http://www.exploits.org/sdig/
>  
>diff --git a/net-mgmt/sdig/files/patch-sdig.conf.5 b/net-mgmt/sdig/files/patch-sdig.conf.5
>index 2073ff093fbf..beb095ad5889 100644
>--- a/net-mgmt/sdig/files/patch-sdig.conf.5
>+++ b/net-mgmt/sdig/files/patch-sdig.conf.5
>@@ -1,6 +1,6 @@
>---- sdig.conf.5.orig	2011-05-30 17:21:10.000000000 -0400
>-+++ sdig.conf.5	2011-05-30 17:21:34.000000000 -0400
>-@@ -109,7 +109,7 @@
>+--- sdig.conf.5.orig	2010-07-27 06:55:33 UTC
>++++ sdig.conf.5
>+@@ -109,7 +109,7 @@ Specify the path to Samba's nmblookup binary.  This mi
>  This program is optional, and is provided to augment DNS lookups in
>  environments laden with Windows machines.
>  
>@@ -9,7 +9,7 @@
>  
>  .IP "MACTABLE \fIpath\fR"
>  
>-@@ -122,7 +122,7 @@
>+@@ -122,7 +122,7 @@ This file is rather large and rarely changes, so it's 
>  source distribution.  You can get it on the main sdig web site -
>  http://www.exploits.org/sdig/
>  
>diff --git a/net-mgmt/sdig/files/patch-src-output.c b/net-mgmt/sdig/files/patch-src-output.c
>index 89cb8574c16a..db8e759c9c46 100644
>--- a/net-mgmt/sdig/files/patch-src-output.c
>+++ b/net-mgmt/sdig/files/patch-src-output.c
>@@ -1,5 +1,5 @@
>---- src/output.c.orig	2011-05-30 16:52:55.000000000 -0400
>-+++ src/output.c	2011-05-30 16:53:21.000000000 -0400
>+--- src/output.c.orig	2010-07-27 07:31:03 UTC
>++++ src/output.c
> @@ -22,11 +22,6 @@
>  #ifdef SDIG_USE_SEMS
>  
>diff --git a/net-mgmt/sdig/files/patch-src_sdig.h b/net-mgmt/sdig/files/patch-src_sdig.h
>new file mode 100644
>index 000000000000..53fb5f69aff2
>--- /dev/null
>+++ b/net-mgmt/sdig/files/patch-src_sdig.h
>@@ -0,0 +1,17 @@
>+--- src/sdig.h.orig	2021-10-08 14:08:41 UTC
>++++ src/sdig.h
>+@@ -42,14 +42,6 @@ typedef struct {
>+ 	void    *next;
>+ }       pdtype;
>+ 
>+-/* holds the results of a matched port */
>+-struct result {
>+-	stype s;
>+-	char *ifIdx;
>+-	char *ifAlias;
>+-	char *ifName;
>+-} result;
>+-
>+ /*
>+  * global data
>+  */
>-- 
>2.32.0
>

Flags:

fuz: maintainer-approval+

Actions: View | Diff

Attachments on bug 259006: 228518