From fe6da2a94b93b769a664c5ec019bfe33ff048bce Mon Sep 17 00:00:00 2001 From: jim-p Date: Mon, 24 Nov 2014 09:14:22 -0500 Subject: Add some "install" code for nmap to check for the OUI database and symlink it if necessary. --- config/nmap/nmap.inc | 22 ++++++++++++++++++++++ config/nmap/nmap.xml | 5 ++++- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/config/nmap/nmap.inc b/config/nmap/nmap.inc index 272f27ef..f66f6be9 100644 --- a/config/nmap/nmap.inc +++ b/config/nmap/nmap.inc @@ -28,6 +28,28 @@ POSSIBILITY OF SUCH DAMAGE. */ +function nmap_install() { + $destination_file = "/usr/local/share/nmap/nmap-mac-prefixes"; + $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); + switch ($pfs_version) { + case "1.2": + case "2.0": + return null; + case "2.1": + $source_file = "/usr/pbi/nmap-" . php_uname("m") . "/share/nmap/nmap-mac-prefixes"; + break; + default: + $source_file = "/usr/pbi/nmap-" . php_uname("m") . "/local/share/nmap/nmap-mac-prefixes"; + } + /* Only copy the file if it doesn't exist */ + if (file_exists($source_file) && !file_exists($destination_file)) { + if (!is_dir(dirname($destination_file))) { + @mkdir(dirname($destination_file), 0644, true); + } + @symlink($source_file, $destination_file); + } +} + function nmap_custom_php_validation_command($post, & $input_errors) { global $_POST, $savemsg, $config; if (empty($_POST['hostname'])) { diff --git a/config/nmap/nmap.xml b/config/nmap/nmap.xml index b07b3982..ad0f8e0a 100644 --- a/config/nmap/nmap.xml +++ b/config/nmap/nmap.xml @@ -46,7 +46,7 @@ Describe your package requirements here Currently there are no FAQ items provided. nmap - 6.40_2 pkg v1.2.1 + 6.40_2 pkg v1.3 Diagnostics: NMap Scan yes @@ -122,4 +122,7 @@ nmap_custom_php_validation_command($_POST, $input_errors); + + nmap_install(); + diff --git a/pkg_config.10.xml b/pkg_config.10.xml index df48fd80..219f17b3 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -684,7 +684,7 @@ Security nmap-6.46-##ARCH##.pbi https://packages.pfsense.org/packages/config/nmap/nmap.xml - nmap-6.46 pkg v1.2.2 + nmap-6.46 pkg v1.3 Stable https://doc.pfsense.org/index.php/Nmap_package 2.2 diff --git a/pkg_config.8.xml b/pkg_config.8.xml index a84223a7..9ee9ab4b 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -882,7 +882,7 @@ nmap-6.25_1.tbz nmap-6.40_2-i386.pbi https://packages.pfsense.org/packages/config/nmap/nmap.xml - nmap-6.40_2 pkg v1.2.2 + nmap-6.40_2 pkg v1.3 Stable https://doc.pfsense.org/index.php/Nmap_package 2.0 diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 6d04672e..a1efb462 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -869,7 +869,7 @@ nmap-6.25_1.tbz nmap-6.40_2-amd64.pbi https://packages.pfsense.org/packages/config/nmap/nmap.xml - nmap-6.40_2 pkg v1.2.2 + nmap-6.40_2 pkg v1.3 Stable https://doc.pfsense.org/index.php/Nmap_package 2.0 -- cgit v1.2.3