1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-10 16:39:04 +00:00
Commit Graph

164 Commits

Author SHA1 Message Date
david
2ad8804e64 Merge r10423:14069 from /nmap-exp/david/nmap-payloads. This adds UDP
payload sending by default for certain UDP ports. See
http://seclists.org/nmap-dev/2009/q3/0022.html.
2009-07-06 18:03:50 +00:00
david
7d9da6df81 Do a recursive distclean in ncat before nbase. Otherwise, this sequence
of commands
	./configure
	make
	make clean
	make distclean
fails when makefile.dep is remade in the ncat directory:
In file included from ncat.h:12,
                 from ncat_main.c:4:
../nbase/nbase.h:128:26: error: nbase_config.h: No such file or directory
(Many similar messages follow.)

This happened because "make clean" deletes ncat/makefile.dep. Remaking
makefile.dep requires preprocessing C files that indirectly include
nbase_config.h, which was removed from nbase by distclean. Doing the
distclean in ncat before nbase sidesteps the issue.
2009-06-10 03:16:46 +00:00
fyodor
4a53444901 Split the release build system from having one make distro rule to three separate ones: make prerelease; make release-tarballs; and make release-rpms 2009-06-07 04:25:48 +00:00
batrick
68bf664db6 [NSE] Applied change to remove the old nse_macros.h header file.
Here is a mostly exhaustive list of the changes:

o Removes the SCRIPT_ENGINE_* status defines and replaces the
  instances with regular boolean integer returns or changes the
  procedure to return void. The latter case is better generally because
  the caller ignores any status return (e.g. nmap.cc calling open_nse)
  and/or the procedure raises a fatal error when unsuccessful.

o Moves the SCRIPT_ENGINE_LUA_DIR and the like to the nse_main.h header file.

o Removes the use of the SCRIPT_ENGINE_TRY (there was only one left)
  and thus changes the call to l_dnet_open to a void function called
  directly by luaopen_nsock (in nse_nsock.cc) instead of luaopen_nmap
  (in nse_nmaplib.cc). I felt moving the function was also an
  appropriate (but somewhat unrelated to the intent of the patch) change
  as opening the dnet metatable is very related to opening up the
  nsock library. This confines errors in opening the nsock library, including
  opening the dnet metatable, to the call to luaopen_nsock.

o The FILES and DIRS defines are moved in to nse_fs.h where they are
  more appropriate and localalized.
2009-06-07 01:25:53 +00:00
fyodor
c5d5b47769 Use $(INSTALL) command rather than cp to copy NSE scripts and libraries during install so that permissions are set properly too 2009-06-04 02:38:16 +00:00
fyodor
0c28544135 This path was changed in svn, so I might as well change on my filesystem too 2009-05-13 01:32:34 +00:00
batrick
061eace2db Fixed the redundant log message during compilation:
echo Compiling Nmap
Compiling Nmap

to

Compiling Nmap

:)
2009-05-04 07:02:18 +00:00
batrick
37bbb40520 Merge of nse-lua (nse-lua-merge) minus most enchancements that were
not directly related to the change from C++ to Lua for the NSE main
procedures.

The changes are discussed in the nse-lua thread here:
http://seclists.org/nmap-dev/2009/q1/0047.html
2009-04-05 06:01:27 +00:00
david
541f8dffd8 Make the Ncat version number follow the Nmap version number. 2009-03-26 22:51:20 +00:00
david
1b315f7b97 Use the --force option to setup.py when installing Zenmap to prohibit distutils
from retaining old files it doesn't think need to be replaced.
2009-03-24 17:40:50 +00:00
david
523452a0d0 o Fixed the install-zenmap make target for Solaris portability.
Solaris /bin/sh does not have test(1) -e. [Daniel Roethlisberger]
2009-03-04 18:33:15 +00:00
david
6f5c4b5070 In Makefile.in, have ncat_build depend on nbase_build and nsock_build to
avoid a race condition. "make all" would make nsock and ncat, and ncat
would in turn make nsock. If the timing was right, the two simultaneous
builds would trample each other.

It may seem inefficient to have all these recursive makes calling down
the dependency tree all the time, but GNU Make at least remembers which
targets were already completed so for example only one descent into
nbase_build will be done per "make all".
2009-01-23 23:05:37 +00:00
david
95fcd4966d Define _FORTIFY_SOURCE=2 in nmap, nbase, ncat, and nsock. This
definition causes GCC to add extra security checks to compiled source
code. See http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html.

