From dc690b55fe7b55b767af8461c4735ea4a3a60c3b Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 22 Apr 2014 11:18:00 -0700 Subject: bandwidthd for 2.2 on nanoBSD I installed bandwidthd on a 2.2 nanoBSD Alix2D13. The new path to the executable has an extra "/local" in it, and it needs an LD_LIBRARY_PATH to know where to find some of its libraries. With this, it installs, runs and comes up again after a reboot. These changes should all be backward-compatible and make no difference to what happens when installed on older 1.2 2.0 and 2.1 series systems. --- config/bandwidthd/bandwidthd.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/config/bandwidthd/bandwidthd.inc b/config/bandwidthd/bandwidthd.inc index 7cdc8006..16ce4ab1 100644 --- a/config/bandwidthd/bandwidthd.inc +++ b/config/bandwidthd/bandwidthd.inc @@ -34,9 +34,15 @@ switch ($pfs_version) { case "1.2": case "2.0": define('PKG_BANDWIDTHD_BASE', '/usr/local/bandwidthd'); + define('PKG_BANDWIDTHD_RUNTIME_LIBRARY_ENV', ''); break; - default: + case "2.1": define('PKG_BANDWIDTHD_BASE', '/usr/pbi/bandwidthd-' . php_uname("m") . '/bandwidthd'); + define('PKG_BANDWIDTHD_RUNTIME_LIBRARY_ENV', ''); + break; + default: + define('PKG_BANDWIDTHD_BASE', '/usr/pbi/bandwidthd-' . php_uname("m") . '/local/bandwidthd'); + define('PKG_BANDWIDTHD_RUNTIME_LIBRARY_ENV', 'LD_LIBRARY_PATH=/usr/pbi/bandwidthd-' . php_uname("m") . '/local/lib'); } // End: Check pfSense version @@ -63,6 +69,7 @@ function bandwidthd_install_config() { /* the conf file must be ./etc/bandwidthd.conf relative to the current dir */ $bandwidthd_base_dir = PKG_BANDWIDTHD_BASE; $bandwidthd_config_dir = PKG_BANDWIDTHD_BASE . "/etc"; + $bandwidthd_runtime_library_env = PKG_BANDWIDTHD_RUNTIME_LIBRARY_ENV; conf_mount_rw(); config_lock(); @@ -336,7 +343,7 @@ if [ ! -f "{$bandwidthd_htdocs_dir}/logo.gif" ] ; then /bin/cp {$bandwidthd_base_dir}/htdocs/logo.gif {$bandwidthd_htdocs_dir} fi cd {$bandwidthd_nano_dir} -{$bandwidthd_nano_dir}/bandwidthd +{$bandwidthd_runtime_library_env} {$bandwidthd_nano_dir}/bandwidthd cd - EOD; } else { -- cgit v1.2.3 From a8c6b3158ed99d85576f3d8ef222e79539c4530b Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 22 Apr 2014 11:27:25 -0700 Subject: bandwidthd version bump to 0.4 --- pkg_config.10.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 3fc8afb0..0128ece6 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -834,7 +834,7 @@ http://bandwidthd.sourceforge.net/ BandwidthD tracks usage of TCP/IP network subnets and builds html files with graphs to display utilization. Charts are built by individual IPs, and by default display utilization over 2 day, 8 day, 40 day, and 400 day periods. Furthermore, each ip address's utilization can be logged out at intervals of 3.3 minutes, 10 minutes, 1 hour or 12 hours in cdf format, or to a backend database server. HTTP, TCP, UDP, ICMP, VPN, and P2P traffic are color coded. System - 2.0.1_6 pkg v.0.3 + 2.0.1_6 pkg v.0.4 BETA 2.2 bandwidthd-2.0.1_6-##ARCH##.pbi -- cgit v1.2.3 From 6b14479fe369954ddce33c3806d0b291bd537b16 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 22 Apr 2014 11:29:22 -0700 Subject: bandwidthd version bump to 0.4 --- pkg_config.8.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_config.8.xml b/pkg_config.8.xml index be94f74c..9840dd34 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1114,7 +1114,7 @@ http://bandwidthd.sourceforge.net/ BandwidthD tracks usage of TCP/IP network subnets and builds html files with graphs to display utilization. Charts are built by individual IPs, and by default display utilization over 2 day, 8 day, 40 day, and 400 day periods. Furthermore, each ip address's utilization can be logged out at intervals of 3.3 minutes, 10 minutes, 1 hour or 12 hours in cdf format, or to a backend database server. HTTP, TCP, UDP, ICMP, VPN, and P2P traffic are color coded. System - 2.0.1_5 pkg v.0.3 + 2.0.1_5 pkg v.0.4 BETA 1.2.1 https://files.pfsense.org/packages/8/All/ -- cgit v1.2.3 From 9daa10b84298da1957026e4c3e39d99adebb8912 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 22 Apr 2014 11:30:29 -0700 Subject: bandwidthd version bump to 0.4 --- pkg_config.8.xml.amd64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 55b7509c..cf82721e 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1101,7 +1101,7 @@ http://bandwidthd.sourceforge.net/ BandwidthD tracks usage of TCP/IP network subnets and builds html files with graphs to display utilization. Charts are built by individual IPs, and by default display utilization over 2 day, 8 day, 40 day, and 400 day periods. Furthermore, each ip address's utilization can be logged out at intervals of 3.3 minutes, 10 minutes, 1 hour or 12 hours in cdf format, or to a backend database server. HTTP, TCP, UDP, ICMP, VPN, and P2P traffic are color coded. System - 2.0.1_5 pkg v.0.3 + 2.0.1_5 pkg v.0.4 BETA 1.2.1 https://files.pfsense.org/packages/amd64/8/All/ -- cgit v1.2.3 From baff8d33602598c0774bdb46a451a69eb99b0dda Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 22 Apr 2014 11:31:32 -0700 Subject: bandwidthd version bump to 0.4 --- config/bandwidthd/bandwidthd.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/bandwidthd/bandwidthd.xml b/config/bandwidthd/bandwidthd.xml index 7f0f12fe..fc768761 100644 --- a/config/bandwidthd/bandwidthd.xml +++ b/config/bandwidthd/bandwidthd.xml @@ -46,7 +46,7 @@ Describe your package requirements here Currently there are no FAQ items provided. bandwidthd - 2.0.1_5 pkg v.0.3 + 2.0.1_5 pkg v.0.4 Bandwidthd /pkg_edit.php?xml=bandwidthd.xml&id=0 /usr/local/pkg/bandwidthd.inc -- cgit v1.2.3