diff options
| -rw-r--r-- | net/nmap/Makefile | 9 | ||||
| -rw-r--r-- | net/nmap/PLIST | 3 | ||||
| -rw-r--r-- | net/nmap/distinfo | 13 | ||||
| -rw-r--r-- | net/nmap/patches/patch-aa | 25 | ||||
| -rw-r--r-- | net/nmap/patches/patch-ab | 16 | ||||
| -rw-r--r-- | net/nmap/patches/patch-ad | 69 | ||||
| -rw-r--r-- | net/nmap/patches/patch-ae | 13 |
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 |