-D_FORTIFY_SOURCE=1 adds only those checks that are not supposed to
cause any "conforming" program to fail. (Conforming to what I'm not
sure, probably one of the C standards.) -D_FORTIFY_SOURCE=2 adds extra
checks above that. Some light testing hasn't shown any obvious problems.
2009-01-22 21:00:40 +00:00
sven
d8714befb1 merging nse_openssl branch 2008-10-08 22:21:41 +00:00
david
466a760e67 Remove a few remaining references to NMAPLIBEXECDIR, where compiled NSE modules
used to be installed.
2008-09-23 23:25:40 +00:00
david
1073c8283a Merge from /nmap-exp/david/nmap-ndiff and /nmap-exp/david/zenmap-ndiff. 2008-09-18 15:51:40 +00:00
david
f40f6e9549 Don't use CXXFLAGS when making makefile.dep, because that doesn't work with
universal binaries. Instead, put -DNOLUA in CPPFLAGS.
2008-09-16 04:25:39 +00:00
kris
c74ce1f424 Adding Ncat to /nmap. This should have Ncat in the regular build systems for
Windows and UNIX, and install/distro system for the source tarball, RPM, OS X
installer (thanks to David) and the Windows installer.

configure --without-ncat keeps it out on Unix
2008-09-16 01:34:28 +00:00
fyodor
fc4424ef21 Add CXXFLAGS to the makefile.dep creation rule to catch defines such as -DNOLUA which prevents files from trying to include the liblua includes. Suggested by Simon Zilliken 2008-09-13 07:16:35 +00:00
david
b3eddfe90a Remove the nselib-bin directory. Almost all references to it have been removed
too. The section in scripting.xml about creating C modules is gone. (But maybe
it should be replaced with a tutorial on making static modules?) The only
places where nselib-bin is still referenced are in mswin32/nsis/Nmap.nsi, where
it is still removed on uninstallation; and in mswin32/nmap.vcproj, from where I
don't have the resources now to remove it.
2008-09-05 05:32:06 +00:00
fyodor
be9e8bf7b1 o Fixed a Makefile problem (race condition) which could lead to build
failures when launching make in parallel mode (e.g. -j4). [Michal
  Januszewski]
2008-08-30 22:01:45 +00:00
david
986b7f8978 Uncomment the nselib_dist_clean Makefile target. 2008-08-29 20:37:47 +00:00
david
4ab33440fc Uncomment the nselib_clean target so "make clean" works. 2008-08-28 21:28:36 +00:00
david
5a38316995 Uncomment the nsestdlib target. Even though it's a no-op another part of the
makefile was looking for it.
2008-08-28 01:35:34 +00:00
batrick
8a44c9432d Updated NSE's bit library to no longer be a shared library.
See this thread: http://seclists.org/nmap-dev/2008/q3/0404.html
2008-08-27 22:23:50 +00:00
david
ef650e0f67 Delete install-sh. We don't need it because we can use shtool (configure checks
for both).
2008-08-19 18:23:47 +00:00
pgpickering
78d3be0968 modified Makefile.in, added binlib and hashlib for nse 2008-07-31 14:20:10 +00:00
batrick
3ae4bcfa9e Removed nse_string. Equivalent procedures are placed in
nse_main and nse_nsock. nse_main now uses Lua to create printable output
while a cleaner hexify procedure has been placed in nsock.
nse_string is removed as a result.
2008-07-07 17:31:38 +00:00
david
b63cdc769a Remove the part of Makefile.in that calls setup.sh in a subdirectory of zenmap.
setup.sh no longer exists. It was not used anyway.
2008-06-30 19:29:36 +00:00
fyodor
31ed85eca8 remove makefile.dep as part of make clean 2008-05-31 03:24:50 +00:00
batrick
d0bc640db8 Large recode of nse_init.cc
Now does most of it's work through Lua:

From Nmap-dev: "Many of the changes consist of changing how Nmap interfaces
with Lua that were sometimes awkward or inflexible. Most of the functions 
have been made to be callable directly by Lua which offers many technical
advantages: stack management is alleviated, errors are handled cleanly and
are more descriptive, and there is increased reusability."

