aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/lcdproc-dev/lcdproc.inc7
-rw-r--r--config/lcdproc/lcdproc.inc7
-rw-r--r--config/nrpe2/nrpe2.inc2
-rw-r--r--pkg_config.10.xml12
-rw-r--r--pkg_config.8.xml6
-rw-r--r--pkg_config.8.xml.amd646
6 files changed, 25 insertions, 15 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc
index 73827721..fed2e7dc 100644
--- a/config/lcdproc-dev/lcdproc.inc
+++ b/config/lcdproc-dev/lcdproc.inc
@@ -32,7 +32,12 @@
require_once("service-utils.inc");
/* LCDproc */
define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh');
- define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+ if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) {
+ define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf');
+ } else {
+ define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ }
define('LCDPROC_HOST','localhost');
define('LCDPROC_PORT','13666');
define('LCDPROC_SERVICE_NAME','lcdproc');
diff --git a/config/lcdproc/lcdproc.inc b/config/lcdproc/lcdproc.inc
index 760732df..321328bc 100644
--- a/config/lcdproc/lcdproc.inc
+++ b/config/lcdproc/lcdproc.inc
@@ -33,7 +33,12 @@
/* LCDproc */
define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh');
define('LCDPROC_CLIENT', '/tmp/lcdclient.sh');
- define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+ if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) {
+ define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf');
+ } else {
+ define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ }
define('LCDPROC_HOST','localhost');
define('LCDPROC_PORT','13666');
diff --git a/config/nrpe2/nrpe2.inc b/config/nrpe2/nrpe2.inc
index 643cb837..7d541e6b 100644
--- a/config/nrpe2/nrpe2.inc
+++ b/config/nrpe2/nrpe2.inc
@@ -34,7 +34,7 @@ if ($pfs_version == "2.0") {
}
if ($pfs_version == "2.1")
- define('NRPE_BINARY', NRPE_BASE . "sbin/nrpe2");
+ define('NRPE_BINARY', NRPE_BASE . "/sbin/nrpe2");
else
define('NRPE_BINARY', "/usr/local/sbin/nrpe2");
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index fb12883c..29fa878b 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -53,12 +53,12 @@
<descr><![CDATA[The most widely used name server software]]></descr>
<website>http://www.isc.org/downloads/BIND/</website>
<category>Services</category>
- <version>9.9.6_1 pkg v 0.3.6</version>
+ <version>9.9.6P1_3 pkg v 0.3.6</version>
<status>RC</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
<configurationfile>bind.xml</configurationfile>
- <depends_on_package_pbi>bind-9.9.6_1-##ARCH##.pbi</depends_on_package_pbi>
+ <depends_on_package_pbi>bind-9.9.6P1_3-##ARCH##.pbi</depends_on_package_pbi>
<build_pbi>
<custom_name>bind</custom_name>
<port>dns/bind99</port>
@@ -912,7 +912,7 @@
<descr>LCD display driver</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.7_2 pkg.v.1.0.1</version>
+ <version>lcdproc-0.5.7_2 pkg.v.1.0.2</version>
<status>BETA</status>
<required_version>2.2</required_version>
<maintainer>seth.mos@dds.nl</maintainer>
@@ -930,7 +930,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.7_2 pkg v. 0.9.10</version>
+ <version>lcdproc-0.5.7_2 pkg v. 0.9.11</version>
<status>BETA</status>
<required_version>2.2</required_version>
<maintainer>michele@nt2.it</maintainer>
@@ -1025,7 +1025,7 @@
<ports_after>security/clamav</ports_after>
</build_pbi>
<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
- <version>0.91_3 pkg v1.05</version>
+ <version>0.91_3 pkg v1.05_1</version>
<status>BETA</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/havp/havp.xml</config_file>
@@ -1117,7 +1117,7 @@
</build_pbi>
<build_options>nrpe_SET_FORCE=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
- <version>2.15_5 v2.2_3</version>
+ <version>2.15_5 v2.2_4</version>
<status>Beta</status>
<required_version>2.2</required_version>
<maintainer>erik@erikkristensen.com</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b98fe248..78df6eae 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1211,7 +1211,7 @@
<descr>LCD display driver</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.5 pkg.v.1.0.1</version>
+ <version>lcdproc-0.5.5 pkg.v.1.0.2</version>
<status>BETA</status>
<required_version>1.2.1</required_version>
<maintainer>seth.mos@dds.nl</maintainer>
@@ -1229,7 +1229,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.6 pkg v. 0.9.10</version>
+ <version>lcdproc-0.5.6 pkg v. 0.9.11</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>michele@nt2.it</maintainer>
@@ -1543,7 +1543,7 @@
</build_pbi>
<build_options>nrpe_SET=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
- <version>2.12_4 v2.2_3</version>
+ <version>2.12_4 v2.2_4</version>
<status>Beta</status>
<required_version>1.2</required_version>
<maintainer>erik@erikkristensen.com</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index d914a59e..ee0c60ee 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1198,7 +1198,7 @@
<descr>LCD display driver</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.5 pkg.v.1.0.1</version>
+ <version>lcdproc-0.5.5 pkg.v.1.0.2</version>
<status>BETA</status>
<required_version>1.2.1</required_version>
<maintainer>seth.mos@dds.nl</maintainer>
@@ -1216,7 +1216,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.6 pkg v. 0.9.10</version>
+ <version>lcdproc-0.5.6 pkg v. 0.9.11</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>michele@nt2.it</maintainer>
@@ -1530,7 +1530,7 @@
</build_pbi>
<build_options>nrpe_SET=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
- <version>2.12_4 v2.2_3</version>
+ <version>2.12_4 v2.2_4</version>
<status>Beta</status>
<required_version>1.2</required_version>
<maintainer>erik@erikkristensen.com</maintainer>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 04:33:20 +0000