Sync CHANGELOG with released version

CHANGELOG

@@ -1,34 +1,50 @@
-# Nmap Changelog ($Id$); -*-text-*-
+# Nmap Changelog ($Id: CHANGELOG 34742 2015-06-25 19:37:51Z dmiller $); -*-text-*-
 
-o [GH#164] Remove the DYLD_LIBRARY_PATH environment variable from
-  zenmap_wrapper.py, addressing a crash with the error
-  "dyld: Symbol not found: _iconv Referenced from: /usr/lib/libcups.2.dylib"
-  Reported by Robert Strom. [Daniel Miller]
+o [NSE] Added additional checks for successful PUT request in http-put.
+  [Oleg Mitrofanov]
 
-o [NSE] Added additional checks for succesful put request in http-put. [Oleg Mitrofanov]
+o [NSE] Added an update for http-methods that checks all possible methods not in
+  Allow or Public header of OPTIONS response. [Gyanendra Mishra]
 
-o [NSE] Added an update for http-methods that checks all possible methods not in Allow
-  or Public header of OPTIONS response. [Gyanendra Mishra]
+o [NSE] Added SLAXML, an XML parser in Lua originally written by Gavin Kistner
+  (a.k.a. Phrogz). [Gyanendra Mishra]
 
-o [NSE] Added SLAXML, an XML Parser in lua Originally written by Gavin Kistner
-  or Phrogz. [Gyanendra Mishra]
-
-o [NSE] Added hnap-info, detects and outputs info for hnap devices. [Gyanendra Mishra]
+o [NSE] Added hnap-info, detects and outputs info for Home Network
+  Administration Protocol devices. [Gyanendra Mishra]
 
 o [NSE] Allow ssl-enum-ciphers to run on non-typical ports when it is selected
   by name. It will now send a service detection probe if the port is not a
   typical SSL port and version scan (-sV) was not used. [Daniel Miller]
 
-o Fix Ncat listen mode on Solaris and other platforms where struct sockaddr
+o [NSE] Added http-webdav-scan, which detects WebDAV servers. [Gyanendra Mishra]
+
+
+Nmap 6.49BETA3 [2015-06-25]
+
+o [GH#166] Fix Ncat listen mode on Solaris and other platforms where struct sockaddr
   does not have a sa_len member. This also affected use of the -p and -s
   options. Brandon Haberfeld reported the crash. [Daniel Miller]
 
+o [GH#164] Fix a Zenmap failure ot open on OS X with the error:
+  "dyld: Symbol not found: _iconv Referenced from: /usr/lib/libcups.2.dylib"
+  We had to remove the DYLD_LIBRARY_PATH environment variable from
+  zenmap_wrapper.py. Reported by Robert Strom. [Daniel Miller]
+
 o Report our https URL (https://nmap.org) in more places rather than
   our non-SSL one. [David Fifield]
 
 o [NSE] Fix Diffie-Hellman parameter extraction in tls.lua. [Jacob Gajek]
 
-o [NSE] Added http-webdav-scan, which detects WebDAV installations. [Gyanendra Mishra]
+Nmap 6.49BETA2 [2015-06-16]
+
+o [GH#154] Fix a crash (assertion error) when Nmap recieves an ICMP Host
+  Unreachable message.
+
+o [GH#158] Fix a configure failure when Python is not present, but no Python
+  projects were requested. [Gioacchino Mazzurco]
+
+o [GH#161] [Zenmap] Fix Zenmap on OS X which was failing with
+  zipimport.ZipImportError due to architecture mismatch.
 
 o [NSE] Remove ahbl.org checks from dnsbl.lua, since the service was shut down.
   [Forrest B.]
@@ -70,23 +86,18 @@ o Added options --data <hex string> and --data-string <string> to send custom
 o --reason is enabled for verbosity > 2, and now includes the TTL of received
   packets in Normal output (this was already present in XML) [Jay Bosamiya]
 
-o Update our Windows build system to VS 2013 on Windows 8.1. Also, we now build
-  our included OpenSSL with DEP, ASLR, and SafeSEH enabled. [Daniel Miller]
+o Fix ICMP Echo (-PE) host discovery for IPv6, broken since 6.45, caused by
+  failing to set the ICMP ID for outgoing packets which is used to match
+  incoming responses. [Andrew Waters]
 
-o Our OS X installer is now built for a minimum supported version of 10.8
-  (Mountain Lion), a much-needed update from 10.5 (Leopard). Additionally,
-  OpenSSL is now statically linked, allowing us to distribute the latest from
-  Macports instead of being subjected to the 0.9.8 branch still in use as of
-  10.9. [Daniel Miller]
+o Solve a crash on Windows (reported on Windows 8.1 on Surface Pro 3) caused by
+  passing a NULL pointer to a WinPcap function that then tries to write an
+  error message to it. [Peter Malecka]
 
-o New features for the IPv6 OS detection engine allow for better classification
-  of systems: IPv6 guessed initial hop limit (TTL) and ratio of TCP initial
-  window size to maximum segment size. [Alexandru Geana]
-
-o [NSE] Rework ssl-enum-ciphers to actually score the strength of the SSL/TLS
-  handshake, including certificate key size and DH parameters if applicable.
-  This is similar to Qualys's SSL Labs scanner, and means that we no longer
-  maintain a list of scores per ciphersuite. [Daniel Miller]
+o Enhance Nmap's tcpwrapped service detection by using a shorter timeout for
+  the tcpwrapped designation. This prevents falsely labeling services as
+  tcpwrapped which merely have a read timeout shorter than 6 seconds. Full
+  discussion: http://issues.nmap.org/39 [nnposter, Daniel Miller]
 
 o All nmap.org pages are now available SSL-secured to improve privacy
   and ensure your binaries can't be tampered with in transit. So be
@@ -95,7 +106,7 @@ o All nmap.org pages are now available SSL-secured to improve privacy
   binaries as well: https://nmap.org/book/install.html#inst-integrity
 
 o [NSE] Added 25 NSE scripts from 17 authors, bringing the total up to 494!
-  They are all listed at https://nmap.org/nsedoc/, and the summaries are below
+  They are all listed at http://nmap.org/nsedoc/, and the summaries are below
   (authors are listed in brackets):
 
   + bacnet-info gets device information from SCADA/ICS devices via BACnet
@@ -168,14 +179,14 @@ o [NSE] Added 25 NSE scripts from 17 authors, bringing the total up to 494!
   + targets-ipv6-wordlist generates target IPv6 addresses from a wordlist made
     of hexadecimal characters. [Raúl Fuentes]
 
-o Enhance Nmap's tcpwrapped service detection by using a shorter timeout for
-  the tcpwrapped designation. This prevents falsely labeling services as
-  tcpwrapped which merely have a read timeout shorter than 6 seconds. Full
-  discussion: http://issues.nmap.org/39 [nnposter, Daniel Miller]
+o Update our Windows build system to VS 2013 on Windows 8.1. Also, we now build
+  our included OpenSSL with DEP, ASLR, and SafeSEH enabled. [Daniel Miller]
 
-o Fix ICMP Echo (-PE) host discovery for IPv6, broken since 6.45, caused by
-  failing to set the ICMP ID for outgoing packets which is used to match
-  incoming responses. [Andrew Waters]
+o Our OS X installer is now built for a minimum supported version of 10.8
+  (Mountain Lion), a much-needed update from 10.5 (Leopard). Additionally,
+  OpenSSL is now statically linked, allowing us to distribute the latest from
+  Macports instead of being subjected to the 0.9.8 branch still in use as of
+  10.9. [Daniel Miller]
 
 o Add 2 more ASCII-art configure splash images to be rotated randomly with the
   traditional dragon image. New ideas for other images to use here may be sent
@@ -191,6 +202,15 @@ o Fix a bug in libdnet-stripped on Solaris that resulted in the wrong MAC
   address being detected for all interfaces.
   http://seclists.org/nmap-dev/2015/q2/1 [Daniel Miller]
 
+o New features for the IPv6 OS detection engine allow for better classification
+  of systems: IPv6 guessed initial hop limit (TTL) and ratio of TCP initial
+  window size to maximum segment size. [Alexandru Geana]
+
+o [NSE] Rework ssl-enum-ciphers to actually score the strength of the SSL/TLS
+  handshake, including certificate key size and DH parameters if applicable.
+  This is similar to Qualys's SSL Labs scanner, and means that we no longer
+  maintain a list of scores per ciphersuite. [Daniel Miller]
+
 o [NSE] Improved http-form-brute autodetection and behavior to handle more
   unusual-but-valid HTML syntax, non-POST forms, success/failure testing on
   HTTP headers, and more. [nnposter]