aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/apache_mod_security-dev/apache_logs_data.php2
-rw-r--r--config/apache_mod_security-dev/apache_logs_data.teste.php2
-rw-r--r--config/diag_states_pt/diag_new_states.xml4
-rw-r--r--config/tftp2/tftp.xml4
-rw-r--r--config/tftp2/tftp_files.php11
-rw-r--r--config/tinc/tinc.inc46
-rw-r--r--config/tinc/tinc.xml3
-rw-r--r--config/tinc/tinc_hosts.xml3
-rw-r--r--config/widentd/widentd.xml5
-rw-r--r--pkg_config.10.xml10
-rw-r--r--pkg_config.8.xml8
-rw-r--r--pkg_config.8.xml.amd648
12 files changed, 57 insertions, 49 deletions
diff --git a/config/apache_mod_security-dev/apache_logs_data.php b/config/apache_mod_security-dev/apache_logs_data.php
index fdcc04b0..2410a547 100644
--- a/config/apache_mod_security-dev/apache_logs_data.php
+++ b/config/apache_mod_security-dev/apache_logs_data.php
@@ -91,7 +91,7 @@ if ($_GET) {
if (preg_match($regex, $logline[0],$line)) {
// Apply filter and color
if ($filter != "")
- $line = preg_replace("@($filter)@i","<spam><font color='red'>$1</font></span>",$line);
+ $line = preg_replace("@($filter)@i","<span><font color='red'>$1</font></span>",$line);
$agent_info="onmouseover=\"jQuery('#browserinfo').empty().html('{$line[13]}');\"\n";
echo "<tr valign=\"top\" $agent_info>\n";
echo "<td class=\"listlr\" align=\"center\" nowrap>{$line[5]}({$line[6]})</td>\n";
diff --git a/config/apache_mod_security-dev/apache_logs_data.teste.php b/config/apache_mod_security-dev/apache_logs_data.teste.php
index c3f270bf..619a856a 100644
--- a/config/apache_mod_security-dev/apache_logs_data.teste.php
+++ b/config/apache_mod_security-dev/apache_logs_data.teste.php
@@ -64,7 +64,7 @@ if ($_GET) {
// Apply filter and color
// Need validate special chars
if ($filter != "")
- $logline = preg_replace("@($filter)@i","<spam><font color='red'>$1</font></span>",$logline);
+ $logline = preg_replace("@($filter)@i","<span><font color='red'>$1</font></span>",$logline);
echo $logline[0]."\n<br/>";
}
diff --git a/config/diag_states_pt/diag_new_states.xml b/config/diag_states_pt/diag_new_states.xml
index 941d69fc..3a36027b 100644
--- a/config/diag_states_pt/diag_new_states.xml
+++ b/config/diag_states_pt/diag_new_states.xml
@@ -42,13 +42,13 @@
]]>
</copyright>
<name>diag_new_states</name>
- <version>0.3</version>
+ <version>0.3.1</version>
<title>Diagnostics: States New</title>
<menu>
<name>States New</name>
<tooltiptext>States by Paul Taylor</tooltiptext>
<section>Diagnostics</section>
- <url>diag_new_states.php</url>
+ <url>/diag_new_states.php</url>
</menu>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
diff --git a/config/tftp2/tftp.xml b/config/tftp2/tftp.xml
index 33fb9c3d..f45a344a 100644
--- a/config/tftp2/tftp.xml
+++ b/config/tftp2/tftp.xml
@@ -43,7 +43,7 @@
]]>
</copyright>
<name>tftp Settings</name>
- <version>2.2.2</version>
+ <version>2.2.3</version>
<title>TFTP: Settings</title>
<include_file>/usr/local/pkg/tftp.inc</include_file>
<menu>
@@ -51,7 +51,7 @@
<tooltiptext>Add or Remove files for TFTP.</tooltiptext>
<section>Services</section>
<configfile>tftp.xml</configfile>
- <url>tftp_files.php</url>
+ <url>/tftp_files.php</url>
</menu>
<service>
<name>tftp</name>
diff --git a/config/tftp2/tftp_files.php b/config/tftp2/tftp_files.php
index 0352f4a0..e2e81ed4 100644
--- a/config/tftp2/tftp_files.php
+++ b/config/tftp2/tftp_files.php
@@ -133,17 +133,6 @@ if ($savemsg) {
?>
<div id="mainlevel">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr><td class="tabnavtbl">
-<?php
-
- $tab_array = array();
- $tab_array[] = array(gettext("TFTP"), false, "tftp_files.php");
- display_top_tabs($tab_array);
-
-?>
-</td></tr>
-</table>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
diff --git a/config/tinc/tinc.inc b/config/tinc/tinc.inc
index 81e506b4..56aa3db9 100644
--- a/config/tinc/tinc.inc
+++ b/config/tinc/tinc.inc
@@ -26,7 +26,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
-
+require_once('config.inc');
+require_once('service-utils.inc');
+require_once('util.inc');
/* include_once('guiconfig.inc'); is needed for clear_log_file() during package installation while booting.
* However, guiconfig.inc includes authgui.inc which requires a valid php session_auth() and exits when not found.
* So we include the function here.
@@ -34,7 +36,8 @@
if (!function_exists('clear_log_file')) {
function clear_log_file($logfile = "/var/log/system.log", $restart_syslogd = true) {
- global $config, $g;
+ require_once('system.inc');
+ global $config;
if ($restart_syslogd) {
exec("/usr/bin/killall syslogd");
}
@@ -65,8 +68,11 @@ function tinc_save() {
safe_mkdir("{$configpath}");
safe_mkdir("{$configpath}/hosts");
touch("{$configpath}/WARNING-ENTIRE_DIRECTORY_ERASED_ON_SAVE_FROM_GUI");
- $tincconf = &$config['installedpackages']['tinc']['config'][0];
- $fout = fopen("{$configpath}/tinc.conf", "w");
+ if (is_array($config['installedpackages']['tinc']['config'])) {
+ $tincconf = &$config['installedpackages']['tinc']['config'][0];
+ } else {
+ $tincconf = array();
+ }
// No proper config, bail out.
if (!isset($tincconf['name']) || empty($tincconf['name'])) {
@@ -74,13 +80,15 @@ function tinc_save() {
return;
}
+ $fout = fopen("{$configpath}/tinc.conf", "w");
fwrite($fout, "name=" . $tincconf['name'] . "\n");
fwrite($fout, "AddressFamily=" . $tincconf['addressfamily'] . "\n");
+
if (!is_array($config['installedpackages']['tinchosts']['config'])) {
- $config['installedpackages']['tinchosts']['config']= array();
+ $config['installedpackages']['tinchosts']['config'] = array();
}
foreach ($config['installedpackages']['tinchosts']['config'] as $host) {
- if($host['connect']) {
+ if ($host['connect']) {
fwrite($fout, "ConnectTo=" . $host['name'] . "\n");
}
@@ -158,24 +166,36 @@ function tinc_save() {
}
if ($tincconf['enable'] != "") {
- restart_service("tinc");
- } elseif (is_process_running("tincd")) {
- stop_service("tinc");
+ tinc_write_rcfile();
+ if (is_service_running("tinc")) {
+ restart_service("tinc");
+ } else {
+ start_service("tinc");
+ }
+ } else {
+ if (is_process_running("tincd")) {
+ stop_service("tinc");
+ }
+ unlink_if_exists("/usr/local/etc/rc.d/tinc.sh");
}
rmdir_recursive("/usr/local/etc/tinc.old");
conf_mount_ro();
}
+function tinc_write_rcfile() {
+ $rc['file'] = 'tinc.sh';
+ $rc['start'] .= "/usr/local/sbin/tincd --config=/usr/local/etc/tinc\n\t";
+ $rc['stop'] .= "/usr/local/sbin/tincd --kill \n\t";
+ write_rcfile($rc);
+}
+
function tinc_install() {
global $config;
safe_mkdir("/usr/local/etc/tinc");
safe_mkdir("/usr/local/etc/tinc/hosts");
- $rc['file'] = 'tinc.sh';
- $rc['start'] .= "/usr/local/sbin/tincd --config=/usr/local/etc/tinc\n\t";
- $rc['stop'] .= "/usr/local/sbin/tincd --kill \n\t";
- write_rcfile($rc);
+ tinc_write_rcfile();
unlink_if_exists("/usr/local/etc/rc.d/tincd");
clear_log_file("/var/log/tinc.log");
diff --git a/config/tinc/tinc.xml b/config/tinc/tinc.xml
index 0f71e03d..be4a8d65 100644
--- a/config/tinc/tinc.xml
+++ b/config/tinc/tinc.xml
@@ -42,10 +42,9 @@
</copyright>
<description>A self-contained VPN solution designed to connect multiple sites together in a secure way.</description>
<name>tinc</name>
- <version>1.2.4</version>
+ <version>1.2.5</version>
<title>VPN: Tinc: Settings</title>
<include_file>/usr/local/pkg/tinc.inc</include_file>
- <configpath>['installedpackages']['package']['$packagename']['config']</configpath>
<menu>
<name>tinc</name>
<section>VPN</section>
diff --git a/config/tinc/tinc_hosts.xml b/config/tinc/tinc_hosts.xml
index a10c1a9e..7fe8546a 100644
--- a/config/tinc/tinc_hosts.xml
+++ b/config/tinc/tinc_hosts.xml
@@ -41,10 +41,9 @@
]]>
</copyright>
<name>tinchosts</name>
- <version>1.2.4</version>
+ <version>1.2.5</version>
<title>VPN: Tinc: Hosts</title>
<include_file>/usr/local/pkg/tinc.inc</include_file>
- <configpath>['installedpackages']['package']['$packagename']['config']</configpath>
<tabs>
<tab>
<text>Settings</text>
diff --git a/config/widentd/widentd.xml b/config/widentd/widentd.xml
index 9730160c..00e481a0 100644
--- a/config/widentd/widentd.xml
+++ b/config/widentd/widentd.xml
@@ -42,13 +42,13 @@
]]>
</copyright>
<name>widentd</name>
- <version>1.0.5</version>
+ <version>1.0.6</version>
<title>Services: widentd</title>
<menu>
<name>widentd</name>
<tooltiptext>Modify widentd settings.</tooltiptext>
<section>Services</section>
- <url>pkg_edit.php?xml=widentd.xml</url>
+ <url>/pkg_edit.php?xml=widentd.xml</url>
</menu>
<service>
<name>widentd</name>
@@ -59,7 +59,6 @@
<item>https://packages.pfsense.org/packages/config/widentd/widentd.priv.inc</item>
<prefix>/etc/inc/priv/</prefix>
</additional_files_needed>
- <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<fields>
<field>
<fielddescr>Enable widentd Daemon</fielddescr>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index eec3985f..54eaf926 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -336,7 +336,7 @@
<pkginfolink/>
<port_category>ftp</port_category>
<config_file>https://packages.pfsense.org/packages/config/tftp2/tftp.xml</config_file>
- <version>2.2.2</version>
+ <version>2.2.3</version>
<status>RELEASE</status>
<required_version>2.2</required_version>
<configurationfile>tftp.xml</configurationfile>
@@ -864,7 +864,7 @@
<name>diag_new_states</name>
<descr>Paul Taylor's version of Diagnostics States which utilizes pftop.</descr>
<category>Network Management</category>
- <version>0.3.1</version>
+ <version>0.3.2</version>
<maintainer>ptaylor@addressplus.net</maintainer>
<required_version>2.2</required_version>
<status>BETA</status>
@@ -914,7 +914,7 @@
<website>http://bsdforge.com/projects/source/net/widentd/</website>
<category>Services</category>
<depends_on_package_pbi>widentd-1.03_2-##ARCH##.pbi</depends_on_package_pbi>
- <version>1.0.5</version>
+ <version>1.0.6</version>
<status>RELEASE</status>
<pkginfolink>https://doc.pfsense.org/index.php/Widentd_package</pkginfolink>
<required_version>2.2</required_version>
@@ -1446,6 +1446,8 @@
<port_category>sysutils</port_category>
<required_version>2.2</required_version>
<configurationfile>systempatches.xml</configurationfile>
+ <!-- Skip auto sync to 2.3 format -->
+ <maximum_version>2.2.999</maximum_version>
</package>
<package>
<name>bacula-client</name>
@@ -1533,7 +1535,7 @@
<build_pbi>
<port>security/tinc</port>
</build_pbi>
- <version>1.2.4</version>
+ <version>1.2.5</version>
<status>ALPHA</status>
<pkginfolink>https://doc.pfsense.org/index.php/tinc_package</pkginfolink>
<required_version>2.2</required_version>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 69d40abb..d07e6a87 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -383,7 +383,7 @@
<pkginfolink/>
<config_file>https://packages.pfsense.org/packages/config/tftp2/tftp.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <version>2.2.2</version>
+ <version>2.2.3</version>
<status>Stable</status>
<required_version>2.0</required_version>
<configurationfile>tftp.xml</configurationfile>
@@ -882,7 +882,7 @@
<descr>Paul Taylors version of Diagnostics States which utilizes pftop.</descr>
<website>http://www.addressplus.net</website>
<category>Network Management</category>
- <version>0.3.1</version>
+ <version>0.3.2</version>
<maintainer>ptaylor@addressplus.net</maintainer>
<required_version>1.2.1</required_version>
<status>BETA</status>
@@ -929,7 +929,7 @@
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
<depends_on_package>widentd-1.03_1.tbz</depends_on_package>
<depends_on_package_pbi>widentd-1.03_1-i386.pbi</depends_on_package_pbi>
- <version>1.05</version>
+ <version>1.06</version>
<status>Stable</status>
<pkginfolink>https://doc.pfsense.org/index.php/Widentd_package</pkginfolink>
<required_version>1.2.1</required_version>
@@ -1607,7 +1607,7 @@
<port>security/tinc</port>
</build_pbi>
<build_options></build_options>
- <version>1.0.23 pkg v1.2.4</version>
+ <version>1.0.23 pkg v1.2.5</version>
<status>ALPHA</status>
<pkginfolink>https://doc.pfsense.org/index.php/tinc_package</pkginfolink>
<required_version>2.1</required_version>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index c8a2d1c3..fa203c48 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -383,7 +383,7 @@
<pkginfolink/>
<config_file>https://packages.pfsense.org/packages/config/tftp2/tftp.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <version>2.2.2</version>
+ <version>2.2.3</version>
<status>Stable</status>
<required_version>2.0</required_version>
<configurationfile>tftp.xml</configurationfile>
@@ -882,7 +882,7 @@
<descr>Paul Taylors version of Diagnostics States which utilizes pftop.</descr>
<website>http://www.addressplus.net</website>
<category>Network Management</category>
- <version>0.3.1</version>
+ <version>0.3.2</version>
<maintainer>ptaylor@addressplus.net</maintainer>
<required_version>1.2.1</required_version>
<status>BETA</status>
@@ -929,7 +929,7 @@
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
<depends_on_package>widentd-1.03_1.tbz</depends_on_package>
<depends_on_package_pbi>widentd-1.03_1-amd64.pbi</depends_on_package_pbi>
- <version>1.05</version>
+ <version>1.06</version>
<status>Stable</status>
<pkginfolink>https://doc.pfsense.org/index.php/Widentd_package</pkginfolink>
<required_version>1.2.1</required_version>
@@ -1607,7 +1607,7 @@
<port>security/tinc</port>
</build_pbi>
<build_options></build_options>
- <version>1.0.23 pkg v1.2.4</version>
+ <version>1.0.23 pkg v1.2.5</version>
<status>ALPHA</status>
<pkginfolink>https://doc.pfsense.org/index.php/tinc_package</pkginfolink>
<required_version>2.1</required_version>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-20 10:18:08 +0000