aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/nmap/nmap.inc8
-rw-r--r--pkg_config.10.xml4
2 files changed, 7 insertions, 5 deletions
diff --git a/config/nmap/nmap.inc b/config/nmap/nmap.inc
index f66f6be9..632d4b2d 100644
--- a/config/nmap/nmap.inc
+++ b/config/nmap/nmap.inc
@@ -32,14 +32,14 @@ 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:
+ case "2.2":
$source_file = "/usr/pbi/nmap-" . php_uname("m") . "/local/share/nmap/nmap-mac-prefixes";
+ break;
+ default:
+ return null;
}
/* Only copy the file if it doesn't exist */
if (file_exists($source_file) && !file_exists($destination_file)) {
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 87fb24c6..82a737b0 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -741,11 +741,13 @@
<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>nmap-6.47 pkg v1.3</version>
+ <version>1.3</version>
<status>Stable</status>
<pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
<required_version>2.2</required_version>
<configurationfile>nmap.xml</configurationfile>
+ <port_category>security</port_category>
+ <run_depends>bin/nmap:security/nmap</run_depends>
<build_pbi>
<port>security/nmap</port>
</build_pbi>