diff options
-rw-r--r-- | config/asterisk/asterisk.inc | 186 | ||||
-rw-r--r-- | config/dansguardian/dansguardian_ldap.php | 296 | ||||
-rw-r--r-- | pkg_config.8.xml | 12 | ||||
-rw-r--r-- | pkg_config.8.xml.amd64 | 9 |
4 files changed, 252 insertions, 251 deletions
diff --git a/config/asterisk/asterisk.inc b/config/asterisk/asterisk.inc index 4cd4bb6b..b2f93532 100644 --- a/config/asterisk/asterisk.inc +++ b/config/asterisk/asterisk.inc @@ -1,93 +1,93 @@ -<?php
-/* ========================================================================== */
-/*
- asterisk.inc
- part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
- 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.
- */
-/* ========================================================================== */
-
-
-function asterisk_install() {
- sync_package_asterisk();
-}
-
-function asterisk_deinstall() {
- $script='/usr/local/etc/rc.d/asterisk';
- if (file_exists($script)){
- mwexec("$script stop");
- chmod ($script,0444);
- }
-}
-
-function sync_package_asterisk() {
- global $config, $g;
-
- #mount filesystem writeable
- conf_mount_rw();
-
- #fix asterisk options for nanobsd
- if ($g['platform'] == "nanobsd"){
- $script='/usr/local/etc/asterisk/logger.conf';
- if (file_exists($script)){
- $script_file=file_get_contents($script);
- $pattern[0]='/messages =/';
- $replace[0]='/tmp/log_asterisk =';
- $script_file=preg_replace($pattern,$replace,$script_file);
- file_put_contents($script, $script_file, LOCK_EX);
- }
-
- $script='/usr/local/etc/asterisk/asterisk.conf';
- if (file_exists($script)){
- $script_file=file_get_contents($script);
- $pattern[0]='@astdbdir => [a-z,A-Z,/]+@';
- $replace[0]='astdbdir => /tmp';
- $pattern[1]='@astspooldir => [a-z,A-Z,/]+@';
- $replace[1]='astspooldir => /tmp';
- $script_file=preg_replace($pattern,$replace,$script_file);
- file_put_contents($script, $script_file, LOCK_EX);
- }
-
- }
-
- $script='/usr/local/etc/rc.d/asterisk';
- if (file_exists($script)){
- $script_file=file_get_contents($script);
- if (preg_match('/NO/',$script_file)){
- $script_file=preg_replace("/NO/","YES",$script_file);
- file_put_contents($script, $script_file, LOCK_EX);
- }
- chmod ($script,0755);
- mwexec("$script stop");
- mwexec_bg("$script start");
- }
- #mount filesystem readonly
- conf_mount_ro();
-
-}
-
-?>
+<?php +/* ========================================================================== */ +/* + asterisk.inc + part of pfSense (http://www.pfSense.com) + Copyright (C) 2012 Marcello Coutinho + 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. + */ +/* ========================================================================== */ + + +function asterisk_install() { + sync_package_asterisk(); +} + +function asterisk_deinstall() { + $script='/usr/local/etc/rc.d/asterisk'; + if (file_exists($script)){ + mwexec("$script stop"); + chmod ($script,0444); + } +} + +function sync_package_asterisk() { + global $config, $g; + + #mount filesystem writeable + conf_mount_rw(); + + #fix asterisk options for nanobsd + if ($g['platform'] == "nanobsd"){ + $script='/usr/local/etc/asterisk/logger.conf'; + if (file_exists($script)){ + $script_file=file_get_contents($script); + $pattern[0]='/messages =/'; + $replace[0]='/tmp/log_asterisk ='; + $script_file=preg_replace($pattern,$replace,$script_file); + file_put_contents($script, $script_file, LOCK_EX); + } + + $script='/usr/local/etc/asterisk/asterisk.conf'; + if (file_exists($script)){ + $script_file=file_get_contents($script); + $pattern[0]='@astdbdir => [a-z,A-Z,/]+@'; + $replace[0]='astdbdir => /tmp'; + $pattern[1]='@astspooldir => [a-z,A-Z,/]+@'; + $replace[1]='astspooldir => /tmp'; + $script_file=preg_replace($pattern,$replace,$script_file); + file_put_contents($script, $script_file, LOCK_EX); + } + + } + + $script='/usr/local/etc/rc.d/asterisk'; + if (file_exists($script)){ + $script_file=file_get_contents($script); + if (preg_match('/NO/',$script_file)){ + $script_file=preg_replace("/NO/","YES",$script_file); + file_put_contents($script, $script_file, LOCK_EX); + } + chmod ($script,0755); + mwexec("$script stop"); + mwexec_bg("$script start"); + } + #mount filesystem readonly + conf_mount_ro(); + +} + +?> diff --git a/config/dansguardian/dansguardian_ldap.php b/config/dansguardian/dansguardian_ldap.php index 90ab1b99..c02289ac 100644 --- a/config/dansguardian/dansguardian_ldap.php +++ b/config/dansguardian/dansguardian_ldap.php @@ -1,149 +1,149 @@ -#!/usr/local/bin/php -f
-<?php
-
-// based on http://samjlevy.com/2011/02/using-php-and-ldap-to-list-of-members-of-an-active-directory-group/
-// pfsense integration by marcelloc and ccesario
-/* $Id$ */
-/* ========================================================================== */
-/*
- dansguardian_ldap.php
- part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
-
- 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.
- */
-/* ========================================================================== */
-
-require_once("/etc/inc/util.inc");
-require_once("/etc/inc/functions.inc");
-require_once("/etc/inc/pkg-utils.inc");
-require_once("/etc/inc/globals.inc");
-
-function explode_dn($dn, $with_attributes=0)
-{
- $result = ldap_explode_dn($dn, $with_attributes);
- if (is_array($result))
- foreach($result as $key => $value) {
- $result[$key] = $value;
- }
- return $result;
-}
-
-function get_ldap_members($group,$user,$password) {
- global $ldap_host;
- global $ldap_dn;
- $LDAPFieldsToFind = array("member");
- $ldap = ldap_connect($ldap_host) or die("Could not connect to LDAP");
-
- // OPTIONS TO AD
- ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION,3);
- ldap_set_option($ldap, LDAP_OPT_REFERRALS,0);
-
- ldap_bind($ldap, $user, $password) or die("Could not bind to LDAP");
-
- $results = ldap_search($ldap,$ldap_dn,"cn=" . $group,$LDAPFieldsToFind);
-
- $member_list = ldap_get_entries($ldap, $results);
- $group_member_details = array();
- if (is_array($member_list[0]))
- foreach($member_list[0] as $list)
- if (is_array($list))
- foreach($list as $member) {
- $member_dn = explode_dn($member);
- $member_cn = str_replace("CN=","",$member_dn[0]);
- $member_search = ldap_search($ldap, $ldap_dn, "(CN=" . $member_cn . ")");
- $member_details = ldap_get_entries($ldap, $member_search);
- $group_member_details[] = array($member_details[0]['samaccountname'][0],
- $member_details[0]['displayname'][0]);
- }
- ldap_close($ldap);
- array_shift($group_member_details);
- return $group_member_details;
- ldap_unbind($ldap);
-}
-
-// Read Pfsense config
-global $config,$g;
-
-#mount filesystem writable
-conf_mount_rw();
-
-$id=0;
-$apply_config=0;
-if (is_array($config['installedpackages']['dansguardiangroups']['config']))
- foreach($config['installedpackages']['dansguardiangroups']['config'] as $group) {
- #ignore default group
- if ($id > 0)
- if ($argv[1] == "" || $argv[1] == $group['name']){
- $members="";
- $ldap_servers= explode (',',$group['ldap']);
- echo "Group : " . $group['name']."\n";
- if (is_array($config['installedpackages']['dansguardianldap']['config']))
- foreach ($config['installedpackages']['dansguardianldap']['config'] as $server){
- if (in_array($server['dc'],$ldap_servers)){
- $ldap_dn = $server['dn'];
- $ldap_host=$server['dc'];
- $mask=(empty($server['mask'])?"USER":$server['mask']);
- $result = get_ldap_members($group['name'],$server['username'].','.$server['dn'],$server['password']);
- foreach($result as $key => $value) {
- if (preg_match ("/\w+/",$value[0])){
- #var_dump($value);
- $name= preg_replace('/[^(\x20-\x7F)]*/','', $value[1]);
- $pattern[0]="/USER/";
- $pattern[1]="/,/";
- $pattern[2]="/NAME/";
- $replace[0]=$value[0];
- $replace[1]="\n";
- $replace[2]="$name";
- $members .= preg_replace($pattern,$replace,$mask)."\n";
- }
- }
- }
- }
- if (!empty($members)){
- $import_users = explode("\n", $members);
- asort($import_users);
- $members=base64_encode(implode("\n", $import_users));
- if($config['installedpackages']['dansguardianusers']['config'][0][strtolower($group['name'])] != $members){
- $config['installedpackages']['dansguardianusers']['config'][0][strtolower($group['name'])] = $members;
- $apply_config++;
- }
- }
- }
- $id++;
- }
-if ($apply_config > 0){
- print "user list from LDAP is different from current group, applying new configuration...";
- write_config();
- include("/usr/local/pkg/dansguardian.inc");
- sync_package_dansguardian();
- print "done\n";
-}
-
-#mount filesystem read-only
-conf_mount_ro();
-
+#!/usr/local/bin/php -f +<?php + +// based on http://samjlevy.com/2011/02/using-php-and-ldap-to-list-of-members-of-an-active-directory-group/ +// pfsense integration by marcelloc and ccesario +/* $Id$ */ +/* ========================================================================== */ +/* + dansguardian_ldap.php + part of pfSense (http://www.pfSense.com) + Copyright (C) 2012 Marcello Coutinho + + 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. + */ +/* ========================================================================== */ + +require_once("/etc/inc/util.inc"); +require_once("/etc/inc/functions.inc"); +require_once("/etc/inc/pkg-utils.inc"); +require_once("/etc/inc/globals.inc"); + +function explode_dn($dn, $with_attributes=0) +{ + $result = ldap_explode_dn($dn, $with_attributes); + if (is_array($result)) + foreach($result as $key => $value) { + $result[$key] = $value; + } + return $result; +} + +function get_ldap_members($group,$user,$password) { + global $ldap_host; + global $ldap_dn; + $LDAPFieldsToFind = array("member"); + $ldap = ldap_connect($ldap_host) or die("Could not connect to LDAP"); + + // OPTIONS TO AD + ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION,3); + ldap_set_option($ldap, LDAP_OPT_REFERRALS,0); + + ldap_bind($ldap, $user, $password) or die("Could not bind to LDAP"); + + $results = ldap_search($ldap,$ldap_dn,"cn=" . $group,$LDAPFieldsToFind); + + $member_list = ldap_get_entries($ldap, $results); + $group_member_details = array(); + if (is_array($member_list[0])) + foreach($member_list[0] as $list) + if (is_array($list)) + foreach($list as $member) { + $member_dn = explode_dn($member); + $member_cn = str_replace("CN=","",$member_dn[0]); + $member_search = ldap_search($ldap, $ldap_dn, "(CN=" . $member_cn . ")"); + $member_details = ldap_get_entries($ldap, $member_search); + $group_member_details[] = array($member_details[0]['samaccountname'][0], + $member_details[0]['displayname'][0]); + } + ldap_close($ldap); + array_shift($group_member_details); + return $group_member_details; + ldap_unbind($ldap); +} + +// Read Pfsense config +global $config,$g; + +#mount filesystem writable +conf_mount_rw(); + +$id=0; +$apply_config=0; +if (is_array($config['installedpackages']['dansguardiangroups']['config'])) + foreach($config['installedpackages']['dansguardiangroups']['config'] as $group) { + #ignore default group + if ($id > 0) + if ($argv[1] == "" || $argv[1] == $group['name']){ + $members=""; + $ldap_servers= explode (',',$group['ldap']); + echo "Group : " . $group['name']."\n"; + if (is_array($config['installedpackages']['dansguardianldap']['config'])) + foreach ($config['installedpackages']['dansguardianldap']['config'] as $server){ + if (in_array($server['dc'],$ldap_servers)){ + $ldap_dn = $server['dn']; + $ldap_host=$server['dc']; + $mask=(empty($server['mask'])?"USER":$server['mask']); + $result = get_ldap_members($group['name'],$server['username'].','.$server['dn'],$server['password']); + foreach($result as $key => $value) { + if (preg_match ("/\w+/",$value[0])){ + #var_dump($value); + $name= preg_replace('/[^(\x20-\x7F)]*/','', $value[1]); + $pattern[0]="/USER/"; + $pattern[1]="/,/"; + $pattern[2]="/NAME/"; + $replace[0]=$value[0]; + $replace[1]="\n"; + $replace[2]="$name"; + $members .= preg_replace($pattern,$replace,$mask)."\n"; + } + } + } + } + if (!empty($members)){ + $import_users = explode("\n", $members); + asort($import_users); + $members=base64_encode(implode("\n", $import_users)); + if($config['installedpackages']['dansguardianusers']['config'][0][strtolower($group['name'])] != $members){ + $config['installedpackages']['dansguardianusers']['config'][0][strtolower($group['name'])] = $members; + $apply_config++; + } + } + } + $id++; + } +if ($apply_config > 0){ + print "user list from LDAP is different from current group, applying new configuration..."; + write_config(); + include("/usr/local/pkg/dansguardian.inc"); + sync_package_dansguardian(); + print "done\n"; +} + +#mount filesystem read-only +conf_mount_ro(); + ?>
\ No newline at end of file diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 21fbfae9..a68ae739 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -235,14 +235,15 @@ <descr>ntop is a network probe that shows network usage in a way similar to what top does for processes. In interactive mode, it displays the network status on the user's terminal. In Web mode it acts as a Web server, creating an HTML dump of the network status. It sports a NetFlow/sFlow emitter/collector, an HTTP-based client interface for creating ntop-centric monitoring applications, and RRD for persistently storing traffic statistics.</descr> <category>Network Management</category> <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> + <depends_on_package_pbi>rrdtool-1.2.30_1-i386.pbi gdbm-1.9.1-i386.pbi perl-5.12.4_2-i386.pbi libpcap-1.1.1_1-i386.pbi geoip-1.4.8_1-i386.pbi font-util-1.2.0-i386.pbi webfonts-0.30_6-i386.pbi ntop-4.1.0_1-i386.pbi</depends_on_package_pbi> <depends_on_package>rrdtool-1.2.26_1.tbz</depends_on_package> - <depends_on_package>gdbm-1.8.3_3.tbz</depends_on_package> - <depends_on_package>perl-5.12.3.tbz</depends_on_package> + <depends_on_package>gdbm-1.9.1.tbz</depends_on_package> + <depends_on_package>perl-5.12.4_4.tbz</depends_on_package> <depends_on_package>libpcap-1.1.1_1.tbz</depends_on_package> <depends_on_package>GeoIP-1.4.8_1.tbz</depends_on_package> <depends_on_package>font-util-1.2.0.tbz</depends_on_package> <depends_on_package>webfonts-0.30_6.tbz</depends_on_package> - <depends_on_package>ntop-4.0.1_1.tbz</depends_on_package> + <depends_on_package>ntop-4.1.0_3.tbz</depends_on_package> <build_port_path>/usr/ports/net/GeoIP</build_port_path> <build_port_path>/usr/ports/databases/gdbm</build_port_path> <build_port_path>/usr/ports/databases/rrdtool12</build_port_path> @@ -250,10 +251,8 @@ <build_port_path>/usr/ports/graphics/graphviz</build_port_path> <build_port_path>/usr/ports/x11-fonts/webfonts</build_port_path> <build_port_path>/usr/ports/net/ntop</build_port_path> - <depends_on_package_pbi>rrdtool-1.2.30_1-i386.pbi gdbm-1.9.1-i386.pbi perl-5.12.4_2-i386.pbi libpcap-1.1.1_1-i386.pbi geoip-1.4.8_1-i386.pbi font-util-1.2.0-i386.pbi webfonts-0.30_6-i386.pbi ntop-4.1.0_1-i386.pbi</depends_on_package_pbi> - <build_options>WITHOUT_APNG=true WITHOUT_COLLATION_FIX=true WITHOUT_DEBUGGING=true WITHOUT_DEJAVU=true WITHOUT_DEVIL=true WITHOUT_DIGCOLA=true WITHOUT_EXTRA_PATCHES=true WITHOUT_FONTCONFIG=true WITHOUT_FPECTL=true WITHOUT_GAM_POLLER=true WITHOUT_GDBM=true WITHOUT_GDK_PIXBUF=true WITHOUT_GHOSTSCRIPT=true WITHOUT_GLITZ=true WITHOUT_GNOMEUI=true WITHOUT_GTK=true WITHOUT_GUILE=true WITHOUT_HUGE_STACK_SIZE=true WITHOUT_ICONV=true WITHOUT_IPSEPCOLA=true WITHOUT_LIBSIGSEGV=true WITHOUT_LOCALE=true WITHOUT_LUA=true WITHOUT_MING=true WITHOUT_MMAP=true WITHOUT_MULTIPLICITY=true WITHOUT_PANGOCAIRO=true WITHOUT_PCAP_PORT=true WITHOUT_PERL=true WITHOUT_PERL_MALLOC=true WITHOUT_PERL_MODULE=true WITHOUT_PHP=true WITHOUT_PTH=true WITHOUT_PYTHON=true WITHOUT_PYTHON_MODULE=true WITHOUT_RSVG=true WITHOUT_RUBY=true WITHOUT_RUBY_MODULE=true WITHOUT_SEM=true WITHOUT_SIMD=true WITHOUT_SITECUSTOMIZE=true WITHOUT_SMYRNA=true WITHOUT_SUIDPERL=true WITHOUT_TCL=true WITHOUT_THREADS=true WITHOUT_TK=true WITHOUT_X11=true WITHOUT_XCB=true WITHOUT_XMLDUMP=true WITHOUT_XPM=true WITHOUT_ZSH=true WITH_BASH=true WITH_EXTRA_ENCODINGS=true WITH_ICONV=true WITH_IPV6=true WITH_NLS=true WITH_PERL_64BITINT=true WITH_PYMALLOC=true WITH_TCPWRAPPER=true WITH_THREADS=true WITH_UCS4=true WITH_USE_PERL=true</build_options> - <version>4.0.1_1 v2</version> + <version>4.1.0_3 v2</version> <status>BETA</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/ntop2/ntop.xml</config_file> @@ -756,6 +755,7 @@ <config_file>http://www.pfsense.com/packages/config/imspector/imspector.xml</config_file> <configurationfile>imspector.xml</configurationfile> <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> + <depends_on_package>sqlite3-3.7.9.tbz</depends_on_package> <depends_on_package>imspector-0.9.tbz</depends_on_package> <build_port_path>/usr/home/pfsense/tools/pfPorts/imspector</build_port_path> </package> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 1f060238..13e7ace1 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -321,13 +321,13 @@ <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> <depends_on_package_pbi>rrdtool-1.2.30_1-amd64.pbi gdbm-1.9.1-amd64.pbi perl-5.12.4_2-amd64.pbi libpcap-1.1.1_1-amd64.pbi geoip-1.4.8_1-amd64.pbi font-util-1.2.0-amd64.pbi webfonts-0.30_6-amd64.pbi ntop-4.1.0_1-amd64.pbi</depends_on_package_pbi> <depends_on_package>rrdtool-1.2.26_1.tbz</depends_on_package> - <depends_on_package>gdbm-1.8.3_3.tbz</depends_on_package> - <depends_on_package>perl-5.12.3.tbz</depends_on_package> + <depends_on_package>gdbm-1.9.1.tbz</depends_on_package> + <depends_on_package>perl-5.12.4_4.tbz</depends_on_package> <depends_on_package>libpcap-1.1.1_1.tbz</depends_on_package> <depends_on_package>GeoIP-1.4.8_1.tbz</depends_on_package> <depends_on_package>font-util-1.2.0.tbz</depends_on_package> <depends_on_package>webfonts-0.30_6.tbz</depends_on_package> - <depends_on_package>ntop-4.0.1_1.tbz</depends_on_package> + <depends_on_package>ntop-4.1.0_3.tbz</depends_on_package> <build_port_path>/usr/ports/net/GeoIP</build_port_path> <build_port_path>/usr/ports/databases/gdbm</build_port_path> <build_port_path>/usr/ports/databases/rrdtool12</build_port_path> @@ -336,7 +336,7 @@ <build_port_path>/usr/ports/x11-fonts/webfonts</build_port_path> <build_port_path>/usr/ports/net/ntop</build_port_path> <build_options>WITHOUT_APNG=true WITHOUT_COLLATION_FIX=true WITHOUT_DEBUGGING=true WITHOUT_DEJAVU=true WITHOUT_DEVIL=true WITHOUT_DIGCOLA=true WITHOUT_EXTRA_PATCHES=true WITHOUT_FONTCONFIG=true WITHOUT_FPECTL=true WITHOUT_GAM_POLLER=true WITHOUT_GDBM=true WITHOUT_GDK_PIXBUF=true WITHOUT_GHOSTSCRIPT=true WITHOUT_GLITZ=true WITHOUT_GNOMEUI=true WITHOUT_GTK=true WITHOUT_GUILE=true WITHOUT_HUGE_STACK_SIZE=true WITHOUT_ICONV=true WITHOUT_IPSEPCOLA=true WITHOUT_LIBSIGSEGV=true WITHOUT_LOCALE=true WITHOUT_LUA=true WITHOUT_MING=true WITHOUT_MMAP=true WITHOUT_MULTIPLICITY=true WITHOUT_PANGOCAIRO=true WITHOUT_PCAP_PORT=true WITHOUT_PERL=true WITHOUT_PERL_MALLOC=true WITHOUT_PERL_MODULE=true WITHOUT_PHP=true WITHOUT_PTH=true WITHOUT_PYTHON=true WITHOUT_PYTHON_MODULE=true WITHOUT_RSVG=true WITHOUT_RUBY=true WITHOUT_RUBY_MODULE=true WITHOUT_SEM=true WITHOUT_SIMD=true WITHOUT_SITECUSTOMIZE=true WITHOUT_SMYRNA=true WITHOUT_SUIDPERL=true WITHOUT_TCL=true WITHOUT_THREADS=true WITHOUT_TK=true WITHOUT_X11=true WITHOUT_XCB=true WITHOUT_XMLDUMP=true WITHOUT_XPM=true WITHOUT_ZSH=true WITH_BASH=true WITH_EXTRA_ENCODINGS=true WITH_ICONV=true WITH_IPV6=true WITH_NLS=true WITH_PERL_64BITINT=true WITH_PYMALLOC=true WITH_TCPWRAPPER=true WITH_THREADS=true WITH_UCS4=true WITH_USE_PERL=true</build_options> - <version>4.0.1_1 v2</version> + <version>4.1.0_3 v2</version> <status>BETA</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/ntop2/ntop.xml</config_file> @@ -795,6 +795,7 @@ <config_file>http://www.pfsense.com/packages/config/imspector/imspector.xml</config_file> <configurationfile>imspector.xml</configurationfile> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> + <depends_on_package>sqlite3-3.7.9.tbz</depends_on_package> <depends_on_package>imspector-0.9.tbz</depends_on_package> <build_port_path>/usr/home/pfsense/tools/pfPorts/imspector</build_port_path> </package> |