Update to version 3.45.

Also closes PR pkg/22845 by Adrian Portelli.

Changes:

3.45:
=====
- Added new HTTPOptions and RTSPRequest probes suggested by MadHat
  (madhat(a)unspecific.com)

- Integrated more service signatures from MadHat
  (madhat(a)unspecific.com), Brian Hatch (bri(a)ifokr.org), Niels
  Heinen (zillion(a)safemode.org), Solar Designer
  (solar(a)openwall.com), Seth Master
  (smaster(a)stanford.edu), and Curt Wilson
  (netw3_security(a)hushmail.com),

- Applied a patch from Solar Eclipse (solareclipse(a)phreedom.org)
  which increases the allowed size of the 'extrainfo' version field from
  80 characters to 128.  The main benefit is to allow longer apache module
  version strings.

- Fixed Windows compilation.

- Applied some updates to README-WIN32 sent in by Kirby Kuehl
  (kkuehl(a)cisco.com).  He improved the list of suggested registry
  changes and also fixed a typo or two.  He also attached a .reg file
  automate the Nmap connect() scan performance enhancing registry
  changes.  I am now including that with the Nmap Windows binary .zip
  distribution (and in mswin32/ of the source distro).

- Applied a one-line patch from Dmitry V. Levin (ldv@altlinux.org)
  which fixes a test Nmap does during compilation to see if an existing
  libpcap installation is recent enough.

3.40PVT17:
==========
- Wrote and posted a new paper on version scanning to
  http://www.insecure.org/nmap/versionscan.html .  Updated
  nmap-service-probes and the Nmap man page to simply refer to this
  URL.

- Integrated more service signatures from my own scanning as well as
  contributions from Brian Hatch (bri(a)ifokr.org), MadHat
  (madhat(a)unspecific.com), Max Vision (vision(a)whitehats.com), HD
  Moore (hdm(a)digitaloffense.net), Seth Master
  (smaster(a)stanford.edu), and Niels Heinen (zillion(a)safemode.org).
  MadHat also contributed a new probe for Windows Media Service.  Many
  people set a LOT of signatures, which has allowed
  nmap-service-probes to grow from 295 to 356 signatures representing
  85 service protocols!

- Applied a patch (with slight changes) from Brian Hatch
  (bri(a)ifokr.org) which enables caching of SSL sessions so that
  negotiation doesn't have to be repeated when Nmap reconnects to the same
  between probes.

- Applied a patch from Brian Hatch (bri@ifokr.org) which optimizes the
  requested SSL ciphers for speed rather than security.  The list was
  based on empirical evidence from substantial benchmarking he did with
  tests that resemble nmap-service-scanning.

- Updated the Nmap man page to discuss the new version scanning
  options (-sV, -A).

