diff options
author | Robert Clausecker <fuz@fuz.su> | 2021-10-08 14:38:45 +0000 |
---|---|---|
committer | Yasuhiro Kimura <yasu@FreeBSD.org> | 2021-10-27 16:00:35 +0000 |
commit | 82a0987e8517e98e339ab648bc76fefefc517390 (patch) | |
tree | 967f6420c88918efcd1e3df6799490e21edc2a6c /net-mgmt | |
parent | 89091e4b0e3a6ef4a843a11a253b47d619e3588f (diff) | |
download | ports-82a0987e8517e98e339ab648bc76fefefc517390.tar.gz ports-82a0987e8517e98e339ab648bc76fefefc517390.zip |
net-mgmt/sdig: Fix build with -fno-common
* Add license information
* Reformat Makefile with portfmt
PR: 259006
Approved by: maintainer timeout (> 2 weeks)
Differential Revision: https://reviews.freebsd.org/D32661
(cherry picked from commit 3436c34cf6a6663dce899fe2d33ffdf3abf841f0)
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/sdig/Makefile | 13 | ||||
-rw-r--r-- | net-mgmt/sdig/files/patch-sdig.conf | 6 | ||||
-rw-r--r-- | net-mgmt/sdig/files/patch-sdig.conf.5 | 8 | ||||
-rw-r--r-- | net-mgmt/sdig/files/patch-src-output.c | 4 | ||||
-rw-r--r-- | net-mgmt/sdig/files/patch-src_sdig.h | 17 |
5 files changed, 34 insertions, 14 deletions
diff --git a/net-mgmt/sdig/Makefile b/net-mgmt/sdig/Makefile index 06ad83875039..ef669d20bc97 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,16 +10,19 @@ 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 -PLIST_FILES= bin/sdig etc/sdig.conf etc/mactable man/man5/sdig.conf.5.gz \ +PLIST_FILES= bin/sdig \ + etc/mactable \ + etc/sdig.conf \ + man/man5/sdig.conf.5.gz \ man/man8/sdig.8.gz post-patch: 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 + */ |