From 5afd89e04ec28fabaddb8e0fe32c436554b9eea2 Mon Sep 17 00:00:00 2001 From: Pete Fritchman Date: Fri, 5 Oct 2001 20:34:53 +0000 Subject: - update 0.3 - remove manpages from files, they are now included w/dist - sort pkg-plist PR: 31062 Submitted by: Dmitry Morozovsky --- net-mgmt/ehnt/Makefile | 6 +- net-mgmt/ehnt/distinfo | 4 +- net-mgmt/ehnt/files/ehnt.1 | 111 ------------------------------------- net-mgmt/ehnt/files/ehntserv.8 | 72 ------------------------ net-mgmt/ehnt/files/patch-Makefile | 21 ++++--- net-mgmt/ehnt/pkg-plist | 4 +- 6 files changed, 20 insertions(+), 198 deletions(-) delete mode 100644 net-mgmt/ehnt/files/ehnt.1 delete mode 100644 net-mgmt/ehnt/files/ehntserv.8 (limited to 'net-mgmt') diff --git a/net-mgmt/ehnt/Makefile b/net-mgmt/ehnt/Makefile index 254998e4f5ff..bf6d4e23f0b7 100644 --- a/net-mgmt/ehnt/Makefile +++ b/net-mgmt/ehnt/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ehnt -PORTVERSION= 0.2.3 +PORTVERSION= 0.3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,8 +22,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ehnt ${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/ehntserv ${PREFIX}/sbin/ ${INSTALL_SCRIPT} ${FILESDIR}/ehntserv.sh.sample ${PREFIX}/etc/rc.d/ - ${INSTALL_MAN} ${FILESDIR}/ehnt.1 ${PREFIX}/man/man1/ - ${INSTALL_MAN} ${FILESDIR}/ehntserv.8 ${PREFIX}/man/man8/ + ${INSTALL_MAN} ${WRKSRC}/ehnt.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/ehntserv.8 ${PREFIX}/man/man8/ ${MKDIR} ${PREFIX}/share/ehnt ${INSTALL_DATA} ${WRKSRC}/asnc.txt ${PREFIX}/share/ehnt/ .if !defined(NOPORTDOCS) diff --git a/net-mgmt/ehnt/distinfo b/net-mgmt/ehnt/distinfo index eb6962d8489f..ab4880cb73b7 100644 --- a/net-mgmt/ehnt/distinfo +++ b/net-mgmt/ehnt/distinfo @@ -1,2 +1,2 @@ -MD5 (ehnt-0.2.3.tar.gz) = 4fb3af5046fb9943ea6bb93a56cb89cb -MD5 (ehnt_data-0.2.3.tar.gz) = ddba92084c78138bdd9af23ac25f5ee9 +MD5 (ehnt-0.3.tar.gz) = 1477137f5207561cafb421864351562d +MD5 (ehnt_data-0.3.tar.gz) = b861e0fb0092c45c71b9048e9a4b1679 diff --git a/net-mgmt/ehnt/files/ehnt.1 b/net-mgmt/ehnt/files/ehnt.1 deleted file mode 100644 index dfc44d7914e3..000000000000 --- a/net-mgmt/ehnt/files/ehnt.1 +++ /dev/null @@ -1,111 +0,0 @@ -.\" Copyright (c) 2000-2001 Nik Weidenbacher nikw@martnet.com -.\" Portions Copyright (c) 2001 Dmitry Morozovsky marck@rinet.ru -.\" -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id$ -.\" -.Dd Aug 04, 2001 -.Dt EHNT 1 -.\" .Os BSD 4.4 -.Sh NAME -.Nm ehnt -.Nd Extreme Happy Netflow Tool. Client part -.Sh SYNOPSIS -.Nm -.Op Fl 0 Ar ASN -.Op Fl a Ar ASN -.Op Fl b -.Op Fl c Ar count -.Op Fl i Ar mins -.Op Fl m Ar mode -.Op Fl n Ar intidx -.Op Fl p Ar port -.Op Fl P Ar proto -.Op Fl r Ar addr -.Op Fl s Ar server:port -.Op Fl x Ar prefix -.Sh DESCRIPTION -The -.Nm -command starts -.Xr ehnt 1 -client which connects to -.Xr ehntserv 8 -server and converts raw flow of NetFlow version 5 packets into -somewhat human-readable (or machine-readable) form. -.Pp -The options are as follows: -.Bl -tag -width ".Fl n Ar intidx" -.It Fl 0 Ar ASN -Replace AS number 0 occurences with this AS number -.It Fl a Ar ASN -Only display flows to/from this AS number -.It Fl b -Display big flows (only shows flows with the most bytes -or packets received so far) -.It Fl c Ar count -Exit after flows are received -.It Fl i Ar mins -How long to wait between report generations (in minutes) -.It Fl m Ar mode -The name of the mode of operation to use: -.Cm dump -displays flow detail; -.Cm shortdump -shows flow details in a more compact fashion; -.Cm top -generates reports of top average utilization -.It Fl n Ar intidx -Specify the interface by SNMP ifIndex number -.It Fl p Ar port -Only display flows to/from this tcp or udp port number -.It Fl P Ar proto -Only display flows using this IP protocol number -.It Fl r Ar addr -Only display flows reported by this router IP address -.It Fl s Ar server:port -The hostname or IP address and port number of the -.Xr ehntserv 8 -.It Fl x Ar prefix -Only display flows to/from this IP prefix. The format for -is 'address/length', for example 1.2.3.4/30 or 127.0.0.0/8. -.El -.Sh FILES -.Bl -tag -width /usr/local/share/ehnt/asnc.txt -compact -.It Pa /usr/local/share/ehnt/asnc.txt -Autonomous Systems Number-to-Name Convertion table -.El -.Sh SEE ALSO -.Xr ehntserv 8 -.Sh AUTHORS -.An Nik Weidenbacher Aq nikw@martnet.com -.An Dmitry Morozovsky Aq marck@rinet.ru - diff --git a/net-mgmt/ehnt/files/ehntserv.8 b/net-mgmt/ehnt/files/ehntserv.8 deleted file mode 100644 index d43849e049e4..000000000000 --- a/net-mgmt/ehnt/files/ehntserv.8 +++ /dev/null @@ -1,72 +0,0 @@ -.\" Copyright (c) 2000-2001 Nik Weidenbacher nikw@martnet.com -.\" Portions Copyright (c) 2001 Dmitry Morozovsky marck@rinet.ru -.\" -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id$ -.\" -.Dd Aug 04, 2001 -.Dt EHNTSERV 8 -.\" .Os BSD 4.4 -.Sh NAME -.Nm ehntserv -.Nd Extreme Happy Netflow Tool. Server part -.Sh SYNOPSIS -.Nm -.Op Fl u Ar udp-port -.Op Fl t Ar tcp-port -.Op Fl m Ar maxdata -.Op Fl d -.Sh DESCRIPTION -The -.Nm -command starts -.Xr ehnt 1 -server (udp to tcp translator) which listens to NetFlow version 5 -packets from Routers and translates them into TCP stream for -.Xr ehnt 1 -clients. -.Pp -The options are as follows: -.Bl -tag -width ".Fl u Ar udp-port" -.It Fl d -Debug. Don't become a daemon, displays all messages on stdout, -displays lots of extra information -.It Fl t Ar tcp-port -Listen on given TCP port (client connections) instead of the default 4444. -.It Fl u Ar udp-port -Listen on given UDP port (NetFlow packets from routers) instead of the default 4444. -.El -.Sh SEE ALSO -.Xr ehnt 1 -.Sh AUTHORS -.An Nik Weidenbacher Aq nikw@martnet.com -.An Dmitry Morozovsky Aq marck@rinet.ru - diff --git a/net-mgmt/ehnt/files/patch-Makefile b/net-mgmt/ehnt/files/patch-Makefile index fd1bdfd279de..5c0d61866bdb 100644 --- a/net-mgmt/ehnt/files/patch-Makefile +++ b/net-mgmt/ehnt/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Thu Aug 9 12:55:44 2001 -+++ Makefile Thu Aug 9 13:04:50 2001 -@@ -1,19 +1,12 @@ +--- Makefile.orig Thu Oct 4 22:18:29 2001 ++++ Makefile Fri Oct 5 21:00:34 2001 +@@ -1,23 +1,14 @@ -PLATFORM = LINUX +#PLATFORM = LINUX #PLATFORM = SOLARIS @@ -11,7 +11,11 @@ #DEBUG = yes #CFLAGS = -g #CFLAGS = -O6 +-STRIP = strip ++#STRIP = strip + #STRIP = gstrip LIBS = -lm +-CFLAGS = -I/usr/lib/glib/include - -ifeq ($(PLATFORM),SOLARIS) - LIBS += -lsocket -lnsl -lresolv @@ -20,30 +24,31 @@ -ifeq ($(DEBUG),yes) - CFLAGS += -g -endif +- +CFLAGS+= -DASNCDIR=\"${PREFIX}/share/ehnt\" - all: ehntserv ehnt asnc.txt -@@ -37,11 +30,6 @@ + @echo +@@ -40,11 +31,6 @@ ehnt : ehnt_client.o ehnt_lookup.o ehnt_display.o ehnt_processflow.o ehnt_main.o $(CC) -o ehnt ehnt_client.o ehnt_lookup.o ehnt_display.o ehnt_processflow.o ehnt_main.o $(LIBS) $(CFLAGS) -ifeq ($(DEBUG),yes) - @echo Debug mode - ehnt not stripped -else -- strip ehnt +- $(STRIP) ehnt -endif ehntserv.o : ehntserv.c ehnt.h netflowv5.h config.h -@@ -49,11 +37,6 @@ +@@ -52,11 +38,6 @@ ehntserv : ehntserv.o $(CC) $(CFLAGS) -o ehntserv ehntserv.o $(LIBS) $(CFLAGS) -ifeq ($(DEBUG),yes) - @echo Debug mode - ehnt not stripped -else -- strip ehntserv +- $(STRIP) ehntserv -endif asnc.txt : diff --git a/net-mgmt/ehnt/pkg-plist b/net-mgmt/ehnt/pkg-plist index 047cd3bbd2c4..482ecee5ac30 100644 --- a/net-mgmt/ehnt/pkg-plist +++ b/net-mgmt/ehnt/pkg-plist @@ -1,7 +1,7 @@ bin/ehnt -sbin/ehntserv etc/rc.d/ehntserv.sh.sample +sbin/ehntserv +%%PORTDOCS%%share/doc/ehnt/README share/ehnt/asnc.txt @dirrm share/ehnt -%%PORTDOCS%%share/doc/ehnt/README %%PORTDOCS%%@dirrm share/doc/ehnt -- cgit v1.2.3