From a083db0cf962a25940f87964ce5b5749e9d83334 Mon Sep 17 00:00:00 2001 From: dmiller Date: Tue, 29 Mar 2016 19:43:37 +0000 Subject: [PATCH] Bump version for 7.12 release --- CHANGELOG | 2 ++ docs/nmap-update.1 | 4 ++-- docs/nmap.1 | 6 +++--- docs/nmap.usage.txt | 2 +- docs/zenmap.1 | 4 ++-- mswin32/nmap.rc | 4 ++-- ncat/docs/ncat.1 | 6 +++--- ncat/docs/ncat.usage.txt | 2 +- ncat/ncat.h | 2 +- ndiff/docs/ndiff.1 | 4 ++-- nmap.h | 4 ++-- nping/docs/nping.1 | 4 ++-- nping/nping.h | 2 +- zenmap/share/zenmap/config/zenmap_version | 2 +- zenmap/zenmapCore/Version.py | 2 +- 15 files changed, 26 insertions(+), 24 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index aef08bff0..7945d40df 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ # Nmap Changelog ($Id$); -*-text-*- +Nmap 7.12 [2016-03-29] + o [Zenmap] Avoid file corruption in zenmap.conf, reported as files containing many null ("\x00") characters. Example exception: ValueError: unable to parse colour specification diff --git a/docs/nmap-update.1 b/docs/nmap-update.1 index 54af51b19..459b15739 100644 --- a/docs/nmap-update.1 +++ b/docs/nmap-update.1 @@ -2,12 +2,12 @@ .\" Title: nmap-update .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 03/17/2016 +.\" Date: 03/29/2016 .\" Manual: nmap-update Reference Guide .\" Source: nmap-update .\" Language: English .\" -.TH "NMAP\-UPDATE" "1" "03/17/2016" "nmap\-update" "nmap\-update Reference Guide" +.TH "NMAP\-UPDATE" "1" "03/29/2016" "nmap\-update" "nmap\-update Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/nmap.1 b/docs/nmap.1 index 1abe431a6..d4b05f49f 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 03/17/2016 +.\" Date: 03/29/2016 .\" Manual: Nmap Reference Guide .\" Source: Nmap .\" Language: English .\" -.TH "NMAP" "1" "03/17/2016" "Nmap" "Nmap Reference Guide" +.TH "NMAP" "1" "03/29/2016" "Nmap" "Nmap Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -123,7 +123,7 @@ This options summary is printed when Nmap is run with no arguments, and the late .RS 4 .\} .nf -Nmap 7\&.10SVN ( https://nmap\&.org ) +Nmap 7\&.12SVN ( https://nmap\&.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc\&. diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt index 4ac545302..1045118b8 100644 --- a/docs/nmap.usage.txt +++ b/docs/nmap.usage.txt @@ -1,4 +1,4 @@ -Nmap 7.10SVN ( https://nmap.org ) +Nmap 7.12SVN ( 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 d71c378b4..71ac93a06 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.78.1 -.\" Date: 03/17/2016 +.\" Date: 03/29/2016 .\" Manual: Zenmap Reference Guide .\" Source: Zenmap .\" Language: English .\" -.TH "ZENMAP" "1" "03/17/2016" "Zenmap" "Zenmap Reference Guide" +.TH "ZENMAP" "1" "03/29/2016" "Zenmap" "Zenmap Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/mswin32/nmap.rc b/mswin32/nmap.rc index 1a04bf2f2..47d4040ac 100644 --- a/mswin32/nmap.rc +++ b/mswin32/nmap.rc @@ -13,7 +13,7 @@ // VS_VERSION_INFO VERSIONINFO -FILEVERSION 7,0,10,1 +FILEVERSION 7,0,12,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x21L @@ -30,7 +30,7 @@ BEGIN BEGIN VALUE "CompanyName", "Insecure.Org\0" VALUE "FileDescription", "Nmap\0" - VALUE "FileVersion", "7.10SVN\0" + VALUE "FileVersion", "7.12SVN\0" VALUE "InternalName", "Nmap\0" VALUE "LegalCopyright", "Copyright (c) Insecure.Com LLC (fyodor@insecure.org)\0" VALUE "LegalTrademarks", "NMAP\0" diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1 index 741ae4eab..17cb1ff1b 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.78.1 -.\" Date: 03/17/2016 +.\" Date: 03/29/2016 .\" Manual: Ncat Reference Guide .\" Source: Ncat .\" Language: English .\" -.TH "NCAT" "1" "03/17/2016" "Ncat" "Ncat Reference Guide" +.TH "NCAT" "1" "03/29/2016" "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\&.10SVN ( https://nmap\&.org/ncat ) +Ncat 7\&.12SVN ( 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 3209c46dd..0ba414a53 100644 --- a/ncat/docs/ncat.usage.txt +++ b/ncat/docs/ncat.usage.txt @@ -1,4 +1,4 @@ -Ncat 7.10SVN ( https://nmap.org/ncat ) +Ncat 7.12SVN ( 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 2dcb6fffc..e2cbb17a7 100644 --- a/ncat/ncat.h +++ b/ncat/ncat.h @@ -145,7 +145,7 @@ /* Ncat information for output, etc. */ #define NCAT_NAME "Ncat" #define NCAT_URL "https://nmap.org/ncat" -#define NCAT_VERSION "7.10SVN" +#define NCAT_VERSION "7.12SVN" #ifndef __GNUC__ #ifndef __attribute__ diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1 index c1c166390..728c2a1f1 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.78.1 -.\" Date: 03/17/2016 +.\" Date: 03/29/2016 .\" Manual: User Commands .\" Source: Ndiff .\" Language: English .\" -.TH "NDIFF" "1" "03/17/2016" "Ndiff" "User Commands" +.TH "NDIFF" "1" "03/29/2016" "Ndiff" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/nmap.h b/nmap.h index dfb3ebf4e..90cd1c9c1 100644 --- a/nmap.h +++ b/nmap.h @@ -193,8 +193,8 @@ #ifndef NMAP_VERSION /* Edit this definition only within the quotes, because it is read from this file by the makefiles. */ -#define NMAP_VERSION "7.10SVN" -#define NMAP_NUM_VERSION "7.0.10.1" +#define NMAP_VERSION "7.12SVN" +#define NMAP_NUM_VERSION "7.0.12.1" #endif /* The version number of updates retrieved by the nmap-update program. It can be different (but should always be the same or diff --git a/nping/docs/nping.1 b/nping/docs/nping.1 index b30fe95df..203a626b0 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.78.1 -.\" Date: 03/17/2016 +.\" Date: 03/29/2016 .\" Manual: Nping Reference Guide .\" Source: Nping .\" Language: English .\" -.TH "NPING" "1" "03/17/2016" "Nping" "Nping Reference Guide" +.TH "NPING" "1" "03/29/2016" "Nping" "Nping Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/nping/nping.h b/nping/nping.h index 9bec4178b..eb7588ead 100644 --- a/nping/nping.h +++ b/nping/nping.h @@ -339,7 +339,7 @@ /* General tunable defines **************************************************/ #define NPING_NAME "Nping" #define NPING_URL "https://nmap.org/nping" -#define NPING_VERSION "0.7.10SVN" +#define NPING_VERSION "0.7.12SVN" #define DEFAULT_VERBOSITY VB_0 diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version index ff52de392..099a81640 100644 --- a/zenmap/share/zenmap/config/zenmap_version +++ b/zenmap/share/zenmap/config/zenmap_version @@ -1 +1 @@ -7.10SVN +7.12SVN diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py index d72a60faf..f145d7f63 100644 --- a/zenmap/zenmapCore/Version.py +++ b/zenmap/zenmapCore/Version.py @@ -1 +1 @@ -VERSION = "7.10SVN" +VERSION = "7.12SVN"