diff options
| -rw-r--r-- | net/nmap/Makefile | 4 | ||||
| -rw-r--r-- | net/nmap/distinfo | 10 | ||||
| -rw-r--r-- | net/nmap/patches/patch-aa | 28 | ||||
| -rw-r--r-- | net/nmap/patches/patch-ad | 55 |
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 |