Stuart Henderson wrote: > On 2013/06/16 12:17, André Stöbe wrote: >> Here is an update to softflowd 0.9.9. >> >> Tested on amd64 and i386. > > Here's a diff against current (and avoid groff). I think it could > do with a readme though; using the rc script requires more than just > adding to pkg_scripts, users need to set, as a minimum, > softflowd_flags="-i <interface>".
Hi Stuart, thanks for the correction. This is actually my first port and I'm very happy to have someone point me in the right direction so I can do better next time. :-) Here's an updated diff with a readme file. Regards André Index: Makefile =================================================================== RCS file: /cvs/ports/net/softflowd/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile 11 Mar 2013 11:35:56 -0000 1.6 +++ Makefile 16 Jun 2013 12:45:48 -0000 @@ -1,21 +1,21 @@ -# $OpenBSD: Makefile,v 1.6 2013/03/11 11:35:56 espie Exp $ +# $OpenBSD$ COMMENT= flow-based network traffic analyser -DISTNAME= softflowd-0.9.8 -REVISION= 0 +DISTNAME= softflowd-0.9.9 CATEGORIES= net +HOMEPAGE= http://code.google.com/p/softflowd/ + # BSD PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES= http://www2.mindrot.org/files/softflowd/ +MASTER_SITES= http://softflowd.googlecode.com/files/ WANTLIB= c pcap CONFIGURE_STYLE= gnu -USE_GROFF = Yes -NO_TEST= Yes +NO_TEST= Yes .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/softflowd/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 5 Apr 2007 16:20:16 -0000 1.3 +++ distinfo 16 Jun 2013 12:45:48 -0000 @@ -1,5 +1,2 @@ -MD5 (softflowd-0.9.8.tar.gz) = AFTRyASUOWzBXtsKHHdIsQ== -RMD160 (softflowd-0.9.8.tar.gz) = XvRpxWG+8FXHQX57UeFZfz7h+wg= -SHA1 (softflowd-0.9.8.tar.gz) = bqGM/p09OGV0n1n5tGalb8f7hss= -SHA256 (softflowd-0.9.8.tar.gz) = UpyFSoJ0KAkigTzPCrl89JLJFfG+F89rdqgr0avquMM= -SIZE (softflowd-0.9.8.tar.gz) = 89839 +SHA256 (softflowd-0.9.9.tar.gz) = IxPyxQ6ps/LbNSTjjsfNcfmm6IWsLjtVqwN7zPgXNhI= +SIZE (softflowd-0.9.9.tar.gz) = 91939 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/softflowd/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 3 Apr 2005 02:22:31 -0000 1.1.1.1 +++ pkg/PLIST 16 Jun 2013 12:45:48 -0000 @@ -1,5 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2005/04/03 02:22:31 msf Exp $ +@comment $OpenBSD$ @man man/man8/softflowctl.8 @man man/man8/softflowd.8 -sbin/softflowctl -sbin/softflowd +@bin sbin/softflowctl +@bin sbin/softflowd +share/doc/pkg-readmes/${FULLPKGNAME} +@rcscript ${RCDIR}/softflowd Index: pkg/README =================================================================== RCS file: pkg/README diff -N pkg/README --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/README 16 Jun 2013 12:45:48 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ + ++----------------------------------------------------------------------- +| Running ${FULLPKGNAME} on OpenBSD ++----------------------------------------------------------------------- + +Before starting softflowd(8), "softflowd_flags" needs to be modified in +rc.conf.local(8) to listen on a network interface as a minimum. + +For example: + + softflowd_flags="-i em0" + This would cause softflowd(8) to listen on interface + em0 and to run in statistics gathering mode only (i.e. + no NetFlow data export). + + softflowd_flags="-i fxp0 -n 10.1.0.2:4432" + This would cause softflowd(8) to listen on interface + fxp0 and to export NetFlow v.5 datagrams on flow expiry + to a flow collector running on 10.1.0.2 port 4432. + +In both statistics-only and export mode, the running daemon can be +controlled (i.e. pause data collection, expire or delete flows, etc.) +and queried for statistics using the softflowctl(8) control program. Index: pkg/softflowd.rc =================================================================== RCS file: pkg/softflowd.rc diff -N pkg/softflowd.rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/softflowd.rc 16 Jun 2013 12:45:48 -0000 @@ -0,0 +1,11 @@ +#!/bin/sh +# +# $OpenBSD$ + +daemon="${TRUEPREFIX}/sbin/softflowd" + +. /etc/rc.d/rc.subr + +rc_reload=NO + +rc_cmd $1