- I now include nmap-version/aclocal.m4 in the distribution as this is
  required to rebuild the configure script ( thanks to Dmitry V. Levin
  (ldv(a)altlinux.org) for notifying me of the problem.

- Applied a patch from Dmitry V. Levin (ldv(a)altlinux.org) which
  detects whether the PCRE include file is <pcre.h> or <pcre

- Applied a patch from Dmitry V. Levin (ldv(a)altlinux.org) which
  fixes typos in some error messages.  The patch apparently came from
  the highly-secure and stable Owl and Alt Linux distributions.  Check
  them out at http://www.openwall.com/Owl/ and
  http://www.altlinux.com/

- Fixed compilation on Mac OS X - thanks to Brian Hatch
  (bri(a)ifokr.org> and Ryan Lowe (rlowe(a)pablowe.net) for giving me
  access to Mac OS X boxes.

- Stripped down libpcre build system to remove libtool dependency and
  other cruft that Nmap doesn't need. (this was mostly a response to
  libtool-related issues on Mac OS X).

- Added a new --version_trace option which causes Nmap to print out extensive
  debugging info about what version scanning is doing (this is a subset
  of what you would get with --packet_trace).  You should usually use
  this in combination with at least one -d option.

- Fixed a port number printing bug that would cause Nmap service
  fingerprints to give a negative port number when the actual port was
  above 32K.  Thanks to Seth Master (smaster@stanford.edu) for finding
  this.

- Updated all the header text again to clarify our interpretation of
  "derived works" after some suggestions from Brian Hatch
  (bri(a)ifokr.org)

- Updated the Nsock config.sub/config.guess to the same newer versions
  that Nmap uses (for Mac OS X compilation).

3.40PVT16:
==========
- Fixed a compilation problem on systems w/o OpenSSL that was
  discovered by Solar Designer.  I also fixed some compilation
  problems on non-IPv6 systems.  It now compiles and runs on my
  Solaris and ancient OpenBSD systems.

- Integrated more services thanks to submissions from Niels Heinen
  (zillion(a)safemode.org).

- Canonicalized the headers at the top of each Nmap/Nsock header src
  file.  This included clarifying our interpretation of derived works,
  updating the copyright date to 2003, making the header a bit wider,
  and a few other light changes.  I've been putting this off for a
  while, because it required editing about a hundred !#$# files!

3.40PVT15:
==========
- Fixed a major bug in the Nsock time caching system.  This could
  cause service detection to inexplicably fail against certain ports in
  the second or later machines scanned.  Thanks to Solar Designer and HD
  Moore for helping me track this down.

- Fixed some *BSD compilation bugs found by
  Zillion (zillion(a)safemode.org).

- Integrated more services thanks to submissions from Fyodor Yarochkin
  (fygrave(a)tigerteam.net), and Niels Heinen
  (zillion(a)safemode.org), and some of my own exploring.  There are
  now 295 signatures.

- Fixed a compilation bug found by Solar Designer on machines that
  don't have struct sockaddr_storage.  Nsock now just uses "struct
  sockaddr *" like connect() does.

- Fixed a bug found by Solar Designer which would cause the Nmap
  portscan table to be truncated in -oN output files if the results are
  very long.

- Changed a bunch of large stack arrays (e.g. int portlookup[65536])
  into dynamically allocated heap pointers.  The large stack variables
  apparently caused problems on some architectures.  This issue was
  reported by osamah abuoun (osamah_abuoun(a)hotmail.com).

3.40PVT14:
==========
- Added IPv6 support for service scan.

- Added an 'sslports' directive to nmap-service-probes.  This tells
  Nmap which service checks to try first for SSL-wrapped ports.  The
  syntax is the same as the normal 'ports' directive for non-ssl ports.
  For example, the HTTP probe has an 'sslports 443' line and
  SMTP-detecting probes have and 'sslports 465' line.

- Integrated more services thanks to submissions from MadHat
  (madhat(a)unspecific.com), Solar Designer (solar(a)openwall.com), Dug
  Song (dugsong(a)monkey.org), pope(a)undersec.com, and Brian Hatch
  (bri(a)ifokr.org).  There are now 288 signatures, matching these 65
  service protocols:
    chargen cvspserver daytime domain echo exec finger font-service
    ftp ftp-proxy http http-proxy hylafax ident ident imap imaps ipp
    ircbot ircd irc-proxy issrealsecure landesk-rc ldap meetingmaker
    microsoft-ds msrpc mud mysql ncacn_http ncp netbios-ns netbios-ssn
    netsaint netwareip nntp nsclient oracle-tns pcanywheredata pop3
    pop3s postgres printer qotd redcarpet rlogind rpc rsync rtsp shell
    smtp snpp spamd ssc-agent ssh ssl telnet time upnp uucp vnc
    vnc-http webster whois winshell X11

- Added a Lotus Notes probe from Fyodor Yarochkin
  (fygrave(a)tigerteam.net).

- Dug Song wins the "award" for most obscure service fingerprint
  submission.  Nmap now detects Dave Curry's Webster dictionary server
  from 1986 :).

- Service fingerprints now include a 'T=SSL' attribute when SSL
  tunneling was used.

- More portability enhancements thanks to Solar Designer and his Linux
  2.0 libc5 boxes.

- Applied a patch from Gisle Vanem (giva(a)bgnett.no) which improves
  Windows emulation of the UNIX mmap() and munmap() memory mapping calls.

