summaryrefslogtreecommitdiff
path: root/net/nmap
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2003-10-13 15:02:15 +0000
committersalo <salo@pkgsrc.org>2003-10-13 15:02:15 +0000
commit9b16842e8c37fc554822e49c395fcb529226eccc (patch)
tree46ae06177fa394596955c0a18d01b5e03fe7ed10 /net/nmap
parente158c7c4f70ae04a6bc3ba59aeafde030b32993e (diff)
downloadpkgsrc-9b16842e8c37fc554822e49c395fcb529226eccc.tar.gz
Update to version 3.48.
Changes since 3.45: =================== o Integrated an enormous number of version detection service submissions. The database has almost doubled in size to 663 signatures representing the following 130 services: 3dm-http afp apcnisd arkstats bittorent chargen citrix-ica cvspserver cvsup dantzretrospect daytime dict directconnect domain echo eggdrop exec finger flexlm font-service ftp ftp-proxy gnats gnutella-http hddtemp hp-gsg http http-proxy hylafax icecast ident imap imaps imsp ipp irc ircbot irc-proxy issrealsecure jabber kazaa-http kerberos-sec landesk-rc ldap linuxconf lmtp lotusnotes lpd lucent-fwadm meetingmaker melange microsoft-ds microsoft-rdp mldonkey msactivesync msdtc msrpc ms-sql-m mstask mud mysql napster ncacn_http ncp netbios-ns netbios-ssn netrek netsaint netstat netwareip networkaudio nntp nsclient nsunicast ntop-http omniback oracle-mts oracle-tns pcanywheredata pksd pmud pop2 pop3 pop3s poppass postgresql powerchute printer qotd redcarpet rendezvous rlogind rpc rsync rtsp sdmsvc sftp shell shivahose sieve slimp3 smtp smux snpp sourceoffice spamd ssc-agent ssh ssl svrloc symantec-av symantec-esm systat telnet time tinyfw upnp uucp veritasnetbackup vnc vnc-http vtun webster whois wins winshell wms X11 xfce zebra o Added the ability to execute "helper functions" in version templates, to help clean up/manipulate data captured from a server response. The first defined function is P() which includes only printable characters in a captured string. The main impetus for this is to deal with unicode strings like "W\0O\0R\0K\0G\0R\0O\0U\0P\0" that many MS protocols send. Nmap can now decode that into "WORKGROUP". o Added SUBST() helper function, which replaces strings in matched appname/version/extrainfo strings with something else. For example, VanDyke Vshell gives a banner that includes "SSH-2\.0-VShell_2_2_0_528". A substring match is used to pick out the string "2_2_0_528", and then SUBST(1,"_",".") is called on that match to form the version number 2.2.0.528. o If responses to a probe fail to match any of the registered match strings for that probe, Nmap will now try against the registered "null probe" match strings. This helps in the case that the NULL probe initially times out (perhaps because of initial DNS lookup) but the banner appears in later responses. o Applied some portability fixes (particularly for OpenBSD) from Chad Loder (cloder(a)loder.us), who is also now the OpenBSD Nmap port maintainer. o Applied some portability fixes from Marius Strobl (marius(a)alchemy.franken.de). o The tarball distribution of Nmap now strips the binary at install time thanks to a patch from Marius Strobl (marius(a)alchemy.franken.de). o Fixed a problem related to building Nmap on systems that lack PCRE libs (and thus have to use the ones included by Nmap). Thanks to Remi Denis-Courmont (deniscr6(a)cti.ecp.fr) for the repot and patch. o Alphebetized the service names in each Probe section in nmap-service-probes (makes them easier to find and add to). o Fixed the problem several people reported where Nmap would quit with a "broken pipe" error during service scanning. Thanks to Jari Ruusu (jari.ruusu(a)pp.inet.fi) for sending a patch. The actual error message was "Unexpected error in NSE_TYPE_READ callback. Error code: 32 (Broken pipe)" o Fixed protocol scan (-sO), which I had broken when adding the new output table format. It would complain "NmapOutputTable.cc:128: failed assertion `row < numRows'". Thanks to Matt Burnett (marukka(a)mac.com) for notifying me of the problem. o Upgraded Libpcap to the latest tcpdump.org version (0.7.2) from 0.7.1 o Applied a patch from Peter Marschall (peter(a)adpm.de) which adds version detection support to nmapfe. o Fixed a problem with XML output being invalid when service detection was done on SSL-tunneled ports. Thanks to the several people who reported this - it means that folks are actually using the XML output :). o Fixed (I hope) some Solaris Sune ONE compiler compilation problems reported (w/patches) by Mikael Mannstrom (candyman(a)penti.org) o Fixed the --with-openssl configure option for people who have OpenSSL installed in a path not automatically found by their compilers. Thanks to Marius Strobl (marius(a)alchemy.franken.de) for the patch. o Made some portability changes for HP-UX and possibly other types of machines, thanks to a patch from Petter Reinholdtsen (pere(a)hungry.com) o Applied a patch from Matt Selsky (selsky@columbia.edu) which fixes compilation on some Solaris boxes, and maybe others. The error said "cannot compute sizeof (char)" o Applied some patches from the NetBSD ports tree that Hubert Feyrer (hubert.feyrer(a)informatik.fh-regensburg.de) sent me. The NetBSD Nmap ports page is at http://www.NetBSD.org/packages/net/nmap/ . o Applied some Makefile patches from the FreeBSD ports tree that I found at http://www.freebsd.org/cgi/cvsweb.cgi/ports/security/nmap/files/
Diffstat (limited to 'net/nmap')
-rw-r--r--net/nmap/Makefile4
-rw-r--r--net/nmap/distinfo10
-rw-r--r--net/nmap/patches/patch-aa28
-rw-r--r--net/nmap/patches/patch-ad55
4 files changed, 23 insertions, 74 deletions
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 69ffceaba00..ca75375bd9a 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2003/09/20 14:15:27 salo Exp $
+# $NetBSD: Makefile,v 1.29 2003/10/13 15:02:15 salo Exp $
#
-DISTNAME= nmap-3.45
+DISTNAME= nmap-3.48
CATEGORIES= net security
MASTER_SITES= http://www.insecure.org/nmap/dist/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 9d81a25d3d1..676cd832be1 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2003/10/07 17:50:37 reed Exp $
+$NetBSD: distinfo,v 1.15 2003/10/13 15:02:15 salo Exp $
-SHA1 (nmap-3.45.tar.bz2) = f89fabaebabdaa548704bd0ea1f0a0aac028ebcc
-Size (nmap-3.45.tar.bz2) = 1221032 bytes
-SHA1 (patch-aa) = c2ef0b16ce8cda4e238f5d03a00fc08def78ab70
+SHA1 (nmap-3.48.tar.bz2) = 91ed393f9fbe4a0739de282b0aca003b856b93df
+Size (nmap-3.48.tar.bz2) = 1227663 bytes
+SHA1 (patch-aa) = 0ab8ca4b1123ab22720eb594973eb7e9ca07903b
SHA1 (patch-ab) = 31cee0df5dd8d071f421fc8b9d467b34a6275472
-SHA1 (patch-ad) = 71c22d0d76a789cf417b9b17d356a6b5f933553c
+SHA1 (patch-ad) = 9d9dc207ddd55e38d3ae95e41440c6f0c2bb2474
SHA1 (patch-ae) = 703872b2f822e48080b6158774d0adf75e652bff
SHA1 (patch-af) = 21b03fc6658267c6c40d65f634f4fe20d06a2d77
diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa
index ae3b172ce85..588b6f67538 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,34 +1,28 @@
-$NetBSD: patch-aa,v 1.10 2003/09/20 14:15:28 salo Exp $
+$NetBSD: patch-aa,v 1.11 2003/10/13 15:02:15 salo Exp $
---- Makefile.in.orig 2003-09-15 09:23:32.000000000 +0200
-+++ Makefile.in 2003-09-17 02:32:43.000000000 +0200
-@@ -16,9 +16,8 @@
+--- Makefile.in.orig 2003-10-06 10:23:20.000000000 +0200
++++ Makefile.in 2003-10-06 13:00:34.000000000 +0200
+@@ -16,9 +16,7 @@
CC = @CC@
CXX = @CXX@
CCOPT =
-LIBPCAPDIR = @libpcapdir@
- LIBPCREDIR = @LIBPCREDIR@
+-LIBPCREDIR = @LIBPCREDIR@
-INCLS = -I$(LIBPCAPDIR)
+INCLS = -I.
DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
# For mtrace debugging -- see MTRACE define in main.cc for instructions
# Should only be enabled during debugging and not in any real release.
-@@ -64,9 +63,6 @@
- $(LIBPCREDIR)/libpcre.a: $(LIBPCREDIR)/Makefile FORCE
- @echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
+@@ -61,12 +59,6 @@
+ # all of the prerequisites (e.g. recursive makes and such)
+ FORCE:
+-$(LIBPCREDIR)/libpcre.a: $(LIBPCREDIR)/Makefile FORCE
+- @echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
+-
-$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile FORCE
- @echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE)
-
$(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile FORCE
@echo Compiling libnbase;
cd $(NBASEDIR) && $(MAKE)
-@@ -254,7 +250,7 @@
- $(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
-
- install-nmap: $(TARGET)
-- $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir)
-+ $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir)
- $(INSTALL) -c -m 755 nmap $(bindir)/nmap
- $(INSTALL) -c -m 644 docs/$(TARGET).1 $(mandir)/man1/$(TARGET).1
- $(INSTALL) -c -m 644 nmap-os-fingerprints $(nmapdatadir)/nmap-os-fingerprints
diff --git a/net/nmap/patches/patch-ad b/net/nmap/patches/patch-ad
index 1e9ab9a10b9..687b637728c 100644
--- a/net/nmap/patches/patch-ad
+++ b/net/nmap/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.6 2003/09/20 14:15:28 salo Exp $
+$NetBSD: patch-ad,v 1.7 2003/10/13 15:02:15 salo Exp $
---- nbase/configure.orig 2003-09-13 06:24:43.000000000 +0200
-+++ nbase/configure 2003-09-17 02:08:19.000000000 +0200
+--- nbase/configure.orig 2003-10-03 10:33:24.000000000 +0200
++++ nbase/configure 2003-10-06 12:52:20.000000000 +0200
@@ -10,6 +10,8 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -11,43 +11,7 @@ $NetBSD: patch-ad,v 1.6 2003/09/20 14:15:28 salo Exp $
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
-@@ -3314,7 +3316,7 @@
-
-
- # If they didn't specify it, we try to find it
--if test "$use_openssl" == "yes" -a "${specialssldir+set}" == "set" ; then
-+if test "$use_openssl" = "yes" -a "${specialssldir+set}" = "set" ; then
- if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
- echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
- echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
-@@ -3456,7 +3458,7 @@
-
-
-
-- if test "$use_openssl" == "yes"; then
-+ if test "$use_openssl" = "yes"; then
- if test "${ac_cv_header_openssl_err_h+set}" = set; then
- echo "$as_me:$LINENO: checking for openssl/err.h" >&5
- echo $ECHO_N "checking for openssl/err.h... $ECHO_C" >&6
-@@ -3599,7 +3601,7 @@
-
- fi
-
-- if test "$use_openssl" == "yes"; then
-+ if test "$use_openssl" = "yes"; then
- if test "${ac_cv_header_openssl_rand_h+set}" = set; then
- echo "$as_me:$LINENO: checking for openssl/rand.h" >&5
- echo $ECHO_N "checking for openssl/rand.h... $ECHO_C" >&6
-@@ -3742,7 +3744,7 @@
-
- fi
-
-- if test "$use_openssl" == "yes"; then
-+ if test "$use_openssl" = "yes"; then
-
- echo "$as_me:$LINENO: checking for SSL_new in -lssl" >&5
- echo $ECHO_N "checking for SSL_new in -lssl... $ECHO_C" >&6
-@@ -3750,7 +3752,7 @@
+@@ -6423,7 +6425,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -56,7 +20,7 @@ $NetBSD: patch-ad,v 1.6 2003/09/20 14:15:28 salo Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
-@@ -3803,7 +3805,7 @@
+@@ -6476,7 +6478,7 @@
#define HAVE_LIBSSL 1
_ACEOF
@@ -65,12 +29,3 @@ $NetBSD: patch-ad,v 1.6 2003/09/20 14:15:28 salo Exp $
else
use_openssl="no"
-@@ -3816,7 +3818,7 @@
- fi
- fi
-
--if test "$use_openssl" == "yes"; then
-+if test "$use_openssl" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_OPENSSL 1
- _ACEOF