diff options
Diffstat (limited to 'net-analyzer/bwm-ng')
| -rw-r--r-- | net-analyzer/bwm-ng/Manifest | 7 | ||||
| -rw-r--r-- | net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild | 38 | ||||
| -rw-r--r-- | net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch | 93 | ||||
| -rw-r--r-- | net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch | 256 | ||||
| -rw-r--r-- | net-analyzer/bwm-ng/metadata.xml | 12 |
5 files changed, 406 insertions, 0 deletions
diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest new file mode 100644 index 000000000000..964f84923c5d --- /dev/null +++ b/net-analyzer/bwm-ng/Manifest @@ -0,0 +1,7 @@ +AUX bwm-ng-0.6.1-fix-buildsystem.patch 3173 SHA256 c323c548c8f85cec507876576446d24634cefbf92984cb672f409eb72e7e846c SHA512 5d58ef94633a65629485a6742b70e8eb819435957604c7877bcdeb1a842f6ad0a6cd99cf1d90572c9254ea6d9aaf431a4328cfab32809fa2654194486084520e WHIRLPOOL 0429e0b12bcab42f9ddb520869c8c31384c5c7ae9eae1950abe34292c04ae756f8c95416e041b3d3cffa2249dd0efd1f7045567436cb47105b2ff84494f0b05a +AUX bwm-ng-0.6.1-static-inline.patch 9852 SHA256 d856f68070189ed95beb62b13b1880f4243b9693641e322b0826ec1dfea8572d SHA512 75c7f52121c8f05737f59c96c99c8e9f4fd72209007ea2b9884ac2aeaa151431475d70f312b41100993d6bd4f16e430b2a79628b37c249344be8ab4ed5f2d2ba WHIRLPOOL 9f3f09d64bc74263b8013739b7f47b5cf782c51938293c694dcfa908398f66a3879c9cd2a6e3192718fddb4ef6a3863ba6bdd897f6f616961f036c86e4e8bc47 +DIST bwm-ng-0.6.1.tar.gz 162620 SHA256 027cf3c960cd96fc9ffacdf7713df62d0fc55eeef4a1388289f8a62ae5e50df0 SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd WHIRLPOOL a83569acf0f4f24f98e5b65733e0a02de2db4a4249ece24eaf457b20a4eed4a6f425256a13477e8d3844c251b4818fc8b1e34243a975cce7e20ec27b3af8e413 +EBUILD bwm-ng-0.6.1-r1.ebuild 741 SHA256 701b5a4d6ff84fde27c8a980e935a25bfc5255d9c1f5e8ded6a1e3ab5819d7bf SHA512 8d816d7b53c86f03170db7753cbd5ecaddf7bf1c2e794aaad963116fb7caac698fdc5acc5e5077b61d2f7c54316e15c08ed20d650366d18c9af461f94f3da19f WHIRLPOOL 642bf6293f55904d57d1eabf97678401f7e5786339cfa0c245fe4f4c82a3bd9602e287280773c480d4f9e9f9161a5003a106ac8519fd8469484df83c8130f661 +MISC ChangeLog 3604 SHA256 ab3cde0415ff32036709cc7ce800adc29868123ed07dcf8c7b2a01899d6c882c SHA512 72faaf09823eeab9e51bd83afa128e62e51b474cff9268891596fbbdf58efe85bb2cb98f7481f4b77e133fb60b99a27e1f5a315a3d3c0194f5d679ee93f0656b WHIRLPOOL 7ab816d74aad67fa5963718569e7c96873b977f499c4c58468ce274347c3726e529d413980c7ef158a2b5658b0351fc3949f43cc36661b150d3c1eeb31989147 +MISC ChangeLog-2015 2565 SHA256 3d3775d0f399591c5cdf96d781ea2f3ef020d31393b5e28c899bf2fc9d1ab287 SHA512 66ad9eb68d42592729cfa4aca5d2830f3afad31254bd35f2431772c886e0588f99e34b5c31ee5dd74fd13a4237516e3e794f019766452ea986634fc0c6dfe558 WHIRLPOOL 0cc035765f395806440588e1265ec94bc92819c2fd02c275972f039fa9c8d880d697864c2d6bbd524d5fdf38530529b99213d22c696b37f87f6d4d374740fac6 +MISC metadata.xml 373 SHA256 99ea959581c77c3dee72499e6d3505e28de5704d16edd086c658a0c54301fde9 SHA512 cab403ed79bc8eedcbff2160e8cc0af1c9ef4e8a4311a81b51e201537b22344d1d2ee8f18d96b9fcb23118ba60443f87461c1b471aae42119ae99eeb6d440bc0 WHIRLPOOL 30f46aebb73010f0bf3109a9b2e190c6843da872fcd0b56d3529cea56d9dc477288259a60c10745252da16f3b2850ddd82c41bc6bd2a9cbf64cc56ed83e78826 diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild new file mode 100644 index 000000000000..51311ad80550 --- /dev/null +++ b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor" +SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz" +HOMEPAGE="http://www.gropp.org/" + +KEYWORDS="amd64 ~arm ppc x86" +LICENSE="GPL-2" +SLOT="0" +IUSE="csv html" + +RDEPEND="sys-libs/ncurses:0= + >=sys-apps/net-tools-1.60-r1" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-fix-buildsystem.patch + "${FILESDIR}"/${P}-static-inline.patch +) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + econf \ + $(use_enable csv) \ + $(use_enable html) \ + --enable-ncurses \ + --with-procnetdev +} diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch new file mode 100644 index 000000000000..04c14392d66a --- /dev/null +++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch @@ -0,0 +1,93 @@ +* Fix broken buildsystem +* Fix ncurses underlinking caused by missing "-ltinfo" in $LIBS +https://bugs.gentoo.org/show_bug.cgi?id=561718 + +--- a/configure.in ++++ b/configure.in +@@ -3,7 +3,7 @@ + + AC_INIT([bwm-ng],[0.6.1],[bwmng@gropp.org],[bwm-ng]) + AC_CONFIG_SRCDIR(src/bwm-ng.c) +-AM_INIT_AUTOMAKE([gnu]) ++AM_INIT_AUTOMAKE([gnu subdir-objects]) + AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR(./) + AC_LANG([C]) +@@ -28,44 +28,12 @@ + AC_CHECK_TYPES(unsigned long long) + + # Checks for libraries. +-CURSES_CHECKED="0" ++AC_ARG_ENABLE([ncurses], ++ AS_HELP_STRING([--enable-ncurses], [Enable feature ncurses])) + +-AC_ARG_WITH([curses],AS_HELP_STRING([--with-curses],[with curses (ARG=PATH)]),[ +-if [ test $withval != "no" ]; then +- OLD_CPPFLAGS=$CPPFLAGS +- if [ test $withval != "yes" ]; then +- CPPFLAGS="$CPPFLAGS -I$withval" +- fi +- AC_CHECK_LIB([curses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ]) +- CURSES_CHECKED="1" +-else +- CURSES_CHECKED="1" +-fi +-]) +- +- +-if [ test $CURSES_CHECKED != "1" ]; then +-AC_ARG_WITH([ncurses],AS_HELP_STRING([--with-ncurses],[prefer ncurses over curses (ARG=PATH)]),[ +-if [ test $withval != "no" ]; then +- OLD_CPPFLAGS=$CPPFLAGS +- if [ test $withval != "yes" ]; then +- CPPFLAGS="$CPPFLAGS -I$withval" +- fi +- AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ]) +- CURSES_CHECKED="1" +-else +- CURSES_CHECKED="1" +-fi ++AS_IF([test "x$enable_ncurses" != "xno"], [ ++ PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], [1], [Define to 1 if you have the `ncurses' library (-lncurses).])]) + ]) +-fi +- +- +- +-if [ test $CURSES_CHECKED != "1" ]; then +-AC_CHECK_LIB([curses],[initscr,timeout],,[ +- AC_CHECK_LIB([ncurses],[newterm,timeout]) +-]) +-fi + + AC_CHECK_FUNCS([wattron]) + AC_CHECK_FUNCS([curs_set]) +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,12 +2,10 @@ + + bin_PROGRAMS = bwm-ng + +-bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c ++bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c + +-EXTRA_bwm_ng_SOURCES = input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c +- +-bwm_ng_LDADD = retrieve.$(OBJEXT) $(INPUT_SYSTEM) +-bwm_ng_DEPENDENCIES = retrieve.$(OBJEXT) $(INPUT_SYSTEM) ++bwm_ng_CPPFLAGS = @NCURSES_CFLAGS@ ++bwm_ng_LDADD = @NCURSES_LIBS@ + + noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h + +--- a/src/defines.h ++++ b/src/defines.h +@@ -48,7 +48,7 @@ + #define LIBSTATGRAB + #endif + +-#if HAVE_LIBCURSES || HAVE_LIBNCURSES ++#if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES) + #define HAVE_CURSES + #endif + diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch new file mode 100644 index 000000000000..88e15ecefe3f --- /dev/null +++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch @@ -0,0 +1,256 @@ +Make all 'inline' functions 'static inline' such that +the compiler can emit definitions when needed. +http://www.greenend.org.uk/rjk/tech/inline.html + +--- a/src/bwm-ng.c ++++ b/src/bwm-ng.c +@@ -26,7 +26,7 @@ + + /* handle interrupt signal */ + void sigint(int sig) FUNCATTR_NORETURN; +-inline void init(void); ++static inline void init(void); + + /* clear stuff and exit */ + #ifdef __STDC__ +@@ -98,7 +98,7 @@ + deinit(0, NULL); + } + +-inline void init(void) { ++static inline void init(void) { + if_count=0; + delay=500; + #if EXTENDED_STATS +--- a/src/help.c ++++ b/src/help.c +@@ -24,9 +24,9 @@ + #include "global_vars.h" + #include "help.h" + +-inline void print_help_line(const char *short_c,const char * long_c,const char *descr); ++static inline void print_help_line(const char *short_c,const char * long_c,const char *descr); + +-inline void print_help_line(const char *short_c,const char * long_c,const char *descr) { ++static inline void print_help_line(const char *short_c,const char * long_c,const char *descr) { + #ifdef LONG_OPTIONS + printf(" %-23s",long_c); + #else +--- a/src/options.c ++++ b/src/options.c +@@ -30,12 +30,12 @@ + char *trim_whitespace(char *str); + int read_config(const char *config_file); + #endif +-inline int str2output_unit(char *optarg); ++static inline int str2output_unit(char *optarg); + #if EXTENDED_STATS +-inline int str2output_type(char *optarg); ++static inline int str2output_type(char *optarg); + #endif +-inline int str2out_method(char *optarg); +-inline int str2in_method(char *optarg); ++static inline int str2out_method(char *optarg); ++static inline int str2in_method(char *optarg); + + #ifdef CONFIG_FILE + /****************************************************************************** +@@ -65,7 +65,7 @@ + /******************************************************************************/ + #endif + +-inline int str2output_unit(char *optarg) { ++static inline int str2output_unit(char *optarg) { + if (optarg) { + if (!strcasecmp(optarg,"bytes")) return BYTES_OUT; + if (!strcasecmp(optarg,"bits")) return BITS_OUT; +@@ -76,7 +76,7 @@ + } + + #if EXTENDED_STATS +-inline int str2output_type(char *optarg) { ++static inline int str2output_type(char *optarg) { + if (optarg) { + if (!strcasecmp(optarg,"rate")) return RATE_OUT; + if (!strcasecmp(optarg,"max")) return MAX_OUT; +@@ -87,7 +87,7 @@ + } + #endif + +-inline int str2out_method(char *optarg) { ++static inline int str2out_method(char *optarg) { + if (optarg) { + if (!strcasecmp(optarg,"plain")) return PLAIN_OUT; + #ifdef HAVE_CURSES +@@ -109,7 +109,7 @@ + } + + +-inline int str2in_method(char *optarg) { ++static inline int str2in_method(char *optarg) { + if (optarg) { + #ifdef PROC_NET_DEV + if (!strcasecmp(optarg,"proc")) return PROC_IN; +--- a/src/output.c ++++ b/src/output.c +@@ -25,13 +25,13 @@ + #include "output.h" + + inline static const char *output_type2str(void); +-inline const char *input2str(void); +-inline const char *show_all_if2str(void); +-inline ullong direction2value(char mode,struct inout_long stats); ++static inline const char *input2str(void); ++static inline const char *show_all_if2str(void); ++static inline ullong direction2value(char mode,struct inout_long stats); + #if EXTENDED_STATS +-inline double direction_max2value(char mode,struct inouttotal_double stats,int items); ++static inline double direction_max2value(char mode,struct inouttotal_double stats,int items); + #endif +-inline char *dyn_byte_value2str(double value,char *str,int buf_size); ++static inline char *dyn_byte_value2str(double value,char *str,int buf_size); + char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size); + + inline static const char *output_type2str(void) { +@@ -59,7 +59,7 @@ + } + + +-inline const char *input2str(void) { ++static inline const char *input2str(void) { + switch (input_method) { + #ifdef SYSCTL + case SYSCTL_IN: +@@ -121,7 +121,7 @@ + return ""; + } + +-inline const char *show_all_if2str(void) { ++static inline const char *show_all_if2str(void) { + switch (show_all_if) { + case 1: + return " (all)"; +@@ -262,7 +262,7 @@ + } + + +-inline ullong direction2value(char mode,struct inout_long stats) { ++static inline ullong direction2value(char mode,struct inout_long stats) { + switch (mode) { + case 0: + return stats.in; +@@ -275,7 +275,7 @@ + } + + #if EXTENDED_STATS +-inline double direction_max2value(char mode,struct inouttotal_double stats,int items) { ++static inline double direction_max2value(char mode,struct inouttotal_double stats,int items) { + switch (mode) { + case 0: + return (double)(stats.in/items); +@@ -288,7 +288,7 @@ + } + #endif + +-inline char *dyn_byte_value2str(double value,char *str,int buf_size) { ++static inline char *dyn_byte_value2str(double value,char *str,int buf_size) { + if (dynamic) { + if (value<1024) + snprintf(str,buf_size,"%15.2f ",value); +@@ -306,7 +306,7 @@ + return str; + } + +-inline char *dyn_bit_value2str(double value,char *str,int buf_size) { ++static inline char *dyn_bit_value2str(double value,char *str,int buf_size) { + if (dynamic) { + if (value<1000) + snprintf(str,buf_size,"%15.2f ",value); +--- a/src/process.c ++++ b/src/process.c +@@ -26,19 +26,19 @@ + + short show_iface(char *instr, char *searchstr,char iface_is_up); + #if HAVE_GETTIMEOFDAY +-inline long tvdiff(struct timeval newer, struct timeval older); ++static inline long tvdiff(struct timeval newer, struct timeval older); + float get_time_delay(int iface_num); + #endif +-inline ullong calc_new_values(ullong new, ullong old); ++static inline ullong calc_new_values(ullong new, ullong old); + t_iface_speed_stats convert2calced_values(t_iface_speed_stats new, t_iface_speed_stats old); + t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_speed_stats old); + #if EXTENDED_STATS +-inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data); +-inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data); +-inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier); ++static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data); ++static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data); ++static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier); + void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float multiplier); +-inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values); +-inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier); ++static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values); ++static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier); + #endif + + /* returns the whether to show the iface or not +@@ -74,7 +74,7 @@ + + #if HAVE_GETTIMEOFDAY + /* Returns: the time difference in milliseconds. */ +-inline long tvdiff(struct timeval newer, struct timeval older) { ++static inline long tvdiff(struct timeval newer, struct timeval older) { + return labs((newer.tv_sec-older.tv_sec)*1000+ + (newer.tv_usec-older.tv_usec)/1000); + } +@@ -92,7 +92,7 @@ + #endif + + /* basically new-old, but handles "overflow" of source aswell */ +-inline ullong calc_new_values(ullong new, ullong old) { ++static inline ullong calc_new_values(ullong new, ullong old) { + /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */ + return (new>=old) ? (ullong)(new-old) : (ullong)(( + #ifdef HAVE_LIBKSTAT +@@ -133,13 +133,13 @@ + + #if EXTENDED_STATS + /* sub old values from cached for avg stats */ +-inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { ++static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { + values->in-=data.in; + values->out-=data.out; + values->total-=data.total; + } + +-inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { ++static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { + values->in+=data.in; + values->out+=data.out; + values->total+=data.total; +@@ -148,7 +148,7 @@ + + /* put new-old bytes in inout_long struct into a inouttotal_double struct + * and add values to cached .value struct */ +-inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) { ++static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) { + data->in=calced_stats.in*multiplier; + data->out=calced_stats.out*multiplier; + data->total=(calced_stats.in+calced_stats.out)*multiplier; +@@ -198,13 +198,13 @@ + } + + /* add current in and out bytes to totals struct */ +-inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) { ++static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) { + stats->in+=new_stats_values.in; + stats->out+=new_stats_values.out; + } + + /* lookup old max values and save new if higher */ +-inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) { ++static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) { + if (multiplier*calced_stats.in > stats->in) + stats->in=multiplier*calced_stats.in; + if (multiplier*calced_stats.out>stats->out) diff --git a/net-analyzer/bwm-ng/metadata.xml b/net-analyzer/bwm-ng/metadata.xml new file mode 100644 index 000000000000..7d30b17df0f1 --- /dev/null +++ b/net-analyzer/bwm-ng/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> +<email>netmon@gentoo.org</email> +<name>Gentoo network monitoring and analysis project</name> +</maintainer> +<use> +<flag name="csv">Enable csv output</flag> +<flag name="html">Enable html output</flag> +</use> +</pkgmetadata> |