+++ /dev/null
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bandwidthd
-PKG_VERSION:=2.0.1
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=@SF/bandwidthd
-PKG_MD5SUM:=aa79aad7bd489fd2cae1f7dc086ca8b6
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bandwidthd
- SECTION:=utils
- CATEGORY:=Utilities
- TITLE:=Bandwidthd
- URL:=http://bandwidthd.sourceforge.net/
- DEPENDS:=+libgd +libpcap
-endef
-
-define Package/bandwidthd/daemon
- This package contains bandwidthd a bandwith tracking utility.
-endef
-
-CONFIGURE_ARGS += \
- ac_cv_file__sw_lib=no \
- ac_cv_file__sw_include=no \
- ac_cv_file__usr_pkg_lib=no \
- ac_cv_file__usr_pkg_include=no \
- ac_cv_file__usr_local_pgsql_lib=no \
- ac_cv_file__usr_local_pgsql_include=no \
- ac_cv_lib_pq_PQconnectdb=no \
-
-EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
-EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
-
-define Package/bandwidthd/install
- $(INSTALL_DIR) $(1)/usr/sbin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/bandwidthd $(1)/usr/sbin/
- $(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_DATA) ./files/bandwidthd.config $(1)/etc/config/bandwidthd
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/bandwidthd.init $(1)/etc/init.d/bandwidthd
- $(INSTALL_DIR) $(1)/www
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/legend.gif $(1)/www/
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/logo.gif $(1)/www/
-endef
-
-define Package/bandwidthd/conffiles
-/etc/config/bandwidthd
-endef
-
-$(eval $(call BuildPackage,bandwidthd))
+++ /dev/null
-config bandwidthd
- option dev br-lan
- option subnets "192.168.0.0/16 10.0.0.0/8 172.16.0.0/12"
- option skip_intervals 0
- option graph_cutoff 1024
- option promiscuous true
- option output_cdf false
- option recover_cdf false
- option filter ip
- option graph true
- option meta_refresh 150
+++ /dev/null
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2011 OpenWrt.org
-
-START=99
-
-config_cb() {
- local cfg_type="$1"
- local cfg_name="$2"
-
- case "$cfg_type" in
- bandwidthd)
- append cfgs "$cfg_name"
- ;;
- esac
-}
-
-export_bool() {
- local option="$1"
- local section="$2"
- local _loctmp
- config_get_bool _loctmp "$section" "$option"
- if [ -n "$_loctmp" ]; then
- conffile="${conffile}$option "
- if [ 1 -eq "$_loctmp" ]; then
- conffile="${conffile}true"
- else
- conffile="${conffile}false"
- fi
- conffile="${conffile}\n"
- fi
-}
-
-export_number() {
- local option="$1"
- local section="$2"
- local _loctmp
- config_get _loctmp "$section" "$option"
- if [ -n "$_loctmp" ]; then
- conffile="${conffile}$option ${_loctmp}\n"
- fi
-}
-
-export_string() {
- local option="$1"
- local section="$2"
- local _loctmp
- config_get _loctmp "$section" "$option"
- if [ -n "$_loctmp" ]; then
- conffile="${conffile}$option \"${_loctmp}\"\n"
- fi
-}
-
-start() {
- local subnet conffile
-
- [ -d /tmp/bandwidthd ] || mkdir -p /tmp/bandwidthd && cp /www/legend.gif /www/logo.gif /tmp/bandwidthd/
- [ -e /htdocs ] || ln -s /tmp/bandwidthd /htdocs
- [ -e /www/bandwidthd ] || ln -s /tmp/bandwidthd /www/bandwidthd
- rm -f /tmp/bandwidthd.conf
- touch /tmp/bandwidthd.conf
- [ -e /etc/bandwidthd.conf ] || ln -s /tmp/bandwidthd.conf /etc/bandwidthd.conf
-
-
- config_load bandwidthd
- for cfg in $cfgs; do
- config_get subnets $cfg subnets
- for subnet in $subnets; do
- conffile="${conffile}subnet ${subnet}\n"
- done
- export_string dev $cfg
- export_number skip_intervals $cfg
- export_number graph_cutoff $cfg
- export_bool promiscuous $cfg
- export_bool output_cdf $cfg
- export_bool recover_cdf $cfg
- export_string filter $cfg
- export_bool graph $cfg
- export_number meta_refresh $cfg
- [ -n "$conffile" ] && echo -e "$conffile" >>/tmp/bandwidthd.conf
- unset conffile
- done
- cd /
- service_start /usr/sbin/bandwidthd
-}
-
-stop() {
- service_stop /usr/sbin/bandwidthd
-}
+++ /dev/null
-diff --git a/configure b/configure
-index 4c2546e..e516137 100755
---- a/configure
-+++ b/configure
-@@ -2439,11 +2439,6 @@ if test -n "$x_libraries" && test "x$x_libraries" != xNONE ; then
- LDFLAGS="$LDFLAGS -L$x_libraries"
- fi
-
--# May be equired for BSD
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
--
--CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--
- #Check for Darwin sw directory
- echo "$as_me:2448: checking for /sw/lib" >&5
- echo $ECHO_N "checking for /sw/lib... $ECHO_C" >&6
-@@ -2505,9 +2500,6 @@ fi
- fi
- echo "$as_me:2506: result: $ac_cv_file__usr_pkg_lib" >&5
- echo "${ECHO_T}$ac_cv_file__usr_pkg_lib" >&6
--if test $ac_cv_file__usr_pkg_lib = yes; then
-- LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
--fi
-
- echo "$as_me:2512: checking for /usr/pkg/include" >&5
- echo $ECHO_N "checking for /usr/pkg/include... $ECHO_C" >&6
-@@ -3092,9 +3084,6 @@ fi
- fi
- echo "$as_me:3093: result: $ac_cv_file__usr_local_pgsql_lib" >&5
- echo "${ECHO_T}$ac_cv_file__usr_local_pgsql_lib" >&6
--if test $ac_cv_file__usr_local_pgsql_lib = yes; then
-- LDFLAGS="$LDFLAGS -L/usr/local/pgsql/lib"
--fi
-
- echo "$as_me:3099: checking for /usr/local/pgsql/include" >&5
- echo $ECHO_N "checking for /usr/local/pgsql/include... $ECHO_C" >&6
+++ /dev/null
---- bandwidthd-2.0.1/bandwidthd.c.orig 2008-05-09 10:06:37.000000000 -0500
-+++ bandwidthd-2.0.1/bandwidthd.c 2008-05-09 10:32:54.000000000 -0500
-@@ -255,22 +255,22 @@
-
- openlog("bandwidthd", LOG_CONS, LOG_DAEMON);
-
-- if (stat("./etc/bandwidthd.conf", &StatBuf))
-+ if (stat("/etc/bandwidthd.conf", &StatBuf))
- {
- chdir(INSTALL_DIR);
-- if (stat("./etc/bandwidthd.conf", &StatBuf))
-+ if (stat("/etc/bandwidthd.conf", &StatBuf))
- {
-- printf("Cannot find ./etc/bandwidthd.conf or %s/etc/bandwidthd.conf\n", INSTALL_DIR);
-- syslog(LOG_ERR, "Cannot find ./etc/bandwidthd.conf or %s/etc/bandwidthd.conf", INSTALL_DIR);
-+ printf("Cannot find /etc/bandwidthd.conf or %s/etc/bandwidthd.conf\n", INSTALL_DIR);
-+ syslog(LOG_ERR, "Cannot find /etc/bandwidthd.conf or %s/etc/bandwidthd.conf", INSTALL_DIR);
- exit(1);
- }
- }
-
-- bdconfig_in = fopen("./etc/bandwidthd.conf", "rt");
-+ bdconfig_in = fopen("/etc/bandwidthd.conf", "rt");
- if (!bdconfig_in)
- {
- syslog(LOG_ERR, "Cannot open bandwidthd.conf");
-- printf("Cannot open ./etc/bandwidthd.conf\n");
-+ printf("Cannot open /etc/bandwidthd.conf\n");
- exit(1);
- }
- bdconfig_parse();
projects / packages.git / commitdiff
