1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 14:11:29 +00:00
Commit Graph

294 Commits

Author SHA1 Message Date
dmiller
6e33d6ac3c Bump date in copyright headers 2016-04-04 15:38:44 +00:00
dmiller
a083db0cf9 Bump version for 7.12 release 2016-03-29 19:43:37 +00:00
dmiller
c97b56a1e9 sync CHANGELOG and bump version for 7.10SVN 2016-03-17 18:16:43 +00:00
dmiller
542f0afe65 Add DisplayVersion to Uninstall windows registry key. Closes #263 2016-02-03 19:19:37 +00:00
dmiller
8425c16203 Bump version and sync CHANGELOG with 7.01 2015-12-10 13:53:54 +00:00
dmiller
32b28a8726 Version bump for 7.00SVN 2015-11-19 20:49:20 +00:00
dmiller
37d517b32e Use XP compatibility SDK, because users are complaining 2015-11-10 16:47:35 +00:00
dmiller
857a62ba8f Add mutex protection to a couple more WinPcap calls 2015-11-10 16:47:33 +00:00
dmiller
40dc3c5830 Move global_structures.h back into nmap.h now that things are sorted out better 2015-07-02 03:09:29 +00:00
dmiller
a19e3e5c12 6.49SVN version bump 2015-06-07 15:53:49 +00:00
dmiller
68409b2226 Update copyright date to 2015 2015-06-03 13:01:29 +00:00
dmiller
0952bed032 Merge final changes to support VS2013 build
Changes:

* Fix a collision of the name PS_NONE with a different constant in shlobj.h
* Update solution and project files for VS2013
* Update the NSIS installer to reference the VC 2013 redistributable
2015-01-17 04:35:01 +00:00
dmiller
7b0c3432e6 Update nmap.rc 2015-01-14 04:57:00 +00:00
dmiller
48c29e99b3 Force nmap.rc to be rebuilt when nmap.h changes
The make rule for nmap.rc depended only on nmap.rc.in, which doesn't
change regularly. Since the rule itself adds version info based on
nmap.h, it makes sense to list this as one of its dependencies.

Fixes #45
2015-01-14 04:56:56 +00:00
dmiller
680dd540eb Fix a compiler error on VS2013 2014-11-11 18:56:05 +00:00
d33tah
1c10f5f926 Keep the file list in order and add a header file for nse_lpeg.h as
well.
2014-09-03 14:34:54 +00:00
batrick
2b36d23f01 Include missing nse_lpeg.cc file for mswin32. 2014-09-03 14:30:06 +00:00
d33tah
c86b862501 Introduce scan_engine_connect.cc, scan_engine_connect.h,
scan_engine_raw.cc, scan_engine_raw.h and add them to Windows and Unix
build systems.
2014-09-03 14:27:00 +00:00
dmiller
86a945e666 Fix syntax issues with python-wrap.bat 2014-08-23 04:22:20 +00:00
dmiller
b113a27a04 Give python-wrap.bat Windows CRLF lines 2014-08-23 04:22:18 +00:00
dmiller
1ea3557757 Let Windows build find VCExpress on any drive letter (mine is N) 2014-08-21 20:13:58 +00:00
dmiller
5adfb3b1de Update copyright notice to 2014 2014-08-16 01:52:33 +00:00
jay
8d5ec9e310 Reapply r33420, r33421. Fix a missing right parenthesis. https://xkcd.com/859/ 2014-08-15 12:09:22 +00:00
fyodor
f6f59a7cd7 Auto regeneration with latest template files, etc. 2014-08-13 22:57:43 +00:00
jay
d4cf544df6 Fix a missing bracket at the end of the IMPORTANT NMAP LICENSE TERMS part in each file 2014-08-02 19:29:50 +00:00
jay
f5e438b966 Got rid of (unnecessary) spaces in blank lines in *.cc and *.h files.
sed -i 's/^\s*$//'
2014-06-19 11:36:10 +00:00
dmiller
ddcfa8cc90 Spellcheck: common misspellings in the entire source tree 2014-02-21 21:10:51 +00:00
robert
0772a10895 Updated Nmap NSIS file to use WinPcap 4.1.3 installer. 2014-01-11 15:00:05 +00:00
robert
98ed1cb771 Updated WinPcap to 4.1.3. 2014-01-11 14:55:10 +00:00
dmiller
d1304e602c Fix windows build breakage from r32558 2014-01-06 20:19:21 +00:00
dmiller
1e6db2b22c Make Ndiff install as a Python module as well as script
Discussion: http://seclists.org/nmap-dev/2013/q4/19
2013-10-17 19:20:49 +00:00
d33tah
ccd0c02a4c Add a lacking space in the license comment. The command I used to do this is:
for file in `grep "* including the terms and conditions of this license text as well.       \*" * -r --files-with-match `; do sed "s/\* including the terms and conditions of this license text as well.       \*/* including the terms and conditions of this license text as well.        */g" -i $file; done
2013-09-11 19:06:20 +00:00
fyodor
6e01ecd452 Update an email address, fix a typo, and slightly reword a sentence. 2013-07-30 00:02:00 +00:00
fyodor
83fb10ec56 Update the Nmap copyright/license files. This isn't the new Nmap Public Source License we've been discussing on the list, but rather just a 'quick patch' to hopefully prevent some of the abuse we've been seeing from companies lately. More details on the changes will be posted to the dev list. Also, the copyright year was updated to 2013 (which is the only change to Nsock license statements). 2013-07-28 22:05:05 +00:00
david
cac0880ca6 Use /out instead of /log in command-line Windows build.
/log seems to be IDE internal logging, and has always been useless to
me. /out gives you the error messages you see in the build window in the
IDE.

