diff --git a/CHANGELOG b/CHANGELOG index 8f4a3cd40..71d300439 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ # Nmap Changelog ($Id$); -*-text-*- +o Fixed a bug which prevented the NSE scripts directory from appearing + in the Win32 .zip version of Nmap. + o Fixed a bug in Traceroute's output. It occured when a traced host could be fully consolidated, but only the first hop number was outputted. [Kris] diff --git a/Makefile.in b/Makefile.in index f7e1fae81..11ba883fa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -export NMAP_VERSION = 4.21ALPHA4 +export NMAP_VERSION = 4.21ALPHA5 NMAP_NAME= Nmap NMAP_URL= http://insecure.org NMAP_PLATFORM=@host@ diff --git a/mswin32/Makefile b/mswin32/Makefile index 358b5660b..834a15992 100644 --- a/mswin32/Makefile +++ b/mswin32/Makefile @@ -9,7 +9,7 @@ winbuild: $(MAKENSIS) winpcap/winpcap-nmap.nsi rm -rf nmap-$(NMAP_VERSION) mkdir nmap-$(NMAP_VERSION) - cd Release && cp ../../CHANGELOG ../../COPYING nmap-mac-prefixes nmap-os-fingerprints nmap-os-db nmap-protocols nmap-rpc nmap-service-probes nmap-services nmap.exe nmap.xsl ../nmap_performance.reg ../../README-WIN32 ../nmap-$(NMAP_VERSION)/ + cd Release && cp -r ../../CHANGELOG ../../COPYING scripts nmap-mac-prefixes nmap-os-fingerprints nmap-os-db nmap-protocols nmap-rpc nmap-service-probes nmap-services nmap.exe nmap.xsl ../nmap_performance.reg ../../README-WIN32 ../nmap-$(NMAP_VERSION)/ zip -r nmap-$(NMAP_VERSION)-win32.zip nmap-$(NMAP_VERSION) cp winpcap/winpcap-nmap-*.exe nmap-$(NMAP_VERSION) cp nsis/AddToPath.nsh nsis/Nmap.nsi nmap-$(NMAP_VERSION) diff --git a/nmap_winconfig.h b/nmap_winconfig.h index dcdba14dc..85ef47cd7 100644 --- a/nmap_winconfig.h +++ b/nmap_winconfig.h @@ -106,7 +106,7 @@ /* Without this, Windows will give us all sorts of crap about using functions like strcpy() even if they are done safely */ #define _CRT_SECURE_NO_DEPRECATE 1 -#define NMAP_VERSION "4.21ALPHA4" +#define NMAP_VERSION "4.21ALPHA5" #define NMAP_NAME "Nmap" #define NMAP_URL "http://insecure.org" #define NMAP_PLATFORM "i686-pc-windows-windows"