Additionally:
   -- Moved all lua_State * symbols from "l" to "L". This is to maintain
      consistency with other Lua libraries (convention) and to make our macros portable.
   -- Moved file system manipulation over to nse_fs.cc (from nse_init.cc)
2008-05-31 02:39:27 +00:00
batrick
742ff67100 Removed nse_auxiliar. Updated Script Argument parsing. Fixed typos in
documentation. Improved MySQLinfo.nse. Nsock/dnet metatabels are now
protected.
2008-05-31 02:19:24 +00:00
david
cac1f8cf09 Pass CC to the liblua build. Also simplify the code handling Lua CFLAGS a bit. 2008-05-20 05:52:06 +00:00
david
326424ebdb Call the Zenmap setup.py uninstaller from the uninstall-zenmap target. 2008-05-07 02:42:22 +00:00
david
67739dfa73 Create $(DESTDIR)$(mandir)/man1 before trying to install zenmap.1 into it in
Makefile.in.
2008-05-06 23:55:25 +00:00
david
4fa44aecbf Split Zenmap uninstallation into its own makefile target uninstall-zenmap, to
make it easier when we actually support uninstalling Zenmap with the makefile.
2008-05-05 18:33:21 +00:00
david
a816e2d4dc Install the zenmap man page in the install-zenmap target, not the install-nmap
target.
2008-05-05 18:12:19 +00:00
david
7cd445591c Use DESTDIR in the uninstall target in Makefile.in. This is, for example, what
Automake does. Otherwise, when you run an uninstall, it will delete
/usr/bin/nmap, not the nmap you might be staging elsewhere. This has no effect
if DESTDIR is undefined.
2008-05-05 18:00:31 +00:00
kris
9a89b403f9 Moving Nmap's config.h[.in] to nmap_config.h[.in] 2008-04-28 17:53:32 +00:00
david
5f2375d3e7 Don't use CXXFLAGS when building makefile.dep. CXXFLAGS contains "-arch ppc
-arch i386" when building a universal binary on Mac OS X, and you can't
generate dependencies while using those flags. Include directories were
previously moved to CPPFLAGS so the right dependencies are still found.
2008-04-25 23:54:33 +00:00
kris
c5edfb15f0 install the Zenmap man page during 'make install' 2008-01-24 01:36:01 +00:00
fyodor
29c912f394 URL change from http://insecure.org/nmap/* to http://nmap.org/* 2008-01-17 07:22:03 +00:00
david
7e787c4800 Rename Python packages umitCore to zenmapCore and umitGUI to zenmapGUI with the
following command:

grep -l 'umitGUI\|umitCore' * -r | grep -v '/\.svn/' | xargs -n 1 -t sed -i -e 's/umitGUI/zenmapGUI/' -e 's/umitCore/zenmapCore/'

This allows both Umit and Zenmap to be installed at the same time.
2007-12-01 00:21:28 +00:00
diman
c0f07c99ac adding nselib nselib-bin second (should work on unix now) 2007-11-27 22:18:59 +00:00
david
f3ea111cb0 Install zenmap.1 in zenmap.spec.in, not Makefile. 2007-11-27 08:19:17 +00:00
david
93fb0fc165 Install zenmap.1 and package it in the Zenmap RPM. 2007-11-27 07:45:08 +00:00
david
70425e715d Make nmap be rebuilt when something in a subdirectory changes. Rather than
"all" depending on libpcre/libpcre.a, it now depends on a target pcre_build,
which always runs and does the build in the subdirectory. "nmap" depends on
libpcre/libpcre.a itself. The same thing happens for other subdirectory builds.
Subdirectory builds are prerequisites of "all" and "make nmap" happens in the
body of "all" so the subdirectories are always built first.
2007-11-22 07:43:59 +00:00
david
a460f4433c Make nbase_dist_clean and nsock_dist_clean with distclean. 2007-11-20 23:37:36 +00:00
david
d029d1d75a Look for strip in configure and strip nmap with strip -x on install. install -s
or strip with no arguments was stripping dynamically loaded NSE functions on
Mac OS X. The difference between plain strip and strip -x was so slight on
Linux that I just made it unconditional.
2007-11-19 21:36:21 +00:00
david
85ab7254fa Re-override distutils's overriding of the Python interpreter path to be
"/usr/bin/env python" when DESTDIR is defined. This keeps from hardcoding a
specific interpreter location when building for installation on another
machine.
2007-11-16 22:18:09 +00:00