aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2015-02-23 09:46:49 -0500
committerjim-p <jimp@pfsense.org>2015-02-23 09:46:49 -0500
commit22b32e8e9d2214736ed107954bddd7949888469f (patch)
treeb8fc6c1f372d3b8b2d37082edbbed6f8466ae1ce
parent44b7ee6dec8c2b37e757af697262e9cecbf173fe (diff)
parent366fd69669c5bd329156afe1673c22ee459bb130 (diff)
downloadpfsense-packages-22b32e8e9d2214736ed107954bddd7949888469f.tar.gz
pfsense-packages-22b32e8e9d2214736ed107954bddd7949888469f.tar.bz2
pfsense-packages-22b32e8e9d2214736ed107954bddd7949888469f.zip
Merge pull request #819 from dbaio/master
-rw-r--r--config/apcupsd/apcupsd.xml2
-rwxr-xr-xconfig/apcupsd/apcupsd_mail.php2
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 5 insertions, 5 deletions
diff --git a/config/apcupsd/apcupsd.xml b/config/apcupsd/apcupsd.xml
index 8a42f352..0b2a96e0 100644
--- a/config/apcupsd/apcupsd.xml
+++ b/config/apcupsd/apcupsd.xml
@@ -40,7 +40,7 @@
<name>Apcupsd</name>
<title>Services: Apcupsd (General)</title>
<category>Monitoring</category>
- <version>0.3.2</version>
+ <version>0.3.3</version>
<include_file>/usr/local/pkg/apcupsd.inc</include_file>
<addedit_string>Apcupsd has been created/modified.</addedit_string>
<delete_string>Apcupsd has been deleted.</delete_string>
diff --git a/config/apcupsd/apcupsd_mail.php b/config/apcupsd/apcupsd_mail.php
index d5b97f92..3b13309c 100755
--- a/config/apcupsd/apcupsd_mail.php
+++ b/config/apcupsd/apcupsd_mail.php
@@ -29,7 +29,7 @@
require_once("pkg-utils.inc");
require_once("globals.inc");
-require_once("phpmailer/class.phpmailer.php");
+require_once("phpmailer/PHPMailerAutoload.php");
global $config, $g;
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 005546fd..dc2a8ffe 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1431,7 +1431,7 @@
<descr>Set of programs for controlling APC UPS.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file>
- <version>apcupsd-3.14.12_1 pkg v0.3.2</version>
+ <version>apcupsd-3.14.12_1 pkg v0.3.3</version>
<status>BETA</status>
<required_version>2.2</required_version>
<configurationfile>apcupsd.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index d6587606..c0fab064 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1859,7 +1859,7 @@
<descr>Set of programs for controlling APC UPS.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file>
- <version>apcupsd-3.14.10_1 pkg v0.3.2</version>
+ <version>apcupsd-3.14.10_1 pkg v0.3.3</version>
<status>BETA</status>
<required_version>2.0</required_version>
<configurationfile>apcupsd.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 33f1a27f..8a9235c7 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1846,7 +1846,7 @@
<descr>Set of programs for controlling APC UPS.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file>
- <version>apcupsd-3.14.10_1 pkg v0.3.2</version>
+ <version>apcupsd-3.14.10_1 pkg v0.3.3</version>
<status>BETA</status>
<required_version>2.0</required_version>
<configurationfile>apcupsd.xml</configurationfile>