diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-11-06 17:52:24 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-11-06 17:52:24 -0200 |
| commit | 95ef24fa5e90e51b519fa2dfb68d9de92569a31c (patch) | |
| tree | aa13038c0ea99c3d588f4702f8eb7d37e2507d0a | |
| parent | 71ee376fb3cd7daa571dc0b45f20ee3934508291 (diff) | |
| download | FreeBSD-ports-95ef24fa5e90e51b519fa2dfb68d9de92569a31c.zip FreeBSD-ports-95ef24fa5e90e51b519fa2dfb68d9de92569a31c.tar.gz | |
Catch up with recent packages changes
64 files changed, 511 insertions, 361 deletions
diff --git a/benchmarks/pfSense-pkg-iperf/files/usr/local/share/pfSense-pkg-iperf/info.xml b/benchmarks/pfSense-pkg-iperf/files/usr/local/share/pfSense-pkg-iperf/info.xml index 474fde5..4b00049 100644 --- a/benchmarks/pfSense-pkg-iperf/files/usr/local/share/pfSense-pkg-iperf/info.xml +++ b/benchmarks/pfSense-pkg-iperf/files/usr/local/share/pfSense-pkg-iperf/info.xml @@ -8,7 +8,7 @@ <config_file>https://packages.pfsense.org/packages/config/iperf/iperf.xml</config_file> <depends_on_package_pbi>iperf-2.0.5-##ARCH##.pbi</depends_on_package_pbi> <version>2.0.5.2</version> - <status>Beta</status> + <status>BETA</status> <pkginfolink>https://doc.pfsense.org/index.php/Iperf_package</pkginfolink> <required_version>2.2</required_version> <configurationfile>iperf.xml</configurationfile> diff --git a/emulators/pfSense-pkg-Open-VM-Tools/files/usr/local/share/pfSense-pkg-Open-VM-Tools/info.xml b/emulators/pfSense-pkg-Open-VM-Tools/files/usr/local/share/pfSense-pkg-Open-VM-Tools/info.xml index 341009c..fdca2d8 100644 --- a/emulators/pfSense-pkg-Open-VM-Tools/files/usr/local/share/pfSense-pkg-Open-VM-Tools/info.xml +++ b/emulators/pfSense-pkg-Open-VM-Tools/files/usr/local/share/pfSense-pkg-Open-VM-Tools/info.xml @@ -4,9 +4,9 @@ <name>Open-VM-Tools</name> <descr><![CDATA[VMware Tools is a suite of utilities that enhances the performance of the virtual machine's guest operating system and improves management of the virtual machine.]]></descr> <website>http://open-vm-tools.sourceforge.net/</website> - <category>Services</category> + <category>System</category> <version>1280544.12</version> - <status>Stable</status> + <status>RELEASE</status> <pkginfolink>https://doc.pfsense.org/index.php/Open_VM_Tools_package</pkginfolink> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/open-vm-tools_2/open-vm-tools.xml</config_file> diff --git a/ftp/pfSense-pkg-FTP_Client_Proxy/files/usr/local/share/pfSense-pkg-FTP_Client_Proxy/info.xml b/ftp/pfSense-pkg-FTP_Client_Proxy/files/usr/local/share/pfSense-pkg-FTP_Client_Proxy/info.xml index b27c156..d49b4c3 100644 --- a/ftp/pfSense-pkg-FTP_Client_Proxy/files/usr/local/share/pfSense-pkg-FTP_Client_Proxy/info.xml +++ b/ftp/pfSense-pkg-FTP_Client_Proxy/files/usr/local/share/pfSense-pkg-FTP_Client_Proxy/info.xml @@ -8,7 +8,7 @@ <maintainer>jimp@pfsense.org</maintainer> <version>0.3</version> <category>Services</category> - <status>Beta</status> + <status>BETA</status> <port_category>ftp</port_category> <config_file>https://packages.pfsense.org/packages/config/ftpproxy/ftpproxy.xml</config_file> <required_version>2.2</required_version> diff --git a/mail/pfSense-pkg-mailreport/files/usr/local/share/pfSense-pkg-mailreport/info.xml b/mail/pfSense-pkg-mailreport/files/usr/local/share/pfSense-pkg-mailreport/info.xml index 697e2d6..4b66ad6 100644 --- a/mail/pfSense-pkg-mailreport/files/usr/local/share/pfSense-pkg-mailreport/info.xml +++ b/mail/pfSense-pkg-mailreport/files/usr/local/share/pfSense-pkg-mailreport/info.xml @@ -3,9 +3,9 @@ <package> <name>mailreport</name> <descr><![CDATA[Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs.]]></descr> - <category>Network Management</category> + <category>System</category> <version>2.3_1</version> - <status>Stable</status> + <status>RELEASE</status> <port_category>mail</port_category> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/mailreport/mailreport.xml</config_file> diff --git a/net-mgmt/pfSense-pkg-darkstat/files/usr/local/share/pfSense-pkg-darkstat/info.xml b/net-mgmt/pfSense-pkg-darkstat/files/usr/local/share/pfSense-pkg-darkstat/info.xml index dfaa092..5abe49b 100644 --- a/net-mgmt/pfSense-pkg-darkstat/files/usr/local/share/pfSense-pkg-darkstat/info.xml +++ b/net-mgmt/pfSense-pkg-darkstat/files/usr/local/share/pfSense-pkg-darkstat/info.xml @@ -7,7 +7,7 @@ <category>Network Management</category> <depends_on_package_pbi>darkstat-3.0.718-##ARCH##.pbi</depends_on_package_pbi> <version>3.1.1</version> - <status>Stable</status> + <status>RELEASE</status> <required_version>2.2</required_version> <maintainer>coreteam@pfsense.org</maintainer> <config_file>https://packages.pfsense.org/packages/config/darkstat/darkstat.xml</config_file> diff --git a/net-mgmt/pfSense-pkg-iftop/files/usr/local/share/pfSense-pkg-iftop/info.xml b/net-mgmt/pfSense-pkg-iftop/files/usr/local/share/pfSense-pkg-iftop/info.xml index fd98465..ab6476d 100644 --- a/net-mgmt/pfSense-pkg-iftop/files/usr/local/share/pfSense-pkg-iftop/info.xml +++ b/net-mgmt/pfSense-pkg-iftop/files/usr/local/share/pfSense-pkg-iftop/info.xml @@ -5,9 +5,9 @@ <pkginfolink>https://forum.pfsense.org/</pkginfolink> <descr><![CDATA[Realtime interface monitor (console/shell only).]]></descr> <website>http://www.ex-parrot.com/~pdw/iftop/</website> - <category>Services</category> + <category>Network Management</category> <version>0.17</version> - <status>Beta</status> + <status>BETA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/iftop/iftop.xml</config_file> <maintainer>jimp@pfsense.org</maintainer> diff --git a/net-mgmt/pfSense-pkg-softflowd/files/usr/local/share/pfSense-pkg-softflowd/info.xml b/net-mgmt/pfSense-pkg-softflowd/files/usr/local/share/pfSense-pkg-softflowd/info.xml index ad5c7f8..cb8c1d6 100644 --- a/net-mgmt/pfSense-pkg-softflowd/files/usr/local/share/pfSense-pkg-softflowd/info.xml +++ b/net-mgmt/pfSense-pkg-softflowd/files/usr/local/share/pfSense-pkg-softflowd/info.xml @@ -3,12 +3,14 @@ <package> <name>softflowd</name> <website>http://code.google.com/p/softflowd/</website> - <descr><![CDATA[Softflowd is flow-based network traffic analyser capable of Cisco NetFlow data export. Softflowd semi-statefully tracks traffic flows recorded by listening on a network interface or by reading a packet capture file. These flows may be reported via NetFlow to a collecting host or summarised within softflowd itself. Softflowd supports Netflow versions 1, 5 and 9 and is fully IPv6-capable - it can track IPv6 flows and send export datagrams via IPv6. It also supports export to multicast groups, allowing for redundant flow collectors.]]></descr> + <descr><![CDATA[Softflowd is flow-based network traffic analyser capable of Cisco NetFlow data export.<br/> + Softflowd semi-statefully tracks traffic flows recorded by listening on a network interface or by reading a packet capture file. These flows may be reported via NetFlow to a collecting host or summarised within softflowd itself.<br/> + Softflowd supports Netflow versions 1, 5 and 9 and is fully IPv6-capable - it can track IPv6 flows and send export datagrams via IPv6. It also supports export to multicast groups, allowing for redundant flow collectors.<br/>]]></descr> <category>Network Management</category> <config_file>https://packages.pfsense.org/packages/config/softflowd/softflowd.xml</config_file> <depends_on_package_pbi>softflowd-0.9.8_2-##ARCH##.pbi</depends_on_package_pbi> <version>1.2.1</version> - <status>Beta</status> + <status>BETA</status> <required_version>2.2</required_version> <configurationfile>softflowd.xml</configurationfile> <port_category>net-mgmt</port_category> diff --git a/net-mgmt/pfSense-pkg-softflowd/pkg-descr b/net-mgmt/pfSense-pkg-softflowd/pkg-descr index 3ea64d9..fb4d65a 100644 --- a/net-mgmt/pfSense-pkg-softflowd/pkg-descr +++ b/net-mgmt/pfSense-pkg-softflowd/pkg-descr @@ -1,7 +1,11 @@ Softflowd is flow-based network traffic analyser capable of Cisco NetFlow data -export. Softflowd semi-statefully tracks traffic flows recorded by listening on -a network interface or by reading a packet capture file. These flows may be -reported via NetFlow to a collecting host or summarised within softflowd itself. -Softflowd supports Netflow versions 1, 5 and 9 and is fully IPv6-capable - it -can track IPv6 flows and send export datagrams via IPv6. It also supports export -to multicast groups, allowing for redundant flow collectors. +export.<br/> + Softflowd semi-statefully tracks traffic flows recorded + by listening on a network interface or by reading a + packet capture file. These flows may be reported via + NetFlow to a collecting host or summarised within + softflowd itself.<br/> Softflowd supports Netflow + versions 1, 5 and 9 and is fully IPv6-capable - it can + track IPv6 flows and send export datagrams via IPv6. It + also supports export to multicast groups, allowing for + redundant flow collectors.<br/> diff --git a/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml b/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml index c7aae34..531ae14 100644 --- a/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml +++ b/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml @@ -4,7 +4,10 @@ <name>Avahi</name> <pkginfolink>https://doc.pfsense.org/index.php/Avahi_package</pkginfolink> <website>http://www.avahi.org/</website> - <descr><![CDATA[Avahi is a system which facilitates service discovery on a local network. This means that you can plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared. This kind of technology is already found in Apple Mac OS X (branded Rendezvous, Bonjour and sometimes Zeroconf) and is very convenient. Avahi is mainly based on Lennart Poettering's flexmdns mDNS implementation for Linux which has been discontinued in favour of Avahi.]]></descr> + <descr><![CDATA[Avahi is a system which facilitates service discovery on a local network via the mDNS/DNS-SD protocol suite.<br/> + This enables you to plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared.<br/> + In addition it supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments.<br/> + Compatible technology is found in Apple MacOS X (branded ​Bonjour and sometimes Zeroconf).]]></descr> <category>Network Management</category> <lib_depends>libavahi-core.so:net/avahi-app</lib_depends> <port_category>net</port_category> @@ -19,6 +22,6 @@ <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/avahi/avahi.xml</config_file> <configurationfile>avahi.xml</configurationfile> - <after_install_info>Please visit the Avahi settings tab and select which interfaces you do not wish Avahi to listen on and click save to start the service.</after_install_info> + <after_install_info>Please visit Services - Avahi menu, enable the service and select which interfaces you do NOT wish Avahi to listen on. Save settings to start the service.</after_install_info> </package> </pfsensepkgs> diff --git a/net/pfSense-pkg-Avahi/pkg-descr b/net/pfSense-pkg-Avahi/pkg-descr index e22d75e..c3c53a43 100644 --- a/net/pfSense-pkg-Avahi/pkg-descr +++ b/net/pfSense-pkg-Avahi/pkg-descr @@ -1,9 +1,12 @@ -Avahi is a system which facilitates service discovery on a local network. This -means that you can plug your laptop or computer into a network and instantly be -able to view other people who you can chat with, find printers to print to or -find files being shared. This kind of technology is already found in Apple Mac -OS X (branded Rendezvous, Bonjour and sometimes Zeroconf) and is very -convenient. Avahi is mainly based on Lennart Poettering's flexmdns mDNS -implementation for Linux which has been discontinued in favour of Avahi. +Avahi is a system which facilitates service discovery on a local network via the +mDNS/DNS-SD protocol suite.<br/> + This enables you to plug your laptop or computer into a + network and instantly be able to view other people who + you can chat with, find printers to print to or find + files being shared.<br/> In addition it supports some + nifty things that have never been seen elsewhere like + correct mDNS reflection across LAN segments.<br/> + Compatible technology is found in Apple MacOS X (branded + Bonjour and sometimes Zeroconf). WWW: https://doc.pfsense.org/index.php/Avahi_package diff --git a/net/pfSense-pkg-Avahi/pkg-message b/net/pfSense-pkg-Avahi/pkg-message index 818f188..ce99f63 100644 --- a/net/pfSense-pkg-Avahi/pkg-message +++ b/net/pfSense-pkg-Avahi/pkg-message @@ -1 +1 @@ -Please visit the Avahi settings tab and select which interfaces you do not wish Avahi to listen on and click save to start the service. +Please visit Services - Avahi menu, enable the service and select which interfaces you do NOT wish Avahi to listen on. Save settings to start the service. diff --git a/net/pfSense-pkg-OpenBGPD/files/usr/local/share/pfSense-pkg-OpenBGPD/info.xml b/net/pfSense-pkg-OpenBGPD/files/usr/local/share/pfSense-pkg-OpenBGPD/info.xml index 56534ca..bfd3e65 100644 --- a/net/pfSense-pkg-OpenBGPD/files/usr/local/share/pfSense-pkg-OpenBGPD/info.xml +++ b/net/pfSense-pkg-OpenBGPD/files/usr/local/share/pfSense-pkg-OpenBGPD/info.xml @@ -4,7 +4,7 @@ <name>OpenBGPD</name> <descr><![CDATA[OpenBGPD is a free implementation of the Border Gateway Protocol, version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol.<br /> <strong>WARNING! Installs files to the same place as Quagga OSPF. Installing both will result in a broken state, remove this package before installing Quagga OSPF.</strong>]]></descr> - <category>NET</category> + <category>Network Management</category> <config_file>https://packages.pfsense.org/packages/config/openbgpd/openbgpd.xml</config_file> <port_category>net</port_category> <run_depends>sbin/bgpctl:net/openbgpd</run_depends> @@ -13,7 +13,7 @@ <port>net/openbgpd</port> </build_pbi> <version>0.9.3.8</version> - <status>STABLE</status> + <status>RELEASE</status> <pkginfolink>https://doc.pfsense.org/index.php/OpenBGPD_package</pkginfolink> <required_version>2.2</required_version> <configurationfile>openbgpd.xml</configurationfile> diff --git a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml index c8e6c6f..a13bde6 100644 --- a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml +++ b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml @@ -7,7 +7,7 @@ <strong>WARNING! Installs files to the same place as OpenBGPD. Installing both will break things.</strong>]]></descr> <maintainer>jimp@pfsense.org</maintainer> <version>0.6.8</version> - <category>Routing</category> + <category>Network Management</category> <status>BETA</status> <depends_on_package_pbi>quagga-0.99.23.1_2-##ARCH##.pbi</depends_on_package_pbi> <config_file>https://packages.pfsense.org/packages/config/quagga_ospfd/quagga_ospfd.xml</config_file> diff --git a/net/pfSense-pkg-arping/files/usr/local/share/pfSense-pkg-arping/info.xml b/net/pfSense-pkg-arping/files/usr/local/share/pfSense-pkg-arping/info.xml index e442e48..224cbc1 100644 --- a/net/pfSense-pkg-arping/files/usr/local/share/pfSense-pkg-arping/info.xml +++ b/net/pfSense-pkg-arping/files/usr/local/share/pfSense-pkg-arping/info.xml @@ -4,9 +4,9 @@ <name>arping</name> <descr><![CDATA[Broadcasts a who-has ARP packet on the network and prints answers.]]></descr> <website>http://www.habets.pp.se/synscan/programs.php?prog=arping</website> - <category>Services</category> + <category>Network Management</category> <version>1.2.1</version> - <status>Stable</status> + <status>RELEASE</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/arping/arping.xml</config_file> <configurationfile>arping.xml</configurationfile> diff --git a/net/pfSense-pkg-freeradius2/Makefile b/net/pfSense-pkg-freeradius2/Makefile index 5ce70f0..90d2643 100644 --- a/net/pfSense-pkg-freeradius2/Makefile +++ b/net/pfSense-pkg-freeradius2/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pfSense-pkg-freeradius2 -PORTVERSION= 1.6.16 +PORTVERSION= 1.6.17 CATEGORIES= net MASTER_SITES= # empty DISTFILES= # empty diff --git a/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradius.inc b/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradius.inc index dd29561..005a193 100644 --- a/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradius.inc +++ b/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradius.inc @@ -621,7 +621,7 @@ if (is_array($arrusers) && !empty($arrusers)) { // If an octet limit is NOT set we delete the files for the limit and the counter. else { if (file_exists("/var/log/radacct/datacounter/$varusersmaxtotaloctetstimerange/max-octets-$varusersusername")) { unlink("/var/log/radacct/datacounter/$varusersmaxtotaloctetstimerange/max-octets-$varusersusername"); } - if (file_exists("/var/log/radacct/datacounter/$varusersmaxtotaloctetstimerange/used-octets-$varusersusername")) { unlink("/var/log/radacct/datacounter/$varusersmaxtotaloctetstimerange/used-octets-$varusersusername"); } + if (file_exists("/var/log/radacct/datacounter/$varusersmaxtotaloctetstimerange/used-octets-$varusersusername")) { unlink("/var/log/radacct/datacounter/$varusersmaxtotaloctetstimerange/used-octets-$varusersusername*"); } } if ($varusersadditionaloptionsreplyitems != '') { if ($varusersreplyitem != '') { $varusersreplyitem .=","; } @@ -815,7 +815,7 @@ if (is_array($arrmacs) && !empty($arrmacs)) { // If an octet limit is NOT set we delete the files for the limit and the counter. else { if (file_exists("/var/log/radacct/datacounter/$varmacsmaxtotaloctetstimerange/max-octets-$varmacsaddress")) { unlink("/var/log/radacct/datacounter/$varmacsmaxtotaloctetstimerange/max-octets-$varmacsaddress"); } - if (file_exists("/var/log/radacct/datacounter/$varmacsmaxtotaloctetstimerange/used-octets-$varmacsaddress")) { unlink("/var/log/radacct/datacounter/$varmacsmaxtotaloctetstimerange/used-octets-$varmacsaddress"); } + if (file_exists("/var/log/radacct/datacounter/$varmacsmaxtotaloctetstimerange/used-octets-$varmacsaddress")) { unlink("/var/log/radacct/datacounter/$varmacsmaxtotaloctetstimerange/used-octets-$varmacsaddress*"); } } if ($varmacsadditionaloptionsreplyitems != '') { if ($varmacsreplyitem != '') { $varmacsreplyitem .=","; } @@ -4132,20 +4132,20 @@ function freeradius_modulesdatacounter_resync() { $conf .= <<<EOD exec datacounterdaily { wait = yes - program = "/bin/sh {$varFREERADIUS_ETC}/raddb/scripts/datacounter_acct.sh %{request:User-Name} daily %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}" + program = "/bin/sh {$varFREERADIUS_ETC}/raddb/scripts/datacounter_acct.sh %{request:User-Name} daily %{request:Acct-Input-Octets} %{request:Acct-Output-Octets} %{request:Acct-Status-Type} %{request:Acct-Session-Id}" } exec datacounterweekly { wait = yes - program = "/bin/sh {$varFREERADIUS_ETC}/raddb/scripts/datacounter_acct.sh %{request:User-Name} weekly %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}" + program = "/bin/sh {$varFREERADIUS_ETC}/raddb/scripts/datacounter_acct.sh %{request:User-Name} weekly %{request:Acct-Input-Octets} %{request:Acct-Output-Octets} %{request:Acct-Status-Type} %{request:Acct-Session-Id}" } exec datacountermonthly { wait = yes - program = "/bin/sh {$varFREERADIUS_ETC}/raddb/scripts/datacounter_acct.sh %{request:User-Name} monthly %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}" + program = "/bin/sh {$varFREERADIUS_ETC}/raddb/scripts/datacounter_acct.sh %{request:User-Name} monthly %{request:Acct-Input-Octets} %{request:Acct-Output-Octets} %{request:Acct-Status-Type} %{request:Acct-Session-Id}" } exec datacounterforever { wait = yes - program = "/bin/sh {$varFREERADIUS_ETC}/raddb/scripts/datacounter_acct.sh %{request:User-Name} forever %{request:Acct-Input-Octets} %{request:Acct-Output-Octets}" - } + program = "/bin/sh {$varFREERADIUS_ETC}/raddb/scripts/datacounter_acct.sh %{request:User-Name} forever %{request:Acct-Input-Octets} %{request:Acct-Output-Octets} %{request:Acct-Status-Type} %{request:Acct-Session-Id}" + } EOD; $filename = FREERADIUS_ETC . '/raddb/modules/datacounter_acct'; @@ -4171,18 +4171,19 @@ TIMERANGE=`echo -n "\\$2" | sed 's/[^a-z]//g' ` ### This is to make sure there is a used-octets file after the cronjob resetted the counter if [ -e "/var/log/radacct/datacounter/\$TIMERANGE/max-octets-\$USERNAME" ] && [ ! -e "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME" ]; then echo 0 > "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME" + rm "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME-"* fi ### The next two lines are just for getting values for logging output -MAXOCTETSUSERNAMEMB=$((`cat "/var/log/radacct/datacounter/\$TIMERANGE/max-octets-\$USERNAME"`/1024/1024)) -USEDOCTETSUSERNAMEMB=$((`cat "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME"`/1024/1024)) - +MAXOCTETSUSERNAMEMB=$((`/bin/cat "/var/log/radacct/datacounter/\$TIMERANGE/max-octets-\$USERNAME"`/1024/1024)) +USEDOCTETSUSERNAMEMB=`/bin/cat "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\${USERNAME}"* | /usr/bin/awk '{ SUM += \$1; } END { print int(SUM/1024/1024); }'` + ### We check if MAX-OCTETS-USERNAME is greater than USED-OCTETS-USERNAME and accept or reject the user -if [ `cat "/var/log/radacct/datacounter/\$TIMERANGE/max-octets-\$USERNAME"` -gt `cat "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME"` ]; then - logger -f /var/log/system.log "FreeRADIUS: Used amount of \$TIMERANGE traffic by \$USERNAME is \$USEDOCTETSUSERNAMEMB MB of \$MAXOCTETSUSERNAMEMB MB! The user was accepted!!!" +if [ \$MAXOCTETSUSERNAMEMB -gt \$USEDOCTETSUSERNAMEMB ]; then + logger -f /var/log/system.log "FreeRADIUS: User \$USERNAME has used \$USEDOCTETSUSERNAMEMB MB of \$MAXOCTETSUSERNAMEMB MB \$TIMERANGE allotted traffic. The login request was accepted." exit 0 else - logger -f /var/log/system.log "FreeRADIUS: Credentials are probably correct but the user \$USERNAME has reached the \$TIMERANGE Amount of Upload and Download Traffic which is \$USEDOCTETSUSERNAMEMB MB of \$MAXOCTETSUSERNAMEMB MB! The user was rejected!!!" + logger -f /var/log/system.log "FreeRADIUS: User \$USERNAME has reached the \$TIMERANGE amount of upload and download traffic (\$USEDOCTETSUSERNAMEMB MB of \$MAXOCTETSUSERNAMEMB MB). The login request was denied." exit 99 fi EOD; @@ -4207,6 +4208,8 @@ USERNAME=`echo -n "\\$1" | sed 's/[^0-9a-zA-Z.:_-]/X/g' ` TIMERANGE=`echo -n "\\$2" | sed 's/[^a-z]//g' ` ACCTINPUTOCTETS=`echo -n "\\$3" | sed 's/[^0-9]/0/g' ` ACCTOUTPUTOCTETS=`echo -n "\\$4" | sed 's/[^0-9]/0/g' ` +UPDATETYPE=\$5 +SESSIONID=\$6 ### If we do not get Octets we set some default values if [ ! \$ACCTINPUTOCTETS ]; then @@ -4225,11 +4228,23 @@ else if [ ! -e "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME" ]; then echo 0 > "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME" fi -### The following two lines (chose the one or the other) are a bad workaround to make accounting accurate with stop/start accounting on pfsense 2.0.1 - it only works if the session will not be interrupted (host disconnects) -### USEDOCTETS=\$((\$ACCTINPUTOCTETS+\$ACCTOUTPUTOCTETS)) - USEDOCTETS=\$((\$ACCTINPUTOCTETS+\$ACCTOUTPUTOCTETS+`cat "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME"`)) - - echo "\$USEDOCTETS" > "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME" + + USEDOCTETS=\$((\$ACCTINPUTOCTETS+\$ACCTOUTPUTOCTETS)) + + # If this is an interim update, track it in a separate session file + # since the incoming data is a gauge not a counter. + if [ \$UPDATETYPE = "Interim-Update" ]; then + echo \$USEDOCTETS > "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME-\$SESSIONID" + else + USEDOCTETS=\$((\$USEDOCTETS+`cat "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME"`)) + + # If there was a session file for this session (from interim updates) clear it since the equivalent + # value was just added to the total. + if [ -e "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME-\$SESSIONID" ]; then + rm "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME-\$SESSIONID" + fi + echo "\$USEDOCTETS" > "/var/log/radacct/datacounter/\$TIMERANGE/used-octets-\$USERNAME" + fi exit 0 fi diff --git a/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradius.xml b/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradius.xml index 4563ef6..eab6b09 100644 --- a/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradius.xml +++ b/net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradius.xml @@ -45,7 +45,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>freeradius</name> - <version>1.6.13</version> + <version>1.6.17</version> <title>FreeRADIUS: Users</title> <include_file>/usr/local/pkg/freeradius.inc</include_file> <menu> diff --git a/net/pfSense-pkg-freeradius2/files/usr/local/share/pfSense-pkg-freeradius2/info.xml b/net/pfSense-pkg-freeradius2/files/usr/local/share/pfSense-pkg-freeradius2/info.xml index de4f81f..4215f9f 100644 --- a/net/pfSense-pkg-freeradius2/files/usr/local/share/pfSense-pkg-freeradius2/info.xml +++ b/net/pfSense-pkg-freeradius2/files/usr/local/share/pfSense-pkg-freeradius2/info.xml @@ -8,15 +8,15 @@ FreeRADIUS and FreeRADIUS2 settings are not compatible so don't use them together or try to update.<br /> On pfSense docs there is a how-to which could help you on porting users.]]></descr> <pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink> - <category>System</category> - <version>1.6.16</version> - <status>RC1</status> + <category>Services</category> + <version>1.6.17</version> + <status>RC</status> <required_version>2.2</required_version> <maintainer>nachtfalkeaw@web.de</maintainer> <depends_on_package_pbi>freeradius-2.2.6_3-##ARCH##.pbi</depends_on_package_pbi> <config_file>https://packages.pfsense.org/packages/config/freeradius2/freeradius.xml</config_file> <configurationfile>freeradius.xml</configurationfile> - <after_install_info>Please visit Services: FreeRADIUS.</after_install_info> + <after_install_info>Please visit Services - FreeRADIUS menu to configure the package.</after_install_info> <port_category>net</port_category> <run_depends>sbin/radiusd:net/freeradius2 bin/bash:shells/bash</run_depends> <build_pbi> diff --git a/net/pfSense-pkg-freeradius2/pkg-message b/net/pfSense-pkg-freeradius2/pkg-message index d28e2b6..dd63eb6 100644 --- a/net/pfSense-pkg-freeradius2/pkg-message +++ b/net/pfSense-pkg-freeradius2/pkg-message @@ -1 +1 @@ -Please visit Services: FreeRADIUS. +Please visit Services - FreeRADIUS menu to configure the package. diff --git a/net/pfSense-pkg-haproxy-devel/Makefile b/net/pfSense-pkg-haproxy-devel/Makefile index 05479d7..42db0a5 100644 --- a/net/pfSense-pkg-haproxy-devel/Makefile +++ b/net/pfSense-pkg-haproxy-devel/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pfSense-pkg-haproxy-devel -PORTVERSION= 0.32 +PORTVERSION= 0.33 CATEGORIES= net MASTER_SITES= # empty DISTFILES= # empty @@ -10,7 +10,7 @@ EXTRACT_ONLY= # empty MAINTAINER= coreteam@pfsense.org COMMENT= pfSense package haproxy-devel -RUN_DEPENDS= ${LOCALBASE}/sbin/haproxy:${PORTSDIR}/net/haproxy-devel +RUN_DEPENDS= ${LOCALBASE}/sbin/haproxy:${PORTSDIR}/net/haproxy CONFLICTS= pfSense-pkg-haproxy-[0-9]* diff --git a/net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy.inc b/net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy.inc index bdee276..f83a4c5 100644 --- a/net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy.inc +++ b/net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy.inc @@ -766,7 +766,8 @@ function write_backend($configpath, $fd, $name, $pool, $backendsettings) { $backend_mode = $frontendtype; } fwrite ($fd, "\tmode\t\t\t" . $backend_mode . "\n"); - + fwrite ($fd, "\tlog\t\t\tglobal\n"); + $use_haproxyresolvers = false; if (haproxy_version() >= '1.6') { $use_mailers = is_array($a_mailers) && count($a_mailers) > 0; @@ -1460,6 +1461,18 @@ function haproxy_writeconf($configpath) { $a_mailers = &$config['installedpackages']['haproxy']['email_mailers']['item']; $a_resolvers = &$config['installedpackages']['haproxy']['dns_resolvers']['item']; $a_files = &$config['installedpackages']['haproxy']['files']['item']; + if (!is_array($a_frontends)) { + $a_frontends = array(); + } + if (!is_array($a_backends)) { + $a_backends = array(); + } + if (!is_array($a_mailers)) { + $a_mailers = array(); + } + if (!is_array($a_resolvers)) { + $a_resolvers = array(); + } $fd = fopen($configfile, "w"); if (is_array($a_global)) { diff --git a/net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy.xml b/net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy.xml index 784e003..19b6b57 100644 --- a/net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy.xml +++ b/net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy.xml @@ -42,7 +42,7 @@ ]]> </copyright> <name>haproxy</name> - <version>0.32</version> + <version>0.33</version> <title>HAProxy</title> <aftersaveredirect>/pkg_edit.php?xml=haproxy_pools.php</aftersaveredirect> <include_file>/usr/local/pkg/haproxy.inc</include_file> diff --git a/net/pfSense-pkg-haproxy-devel/files/usr/local/share/pfSense-pkg-haproxy-devel/info.xml b/net/pfSense-pkg-haproxy-devel/files/usr/local/share/pfSense-pkg-haproxy-devel/info.xml index 6b76c95..78afb12 100644 --- a/net/pfSense-pkg-haproxy-devel/files/usr/local/share/pfSense-pkg-haproxy-devel/info.xml +++ b/net/pfSense-pkg-haproxy-devel/files/usr/local/share/pfSense-pkg-haproxy-devel/info.xml @@ -6,23 +6,23 @@ <descr><![CDATA[The Reliable, High Performance TCP/HTTP(S) Load Balancer.<br /> This package implements the TCP, HTTP and HTTPS balancing features from haproxy.<br /> Supports ACLs for smart backend switching.<br /> - <strong>As of pkg v0.27 switched to using 1.6dev releases. If you need stable, switch to haproxy-1_5 package.</strong>]]></descr> + <strong>As of pkg v0.33 switched to using 1.6 stable releases.</strong>]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>0.32</version> - <status>Release</status> + <version>0.33</version> + <status>RELEASE</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file> <configurationfile>haproxy.xml</configurationfile> - <run_depends>sbin/haproxy:net/haproxy-devel</run_depends> + <run_depends>sbin/haproxy:net/haproxy</run_depends> <port_category>net</port_category> <conflicts>haproxy</conflicts> - <depends_on_package_pbi>haproxy-devel-1.6-dev4-##ARCH##.pbi</depends_on_package_pbi> + <depends_on_package_pbi>haproxy-1.6.2_1-##ARCH##.pbi</depends_on_package_pbi> <build_pbi> - <ports_before>security/openssl</ports_before> - <custom_name>haproxy-devel</custom_name> - <port>net/haproxy-devel</port> + <ports_before>security/openssl lang/lua53</ports_before> + <custom_name>haproxy</custom_name> + <port>net/haproxy</port> </build_pbi> - <build_options>WITH_OPENSSL_PORT=yes;net_haproxy-devel_UNSET_FORCE=DPCRE;net_haproxy-devel_SET_FORCE=OPENSSL SPCRE LUA CPU_AFFINITY</build_options> + <build_options>WITH_OPENSSL_PORT=yes;net_haproxy_UNSET_FORCE=DPCRE;net_haproxy_SET_FORCE=OPENSSL SPCRE LUA CPU_AFFINITY</build_options> </package> </pfsensepkgs> diff --git a/net/pfSense-pkg-haproxy-devel/files/usr/local/www/haproxy_listeners_edit.php b/net/pfSense-pkg-haproxy-devel/files/usr/local/www/haproxy_listeners_edit.php index 9d2b0b0..8e6c1c3 100644 --- a/net/pfSense-pkg-haproxy-devel/files/usr/local/www/haproxy_listeners_edit.php +++ b/net/pfSense-pkg-haproxy-devel/files/usr/local/www/haproxy_listeners_edit.php @@ -283,6 +283,7 @@ if (isset($id) && $a_backend[$id]) { if (isset($_GET['dup'])) { unset($id); + $pconfig['name'] .= "-copy"; if ($pconfig['secondary'] != 'yes') $pconfig['primary_frontend'] = $pconfig['name']; } diff --git a/net/pfSense-pkg-haproxy-devel/files/usr/local/www/haproxy_pool_edit.php b/net/pfSense-pkg-haproxy-devel/files/usr/local/www/haproxy_pool_edit.php index 71da973..2b4787f 100644 --- a/net/pfSense-pkg-haproxy-devel/files/usr/local/www/haproxy_pool_edit.php +++ b/net/pfSense-pkg-haproxy-devel/files/usr/local/www/haproxy_pool_edit.php @@ -323,9 +323,10 @@ if (isset($id) && $a_pools[$id]) { } } -if (isset($_GET['dup'])) +if (isset($_GET['dup'])) { unset($id); - + $pconfig['name'] .= "-copy"; +} $changedesc = "Services: HAProxy: Backend server pool: "; $changecount = 0; diff --git a/net/pfSense-pkg-haproxy-devel/pkg-descr b/net/pfSense-pkg-haproxy-devel/pkg-descr index 65ddeeb..9ab41f6 100644 --- a/net/pfSense-pkg-haproxy-devel/pkg-descr +++ b/net/pfSense-pkg-haproxy-devel/pkg-descr @@ -1,8 +1,7 @@ The Reliable, High Performance TCP/HTTP(S) Load Balancer.<br /> This package implements the TCP, HTTP and HTTPS balancing features from haproxy.<br /> Supports ACLs for - smart backend switching.<br /> <strong>As of pkg v0.27 - switched to using 1.6dev releases. If you need stable, - switch to haproxy-1_5 package.</strong> + smart backend switching.<br /> <strong>As of pkg v0.33 + switched to using 1.6 stable releases.</strong> WWW: https://doc.pfsense.org/index.php/haproxy_package diff --git a/net/pfSense-pkg-haproxy/files/usr/local/share/pfSense-pkg-haproxy/info.xml b/net/pfSense-pkg-haproxy/files/usr/local/share/pfSense-pkg-haproxy/info.xml index 6212c36..8467e5b 100644 --- a/net/pfSense-pkg-haproxy/files/usr/local/share/pfSense-pkg-haproxy/info.xml +++ b/net/pfSense-pkg-haproxy/files/usr/local/share/pfSense-pkg-haproxy/info.xml @@ -10,7 +10,7 @@ <website>http://haproxy.1wt.eu/</website> <category>Services</category> <version>0.32</version> - <status>Release</status> + <status>RELEASE</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/haproxy1_5/haproxy.xml</config_file> <configurationfile>haproxy.xml</configurationfile> diff --git a/net/pfSense-pkg-mtr-nox11/files/usr/local/share/pfSense-pkg-mtr-nox11/info.xml b/net/pfSense-pkg-mtr-nox11/files/usr/local/share/pfSense-pkg-mtr-nox11/info.xml index f111025..908ce57 100644 --- a/net/pfSense-pkg-mtr-nox11/files/usr/local/share/pfSense-pkg-mtr-nox11/info.xml +++ b/net/pfSense-pkg-mtr-nox11/files/usr/local/share/pfSense-pkg-mtr-nox11/info.xml @@ -8,7 +8,7 @@ <category>Network Management</category> <depends_on_package_pbi>mtr-0.85_1-##ARCH##.pbi</depends_on_package_pbi> <version>0.85_3</version> - <status>Stable</status> + <status>RELEASE</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/mtr-nox11/mtr-nox11.xml</config_file> <configurationfile>mtr-nox11.xml</configurationfile> diff --git a/net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml b/net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml index 0a09e76..112fafc 100644 --- a/net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml +++ b/net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml @@ -8,11 +8,11 @@ De-Duplication, Suppression, and Reputation enhancements.<br /> Provision to download from diverse List formats.<br /> Advanced Integration for Emerging Threats IQRisk IP Reputation Threat Sources.]]></descr> - <category>Firewall</category> + <category>Security</category> <pkginfolink>https://forum.pfsense.org/index.php?topic=86212.0</pkginfolink> <config_file>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.xml</config_file> <version>1.10</version> - <status>Stable</status> + <status>RELEASE</status> <required_version>2.2</required_version> <maintainer>BBCan177@gmail.com</maintainer> <configurationfile>pfblockerng.xml</configurationfile> diff --git a/net/pfSense-pkg-routed/files/usr/local/share/pfSense-pkg-routed/info.xml b/net/pfSense-pkg-routed/files/usr/local/share/pfSense-pkg-routed/info.xml index 041cc1a..e936980 100644 --- a/net/pfSense-pkg-routed/files/usr/local/share/pfSense-pkg-routed/info.xml +++ b/net/pfSense-pkg-routed/files/usr/local/share/pfSense-pkg-routed/info.xml @@ -8,7 +8,7 @@ <port_category>net</port_category> <config_file>https://packages.pfsense.org/packages/config/routed/routed.xml</config_file> <version>1.2.1</version> - <status>Stable</status> + <status>RELEASE</status> <required_version>2.2</required_version> <configurationfile>routed.xml</configurationfile> </package> diff --git a/net/pfSense-pkg-siproxd/files/usr/local/share/pfSense-pkg-siproxd/info.xml b/net/pfSense-pkg-siproxd/files/usr/local/share/pfSense-pkg-siproxd/info.xml index e65d1df..80fe19f 100644 --- a/net/pfSense-pkg-siproxd/files/usr/local/share/pfSense-pkg-siproxd/info.xml +++ b/net/pfSense-pkg-siproxd/files/usr/local/share/pfSense-pkg-siproxd/info.xml @@ -14,7 +14,7 @@ <port>net/siproxd</port> </build_pbi> <version>1.0.6</version> - <status>Beta</status> + <status>BETA</status> <required_version>2.2</required_version> <configurationfile>siproxd.xml</configurationfile> </package> diff --git a/security/pfSense-pkg-nmap/files/usr/local/share/pfSense-pkg-nmap/info.xml b/security/pfSense-pkg-nmap/files/usr/local/share/pfSense-pkg-nmap/info.xml index 442a50f..58440f5 100644 --- a/security/pfSense-pkg-nmap/files/usr/local/share/pfSense-pkg-nmap/info.xml +++ b/security/pfSense-pkg-nmap/files/usr/local/share/pfSense-pkg-nmap/info.xml @@ -3,12 +3,14 @@ <package> <name>nmap</name> <maintainer>jimp@pfsense.org</maintainer> - <descr><![CDATA[NMap is a utility for network exploration or security auditing. It supports ping scanning (determine which hosts are up), many port scanning techniques (determine what services the hosts are offering), version detection (determine what application/service is running on a port), and TCP/IP fingerprinting (remote host OS or device identification). It also offers flexible target and port specification, decoy/stealth scanning, SunRPC scanning, and more.]]></descr> + <descr><![CDATA[NMap is a utility for network exploration or security auditing.<br/> + It supports ping scanning (determine which hosts are up), many port scanning techniques (determine what services the hosts are offering), version detection (determine what application/service is running on a port), and TCP/IP fingerprinting (remote host OS or device identification). + It also offers flexible target and port specification, decoy/stealth scanning, SunRPC scanning, and more.]]></descr> <category>Security</category> <depends_on_package_pbi>nmap-6.47-##ARCH##.pbi</depends_on_package_pbi> <config_file>https://packages.pfsense.org/packages/config/nmap/nmap.xml</config_file> <version>1.4</version> - <status>Stable</status> + <status>RELEASE</status> <pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink> <required_version>2.2</required_version> <configurationfile>nmap.xml</configurationfile> diff --git a/security/pfSense-pkg-nmap/pkg-descr b/security/pfSense-pkg-nmap/pkg-descr index f654d63..6d4b9ce 100644 --- a/security/pfSense-pkg-nmap/pkg-descr +++ b/security/pfSense-pkg-nmap/pkg-descr @@ -1,8 +1,11 @@ -NMap is a utility for network exploration or security auditing. It supports ping -scanning (determine which hosts are up), many port scanning techniques -(determine what services the hosts are offering), version detection (determine -what application/service is running on a port), and TCP/IP fingerprinting -(remote host OS or device identification). It also offers flexible target and -port specification, decoy/stealth scanning, SunRPC scanning, and more. +NMap is a utility for network exploration or security auditing.<br/> + It supports ping scanning (determine which hosts are + up), many port scanning techniques (determine what + services the hosts are offering), version detection + (determine what application/service is running on a + port), and TCP/IP fingerprinting (remote host OS or + device identification). It also offers flexible target + and port specification, decoy/stealth scanning, SunRPC + scanning, and more. WWW: https://doc.pfsense.org/index.php/Nmap_package diff --git a/security/pfSense-pkg-snort/Makefile b/security/pfSense-pkg-snort/Makefile index 2fc85f6..25cfa9d 100644 --- a/security/pfSense-pkg-snort/Makefile +++ b/security/pfSense-pkg-snort/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pfSense-pkg-snort -PORTVERSION= 3.2.8.2 +PORTVERSION= 3.2.8.3 CATEGORIES= security MASTER_SITES= # empty DISTFILES= # empty diff --git a/security/pfSense-pkg-snort/files/usr/local/pkg/snort/snort.inc b/security/pfSense-pkg-snort/files/usr/local/pkg/snort/snort.inc index ef0b1fa..7cfae0a 100644 --- a/security/pfSense-pkg-snort/files/usr/local/pkg/snort/snort.inc +++ b/security/pfSense-pkg-snort/files/usr/local/pkg/snort/snort.inc @@ -3737,103 +3737,117 @@ function snort_sync_on_changes() { /* Do not attempt a package sync while booting up or installing package */ if ($g['booting'] || $g['snort_postinstall']) { - log_error("[snort] No xmlrpc sync to CARP targets when booting up or during package reinstallation."); + log_error("[snort] Skipping XMLRPC sync when booting up or during package reinstallation."); return; } if (is_array($config['installedpackages']['snortsync']['config'])){ - $snort_sync=$config['installedpackages']['snortsync']['config'][0]; + $snort_sync = $config['installedpackages']['snortsync']['config'][0]; $synconchanges = $snort_sync['varsynconchanges']; - $synctimeout = $snort_sync['varsynctimeout']; + $synctimeout = $snort_sync['varsynctimeout'] ?: '150'; $syncdownloadrules = $snort_sync['vardownloadrules']; switch ($synconchanges){ case "manual": if (is_array($snort_sync['row'])){ $rs=$snort_sync['row']; - } - else{ - log_error("[snort] xmlrpc sync is enabled but there are no hosts configured as replication targets."); + } else { + log_error("[snort] XMLRPC sync is enabled but there are no hosts configured as replication targets."); return; } break; case "auto": - if (is_array($config['hasync'])) { - $system_carp=$config['hasync']; - $rs[0]['varsyncipaddress']=$system_carp['synchronizetoip']; - $rs[0]['varsyncusername']=$system_carp['username']; - $rs[0]['varsyncpassword']=$system_carp['password']; - $rs[0]['varsyncsnortstart']="no"; - if ($system_carp['synchronizetoip'] ==""){ - log_error("[snort] xmlrpc sync is enabled but there are no system backup hosts configured as replication targets."); - return; - } + if (is_array($config['hasync'])) { + $system_carp = $config['hasync']; + $rs[0]['varsyncipaddress'] = $system_carp['synchronizetoip']; + $rs[0]['varsyncusername'] = $system_carp['username']; + $rs[0]['varsyncpassword'] = $system_carp['password']; + $rs[0]['varsyncsnortstart'] = FALSE; + $rs[0]['varsyncdestinenable'] = FALSE; + // XMLRPC sync is currently only supported over connections using the same protocol and port as this system + if ($config['system']['webgui']['protocol'] == "http") { + $rs[0]['varsyncprotocol'] = "http"; + $rs[0]['varsyncport'] = $config['system']['webgui']['port'] ?: '80'; + } else { + $rs[0]['varsyncprotocol'] = "https"; + $rs[0]['varsyncport'] = $config['system']['webgui']['port'] ?: '443'; } - else{ - log_error("[snort] xmlrpc sync is enabled but there are no system backup hosts configured as replication targets."); + if ($system_carp['synchronizetoip'] == "") { + log_error("[snort] XMLRPC CARP/HA sync is enabled but there are no system backup hosts configured as replication targets."); return; + } else { + $rs[0]['varsyncdestinenable'] = TRUE; } + } else { + log_error("[snort] XMLRPC CARP/HA sync is enabled but there are no system backup hosts configured as replication targets."); + return; + } break; default: return; - break; + break; } if (is_array($rs)){ - log_error("[snort] Snort pkg xmlrpc sync is starting."); - foreach($rs as $sh){ - if ($sh['varsyncsnortstart']) - $syncstartsnort = $sh['varsyncsnortstart']; - else - $syncstartsnort = "OFF"; - $sync_to_ip = $sh['varsyncipaddress']; - $port = $sh['varsyncport']; - $password = $sh['varsyncpassword']; - if($sh['varsyncusername']) - $username = $sh['varsyncusername']; - else - $username = 'admin'; - if($password && $sync_to_ip) - snort_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $username, $password, $synctimeout, $syncstartsnort); + log_error("[snort] XMLRPC sync is starting."); + foreach ($rs as $sh){ + // Only sync enabled replication targets + if ($sh['varsyncdestinenable']) { + if ($sh['varsyncsnortstart']) { + $syncstartsnort = $sh['varsyncsnortstart']; + } else { + $syncstartsnort = "OFF"; + } + $sync_to_ip = $sh['varsyncipaddress']; + $port = $sh['varsyncport']; + $password = $sh['varsyncpassword']; + $protocol = $sh['varsyncprotocol']; + $error = ''; + $success = TRUE; + $username = $sh['varsyncusername'] ?: 'admin'; + if ($password == "") { + $error = "Password parameter is empty. "; + $success = FALSE; + } + if (!is_ipaddr($sync_to_ip) && !is_hostname($sync_to_ip) && !is_domain($sync_to_ip)) { + $error .= "Misconfigured Replication Target IP Address. "; + $success = FALSE; + } + if (!is_port($port)) { + $error .= "Misconfigured Replication Target Port. "; + $success = FALSE; + } + if ($success) { + snort_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $protocol, $username, $password, $synctimeout, $syncstartsnort); + } else { + log_error("[snort] XMLRPC sync with '{$sync_to_ip}' aborted due to the following error(s): {$error}"); + } + } } - log_error("[snort] Snort pkg xmlrpc sync completed."); + log_error("[snort] XMLRPC sync completed."); } } } /* Do the actual XMLRPC sync */ -function snort_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $username, $password, $synctimeout, $syncstartsnort) { +function snort_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $protocol, $username, $password, $synctimeout = 150, $syncstartsnort) { global $config, $g; /* Do not attempt a package sync while booting up or installing package */ if ($g['booting'] || $g['snort_postinstall']) { - log_error("[snort] No xmlrpc sync to CARP targets when booting up or during package reinstallation."); + log_error("[snort] Skipping XMLRPC sync when booting up or during package reinstallation."); return; } - if(!$username || !$password || !$sync_to_ip) { - log_error("[snort] A required XMLRPC sync parameter (user, host IP or password) is empty ... aborting pkg sync"); + if ($username == "" || $password == "" || $sync_to_ip == "" || $port == "" || $protocol == "") { + log_error("[snort] A required XMLRPC sync parameter (username, password, replication target, port or protocol) is empty ... aborting pkg sync"); return; } - /* Test key variables and set defaults if empty */ - if(!$synctimeout) - $synctimeout=150; - - $xmlrpc_sync_neighbor = $sync_to_ip; - if($config['system']['webgui']['protocol'] != "") { - $synchronizetoip = $config['system']['webgui']['protocol']; - $synchronizetoip .= "://"; - } - if ($port == "") - $port = $config['system']['webgui']['port']; - /* if port is empty let's rely on the protocol selection */ - if($port == "") { - if($config['system']['webgui']['protocol'] == "http") - $port = "80"; - else - $port = "443"; + // Take care of IPv6 literal address + if (is_ipaddrv6($sync_to_ip)) { + $sync_to_ip = "[{$sync_to_ip}]"; } - $synchronizetoip .= $sync_to_ip; - $url = $synchronizetoip; + + $url = "{$protocol}://{$sync_to_ip}"; /*************************************************/ /* Send over any auto-SID management files */ @@ -3847,25 +3861,26 @@ function snort_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $username, $method = 'pfsense.exec_php'; $params = array( XML_RPC_encode($password), XML_RPC_encode($payload) ); - log_error("[snort] Snort XMLRPC CARP sync sending auto-SID conf files to {$url}:{$port}."); + log_error("[snort] Snort XMLRPC sync sending auto-SID conf files to {$url}:{$port}."); $msg = new XML_RPC_Message($method, $params); $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); $cli->setCredentials($username, $password); $resp = $cli->send($msg, $synctimeout); $error = ""; if(!$resp) { - $error = "A communications error occurred while attempting Snort XMLRPC CARP sync with {$url}:{$port}. Failed to transfer file: " . basename($file); + $error = "A communications error occurred while attempting Snort XMLRPC sync with {$url}:{$port}. Failed to transfer file: " . basename($file); log_error($error); file_notice("sync_settings", $error, "Snort Settings Sync", ""); } elseif($resp->faultCode()) { - $error = "An error code was received while attempting Snort XMLRPC CARP sync with {$url}:{$port}. Failed to transfer file: " . basename($file) . " - Code " . $resp->faultCode() . ": " . $resp->faultString(); + $error = "An error code was received while attempting Snort XMLRPC sync with {$url}:{$port}. Failed to transfer file: " . basename($file) . " - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "Snort Settings Sync", ""); } } - if (!empty($sid_files) && $error == "") - log_error("[snort] Snort pkg XMLRPC CARP sync auto-SID conf files success with {$url}:{$port} (pfsense.exec_php)."); + if (!empty($sid_files) && $error == "") { + log_error("[snort] XMLRPC sync auto-SID conf files success with {$url}:{$port} (pfsense.exec_php)."); + } /*************************************************/ /* Send over any IPREP IP List files */ @@ -3879,25 +3894,26 @@ function snort_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $username, $method = 'pfsense.exec_php'; $params = array( XML_RPC_encode($password), XML_RPC_encode($payload) ); - log_error("[snort] Snort XMLRPC CARP sync sending IPREP files to {$url}:{$port}."); + log_error("[snort] Snort XMLRPC sync sending IPREP files to {$url}:{$port}."); $msg = new XML_RPC_Message($method, $params); $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); $cli->setCredentials($username, $password); $resp = $cli->send($msg, $synctimeout); $error = ""; - if(!$resp) { - $error = "A communications error occurred while attempting Snort XMLRPC CARP sync with {$url}:{$port}. Failed to transfer file: " . basename($file); + if (!$resp) { + $error = "A communications error occurred while attempting Snort XMLRPC sync with {$url}:{$port}. Failed to transfer file: " . basename($file); log_error($error); file_notice("sync_settings", $error, "Snort Settings Sync", ""); - } elseif($resp->faultCode()) { - $error = "An error code was received while attempting Snort XMLRPC CARP sync with {$url}:{$port}. Failed to transfer file: " . basename($file) . " - Code " . $resp->faultCode() . ": " . $resp->faultString(); + } elseif ($resp->faultCode()) { + $error = "An error code was received while attempting Snort XMLRPC sync with {$url}:{$port}. Failed to transfer file: " . basename($file) . " - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "Snort Settings Sync", ""); } } - if (!empty($sid_files) && $error == "") - log_error("[snort] Snort pkg XMLRPC CARP sync IPREP files success with {$url}:{$port} (pfsense.exec_php)."); + if (!empty($sid_files) && $error == "") { + log_error("[snort] XMLRPC sync IPREP files success with {$url}:{$port} (pfsense.exec_php)."); + } /**************************************************/ /* Send over the <snortglobal> portion of the */ @@ -3911,7 +3927,7 @@ function snort_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $username, XML_RPC_encode($xml) ); - log_error("[snort] Beginning Snort pkg configuration XMLRPC sync to {$url}:{$port}."); + log_error("[snort] Beginning package configuration XMLRPC sync to {$url}:{$port}."); $method = 'pfsense.merge_installedpackages_section_xmlrpc'; $msg = new XML_RPC_Message($method, $params); $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); @@ -3919,16 +3935,16 @@ function snort_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $username, /* send our XMLRPC message and timeout after defined sync timeout value*/ $resp = $cli->send($msg, $synctimeout); - if(!$resp) { + if (!$resp) { $error = "A communications error occurred while attempting snort XMLRPC sync with {$url}:{$port}."; log_error($error); file_notice("sync_settings", $error, "snort Settings Sync", ""); - } elseif($resp->faultCode()) { + } elseif ($resp->faultCode()) { $error = "An error code was received while attempting snort XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "snort Settings Sync", ""); } else { - log_error("[snort] Snort pkg configuration XMLRPC sync successfully completed with {$url}:{$port}."); + log_error("[snort] Package configuration XMLRPC sync successfully completed with {$url}:{$port}."); } $downloadrulescmd = ""; @@ -3992,16 +4008,16 @@ EOD; $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); $cli->setCredentials($username, $password); $resp = $cli->send($msg, $synctimeout); - if(!$resp) { + if (!$resp) { $error = "A communications error occurred while attempting snort XMLRPC sync with {$url}:{$port} (pfsense.exec_php)."; log_error($error); file_notice("sync_settings", $error, "snort Settings Sync", ""); - } elseif($resp->faultCode()) { + } elseif ($resp->faultCode()) { $error = "An error code was received while attempting snort XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "snort Settings Sync", ""); } else { - log_error("[snort] Snort pkg XMLRPC reload configuration success with {$url}:{$port} (pfsense.exec_php)."); + log_error("[snort] XMLRPC reload configuration success with {$url}:{$port} (pfsense.exec_php)."); } /*************************************************/ @@ -4016,16 +4032,16 @@ EOD; log_error("[snort] Snort XMLRPC sending {$url}:{$port} cmd to execute configuration reload."); $msg2 = new XML_RPC_Message($method, $params2); $resp = $cli->send($msg2, $synctimeout); - if(!$resp) { + if (!$resp) { $error = "A communications error occurred while attempting snort XMLRPC sync with {$url}:{$port} (pfsense.exec_php)."; log_error($error); file_notice("sync_settings", $error, "snort Settings Sync", ""); - } elseif($resp->faultCode()) { + } elseif ($resp->faultCode()) { $error = "An error code was received while attempting snort XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "snort Settings Sync", ""); } else { - log_error("[snort] Snort pkg XMLRPC reload configuration success with {$url}:{$port} (pfsense.exec_php)."); + log_error("[snort] XMLRPC reload configuration success with {$url}:{$port} (pfsense.exec_php)."); } } diff --git a/security/pfSense-pkg-snort/files/usr/local/pkg/snort/snort_sync.xml b/security/pfSense-pkg-snort/files/usr/local/pkg/snort/snort_sync.xml index 4692282..6b9e6a7 100644 --- a/security/pfSense-pkg-snort/files/usr/local/pkg/snort/snort_sync.xml +++ b/security/pfSense-pkg-snort/files/usr/local/pkg/snort/snort_sync.xml @@ -172,11 +172,11 @@ </options> </rowhelperfield> <rowhelperfield> - <fielddescr>IP-Address</fielddescr> + <fielddescr>IP Address/Hostname</fielddescr> <fieldname>varsyncipaddress</fieldname> - <description><![CDATA[IP Address of the destination host.]]></description> + <description><![CDATA[IP address or hostname of the destination host.]]></description> <type>input</type> - <size>15</size> + <size>40</size> </rowhelperfield> <rowhelperfield> <fielddescr>Port</fielddescr> @@ -202,8 +202,6 @@ </rowhelper> </field> </fields> - <custom_delete_php_command> - </custom_delete_php_command> <custom_php_resync_config_command> write_config("Snort pkg: saved changes to XMLRPC sync configuration.");snort_sync_on_changes(); </custom_php_resync_config_command> diff --git a/security/pfSense-pkg-snort/files/usr/local/share/pfSense-pkg-snort/info.xml b/security/pfSense-pkg-snort/files/usr/local/share/pfSense-pkg-snort/info.xml index 62d4230..3eced01 100644 --- a/security/pfSense-pkg-snort/files/usr/local/share/pfSense-pkg-snort/info.xml +++ b/security/pfSense-pkg-snort/files/usr/local/share/pfSense-pkg-snort/info.xml @@ -15,10 +15,10 @@ </build_pbi> <build_options>barnyard2_UNSET_FORCE=ODBC PGSQL PRELUDE;barnyard2_SET_FORCE=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;snort_SET_FORCE=BARNYARD PERFPROFILE SOURCEFIRE GRE IPV6 NORMALIZER APPID;snort_UNSET_FORCE=PULLEDPORK FILEINSPECT HA</build_options> <config_file>https://packages.pfsense.org/packages/config/snort/snort.xml</config_file> - <version>3.2.8.2</version> + <version>3.2.8.3</version> <required_version>2.2</required_version> - <status>Stable</status> + <status>RELEASE</status> <configurationfile>/snort.xml</configurationfile> - <after_install_info>Please visit the Snort settings tab first and select your desired rules. Afterwards visit the update rules tab to download your configured rules.</after_install_info> + <after_install_info>Please visit Services - Snort - Interfaces tab first and select your desired rules. Afterwards visit the Updates tab to download your configured rulesets.</after_install_info> </package> </pfsensepkgs> diff --git a/security/pfSense-pkg-snort/pkg-message b/security/pfSense-pkg-snort/pkg-message index d68a89e..ce4e1b7 100644 --- a/security/pfSense-pkg-snort/pkg-message +++ b/security/pfSense-pkg-snort/pkg-message @@ -1 +1 @@ -Please visit the Snort settings tab first and select your desired rules. Afterwards visit the update rules tab to download your configured rules. +Please visit Services - Snort - Interfaces tab first and select your desired rules. Afterwards visit the Updates tab to download your configured rulesets. diff --git a/security/pfSense-pkg-sudo/files/usr/local/share/pfSense-pkg-sudo/info.xml b/security/pfSense-pkg-sudo/files/usr/local/share/pfSense-pkg-sudo/info.xml index f2bb769..7229bc3 100644 --- a/security/pfSense-pkg-sudo/files/usr/local/share/pfSense-pkg-sudo/info.xml +++ b/security/pfSense-pkg-sudo/files/usr/local/share/pfSense-pkg-sudo/info.xml @@ -5,9 +5,9 @@ <pkginfolink>https://doc.pfsense.org/index.php/Sudo_Package</pkginfolink> <descr><![CDATA[sudo allows delegation of privileges to users in the shell so commands can be run as other users, such as root.]]></descr> <website>http://www.sudo.ws/</website> - <category>Security</category> + <category>System</category> <version>0.2.8</version> - <status>Beta</status> + <status>BETA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/sudo/sudo.xml</config_file> <maintainer>jimp@pfsense.org</maintainer> diff --git a/security/pfSense-pkg-suricata/Makefile b/security/pfSense-pkg-suricata/Makefile index 3cb7be6..59e72f93 100644 --- a/security/pfSense-pkg-suricata/Makefile +++ b/security/pfSense-pkg-suricata/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pfSense-pkg-suricata -PORTVERSION= 2.1.7 +PORTVERSION= 2.1.8 CATEGORIES= security MASTER_SITES= # empty DISTFILES= # empty diff --git a/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata.inc b/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata.inc index 72acd47..8eea712 100644 --- a/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata.inc +++ b/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata.inc @@ -3304,7 +3304,7 @@ function suricata_sync_on_changes() { /* Do not attempt a package sync while booting up or installing package */ if ($g['booting'] || $g['suricata_postinstall'] == TRUE) { - log_error("[suricata] No xmlrpc sync to CARP targets when booting up or during package reinstallation."); + log_error("[suricata] Skipping XMLRPC sync when booting up or during package reinstallation."); return; } @@ -3318,17 +3318,18 @@ function suricata_sync_on_changes() { if (is_array($suricata_sync['row'])) { $rs = $suricata_sync['row']; } else { - log_error("[suricata] xmlrpc CARP sync is enabled but there are no hosts configured as replication targets."); + log_error("[suricata] XMLRPC sync is enabled but there are no hosts configured as replication targets."); return; } break; case "auto": - if (is_array($config['installedpackages']['carpsettings']) && is_array($config['installedpackages']['carpsettings']['config'])) { - $system_carp = $config['installedpackages']['carpsettings']['config'][0]; + if (is_array($config['hasync'])) { + $system_carp = $config['hasync']; $rs[0]['varsyncipaddress'] = $system_carp['synchronizetoip']; $rs[0]['varsyncusername'] = $system_carp['username']; $rs[0]['varsyncpassword'] = $system_carp['password']; - $rs[0]['varsyncsuricatastart'] = "no"; + $rs[0]['varsyncsuricatastart'] = FALSE; + $rs[0]['varsyncdestinenable'] = FALSE; // XMLRPC sync is currently only supported over connections using the same protocol and port as this system if ($config['system']['webgui']['protocol'] == "http") { $rs[0]['varsyncprotocol'] = "http"; @@ -3338,11 +3339,13 @@ function suricata_sync_on_changes() { $rs[0]['varsyncport'] = $config['system']['webgui']['port'] ?: '443'; } if ($system_carp['synchronizetoip'] == "") { - log_error("[suricata] xmlrpc CARP sync is enabled but there are no system backup hosts configured as replication targets."); + log_error("[suricata] XMLRPC CARP/HA sync is enabled but there are no system backup hosts configured as replication targets."); return; + } else { + $rs[0]['varsyncdestinenable'] = TRUE; } } else { - log_error("[suricata] xmlrpc CARP sync is enabled but there are no system backup hosts configured as replication targets."); + log_error("[suricata] XMLRPC CARP/HA sync is enabled but there are no system backup hosts configured as replication targets."); return; } break; @@ -3351,44 +3354,42 @@ function suricata_sync_on_changes() { break; } if (is_array($rs)) { - log_error("[suricata] Suricata pkg xmlrpc CARP sync is starting."); + log_error("[suricata] XMLRPC sync is starting."); foreach ($rs as $sh) { - if ($sh['varsyncsuricatastart']) { - $syncstartsuricata = $sh['varsyncsuricatastart']; - } else { - $syncstartsuricata = "OFF"; - } - $sync_to_ip = $sh['varsyncipaddress']; - $password = $sh['varsyncpassword']; - $port = $sh['varsyncport']; - $protocol = $sh['varsyncprotocol']; - $error = ''; - $success = TRUE; - if ($sh['varsyncusername']) { - $username = $sh['varsyncusername']; - } else { - $username = 'admin'; - } - if ($password == "") { - $error = "Password parameter is empty. "; - $success = FALSE; - } - if (!is_ipaddr($sync_to_ip) && !is_hostname($sync_to_ip) && !is_domain($sync_to_ip)) { - $error .= "Misconfigured Replication Target IP Address. "; - $success = FALSE; - } - if (!is_port($port)) { - $error .= "Misconfigured Replication Target Port. "; - $success = FALSE; - } - if ($success) { - suricata_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $protocol, $username, $password, $synctimeout, $syncstartsuricata); - } else { - log_error("[suricata] Suricata pkg xmlrpc CARP sync aborted due to the following error(s): {$error}"); - return; + // Only sync enabled replication targets + if ($sh['varsyncdestinenable']) { + if ($sh['varsyncsuricatastart']) { + $syncstartsuricata = $sh['varsyncsuricatastart']; + } else { + $syncstartsuricata = "OFF"; + } + $sync_to_ip = $sh['varsyncipaddress']; + $password = $sh['varsyncpassword']; + $port = $sh['varsyncport']; + $protocol = $sh['varsyncprotocol']; + $error = ''; + $success = TRUE; + $username = $sh['varsyncusername'] ?: 'admin'; + if ($password == "") { + $error = "Password parameter is empty. "; + $success = FALSE; + } + if (!is_ipaddr($sync_to_ip) && !is_hostname($sync_to_ip) && !is_domain($sync_to_ip)) { + $error .= "Misconfigured Replication Target IP Address. "; + $success = FALSE; + } + if (!is_port($port)) { + $error .= "Misconfigured Replication Target Port. "; + $success = FALSE; + } + if ($success) { + suricata_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $protocol, $username, $password, $synctimeout, $syncstartsuricata); + } else { + log_error("[suricata] XMLRPC sync with '{$sync_to_ip}' aborted due to the following error(s): {$error}"); + } } } - log_error("[suricata] Suricata pkg xmlrpc CARP sync completed."); + log_error("[suricata] XMLRPC sync completed."); } } } @@ -3399,12 +3400,12 @@ function suricata_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $protoc /* Do not attempt a package sync while booting up or installing package */ if ($g['booting'] || isset($g['suricata_postinstall'])) { - log_error("[suricata] No xmlrpc sync to CARP targets when booting up or during package reinstallation."); + log_error("[suricata] Skipping XMLRPC sync when booting up or during package reinstallation."); return; } if ($username == "" || $password == "" || $sync_to_ip == "" || $port == "" || $protocol == "") { - log_error("[suricata] A required XMLRPC CARP sync parameter (username, password, replication target, port or protocol) is empty ... aborting pkg sync"); + log_error("[suricata] A required XMLRPC sync parameter (username, password, replication target, port or protocol) is empty ... aborting pkg sync"); return; } @@ -3428,25 +3429,25 @@ function suricata_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $protoc $method = 'pfsense.exec_php'; $params = array( XML_RPC_encode($password), XML_RPC_encode($payload) ); - log_error("[suricata] Suricata XMLRPC CARP sync sending auto-SID conf files to {$url}:{$port}."); + log_error("[suricata] XMLRPC sync sending auto-SID conf files to {$url}:{$port}."); $msg = new XML_RPC_Message($method, $params); $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); $cli->setCredentials($username, $password); $resp = $cli->send($msg, $synctimeout); $error = ""; if (!$resp) { - $error = "A communications error occurred while attempting Suricata XMLRPC CARP sync with {$url}:{$port}. Failed to transfer file: " . basename($file); + $error = "A communications error occurred while attempting Suricata XMLRPC sync with {$url}:{$port}. Failed to transfer file: " . basename($file); log_error($error); file_notice("sync_settings", $error, "Suricata Settings Sync", ""); } elseif ($resp->faultCode()) { - $error = "An error code was received while attempting Suricata XMLRPC CARP sync with {$url}:{$port}. Failed to transfer file: " . basename($file) . " - Code " . $resp->faultCode() . ": " . $resp->faultString(); + $error = "An error code was received while attempting Suricata XMLRPC sync with {$url}:{$port}. Failed to transfer file: " . basename($file) . " - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "Suricata Settings Sync", ""); } } if (!empty($sid_files) && $error == "") { - log_error("[suricata] Suricata pkg XMLRPC CARP sync auto-SID conf files success with {$url}:{$port} (pfsense.exec_php)."); + log_error("[suricata] XMLRPC sync auto-SID conf files success with {$url}:{$port} (pfsense.exec_php)."); } /*************************************************/ @@ -3461,25 +3462,25 @@ function suricata_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $protoc $method = 'pfsense.exec_php'; $params = array( XML_RPC_encode($password), XML_RPC_encode($payload) ); - log_error("[suricata] Suricata XMLRPC CARP sync sending IPREP files to {$url}:{$port}."); + log_error("[suricata] Suricata XMLRPC sync sending IPREP files to {$url}:{$port}."); $msg = new XML_RPC_Message($method, $params); $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); $cli->setCredentials($username, $password); $resp = $cli->send($msg, $synctimeout); $error = ""; if (!$resp) { - $error = "A communications error occurred while attempting Suricata XMLRPC CARP sync with {$url}:{$port}. Failed to transfer file: " . basename($file); + $error = "A communications error occurred while attempting Suricata XMLRPC sync with {$url}:{$port}. Failed to transfer file: " . basename($file); log_error($error); file_notice("sync_settings", $error, "Suricata Settings Sync", ""); } elseif ($resp->faultCode()) { - $error = "An error code was received while attempting Suricata XMLRPC CARP sync with {$url}:{$port}. Failed to transfer file: " . basename($file) . " - Code " . $resp->faultCode() . ": " . $resp->faultString(); + $error = "An error code was received while attempting Suricata XMLRPC sync with {$url}:{$port}. Failed to transfer file: " . basename($file) . " - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "Suricata Settings Sync", ""); } } if (!empty($iprep_files) && $error == "") { - log_error("[suricata] Suricata pkg XMLRPC CARP sync IPREP files success with {$url}:{$port} (pfsense.exec_php)."); + log_error("[suricata] XMLRPC sync IPREP files success with {$url}:{$port} (pfsense.exec_php)."); } /**************************************************/ @@ -3494,7 +3495,7 @@ function suricata_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $protoc XML_RPC_encode($xml) ); - log_error("[suricata] Beginning Suricata pkg configuration XMLRPC sync to {$url}:{$port}."); + log_error("[suricata] Beginning package configuration XMLRPC sync to {$url}:{$port}."); $method = 'pfsense.merge_installedpackages_section_xmlrpc'; $msg = new XML_RPC_Message($method, $params); $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); @@ -3503,30 +3504,30 @@ function suricata_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $protoc /* send our XMLRPC message and timeout after defined sync timeout value*/ $resp = $cli->send($msg, $synctimeout); if (!$resp) { - $error = "A communications error occurred while attempting Suricata XMLRPC CARP sync with {$url}:{$port}."; + $error = "A communications error occurred while attempting Suricata XMLRPC sync with {$url}:{$port}."; log_error($error); file_notice("sync_settings", $error, "Suricata Settings Sync", ""); } elseif ($resp->faultCode()) { - $error = "An error code was received while attempting Suricata XMLRPC CARP sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); + $error = "An error code was received while attempting Suricata XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "Suricata Settings Sync", ""); } else { - log_error("[suricata] Suricata pkg configuration XMLRPC CARP sync successfully completed with {$url}:{$port}."); + log_error("[suricata] Package configuration XMLRPC sync successfully completed with {$url}:{$port}."); } $downloadrulescmd = ""; if ($syncdownloadrules == "yes") { - $downloadrulescmd = "log_error(gettext(\"[suricata] XMLRPC pkg CARP sync: Update of downloaded rule sets requested...\"));\n"; + $downloadrulescmd = "log_error(gettext(\"[suricata] XMLRPC pkg sync: Update of downloaded rule sets requested...\"));\n"; $downloadrulescmd .= "\tinclude_once(\"/usr/local/pkg/suricata/suricata_check_for_rule_updates.php\");\n"; } $suricatastart = ""; if ($syncstartsuricata == "ON") { - $suricatastart = "log_error(gettext(\"[suricata] XMLRPC pkg CARP sync: Checking Suricata status...\"));\n"; + $suricatastart = "log_error(gettext(\"[suricata] XMLRPC pkg sync: Checking Suricata status...\"));\n"; $suricatastart .= "\tif (!is_process_running(\"suricata\")) {\n"; - $suricatastart .= "\t\tlog_error(gettext(\"[suricata] XMLRPC pkg CARP sync: Suricata not running. Sending a start command...\"));\n"; + $suricatastart .= "\t\tlog_error(gettext(\"[suricata] XMLRPC pkg sync: Suricata not running. Sending a start command...\"));\n"; $suricatastart .= "\t\t\$sh_script = RCFILEPREFIX . \"suricata.sh\";\n"; $suricatastart .= "\t\tmwexec_bg(\"{\$sh_script} start\");\n\t}\n"; - $suricatastart .= "\telse {\n\t\tlog_error(gettext(\"[suricata] XMLRPC pkg CARP sync: Suricata is running...\"));\n\t}\n"; + $suricatastart .= "\telse {\n\t\tlog_error(gettext(\"[suricata] XMLRPC pkg sync: Suricata is running...\"));\n\t}\n"; } /*************************************************/ @@ -3546,14 +3547,14 @@ function suricata_do_xmlrpc_sync($syncdownloadrules, $sync_to_ip, $port, $protoc \$pkg_interface = "console"; {$downloadrulescmd} unset(\$g["suricata_postinstall"]); - log_error(gettext("[suricata] XMLRPC pkg CARP sync: Generating suricata.yaml file using Master Host settings...")); + log_error(gettext("[suricata] XMLRPC pkg sync: Generating suricata.yaml file using Master Host settings...")); \$rebuild_rules = true; conf_mount_rw(); sync_suricata_package_config(); conf_mount_ro(); \$rebuild_rules = false; {$suricatastart} - log_error(gettext("[suricata] XMLRPC pkg CARP sync process on this host is complete...")); + log_error(gettext("[suricata] XMLRPC pkg sync process on this host is complete...")); \$pkg_interface = \$orig_pkg_interface; unset(\$g["suricata_sync_in_progress"]); return true; @@ -3574,21 +3575,21 @@ EOD; XML_RPC_encode($execcmd) ); - log_error("[suricata] Suricata XMLRPC CARP sync sending reload configuration cmd set as a file to {$url}:{$port}."); + log_error("[suricata] XMLRPC sync sending reload configuration cmd set as a file to {$url}:{$port}."); $msg = new XML_RPC_Message($method, $params); $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); $cli->setCredentials($username, $password); $resp = $cli->send($msg, $synctimeout); if (!$resp) { - $error = "A communications error occurred while attempting Suricata XMLRPC CARP sync with {$url}:{$port} (pfsense.exec_php)."; + $error = "A communications error occurred while attempting Suricata XMLRPC sync with {$url}:{$port} (pfsense.exec_php)."; log_error($error); file_notice("sync_settings", $error, "Suricata Settings Sync", ""); } elseif ($resp->faultCode()) { - $error = "An error code was received while attempting Suricata XMLRPC CARP sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); + $error = "An error code was received while attempting Suricata XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "Suricata Settings Sync", ""); } else { - log_error("[suricata] Suricata pkg XMLRPC CARP sync reload configuration success with {$url}:{$port} (pfsense.exec_php)."); + log_error("[suricata] XMLRPC sync reload configuration success with {$url}:{$port} (pfsense.exec_php)."); } /*************************************************/ @@ -3600,19 +3601,19 @@ EOD; XML_RPC_encode($password), XML_RPC_encode($execcmd) ); - log_error("[suricata] Suricata XMLRPC CARP sync sending {$url}:{$port} cmd to execute configuration reload."); + log_error("[suricata] XMLRPC sync sending {$url}:{$port} cmd to execute configuration reload."); $msg2 = new XML_RPC_Message($method, $params2); $resp = $cli->send($msg2, $synctimeout); if (!$resp) { - $error = "A communications error occurred while attempting Suricata XMLRPC CARP sync with {$url}:{$port} (pfsense.exec_php)."; + $error = "A communications error occurred while attempting Suricata XMLRPC sync with {$url}:{$port} (pfsense.exec_php)."; log_error($error); file_notice("sync_settings", $error, "Suricata Settings Sync", ""); } elseif ($resp->faultCode()) { - $error = "An error code was received while attempting Suricata XMLRPC CARP sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); + $error = "An error code was received while attempting Suricata XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "Suricata Settings Sync", ""); } else { - log_error("[suricata] Suricata pkg XMLRPC CARP sync reload configuration success with {$url}:{$port} (pfsense.exec_php)."); + log_error("[suricata] XMLRPC sync reload configuration success with {$url}:{$port} (pfsense.exec_php)."); } } diff --git a/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_sync.xml b/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_sync.xml index 28083d8..c2f5ec8 100644 --- a/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_sync.xml +++ b/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_sync.xml @@ -1,56 +1,49 @@ <?xml version="1.0" encoding="utf-8" ?> -<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd"> -<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> +<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> - <copyright> + <copyright> <![CDATA[ /* $Id$ */ -/* ========================================================================== */ +/* ====================================================================================== */ /* -based on snortsync.xml developed as part -of pfSense (http://www.pfSense.com) -Copyright (C) 2013 Marcello Coutinho -based on pfblocker_sync.xml -All rights reserved. - -modified for use with Suricata package -Copyright (C) 2014 Bill Meeks -All rights reserved. - -Based on m0n0wall (http://m0n0.ch/wall) -Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>. -All rights reserved. + suricata_sync.xml + part of pfSense (https://www.pfSense.org/) + Copyright (C) 2013 Marcello Coutinho + Copyright (C) 2014-2015 Bill Meeks + Copyright (C) 2015 ESF, LLC + All rights reserved. */ -/* ========================================================================== */ +/* ====================================================================================== */ /* -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. -1. Redistributions of source code MUST retain the above copyright notice, -this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. -2. Redistributions in binary form MUST reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, -OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ -/* ========================================================================== */ -]]></copyright> - <description><![CDATA[Describe your package here]]></description> - <requirements>Describe your package requirements here</requirements> - <faq>Currently there are no FAQ items provided.</faq> +/* ====================================================================================== */ + ]]> + </copyright> <name>suricatasync</name> - <version>1.0</version> + <version>2.1.8</version> <title>Suricata: XMLRPC Sync</title> <include_file>/usr/local/pkg/suricata/suricata.inc</include_file> <tabs> @@ -183,11 +176,11 @@ POSSIBILITY OF SUCH DAMAGE. </options> </rowhelperfield> <rowhelperfield> - <fielddescr>IP-Address</fielddescr> + <fielddescr>IP Address/Hostname</fielddescr> <fieldname>varsyncipaddress</fieldname> - <description><![CDATA[IP Address of the destination host.]]></description> + <description><![CDATA[IP address or hostname of the destination host.]]></description> <type>input</type> - <size>15</size> + <size>40</size> </rowhelperfield> <rowhelperfield> <fielddescr>Port</fielddescr> @@ -213,8 +206,6 @@ POSSIBILITY OF SUCH DAMAGE. </rowhelper> </field> </fields> - <custom_delete_php_command> - </custom_delete_php_command> <custom_php_resync_config_command> write_config("Suricata pkg: updating CARP sync info.");suricata_sync_on_changes(); </custom_php_resync_config_command> diff --git a/security/pfSense-pkg-suricata/files/usr/local/share/pfSense-pkg-suricata/info.xml b/security/pfSense-pkg-suricata/files/usr/local/share/pfSense-pkg-suricata/info.xml index 4557e9e..8f18fcf 100644 --- a/security/pfSense-pkg-suricata/files/usr/local/share/pfSense-pkg-suricata/info.xml +++ b/security/pfSense-pkg-suricata/files/usr/local/share/pfSense-pkg-suricata/info.xml @@ -5,7 +5,7 @@ <website>http://suricata-ids.org/</website> <descr><![CDATA[High Performance Network IDS, IPS and Security Monitoring engine by OISF.]]></descr> <category>Security</category> - <version>2.1.7</version> + <version>2.1.8</version> <status>Stable</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/suricata/suricata.xml</config_file> diff --git a/sysutils/pfSense-pkg-AutoConfigBackup/files/usr/local/share/pfSense-pkg-AutoConfigBackup/info.xml b/sysutils/pfSense-pkg-AutoConfigBackup/files/usr/local/share/pfSense-pkg-AutoConfigBackup/info.xml index 3464dd5..0c4627c 100644 --- a/sysutils/pfSense-pkg-AutoConfigBackup/files/usr/local/share/pfSense-pkg-AutoConfigBackup/info.xml +++ b/sysutils/pfSense-pkg-AutoConfigBackup/files/usr/local/share/pfSense-pkg-AutoConfigBackup/info.xml @@ -8,7 +8,7 @@ <website>https://portal.pfsense.org</website> <category>Services</category> <version>1.29</version> - <status>Stable</status> + <status>RELEASE</status> <required_version>2.2</required_version> <pkginfolink>https://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink> <config_file>https://packages.pfsense.org/packages/config/autoconfigbackup/autoconfigbackup.xml</config_file> diff --git a/sysutils/pfSense-pkg-Backup/files/usr/local/share/pfSense-pkg-Backup/info.xml b/sysutils/pfSense-pkg-Backup/files/usr/local/share/pfSense-pkg-Backup/info.xml index b67c62c..185bb96 100644 --- a/sysutils/pfSense-pkg-Backup/files/usr/local/share/pfSense-pkg-Backup/info.xml +++ b/sysutils/pfSense-pkg-Backup/files/usr/local/share/pfSense-pkg-Backup/info.xml @@ -6,7 +6,7 @@ <category>System</category> <config_file>https://packages.pfsense.org/packages/config/backup/backup.xml</config_file> <version>0.2.1</version> - <status>Beta</status> + <status>BETA</status> <required_version>2.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> <configurationfile>backup.xml</configurationfile> diff --git a/sysutils/pfSense-pkg-Cron/files/usr/local/share/pfSense-pkg-Cron/info.xml b/sysutils/pfSense-pkg-Cron/files/usr/local/share/pfSense-pkg-Cron/info.xml index bf3ab4c..b3512b1 100644 --- a/sysutils/pfSense-pkg-Cron/files/usr/local/share/pfSense-pkg-Cron/info.xml +++ b/sysutils/pfSense-pkg-Cron/files/usr/local/share/pfSense-pkg-Cron/info.xml @@ -3,10 +3,10 @@ <package> <name>Cron</name> <descr><![CDATA[The cron utility is used to manage commands on a schedule.]]></descr> - <category>Services</category> + <category>System</category> <config_file>https://packages.pfsense.org/packages/config/cron/cron.xml</config_file> <version>0.3.2</version> - <status>Beta</status> + <status>BETA</status> <required_version>2.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> <configurationfile>cron.xml</configurationfile> diff --git a/sysutils/pfSense-pkg-Notes/files/usr/local/share/pfSense-pkg-Notes/info.xml b/sysutils/pfSense-pkg-Notes/files/usr/local/share/pfSense-pkg-Notes/info.xml index c5174cb..c1a928c 100644 --- a/sysutils/pfSense-pkg-Notes/files/usr/local/share/pfSense-pkg-Notes/info.xml +++ b/sysutils/pfSense-pkg-Notes/files/usr/local/share/pfSense-pkg-Notes/info.xml @@ -3,11 +3,11 @@ <package> <name>Notes</name> <descr><![CDATA[Track things you want to note for this system.]]></descr> - <category>Status</category> + <category>Utility</category> <pkginfolink/> <config_file>https://packages.pfsense.org/packages/config/notes/notes.xml</config_file> <version>0.2.7</version> - <status>Alpha</status> + <status>RC</status> <required_version>2.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> <configurationfile>notes.xml</configurationfile> diff --git a/sysutils/pfSense-pkg-RRD_Summary/files/usr/local/share/pfSense-pkg-RRD_Summary/info.xml b/sysutils/pfSense-pkg-RRD_Summary/files/usr/local/share/pfSense-pkg-RRD_Summary/info.xml index 40ed496..a5fe4dc 100644 --- a/sysutils/pfSense-pkg-RRD_Summary/files/usr/local/share/pfSense-pkg-RRD_Summary/info.xml +++ b/sysutils/pfSense-pkg-RRD_Summary/files/usr/local/share/pfSense-pkg-RRD_Summary/info.xml @@ -4,9 +4,9 @@ <name>RRD Summary</name> <internal_name>RRD_Summary</internal_name> <descr><![CDATA[RRD Summary Page, which will give a total amount of traffic passed In/Out during this and the previous month.]]></descr> - <category>System</category> + <category>Network Management</category> <version>1.2</version> - <status>Beta</status> + <status>BETA</status> <maintainer>jimp@pfsense.org</maintainer> <port_category>sysutils</port_category> <required_version>2.2</required_version> diff --git a/sysutils/pfSense-pkg-Service_Watchdog/files/usr/local/share/pfSense-pkg-Service_Watchdog/info.xml b/sysutils/pfSense-pkg-Service_Watchdog/files/usr/local/share/pfSense-pkg-Service_Watchdog/info.xml index 3f60c6a..911b13d 100644 --- a/sysutils/pfSense-pkg-Service_Watchdog/files/usr/local/share/pfSense-pkg-Service_Watchdog/info.xml +++ b/sysutils/pfSense-pkg-Service_Watchdog/files/usr/local/share/pfSense-pkg-Service_Watchdog/info.xml @@ -7,7 +7,7 @@ <maintainer>jimp@pfsense.org</maintainer> <version>1.7.1</version> <category>Services</category> - <status>Release</status> + <status>RELEASE</status> <config_file>https://packages.pfsense.org/packages/config/servicewatchdog/servicewatchdog.xml</config_file> <required_version>2.2</required_version> <configurationfile>servicewatchdog.xml</configurationfile> diff --git a/sysutils/pfSense-pkg-Shellcmd/files/usr/local/share/pfSense-pkg-Shellcmd/info.xml b/sysutils/pfSense-pkg-Shellcmd/files/usr/local/share/pfSense-pkg-Shellcmd/info.xml index bd648e0..98392b6 100644 --- a/sysutils/pfSense-pkg-Shellcmd/files/usr/local/share/pfSense-pkg-Shellcmd/info.xml +++ b/sysutils/pfSense-pkg-Shellcmd/files/usr/local/share/pfSense-pkg-Shellcmd/info.xml @@ -3,10 +3,10 @@ <package> <name>Shellcmd</name> <descr><![CDATA[The shellcmd utility is used to manage commands on system startup.]]></descr> - <category>Services</category> + <category>System</category> <config_file>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.xml</config_file> <version>1.0</version> - <status>Beta</status> + <status>BETA</status> <required_version>2.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> <configurationfile>shellcmd.xml</configurationfile> diff --git a/sysutils/pfSense-pkg-blinkled/files/usr/local/share/pfSense-pkg-blinkled/info.xml b/sysutils/pfSense-pkg-blinkled/files/usr/local/share/pfSense-pkg-blinkled/info.xml index 7e05fea..931866b 100644 --- a/sysutils/pfSense-pkg-blinkled/files/usr/local/share/pfSense-pkg-blinkled/info.xml +++ b/sysutils/pfSense-pkg-blinkled/files/usr/local/share/pfSense-pkg-blinkled/info.xml @@ -5,7 +5,7 @@ <descr><![CDATA[Allows you to use LEDs for monitoring network activity on supported platforms (ALIX, WRAP, Soekris, etc.)]]></descr> <category>System</category> <version>0.4.6</version> - <status>Beta</status> + <status>BETA</status> <maintainer>jimp@pfsense.org</maintainer> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/blinkled8/blinkled.xml</config_file> diff --git a/sysutils/pfSense-pkg-gwled/files/usr/local/share/pfSense-pkg-gwled/info.xml b/sysutils/pfSense-pkg-gwled/files/usr/local/share/pfSense-pkg-gwled/info.xml index 4046ff8..163b2de 100644 --- a/sysutils/pfSense-pkg-gwled/files/usr/local/share/pfSense-pkg-gwled/info.xml +++ b/sysutils/pfSense-pkg-gwled/files/usr/local/share/pfSense-pkg-gwled/info.xml @@ -5,7 +5,7 @@ <descr><![CDATA[Allows you to use LEDs for monitoring gateway status on supported platforms (ALIX, WRAP, Soekris, etc.)]]></descr> <category>System</category> <version>0.2.3</version> - <status>Beta</status> + <status>BETA</status> <maintainer>jimp@pfsense.org</maintainer> <port_category>sysutils</port_category> <required_version>2.2</required_version> diff --git a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml index 3b5efa9..9ab89a9 100644 --- a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml +++ b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml @@ -4,7 +4,7 @@ <name>syslog-ng</name> <website>http://www.balabit.com/network-security/syslog-ng/</website> <descr><![CDATA[Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.]]></descr> - <category>Services</category> + <category>System</category> <version>1.1.1</version> <status>BETA</status> <required_version>2.2</required_version> diff --git a/www/pfSense-pkg-Lightsquid/files/usr/local/share/pfSense-pkg-Lightsquid/info.xml b/www/pfSense-pkg-Lightsquid/files/usr/local/share/pfSense-pkg-Lightsquid/info.xml index 8065630..3a92399 100644 --- a/www/pfSense-pkg-Lightsquid/files/usr/local/share/pfSense-pkg-Lightsquid/info.xml +++ b/www/pfSense-pkg-Lightsquid/files/usr/local/share/pfSense-pkg-Lightsquid/info.xml @@ -2,9 +2,10 @@ <pfsensepkgs> <package> <name>Lightsquid</name> - <descr><![CDATA[LightSquid is a high performance web proxy reporting tool. Proxy realtime statistics (SQStat). Requires Squid HTTP proxy.]]></descr> + <descr><![CDATA[LightSquid is a high performance web proxy reporting tool. Includes proxy realtime statistics (SQStat). + <strong>Requires Squid3 or Squid package.</strong>]]></descr> <website>http://lightsquid.sf.net/</website> - <category>Network Report</category> + <category>Network Management</category> <version>2.42</version> <maintainer>dv_serg@mail.ru</maintainer> <port_category>www</port_category> @@ -15,7 +16,7 @@ <port>www/lightsquid</port> </build_pbi> <build_options>lightsquid_SET_FORCE=GD;libgd_UNSET_FORCE=FONTCONFIG XPM;perl_UNSET_FORCE=MULTIPLICITY</build_options> - <status>RC1</status> + <status>RC</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/lightsquid/lightsquid.xml</config_file> <configurationfile>lightsquid.xml</configurationfile> diff --git a/www/pfSense-pkg-Lightsquid/pkg-descr b/www/pfSense-pkg-Lightsquid/pkg-descr index 586e281..54101a7 100644 --- a/www/pfSense-pkg-Lightsquid/pkg-descr +++ b/www/pfSense-pkg-Lightsquid/pkg-descr @@ -1,2 +1,3 @@ -LightSquid is a high performance web proxy reporting tool. Proxy realtime -statistics (SQStat). Requires Squid HTTP proxy. +LightSquid is a high performance web proxy reporting tool. Includes proxy +realtime statistics (SQStat). + <strong>Requires Squid3 or Squid package.</strong> diff --git a/www/pfSense-pkg-squid/files/usr/local/share/pfSense-pkg-squid/info.xml b/www/pfSense-pkg-squid/files/usr/local/share/pfSense-pkg-squid/info.xml index 99caac4..19593e7 100644 --- a/www/pfSense-pkg-squid/files/usr/local/share/pfSense-pkg-squid/info.xml +++ b/www/pfSense-pkg-squid/files/usr/local/share/pfSense-pkg-squid/info.xml @@ -3,14 +3,14 @@ <package> <name>squid3</name> <internal_name>squid</internal_name> - <descr><![CDATA[High performance web proxy cache.<br /> - It combines Squid as a proxy server with its capabilities of acting as a HTTP / HTTPS reverse proxy.<br /> - It includes an Exchange-Web-Access (OWA) Assistant, SSL filtering and antivirus integration via C-ICAP.]]></descr> + <descr><![CDATA[High performance web proxy cache (3.4 branch). It combines Squid as a proxy server with its capabilities of acting as a HTTP / HTTPS reverse proxy.<br /> + It includes an Exchange-Web-Access (OWA) Assistant, SSL filtering and antivirus integration via C-ICAP.<br/><br/> + <strong>WARNING! This package bundles ClamAV that conflicts with 'Dansguardian', 'Mailscanner' and 'HAVP antivirus' packages! Installing these will result in a broken state.</strong>]]></descr> <pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink> <website>http://www.squid-cache.org/</website> - <category>Network</category> + <category>Services</category> <version>0.4.2</version> - <status>beta</status> + <status>BETA</status> <required_version>2.2</required_version> <maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer> <run_depends>sbin/squid:www/squid libexec/squid/squid_radius_auth:www/squid_radius_auth lib/c_icap/virus_scan.so:www/c-icap-modules lib/c_icap/squidclamav.so:www/squidclamav</run_depends> @@ -24,5 +24,6 @@ <config_file>https://packages.pfsense.org/packages/config/squid3/34/squid.xml</config_file> <configurationfile>squid.xml</configurationfile> <depends_on_package_pbi>squid-3.4.10_2-##ARCH##.pbi</depends_on_package_pbi> + <after_install_info>Please visit Services - Squid Proxy Server menu to configure the package and enable the proxy.</after_install_info> </package> </pfsensepkgs> diff --git a/www/pfSense-pkg-squid/pkg-descr b/www/pfSense-pkg-squid/pkg-descr index b5e6e7b..1dc8562 100644 --- a/www/pfSense-pkg-squid/pkg-descr +++ b/www/pfSense-pkg-squid/pkg-descr @@ -1,8 +1,10 @@ -High performance web proxy cache.<br /> - It combines Squid as a proxy server with its - capabilities of acting as a HTTP / HTTPS reverse - proxy.<br /> It includes an Exchange-Web-Access (OWA) - Assistant, SSL filtering and antivirus integration via - C-ICAP. +High performance web proxy cache (3.4 branch). It combines Squid as a proxy +server with its capabilities of acting as a HTTP / HTTPS reverse proxy.<br /> + It includes an Exchange-Web-Access (OWA) Assistant, SSL + filtering and antivirus integration via + C-ICAP.<br/><br/> <strong>WARNING! This package bundles + ClamAV that conflicts with 'Dansguardian', 'Mailscanner' + and 'HAVP antivirus' packages! Installing these will + result in a broken state.</strong> WWW: https://forum.pfsense.org/index.php/topic,48347.0.html diff --git a/www/pfSense-pkg-squid/pkg-message b/www/pfSense-pkg-squid/pkg-message new file mode 100644 index 0000000..205e193 --- /dev/null +++ b/www/pfSense-pkg-squid/pkg-message @@ -0,0 +1 @@ +Please visit Services - Squid Proxy Server menu to configure the package and enable the proxy. diff --git a/www/pfSense-pkg-squidGuard/Makefile b/www/pfSense-pkg-squidGuard/Makefile index af26601..44a01d9 100644 --- a/www/pfSense-pkg-squidGuard/Makefile +++ b/www/pfSense-pkg-squidGuard/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pfSense-pkg-squidGuard -PORTVERSION= 1.9.15 +PORTVERSION= 1.9.16 CATEGORIES= www MASTER_SITES= # empty DISTFILES= # empty @@ -23,32 +23,35 @@ do-extract: do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/pkg + ${MKDIR} ${STAGEDIR}/etc/inc/priv ${MKDIR} ${STAGEDIR}${PREFIX}/www/squidGuard ${MKDIR} ${STAGEDIR}${PREFIX}/www ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} -m 0644 ${FILESDIR}${PREFIX}/pkg/squidguard.xml \ ${STAGEDIR}${PREFIX}/pkg - ${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/squidguard.inc \ + ${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/squidguard.inc \ ${STAGEDIR}${PREFIX}/pkg - ${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/squidguard_configurator.inc \ + ${INSTALL_DATA} ${FILESDIR}/etc/inc/priv/squidguard.priv.inc \ + ${STAGEDIR}/etc/inc/priv + ${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/squidguard_configurator.inc \ ${STAGEDIR}${PREFIX}/pkg - ${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/squidguard_acl.xml \ + ${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/squidguard_acl.xml \ ${STAGEDIR}${PREFIX}/pkg - ${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/squidguard_default.xml \ + ${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/squidguard_default.xml \ ${STAGEDIR}${PREFIX}/pkg - ${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/squidguard_dest.xml \ + ${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/squidguard_dest.xml \ ${STAGEDIR}${PREFIX}/pkg - ${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/squidguard_rewr.xml \ + ${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/squidguard_rewr.xml \ ${STAGEDIR}${PREFIX}/pkg - ${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/squidguard_time.xml \ + ${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/squidguard_time.xml \ ${STAGEDIR}${PREFIX}/pkg - ${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/squidguard_sync.xml \ + ${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/squidguard_sync.xml \ ${STAGEDIR}${PREFIX}/pkg - ${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/www/squidGuard/squidguard_log.php \ + ${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/squidGuard/squidguard_log.php \ ${STAGEDIR}${PREFIX}/www/squidGuard - ${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/www/squidGuard/squidguard_blacklist.php \ + ${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/squidGuard/squidguard_blacklist.php \ ${STAGEDIR}${PREFIX}/www/squidGuard - ${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/www/sgerror.php \ + ${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/sgerror.php \ ${STAGEDIR}${PREFIX}/www ${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \ ${STAGEDIR}${DATADIR} diff --git a/www/pfSense-pkg-squidGuard/files/etc/inc/priv/squidguard.priv.inc b/www/pfSense-pkg-squidGuard/files/etc/inc/priv/squidguard.priv.inc new file mode 100644 index 0000000..a80c798 --- /dev/null +++ b/www/pfSense-pkg-squidGuard/files/etc/inc/priv/squidguard.priv.inc @@ -0,0 +1,55 @@ +<?php +/* + squidguard.priv.inc + part of pfSense (http://www.pfSense.org/) + Copyright (C) 2015 ESF, LLC + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ +global $priv_list; + +$priv_list['page-services-squidguard'] = array(); +$priv_list['page-services-squidguard']['name'] = "WebCfg - Services: SquidGuard package"; +$priv_list['page-services-squidguard']['descr'] = "Allow access to SquidGuard package GUI"; +$priv_list['page-services-squidguard']['match'] = array(); + +$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_acl.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_default.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_dest.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_sync.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_time.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_rewr.xml*"; + +$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_acl.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_default.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_dest.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_sync.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_time.xml*"; +$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_rewr.xml*"; + +$priv_list['page-services-squidguard']['match'][] = "squidguard_blacklist.php*"; +$priv_list['page-services-squidguard']['match'][] = "squidguard_log.php*"; + +?> diff --git a/www/pfSense-pkg-squidGuard/files/usr/local/pkg/squidguard.xml b/www/pfSense-pkg-squidGuard/files/usr/local/pkg/squidguard.xml index e268fb7..e7514f6 100644 --- a/www/pfSense-pkg-squidGuard/files/usr/local/pkg/squidguard.xml +++ b/www/pfSense-pkg-squidGuard/files/usr/local/pkg/squidguard.xml @@ -2,16 +2,52 @@ <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> - <description>[<![CDATA[Describe your package here]]></description> - <requirements>Describe your package requirements here</requirements> - <faq>Currently there are no FAQ items provided.</faq> + <copyright> +<![CDATA[ +/* $Id$ */ +/* ====================================================================================== */ +/* + squidguard.xml + part of pfSense (https://www.pfSense.org/) + Copyright (C) 2006-2013 Sergey Dvoriancev <dv_serg@mail.ru> + Copyright (C) 2015 ESF, LLC + All rights reserved. +*/ +/* ====================================================================================== */ +/* + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ +/* ====================================================================================== */ + ]]> + </copyright> <name>squidguardgeneral</name> - <version>1.4_7 pkg v.1.9.14</version> + <version>1.9.16</version> <title>Proxy filter SquidGuard: General settings</title> <include_file>/usr/local/pkg/squidguard.inc</include_file> <!-- Installation --> <menu> - <name>Proxy filter</name> + <name>SquidGuard Proxy Filter</name> <tooltiptext>Modify the proxy server's filter settings</tooltiptext> <section>Services</section> <url>/pkg_edit.php?xml=squidguard.xml&id=0</url> @@ -62,57 +98,50 @@ </service> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/squidGuard/squidguard.inc</item> </additional_files_needed> <additional_files_needed> + <prefix>/etc/inc/priv/</prefix> + <item>https://packages.pfsense.org/packages/config/squidGuard/squidguard.priv.inc</item> + </additional_files_needed> + <additional_files_needed> <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/squidGuard/squidguard_configurator.inc</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/squidGuard/squidguard_acl.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/squidGuard/squidguard_default.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/squidGuard/squidguard_dest.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/squidGuard/squidguard_rewr.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/squidGuard/squidguard_time.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/squidGuard/squidguard_sync.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/squidGuard/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/squidGuard/squidguard_log.php</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/squidGuard/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/squidGuard/squidguard_blacklist.php</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/squidGuard/sgerror.php</item> </additional_files_needed> <fields> diff --git a/www/pfSense-pkg-squidGuard/files/usr/local/share/pfSense-pkg-squidGuard/info.xml b/www/pfSense-pkg-squidGuard/files/usr/local/share/pfSense-pkg-squidGuard/info.xml index 90898ce..93d60d7 100644 --- a/www/pfSense-pkg-squidGuard/files/usr/local/share/pfSense-pkg-squidGuard/info.xml +++ b/www/pfSense-pkg-squidGuard/files/usr/local/share/pfSense-pkg-squidGuard/info.xml @@ -2,12 +2,13 @@ <pfsensepkgs> <package> <name>squidGuard</name> - <descr><![CDATA[High performance web proxy URL filter. Works with both Squid 2.x and Squid 3.x.]]></descr> + <descr><![CDATA[High performance web proxy URL filter.<br/> + <strong>Works with both Squid (2.7 legacy branch) and Squid3 (3.4 branch) packages.</strong>]]></descr> <website>http://www.squidGuard.org/</website> <maintainer>dv_serg@mail.ru</maintainer> <category>Network Management</category> - <version>1.9.15</version> - <status>Beta</status> + <version>1.9.16</version> + <status>BETA</status> <required_version>2.2</required_version> <depends_on_package_pbi>squidguard-1.4_7-##ARCH##.pbi</depends_on_package_pbi> <port_category>www</port_category> diff --git a/www/pfSense-pkg-squidGuard/pkg-descr b/www/pfSense-pkg-squidGuard/pkg-descr index 7f582b9..fed3c84 100644 --- a/www/pfSense-pkg-squidGuard/pkg-descr +++ b/www/pfSense-pkg-squidGuard/pkg-descr @@ -1 +1,3 @@ -High performance web proxy URL filter. Works with both Squid 2.x and Squid 3.x. +High performance web proxy URL filter.<br/> + <strong>Works with both Squid (2.7 legacy branch) and + Squid3 (3.4 branch) packages.</strong> diff --git a/www/pfSense-pkg-squidGuard/pkg-plist b/www/pfSense-pkg-squidGuard/pkg-plist index 57eab07..81f4725 100644 --- a/www/pfSense-pkg-squidGuard/pkg-plist +++ b/www/pfSense-pkg-squidGuard/pkg-plist @@ -1,5 +1,6 @@ pkg/squidguard.xml pkg/squidguard.inc +/etc/inc/priv/squidguard.priv.inc pkg/squidguard_configurator.inc pkg/squidguard_acl.xml pkg/squidguard_default.xml @@ -11,3 +12,4 @@ www/squidGuard/squidguard_log.php www/squidGuard/squidguard_blacklist.php www/sgerror.php %%DATADIR%%/info.xml +@dir /etc/inc/priv |
