Commit Graph

151 Commits

Author SHA1 Message Date
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
david 809a1e4612 Change paths in Makefile and zenmap.spec.in to match Zenmap file name changes. 2007-11-15 20:51:55 +00:00
fyodor a62e2976da no longer strip Nmap binary. It was causing problems on OS X, and I noticed that debian package removes that too 2007-11-14 00:25:49 +00:00
david 4b8325988a Check for Python in configure and substitute PYTHON in the makefile. 2007-11-09 15:56:09 +00:00
david 4a753006db Make symlinks from nmapfe and xnmap to zenmap. Don't create the nmapfe symlink
unless that file doesn't exist or is already a link.
2007-11-09 05:29:25 +00:00
david 79bdfec9b5 Use --root to give DESTDIR to setup.py instead of embedding it in --prefix. This will help in making a Zenmap RPM. 2007-11-04 18:35:43 +00:00
david 50c4981934 Remove the first-generation OS detection and nmap-os-fingerprints. 2007-11-03 01:31:02 +00:00
david b17c82a0b0 Remove NmapFE. 2007-11-01 07:45:43 +00:00
fyodor 02db0e5981 Rename Umit to Zenmap to reduce confusion between the version we ship with Nmap as the integrated GUI and the version maintained separately at umit.sourceforge.net 2007-10-24 21:45:50 +00:00
david 83382600f2 Revert r5485. This changes the pcre Lua module back to statically linked
code instead of a dynamically loaded C module. Linking the dynamic
shared module with the static libpcre.a was failing on OpenBSD. See
http://seclists.org/nmap-dev/2007/q4/0085.html.
2007-10-23 00:45:00 +00:00
david abf3ad1d81 Don't remove umit/setup.py on distclean. 2007-10-14 21:24:06 +00:00
david 8725d37b47 Avoid rebuilding nmap every time "make" is run. The target "all" takes
care of building all prerequisites. One downside is that you can't do
"make nmap" in an clean tree any more, if anyone ever did that. You have
to do "make" once to build the prerequisites. This is how Automake does
it. I'll keep thinking about this.
2007-10-14 04:24:42 +00:00
david b41c987471 Remove the unused DEPS variable from Makefile.in. 2007-10-14 04:05:16 +00:00
fyodor ba545c1ef9 Unix installation now places NSELib dynamic libraries in 'libexec' rather than 'share' directories, since they are architecture dependent. Thanks to Christoph J. Thompson for the patch. 2007-10-07 21:32:38 +00:00