3.40PVT13:
==========
- Added SSL-scan-through support.  If service detection finds a port to be
  SSL, it will transparently connect to the port using OpenSSL and use
  version detection to determine what service lies beneath.  This
  feature is only enabled if OpenSSL is available at build time.  A
  new --with-openssl=DIR configure option is available if OpenSSL is
  not in your default compiler paths.  You can use --without-openssl
  to disable this functionality.  Thanks to Brian Hatch
  (bri(a)ifokr.org) for sample code and other assistance.  Make sure
  you use a version without known exploitable overflows.  In
  particular, versions up to and including OpenSSL 0.9.6d and
  0.9.7-beta2 contained serious vulnerabilities described at
  http://www.openssl.org/news/secadv_20020730.txt .  Note that these
  vulnerabilities are well over a year old at the time of this
  writing.

- Integrated many more services thanks to submissions from Brian
  Hatch, HellNBack ( hellnbak(a)nmrc.org ), MadHat, Solar Designer,
  Simple Nomad, and Shawn Wallis (swallis(a)ku.edu).  The number of
  signatures has grown from 242 to 271.  Thanks!

- Integrated Novell Netware NCP and MS Terminal Server probes from
  Simple Nomad (thegnome(a)nmrc.org).

- Fixed a segfault found by Solar Designer that could occur when
  scanning certain "evil" services.

- Fixed a problem reported by Solar Designer and MadHat (
  madhat(a)unspecific.com ) where Nmap would bail when certain Apache
  version/info responses were particularly long.  It could happen in
  other cases as well.  Now Nmap just prints a warning.

- Fixed some portability issues reported by Solar Designer
  ( solar(a)openwall.com )

3.40PVT12:
==========
- I added probes for SSL (session startup request) and microsoft-ds
  (SMB Negotiate Protocol request).

- I changed the default read timeout for a service probe from 7.5s to 5s.

- Fixed a one-character bug that broke many scans when -sV was NOT
  given.  Thanks to Blue Boar (BlueBoar(a)thievco.com) for the report.

3.40PVT11:
==========
- Integrated many more services thanks to submissions from Simple
  Nomad, Solar Designer, jerickson(a)inphonic.com, Curt Wilson, and
  Marco Ivaldi.  Thanks!  The match line count has risen from 201 to 242.

- Implemented a service classification scheme to separate the
  vendor/product name from the version number and any extra info that
  is provided.  Instead of v/[big version string]/, the new match
  lines include v/[vendor/productname]/[version]/[extrainfo]/ .  See
  the docs at the top of nmap-service-probes for more info.  This
  doesn't change the normal output (which lumps them together anyway),
  but they are separate in the XML so that higher-level programs can
  easily match against just a product name.  Here are a few examples
  of the improved service element:
  <service name="ssh" product="OpenSSH" version="3.1p1"
     extrainfo="protocol 1.99" method="probed" conf="10" />
  <service name="domain" product="ISC Bind" version="9.2.1"
     method="probed" conf="10" />
  <state state="open" /><service name="rpcbind" version="2"
     extrainfo="rpc #100000" method="probed" conf="10" />
  <service name="rndc" method="table" conf="3" />

- I went through nmap-service-probes and added the vendor name to more
  entries.  I also added the service name where the product name
  itself didn't make that completely obvious.

- SCO Corporation of Lindon, Utah (formerly Caldera) has lately taken
  to an extortion campaign of demanding license fees from Linux users
  for code that they themselves knowingly distributed under the terms
  of the GNU GPL.  They have also refused to accept the GPL, claiming
  that some preposterous theory of theirs makes it invalid.  Meanwhile
  they have distributed GPL-licensed Nmap in (at least) their
  "Supplemental Open Source CD".  In response to these blatant
  violations, and in accordance with section 4 of the GPL, we hereby
  terminate SCO's rights to redistribute any versions of Nmap in any
  of their products, including (without limitation) OpenLinux,
  Skunkware, OpenServer, and UNIXWare.