http://msdn.microsoft.com/en-us/library/ms241272(v=vs.100).aspx
http://msdn.microsoft.com/en-us/library/ahky453h(v=vs.100).aspx
2013-03-01 05:09:39 +00:00
david
2d40aacd34 Remove MSBUILDDISABLENODEREUSE that doesn't seem to actually work. 2013-03-01 05:09:36 +00:00
david
ce51d8c4da Use the default value of MultiThreadedDLL where possible. 2013-02-09 20:30:01 +00:00
david
6b095f42d2 Use MultiThreadedDebugDLL (/MDd) in place of MultiThreadedDebug (/MTd).
This is to match r8507, which did the analogous thing for the Release
configuration.
http://seclists.org/nmap-dev/2013/q1/120
2013-02-09 20:29:55 +00:00
fyodor
6a42ef47c0 Update the Nmap and Nsock source code headers to note new Nmap dev mailing list email address and a better URL for Nmap license. 2012-12-06 01:21:42 +00:00
david
64f874d835 Temporarily add back generated nmap.rc.
This is needed from the Visual C++ GUI build, not only from make, and
the GUI doesn't have a way to generate this file.

It may be possible to have a Visual Basic script to the automatic
updating of the version number, according to this article.
http://support.microsoft.com/kb/237870
2012-11-13 01:44:39 +00:00
david
d5f3fb6745 Remove LICENSE on "make clean". 2012-10-31 17:29:27 +00:00
david
13fe0f6d2d Don't silence nmap.rc and nsis/Nmap.nsi commands.
They won't be run as often now.
2012-10-31 17:25:42 +00:00
david
d2a44acb91 Use dependencies to generate LICENSE. 2012-10-31 17:25:39 +00:00
david
43fc9c6182 Exporting an environment variable has no effect on a single makefile line. 2012-10-31 17:23:45 +00:00
david
667aaad60c Use MSBUILDDISABLENODEREUSE=1 to prevent zombie msbuild.exe processes.
Having an msbuild.exe process running would cause builds to fail with a
mysterious message about a tmpdir.

http://stackoverflow.com/questions/3919892/msbuild-exe-staying-open-locking-files
2012-10-31 17:01:02 +00:00
david
9644ad825f Don't edit nmap.rc and nsis/Nmap.nsi in place.
Make new versioned nmap.rc.in and nsis/Nmap.nsi.in, and use those to
generate unversioned nmap.rc and nsis/Nmap.nsi. The changes made to
those files were constantly causing problems with updating.
2012-10-31 17:00:59 +00:00
robert
95c60718c1 Prevent Subversion hidden folder (.svn) from being added to Nmap's Windows setup file when copying the licenses directory. 2012-10-22 19:48:26 +00:00
robert
165d010202 Updated the Nmap.nsi file to check the new Visual C++ redistributable versions. Simplified the check for Visual C++ 2010 and improved the check for x64 systems (now additionally checks the Wow6432Node to prevent an error message even when the software was installed correctly). Also bumped the version number of the NSIS file to match the rest of Nmap. 2012-10-11 10:53:58 +00:00
david
91e019210d Add C:\Python27 to PATH of python-wrap.bat. 2012-10-03 05:18:25 +00:00
david
cfeec34979 Remove vcredist files, moved to /nmap-mswin32-aux. 2012-10-02 00:53:49 +00:00