Date: Mon, 30 May 2011 21:31:11 GMT From: Ryan Steinmetz <rpsfa@rit.edu> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/157440: [update] net-mgmt/sdig to 0.45 Message-ID: <201105302131.p4ULVBsf036848@red.freebsd.org> Resent-Message-ID: <201105302140.p4ULeATq031899@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157440
>Category: ports
>Synopsis: [update] net-mgmt/sdig to 0.45
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon May 30 21:40:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Ryan Steinmetz
>Release: 8.2-RELEASE
>Organization:
Rochester Institute of Technology
>Environment:
>Description:
-Update to 0.45
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/net-mgmt/sdig/Makefile sdig/Makefile
--- /usr/ports/net-mgmt/sdig/Makefile 2010-06-02 15:14:14.000000000 -0400
+++ sdig/Makefile 2011-05-30 17:22:38.000000000 -0400
@@ -6,8 +6,7 @@
#
PORTNAME= sdig
-PORTVERSION= 0.43
-PORTREVISION= 4
+PORTVERSION= 0.45
CATEGORIES= net-mgmt
MASTER_SITES= SF
@@ -21,6 +20,17 @@
MAN5= sdig.conf.5
MAN8= sdig.8
-PLIST_FILES= bin/sdig etc/sdig.conf-sample etc/mactable-sample
+PLIST_FILES= bin/sdig etc/sdig.conf etc/mactable
+
+post-patch:
+ @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/sdig.conf
+ @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/sdig.conf.5
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/sdig ${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/sdig.conf ${PREFIX}/etc
+ ${INSTALL_DATA} ${WRKSRC}/mactable ${PREFIX}/etc
+ ${INSTALL_MAN} ${WRKSRC}/sdig.8 ${PREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKSRC}/sdig.conf.5 ${PREFIX}/man/man5
.include <bsd.port.mk>
diff -urN /usr/ports/net-mgmt/sdig/distinfo sdig/distinfo
--- /usr/ports/net-mgmt/sdig/distinfo 2011-03-20 08:54:10.000000000 -0400
+++ sdig/distinfo 2011-05-30 16:46:32.000000000 -0400
@@ -1,2 +1,2 @@
-SHA256 (sdig-0.43.tar.gz) = f12c265c443f8fd363db80077180aacd041aabc0a3ffdcc78c7c948a88077800
-SIZE (sdig-0.43.tar.gz) = 114754
+SHA256 (sdig-0.45.tar.gz) = 1af5a67d7ba0e804508d1492140ad48d61a8c253657666e110257e704e3bb73d
+SIZE (sdig-0.45.tar.gz) = 140398
diff -urN /usr/ports/net-mgmt/sdig/files/patch-sdig.conf sdig/files/patch-sdig.conf
--- /usr/ports/net-mgmt/sdig/files/patch-sdig.conf 1969-12-31 19:00:00.000000000 -0500
+++ sdig/files/patch-sdig.conf 2011-05-30 17:19:26.000000000 -0400
@@ -0,0 +1,20 @@
+--- sdig.conf.orig 2011-05-30 17:18:03.000000000 -0400
++++ sdig.conf 2011-05-30 17:18:25.000000000 -0400
+@@ -55,7 +55,7 @@
+ #
+ # Usual path is /usr/local/samba/bin
+
+-NMBLOOKUP /usr/local/samba/bin/nmblookup
++NMBLOOKUP %%PREFIX%%/bin/nmblookup
+
+ # ---------------------------------------------------------------------------
+ # MACTABLE <path to MAC table file>
+@@ -68,7 +68,7 @@
+ # rarely changes. If you want to use this feature, get it from the
+ # main web site: http://www.exploits.org/sdig/
+
+-MACTABLE /etc/mactable
++MACTABLE %%PREFIX%%/etc/mactable
+
+ # ---------------------------------------------------------------------------
+ # HOSTINFO <path to program>
diff -urN /usr/ports/net-mgmt/sdig/files/patch-sdig.conf.5 sdig/files/patch-sdig.conf.5
--- /usr/ports/net-mgmt/sdig/files/patch-sdig.conf.5 1969-12-31 19:00:00.000000000 -0500
+++ sdig/files/patch-sdig.conf.5 2011-05-30 17:21:56.000000000 -0400
@@ -0,0 +1,20 @@
+--- 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 @@
+ This program is optional, and is provided to augment DNS lookups in
+ environments laden with Windows machines.
+
+- NMBLOOKUP /usr/local/samba/bin/nmblookup
++ NMBLOOKUP %%PREFIX%%/bin/nmblookup
+
+ .IP "MACTABLE \fIpath\fR"
+
+@@ -122,7 +122,7 @@
+ source distribution. You can get it on the main sdig web site -
+ http://www.exploits.org/sdig/
+
+- MACTABLE /etc/mactable
++ MACTABLE %%PREFIX%%/etc/mactable
+
+ .IP "HOSTINFO \fIpath\fR"
+
diff -urN /usr/ports/net-mgmt/sdig/files/patch-src-output.c sdig/files/patch-src-output.c
--- /usr/ports/net-mgmt/sdig/files/patch-src-output.c 1969-12-31 19:00:00.000000000 -0500
+++ sdig/files/patch-src-output.c 2011-05-30 16:53:45.000000000 -0400
@@ -0,0 +1,14 @@
+--- src/output.c.orig 2011-05-30 16:52:55.000000000 -0400
++++ src/output.c 2011-05-30 16:53:21.000000000 -0400
+@@ -22,11 +22,6 @@
+ #ifdef SDIG_USE_SEMS
+
+ enum ops { UNLOCK = (int)1, LOCK = (int)(-1) };
+-union semun {
+- int val;
+- struct semid_ds *buf;
+- ushort *array;
+-};
+
+ int lock = 0;
+ // int pad = 0;
diff -urN /usr/ports/net-mgmt/sdig/pkg-message sdig/pkg-message
--- /usr/ports/net-mgmt/sdig/pkg-message 1969-12-31 19:00:00.000000000 -0500
+++ sdig/pkg-message 2011-05-30 17:28:29.000000000 -0400
@@ -0,0 +1,2 @@
+If you wish to use the NMBLOOKUP option within sdig, you must
+install net/samba-nmblookup (or net/samba).
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105302131.p4ULVBsf036848>