3.40PVT10:
==========
- Added "soft matches".  These are similar to normal match lines in
  that they provide a regex for recognizing a service (but no version).
  But instead of stopping at softmatch service recognition, the scan
  continues looking for more info.  It only launches probes that are
  known-capable of matching the softmatched service.  If no version
  number is found, at least the determined service is printed.  A
  service print for submission is also provided in that case.  So this
  provides more informative results and improves efficiency.

- Cleaned up the Windows support a bit and did more testing and
  fixing.  Windows service detection seems to be working fine for me
  now, although my testing is still pretty limited.  This release
  includes a Windows binary distribution and the README-WIN32 has been
  updated to reflect new compilation instructions.

- More service fingerprints!  Thanks to Solar Designer, Max Vision,
  Frank Denis (Jedi/Sector One) for the submissions.  I also added a
  bunch from my own testing. The number of match lines went from 179
  to 201.

- Updated XML output to handle new version and service detection
  information.  Here are a few examples of the new output:
  <port protocol="tcp" portid="22"><state state="open" /><service
    name="ssh" version="OpenSSH 3.1p1 (protocol 1.99)" method="probed"
    conf="10" /></port>
  <port protocol="tcp" portid="111"><state state="open" /><service
    name="rpcbind" version="2 (rpc #100000)" method="probed" conf="10" /></port>
  <port protocol="tcp" portid="953"><state state="open" /><service
    name="rndc" method="table" conf="3" /></port>

- Fixed issue where Nmap would quit when ECONNREFUSED was returned
  when we try to read from an already-connected TCP socket.  FreeBSD
  does this for some reason instead of giving ECONNRESET.  Thanks to
  Will Saxon (WillS(a)housing.ufl.edu) for the report.

- Removed the SERVICEMATCH_STATIC match type from
  nmap-service-probes.  There wasn't much benefit of this over regular
  expressions, so it isn't worth maintaining the extra code.

3.40PVT9:
=========
- Added/fixed numerous service fingerprints thanks to submissions from
  Max Vision, MadHat, Seth Master.  Match lines went
  from 164 to 179.

- The Winpcap libraries used in the Windows build process have been
  upgraded to version 3.0.

- Most of the Windows port is complete.  It compiles and service scan
  works (I didn't test very deeply) on my WinXP box with VS.Net 2003.
  I try to work out remaining kinks and do some cleanup for the next
  version.  The Windows code was restructured and improved quite a bit,
  but much more work remains to be done in that area.  I'll probably
  do a Windows binary .zip release of the next version.

- Various minor fixes

3.40PVT8:
=========
- Service scan is now OFF by default.  You can activate it with -sV.
  Or use the snazzy new -A (for "All recommended features" or
  "Aggressive") option which turns on both OS detection and service
  detection.

- Fixed compilation on my ancient OpenBSD 2.3 machine (a Pentium 60 :)

- Added/fixed numerous service fingerprints thanks to submissions from
  Brian Hatch, HD Moore, Anand R., and some of my own testing.  The
  number of match lines in this version grows from 137 to 164!  Please
  keep 'em coming!

- Various important and not-so-important fixes for bugs I encountered
  while test scanning.

- The RPC grinder no longer prints a startup message if it has no
  RPC-detected ports to scan.

- Some of the service fingerprint length limitations are relaxed a bit
  if you enable debugging (-d).

3.40PVT7:
=========
- Added a whole bunch of services submitted by Brian Hatch
  (bri(a)ifokr.org).  I also added a few Windows-related probes.
  Nmap-service-probes has gone from 101 match strings to 137.  Please
  keep the submissions coming.

- The question mark now only appears for ports in the OPEN state and
  when service detection was requested.

- I now print a separator bar between service fingerprints when Nmap
  prints more than one for a given host so that users understand to
  submit them individually (suggested by Brian Hatch (bri(a)ifokr.org))

- Fixed a bug that would cause Nmap to print "empty" service
  fingerprints consisting of just a semi-colon.  Thanks to Brian Hatch
  (bri(a)ifokr.org) for reporting this.

3.40PVT6:
=========
- Banner-scanned hundreds of thousands of machines for ports
  21,23,25,110,3306 to collect default banners.  Where the banner made
  the service name/version obvious, I integrated them into
  nmap-service-probes.  This increased the number of 'match' lines from
  27 to more than 100.

- Created the service fingerprint submission page at
  http://www.insecure.org/cgi-bin/servicefp-submit.cgi

- Changed the service fingerprint format slightly for easier
  processing by scripts.

- Applied a large portability patch from Albert Chin-A-Young
  (china(a)thewrittenword.com).  This cleans up a number of things,
  particularly for IRIX, Tru64, and Solaris.

- Applied NmapFE patch from Peter Marschall (peter(a)adpm.de) which
  "makes sure changes in the relay host and scanned port entry fields
  are displayed immediately, and also keeps the fields editable after
  de- and reactivating them."

3.40PVT4:
=========
- Limited the size of service fingerprints to roughly 1024 bytes.
  This was suggested by Niels Heinen (niels(a)heinen.ws), because the previous
  limit was excessive.  The number of fingerprints printed is also now
  limited to 10.

- Fixed a segmentation fault that could occur when ping-scanning large
  networks.

- Fixed service scan to gracefully handle host_timeout occurrences when
  they happen during a service scan.

- Fixed a service_scan bug that would cause an error when hosts send
  data and then close() during the NULL probe (when we haven't sent
  anything).

- Applied a patch from Solar Designer (solar(a)openwall.com) which
  corrects some errors in the Russian man page translation and also a
  couple typos in the regular man page.  Then I spell-checked the man
  page to reduce future instances of foreigners sending in diffs to
  correct my English :).

