diff options
author | bsiegert <bsiegert@pkgsrc.org> | 2015-11-03 17:46:57 +0000 |
---|---|---|
committer | bsiegert <bsiegert@pkgsrc.org> | 2015-11-03 17:46:57 +0000 |
commit | 2ba96fef78fbd118248b503065b03a8ee57a56db (patch) | |
tree | d7a39be7eedc847b058a0a128d9f7ec2a62b2241 /net | |
parent | efbbc4a66a476843dfa3565ceecf64455157041c (diff) | |
download | pkgsrc-2ba96fef78fbd118248b503065b03a8ee57a56db.tar.gz |
Major bmon update to 3.8.
The changelog only goes as far back as 3.1. Major changes are:
- Mac OS X port
- Provide minimal interface information on BSD
- Fixes for all defects identified by coverity
- Fix accuracy issue on total rate calculation
- Better example config file
- Only initialize curses module if actually used
- Bugfixes
Also saner build system and new source code location (github).
Diffstat (limited to 'net')
-rw-r--r-- | net/bmon/Makefile | 30 | ||||
-rw-r--r-- | net/bmon/PLIST | 4 | ||||
-rw-r--r-- | net/bmon/distinfo | 13 | ||||
-rw-r--r-- | net/bmon/patches/patch-aa | 38 | ||||
-rw-r--r-- | net/bmon/patches/patch-examples_Makefile.in | 15 | ||||
-rw-r--r-- | net/bmon/patches/patch-man-bmon.1 | 20 | ||||
-rw-r--r-- | net/bmon/patches/patch-src_in_sysctl.c | 28 |
7 files changed, 34 insertions, 114 deletions
diff --git a/net/bmon/Makefile b/net/bmon/Makefile index 72e677cb3cb..3ef123f441d 100644 --- a/net/bmon/Makefile +++ b/net/bmon/Makefile @@ -1,31 +1,23 @@ -# $NetBSD: Makefile,v 1.16 2015/09/08 11:57:50 jperkin Exp $ +# $NetBSD: Makefile,v 1.17 2015/11/03 17:46:57 bsiegert Exp $ # -DISTNAME= bmon-2.0.1 -PKGREVISION= 5 +DISTNAME= bmon-3.8 CATEGORIES= net -MASTER_SITES= http://people.suug.ch/~tgr/bmon/files/ +MASTER_SITES= https://github.com/tgraf/ +LICENSE= mit AND 2-clause-bsd +GITHUB_RELEASE= v3.8 MAINTAINER= hsaliak@gmail.com -HOMEPAGE= http://people.suug.ch/~tgr/bmon/ -COMMENT= Bmon is an interface bandwidth monitor +HOMEPAGE= https://github.com/tgraf/bmon +COMMENT= Interface bandwidth monitor GNU_CONFIGURE= yes -MAKE_FILE= GNUmakefile -USE_TOOLS+= gmake +USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -EGDIR= ${PREFIX}/share/examples/bmon -CONF_FILES= ${EGDIR}/bmon.conf ${PKG_SYSCONFDIR}/bmon.conf - -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/bmon - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/bmon ${DESTDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/bmon.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA} ${WRKSRC}/etc/bmon.conf \ - ${DESTDIR}${PREFIX}/share/examples/bmon/bmon.conf - +.include "../../devel/confuse/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/fetch/github.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/bmon/PLIST b/net/bmon/PLIST index ff03e18c06b..739f42427e5 100644 --- a/net/bmon/PLIST +++ b/net/bmon/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:09:23 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2015/11/03 17:46:57 bsiegert Exp $ bin/bmon -man/man1/bmon.1 +man/man8/bmon.8 share/examples/bmon/bmon.conf diff --git a/net/bmon/distinfo b/net/bmon/distinfo index 8eb06d841a0..17e49d211d7 100644 --- a/net/bmon/distinfo +++ b/net/bmon/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.4 2013/08/09 18:15:18 riastradh Exp $ +$NetBSD: distinfo,v 1.5 2015/11/03 17:46:57 bsiegert Exp $ -SHA1 (bmon-2.0.1.tar.gz) = ef6297bbd7a5f9a351e14b2b3e9f45157b136a9c -RMD160 (bmon-2.0.1.tar.gz) = fa4f98fbf0810ae67af4aaa236f1eccdfef054b5 -Size (bmon-2.0.1.tar.gz) = 110024 bytes -SHA1 (patch-aa) = 1b737dc493506f374ed8e5732f922225f2c4d8c1 -SHA1 (patch-man-bmon.1) = c403b723618ebb47faf363a8d56d4257cefddcd1 -SHA1 (patch-src_in_sysctl.c) = 39d1f11dd97efcdf408b97b554ab897ba0bdaa65 +SHA1 (bmon-3.8.tar.gz) = f10ddfebf4b6c2fcdeea9ccd3027dd5291cd6838 +RMD160 (bmon-3.8.tar.gz) = eba503ff9d5bedc3901ab546193effcef8fbb298 +SHA512 (bmon-3.8.tar.gz) = 629a8678bf76e2dab125a08b334925f953e3ddd5ee0b2b865f157013a5462a5fa8e1bc76920487a03f5afdf12143c4a2cc1c6ab51d514119ca9754cc67117d84 +Size (bmon-3.8.tar.gz) = 195437 bytes +SHA1 (patch-examples_Makefile.in) = f7dab570d8b141226f70774aed3a5f119793229f diff --git a/net/bmon/patches/patch-aa b/net/bmon/patches/patch-aa deleted file mode 100644 index 3cdf3859a6c..00000000000 --- a/net/bmon/patches/patch-aa +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/11/07 18:49:13 minskim Exp $ - ---- configure.orig 2004-11-03 15:45:34.000000000 +0800 -+++ configure -@@ -4359,13 +4359,13 @@ fi - fi - - --echo "$as_me:$LINENO: checking for redrawwin in -lncurses" >&5 --echo $ECHO_N "checking for redrawwin in -lncurses... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for redrawwin in ${LIBCURSES}" >&5 -+echo $ECHO_N "checking for redrawwin in ${LIBCURSES}... $ECHO_C" >&6 - if test "${ac_cv_lib_ncurses_redrawwin+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lncurses $LIBS" -+LIBS="$LIBCURSES $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4432,13 +4432,13 @@ _ACEOF - - fi - --echo "$as_me:$LINENO: checking for use_default_colors in -lncurses" >&5 --echo $ECHO_N "checking for use_default_colors in -lncurses... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for use_default_colors in ${LIBCURSES}" >&5 -+echo $ECHO_N "checking for use_default_colors in ${LIBCURSES}... $ECHO_C" >&6 - if test "${ac_cv_lib_ncurses_use_default_colors+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lncurses $LIBS" -+LIBS="$LIBCURSES $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF diff --git a/net/bmon/patches/patch-examples_Makefile.in b/net/bmon/patches/patch-examples_Makefile.in new file mode 100644 index 00000000000..fc89217b931 --- /dev/null +++ b/net/bmon/patches/patch-examples_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-examples_Makefile.in,v 1.1 2015/11/03 17:46:57 bsiegert Exp $ + +Correct installation directory for the example config file. + +--- examples/Makefile.in.orig 2015-11-03 17:31:21.000000000 +0000 ++++ examples/Makefile.in +@@ -267,7 +267,7 @@ target_vendor = @target_vendor@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-exampledir = $(datarootdir)/doc/@PACKAGE@/examples ++exampledir = $(datarootdir)/examples/@PACKAGE@ + example_DATA = bmon.conf + EXTRA_DIST = $(example_DATA) + all: all-am diff --git a/net/bmon/patches/patch-man-bmon.1 b/net/bmon/patches/patch-man-bmon.1 deleted file mode 100644 index 557a5db3495..00000000000 --- a/net/bmon/patches/patch-man-bmon.1 +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-man-bmon.1,v 1.1 2012/01/23 20:52:18 joerg Exp $ - ---- man/bmon.1.orig 2012-01-23 19:37:53.000000000 +0000 -+++ man/bmon.1 -@@ -122,7 +122,6 @@ of secondary input modules is not limite - Every input module has a description, help text and list of - options available which can be seen by adding the option - "help" to the module options: --.TP - .RS - .NF - bmon -i netlink:help -@@ -206,7 +205,6 @@ of secondary output modules is not limit - Every output module has a description, help text and list of - options available which can be seen by adding the option - "help" to the module options: --.TP - .RS - .NF - bmon -o ascii:help diff --git a/net/bmon/patches/patch-src_in_sysctl.c b/net/bmon/patches/patch-src_in_sysctl.c deleted file mode 100644 index 819a3ee2b47..00000000000 --- a/net/bmon/patches/patch-src_in_sysctl.c +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-src_in_sysctl.c,v 1.1 2013/08/09 18:15:18 riastradh Exp $ - -Null-terminate interface names, in case the first octet of the -link-layer address is not zero (as many MAC addresses used to have). - ---- src/in_sysctl.c.orig 2004-10-31 14:33:19.000000000 +0000 -+++ src/in_sysctl.c -@@ -67,6 +67,7 @@ sysctl_read(void) - for (next = buf; next < lim; ) { - struct if_msghdr *ifm, *nextifm; - struct sockaddr_dl *sdl; -+ char *name; - intf_t *i; - - ifm = (struct if_msghdr *) next; -@@ -93,7 +94,11 @@ sysctl_read(void) - if (c_debug) - fprintf(stderr, "Processing %s\n", sdl->sdl_data); - -- i = lookup_intf(get_local_node(), sdl->sdl_data, 0, 0); -+ name = xcalloc(1, sdl->sdl_nlen + 1); -+ (void)memcpy(name, sdl->sdl_data, sdl->sdl_nlen); -+ name[sdl->sdl_nlen] = 0; -+ i = lookup_intf(get_local_node(), name, 0, 0); -+ xfree(name); - - if (NULL == i) - continue; |