From 641a91856da66f45a68226141958f46d8460c4b7 Mon Sep 17 00:00:00 2001 From: Daniel Hoffend Date: Thu, 27 Feb 2014 17:07:32 +0100 Subject: add support for quagga ospfd raw config support --- config/quagga_ospfd/quagga_ospfd.inc | 67 ++++++++++------------- config/quagga_ospfd/quagga_ospfd.xml | 11 +++- config/quagga_ospfd/quagga_ospfd_interfaces.xml | 4 ++ config/quagga_ospfd/quagga_ospfd_raw.xml | 71 +++++++++++++++++++++++++ config/quagga_ospfd/status_ospfd.php | 4 ++ 5 files changed, 117 insertions(+), 40 deletions(-) create mode 100644 config/quagga_ospfd/quagga_ospfd_raw.xml diff --git a/config/quagga_ospfd/quagga_ospfd.inc b/config/quagga_ospfd/quagga_ospfd.inc index 782baf0f..c709381a 100644 --- a/config/quagga_ospfd/quagga_ospfd.inc +++ b/config/quagga_ospfd/quagga_ospfd.inc @@ -74,20 +74,20 @@ function quagga_ospfd_install_conf() { $quagga_config_base = PKG_QUAGGA_CONFIG_BASE; $noaccept = ""; + + // generate ospfd.conf based on the assistant + if($config['installedpackages']['quaggaospfd']['config']) + $ospfd_conf = &$config['installedpackages']['quaggaospfd']['config'][0]; + else { + log_error("Quagga OSPFd: No config data found."); + return; + } - if ($config['installedpackages']['quaggaospfd']['rawconfig'] && $config['installedpackages']['quaggaospfd']['rawconfig']['item']) { + if (isset($config['installedpackages']['quaggaospfdraw']['config'][0]['ospfd']) + && !empty($config['installedpackages']['quaggaospfdraw']['config'][0]['ospfd'])) { // if there is a raw config specifyed in tthe config.xml use that instead of the assisted config - $conffile = implode("\n",$config['installedpackages']['quaggaospfd']['rawconfig']['item']); - //$conffile = $config['installedpackages']['quaggaospfd']['rawconfig']; + $conffile = str_replace("\r","",base64_decode($config['installedpackages']['quaggaospfdraw']['config'][0]['ospfd'])); } else { - // generate ospfd.conf based on the assistant - if($config['installedpackages']['quaggaospfd']['config']) - $ospfd_conf = &$config['installedpackages']['quaggaospfd']['config'][0]; - else { - log_error("Quagga OSPFd: No config data found."); - return; - } - $conffile = "# This file was created by the pfSense package manager. Do not edit!\n\n"; if($ospfd_conf['password']) @@ -242,17 +242,23 @@ function quagga_ospfd_install_conf() { fclose($fd); /* Make zebra config */ - $zebraconffile = "# This file was created by the pfSense package manager. Do not edit!\n\n"; - if($ospfd_conf['password']) - $zebraconffile .= "password {$ospfd_conf['password']}\n"; - if ($ospfd_conf['logging']) - $zebraconffile .= "log syslog\n"; - if (!empty($noaccept)) { - $zebraconffile .= $noaccept; - $zebraconffile .= "ip prefix-list ACCEPTFILTER permit any\n"; - $zebraconffile .= "route-map ACCEPTFILTER permit 10\n"; - $zebraconffile .= "match ip address prefix-list ACCEPTFILTER\n"; - $zebraconffile .= "ip protocol ospf route-map ACCEPTFILTER\n"; + if (isset($config['installedpackages']['quaggaospfdraw']['config'][0]['zebra']) + && !empty($config['installedpackages']['quaggaospfdraw']['config'][0]['zebra'])) { + // if there is a raw config specifyed in tthe config.xml use that instead of the assisted config + $zebraconffile = str_replace("\r","",base64_decode($config['installedpackages']['quaggaospfdraw']['config'][0]['zebra'])); + } else { + $zebraconffile = "# This file was created by the pfSense package manager. Do not edit!\n\n"; + if($ospfd_conf['password']) + $zebraconffile .= "password {$ospfd_conf['password']}\n"; + if ($ospfd_conf['logging']) + $zebraconffile .= "log syslog\n"; + if (!empty($noaccept)) { + $zebraconffile .= $noaccept; + $zebraconffile .= "ip prefix-list ACCEPTFILTER permit any\n"; + $zebraconffile .= "route-map ACCEPTFILTER permit 10\n"; + $zebraconffile .= "match ip address prefix-list ACCEPTFILTER\n"; + $zebraconffile .= "ip protocol ospf route-map ACCEPTFILTER\n"; + } } $fd = fopen("{$quagga_config_base}/zebra.conf", "w"); fwrite($fd, $zebraconffile); @@ -375,23 +381,6 @@ function quagga_ospfd_validate_input() { $input_errors[] = "Please select an interface to use for Quagga OSPFd."; } -// get the raw ospfd confi file for manual inspection/editing -function quagga_ospfd_get_raw_config() { - return file_get_contents(PKG_QUAGGA_CONFIG_BASE . "/ospfd.conf"); -} - -// serialize the raw ospfd confi file to config.xml -function quagga_ospfd_put_raw_config($conffile) { - global $config; - if ($conffile == "") - unset($config['installedpackages']['quaggaospfd']['rawconfig']); - else { - $config['installedpackages']['quaggaospfd']['rawconfig'] = array(); - $config['installedpackages']['quaggaospfd']['rawconfig']['item'] = explode("\n",$_POST['quagga_ospfd_raw']); - $config['installedpackages']['quaggaospfd']['rawconfig'] = $conffile; - } -} - function quagga_get_carp_status_by_ip($ipaddr) { $iface = trim(find_carp_interface($ipaddr)); if ($iface) { diff --git a/config/quagga_ospfd/quagga_ospfd.xml b/config/quagga_ospfd/quagga_ospfd.xml index c975961b..74ea76db 100644 --- a/config/quagga_ospfd/quagga_ospfd.xml +++ b/config/quagga_ospfd/quagga_ospfd.xml @@ -14,6 +14,11 @@ 644 http://www.pfsense.com/packages/config/quagga_ospfd/quagga_ospfd_interfaces.xml + + /usr/local/pkg/ + 644 + http://www.pfsense.com/packages/config/quagga_ospfd/quagga_ospfd_raw.xml + /usr/local/www/ 644 @@ -41,6 +46,10 @@ Interface Settings pkg.php?xml=quagga_ospfd_interfaces.xml + + Raw Config + pkg_edit.php?xml=quagga_ospfd_raw.xml&id=0 + Status /status_ospfd.php @@ -199,4 +208,4 @@ quagga_ospfd_validate_input(); - \ No newline at end of file + diff --git a/config/quagga_ospfd/quagga_ospfd_interfaces.xml b/config/quagga_ospfd/quagga_ospfd_interfaces.xml index beb6f2b0..6e82fff8 100644 --- a/config/quagga_ospfd/quagga_ospfd_interfaces.xml +++ b/config/quagga_ospfd/quagga_ospfd_interfaces.xml @@ -26,6 +26,10 @@ pkg.php?xml=quagga_ospfd_interfaces.xml + + Raw Config + pkg_edit.php?xml=quagga_ospfd_raw.xml&id=0 + Status /status_ospfd.php diff --git a/config/quagga_ospfd/quagga_ospfd_raw.xml b/config/quagga_ospfd/quagga_ospfd_raw.xml new file mode 100644 index 00000000..b34558de --- /dev/null +++ b/config/quagga_ospfd/quagga_ospfd_raw.xml @@ -0,0 +1,71 @@ + + quagga_ospfd_raw + 0.1 + Services: Quagga OSPFd + /usr/local/pkg/quagga_ospfd.inc + pkg_edit.php?xml=quagga_ospfd_raw.xml&id=0 + + /usr/local/pkg/ + 077 + http://www.pfsense.com/packages/config/quagga_ospfd/quagga_ospfd.inc + + + OSPF + Modify Quagga RAW Config. +
Services
+ quagga_ospfd.xml + /pkg_edit.php?xml=quagga_ospfd.xml&id=0 + + + + Global Settings + pkg_edit.php?xml=quagga_ospfd.xml&id=0 + + + Interface Settings + pkg.php?xml=quagga_ospfd_interfaces.xml + + + Raw Config + pkg_edit.php?xml=quagga_ospfd_raw.xml&id=0 + + + + Status + /status_ospfd.php + + + + Quagga OSPFd + quagga.sh + ospfd + + + Quagga Zebra + quagga.sh + zebra + + + + ospfd.conf + ospfd + Note: Once you click "Save" below, the assistant (in the "Global Settings" and "Interface Settings" tabs above) will be overridden with whatever you type here. To get back the assisted config save this form below once with both empty input fields. + textarea + base64 + 30 + 65 + + + zebra.conf + zebra + Note: Once you click "Save" below, the assistant (in the "Global Settings" and "Interface Settings" tabs above) will be overridden with whatever you type here. To get back the assisted config save this form below once with both empty input fields. + textarea + base64 + 30 + 65 + + + + quagga_ospfd_install_conf(); + + diff --git a/config/quagga_ospfd/status_ospfd.php b/config/quagga_ospfd/status_ospfd.php index dc6c6aea..8ecf19d0 100644 --- a/config/quagga_ospfd/status_ospfd.php +++ b/config/quagga_ospfd/status_ospfd.php @@ -33,6 +33,7 @@ $pgtitle = "Quagga OSPF: Status"; include("head.inc"); $control_script = "/usr/local/bin/quaggactl"; +$pkg_homedir = "/var/etc/quagga"; /* List all of the commands as an index. */ function listCmds() { @@ -90,6 +91,7 @@ function doCmdT($title, $command) { $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=quagga_ospfd.xml&id=0"); $tab_array[] = array(gettext("Interface Settings"), false, "/pkg.php?xml=quagga_ospfd_interfaces.xml"); + $tab_array[] = array(gettext("RAW Config"), false, "/pkg_edit.php?xml=quagga_ospfd_raw.xml&id=0"); $tab_array[] = array(gettext("Status"), true, "/status_ospfd.php"); display_top_tabs($tab_array); ?> @@ -110,6 +112,8 @@ function doCmdT($title, $command) { defCmdT("Quagga OSPF Interfaces", "{$control_script} ospf interfaces"); defCmdT("Quagga OSPF CPU Usage", "{$control_script} ospf cpu"); defCmdT("Quagga OSPF Memory", "{$control_script} ospf mem"); + defCmdT("Quagga ospfd.conf", "/bin/cat {$pkg_homedir}/ospfd.conf"); + defCmdT("Quagga zebra.conf", "/bin/cat {$pkg_homedir}/zebra.conf"); ?>
-- cgit v1.2.3 From e5849517d07b989a24d38cb98ff860dd5e9ae975 Mon Sep 17 00:00:00 2001 From: topper727 Date: Fri, 4 Apr 2014 01:40:55 -0400 Subject: Update lcdproc_client.php Fixed the LED4 to show gateway status on CrystalFontz displays. Please update version number --- config/lcdproc-dev/lcdproc_client.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/lcdproc-dev/lcdproc_client.php b/config/lcdproc-dev/lcdproc_client.php index 3337052c..5306c903 100644 --- a/config/lcdproc-dev/lcdproc_client.php +++ b/config/lcdproc-dev/lcdproc_client.php @@ -513,6 +513,7 @@ 1 = All gateway up */ global $g; global $config; + $a_gateways = return_gateways_array(); $gateways_status = array(); $gateways_status = return_gateways_status(true); foreach ($a_gateways as $gname => $gateway) -- cgit v1.2.3 From 1e686a3273231d7b458779f84144be4ba148caad Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Tue, 8 Apr 2014 00:36:02 +0200 Subject: haproxy-devel, remove obsolete configuration/certificates cleanup --- config/haproxy-devel/haproxy.inc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc index e1cfdbbe..19616e1b 100644 --- a/config/haproxy-devel/haproxy.inc +++ b/config/haproxy-devel/haproxy.inc @@ -828,15 +828,9 @@ function haproxy_writeconf($configpath) { if(is_array($a_frontends)) { foreach ($a_frontends as $frontend) { if($frontend['status'] != 'active') - { - unlink_if_exists("var/etc/{$frontend['name']}.{$frontend['port']}.crt"); continue; - } if(!$frontend['backend_serverpool']) - { - unlink_if_exists("var/etc/{$frontend['name']}.{$frontend['port']}.crt"); continue; - } $bname = get_frontend_ipport($frontend); -- cgit v1.2.3 From 4c345b9e7743f4e89875bdf518ea0b0fdf804940 Mon Sep 17 00:00:00 2001 From: Daniel Hoffend Date: Tue, 8 Apr 2014 01:25:21 +0200 Subject: changed check for config parameter to is_array --- config/quagga_ospfd/quagga_ospfd.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/quagga_ospfd/quagga_ospfd.inc b/config/quagga_ospfd/quagga_ospfd.inc index c709381a..17c13246 100644 --- a/config/quagga_ospfd/quagga_ospfd.inc +++ b/config/quagga_ospfd/quagga_ospfd.inc @@ -76,7 +76,7 @@ function quagga_ospfd_install_conf() { $noaccept = ""; // generate ospfd.conf based on the assistant - if($config['installedpackages']['quaggaospfd']['config']) + if(is_array($config['installedpackages']['quaggaospfd']['config'])) $ospfd_conf = &$config['installedpackages']['quaggaospfd']['config'][0]; else { log_error("Quagga OSPFd: No config data found."); @@ -100,7 +100,7 @@ function quagga_ospfd_install_conf() { $passive_interfaces = array(); $interface_networks = array(); - if ($config['installedpackages']['quaggaospfdinterfaces']['config']) { + if (is_array($config['installedpackages']['quaggaospfdinterfaces']['config'])) { foreach ($config['installedpackages']['quaggaospfdinterfaces']['config'] as $conf) { $realif = get_real_interface($conf['interface']); $conffile .= "interface {$realif}\n" ; -- cgit v1.2.3 From 6e446cea9aad630af307202809885ab9a6397d43 Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Sun, 13 Apr 2014 15:01:38 +0200 Subject: haproxy-devel, plugin function for reporting used certificates --- config/haproxy-devel/haproxy.inc | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc index e1cfdbbe..cae53330 100644 --- a/config/haproxy-devel/haproxy.inc +++ b/config/haproxy-devel/haproxy.inc @@ -1199,6 +1199,36 @@ function haproxy_plugin_carp($pluginparams) { haproxy_check_run(0); } +function haproxy_plugin_certificates($pluginparams) { + global $config; + $result = array(); + if ($pluginparams['type'] == 'certificates' && $pluginparams['event'] == 'used_certificates') { + $result['pkgname'] = "HAProxy"; + $result['certificatelist'] = array(); + // return a array of used certificates. + foreach($config['installedpackages']['haproxy']['ha_backends']['item'] as &$frontend) { + $mainfrontend = get_primaryfrontend($frontend); + if (strtolower($mainfrontend['type']) == "http" && $mainfrontend['ssloffload']) { + if ($frontend['ssloffloadacl']){ + $item = array(); + $cert = $frontend['ssloffloadcert']; + $item['usedby'] = $frontend['name']; + $result['certificatelist'][$cert][] = $item; + } + if ($frontend['ssloffloadacladditional']){ + foreach($frontend['ha_certificates']['item'] as $certref){ + $item = array(); + $cert = $certref['ssl_certificate']; + $item['usedby'] = $frontend['name']; + $result['certificatelist'][$cert][] = $item; + } + } + } + } + } + return $result; +} + function haproxy_check_run($reload) { global $config, $g, $haproxy_run_message; -- cgit v1.2.3 From 419c50710e9ff8d22bcfff0a812cf733e48d8166 Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Sun, 13 Apr 2014 15:09:10 +0200 Subject: haproxy-devel, add plugin 'activation' into the xml --- config/haproxy-devel/haproxy.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/haproxy-devel/haproxy.xml b/config/haproxy-devel/haproxy.xml index 5c534522..acd934a7 100644 --- a/config/haproxy-devel/haproxy.xml +++ b/config/haproxy-devel/haproxy.xml @@ -62,6 +62,9 @@ plugin_carp + + plugin_certificates + installedpackages->haproxy->config -- cgit v1.2.3 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 From 6a3d0510d4c2d2bbdbeda22493963781cfdf2b6a Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Thu, 8 May 2014 13:24:22 +0200 Subject: correct autodiscover settings (wrong hostname) and bump pkg-version --- config/squid3/31/squid_reverse.inc | 11 +++++++---- config/squid3/33/squid_reverse.inc | 9 ++++++--- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/config/squid3/31/squid_reverse.inc b/config/squid3/31/squid_reverse.inc index eb2d4c73..bfe9cb03 100644 --- a/config/squid3/31/squid_reverse.inc +++ b/config/squid3/31/squid_reverse.inc @@ -170,17 +170,20 @@ function squid_resync_reverse() { array_push($owa_dirs,'Microsoft-Server-ActiveSync'); if($settings['reverse_owa_rpchttp']) array_push($owa_dirs,'rpc/rpcproxy.dll','rpcwithcert/rpcproxy.dll'); - if($settings['reverse_owa_autodiscover']) - array_push($owa_dirs,'autodiscover'); if($settings['reverse_owa_webservice']){ array_push($owa_dirs,'EWS'); $conf .= "ignore_expect_100 on\n"; - } + } } if (is_array($owa_dirs)) foreach ($owa_dirs as $owa_dir) $conf .= "acl OWA_URI_pfs url_regex -i ^https://{$settings['reverse_external_fqdn']}/$owa_dir.*$\n"; - } + + if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) { + $reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.'); + $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover$reverse_external_domain/AutoDiscover/AutoDiscover.xml\n"; + } + } //$conf .= "ssl_unclean_shutdown on"; if (is_array($reverse_maps)) foreach ($reverse_maps as $rm){ diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc index 08c7b388..064844b6 100755 --- a/config/squid3/33/squid_reverse.inc +++ b/config/squid3/33/squid_reverse.inc @@ -173,8 +173,6 @@ function squid_resync_reverse() { array_push($owa_dirs,'Microsoft-Server-ActiveSync'); if($settings['reverse_owa_rpchttp']) array_push($owa_dirs,'rpc/rpcproxy.dll','rpcwithcert/rpcproxy.dll'); - if($settings['reverse_owa_autodiscover']) - array_push($owa_dirs,'autodiscover'); if($settings['reverse_owa_webservice']){ array_push($owa_dirs,'EWS'); //$conf .= "ignore_expect_100 on\n"; Obsolete on 3.3 @@ -183,7 +181,12 @@ function squid_resync_reverse() { if (is_array($owa_dirs)) foreach ($owa_dirs as $owa_dir) $conf .= "acl OWA_URI_pfs url_regex -i ^https://{$settings['reverse_external_fqdn']}/$owa_dir.*$\n"; - } + + if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) { + $reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.'); + $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover$reverse_external_domain/AutoDiscover/AutoDiscover.xml\n"; + } + } //$conf .= "ssl_unclean_shutdown on"; if (is_array($reverse_maps)) foreach ($reverse_maps as $rm){ diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 9f87d704..e35ce01e 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -939,7 +939,7 @@ https://forum.pfsense.org/index.php/topic,48347.0.html http://www.squid-cache.org/ Network - 3.1.20 pkg 2.0.6 + 3.1.20 pkg 2.0.7 beta 2.2 marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org diff --git a/pkg_config.8.xml b/pkg_config.8.xml index a1e3a314..bdd71c6b 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1233,7 +1233,7 @@ https://forum.pfsense.org/index.php/topic,48347.0.html http://www.squid-cache.org/ Network - 3.1.20 pkg 2.0.6 + 3.1.20 pkg 2.0.7 beta 2.0 marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index cfb08654..934a904d 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1220,7 +1220,7 @@ https://forum.pfsense.org/index.php/topic,48347.0.html http://www.squid-cache.org/ Network - 3.1.20 pkg 2.0.6 + 3.1.20 pkg 2.0.7 beta 2.0 marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org -- cgit v1.2.3 From b3be73ad2331dae6514faacc0014886fcf7c6bcf Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Thu, 8 May 2014 17:45:18 +0200 Subject: protect variable name in string and remove spaces --- config/squid3/31/squid_reverse.inc | 4 ++-- config/squid3/33/squid_reverse.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/squid3/31/squid_reverse.inc b/config/squid3/31/squid_reverse.inc index bfe9cb03..c99659b7 100644 --- a/config/squid3/31/squid_reverse.inc +++ b/config/squid3/31/squid_reverse.inc @@ -181,9 +181,9 @@ function squid_resync_reverse() { if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) { $reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.'); - $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover$reverse_external_domain/AutoDiscover/AutoDiscover.xml\n"; + $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n"; } - } + } //$conf .= "ssl_unclean_shutdown on"; if (is_array($reverse_maps)) foreach ($reverse_maps as $rm){ diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc index 064844b6..b865f3c0 100755 --- a/config/squid3/33/squid_reverse.inc +++ b/config/squid3/33/squid_reverse.inc @@ -184,7 +184,7 @@ function squid_resync_reverse() { if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) { $reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.'); - $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover$reverse_external_domain/AutoDiscover/AutoDiscover.xml\n"; + $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n"; } } //$conf .= "ssl_unclean_shutdown on"; -- cgit v1.2.3 From 7f8d8abe25b31e9ab2fd28724d5f5a122e233cfa Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Thu, 8 May 2014 17:47:26 +0200 Subject: correct formatting --- config/squid3/31/squid_reverse.inc | 2 +- config/squid3/33/squid_reverse.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/squid3/31/squid_reverse.inc b/config/squid3/31/squid_reverse.inc index c99659b7..993508aa 100644 --- a/config/squid3/31/squid_reverse.inc +++ b/config/squid3/31/squid_reverse.inc @@ -182,8 +182,8 @@ function squid_resync_reverse() { if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) { $reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.'); $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n"; - } } + } //$conf .= "ssl_unclean_shutdown on"; if (is_array($reverse_maps)) foreach ($reverse_maps as $rm){ diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc index b865f3c0..34ff2366 100755 --- a/config/squid3/33/squid_reverse.inc +++ b/config/squid3/33/squid_reverse.inc @@ -185,8 +185,8 @@ function squid_resync_reverse() { if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) { $reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.'); $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n"; - } - } + } + } //$conf .= "ssl_unclean_shutdown on"; if (is_array($reverse_maps)) foreach ($reverse_maps as $rm){ -- cgit v1.2.3 From 986d138fe85367e1a9301d4bfa871c40f03ed341 Mon Sep 17 00:00:00 2001 From: jim-p Date: Thu, 8 May 2014 16:16:36 -0400 Subject: Change style of call for pre-2.1 call-time pass-by-reference in System Patches (thanks-to: garga), bump. --- config/systempatches/system_patches_edit.php | 2 +- config/systempatches/systempatches.xml | 2 +- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/systempatches/system_patches_edit.php b/config/systempatches/system_patches_edit.php index 0d45ce92..3e63038e 100644 --- a/config/systempatches/system_patches_edit.php +++ b/config/systempatches/system_patches_edit.php @@ -88,7 +88,7 @@ if ($_POST) { $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); if ($pf_version < 2.1) - do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); + $input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;'); else do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); diff --git a/config/systempatches/systempatches.xml b/config/systempatches/systempatches.xml index 23b0795b..b9875140 100644 --- a/config/systempatches/systempatches.xml +++ b/config/systempatches/systempatches.xml @@ -40,7 +40,7 @@ None Applies patches supplied by the user to the firewall. System Patches - 1.0 + 1.0.2 System: Patches /usr/local/pkg/patches.inc diff --git a/pkg_config.10.xml b/pkg_config.10.xml index e35ce01e..38d316db 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1315,7 +1315,7 @@ System Patches A package to apply and maintain custom system patches. jimp@pfsense.org - 1.0.1 + 1.0.2 System RELEASE https://packages.pfsense.org/packages/config/systempatches/systempatches.xml diff --git a/pkg_config.8.xml b/pkg_config.8.xml index bdd71c6b..2cd52357 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1742,7 +1742,7 @@ System Patches A package to apply and maintain custom system patches. jimp@pfsense.org - 1.0.1 + 1.0.2 System RELEASE https://packages.pfsense.org/packages/config/systempatches/systempatches.xml diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 934a904d..e7a863e9 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1729,7 +1729,7 @@ System Patches A package to apply and maintain custom system patches. jimp@pfsense.org - 1.0.1 + 1.0.2 System RELEASE https://packages.pfsense.org/packages/config/systempatches/systempatches.xml -- cgit v1.2.3 From 76a6a0ee241ee33c77c07999dd901c10ef466694 Mon Sep 17 00:00:00 2001 From: Daniel Hoffend Date: Thu, 8 May 2014 22:51:02 +0200 Subject: bumbed version number for quagga-ospfd --- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 19e149a0..fc3a1034 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1311,7 +1311,7 @@ Quagga OSPF OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenOSPFD and OpenBGPD. Installing both will break things. jimp@pfsense.org - 0.99.22.3 v0.6.1 + 0.99.22.3 v0.6.2 Routing BETA quagga-0.99.22.3-##ARCH##.pbi diff --git a/pkg_config.8.xml b/pkg_config.8.xml index aca3f3b3..de3b0a79 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1738,7 +1738,7 @@ Quagga OSPF OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenOSPFD and OpenBGPD. Installing both will break things. jimp@pfsense.org - 0.99.22.3 v0.6.1 + 0.99.22.3 v0.6.2 Routing BETA http://files.pfsense.org/packages/8/All/ diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 05ce8f0c..e108677e 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1725,7 +1725,7 @@ Quagga OSPF OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenOSPFD and OpenBGPD. Installing both will break things. jimp@pfsense.org - 0.99.22.3 v0.6.1 + 0.99.22.3 v0.6.2 Routing BETA http://files.pfsense.org/packages/amd64/8/All/ -- cgit v1.2.3 From 8f7fdf79978dcf504b2344395ff29f9cdddb5c5c Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 8 May 2014 18:13:54 -0300 Subject: Bump lcdproc-dev version due to recent changes --- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 38d316db..562c7e94 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1000,7 +1000,7 @@ LCD display driver - Development version http://www.lcdproc.org/ Utility - lcdproc-0.5.6 pkg v. 0.9.7 + lcdproc-0.5.6 pkg v. 0.9.8 BETA 2.2 michele@nt2.it diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 2cd52357..d21a8ebe 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1305,7 +1305,7 @@ LCD display driver - Development version http://www.lcdproc.org/ Utility - lcdproc-0.5.6 pkg v. 0.9.7 + lcdproc-0.5.6 pkg v. 0.9.8 BETA 2.0 michele@nt2.it diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index e7a863e9..f536622c 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1292,7 +1292,7 @@ LCD display driver - Development version http://www.lcdproc.org/ Utility - lcdproc-0.5.6 pkg v. 0.9.7 + lcdproc-0.5.6 pkg v. 0.9.8 BETA 2.0 michele@nt2.it -- cgit v1.2.3 From 5e99c25048ab4544fd973a1f1cc4d4beccf770ef Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 13:25:23 -0400 Subject: Check new and old path for clog when generating mail report. Bump. --- config/mailreport/mail_reports.inc | 8 +++++++- config/mailreport/mailreport.xml | 2 +- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config/mailreport/mail_reports.inc b/config/mailreport/mail_reports.inc index 5d9e74b2..2742844b 100644 --- a/config/mailreport/mail_reports.inc +++ b/config/mailreport/mail_reports.inc @@ -1243,7 +1243,13 @@ function mail_report_get_log($logfile, $tail, $grepfor) { if(isset($config['system']['usefifolog'])) { exec("/usr/sbin/fifolog_reader {$logfile}{$grepline} | /usr/bin/tail -n {$tail}", $logarr); } else { - exec("/usr/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -n {$tail}", $logarr); + if (is_executable("/usr/local/sbin/clog")) { + exec("/usr/local/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -n {$tail}", $logarr); + } elseif (is_executable("/usr/local/sbin/clog")) { + exec("/usr/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -n {$tail}", $logarr); + } else { + $logarr = array("Cannot locate clog which is required for reading log files."); + } } } return($logarr); diff --git a/config/mailreport/mailreport.xml b/config/mailreport/mailreport.xml index fe6899d4..9239f82e 100644 --- a/config/mailreport/mailreport.xml +++ b/config/mailreport/mailreport.xml @@ -37,7 +37,7 @@ ]]> mailreport - 2.0.11 + 2.0.12 Status: Email Reports /usr/local/bin/ diff --git a/pkg_config.10.xml b/pkg_config.10.xml index fbeff13b..33815883 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1271,7 +1271,7 @@ mailreport Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs. Network Management - 2.0.11 + 2.0.12 Stable 2.2 https://packages.pfsense.org/packages/config/mailreport/mailreport.xml diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 616c898d..a260b511 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1688,7 +1688,7 @@ mailreport Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs. Network Management - 2.0.11 + 2.0.12 Stable 2.0 https://packages.pfsense.org/packages/config/mailreport/mailreport.xml diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index c4d76916..d42775ea 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1675,7 +1675,7 @@ mailreport Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs. Network Management - 2.0.11 + 2.0.12 Stable 2.0 https://packages.pfsense.org/packages/config/mailreport/mailreport.xml -- cgit v1.2.3 From c18e6be175e6e0e2939fd8dde7dcd1138a97a0a3 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 13:30:32 -0400 Subject: Correct check --- config/mailreport/mail_reports.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mailreport/mail_reports.inc b/config/mailreport/mail_reports.inc index 2742844b..0119457a 100644 --- a/config/mailreport/mail_reports.inc +++ b/config/mailreport/mail_reports.inc @@ -1245,7 +1245,7 @@ function mail_report_get_log($logfile, $tail, $grepfor) { } else { if (is_executable("/usr/local/sbin/clog")) { exec("/usr/local/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -n {$tail}", $logarr); - } elseif (is_executable("/usr/local/sbin/clog")) { + } elseif (is_executable("/usr/sbin/clog")) { exec("/usr/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -n {$tail}", $logarr); } else { $logarr = array("Cannot locate clog which is required for reading log files."); -- cgit v1.2.3 From 718bfb6ac6f684fc740eaad037aabef790c33f99 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 13:34:19 -0400 Subject: Make tinc pkg respect proper clog path for >= 2.1.3 --- config/tinc/status_tinc.php | 20 ++++++++++++++++++-- config/tinc/tinc.xml | 2 +- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/config/tinc/status_tinc.php b/config/tinc/status_tinc.php index 725ccce6..cd7b0aad 100644 --- a/config/tinc/status_tinc.php +++ b/config/tinc/status_tinc.php @@ -6,7 +6,15 @@ require("guiconfig.inc"); function tinc_status_1() { exec("/usr/local/sbin/tincd --config=/usr/local/etc/tinc -kUSR1"); usleep(500000); - exec("/usr/sbin/clog /var/log/tinc.log | sed -e 's/.*tinc\[.*\]: //'",$result); + $clog_path = ""; + $result = array(); + if (is_executable("/usr/local/sbin/clog")) { + $clog_path = "/usr/local/sbin/clog"; + } elseif (is_executable("/usr/sbin/clog")) { + $clog_path = "/usr/sbin/clog"; + + if (!empty($clog_path)) + exec("{$clog_path} /var/log/tinc.log | sed -e 's/.*tinc\[.*\]: //'",$result); $i=0; foreach($result as $line) { @@ -30,7 +38,15 @@ function tinc_status_1() { function tinc_status_2() { exec("/usr/local/sbin/tincd --config=/usr/local/etc/tinc -kUSR2"); usleep(500000); - exec("/usr/sbin/clog /var/log/tinc.log | sed -e 's/.*tinc\[.*\]: //'",$result); + $clog_path = ""; + $result = array(); + if (is_executable("/usr/local/sbin/clog")) { + $clog_path = "/usr/local/sbin/clog"; + } elseif (is_executable("/usr/sbin/clog")) { + $clog_path = "/usr/sbin/clog"; + + if (!empty($clog_path)) + exec("{$clog_path} /var/log/tinc.log | sed -e 's/.*tinc\[.*\]: //'",$result); $i=0; foreach($result as $line) { diff --git a/config/tinc/tinc.xml b/config/tinc/tinc.xml index f016dd41..183ae161 100644 --- a/config/tinc/tinc.xml +++ b/config/tinc/tinc.xml @@ -42,7 +42,7 @@ Describe your package requirements here Currently there are no FAQ items provided. tinc - 1.0.21 v1.1 + 1.0.23 v1.2.1 VPN: tinc diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 33815883..1aa4c47d 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1404,7 +1404,7 @@ security/tinc - 1.0.23 v1.1 + 1.0.23 v1.2.1 ALPHA https://doc.pfsense.org/index.php/tinc_package 2.2 diff --git a/pkg_config.8.xml b/pkg_config.8.xml index a260b511..3ccda834 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1839,7 +1839,7 @@ security/tinc - 1.0.23 v1.2 + 1.0.23 v1.2.1 ALPHA https://doc.pfsense.org/index.php/tinc_package 2.1 diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index d42775ea..3046213f 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1826,7 +1826,7 @@ security/tinc - 1.0.23 v1.2 + 1.0.23 v1.2.1 ALPHA https://doc.pfsense.org/index.php/tinc_package 2.1 -- cgit v1.2.3 From dca64d1474a6c883fb3a406cfadd010a74cd54fd Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 13:59:28 -0400 Subject: Fix call-time pass-by-reference in zebedee, bump --- config/zebedee/zebedee.xml | 4 ++-- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/zebedee/zebedee.xml b/config/zebedee/zebedee.xml index db7bfddf..2a208b27 100644 --- a/config/zebedee/zebedee.xml +++ b/config/zebedee/zebedee.xml @@ -46,7 +46,7 @@ Describe your package requirements here Currently there are no FAQ items provided. zebedee - 0.1 + 1.2.1 Zebedee Tunneling /usr/local/pkg/zebedee.inc @@ -296,7 +296,7 @@ zebedee_php_deinstall_command(); - zebedee_validate_input($_POST, &$input_errors); + zebedee_validate_input($_POST, $input_errors); sync_package_zebedee(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 1aa4c47d..65d43f41 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1283,7 +1283,7 @@ This allows traffic such as telnet, ftp and X to be protected from snooping as well as potentially gaining performance over low-bandwidth networks from compression.]]> Services - 1.2 + 1.2.1 BETA www.winton.org.uk/zebedee/ jorgelustosa@gmail.com marcellocoutinho@gmail.com diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 3ccda834..b2420cd9 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1700,7 +1700,7 @@ This allows traffic such as telnet, ftp and X to be protected from snooping as well as potentially gaining performance over low-bandwidth networks from compression.]]> Services - 1.2 + 1.2.1 BETA www.winton.org.uk/zebedee/ jorgelustosa@gmail.com marcellocoutinho@gmail.com diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 3046213f..fe553b89 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1687,7 +1687,7 @@ This allows traffic such as telnet, ftp and X to be protected from snooping as well as potentially gaining performance over low-bandwidth networks from compression.]]> Services - 1.2 + 1.2.1 BETA www.winton.org.uk/zebedee/ jorgelustosa@gmail.com marcellocoutinho@gmail.com -- cgit v1.2.3 From da61214a7227bd9035ea4be8fab3dbedf681a2a7 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:05:33 -0400 Subject: Fix call-time pass-by-reference in apcupsd. Bump. --- config/apcupsd/apcupsd.xml | 4 ++-- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/apcupsd/apcupsd.xml b/config/apcupsd/apcupsd.xml index 3ed95a7a..5ef2b946 100644 --- a/config/apcupsd/apcupsd.xml +++ b/config/apcupsd/apcupsd.xml @@ -40,7 +40,7 @@ Apcupsd Services: Apcupsd (General) Monitoring - 0.3 + 0.3.1 /usr/local/pkg/apcupsd.inc Apcupsd has been created/modified. Apcupsd has been deleted. @@ -339,7 +339,7 @@ UPSTYPE DEVICE Description
- validate_input_apcupsd($_POST, &$input_errors); + validate_input_apcupsd($_POST, $input_errors); sync_package_apcupsd(); php_deinstall_apcupsd(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 65d43f41..84f4591f 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1534,7 +1534,7 @@ Set of programs for controlling APC UPS. Services https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml - apcupsd-3.14.10_1 pkg v0.3 + apcupsd-3.14.10_1 pkg v0.3.1 BETA 2.2 apcupsd.xml diff --git a/pkg_config.8.xml b/pkg_config.8.xml index b2420cd9..c699307a 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1981,7 +1981,7 @@ Set of programs for controlling APC UPS. Services https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml - apcupsd-3.14.10_1 pkg v0.3 + apcupsd-3.14.10_1 pkg v0.3.1 BETA 2.0 apcupsd.xml diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index fe553b89..d84e6ca6 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1968,7 +1968,7 @@ Set of programs for controlling APC UPS. Services https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml - apcupsd-3.14.10_1 pkg v0.3 + apcupsd-3.14.10_1 pkg v0.3.1 BETA 2.0 apcupsd.xml -- cgit v1.2.3 From 4cad83f73d3ad96601fb0aade27280ff6f5f8510 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:07:01 -0400 Subject: Fix call-time pass-by-reference in bind, bump. --- config/bind/bind.inc | 2 +- config/bind/bind_zones.xml | 2 +- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/bind/bind.inc b/config/bind/bind.inc index 17d171d1..9b4a444d 100644 --- a/config/bind/bind.inc +++ b/config/bind/bind.inc @@ -47,7 +47,7 @@ else define('CHROOT_LOCALBASE','/cf/named'); -function bind_zone_validate($post, $input_errors){ +function bind_zone_validate($post, &$input_errors){ if (key_exists("mail",$_POST)) $_POST['mail']=preg_replace("/@/",".",$post['mail']); diff --git a/config/bind/bind_zones.xml b/config/bind/bind_zones.xml index 3506df63..24c3b99e 100644 --- a/config/bind/bind_zones.xml +++ b/config/bind/bind_zones.xml @@ -434,7 +434,7 @@ if ($_POST['type']=="master") $_POST['serial']=(date("U")+ 1000000000); - bind_zone_validate($_POST, &$input_errors); + bind_zone_validate($_POST, $input_errors); bind_sync(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 84f4591f..8788944d 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -53,7 +53,7 @@ http://www.isc.org/downloads/BIND/ Services - 9.9.5_12 pkg v 0.3.2 + 9.9.5_12 pkg v 0.3.3 RC 2.2 https://packages.pfsense.org/packages/config/bind/bind.xml diff --git a/pkg_config.8.xml b/pkg_config.8.xml index c699307a..85a17be3 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -53,7 +53,7 @@ http://www.isc.org/downloads/BIND/ Services - 9.9.5_12 pkg v 0.3.2 + 9.9.5_12 pkg v 0.3.3 RC 2.1 https://packages.pfsense.org/packages/config/bind/bind.xml diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index d84e6ca6..4620f092 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -53,7 +53,7 @@ http://www.isc.org/downloads/BIND/ Services - 9.9.5_12 pkg v 0.3.2 + 9.9.5_12 pkg v 0.3.3 RC 2.1 https://packages.pfsense.org/packages/config/bind/bind.xml -- cgit v1.2.3 From d371fb794e94ea826515229d10c3dc1fccdec777 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:09:17 -0400 Subject: Fix call-time pass-by-reference in checkmk, bump --- config/checkmk-agent/checkmk.xml | 4 ++-- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/checkmk-agent/checkmk.xml b/config/checkmk-agent/checkmk.xml index 120b6634..2b4f6996 100644 --- a/config/checkmk-agent/checkmk.xml +++ b/config/checkmk-agent/checkmk.xml @@ -41,7 +41,7 @@ Describe your package requirements here Currently there are no FAQ items provided. checkmk - 0.5 + 0.1.1 Check_mk Agent /usr/local/pkg/checkmk.inc @@ -110,7 +110,7 @@ - checkmk_validate_input($_POST, &$input_errors); + checkmk_validate_input($_POST, $input_errors); sync_package_checkmk(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 8788944d..41f52403 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1249,7 +1249,7 @@ https://packages.pfsense.org/packages/config/checkmk-agent/checkmk.xml - v0.1 + v0.1.1 RC1 2.2 marcellocoutinho@gmail.com diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 85a17be3..7d945377 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1666,7 +1666,7 @@ https://packages.pfsense.org/packages/config/checkmk-agent/checkmk.xml - v0.1 + v0.1.1 RC1 2.0 marcellocoutinho@gmail.com diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 4620f092..7e33e0ad 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1653,7 +1653,7 @@ https://packages.pfsense.org/packages/config/checkmk-agent/checkmk.xml - v0.1 + v0.1.1 RC1 2.0 marcellocoutinho@gmail.com -- cgit v1.2.3 From b13b4acd7be6aef3cb5eed0f086b8cccb5bca21c Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:12:58 -0400 Subject: Fix call-time pass-by-reference in clamav (not used) --- config/archive/clamsmtp.inc | 2 +- config/archive/viralator.inc | 2 +- config/clamav.inc | 8 ++++---- config/clamav.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/archive/clamsmtp.inc b/config/archive/clamsmtp.inc index f23a35c1..cc16cf82 100644 --- a/config/archive/clamsmtp.inc +++ b/config/archive/clamsmtp.inc @@ -20,7 +20,7 @@ function clamsmtp_install_command() { clamsmtp_resync(); } -function clamsmtp_validate_input($post, $input_errors) { +function clamsmtp_validate_input($post, &$input_errors) { if (!is_ipaddr(trim($post['smtp_server']))) $input_errors[] = 'The field \'SMTP server\' must contain a valid IP address.'; $port = trim($post['smtp_port']); diff --git a/config/archive/viralator.inc b/config/archive/viralator.inc index dc4e6041..36ceb37f 100644 --- a/config/archive/viralator.inc +++ b/config/archive/viralator.inc @@ -24,7 +24,7 @@ EOD; make_dirs(VIRALATOR_DOWNLOADDIR); } -function viralator_validate_input($post, $input_errors) { +function viralator_validate_input($post, &$input_errors) { if (trim($post['http_otherexts'])) { foreach (explode(',', $post['http_otherexts']) as $ext) { $ext = trim($ext); diff --git a/config/clamav.inc b/config/clamav.inc index 3aaaf71d..036f69cb 100644 --- a/config/clamav.inc +++ b/config/clamav.inc @@ -108,7 +108,7 @@ EOD; } } -function clamav_before_form($pkg) { +function clamav_before_form(&$pkg) { global $config; if (is_package_installed('p3scan')) { @@ -203,15 +203,15 @@ function clamav_before_form($pkg) { } } -function clamav_validate_input($post, $input_errors) { +function clamav_validate_input($post, &$input_errors) { if ($post['scan_smtp'] == 'on') { require_once('clamsmtp.inc'); - clamsmtp_validate_input($post, &$input_errors); + clamsmtp_validate_input($post, $input_errors); } if (is_package_installed('viralator')) { require_once('viralator.inc'); - viralator_validate_input($post, &$input_errors); + viralator_validate_input($post, $input_errors); } } diff --git a/config/clamav.xml b/config/clamav.xml index 94f8c74f..aac32d1e 100644 --- a/config/clamav.xml +++ b/config/clamav.xml @@ -116,13 +116,13 @@ - clamav_before_form(&$pkg); + clamav_before_form($pkg); clamav_resync(); - clamav_validate_input($post, &$input_errors); + clamav_validate_input($post, $input_errors); clamav_install_command(); -- cgit v1.2.3 From f05a0a012dba2a20392cc48225ca25c21debc5f7 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:14:20 -0400 Subject: Fix call-time pass-by-reference in filer, bump --- config/filer/filer.xml | 4 ++-- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/filer/filer.xml b/config/filer/filer.xml index ecb24bcd..71821067 100644 --- a/config/filer/filer.xml +++ b/config/filer/filer.xml @@ -43,7 +43,7 @@ Describe your package requirements here Currently there are no FAQ items provided. filer - 0.5 + 0.60.1 Filer /usr/local/pkg/filer.inc @@ -156,7 +156,7 @@ - filer_validate_input($_POST, &$input_errors); + filer_validate_input($_POST, $input_errors); sync_package_filer(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 41f52403..7139f774 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -72,7 +72,7 @@ File Management https://doc.pfsense.org/index.php/Filer_package https://packages.pfsense.org/packages/config/filer/filer.xml - 0.60 + 0.60.1 Beta 2.2 bscholer@cshl.edu diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 7d945377..3758f2f1 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -74,7 +74,7 @@ File Management https://doc.pfsense.org/index.php/Filer_package https://packages.pfsense.org/packages/config/filer/filer.xml - 0.60 + 0.60.1 Beta 2.0 bscholer@cshl.edu diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 7e33e0ad..21a05c24 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -74,7 +74,7 @@ File Management https://doc.pfsense.org/index.php/Filer_package https://packages.pfsense.org/packages/config/filer/filer.xml - 0.60 + 0.60.1 Beta 2.0 bscholer@cshl.edu -- cgit v1.2.3 From 547c0359e269624884f702e06512d6755109d364 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:16:29 -0400 Subject: Fix call-time pass-by-reference in imspector, bump --- config/imspector/imspector.inc | 2 +- config/imspector/imspector.xml | 4 ++-- config/imspector/imspector_acls.xml | 2 +- config/imspector/imspector_replacements.xml | 2 +- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/imspector/imspector.inc b/config/imspector/imspector.inc index 7ade2e68..2d672e87 100644 --- a/config/imspector/imspector.inc +++ b/config/imspector/imspector.inc @@ -91,7 +91,7 @@ } } - function validate_form_imspector($post, $input_errors) { + function validate_form_imspector($post, &$input_errors) { if($post['iface_array']) foreach($post['iface_array'] as $iface) if($iface == 'wanx') diff --git a/config/imspector/imspector.xml b/config/imspector/imspector.xml index fad8d656..11d5e7ad 100644 --- a/config/imspector/imspector.xml +++ b/config/imspector/imspector.xml @@ -43,7 +43,7 @@ Describe your package requirements here Currently there are no FAQ items provided. imspector - 20111108 + 20111108_1 pkg v 0.3.2 Services: IMSpector Save /usr/local/pkg/imspector.inc @@ -239,7 +239,7 @@ - validate_form_imspector($_POST, &$input_errors); + validate_form_imspector($_POST, $input_errors); sync_package_imspector(); diff --git a/config/imspector/imspector_acls.xml b/config/imspector/imspector_acls.xml index a8aeecc9..79feb64e 100644 --- a/config/imspector/imspector_acls.xml +++ b/config/imspector/imspector_acls.xml @@ -161,7 +161,7 @@ - validate_form_imspector($_POST, &$input_errors); + validate_form_imspector($_POST, $input_errors); sync_package_imspector(); diff --git a/config/imspector/imspector_replacements.xml b/config/imspector/imspector_replacements.xml index 7f53bbd4..65e3d078 100644 --- a/config/imspector/imspector_replacements.xml +++ b/config/imspector/imspector_replacements.xml @@ -175,7 +175,7 @@ - validate_form_imspector($_POST, &$input_errors); + validate_form_imspector($_POST, $input_errors); sync_package_imspector(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 7139f774..11ff93ea 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -715,7 +715,7 @@ http://www.imspector.org/ Network Management marcellocoutinho@gmail.com - 20111108_1 pkg v 0.3.1 + 20111108_1 pkg v 0.3.2 2.2 BETA https://doc.pfsense.org/index.php/IMSpector_package diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 3758f2f1..e5f13d38 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -968,7 +968,7 @@ http://www.imspector.org/ Network Management marcellocoutinho@gmail.com - 20111108 pkg v 0.3.1 + 20111108 pkg v 0.3.2 2.0 BETA https://doc.pfsense.org/index.php/IMSpector_package diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 21a05c24..5d5cfa84 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -955,7 +955,7 @@ http://www.imspector.org/ Network Management marcellocoutinho@gmail.com - 20111108 pkg v 0.3.1 + 20111108 pkg v 0.3.2 2.0 BETA https://doc.pfsense.org/index.php/IMSpector_package -- cgit v1.2.3 From d4b90b36268048a2c1c90512ce4087f4bd574b14 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:19:08 -0400 Subject: Fix call-time pass-by-reference in lcdproc --- config/lcdproc/lcdproc.inc | 8 ++++---- config/lcdproc/lcdproc.xml | 6 +++--- config/lcdproc/lcdproc_screens.xml | 4 ++-- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/lcdproc/lcdproc.inc b/config/lcdproc/lcdproc.inc index 1c628c6a..760732df 100644 --- a/config/lcdproc/lcdproc.inc +++ b/config/lcdproc/lcdproc.inc @@ -72,7 +72,7 @@ chmod($file, 0755); } - function before_form_lcdproc($pkg) { + function before_form_lcdproc(&$pkg) { global $config; config_lock(); @@ -80,7 +80,7 @@ config_unlock(); } - function before_form_lcdproc_screens($pkg) { + function before_form_lcdproc_screens(&$pkg) { global $config; config_lock(); @@ -88,7 +88,7 @@ config_unlock(); } - function validate_form_lcdproc($post, $input_errors) { + function validate_form_lcdproc($post, &$input_errors) { if($post['comport']) { switch($post['comport']) { case "none": @@ -155,7 +155,7 @@ } } } - function validate_form_lcdproc_screens($post, $input_errors) { + function validate_form_lcdproc_screens($post, &$input_errors) { // No validation required ?! } diff --git a/config/lcdproc/lcdproc.xml b/config/lcdproc/lcdproc.xml index ba46e941..8f268b49 100644 --- a/config/lcdproc/lcdproc.xml +++ b/config/lcdproc/lcdproc.xml @@ -2,7 +2,7 @@ Services: LCDproc lcdproc - 0.5.2_1-p12 + 0.5.5 pkg.v.1.0.1 Save /usr/local/pkg/lcdproc.inc @@ -363,10 +363,10 @@ - before_form_lcdproc(&$pkg); + before_form_lcdproc($pkg); - validate_form_lcdproc($_POST, &$input_errors); + validate_form_lcdproc($_POST, $input_errors); sync_package_lcdproc(); diff --git a/config/lcdproc/lcdproc_screens.xml b/config/lcdproc/lcdproc_screens.xml index b807d9f0..d8cc2382 100644 --- a/config/lcdproc/lcdproc_screens.xml +++ b/config/lcdproc/lcdproc_screens.xml @@ -90,10 +90,10 @@ - before_form_lcdproc_screens(&$pkg); + before_form_lcdproc_screens($pkg); - validate_form_lcdproc_screens($_POST, &$input_errors); + validate_form_lcdproc_screens($_POST, $input_errors); sync_package_lcdproc_screens(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 11ff93ea..531f37cb 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -982,7 +982,7 @@ LCD display driver http://www.lcdproc.org/ Utility - lcdproc-0.5.5 + lcdproc-0.5.5 pkg.v.1.0.1 BETA 2.2 seth.mos@dds.nl diff --git a/pkg_config.8.xml b/pkg_config.8.xml index e5f13d38..3e1a7c0e 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1287,7 +1287,7 @@ LCD display driver http://www.lcdproc.org/ Utility - lcdproc-0.5.5 + lcdproc-0.5.5 pkg.v.1.0.1 BETA 1.2.1 seth.mos@dds.nl diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 5d5cfa84..6ad058cc 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1274,7 +1274,7 @@ LCD display driver http://www.lcdproc.org/ Utility - lcdproc-0.5.5 + lcdproc-0.5.5 pkg.v.1.0.1 BETA 1.2.1 seth.mos@dds.nl -- cgit v1.2.3 From a890380266da7f589b809701bd3d0e8ac715e82f Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:21:06 -0400 Subject: Fix call-time pass-by-reference in lcdproc-dev, bump --- config/lcdproc-dev/lcdproc.inc | 8 ++++---- config/lcdproc-dev/lcdproc.xml | 8 ++++---- config/lcdproc-dev/lcdproc_screens.xml | 4 ++-- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index 8b3ce28f..00768cd7 100644 --- a/config/lcdproc-dev/lcdproc.inc +++ b/config/lcdproc-dev/lcdproc.inc @@ -58,17 +58,17 @@ fclose($handle); chmod($file, 0755); } - function before_form_lcdproc($pkg) { + function before_form_lcdproc(&$pkg) { global $config; config_lock(); config_unlock(); } - function before_form_lcdproc_screens($pkg) { + function before_form_lcdproc_screens(&$pkg) { global $config; config_lock(); config_unlock(); } - function validate_form_lcdproc($post, $input_errors) { + function validate_form_lcdproc($post, &$input_errors) { if($post['comport']) { switch($post['comport']) { case "none": @@ -126,7 +126,7 @@ } } } - function validate_form_lcdproc_screens($post, $input_errors) { + function validate_form_lcdproc_screens($post, &$input_errors) { // No validation required ?! } function sync_package_lcdproc_screens() { diff --git a/config/lcdproc-dev/lcdproc.xml b/config/lcdproc-dev/lcdproc.xml index cf816d53..588b898b 100644 --- a/config/lcdproc-dev/lcdproc.xml +++ b/config/lcdproc-dev/lcdproc.xml @@ -1,8 +1,8 @@ - Services: LCDproc 0.5.6 pkg v. 0.9.7 + Services: LCDproc 0.5.6 pkg v. 0.9.9 lcdproc - 0.5.6 pkg v. 0.9.7 + 0.5.6 pkg v. 0.9.9 Save /usr/local/pkg/lcdproc.inc @@ -658,10 +658,10 @@ - before_form_lcdproc(&$pkg); + before_form_lcdproc($pkg); - validate_form_lcdproc($_POST, &$input_errors); + validate_form_lcdproc($_POST, $input_errors); sync_package_lcdproc(); diff --git a/config/lcdproc-dev/lcdproc_screens.xml b/config/lcdproc-dev/lcdproc_screens.xml index f7c70086..9f4a8e2e 100644 --- a/config/lcdproc-dev/lcdproc_screens.xml +++ b/config/lcdproc-dev/lcdproc_screens.xml @@ -106,10 +106,10 @@ - before_form_lcdproc_screens(&$pkg); + before_form_lcdproc_screens($pkg); - validate_form_lcdproc_screens($_POST, &$input_errors); + validate_form_lcdproc_screens($_POST, $input_errors); sync_package_lcdproc_screens(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 531f37cb..c2859517 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1000,7 +1000,7 @@ LCD display driver - Development version http://www.lcdproc.org/ Utility - lcdproc-0.5.6 pkg v. 0.9.8 + lcdproc-0.5.6 pkg v. 0.9.9 BETA 2.2 michele@nt2.it diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 3e1a7c0e..30047046 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1305,7 +1305,7 @@ LCD display driver - Development version http://www.lcdproc.org/ Utility - lcdproc-0.5.6 pkg v. 0.9.8 + lcdproc-0.5.6 pkg v. 0.9.9 BETA 2.0 michele@nt2.it diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 6ad058cc..ebe74c1e 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1292,7 +1292,7 @@ LCD display driver - Development version http://www.lcdproc.org/ Utility - lcdproc-0.5.6 pkg v. 0.9.8 + lcdproc-0.5.6 pkg v. 0.9.9 BETA 2.0 michele@nt2.it -- cgit v1.2.3 From 1d4b895614b279345659592ff7c808a3ce045946 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:24:49 -0400 Subject: Fix call-time pass-by-reference in spamd, bump --- config/spamd/spamd.inc | 2 +- config/spamd/spamd_settings.xml | 4 ++-- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/spamd/spamd.inc b/config/spamd/spamd.inc index 18b4e241..0bd29bd8 100644 --- a/config/spamd/spamd.inc +++ b/config/spamd/spamd.inc @@ -324,7 +324,7 @@ function spamd_install_cron($should_install) { } } -function spamd_validate_input($post, $input_errors) { +function spamd_validate_input($post, &$input_errors) { global $config, $g; $nextmta = str_replace("$", "", $post['nextmta']); if(stristr($nextmta, "{")) { diff --git a/config/spamd/spamd_settings.xml b/config/spamd/spamd_settings.xml index 2607e87f..7ed4c572 100644 --- a/config/spamd/spamd_settings.xml +++ b/config/spamd/spamd_settings.xml @@ -42,7 +42,7 @@ Describe your package requirements here Currently there are no FAQ items provided. spamdsettings - 0.1.0 + 1.1.1 SpamD Settings pkg_edit.php?xml=spamd_settings.xml&id=0 /usr/local/pkg/spamd.inc @@ -185,7 +185,7 @@ - spamd_validate_input($_POST, &$input_errors); + spamd_validate_input($_POST, $input_errors); sync_package_spamd(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index c2859517..9e36fa6d 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -410,7 +410,7 @@ Services https://packages.pfsense.org/packages/config/spamd/spamd.xml spamd-4.9.1_1-##ARCH##.pbi - 4.9.1_1 v1.1 + 4.9.1_1 v1.1.1 Beta 2.2 spamd.xml diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 30047046..49af2956 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -566,7 +566,7 @@ https://files.pfsense.org/packages/8/All/ spamd-4.9.1.tbz spamd-4.9.1-i386.pbi - 4.9.1 v1.1 + 4.9.1 v1.1.1 Beta 1.2.1 spamd.xml diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index ebe74c1e..ba2690e1 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -553,7 +553,7 @@ https://files.pfsense.org/packages/amd64/8/All/ spamd-4.9.1.tbz spamd-4.9.1-amd64.pbi - 4.9.1 v1.1 + 4.9.1 v1.1.1 Beta 1.2.1 spamd.xml -- cgit v1.2.3 From b0edfbc11834ad9f197eb40730660aee84b8f229 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:29:10 -0400 Subject: Fix call-time pass-by-reference in squid, bump --- config/squid/squid.inc | 12 ++++++------ config/squid/squid.xml | 4 ++-- config/squid/squid_auth.xml | 2 +- config/squid/squid_cache.xml | 2 +- config/squid/squid_nac.xml | 2 +- config/squid/squid_traffic.xml | 2 +- config/squid/squid_upstream.xml | 2 +- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/squid/squid.inc b/config/squid/squid.inc index e136d9f8..9f7fe2b0 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -299,7 +299,7 @@ function squid_before_form_general($pkg) { $field['options']['option'][] = array('name' => $names[$i], 'value' => $values[$i]); } -function squid_validate_general($post, $input_errors) { +function squid_validate_general($post, &$input_errors) { global $config; $settings = $config['installedpackages']['squid']['config'][0]; $port = ($settings['proxy_port'] ? $settings['proxy_port'] : 3128); @@ -356,7 +356,7 @@ function squid_validate_general($post, $input_errors) { }} } -function squid_validate_upstream($post, $input_errors) { +function squid_validate_upstream($post, &$input_errors) { if ($post['proxy_forwarding'] == 'on') { $addr = trim($post['proxy_addr']); if (empty($addr)) @@ -378,7 +378,7 @@ function squid_validate_upstream($post, $input_errors) { } } -function squid_validate_cache($post, $input_errors) { +function squid_validate_cache($post, &$input_errors) { $num_fields = array( 'harddisk_cache_size' => 'Hard disk cache size', 'memory_cache_size' => 'Memory cache size', 'maximum_object_size' => 'Maximum object size', @@ -417,7 +417,7 @@ function squid_validate_cache($post, $input_errors) { } -function squid_validate_nac($post, $input_errors) { +function squid_validate_nac($post, &$input_errors) { $allowed_subnets = explode("\n", $post['allowed_subnets']); foreach ($allowed_subnets as $subnet) { $subnet = trim($subnet); @@ -456,7 +456,7 @@ function squid_validate_nac($post, $input_errors) { } } -function squid_validate_traffic($post, $input_errors) { +function squid_validate_traffic($post, &$input_errors) { $num_fields = array( 'max_download_size' => 'Maximum download size', 'max_upload_size' => 'Maximum upload size', 'perhost_throttling' => 'Per-host bandwidth throttling', @@ -488,7 +488,7 @@ function squid_validate_traffic($post, $input_errors) { } -function squid_validate_auth($post, $input_errors) { +function squid_validate_auth($post, &$input_errors) { $num_fields = array( array('auth_processes', 'Authentication processes', 1), array('auth_ttl', 'Authentication TTL', 0), ); diff --git a/config/squid/squid.xml b/config/squid/squid.xml index 32a65589..88bd94ec 100644 --- a/config/squid/squid.xml +++ b/config/squid/squid.xml @@ -46,7 +46,7 @@ Describe your package requirements here Currently there are no FAQ items provided. squid - 2.6.STABLE18 + 2.7.9 pkg v.4.3.4 Proxy server: General settings /usr/local/pkg/squid.inc @@ -326,7 +326,7 @@ squid_resync(); - squid_validate_general($_POST, &$input_errors); + squid_validate_general($_POST, $input_errors); squid_resync(); diff --git a/config/squid/squid_auth.xml b/config/squid/squid_auth.xml index d28beb02..e20d5609 100644 --- a/config/squid/squid_auth.xml +++ b/config/squid/squid_auth.xml @@ -220,7 +220,7 @@ - squid_validate_auth($_POST, &$input_errors); + squid_validate_auth($_POST, $input_errors); squid_print_javascript_auth2(); diff --git a/config/squid/squid_cache.xml b/config/squid/squid_cache.xml index 35c9a934..e4338ca8 100644 --- a/config/squid/squid_cache.xml +++ b/config/squid/squid_cache.xml @@ -222,7 +222,7 @@ } - squid_validate_cache($_POST, &$input_errors); + squid_validate_cache($_POST, $input_errors); squid_resync(); diff --git a/config/squid/squid_nac.xml b/config/squid/squid_nac.xml index 4ad3800c..96ac2fe8 100644 --- a/config/squid/squid_nac.xml +++ b/config/squid/squid_nac.xml @@ -151,7 +151,7 @@ - squid_validate_nac($_POST, &$input_errors); + squid_validate_nac($_POST, $input_errors); squid_resync(); diff --git a/config/squid/squid_traffic.xml b/config/squid/squid_traffic.xml index c660a1ea..263615dd 100644 --- a/config/squid/squid_traffic.xml +++ b/config/squid/squid_traffic.xml @@ -169,7 +169,7 @@ - squid_validate_traffic($_POST, &$input_errors); + squid_validate_traffic($_POST, $input_errors); squid_resync(); diff --git a/config/squid/squid_upstream.xml b/config/squid/squid_upstream.xml index cd87edef..4d9b2ca2 100644 --- a/config/squid/squid_upstream.xml +++ b/config/squid/squid_upstream.xml @@ -125,7 +125,7 @@ - squid_validate_upstream($_POST, &$input_errors); + squid_validate_upstream($_POST, $input_errors); squid_resync(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 9e36fa6d..721e7680 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -916,7 +916,7 @@ High performance web proxy cache. http://www.squid-cache.org/ Network - 2.7.9 pkg v.4.3.3 + 2.7.9 pkg v.4.3.4 Stable 2.2 fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 49af2956..4ee16451 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1203,7 +1203,7 @@ High performance web proxy cache. http://www.squid-cache.org/ Network - 2.7.9 pkg v.4.3.3 + 2.7.9 pkg v.4.3.4 Stable 2 fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index ba2690e1..2ed6c637 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1190,7 +1190,7 @@ High performance web proxy cache. http://www.squid-cache.org/ Network - 2.7.9 pkg v.4.3.3 + 2.7.9 pkg v.4.3.4 Stable 2 fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org -- cgit v1.2.3 From 173c5007b5f863fb642bc86bf906c9eb80ac32e7 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:46:24 -0400 Subject: Fix call-time pass-by-reference in Squidguard, bump --- config/squidGuard/squidguard.inc | 50 +++++++++++++-------------- config/squidGuard/squidguard.xml | 6 ++-- config/squidGuard/squidguard_acl.xml | 4 +-- config/squidGuard/squidguard_configurator.inc | 50 +++++++++++++-------------- config/squidGuard/squidguard_default.xml | 4 +-- config/squidGuard/squidguard_dest.xml | 4 +-- config/squidGuard/squidguard_log.php | 8 ++--- config/squidGuard/squidguard_rewr.xml | 2 +- config/squidGuard/squidguard_time.xml | 2 +- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 12 files changed, 68 insertions(+), 68 deletions(-) diff --git a/config/squidGuard/squidguard.inc b/config/squidGuard/squidguard.inc index d58dfb79..0fd450b7 100644 --- a/config/squidGuard/squidguard.inc +++ b/config/squidGuard/squidguard.inc @@ -101,26 +101,26 @@ sg_init(convert_pfxml_to_sgxml()); # ============================================================================== # Validations # ============================================================================== -function squidguard_validate($post, $input_errors) +function squidguard_validate(&$post, &$input_errors) { $submit = isset($_GET['submit']) ? $_GET['submit'] : $_POST['submit']; # check config if 'Apply' - if ($submit === APPLY_BTN) sg_check_config_data(&$input_errors); + if ($submit === APPLY_BTN) sg_check_config_data($input_errors); } # ------------------------------------------------------------------------------ # validate default # ------------------------------------------------------------------------------ -function squidguard_validate_default($post, $input_errors) +function squidguard_validate_default(&$post, &$input_errors) { - squidguard_validate_acl($post, &$input_errors); + squidguard_validate_acl($post, $input_errors); } # ------------------------------------------------------------------------------ # validate acl # ------------------------------------------------------------------------------ -function squidguard_validate_acl($post, $input_errors) +function squidguard_validate_acl(&$post, &$input_errors) { $pass_up = array(); $deny_up = array(); @@ -134,7 +134,7 @@ function squidguard_validate_acl($post, $input_errors) $name = trim($post[F_NAME]); if(!empty($name)) { # validate name format - check_name_format($name, &$input_errors); + check_name_format($name, $input_errors); # check unique name if (!sg_check_unique_name(F_ACLS, $name)) @@ -148,7 +148,7 @@ function squidguard_validate_acl($post, $input_errors) $sgx = array(); $sgx[F_NAME] = $post[F_NAME]; $sgx[F_SOURCE] = $post[F_SOURCE]; - sg_check_src($sgx, &$input_errors); + sg_check_src($sgx, $input_errors); } # store destinations to 'dest' value @@ -192,7 +192,7 @@ function squidguard_validate_acl($post, $input_errors) # check redirect $errmsg = ''; - if (!sg_check_redirect($post[F_RMOD], $post[F_REDIRECT], &$errmsg)) { + if (!sg_check_redirect($post[F_RMOD], $post[F_REDIRECT], $errmsg)) { $input_errors[] = "Redirect info error. $errmsg"; } } @@ -203,14 +203,14 @@ function squidguard_validate_acl($post, $input_errors) # date: