From dc690b55fe7b55b767af8461c4735ea4a3a60c3b Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
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(-)

(limited to 'config/bandwidthd')

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 baff8d33602598c0774bdb46a451a69eb99b0dda Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
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(-)

(limited to 'config/bandwidthd')

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 @@
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>bandwidthd</name>
-	<version>2.0.1_5 pkg v.0.3</version>
+	<version>2.0.1_5 pkg v.0.4</version>
 	<title>Bandwidthd</title>
 	<aftersaveredirect>/pkg_edit.php?xml=bandwidthd.xml&amp;id=0</aftersaveredirect>
 	<include_file>/usr/local/pkg/bandwidthd.inc</include_file>
-- 
cgit v1.2.3