diff --git a/CHANGELOG b/CHANGELOG index 0debe9019..d3012a95a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,15 +1,69 @@ #Nmap Changelog ($Id$); -*-text-*- -o [GH#2338][NSE] Fix mpint packing in ssh2 library, which was causing OpenSSH - errors like "ssh_dispatch_run_fatal: bignum is negative" [Sami Loone] +Nmap 7.94 [2023-05-19] -o Additional Python 3 update fixes by Sam James, Daniel Miller. Special thanks - to those who opened Python 3-related issues and pull requests: Eli Schwartz, Romain - Leonard, Varunram Ganesh, Pavel Zhukov, Carey Balboa, Hasan Aliyev, and others. +o Zenmap and Ndiff now use Python 3! Thanks to the many contributors who made + this effort possible: + + [GH#2088][GH#1176][Zenmap] Updated Zenmap to Python 3 and PyGObject. [Jakub Kulík] -o [GH#1807][GH#1176][Ndiff] Updated Ndiff to Python 3. [Brian Quigley] + + [GH#1807][GH#1176][Ndiff] Updated Ndiff to Python 3. [Brian Quigley] -o [GH#2088][GH#1176][Zenmap] Updated Zenmap to Python 3 and PyGObject. [Jakub Kulík] + + Additional Python 3 update fixes by Sam James, Daniel Miller. Special thanks + to those who opened Python 3-related issues and pull requests: Eli + Schwartz, Romain Leonard, Varunram Ganesh, Pavel Zhukov, Carey Balboa, + Hasan Aliyev, and others. + +o [Windows] Upgraded Npcap (our Windows raw packet capturing and + transmission driver) from version 1.71 to the latest version 1.75. It + includes dozens of performance improvements, bug fixes and feature + enhancements described at https://npcap.com/changelog. + +o Nmap now prints vendor names based on MAC address for MA-S (24-bit), MA-M + (28-bit), and MA-L (36-bit) registrations instead of the fixed 3-byte MAC + prefix used previously for lookups. + +o Added partial silent-install support to the Nmap Windows + installer. It previously didn't offer silent mode (/S) because the + free/demo version of Npcap Windoes packet capturing driver that it + needs and ships with doesn't include a silent installer. Now with + the /S option, Nmap checks whether Npcap is already installed + (either the free version or OEM) and will silently install itself if + so. This is similar to how the Wireshark installer works and is + particularly helpful for organizations that want to fully automate + their Nmap (and Npcap) deployments. See + https://nmap.org/nmap-silent-install for more details. + +o Lots of profile-guided memory and processing improvements for Nmap, including + OS fingerprint matching, probe matching and retransmission lookups for large + hostgroups, and service name lookups. Overhauled Nmap's string interning and + several other startup-related procedures to speed up start times, especially + for scans using OS detection. [Daniel Miller] + +o Integrated many of the most-submitted IPv4 OS fingerprints for recent + versions of Windows, iOS, macOS, Linux, and BSD. Added 22 fingerprints, + bringing the new total to 5700! + +o [NSE][GH#548] Added the tftp-version script which requests a + nonexistent file from a TFTP server and matches the error message + to a database of known software. [Mak Kolybabi] + +o [Ncat][GH#1223] Ncat can now accept "connections" from multiple UDP hosts in + listen mode with the --keep-open option. This also enables --broker and + --chat via UDP. [Daniel Miller] + +o [GH#2575] Upgraded OpenSSL binaries (for the Windows builds and for + RPM's) to version 3.0.8. This resolves some CVE's (CVE-2022-3602; + CVE-2022-3786) which don't impact Nmap proper since it doesn't do + certificate validation, but could possibly impact Ncat when the + --ssl-verify option is used. + +o Upgrade included libraries: zlib 1.2.13, Lua 5.4.4, libpcap 1.10.4 + +o [GH#2532] Removed the bogus OpenSSL message from the Windows Nmap + executable which looked like "NSOCK ERROR ssl_init_helper(): OpenSSL + legacy provider failed to load." We actually already have the legacy + provider built-in to our OpenSSL builds, and that's why loading the + external one fails. o [GH#2541] UDP port scan (-sU) and version scan (-sV) now both use the same data source, nmap-service-probes, for data payloads. Previously, the @@ -24,25 +78,33 @@ o Nmap's service scan (-sV) can now probe the UDP service behind a DTLS tunnel, o [Ncat] Ncat in listen mode with --udp --ssl will use DTLS to secure incoming connections. [Daniel Miller] -o [Ncat][GH#1223] Ncat can now accept "connections" from multiple UDP hosts in - listen mode with the --keep-open option. This also enables --broker and - --chat via UDP. [Daniel Miller] +o [GH#1023] Handle Internationalized Domain Names (IDN) like Яндекс.рф on + platforms where getaddrinfo supports the AI_IDN flag. [Daniel Miller] + +o [Ncat] Addressed an issue from the Debian bug tracker + (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=969314) regarding data + received immediately after a SOCKS CONNECT response. Ncat can now be + correctly used in the ProxyCommand option of OpenSSH. + +o Improved DNS domain name parsing to avoid recursion and enforce name length + limits, avoiding a theoretical stack overflow issue with certain crafted DNS + server responses, reported by Philippe Antoine. + +o [GH#2338][NSE] Fix mpint packing in ssh2 library, which was causing OpenSSH + errors like "ssh_dispatch_run_fatal: bignum is negative" [Sami Loone] o [GH#2507] Updates to the Japanese manpage translation by Taichi Kotake. -o [NSE][GH#548] New script tftp-version requests a nonexistent file from a TFTP - server and matches the error message to a database of known software. - [Mak Kolybabi] - -o [Ncat][GH#1026][GH#2426] Speed up transfers on Windows by avoiding a 125ms - wait for every read from STDIN. [scriptjunkie] +o [Ncat][GH#1026][GH#2426] Dramatically speed up Ncat transfers on + Windows by avoiding a 125ms wait for every read from + STDIN. [scriptjunkie] o [GH#1192][Windows] Periodically reset the system idle timer to keep the system from going to sleep while scans are in process. This only affects port scans and OS detection scans, since NSE and version scan do not rely on timing data to adjust speed. -o Update the Nmap Public Source License (NPSL) to Version 0.95. This +o Updated the Nmap Public Source License (NPSL) to Version 0.95. This just clarifies that the derivative works definition and all other license clauses only apply to parties who choose to accept the license in return for the special rights granted (such as Nmap @@ -52,9 +114,6 @@ o Update the Nmap Public Source License (NPSL) to Version 0.95. This work. Versions of Nmap released under previous versions of the NPSL may also be used under the NPSL 0.95 terms. -o [GH#1023] Handle Internationalized Domain Names (IDN) like Яндекс.рф on - platforms where getaddrinfo supports the AI_IDN flag. [Daniel Miller] - o Avoid storing many small strings from IPv4 OS detection results in the global string_pool. These were effectively leaked after a host is done being scanned, since string_pool allocations are not freed until Nmap quits. diff --git a/docs/man-xlate/nmap-es.1 b/docs/man-xlate/nmap-es.1 index 7aacbfc27..20374f354 100644 --- a/docs/man-xlate/nmap-es.1 +++ b/docs/man-xlate/nmap-es.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Autor" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 31/03/2023 +.\" Date: 17/05/2023 .\" Manual: Guía de referencia de Nmap .\" Source: Nmap .\" Language: Spanish .\" -.TH "NMAP" "1" "31/03/2023" "Nmap" "Guía de referencia de Nmap" +.TH "NMAP" "1" "17/05/2023" "Nmap" "Guía de referencia de Nmap" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man-xlate/nmap-fr.1 b/docs/man-xlate/nmap-fr.1 index c41419f0f..4cca1f757 100644 --- a/docs/man-xlate/nmap-fr.1 +++ b/docs/man-xlate/nmap-fr.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Auteur" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 31/03/2023 +.\" Date: 17/05/2023 .\" Manual: Guide de référence Nmap .\" Source: Nmap .\" Language: French .\" -.TH "NMAP" "1" "31/03/2023" "Nmap" "Guide de référence Nmap" +.TH "NMAP" "1" "17/05/2023" "Nmap" "Guide de référence Nmap" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man-xlate/nmap-hr.1 b/docs/man-xlate/nmap-hr.1 index 7a141c1ba..58f5ebab8 100644 --- a/docs/man-xlate/nmap-hr.1 +++ b/docs/man-xlate/nmap-hr.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/31/2023 +.\" Date: 05/17/2023 .\" Manual: Nmap vodič .\" Source: Nmap .\" Language: Croatian .\" -.TH "NMAP" "1" "03/31/2023" "Nmap" "Nmap vodič" +.TH "NMAP" "1" "05/17/2023" "Nmap" "Nmap vodič" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man-xlate/nmap-hu.1 b/docs/man-xlate/nmap-hu.1 index e03448777..7feb41e69 100644 --- a/docs/man-xlate/nmap-hu.1 +++ b/docs/man-xlate/nmap-hu.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 31/03/2023 +.\" Date: 17/05/2023 .\" Manual: Nmap Referencia Útmutató .\" Source: Nmap .\" Language: Hungarian .\" -.TH "NMAP" "1" "31/03/2023" "Nmap" "Nmap Referencia Útmutató" +.TH "NMAP" "1" "17/05/2023" "Nmap" "Nmap Referencia Útmutató" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man-xlate/nmap-id.1 b/docs/man-xlate/nmap-id.1 index f086f77a2..429c0a90e 100644 --- a/docs/man-xlate/nmap-id.1 +++ b/docs/man-xlate/nmap-id.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Penulis" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/31/2023 +.\" Date: 05/17/2023 .\" Manual: Panduan Referensi Nmap .\" Source: Nmap .\" Language: Indonesian .\" -.TH "NMAP" "1" "03/31/2023" "Nmap" "Panduan Referensi Nmap" +.TH "NMAP" "1" "05/17/2023" "Nmap" "Panduan Referensi Nmap" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man-xlate/nmap-it.1 b/docs/man-xlate/nmap-it.1 index 1acd536a7..2167ae5fb 100644 --- a/docs/man-xlate/nmap-it.1 +++ b/docs/man-xlate/nmap-it.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Autore" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 31/03/2023 +.\" Date: 17/05/2023 .\" Manual: Guida di riferimento di Nmap .\" Source: Nmap .\" Language: Italian .\" -.TH "NMAP" "1" "31/03/2023" "Nmap" "Guida di riferimento di Nmap" +.TH "NMAP" "1" "17/05/2023" "Nmap" "Guida di riferimento di Nmap" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man-xlate/nmap-ja.1 b/docs/man-xlate/nmap-ja.1 index c37edce2a..185b38462 100644 --- a/docs/man-xlate/nmap-ja.1 +++ b/docs/man-xlate/nmap-ja.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 31/03/2023 +.\" Date: 17/05/2023 .\" Manual: Nmap リファレンスガイド .\" Source: Nmap .\" Language: Japanese .\" -.TH "NMAP" "1" "31/03/2023" "Nmap" "Nmap リファレンスガイド" +.TH "NMAP" "1" "17/05/2023" "Nmap" "Nmap リファレンスガイド" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -93,7 +93,7 @@ Nmapの最新バージョンは、\m[blue]\fB\%https://nmap.org\fR\m[]から入 .RS 4 .\} .nf -Nmap 7\&.93SVN ( https://nmap\&.org ) +Nmap 7\&.94 ( https://nmap\&.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc\&. diff --git a/docs/man-xlate/nmap-pl.1 b/docs/man-xlate/nmap-pl.1 index 549218eba..7a0bf879a 100644 --- a/docs/man-xlate/nmap-pl.1 +++ b/docs/man-xlate/nmap-pl.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Autor" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/31/2023 +.\" Date: 05/17/2023 .\" Manual: Opis programu Nmap .\" Source: Nmap .\" Language: Polish .\" -.TH "NMAP" "1" "03/31/2023" "Nmap" "Opis programu Nmap" +.TH "NMAP" "1" "05/17/2023" "Nmap" "Opis programu Nmap" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man-xlate/nmap-pt_BR.1 b/docs/man-xlate/nmap-pt_BR.1 index 935c98bc3..b3959ee37 100644 --- a/docs/man-xlate/nmap-pt_BR.1 +++ b/docs/man-xlate/nmap-pt_BR.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Autor" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 31/03/2023 +.\" Date: 17/05/2023 .\" Manual: Guia de Referência do Nmap .\" Source: Nmap .\" Language: Portuguese (Brazil) .\" -.TH "NMAP" "1" "31/03/2023" "Nmap" "Guia de Referência do Nmap" +.TH "NMAP" "1" "17/05/2023" "Nmap" "Guia de Referência do Nmap" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man-xlate/nmap-ro.1 b/docs/man-xlate/nmap-ro.1 index e4839ed66..36f54db65 100644 --- a/docs/man-xlate/nmap-ro.1 +++ b/docs/man-xlate/nmap-ro.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/31/2023 +.\" Date: 05/17/2023 .\" Manual: Ghid de referinta Nmap .\" Source: Nmap .\" Language: Romanian .\" -.TH "NMAP" "1" "03/31/2023" "Nmap" "Ghid de referinta Nmap" +.TH "NMAP" "1" "05/17/2023" "Nmap" "Ghid de referinta Nmap" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man-xlate/nmap-sk.1 b/docs/man-xlate/nmap-sk.1 index 74bcf0b36..88d12c6b2 100644 --- a/docs/man-xlate/nmap-sk.1 +++ b/docs/man-xlate/nmap-sk.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 31. marca 2023 +.\" Date: 17. mája 2023 .\" Manual: Nmap - Referencna prirucka .\" Source: Nmap .\" Language: Slovak .\" -.TH "NMAP" "1" "31. marca 2023" "Nmap" "Nmap \- Referencna prirucka" +.TH "NMAP" "1" "17. mája 2023" "Nmap" "Nmap \- Referencna prirucka" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/nmap.1 b/docs/nmap.1 index 12b8f3d60..8c59392ce 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/31/2023 +.\" Date: 05/17/2023 .\" Manual: Nmap Reference Guide .\" Source: Nmap .\" Language: English .\" -.TH "NMAP" "1" "03/31/2023" "Nmap" "Nmap Reference Guide" +.TH "NMAP" "1" "05/17/2023" "Nmap" "Nmap Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -119,7 +119,7 @@ This options summary is printed when Nmap is run with no arguments, and the late .RS 4 .\} .nf -Nmap 7\&.93SVN ( https://nmap\&.org ) +Nmap 7\&.94 ( https://nmap\&.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc\&. @@ -2562,11 +2562,11 @@ networking library, which was written by Dug Song\&. A modified version is distributed with Nmap\&. Nmap can optionally link with the \m[blue]\fBOpenSSL cryptography toolkit\fR\m[]\&\s-2\u[27]\d\s+2 for SSL version detection support\&. The Nmap Scripting Engine uses an embedded version of the -\m[blue]\fBLua programming language\fR\m[]\&\s-2\u[28]\d\s+2\&. +\m[blue]\fBLua programming language\fR\m[]\&\s-2\u[10]\d\s+2\&. The -\m[blue]\fBLiblinear linear classification library\fR\m[]\&\s-2\u[29]\d\s+2 +\m[blue]\fBLiblinear linear classification library\fR\m[]\&\s-2\u[28]\d\s+2 is used for our -\m[blue]\fBIPv6 OS detection machine learning techniques\fR\m[]\&\s-2\u[30]\d\s+2\&. +\m[blue]\fBIPv6 OS detection machine learning techniques\fR\m[]\&\s-2\u[29]\d\s+2\&. All of the third\-party software described in this paragraph is freely redistributable under BSD\-style software licenses\&. .PP @@ -2575,20 +2575,20 @@ LICENSES files\&. .PP This software was supported in part through the -\m[blue]\fBGoogle Summer of Code\fR\m[]\&\s-2\u[31]\d\s+2 +\m[blue]\fBGoogle Summer of Code\fR\m[]\&\s-2\u[30]\d\s+2 and the -\m[blue]\fBDARPA CINDER program\fR\m[]\&\s-2\u[32]\d\s+2 +\m[blue]\fBDARPA CINDER program\fR\m[]\&\s-2\u[31]\d\s+2 (DARPA\-BAA\-10\-84)\&. .SS "United States Export Control" .PP Nmap only uses encryption when compiled with the optional OpenSSL support and linked with OpenSSL\&. When compiled without OpenSSL support, the Nmap Project believes that Nmap is not subject to U\&.S\&. -\m[blue]\fBExport Administration Regulations (EAR)\fR\m[]\&\s-2\u[33]\d\s+2 +\m[blue]\fBExport Administration Regulations (EAR)\fR\m[]\&\s-2\u[32]\d\s+2 export control\&. As such, there is no applicable ECCN (export control classification number) and exportation does not require any special license, permit, or other governmental authorization\&. .PP When compiled with OpenSSL support or distributed as source code, the Nmap Project believes that Nmap falls under U\&.S\&. ECCN -\m[blue]\fB5D002\fR\m[]\&\s-2\u[34]\d\s+2 +\m[blue]\fB5D002\fR\m[]\&\s-2\u[33]\d\s+2 (\(lqInformation Security Software\(rq)\&. We distribute Nmap under the TSU exception for publicly available encryption software defined in -\m[blue]\fBEAR 740\&.13(e)\fR\m[]\&\s-2\u[35]\d\s+2\&. +\m[blue]\fBEAR 740\&.13(e)\fR\m[]\&\s-2\u[34]\d\s+2\&. .SH "NOTES" .IP " 1." 4 Nmap Network Scanning: The Official Nmap Project Guide to Network Discovery and Security Scanning @@ -2638,12 +2638,12 @@ RFC 1323 .IP "10." 4 Lua programming language .RS 4 -\%http://lua.org +\%https://lua.org .RE .IP "11." 4 precedence .RS 4 -\%http://www.lua.org/manual/5.1/manual.html#2.5.3 +\%http://www.lua.org/manual/5.4/manual.html#3.4.8 .RE .IP "12." 4 IP protocol @@ -2726,41 +2726,36 @@ OpenSSL cryptography toolkit \%https://openssl.org .RE .IP "28." 4 -Lua programming language -.RS 4 -\%https://lua.org -.RE -.IP "29." 4 Liblinear linear classification library .RS 4 \%https://www.csie.ntu.edu.tw/~cjlin/liblinear/ .RE -.IP "30." 4 +.IP "29." 4 IPv6 OS detection machine learning techniques .RS 4 \%https://nmap.org/book/osdetect-guess.html#osdetect-guess-ipv6 .RE -.IP "31." 4 +.IP "30." 4 Google Summer of Code .RS 4 \%https://nmap.org/soc/ .RE -.IP "32." 4 +.IP "31." 4 DARPA CINDER program .RS 4 \%https://www.fbo.gov/index?s=opportunity&mode=form&id=585e02a51f77af5cb3c9e06b9cc82c48&tab=core&_cview=1 .RE -.IP "33." 4 +.IP "32." 4 Export Administration Regulations (EAR) .RS 4 \%https://www.bis.doc.gov/index.php/regulations/export-administration-regulations-ear .RE -.IP "34." 4 +.IP "33." 4 5D002 .RS 4 \%https://www.bis.doc.gov/index.php/documents/regulations-docs/federal-register-notices/federal-register-2014/951-ccl5-pt2/file .RE -.IP "35." 4 +.IP "34." 4 EAR 740.13(e) .RS 4 \%https://www.bis.doc.gov/index.php/documents/regulations-docs/2341-740-2/file diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt index c15c8af93..9ff5e7c0a 100644 --- a/docs/nmap.usage.txt +++ b/docs/nmap.usage.txt @@ -1,4 +1,4 @@ -Nmap 7.93SVN ( https://nmap.org ) +Nmap 7.94 ( https://nmap.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc. diff --git a/docs/zenmap.1 b/docs/zenmap.1 index ac15446e8..637784a01 100644 --- a/docs/zenmap.1 +++ b/docs/zenmap.1 @@ -2,12 +2,12 @@ .\" Title: zenmap .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/31/2023 +.\" Date: 05/17/2023 .\" Manual: Zenmap Reference Guide .\" Source: Zenmap .\" Language: English .\" -.TH "ZENMAP" "1" "03/31/2023" "Zenmap" "Zenmap Reference Guide" +.TH "ZENMAP" "1" "05/17/2023" "Zenmap" "Zenmap Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/libpcre/configure b/libpcre/configure index 5dbbccd4b..0c4637619 100755 --- a/libpcre/configure +++ b/libpcre/configure @@ -703,6 +703,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -792,6 +793,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1044,6 +1046,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1181,7 +1192,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1334,6 +1345,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/libssh2/win32/libssh2.vcxproj b/libssh2/win32/libssh2.vcxproj index e375fa00c..703051a0d 100644 --- a/libssh2/win32/libssh2.vcxproj +++ b/libssh2/win32/libssh2.vcxproj @@ -89,7 +89,7 @@ .\Release_dll\libssh2.dll .\Release_dll\libssh2.lib ws2_32.lib;libcrypto.lib;zlibwapi.lib;%(AdditionalDependencies) - ..\..\libz\contrib\vstudio\vc12\x86\ZlibDllReleaseWithoutAsm;..\..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories) + ..\..\libz\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;..\..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories) true UseLinkTimeCodeGeneration @@ -136,7 +136,7 @@ .\Debug_dll\libssh2.dll .\Debug_dll\libssh2.lib ws2_32.lib;libcrypto.lib;zlibwapi.lib;%(AdditionalDependencies) - ..\..\..\nmap-mswin32-aux\OpenSSL\lib;..\..\libz\contrib\vstudio\vc12\x86\ZlibDllDebugWithoutAsm;%(AdditionalLibraryDirectories) + ..\..\..\nmap-mswin32-aux\OpenSSL\lib;..\..\libz\contrib\vstudio\vc14\x86\ZlibDllDebugWithoutAsm;%(AdditionalLibraryDirectories) @@ -185,7 +185,7 @@ - + {8fd826f8-3739-44e6-8cc8-997122e53b8d} false false diff --git a/libz/configure b/libz/configure index fa4d5daab..d75d7cd7a 100755 --- a/libz/configure +++ b/libz/configure @@ -145,7 +145,8 @@ case "$1" in *) echo "unknown option: $1" | tee -a configure.log echo "$0 --help for help" | tee -a configure.log - leave 1;; + #leave 1;; + shift ;; esac done diff --git a/libz/contrib/vstudio/vc14/zlibvc.vcxproj b/libz/contrib/vstudio/vc14/zlibvc.vcxproj index 424ff55b7..7c618091d 100644 --- a/libz/contrib/vstudio/vc14/zlibvc.vcxproj +++ b/libz/contrib/vstudio/vc14/zlibvc.vcxproj @@ -1,668 +1,668 @@ - - - - - Debug - Itanium - - - Debug - Win32 - - - Debug - x64 - - - ReleaseWithoutAsm - Itanium - - - ReleaseWithoutAsm - Win32 - - - ReleaseWithoutAsm - x64 - - - Release - Itanium - - - Release - Win32 - - - Release - x64 - - - - {8FD826F8-3739-44E6-8CC8-997122E53B8D} - - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - v140 - Unicode - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - v140 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - x86\ZlibDll$(Configuration)\ - x86\ZlibDll$(Configuration)\Tmp\ - true - false - x86\ZlibDll$(Configuration)\ - x86\ZlibDll$(Configuration)\Tmp\ - false - false - x86\ZlibDll$(Configuration)\ - x86\ZlibDll$(Configuration)\Tmp\ - false - false - x64\ZlibDll$(Configuration)\ - x64\ZlibDll$(Configuration)\Tmp\ - true - false - ia64\ZlibDll$(Configuration)\ - ia64\ZlibDll$(Configuration)\Tmp\ - true - false - x64\ZlibDll$(Configuration)\ - x64\ZlibDll$(Configuration)\Tmp\ - false - false - ia64\ZlibDll$(Configuration)\ - ia64\ZlibDll$(Configuration)\Tmp\ - false - false - x64\ZlibDll$(Configuration)\ - x64\ZlibDll$(Configuration)\Tmp\ - false - false - ia64\ZlibDll$(Configuration)\ - ia64\ZlibDll$(Configuration)\Tmp\ - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - zlibwapi - zlibwapi - zlibwapi - zlibwapi - zlibwapi - zlibwapi - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - $(OutDir)zlibvc.tlb - - - Disabled - ..\..\..;%(AdditionalIncludeDirectories) - WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions) - - - MultiThreadedDebugDLL - false - $(IntDir)zlibvc.pch - $(IntDir) - $(IntDir) - $(OutDir) - - - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x040c - - - /MACHINE:I386 %(AdditionalOptions) - %(AdditionalDependencies) - $(OutDir)zlibwapi.dll - true - .\zlibvc.def - true - $(OutDir)zlibwapi.pdb - true - $(OutDir)zlibwapi.map - Windows - false - - - $(OutDir)zlibwapi.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - $(OutDir)zlibvc.tlb - - - OnlyExplicitInline - ..\..\..;%(AdditionalIncludeDirectories) - WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - true - $(IntDir)zlibvc.pch - All - $(IntDir) - $(IntDir) - $(OutDir) - - - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x040c - - - /MACHINE:I386 %(AdditionalOptions) - $(OutDir)zlibwapi.dll - true - false - .\zlibvc.def - $(OutDir)zlibwapi.pdb - true - $(OutDir)zlibwapi.map - Windows - false - - - $(OutDir)zlibwapi.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - $(OutDir)zlibvc.tlb - - - OnlyExplicitInline - ..\..\..;%(AdditionalIncludeDirectories) - WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions) - true - - - MultiThreaded - false - true - $(IntDir)zlibvc.pch - All - $(IntDir) - $(IntDir) - $(OutDir) - - - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x040c - - - /MACHINE:I386 %(AdditionalOptions) - %(AdditionalDependencies) - $(OutDir)zlibwapi.dll - true - false - .\zlibvc.def - $(OutDir)zlibwapi.pdb - true - $(OutDir)zlibwapi.map - Windows - false - - - $(OutDir)zlibwapi.lib - false - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - $(OutDir)zlibvc.tlb - - - Disabled - ..\..\..;%(AdditionalIncludeDirectories) - WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) - - - MultiThreadedDebugDLL - false - $(IntDir)zlibvc.pch - $(IntDir) - $(IntDir) - $(OutDir) - - - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x040c - - - %(AdditionalDependencies) - $(OutDir)zlibwapi.dll - true - .\zlibvc.def - true - $(OutDir)zlibwapi.pdb - true - $(OutDir)zlibwapi.map - Windows - $(OutDir)zlibwapi.lib - MachineX64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Itanium - $(OutDir)zlibvc.tlb - - - Disabled - ..\..\..;%(AdditionalIncludeDirectories) - WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) - - - MultiThreadedDebugDLL - false - $(IntDir)zlibvc.pch - $(IntDir) - $(IntDir) - $(OutDir) - - - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x040c - - - $(OutDir)zlibwapi.dll - true - .\zlibvc.def - true - $(OutDir)zlibwapi.pdb - true - $(OutDir)zlibwapi.map - Windows - $(OutDir)zlibwapi.lib - MachineIA64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - $(OutDir)zlibvc.tlb - - - OnlyExplicitInline - ..\..\..;%(AdditionalIncludeDirectories) - WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - true - $(IntDir)zlibvc.pch - All - $(IntDir) - $(IntDir) - $(OutDir) - - - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x040c - - - $(OutDir)zlibwapi.dll - true - false - .\zlibvc.def - $(OutDir)zlibwapi.pdb - true - $(OutDir)zlibwapi.map - Windows - $(OutDir)zlibwapi.lib - MachineX64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Itanium - $(OutDir)zlibvc.tlb - - - OnlyExplicitInline - ..\..\..;%(AdditionalIncludeDirectories) - WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - true - $(IntDir)zlibvc.pch - All - $(IntDir) - $(IntDir) - $(OutDir) - - - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x040c - - - $(OutDir)zlibwapi.dll - true - false - .\zlibvc.def - $(OutDir)zlibwapi.pdb - true - $(OutDir)zlibwapi.map - Windows - $(OutDir)zlibwapi.lib - MachineIA64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - $(OutDir)zlibvc.tlb - - - OnlyExplicitInline - ..\..\..;%(AdditionalIncludeDirectories) - _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - true - $(IntDir)zlibvc.pch - All - $(IntDir) - $(IntDir) - $(OutDir) - - - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x040c - - - %(AdditionalDependencies) - $(OutDir)zlibwapi.dll - true - false - .\zlibvc.def - $(OutDir)zlibwapi.pdb - true - $(OutDir)zlibwapi.map - Windows - $(OutDir)zlibwapi.lib - MachineX64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Itanium - $(OutDir)zlibvc.tlb - - - OnlyExplicitInline - ..\..\..;%(AdditionalIncludeDirectories) - _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - true - $(IntDir)zlibvc.pch - All - $(IntDir) - $(IntDir) - $(OutDir) - - - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x040c - - - $(OutDir)zlibwapi.dll - true - false - .\zlibvc.def - $(OutDir)zlibwapi.pdb - true - $(OutDir)zlibwapi.map - Windows - $(OutDir)zlibwapi.lib - MachineIA64 - - - - - - - - - - - - - - - - - - - - - %(AdditionalIncludeDirectories) - ZLIB_INTERNAL;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - ZLIB_INTERNAL;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - ZLIB_INTERNAL;%(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - ZLIB_INTERNAL;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - ZLIB_INTERNAL;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - ZLIB_INTERNAL;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Itanium + + + Debug + Win32 + + + Debug + x64 + + + ReleaseWithoutAsm + Itanium + + + ReleaseWithoutAsm + Win32 + + + ReleaseWithoutAsm + x64 + + + Release + Itanium + + + Release + Win32 + + + Release + x64 + + + + {8FD826F8-3739-44E6-8CC8-997122E53B8D} + + + + DynamicLibrary + false + true + v142 + + + DynamicLibrary + false + true + v142 + + + DynamicLibrary + false + v142 + Unicode + + + DynamicLibrary + false + true + v142 + + + DynamicLibrary + false + true + v142 + + + DynamicLibrary + false + v142 + + + DynamicLibrary + false + true + v142 + + + DynamicLibrary + false + true + v142 + + + DynamicLibrary + false + v142 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + x86\ZlibDll$(Configuration)\ + x86\ZlibDll$(Configuration)\Tmp\ + true + false + x86\ZlibDll$(Configuration)\ + x86\ZlibDll$(Configuration)\Tmp\ + false + false + x86\ZlibDll$(Configuration)\ + x86\ZlibDll$(Configuration)\Tmp\ + false + false + x64\ZlibDll$(Configuration)\ + x64\ZlibDll$(Configuration)\Tmp\ + true + false + ia64\ZlibDll$(Configuration)\ + ia64\ZlibDll$(Configuration)\Tmp\ + true + false + x64\ZlibDll$(Configuration)\ + x64\ZlibDll$(Configuration)\Tmp\ + false + false + ia64\ZlibDll$(Configuration)\ + ia64\ZlibDll$(Configuration)\Tmp\ + false + false + x64\ZlibDll$(Configuration)\ + x64\ZlibDll$(Configuration)\Tmp\ + false + false + ia64\ZlibDll$(Configuration)\ + ia64\ZlibDll$(Configuration)\Tmp\ + false + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + zlibwapi + zlibwapi + zlibwapi + zlibwapi + zlibwapi + zlibwapi + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(OutDir)zlibvc.tlb + + + Disabled + ..\..\..;%(AdditionalIncludeDirectories) + WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions) + + + MultiThreadedDebugDLL + false + $(IntDir)zlibvc.pch + $(IntDir) + $(IntDir) + $(OutDir) + + + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + /MACHINE:I386 %(AdditionalOptions) + %(AdditionalDependencies) + $(OutDir)zlibwapi.dll + true + .\zlibvc.def + true + $(OutDir)zlibwapi.pdb + true + $(OutDir)zlibwapi.map + Windows + false + + + $(OutDir)zlibwapi.lib + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(OutDir)zlibvc.tlb + + + OnlyExplicitInline + ..\..\..;%(AdditionalIncludeDirectories) + WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions) + true + + + MultiThreadedDLL + false + true + $(IntDir)zlibvc.pch + All + $(IntDir) + $(IntDir) + $(OutDir) + + + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + /MACHINE:I386 %(AdditionalOptions) + $(OutDir)zlibwapi.dll + true + false + .\zlibvc.def + $(OutDir)zlibwapi.pdb + true + $(OutDir)zlibwapi.map + Windows + false + + + $(OutDir)zlibwapi.lib + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(OutDir)zlibvc.tlb + + + OnlyExplicitInline + ..\..\..;%(AdditionalIncludeDirectories) + WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions) + true + + + MultiThreaded + false + true + $(IntDir)zlibvc.pch + All + $(IntDir) + $(IntDir) + $(OutDir) + + + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + /MACHINE:I386 %(AdditionalOptions) + %(AdditionalDependencies) + $(OutDir)zlibwapi.dll + true + false + .\zlibvc.def + $(OutDir)zlibwapi.pdb + true + $(OutDir)zlibwapi.map + Windows + false + + + $(OutDir)zlibwapi.lib + false + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + $(OutDir)zlibvc.tlb + + + Disabled + ..\..\..;%(AdditionalIncludeDirectories) + WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) + + + MultiThreadedDebugDLL + false + $(IntDir)zlibvc.pch + $(IntDir) + $(IntDir) + $(OutDir) + + + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + %(AdditionalDependencies) + $(OutDir)zlibwapi.dll + true + .\zlibvc.def + true + $(OutDir)zlibwapi.pdb + true + $(OutDir)zlibwapi.map + Windows + $(OutDir)zlibwapi.lib + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Itanium + $(OutDir)zlibvc.tlb + + + Disabled + ..\..\..;%(AdditionalIncludeDirectories) + WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) + + + MultiThreadedDebugDLL + false + $(IntDir)zlibvc.pch + $(IntDir) + $(IntDir) + $(OutDir) + + + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x040c + + + $(OutDir)zlibwapi.dll + true + .\zlibvc.def + true + $(OutDir)zlibwapi.pdb + true + $(OutDir)zlibwapi.map + Windows + $(OutDir)zlibwapi.lib + MachineIA64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + $(OutDir)zlibvc.tlb + + + OnlyExplicitInline + ..\..\..;%(AdditionalIncludeDirectories) + WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) + true + + + MultiThreadedDLL + false + true + $(IntDir)zlibvc.pch + All + $(IntDir) + $(IntDir) + $(OutDir) + + + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + $(OutDir)zlibwapi.dll + true + false + .\zlibvc.def + $(OutDir)zlibwapi.pdb + true + $(OutDir)zlibwapi.map + Windows + $(OutDir)zlibwapi.lib + MachineX64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Itanium + $(OutDir)zlibvc.tlb + + + OnlyExplicitInline + ..\..\..;%(AdditionalIncludeDirectories) + WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) + true + + + MultiThreadedDLL + false + true + $(IntDir)zlibvc.pch + All + $(IntDir) + $(IntDir) + $(OutDir) + + + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + $(OutDir)zlibwapi.dll + true + false + .\zlibvc.def + $(OutDir)zlibwapi.pdb + true + $(OutDir)zlibwapi.map + Windows + $(OutDir)zlibwapi.lib + MachineIA64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + $(OutDir)zlibvc.tlb + + + OnlyExplicitInline + ..\..\..;%(AdditionalIncludeDirectories) + _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) + true + + + MultiThreadedDLL + false + true + $(IntDir)zlibvc.pch + All + $(IntDir) + $(IntDir) + $(OutDir) + + + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + %(AdditionalDependencies) + $(OutDir)zlibwapi.dll + true + false + .\zlibvc.def + $(OutDir)zlibwapi.pdb + true + $(OutDir)zlibwapi.map + Windows + $(OutDir)zlibwapi.lib + MachineX64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Itanium + $(OutDir)zlibvc.tlb + + + OnlyExplicitInline + ..\..\..;%(AdditionalIncludeDirectories) + _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions) + true + + + MultiThreadedDLL + false + true + $(IntDir)zlibvc.pch + All + $(IntDir) + $(IntDir) + $(OutDir) + + + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x040c + + + $(OutDir)zlibwapi.dll + true + false + .\zlibvc.def + $(OutDir)zlibwapi.pdb + true + $(OutDir)zlibwapi.map + Windows + $(OutDir)zlibwapi.lib + MachineIA64 + + + + + + + + + + + + + + + + + + + + + %(AdditionalIncludeDirectories) + ZLIB_INTERNAL;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + ZLIB_INTERNAL;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + ZLIB_INTERNAL;%(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + ZLIB_INTERNAL;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + ZLIB_INTERNAL;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + ZLIB_INTERNAL;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mswin32/Makefile b/mswin32/Makefile index 5abd23fc1..76bf7d025 100644 --- a/mswin32/Makefile +++ b/mswin32/Makefile @@ -39,7 +39,7 @@ stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefix # error on startup: 0xc0000022. cmd /c copy $(subst /,\\,$(NMAP_MSWIN32_AUX))\\OpenSSL\\bin\\*.dll nmap-$(NMAP_VERSION) cmd /c copy $(NMAPDIR_WIN)\\libssh2\\win32\\$(VCCONFIG)_dll\\libssh2.dll nmap-$(NMAP_VERSION) - cmd /c copy $(NMAPDIR_WIN)\\libz\\contrib\\vstudio\\vc12\\x86\\ZlibDll$(VCCONFIG)WithoutAsm\\zlibwapi.dll nmap-$(NMAP_VERSION) + cmd /c copy $(NMAPDIR_WIN)\\libz\\contrib\\vstudio\\vc14\\x86\\ZlibDll$(VCCONFIG)WithoutAsm\\zlibwapi.dll nmap-$(NMAP_VERSION) mkdir -p nmap-$(NMAP_VERSION)/scripts cp -f $(NSE_FILES) nmap-$(NMAP_VERSION)/scripts/ for f in `cd $(NMAPDIR) && find nselib -name .svn -prune -o -type d -print`; do \ diff --git a/mswin32/nmap.sln b/mswin32/nmap.sln index b1cbc42c2..81c4b4983 100644 --- a/mswin32/nmap.sln +++ b/mswin32/nmap.sln @@ -27,7 +27,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetutil", "..\libnetutil EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinear", "..\liblinear\liblinear.vcxproj", "{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "..\libz\contrib\vstudio\vc12\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "..\libz\contrib\vstudio\vc14\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh2", "..\libssh2\win32\libssh2.vcxproj", "{ED957342-E43B-496E-92D9-4C76B525BDF5}" EndProject diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj index e49b86c84..1fbb9d2d0 100644 --- a/mswin32/nmap.vcxproj +++ b/mswin32/nmap.vcxproj @@ -93,7 +93,7 @@ liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib .\Debug\nmap.exe true - ..\libssh2\win32\Debug_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc12\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories) + ..\libssh2\win32\Debug_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) packet.dll;wpcap.dll true @@ -134,7 +134,7 @@ liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib .\$(Configuration)/nmap.exe true - ..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc12\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories) + ..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) packet.dll;wpcap.dll true @@ -174,7 +174,7 @@ liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib .\$(Configuration)/nmap.exe true - ..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc12\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories) + ..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) packet.dll;wpcap.dll true diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1 index d48f6b64b..7fbc5b54d 100644 --- a/ncat/docs/ncat.1 +++ b/ncat/docs/ncat.1 @@ -2,12 +2,12 @@ .\" Title: Ncat .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/31/2023 +.\" Date: 05/17/2023 .\" Manual: Ncat Reference Guide .\" Source: Ncat .\" Language: English .\" -.TH "NCAT" "1" "03/31/2023" "Ncat" "Ncat Reference Guide" +.TH "NCAT" "1" "05/17/2023" "Ncat" "Ncat Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -43,7 +43,7 @@ Among Ncat\*(Aqs vast number of features there is the ability to chain Ncats tog .RS 4 .\} .nf -Ncat 7\&.93SVN ( https://nmap\&.org/ncat ) +Ncat 7\&.94 ( https://nmap\&.org/ncat ) Usage: ncat [options] [hostname] [port] Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds, diff --git a/ncat/docs/ncat.usage.txt b/ncat/docs/ncat.usage.txt index 5b1849b94..3aded1528 100644 --- a/ncat/docs/ncat.usage.txt +++ b/ncat/docs/ncat.usage.txt @@ -1,4 +1,4 @@ -Ncat 7.93SVN ( https://nmap.org/ncat ) +Ncat 7.94 ( https://nmap.org/ncat ) Usage: ncat [options] [hostname] [port] Options taking a time assume seconds. Append 'ms' for milliseconds, diff --git a/ncat/ncat.h b/ncat/ncat.h index 6b0c427bb..b09be7538 100644 --- a/ncat/ncat.h +++ b/ncat/ncat.h @@ -78,7 +78,7 @@ /* Ncat information for output, etc. */ #define NCAT_NAME "Ncat" #define NCAT_URL "https://nmap.org/ncat" -#define NCAT_VERSION "7.93SVN" +#define NCAT_VERSION "7.94" #ifndef __GNUC__ #ifndef __attribute__ diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1 index cf5a8aefc..7f636abeb 100644 --- a/ndiff/docs/ndiff.1 +++ b/ndiff/docs/ndiff.1 @@ -2,12 +2,12 @@ .\" Title: ndiff .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/31/2023 +.\" Date: 05/17/2023 .\" Manual: User Commands .\" Source: Ndiff .\" Language: English .\" -.TH "NDIFF" "1" "03/31/2023" "Ndiff" "User Commands" +.TH "NDIFF" "1" "05/17/2023" "Ndiff" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/nmap-services b/nmap-services index f0a77827f..698ca8d14 100644 --- a/nmap-services +++ b/nmap-services @@ -3,7 +3,7 @@ # Well known service port numbers -*- mode: fundamental; -*- # From the Nmap Security Scanner ( https://nmap.org/ ) # -# $Id: nmap-services 9746 2008-08-26 18:45:24Z fyodor $ +# $Id$ # # Derived from IANA data and our own research # @@ -17996,6 +17996,7 @@ pqsp 28001/tcp 0.000000 # PQ Service unknown 28005/udp 0.000654 gruber-cashreg 28010/tcp 0.000000 # Gruber cash registry protocol unknown 28011/udp 0.001307 +rethinkdb 28015/tcp 0.000076 mongod 28017/tcp 0.000076 # http://docs.mongodb.org/manual/reference/default-mongodb-port/ unknown 28019/udp 0.000654 unknown 28020/udp 0.000654 @@ -18315,6 +18316,7 @@ unknown 29008/udp 0.000654 unknown 29010/udp 0.000654 unknown 29013/udp 0.000654 unknown 29014/udp 0.000654 +rethinkdb 29015/tcp 0.000076 unknown 29022/udp 0.000654 unknown 29026/udp 0.000654 unknown 29030/udp 0.001307 diff --git a/nmap.h b/nmap.h index 549e4d915..e9339af02 100644 --- a/nmap.h +++ b/nmap.h @@ -122,10 +122,10 @@ /* Edit this definition only within the quotes, because it is read from this file by the makefiles. */ #define NMAP_MAJOR 7 -#define NMAP_MINOR 93 -#define NMAP_BUILD 1 +#define NMAP_MINOR 94 +#define NMAP_BUILD 0 /* SVN, BETA, etc. */ -#define NMAP_SPECIAL "SVN" +#define NMAP_SPECIAL #define NMAP_VERSION STR(NMAP_MAJOR) "." STR(NMAP_MINOR) NMAP_SPECIAL #define NMAP_NUM_VERSION STR(NMAP_MAJOR) "." STR(NMAP_MINOR) "." STR(NMAP_BUILD) ".0" diff --git a/nping/docs/nping.1 b/nping/docs/nping.1 index 295a56ff6..2c92f4121 100644 --- a/nping/docs/nping.1 +++ b/nping/docs/nping.1 @@ -2,12 +2,12 @@ .\" Title: nping .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/31/2023 +.\" Date: 05/17/2023 .\" Manual: Nping Reference Guide .\" Source: Nping .\" Language: English .\" -.TH "NPING" "1" "03/31/2023" "Nping" "Nping Reference Guide" +.TH "NPING" "1" "05/17/2023" "Nping" "Nping Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/nping/nping.h b/nping/nping.h index f4f4b43f7..3271a50f4 100644 --- a/nping/nping.h +++ b/nping/nping.h @@ -264,7 +264,7 @@ /* General tunable defines **************************************************/ #define NPING_NAME "Nping" #define NPING_URL "https://nmap.org/nping" -#define NPING_VERSION "0.7.93" +#define NPING_VERSION "0.7.94" #define DEFAULT_VERBOSITY VB_0 diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version index b24977149..2b4445acc 100644 --- a/zenmap/share/zenmap/config/zenmap_version +++ b/zenmap/share/zenmap/config/zenmap_version @@ -1 +1 @@ -7.93SVN +7.94 diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py index 432cddea7..8a7c11b14 100644 --- a/zenmap/zenmapCore/Version.py +++ b/zenmap/zenmapCore/Version.py @@ -1 +1 @@ -VERSION = "7.93SVN" +VERSION = "7.94"