diff options
25 files changed, 213 insertions, 139 deletions
diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml index 13b4123a..8cef9430 100644 --- a/config/freeradius2/freeradius.xml +++ b/config/freeradius2/freeradius.xml @@ -204,7 +204,7 @@ </adddeleteeditpagefields> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> @@ -280,19 +280,19 @@ <default_value>0</default_value> </field> <field> - <name>MISCELLANEOUS CONFIGURATION</name> + <name>Miscellaneous Configuration</name> <type>listtopic</type> </field> <field> <fielddescr>Number of simultaneous connections</fielddescr> <fieldname>varuserssimultaneousconnect</fieldname> - <description><![CDATA[The maximum of simultaneous connections with this username. If you leave this field empty than there is no limit. If you are using FreeRADIUS with CaptivePortal you should leave this empty. Read the documentation!]]></description> + <description><![CDATA[The maximum of simultaneous connections with this username. If you leave this field empty than there is no limit. If you are using FreeRADIUS with Captive Portal you should leave this empty. Read the documentation!]]></description> <type>input</type> </field> <field> <fielddescr>Redirection URL</fielddescr> <fieldname>varuserswisprredirectionurl</fieldname> - <description><![CDATA[Enter the URL the user should be redirected to after successfull login. (e.g.: http://www.google.com)]]></description> + <description><![CDATA[Enter the URL the user should be redirected to after successful login. (e.g.: http://www.google.com)]]></description> <type>input</type> </field> <field> @@ -302,7 +302,7 @@ <type>input</type> </field> <field> - <name>NETWORK CONFIGURATION</name> + <name>Network Configuration</name> <type>listtopic</type> </field> <field> @@ -339,7 +339,7 @@ <type>input</type> </field> <field> - <name>TIME CONFIGURATION</name> + <name>Time Configuration</name> <type>listtopic</type> </field> <field> @@ -384,7 +384,7 @@ </options> </field> <field> - <name>TRAFFIC AND BANDWIDTH</name> + <name>Traffic and Bandwidth</name> <type>listtopic</type> </field> <field> @@ -425,7 +425,7 @@ <type>input</type> </field> <field> - <name>ADVANCED CONFIGURATION</name> + <name>Advanced Configuration</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiusauthorizedmacs.xml b/config/freeradius2/freeradiusauthorizedmacs.xml index 05b5515a..594e7398 100644 --- a/config/freeradius2/freeradiusauthorizedmacs.xml +++ b/config/freeradius2/freeradiusauthorizedmacs.xml @@ -200,7 +200,7 @@ </adddeleteeditpagefields> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> @@ -227,13 +227,13 @@ <type>input</type> </field> <field> - <name>MISCELLANEOUS CONFIGURATION</name> + <name>Miscellaneous Configuration</name> <type>listtopic</type> </field> <field> <fielddescr>Redirection URL</fielddescr> <fieldname>varmacsswisprredirectionurl</fieldname> - <description><![CDATA[Enter the URL the MAC should be redirected to after successfull login. (e.g.: http://www.google.com)]]></description> + <description><![CDATA[Enter the URL the MAC should be redirected to after successful login. (e.g.: http://www.google.com)]]></description> <type>input</type> </field> <field> @@ -250,7 +250,7 @@ <type>input</type> </field> <field> - <name>NETWORK CONFIGURATION</name> + <name>Network Configuration</name> <type>listtopic</type> </field> <field> @@ -287,7 +287,7 @@ <type>input</type> </field> <field> - <name>TIME CONFIGURATION</name> + <name>Time Configuration</name> <type>listtopic</type> </field> <field> @@ -331,7 +331,7 @@ </options> </field> <field> - <name>TRAFFIC AND BANDWIDTH</name> + <name>Traffic and Bandwidth</name> <type>listtopic</type> </field> <field> @@ -372,7 +372,7 @@ <type>input</type> </field> <field> - <name>ADVANCED CONFIGURATION</name> + <name>Advanced Configuration</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiuscerts.xml b/config/freeradius2/freeradiuscerts.xml index 6108215b..4909411a 100644 --- a/config/freeradius2/freeradiuscerts.xml +++ b/config/freeradius2/freeradiuscerts.xml @@ -98,7 +98,7 @@ </tabs> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiusclients.xml b/config/freeradius2/freeradiusclients.xml index 215a751e..4e66a597 100644 --- a/config/freeradius2/freeradiusclients.xml +++ b/config/freeradius2/freeradiusclients.xml @@ -132,13 +132,13 @@ </adddeleteeditpagefields> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> <fielddescr>Client IP Address</fielddescr> <fieldname>varclientip</fieldname> - <description><![CDATA[Enter the IP address of the client. This is in general the IP of the NAS (switch,accesspoint).]]></description> + <description><![CDATA[Enter the IP address of the RADIUS client. This is the IP of the NAS (switch, access point, firewall, router, etc.).]]></description> <type>input</type> <required/> </field> @@ -156,19 +156,19 @@ <field> <fielddescr>Client Shortname</fielddescr> <fieldname>varclientshortname</fieldname> - <description><![CDATA[Enter shortname of the client. This is in general the hostname of the NAS (switch,accesspoint).]]></description> + <description><![CDATA[Enter a short name for the client. This is generally the hostname of the NAS.]]></description> <type>input</type> <required/> </field> <field> <fielddescr>Client Shared Secret</fielddescr> <fieldname>varclientsharedsecret</fieldname> - <description><![CDATA[Enter the shared secret of the client here. This is the shared secret (password) which the NAS (switch or accesspoint) needs to communicate with the RADIUS server.]]></description> + <description><![CDATA[Enter the shared secret of the RADIUS client here. This is the shared secret (password) which the NAS (switch or accesspoint) needs to communicate with the RADIUS server.]]></description> <type>password</type> <required/> </field> <field> - <name>MISCELLANEOUS CONFIGURATION</name> + <name>Miscellaneous Configuration</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiuseapconf.xml b/config/freeradius2/freeradiuseapconf.xml index 8f8e4dc7..947ef6b9 100644 --- a/config/freeradius2/freeradiuseapconf.xml +++ b/config/freeradius2/freeradiuseapconf.xml @@ -105,7 +105,7 @@ <field> <fielddescr>Disable weak EAP types</fielddescr> <fieldname>vareapconfdisableweakeaptypes</fieldname> - <description><![CDATA[Here you disable the weak EAP types MD5, GTC and LEAP. You should do this if you want that only stronger EAP types like TLS, TTLS, PEAP, MSCHAPv2 should be allowed. This option does not affect the "tunneled EAP sessions".]]></description> + <description><![CDATA[Here you can disable the weak EAP types MD5, GTC and LEAP. Check this to only allow stronger EAP types like TLS, TTLS, PEAP, MSCHAPv2 should be allowed. This option does not affect the "tunneled EAP sessions".]]></description> <type>checkbox</type> </field> <field> @@ -134,7 +134,7 @@ <field> <fielddescr>Ignore Unknown EAP Types</fielddescr> <fieldname>vareapconfignoreunknowneaptypes</fieldname> - <description><![CDATA[If the RADIUS does not know the EAP type it rejects it. If set to "yes" an other module <b>must</b> be configured to proxy the request to a further RADIUS server. (Default: no)]]></description> + <description><![CDATA[If the RADIUS server does not know the EAP type, it rejects it. If set to "yes" another module <b>must</b> be configured to proxy the request to a further RADIUS server. (Default: no)]]></description> <type>select</type> <default_value>no</default_value> <options> @@ -161,23 +161,23 @@ <default_value>4096</default_value> </field> <field> - <name>CERTIFICATES FOR TLS</name> + <name>Certificates for TLS</name> <type>listtopic</type> </field> <field> - <fielddescr>Choose Cert-Manager</fielddescr> + <fielddescr>Choose Cert Manager</fielddescr> <fieldname>vareapconfchoosecertmanager</fieldname> <description><![CDATA[Choose your Cert manager. By default it is the freeradius cert manager because the server needs some default certs to start service. For more information take al look at "Certificates"-Tab.<br> - To use the firewall's built-in Cert Manager you have to create a CA and an Server Certificate first. (SYSTEM -> Cert Manager).<br><br> - <b>uncheked</b>: FreeRADIUS Cert-Manager (not recommended) (Default: unchecked)<br> - <b>cheked</b>: Firewall Cert-Manager (recommended)]]></description> + To use the firewall's built-in Certificate Manager you have to create a CA and an Server Certificate first. (SYSTEM -> Cert Manager).<br><br> + <b>unchecked</b>: FreeRADIUS Cert Manager (not recommended) (Default: unchecked)<br> + <b>checked</b>: Firewall Cert Manager (recommended)]]></description> <type>checkbox</type> <enablefields>ssl_ca_cert,ssl_ca_crl,ssl_server_cert</enablefields> </field> <field> <fielddescr>Private Key Password</fielddescr> <fieldname>vareapconfprivatekeypassword</fieldname> - <description><![CDATA[By default the certificates created by freeradius are protected with an "input/ouput" password from reading the certificate. The certificates created by the firewall's built-in Cert Manager are not protected so you must leave this field empty. (Default: whatever)]]></description> + <description><![CDATA[By default the certificates created by freeradius are protected with an "input/ouput" password from reading the certificate. The certificates created by the firewall's built-in Cert Manager are not protected so you must leave this field empty.]]></description> <type>password</type> <default_value>whatever</default_value> </field> @@ -306,7 +306,7 @@ <field> - <name>EAP-TLS - ENABLE CACHE</name> + <name>EAP-TLS - Enable Cache</name> <type>listtopic</type> </field> <field> @@ -334,7 +334,7 @@ <field> <fielddescr>Max Entries</fielddescr> <fieldname>vareapconfcachemaxentries</fieldname> - <description><![CDATA[The maximum number of entries in the cache. Set to "0" for "infinite". This could be set to the number of users who are logged in... which can be a LOT. (Default: 255)]]></description> + <description><![CDATA[The maximum number of entries in the cache. Set to "0" for "infinite." (Default: 255)]]></description> <type>input</type> <default_value>255</default_value> </field> @@ -470,7 +470,7 @@ <field> <fielddescr>Microsoft Statement of Health (SoH) Support</fielddescr> <fieldname>vareapconfpeapsohenable</fieldname> - <description><![CDATA[You can accept/reject clients if they have not actual windows updates and more. You need to change server-file for your needs. It cannot be changed from GUI and will be deleted after package (re)installation. (/usr/local/etc/raddb/sites-available/soh). (Default: no)]]></description> + <description><![CDATA[You can accept/reject clients based on Microsoft's Statement of Health, such as if they are missing Windows updates, don't have a firewall enabled, antivirus not in line with policy, etc. You need to change server-file for your needs. It cannot be changed from GUI and will be deleted after package reinstallation. (/usr/local/etc/raddb/sites-available/soh). (Default: no)]]></description> <type>select</type> <default_value>Disable</default_value> <options> diff --git a/config/freeradius2/freeradiusinterfaces.xml b/config/freeradius2/freeradiusinterfaces.xml index 1233f72f..5427f988 100644 --- a/config/freeradius2/freeradiusinterfaces.xml +++ b/config/freeradius2/freeradiusinterfaces.xml @@ -120,7 +120,7 @@ </adddeleteeditpagefields> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> @@ -175,7 +175,7 @@ <field> <fielddescr>Description</fielddescr> <fieldname>description</fieldname> - <description><![CDATA[Enter any description you like for this interface.]]></description> + <description><![CDATA[Optionally enter a description here for your reference.]]></description> <type>input</type> </field> </fields> diff --git a/config/freeradius2/freeradiusmodulesldap.xml b/config/freeradius2/freeradiusmodulesldap.xml index 5abe85cb..e476b877 100644 --- a/config/freeradius2/freeradiusmodulesldap.xml +++ b/config/freeradius2/freeradiusmodulesldap.xml @@ -115,7 +115,7 @@ <type>checkbox</type> </field> <field> - <name>GENERAL CONFIGURATION - SERVER 1</name> + <name>General Configuration - SERVER 1</name> <type>listtopic</type> </field> <field> @@ -207,7 +207,7 @@ <default_value>1</default_value> </field> <field> - <name>MISCELLANEOUS CONFIGURATION - SERVER 1</name> + <name>Miscellaneous Configuration - SERVER 1</name> <type>listtopic</type> </field> <field> @@ -434,7 +434,7 @@ <type>checkbox</type> </field> <field> - <name>GENERAL CONFIGURATION - SERVER 2</name> + <name>General Configuration - SERVER 2</name> <type>listtopic</type> </field> <field> @@ -526,7 +526,7 @@ <default_value>1</default_value> </field> <field> - <name>MISCELLANEOUS CONFIGURATION - SERVER 2</name> + <name>Miscellaneous Configuration - SERVER 2</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiussettings.xml b/config/freeradius2/freeradiussettings.xml index 99af4d4a..78c65372 100644 --- a/config/freeradius2/freeradiussettings.xml +++ b/config/freeradius2/freeradiussettings.xml @@ -8,7 +8,8 @@ /* ========================================================================== */ /* freeradiussettings.xml - part of pfSense (http://www.pfSense.com) + part of pfSense (https://www.pfsense.org) + Copyright (C) 2014 Electric Sheep Fencing, LP Copyright (C) 2013 Alexander Wilke <nachtfalkeaw@web.de> All rights reserved. @@ -98,7 +99,7 @@ </tabs> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> @@ -162,7 +163,7 @@ <field> <fielddescr>Logging Destination of RADIUS</fielddescr> <fieldname>varsettingslogdir</fieldname> - <description><![CDATA[Choose the destination where freeRADIUS should log. This will log if service started or failed but no authentication information. (Default: radius.log)]]></description> + <description><![CDATA[Choose the destination where freeRADIUS will log. This will log general service information, but no authentication information. (Default: radius.log)]]></description> <type>select</type> <default_value>syslog</default_value> <options> @@ -316,7 +317,7 @@ <field> <fielddescr>Enable Mobile-One-Time-Password</fielddescr> <fieldname>varsettingsmotpenable</fieldname> - <description><![CDATA[This enables the possibility to authenticate against an username and an one-time-password. The client which generates OTP can be installed on various mobile device plattforms like Android and more. (Default: unchecked)]]></description> + <description><![CDATA[This enables the possibility to authenticate using a username and one-time-password. The client which generates OTP can be installed on various mobile device plattforms like Android and more. (Default: unchecked)]]></description> <type>checkbox</type> <enablefields>varsettingsmotptimespan,varsettingsmotppasswordattempts,varsettingsmotpchecksumtype,varsettingsmotptokenlength</enablefields> </field> @@ -330,14 +331,14 @@ <field> <fielddescr>Number of invalid password attempts</fielddescr> <fieldname>varsettingsmotppasswordattempts</fieldname> - <description><![CDATA[After this the user will be locked out until the admin unlocks the user. (Default: 5)]]></description> + <description><![CDATA[After this many failed attempts, the user will be locked out until an admin unlocks the user. (Default: 5)]]></description> <type>input</type> <default_value>5</default_value> </field> <field> <fielddescr>Hash algorithm</fielddescr> <fieldname>varsettingsmotpchecksumtype</fieldname> - <description><![CDATA[We build a hash of "EPOCHTIME+INIT-SECRET+PIN" and then use the digits as password. Perhaps there are some other/hardware tokens which use other hash types so you can perhaps adjust this here. But this <b>must</b> be equal on bothe sites! (Default: md5)]]></description> + <description><![CDATA[We build a hash of "EPOCHTIME+INIT-SECRET+PIN" and then use the digits as password. Perhaps there are some other/hardware tokens which use other hash types so you can perhaps adjust this here. This <b>must</b> be equal on both sides! (Default: md5)]]></description> <type>select</type> <default_value>md5</default_value> <options> @@ -349,12 +350,12 @@ <field> <fielddescr>Token Password length</fielddescr> <fieldname>varsettingsmotptokenlength</fieldname> - <description><![CDATA[We build a hash of "EPOCHTIME+INIT-SECRET+PIN" and then use the digits 1 to 6 as password. Perhaps there are some other/hardware tokens which use other digits so you can perhaps adjust this here. But this <b>must</b> be equal on bothe sites! (Default: 1-6)]]></description> + <description><![CDATA[We build a hash of "EPOCHTIME+INIT-SECRET+PIN" and then use the digits 1 to 6 as password. Perhaps there are some other/hardware tokens which use other digits so you can perhaps adjust this here. This <b>must</b> be equal on both sides! (Default: 1-6)]]></description> <type>input</type> <default_value>1-6</default_value> </field> <field> - <name>MISCELLANEOUS CONFIGURATION</name> + <name>Miscellaneous Configuration</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiussqlconf.xml b/config/freeradius2/freeradiussqlconf.xml index bb72a07a..f8f7ebc3 100644 --- a/config/freeradius2/freeradiussqlconf.xml +++ b/config/freeradius2/freeradiussqlconf.xml @@ -98,7 +98,7 @@ </tabs> <fields> <field> - <name>ENABLE SQL DATABASE - SERVER 1</name> + <name>Enable SQL Database- Server 1</name> <type>listtopic</type> </field> <field> @@ -117,7 +117,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -129,7 +129,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -141,7 +141,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -153,12 +153,12 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> <field> - <name>SQL DATABASE CONFIGURATION - SERVER 1</name> + <name>SQL Database Configuration - Server 1</name> <type>listtopic</type> </field> <field> @@ -331,7 +331,7 @@ <field> <fielddescr>Read Clients from Database</fielddescr> <fieldname>varsqlconfreadclients</fieldname> - <description><![CDATA[Set to <b>yes</b> to read radius clients from the database ('nas' table). Clients will only be read on server startup. (Default: yes)]]></description> + <description><![CDATA[Set to <b>yes</b> to read RADIUS clients from the database ('nas' table). Clients will only be read on server startup. (Default: yes)]]></description> <type>select</type> <default_value>yes</default_value> <options> @@ -347,7 +347,7 @@ <default_value>nas</default_value> </field> <field> - <name>ENABLE REDUNDANT SQL DATABASE SUPPORT</name> + <name>Enable Redundant SQL Database Support</name> <type>listtopic</type> </field> <field> @@ -366,7 +366,7 @@ </options> </field> <field> - <name>ENABLE SQL DATABASE - SERVER 2</name> + <name>Enable SQL Database - Server 2</name> <type>listtopic</type> </field> <field> @@ -385,7 +385,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -397,7 +397,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -409,7 +409,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -421,12 +421,12 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> <field> - <name>SQL DATABASE CONFIGURATION - SERVER 2</name> + <name>SQL Database Configuration - Server 2</name> <type>listtopic</type> </field> <field> @@ -599,7 +599,7 @@ <field> <fielddescr>Read Clients from Database</fielddescr> <fieldname>varsqlconf2readclients</fieldname> - <description><![CDATA[Set to <b>yes</b> to read radius clients from the database ('nas' table). Clients will only be read on server startup. (Default: yes)]]></description> + <description><![CDATA[Set to <b>yes</b> to read RADIUS clients from the database ('nas' table). Clients will only be read on server startup. (Default: yes)]]></description> <type>select</type> <default_value>yes</default_value> <options> diff --git a/config/ladvd/ladvd.xml b/config/ladvd/ladvd.xml index 50f9b568..0367a19a 100644 --- a/config/ladvd/ladvd.xml +++ b/config/ladvd/ladvd.xml @@ -35,7 +35,7 @@ <version>1.0.2</version> <category>Network Management</category> <title>Services: LADVD</title> - <savetext>ladvd</savetext> + <savetext>Save</savetext> <include_file>/usr/local/pkg/ladvd.inc</include_file> <aftersaveredirect>/pkg_edit.php?xml=ladvd.xml&id=0</aftersaveredirect> <additional_files_needed> diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index 1a34c260..44604a90 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -38,6 +38,10 @@ require_once("shaper.inc"); require_once("util.inc"); require_once("pfsense-utils.inc"); +global $current_openvpn_version, $current_openvpn_version_rev; +$current_openvpn_version = "2.3.5"; +$current_openvpn_version_rev = "01"; + function openvpn_client_export_install() { conf_mount_rw(); $tarpath = "/usr/local/pkg/openvpn-client-export.tgz"; @@ -478,19 +482,25 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifys } } -function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $outpass, $proxy, $openvpnmanager, $advancedoptions, $openvpn_version = "2.1") { - global $config, $g, $input_errors; +function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $outpass, $proxy, $openvpnmanager, $advancedoptions, $openvpn_version = "x86-xp") { + global $config, $g, $input_errors, $current_openvpn_version, $current_openvpn_version_rev; $uname_p = trim(exec("uname -p")); switch ($openvpn_version) { - case "2.3-x86": - $client_install_exe = "openvpn-install-2.3-i686.exe"; + case "x86-xp": + $client_install_exe = "openvpn-install-{$current_openvpn_version}-I0{$current_openvpn_version_rev}-i686.exe"; + break; + case "x64-xp": + $client_install_exe = "openvpn-install-{$current_openvpn_version}-I0{$current_openvpn_version_rev}-x86_64.exe"; + break; + case "x86-win6": + $client_install_exe = "openvpn-install-{$current_openvpn_version}-I6{$current_openvpn_version_rev}-i686.exe"; break; - case "2.3-x64": - $client_install_exe = "openvpn-install-2.3-x86_64.exe"; + case "x64-win6": + $client_install_exe = "openvpn-install-{$current_openvpn_version}-I6{$current_openvpn_version_rev}-x86_64.exe"; break; default: - $client_install_exe = "openvpn-install-2.3-i686.exe"; + $client_install_exe = "openvpn-install-{$current_openvpn_version}-I0{$current_openvpn_version_rev}-i686.exe"; } $ovpndir = "/usr/local/share/openvpn"; diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml index 21faa26d..f96336b3 100755 --- a/config/openvpn-client-export/openvpn-client-export.xml +++ b/config/openvpn-client-export/openvpn-client-export.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <packagegui> <name>OpenVPN Client Export</name> - <version>1.2.13</version> + <version>1.2.14</version> <title>OpenVPN Client Export</title> <include_file>/usr/local/pkg/openvpn-client-export.inc</include_file> <backup_file></backup_file> diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php index 6a8c9358..12ce01d0 100755 --- a/config/openvpn-client-export/vpn_openvpn_export.php +++ b/config/openvpn-client-export/vpn_openvpn_export.php @@ -34,6 +34,8 @@ require("globals.inc"); require("guiconfig.inc"); require("openvpn-client-export.inc"); +global $current_openvpn_version, $current_openvpn_version_rev; + $pgtitle = array("OpenVPN", "Client Export Utility"); if (!is_array($config['openvpn']['openvpn-server'])) @@ -441,11 +443,15 @@ function server_changed() { cell2.innerHTML += "<a href='javascript:download_begin(\"confinlineios\"," + i + ", -1)'>OpenVPN Connect (iOS/Android)<\/a>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"confinline\"," + i + ", -1)'>Others<\/a>"; - cell2.innerHTML += "<br\/>- Windows Installers:<br\/>"; + cell2.innerHTML += "<br\/>- Windows Installers (<?php echo $current_openvpn_version . '-Ix' . $current_openvpn_version_rev;?>):<br\/>"; + cell2.innerHTML += " "; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-xp\"," + i + ", -1)'>x86-xp<\/a>"; + cell2.innerHTML += " "; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-xp\"," + i + ", -1)'>x64-xp<\/a>"; cell2.innerHTML += " "; - cell2.innerHTML += "<a href='javascript:download_begin(\"inst-2.3-x86\"," + i + ", -1)'>2.3-x86<\/a>"; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\"," + i + ", -1)'>x86-win6<\/a>"; cell2.innerHTML += " "; - cell2.innerHTML += "<a href='javascript:download_begin(\"inst-2.3-x64\"," + i + ", -1)'>2.3-x64<\/a>"; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\"," + i + ", -1)'>x64-win6<\/a>"; cell2.innerHTML += "<br\/>- Mac OSX:<br\/>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"visc\"," + i + ", -1)'>Viscosity Bundle<\/a>"; @@ -476,11 +482,15 @@ function server_changed() { cell2.innerHTML += "<a href='javascript:download_begin(\"confinlineios\", -1," + j + ")'>OpenVPN Connect (iOS/Android)<\/a>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"confinline\", -1," + j + ")'>Others<\/a>"; - cell2.innerHTML += "<br\/>- Windows Installers:<br\/>"; + cell2.innerHTML += "<br\/>- Windows Installers (<?php echo $current_openvpn_version . '-Ix' . $current_openvpn_version_rev;?>):<br\/>"; + cell2.innerHTML += " "; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-xp\", -1," + j + ")'>x86-xp<\/a>"; + cell2.innerHTML += " "; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-xp\", -1," + j + ")'>x64-xp<\/a>"; cell2.innerHTML += " "; - cell2.innerHTML += "<a href='javascript:download_begin(\"inst-2.3-x86\", -1," + j + ")'>2.3-x86<\/a>"; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\", -1," + j + ")'>x86-win6<\/a>"; cell2.innerHTML += " "; - cell2.innerHTML += "<a href='javascript:download_begin(\"inst-2.3-x64\", -1," + j + ")'>2.3-x64<\/a>"; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\", -1," + j + ")'>x64-win6<\/a>"; cell2.innerHTML += "<br\/>- Mac OSX:<br\/>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"visc\", -1," + j + ")'>Viscosity Bundle<\/a>"; @@ -518,11 +528,15 @@ function server_changed() { cell2.innerHTML += "<a href='javascript:download_begin(\"confinlineios\"," + i + ")'>OpenVPN Connect (iOS/Android)<\/a>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"confinline\"," + i + ")'>Others<\/a>"; - cell2.innerHTML += "<br\/>- Windows Installers:<br\/>"; + cell2.innerHTML += "<br\/>- Windows Installers (<?php echo $current_openvpn_version . '-Ix' . $current_openvpn_version_rev;?>):<br\/>"; cell2.innerHTML += " "; - cell2.innerHTML += "<a href='javascript:download_begin(\"inst-2.3-x86\"," + i + ")'>2.3-x86<\/a>"; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-xp\"," + i + ")'>x86-xp<\/a>"; cell2.innerHTML += " "; - cell2.innerHTML += "<a href='javascript:download_begin(\"inst-2.3-x64\"," + i + ")'>2.3-x64<\/a>"; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-xp\"," + i + ")'>x64-xp<\/a>"; + cell2.innerHTML += " "; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\"," + i + ")'>x86-win6<\/a>"; + cell2.innerHTML += " "; + cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\"," + i + ")'>x64-win6<\/a>"; cell2.innerHTML += "<br\/>- Mac OSX:<br\/>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"visc\"," + i + ")'>Viscosity Bundle<\/a>"; @@ -871,7 +885,11 @@ function useproxy_changed(obj) { </table> <table width="100%" border="0" cellpadding="0" cellspacing="5" summary="note"> <tr> - <td align="right" valign="top" width="5%"><?= gettext("NOTE:") ?></td> + <td align="right" valign="top" width="5%"><?= gettext("NOTES:") ?></td> + <td><?= gettext("The "XP" Windows installers work on Windows XP and later versions. The "win6" Windows installers include a new tap-windows6 driver that works only on Windows Vista and later.") ?></td> + </tr> + <tr> + <td> </td> <td><?= gettext("If you expect to see a certain client in the list but it is not there, it is usually due to a CA mismatch between the OpenVPN server instance and the client certificates found in the User Manager.") ?></td> </tr> <tr> diff --git a/config/snort/snort.inc b/config/snort/snort.inc index 3a384dee..5c113d27 100755 --- a/config/snort/snort.inc +++ b/config/snort/snort.inc @@ -51,7 +51,7 @@ $snortver = array(); exec("/usr/local/bin/snort -V 2>&1 |/usr/bin/grep Version | /usr/bin/cut -c20-26", $snortver); /* Used to indicate latest version of this include file has been loaded */ -$pfSense_snort_version = "3.1.3"; +$pfSense_snort_version = "3.1.5"; /* get installed package version for display */ $snort_package_version = "Snort {$config['installedpackages']['package'][get_pkg_id("snort")]['version']}"; diff --git a/config/snort/snort.xml b/config/snort/snort.xml index b52a1b7e..91d42532 100755 --- a/config/snort/snort.xml +++ b/config/snort/snort.xml @@ -47,7 +47,7 @@ <faq>Currently there are no FAQ items provided.</faq> <name>Snort</name> <version>2.9.6.2</version> - <title>Services:2.9.6.2 pkg v3.1.3</title> + <title>Services:2.9.6.2 pkg v3.1.5</title> <include_file>/usr/local/pkg/snort/snort.inc</include_file> <menu> <name>Snort</name> @@ -309,7 +309,6 @@ </custom_add_php_command> <custom_php_resync_config_command> <![CDATA[ - if ($GLOBALS['pfSense_snort_version'] == "3.1.3") sync_snort_package_config(); ]]> </custom_php_resync_config_command> diff --git a/config/snort/snort_check_for_rule_updates.php b/config/snort/snort_check_for_rule_updates.php index fc78cf28..edf99dc8 100755 --- a/config/snort/snort_check_for_rule_updates.php +++ b/config/snort/snort_check_for_rule_updates.php @@ -790,7 +790,7 @@ if ($snortdownload == 'on' || $emergingthreats == 'on' || $snortcommunityrules = } error_log(gettext("\tRestarting Snort to activate the new set of rules...\n"), 3, $snort_rules_upd_log); touch("{$g['varrun_path']}/snort_pkg_starting.lck"); - snort_start_all_interfaces(TRUE); + snort_restart_all_interfaces(TRUE); sleep(3); unlink_if_exists("{$g['varrun_path']}/snort_pkg_starting.lck"); if ($pkg_interface <> "console") diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php index 9569c475..a722d52b 100644 --- a/config/snort/snort_migrate_config.php +++ b/config/snort/snort_migrate_config.php @@ -490,7 +490,7 @@ unset($r); // Log a message if we changed anything if ($updated_cfg) { - $config['installedpackages']['snortglobal']['snort_config_ver'] = "3.1.3"; + $config['installedpackages']['snortglobal']['snort_config_ver'] = "3.1.5"; log_error("[Snort] Saving configuration settings in new format..."); log_error("[Snort] Settings successfully migrated to new configuration format..."); } diff --git a/config/snort/snort_post_install.php b/config/snort/snort_post_install.php index c295b881..5009a8b3 100644 --- a/config/snort/snort_post_install.php +++ b/config/snort/snort_post_install.php @@ -263,8 +263,8 @@ if (stristr($config['widgets']['sequence'], "snort_alerts-container") === FALSE) $config['widgets']['sequence'] .= ",{$snort_widget_container}"; /* Update Snort package version in configuration */ -$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.1.3"; -write_config("Snort pkg v3.1.3: post-install configuration saved."); +$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.1.5"; +write_config("Snort pkg v3.1.5: post-install configuration saved."); /* Done with post-install, so clear flag */ unset($g['snort_postinstall']); diff --git a/config/snort/snort_preprocessors.php b/config/snort/snort_preprocessors.php index cb2af543..75e4902d 100755 --- a/config/snort/snort_preprocessors.php +++ b/config/snort/snort_preprocessors.php @@ -255,7 +255,7 @@ if ($_GET['act'] == "import" && isset($_GET['varname']) && !empty($_GET['varvalu // Handle deleting of any of the multiple configuration engines if ($_POST['del_http_inspect']) { - if (isset($_POST['eng_id']) && isset($id) && issset($a_nat[$id])) { + if (isset($_POST['eng_id']) && isset($id) && isset($a_nat[$id])) { unset($a_nat[$id]['http_inspect_engine']['item'][$_POST['eng_id']]); write_config("Snort pkg: deleted http_inspect engine for {$a_nat[$id]['interface']}."); header("Location: snort_preprocessors.php?id=$id#httpinspect_row"); diff --git a/config/squid3/31/swapstate_check.php b/config/squid3/31/swapstate_check.php index 6ecfff3c..52a6c66c 100644 --- a/config/squid3/31/swapstate_check.php +++ b/config/squid3/31/swapstate_check.php @@ -41,6 +41,8 @@ else if ($settings['harddisk_cache_system'] != "null"){ $cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache'); $swapstate = $cachedir . '/swap.state'; + if (!file_exists($swapstate)) + return; $disktotal = disk_total_space(dirname($cachedir)); $diskfree = disk_free_space(dirname($cachedir)); $diskusedpct = round((($disktotal - $diskfree) / $disktotal) * 100); @@ -55,4 +57,4 @@ if ($settings['harddisk_cache_system'] != "null"){ log_error(gettext(sprintf("Squid swap.state file exceeded size limits. Removing and rotating. File was %d bytes, %d%% of total disk space.", $swapstate_size, $swapstate_pct))); } } -?>
\ No newline at end of file +?> diff --git a/config/squid3/33/swapstate_check.php b/config/squid3/33/swapstate_check.php index a0b3c98b..616b8fd9 100644 --- a/config/squid3/33/swapstate_check.php +++ b/config/squid3/33/swapstate_check.php @@ -42,6 +42,8 @@ else if ($settings['harddisk_cache_system'] != "null"){ $cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache'); $swapstate = $cachedir . '/swap.state'; + if (!file_exists($swapstate)) + return; $disktotal = disk_total_space(dirname($cachedir)); $diskfree = disk_free_space(dirname($cachedir)); $diskusedpct = round((($disktotal - $diskfree) / $disktotal) * 100); @@ -55,4 +57,4 @@ if ($settings['harddisk_cache_system'] != "null"){ log_error(gettext(sprintf("Squid cache and/or swap.state exceeded size limits. Removing and rotating. File was %d bytes, %d%% of total disk space.", $swapstate_size, $swapstate_pct))); } } -?>
\ No newline at end of file +?> diff --git a/config/sudo/sudo.inc b/config/sudo/sudo.inc index 68cf4a00..a69d9211 100644 --- a/config/sudo/sudo.inc +++ b/config/sudo/sudo.inc @@ -33,16 +33,30 @@ switch ($pfs_version) { case "1.2": case "2.0": define('SUDO_BASE','/usr/local'); + define('SUDO_LIBEXEC_DIR', '/usr/local/libexec/sudo'); break; - default: + case "2.1": // Hackish way to detect if someone manually did pkg_add rather than use pbi. - if (is_dir('/usr/pbi/sudo-' . php_uname("m"))) + if (is_dir('/usr/pbi/sudo-' . php_uname("m"))) { define('SUDO_BASE', '/usr/pbi/sudo-' . php_uname("m")); - else + define('SUDO_LIBEXEC_DIR', '/usr/local/libexec/'); + } else { define('SUDO_BASE','/usr/local'); + define('SUDO_LIBEXEC_DIR', '/usr/local/libexec/sudo'); + } + break; + default: + define('SUDO_BASE','/usr/local'); + // Hackish way to detect if someone manually did pkg_add rather than use pbi. + if (is_dir('/usr/pbi/sudo-' . php_uname("m"))) { + define('SUDO_LIBEXEC_DIR', '/usr/pbi/sudo-' . php_uname("m") . '/local/libexec/sudo'); + } else { + define('SUDO_LIBEXEC_DIR', '/usr/local/libexec/sudo'); + } } define('SUDO_CONFIG_DIR', SUDO_BASE . '/etc'); +define('SUDO_CONF', SUDO_CONFIG_DIR . '/sudo.conf'); define('SUDO_SUDOERS', SUDO_CONFIG_DIR . '/sudoers'); function sudo_install() { @@ -73,6 +87,12 @@ function sudo_write_config() { global $config; $sudoers = ""; conf_mount_rw(); + + $sudoconf = "Plugin sudoers_policy " . SUDO_LIBEXEC_DIR . "/sudoers.so\n"; + $sudoconf .= "Plugin sudoers_io " . SUDO_LIBEXEC_DIR . "/sudoers.so\n"; + $sudoconf .= "Path noexec " . SUDO_LIBEXEC_DIR . "/sudo_noexec.so\n"; + file_put_contents(SUDO_CONF, $sudoconf); + if (!is_array($config['installedpackages']['sudo']['config'][0]['row'])) { /* No config, wipe sudoers file and bail. */ unlink(SUDO_SUDOERS); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 6258bd84..a91e6d66 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -122,11 +122,33 @@ <configurationfile>pfblocker.xml</configurationfile> </package> <package> + <name>pfBlockerNG</name> + <website/> + <descr><![CDATA[pfBlockerNG is the Next Generation of pfBlocker.<br /> + Manage IPv4/v6 List Sources into 'Deny, Permit or Match' formats<br /> + Country Blocking Database by MaxMind Inc. (GeoLite Free version).<br /> + De-Duplication, Suppression, and Reputation enhancements.<br /> + Provision to download from diverse List formats. Advanced Integration<br /> + for Emerging Threats IQRisk IP Reputation Threat Sources.]]></descr> + <category>Firewall</category> + <pkginfolink></pkginfolink> + <config_file>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.xml</config_file> + <version>0.99</version> + <status>Beta</status> + <required_version>3.0</required_version> + <maintainer>BBCan177@gmail.com</maintainer> + <configurationfile>pfblockerng.xml</configurationfile> + <build_pbi> + <port>net/GeoIP</port> + <port>net-mgmt/grepcidr</port> + </build_pbi> + </package> + <package> <name>haproxy-devel</name> <pkginfolink>https://doc.pfsense.org/index.php/haproxy_package</pkginfolink> - <descr><![CDATA[The Reliable, High Performance TCP/HTTP(s) Load Balancer<br /> - This package implements TCP, HTTP and HTTPS balance features from Haproxy.<br /> - Supports acl's for smart backend switching.]]></descr> + <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.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> <version>1.5.3 pkg v 0.12</version> @@ -331,7 +353,7 @@ </build_pbi> <build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP;snort_SET=TARGETBASED PERFPROFILE SOURCEFIRE GRE IPV6 MPLS NORMALIZER ZLIB;snort_UNSET=PULLEDPORK;perl_SET=THREADS</build_options> <config_file>https://packages.pfsense.org/packages/config/snort/snort.xml</config_file> - <version>2.9.6.2 pkg v3.1.3</version> + <version>2.9.6.2 pkg v3.1.5</version> <required_version>2.2</required_version> <status>Stable</status> <configurationfile>/snort.xml</configurationfile> @@ -500,8 +522,8 @@ <package> <name>Sarg</name> <website>http://www.dansguardian.org/</website> - <descr><![CDATA[Sarg - Squid Analysis Report Generator is a tool that allow you to view "where" your users are going to on the Internet.<br /> - Sarg provides many informations about Proxy(squid,squidguard or dansguardian) users activities: times, bytes, sites, etc...]]></descr> + <descr><![CDATA[Sarg - Squid Analysis Report Generator - is a tool that generates reports about where your users are going on the Internet.<br /> + Sarg provides information about proxy users' activities: times, bytes, sites, etc. for those using Squid, Squidguard or dansguardian.]]></descr> <category>Network Report</category> <config_file>https://packages.pfsense.org/packages/config/sarg/sarg.xml</config_file> <pkginfolink>https://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink> @@ -540,7 +562,7 @@ <name>Varnish3</name> <internal_name>varnish</internal_name> <descr><![CDATA[Varnish is a state-of-the-art, high-performance HTTP accelerator.<br /> - It uses the advanced features in FreeBSD 6/7/8 to achieve its high performance.<br /> + It uses the advanced features in FreeBSD to achieve its high performance.<br /> Version 3 includes streaming support]]></descr> <website>http://varnish-cache.org</website> <pkginfolink>https://doc.pfsense.org/index.php/Varnish_package</pkginfolink> @@ -901,7 +923,7 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>3.1.20 pkg 2.1.1</version> + <version>3.1.20 pkg 2.1.2</version> <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> @@ -925,7 +947,7 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>3.3.11_1 pkg 2.2.7</version> + <version>3.3.11_1 pkg 2.2.8</version> <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> @@ -978,7 +1000,7 @@ </package> <package> <name>arpwatch</name> - <descr>Arpwatch monitors ethernet/ip address pairings. It also logs certain changes to syslog.</descr> + <descr>Arpwatch monitors Ethernet to IP address pairings. It logs certain changes to syslog.</descr> <website>http://www-nrg.ee.lbl.gov/</website> <category>Security</category> <depends_on_package_pbi>arpwatch-2.1.a15_8-##ARCH##.pbi</depends_on_package_pbi> @@ -1058,7 +1080,7 @@ <depends_on_package_pbi>zip-3.0-##ARCH##.pbi p7zip-9.20.1_2-##ARCH##.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> - <version>1.2.13</version> + <version>1.2.14</version> <status>RELEASE</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> @@ -1426,7 +1448,7 @@ <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> <category>Security</category> - <version>0.2.2</version> + <version>0.2.3</version> <status>Beta</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/sudo/sudo.xml</config_file> @@ -1435,7 +1457,7 @@ <build_pbi> <port>security/sudo</port> </build_pbi> - <depends_on_package_pbi>sudo-1.8.10p3-##ARCH##.pbi</depends_on_package_pbi> + <depends_on_package_pbi>sudo-1.8.10p3_1-##ARCH##.pbi</depends_on_package_pbi> </package> <package> <name>Service Watchdog</name> @@ -1484,7 +1506,7 @@ </package> <package> <name>LADVD</name> - <descr>Send and decode link layer advertisements</descr> + <descr>Send and decode link layer advertisements. Support for LLDP (Link Layer Discovery Protocol), CDP (Cisco Discovery Protocol), EDP (Extreme Discovery Protocol) and NDP (Nortel Discovery Protocol).</descr> <website>https://code.google.com/p/ladvd/</website> <category>Network Management</category> <version>1.0.4</version> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index fd486696..c1fdf260 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -127,8 +127,8 @@ <name>haproxy</name> <pkginfolink>https://doc.pfsense.org/index.php/haproxy_package</pkginfolink> <descr><![CDATA[The Reliable, High Performance TCP/HTTP Load Balancer<br /> - This package implements both TCP and HTTP balance features from Haproxy.<br /> - Supports acl's for smart backend switching.]]></descr> + This package implements the TCP and HTTP balancing features of haproxy.<br /> + Supports ACLs for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> <version>1.4.24 pkg v 1.2.5</version> @@ -145,7 +145,7 @@ <name>haproxy-full</name> <pkginfolink>https://doc.pfsense.org/index.php/haproxy_package</pkginfolink> <descr><![CDATA[The Reliable, High Performance TCP/HTTP Load Balancer<br /> - This package implements both TCP and HTTP balance features from Haproxy.<br /> + This package implements the TCP and HTTP balancing features of haproxy.<br /> (Legacy version)]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> @@ -161,9 +161,9 @@ <package> <name>haproxy-devel</name> <pkginfolink>https://doc.pfsense.org/index.php/haproxy_package</pkginfolink> - <descr><![CDATA[The Reliable, High Performance TCP/HTTP(s) Load Balancer<br /> - This package implements TCP, HTTP and HTTPS balance features from Haproxy.<br /> - Supports acl's for smart backend switching.]]></descr> + <descr><![CDATA[The Reliable, High Performance TCP/HTTP(S) Load Balancer<br /> + This package implements the TCP, HTTP and HTTPS balancing features of haproxy.<br /> + Supports ACLs for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> <version>1.5.3 pkg v 0.12</version> @@ -469,7 +469,7 @@ </build_pbi> <build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;snort_SET=TARGETBASED PERFPROFILE SOURCEFIRE GRE IPV6 MPLS NORMALIZER ZLIB;snort_UNSET=PULLEDPORK;perl_SET=THREADS</build_options> <config_file>https://packages.pfsense.org/packages/config/snort/snort.xml</config_file> - <version>2.9.6.2 pkg v3.1.3</version> + <version>2.9.6.2 pkg v3.1.5</version> <required_version>2.1</required_version> <status>Stable</status> <configurationfile>/snort.xml</configurationfile> @@ -663,8 +663,8 @@ <package> <name>Sarg</name> <website>http://www.dansguardian.org/</website> - <descr><![CDATA[Sarg - Squid Analysis Report Generator is a tool that allow you to view "where" your users are going to on the Internet.<br /> - Sarg provides many informations about Proxy(squid,squidguard or dansguardian) users activities: times, bytes, sites, etc...]]></descr> + <descr><![CDATA[Sarg - Squid Analysis Report Generator - is a tool that generates reports about where your users are going on the Internet.<br /> + Sarg provides information about proxy users' activities: times, bytes, sites, etc. for those using Squid, Squidguard or dansguardian.]]></descr> <category>Network Report</category> <config_file>https://packages.pfsense.org/packages/config/sarg/sarg.xml</config_file> <pkginfolink>https://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink> @@ -703,7 +703,7 @@ <package> <name>Varnish</name> <descr><![CDATA[Varnish is a state-of-the-art, high-performance HTTP accelerator.<br /> - It uses the advanced features in FreeBSD 6/7/8 to achieve its high performance.]]></descr> + It uses the advanced features in FreeBSD to achieve its high performance.]]></descr> <website>http://varnish-cache.org</website> <pkginfolink>https://doc.pfsense.org/index.php/Varnish_package</pkginfolink> <category>Services</category> @@ -1157,7 +1157,7 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>3.1.20 pkg 2.1.1</version> + <version>3.1.20 pkg 2.1.2</version> <status>beta</status> <required_version>2.0</required_version> <maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer> @@ -1184,7 +1184,7 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>3.3.10 pkg 2.2.6</version> + <version>3.3.10 pkg 2.2.8</version> <status>beta</status> <required_version>2.0</required_version> <maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer> @@ -1245,7 +1245,7 @@ </package> <package> <name>arpwatch</name> - <descr>Arpwatch monitors ethernet/ip address pairings. It also logs certain changes to syslog.</descr> + <descr>Arpwatch monitors Ethernet to IP address pairings. It logs certain changes to syslog.</descr> <website>http://www-nrg.ee.lbl.gov/</website> <category>Security</category> <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url> @@ -1377,7 +1377,7 @@ <depends_on_package_pbi>zip-3.0-i386.pbi p7zip-9.20.1-i386.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> - <version>1.2.13</version> + <version>1.2.14</version> <status>RELEASE</status> <required_version>2.0</required_version> <config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> @@ -1831,7 +1831,7 @@ <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> <category>Security</category> - <version>0.2.1</version> + <version>0.2.3</version> <status>Beta</status> <required_version>2.0.2</required_version> <config_file>https://packages.pfsense.org/packages/config/sudo/sudo.xml</config_file> @@ -1896,7 +1896,7 @@ </package> <package> <name>LADVD</name> - <descr>Send and decode link layer advertisements</descr> + <descr>Send and decode link layer advertisements. Support for LLDP (Link Layer Discovery Protocol), CDP (Cisco Discovery Protocol), EDP (Extreme Discovery Protocol) and NDP (Nortel Discovery Protocol).</descr> <website>https://code.google.com/p/ladvd/</website> <category>Network Management</category> <version>1.0.4</version> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 1399fa38..ba790cd4 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -114,8 +114,8 @@ <name>haproxy</name> <pkginfolink>https://doc.pfsense.org/index.php/haproxy_package</pkginfolink> <descr><![CDATA[The Reliable, High Performance TCP/HTTP Load Balancer<br /> - This package implements both TCP and HTTP balance features from Haproxy.<br /> - Supports acl's for smart backend switching.]]></descr> + This package implements the TCP and HTTP balancing features of haproxy.<br /> + Supports ACLs for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> <version>1.4.24 pkg v 1.2.5</version> @@ -132,7 +132,7 @@ <name>haproxy-full</name> <pkginfolink>https://doc.pfsense.org/index.php/haproxy_package</pkginfolink> <descr><![CDATA[The Reliable, High Performance TCP/HTTP Load Balancer<br /> - This package implements both TCP and HTTP balance features from Haproxy.<br /> + This package implements the TCP and HTTP balancing features of haproxy.<br /> (Legacy version)]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> @@ -148,9 +148,9 @@ <package> <name>haproxy-devel</name> <pkginfolink>https://doc.pfsense.org/index.php/haproxy_package</pkginfolink> - <descr><![CDATA[The Reliable, High Performance TCP/HTTP(s) Load Balancer<br /> - This package implements TCP, HTTP and HTTPS balance features from Haproxy.<br /> - Supports acl's for smart backend switching.]]></descr> + <descr><![CDATA[The Reliable, High Performance TCP/HTTP(S) Load Balancer<br /> + This package implements the TCP, HTTP and HTTPS balancing features of haproxy.<br /> + Supports ACLs for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> <version>1.5.3 pkg v 0.12</version> @@ -456,7 +456,7 @@ </build_pbi> <build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP;snort_SET=TARGETBASED PERFPROFILE SOURCEFIRE GRE IPV6 MPLS NORMALIZER ZLIB;snort_UNSET=PULLEDPORK;perl_SET=THREADS</build_options> <config_file>https://packages.pfsense.org/packages/config/snort/snort.xml</config_file> - <version>2.9.6.2 pkg v3.1.3</version> + <version>2.9.6.2 pkg v3.1.5</version> <required_version>2.1</required_version> <status>Stable</status> <configurationfile>/snort.xml</configurationfile> @@ -650,8 +650,8 @@ <package> <name>Sarg</name> <website>http://www.dansguardian.org/</website> - <descr><![CDATA[Sarg - Squid Analysis Report Generator is a tool that allow you to view "where" your users are going to on the Internet.<br /> - Sarg provides many informations about Proxy(squid,squidguard or dansguardian) users activities: times, bytes, sites, etc...]]></descr> + <descr><![CDATA[Sarg - Squid Analysis Report Generator - is a tool that generates reports about where your users are going on the Internet.<br /> + Sarg provides information about proxy users' activities: times, bytes, sites, etc. for those using Squid, Squidguard or dansguardian.]]></descr> <category>Network Report</category> <config_file>https://packages.pfsense.org/packages/config/sarg/sarg.xml</config_file> <pkginfolink>https://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink> @@ -690,7 +690,7 @@ <package> <name>Varnish</name> <descr><![CDATA[Varnish is a state-of-the-art, high-performance HTTP accelerator.<br /> - It uses the advanced features in FreeBSD 6/7/8 to achieve its high performance.]]></descr> + It uses the advanced features in FreeBSD to achieve its high performance.]]></descr> <website>http://varnish-cache.org</website> <pkginfolink>https://doc.pfsense.org/index.php/Varnish_package</pkginfolink> <category>Services</category> @@ -1144,7 +1144,7 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>3.1.20 pkg 2.1.1</version> + <version>3.1.20 pkg 2.1.2</version> <status>beta</status> <required_version>2.0</required_version> <maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer> @@ -1171,7 +1171,7 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>3.3.10 pkg 2.2.6</version> + <version>3.3.10 pkg 2.2.8</version> <status>beta</status> <required_version>2.0</required_version> <maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer> @@ -1232,7 +1232,7 @@ </package> <package> <name>arpwatch</name> - <descr>Arpwatch monitors ethernet/ip address pairings. It also logs certain changes to syslog.</descr> + <descr>Arpwatch monitors Ethernet to IP address pairings. It logs certain changes to syslog.</descr> <website>http://www-nrg.ee.lbl.gov/</website> <category>Security</category> <depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> @@ -1364,7 +1364,7 @@ <depends_on_package_pbi>zip-3.0-amd64.pbi p7zip-9.20.1-amd64.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> - <version>1.2.13</version> + <version>1.2.14</version> <status>RELEASE</status> <required_version>2.0</required_version> <config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> @@ -1818,7 +1818,7 @@ <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> <category>Security</category> - <version>0.2.1</version> + <version>0.2.3</version> <status>Beta</status> <required_version>2.0.2</required_version> <config_file>https://packages.pfsense.org/packages/config/sudo/sudo.xml</config_file> @@ -1883,7 +1883,7 @@ </package> <package> <name>LADVD</name> - <descr>Send and decode link layer advertisements</descr> + <descr>Send and decode link layer advertisements. Support for LLDP (Link Layer Discovery Protocol), CDP (Cisco Discovery Protocol), EDP (Extreme Discovery Protocol) and NDP (Nortel Discovery Protocol).</descr> <website>https://code.google.com/p/ladvd/</website> <category>Network Management</category> <version>1.0.4</version> |