3.40PVT3:
=========
- Nmap now prints a "service fingerprint" for services that it is
  unable to match despite returning data.  The web submission page it
  references is not yet available.

- Service detection now does RPC grinding on ports it detects to be
  running RPC.

- Fixed a bug that would cause Nmap to quit with an Nsock error when
  --host_timeout was used (or when -T5 was used, which sets it
  implicitly).

- Fixed a bug that would cause Nmap to fail to print the OS
  fingerprint in certain cases.  Thanks to Ste Jones
  (root(a)networkpenetration.com) for the problem report.

3.40PVT2:
=========
- Nmap now has a simple VERSION detection scheme.  The 'match' lines in
  nmap-service-probes can specify a template version string
  (referencing subexpression matches from the regex in a perl-like
  manner) so that the version is determined at the same time as the
  service.  This handles many common services in a highly efficient
  manner.  A more complex form of version detection (that initiates
  further communication w/the target service) may be necessary
  eventually to handle services that aren't as forthcoming with
  version details.

- The Nmap port state table now wastes less whitespace due to using a new
  and stingy NmapOutputTable class.  This makes it easier to read, and
  also leaves more room for version info and possibly other enhancements.

- Added 's' option to match lines in nmap-service-probes.  Just as
  with the perl 's' option, this one causes '.' in the regular
  expression to match any character INCLUDING newline.

- The WinPcap header timestamp is no longer used on Windows as it
  sometimes can be a couple seconds different than gettimeofday() (which
  is really _ftime() on Windows) for some reason.  Thanks to Scott
  Egbert (scott.egbert(a)citigroup.com) for the report.

- Applied a patch by Matt Selsky (selsky(a)columbia.edu) which fixes
  configure.in in such a way that the annoying header file "present but
  cannot be compiled" warning for Solaris.

- Applied another patch from Matt that (we hope) fixes the "present
  but cannot be compiled" warning -- this time for Mac OS X.

- Port table header names are now capitalized ("SERVICE", "PORT", etc)

3.40PVT1:
=========
- Initial implementation of service detection.  Nmap will now probe
  ports to determine what is listening, rather than guessing based on
  the nmap-services table lookup.  This can be very useful for
  services on unidentified ports and for UDP services where it is not
  always clear (without these probes) whether the port is really open
  or just firewalled.  It is also handy for when services are run on
  the well-known-port of another protocol -- this is happening more
  and more as users try to circumvent increasingly strict firewall
  policies.

- Nmap now uses the excellent libpcre (Perl Compatible Regular
  Expressions) library from http://www.pcre.org/ .  Many systems
  already have this, otherwise Nmap will use the copy it now includes.
  If your libpcre is hidden away in some nonstandard place, give
  ./configure the new --with-libpcre=DIR directive.

- Nmap now uses the C++ Standard Template Library (STL).  This makes
  programming easier, but if it causes major portability or bloat
  problems, I'll reluctantly remove it.

- Applied a patch from Javier Kohen (jkohen(a)coresecurity.com) which
  normalizes the names of many Microsoft entries in the
  nmap-os-fingerprints file.

- Applied a patch by Florin Andrei (florin(a)sgi.com) to the Nmap RPM
  spec file.  This uses the 'Epoch' flag to prevent the Redhat Network
  tool from marking my RPMs as "obsolete" and "upgrading" to earlier
  Redhat-built versions.  A compilation flag problem is also fixed.

7 files changed, 120 insertions, 28 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 3a6db603f65..69ffceaba00 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2003/07/17 22:51:28 grant Exp $
+# $NetBSD: Makefile,v 1.28 2003/09/20 14:15:27 salo Exp $
 #
 
-DISTNAME=	nmap-3.30
+DISTNAME=	nmap-3.45
 CATEGORIES=	net security
 MASTER_SITES=	http://www.insecure.org/nmap/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,6 +15,8 @@ USE_GCC_SHLIB=	YES
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--with-libpcap=${BUILDLINK_PREFIX.libpcap}
+CONFIGURE_ARGS+=	--with-libpcre=${BUILDLINK_PREFIX.libpcre}
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--without-nmapfe
 
 .include "../../mk/bsd.prefs.mk"
@@ -23,5 +25,8 @@ CONFIGURE_ARGS+=	--without-nmapfe
 MAKE_ENV+=	CPPFLAGS=""
 .endif
 
+.include "../../devel/pcre/buildlink2.mk"
 .include "../../net/libpcap/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index 143495479aa..e954aa49c94 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/03 12:23:57 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/09/20 14:15:27 salo Exp $
 bin/nmap
 man/man1/nmap.1
 share/nmap/nmap-os-fingerprints
 share/nmap/nmap-protocols
 share/nmap/nmap-rpc
+share/nmap/nmap-service-probes
 share/nmap/nmap-services
 @dirrm share/nmap
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 45ae0cf0101..f3dce980a43 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.12 2003/07/04 23:49:42 salo Exp $
+$NetBSD: distinfo,v 1.13 2003/09/20 14:15:27 salo Exp $
 
-SHA1 (nmap-3.30.tar.bz2) = fe127f37ac8b0be9bc3f9b7dfaded91e2c7f160e
-Size (nmap-3.30.tar.bz2) = 918954 bytes
-SHA1 (patch-aa) = 44dc9c98c8b032c7dc538ee89fcd42636f607f34
-SHA1 (patch-ab) = 590271ab5edd85ec8304ae5ee2248c8249b42195
-SHA1 (patch-ad) = 78b40e4840efc2c7d8b9ab94e0eedc4b47239304
+SHA1 (nmap-3.45.tar.bz2) = f89fabaebabdaa548704bd0ea1f0a0aac028ebcc
+Size (nmap-3.45.tar.bz2) = 1221032 bytes
+SHA1 (patch-aa) = c2ef0b16ce8cda4e238f5d03a00fc08def78ab70
+SHA1 (patch-ab) = c0fd4e153fd0823407f2e6923d33412b88d77a78
+SHA1 (patch-ad) = 71c22d0d76a789cf417b9b17d356a6b5f933553c
+SHA1 (patch-ae) = 703872b2f822e48080b6158774d0adf75e652bff
 SHA1 (patch-af) = 21b03fc6658267c6c40d65f634f4fe20d06a2d77
diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa
index facea7c0763..ae3b172ce85 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,28 +1,29 @@
-$NetBSD: patch-aa,v 1.9 2003/03/22 04:07:11 salo Exp $
+$NetBSD: patch-aa,v 1.10 2003/09/20 14:15:28 salo Exp $
 
---- Makefile.in.orig	2003-03-19 01:53:36.000000000 +0100
-+++ Makefile.in	2003-03-22 04:24:12.000000000 +0100
-@@ -15,8 +15,7 @@
+--- 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 @@
  CC = @CC@
  CXX = @CXX@
  CCOPT = 
 -LIBPCAPDIR = @libpcapdir@
+ 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.
-@@ -54,9 +53,6 @@
- 	rm -f $@
- 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+@@ -64,9 +63,6 @@
+ $(LIBPCREDIR)/libpcre.a: $(LIBPCREDIR)/Makefile FORCE
+ 	@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
  
--$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile
--	@echo Compiling libpcap; cd $(LIBPCAPDIR); $(MAKE)
+-$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile FORCE
+-	@echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE)
 -
- $(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile
+ $(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile FORCE
  	@echo Compiling libnbase;
- 	cd $(NBASEDIR); $(MAKE)
-@@ -200,7 +196,7 @@
+ 	cd $(NBASEDIR) && $(MAKE)
+@@ -254,7 +250,7 @@
  	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
  
  install-nmap: $(TARGET)
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
index d10d77f4b8f..0979d414dc7 100644
--- a/net/nmap/patches/patch-ab
+++ b/net/nmap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2002/08/03 12:23:59 hubertf Exp $
+$NetBSD: patch-ab,v 1.7 2003/09/20 14:15:28 salo Exp $
 
---- configure.orig	Sat Jul 20 09:48:46 2002
-+++ configure
-@@ -3450,6 +3450,7 @@
+--- configure.orig	2003-09-13 07:40:51.000000000 +0200
++++ configure	2003-09-20 14:41:26.000000000 +0200
+@@ -5208,6 +5208,7 @@
  extern char pcap_version[];
  int main() {
    int major, minor;
@@ -10,3 +10,11 @@ $NetBSD: patch-ab,v 1.6 2002/08/03 12:23:59 hubertf Exp $
    sscanf(pcap_version,"%d.%d", &major, &minor);
    if (major > 0)
      exit(0);
+@@ -6983,7 +6984,6 @@
+ 
+ 
+ 
+-subdirs="$subdirs $subdirs "
+ 
+ 
+ 
diff --git a/net/nmap/patches/patch-ad b/net/nmap/patches/patch-ad
index 11b14337107..1e9ab9a10b9 100644
--- a/net/nmap/patches/patch-ad
+++ b/net/nmap/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.5 2003/03/22 04:07:11 salo Exp $
+$NetBSD: patch-ad,v 1.6 2003/09/20 14:15:28 salo Exp $
 
---- nbase/configure.orig	2003-03-22 04:36:20.000000000 +0100
-+++ nbase/configure	2003-03-22 04:39:41.000000000 +0100
+--- nbase/configure.orig	2003-09-13 06:24:43.000000000 +0200
++++ nbase/configure	2003-09-17 02:08:19.000000000 +0200
 @@ -10,6 +10,8 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
@@ -11,3 +11,66 @@ $NetBSD: patch-ad,v 1.5 2003/03/22 04:07:11 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 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lssl  $LIBS"
++LIBS="-lssl -lcrypto $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -3803,7 +3805,7 @@
+ #define HAVE_LIBSSL 1
+ _ACEOF
+ 
+-  LIBS="-lssl $LIBS"
++  LIBS="-lssl -lcrypto $LIBS"
+ 
+ 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
diff --git a/net/nmap/patches/patch-ae b/net/nmap/patches/patch-ae
new file mode 100644
index 00000000000..10465ed73ea
--- /dev/null
+++ b/net/nmap/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.5 2003/09/20 14:15:28 salo Exp $
+
+--- nsock/src/configure.orig	2003-09-11 05:44:08.000000000 +0200
++++ nsock/src/configure	2003-09-20 14:50:34.000000000 +0200
+@@ -10,6 +10,8 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
++LIBS=
++
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh