From 0b0a3a8533deabf4c1136bd1482711168eb58fc3 Mon Sep 17 00:00:00 2001 From: sturm Date: Tue, 8 Feb 2005 19:06:42 +0000 Subject: [PATCH] update to nmap 3.81 from maintainer Okan Demirmen --- net/nmap/Makefile | 5 ++--- net/nmap/distinfo | 8 ++++---- .../patch-libpcap_possiblymodified_pcap_bpf_h | 14 -------------- net/nmap/patches/patch-nbase_configure | 13 ------------- net/nmap/patches/patch-tcpip_cc | 8 ++++---- net/nmap/patches/patch-tcpip_h | 8 ++++---- net/nmap/pkg/PFRAG.no-no_x11 | 8 +++----- net/nmap/pkg/PLIST | 4 +++- 8 files changed, 20 insertions(+), 48 deletions(-) delete mode 100644 net/nmap/patches/patch-libpcap_possiblymodified_pcap_bpf_h delete mode 100644 net/nmap/patches/patch-nbase_configure diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 540b7b0aea0..4a0213b798d 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.56 2005/01/29 20:15:32 sturm Exp $ +# $OpenBSD: Makefile,v 1.57 2005/02/08 19:06:42 sturm Exp $ COMMENT= "scan ports and fingerprint stack of network hosts" -DISTNAME= nmap-3.75 -PKGNAME= ${DISTNAME}p1 +DISTNAME= nmap-3.81 CATEGORIES= net security MASTER_SITES= ${HOMEPAGE}dist/ EXTRACT_SUFX= .tgz diff --git a/net/nmap/distinfo b/net/nmap/distinfo index 51fff5afec7..2cf868c3286 100644 --- a/net/nmap/distinfo +++ b/net/nmap/distinfo @@ -1,4 +1,4 @@ -MD5 (nmap-3.75.tgz) = fa537ab4ed0f4ee7550cffb15295312f -RMD160 (nmap-3.75.tgz) = 80c28f3245282a203ad7b8af035a77b8bf650cdb -SHA1 (nmap-3.75.tgz) = 67d4c1b96d95093f00d1be95550bf1867de879f6 -SIZE (nmap-3.75.tgz) = 1809143 +MD5 (nmap-3.81.tgz) = 9b32f74e2f6999e4f7668a24f2a1ea85 +RMD160 (nmap-3.81.tgz) = d57533f1bf614541dd0cdfcf0f14b257d26a28c9 +SHA1 (nmap-3.81.tgz) = 9d1ce1ab3e097ce5d61078fd4bc713f9b701fa1c +SIZE (nmap-3.81.tgz) = 1846196 diff --git a/net/nmap/patches/patch-libpcap_possiblymodified_pcap_bpf_h b/net/nmap/patches/patch-libpcap_possiblymodified_pcap_bpf_h deleted file mode 100644 index e52dcf3e962..00000000000 --- a/net/nmap/patches/patch-libpcap_possiblymodified_pcap_bpf_h +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-libpcap_possiblymodified_pcap_bpf_h,v 1.3 2005/01/29 20:15:32 sturm Exp $ ---- libpcap-possiblymodified/pcap-bpf.h.orig Sun Aug 1 07:34:47 2004 -+++ libpcap-possiblymodified/pcap-bpf.h Sat Jan 29 20:35:07 2005 -@@ -239,8 +239,9 @@ struct bpf_version { - * define it as 108 here. If OpenBSD picks up this file, it should - * define DLT_LOOP as 12 in its version, as per the comment above - - * and should not use 108 as a DLT_ value. -+ * - */ --#define DLT_LOOP 108 -+#define DLT_LOOP 12 - - /* - * Encapsulated packets for IPsec; DLT_ENC is 13 in OpenBSD, but that's diff --git a/net/nmap/patches/patch-nbase_configure b/net/nmap/patches/patch-nbase_configure deleted file mode 100644 index d29c4be6e91..00000000000 --- a/net/nmap/patches/patch-nbase_configure +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-nbase_configure,v 1.5 2004/10/31 18:06:14 sturm Exp $ ---- nbase/configure.orig Sat Oct 16 01:03:33 2004 -+++ nbase/configure Wed Oct 20 11:54:11 2004 -@@ -3324,6 +3324,9 @@ cat >>conftest.$ac_ext <<_ACEOF - #if HAVE_SYS_TYPES_H - # include - # endif -+#if HAVE_NETINET_IN_H -+# include -+#endif - #if HAVE_SYS_SOCKET_H - # include - # endif diff --git a/net/nmap/patches/patch-tcpip_cc b/net/nmap/patches/patch-tcpip_cc index 47c5f37498c..a7533976fc2 100644 --- a/net/nmap/patches/patch-tcpip_cc +++ b/net/nmap/patches/patch-tcpip_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-tcpip_cc,v 1.2 2004/10/31 18:06:14 sturm Exp $ ---- tcpip.cc.orig Mon Oct 18 12:59:15 2004 -+++ tcpip.cc Wed Oct 20 11:54:12 2004 -@@ -1649,7 +1649,8 @@ if (!pd) fatal("NULL packet device passe +$OpenBSD: patch-tcpip_cc,v 1.3 2005/02/08 19:06:42 sturm Exp $ +--- tcpip.cc.orig Sat Feb 5 23:37:55 2005 ++++ tcpip.cc Tue Feb 8 19:36:27 2005 +@@ -1664,7 +1664,8 @@ if (timedout) { gettimeofday(&tv_end, NULL); *rcvdtime = tv_end; #else diff --git a/net/nmap/patches/patch-tcpip_h b/net/nmap/patches/patch-tcpip_h index 189839a88ab..c58c2589d5b 100644 --- a/net/nmap/patches/patch-tcpip_h +++ b/net/nmap/patches/patch-tcpip_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-tcpip_h,v 1.2 2004/10/31 18:06:14 sturm Exp $ ---- tcpip.h.orig Sun Aug 29 05:11:42 2004 -+++ tcpip.h Wed Oct 20 11:54:12 2004 -@@ -254,7 +254,7 @@ extern "C" { +$OpenBSD: patch-tcpip_h,v 1.3 2005/02/08 19:06:42 sturm Exp $ +--- tcpip.h.orig Sat Feb 5 23:37:55 2005 ++++ tcpip.h Tue Feb 8 19:36:27 2005 +@@ -256,7 +256,7 @@ extern "C" { #endif #ifndef BSDFIX diff --git a/net/nmap/pkg/PFRAG.no-no_x11 b/net/nmap/pkg/PFRAG.no-no_x11 index 1534a35a318..95c0fbaa117 100644 --- a/net/nmap/pkg/PFRAG.no-no_x11 +++ b/net/nmap/pkg/PFRAG.no-no_x11 @@ -1,9 +1,7 @@ -@comment $OpenBSD: PFRAG.no-no_x11,v 1.2 2004/09/15 18:17:42 espie Exp $ +@comment $OpenBSD: PFRAG.no-no_x11,v 1.3 2005/02/08 19:06:42 sturm Exp $ bin/nmapfe bin/xnmap @man man/man1/nmapfe.1 @man man/man1/xnmap.1 -@comment share/gnome/ -@comment share/gnome/apps/ -@comment share/gnome/apps/Utilities/ -@comment share/gnome/apps/Utilities/nmapfe.desktop +share/applications/ +share/applications/nmapfe.desktop diff --git a/net/nmap/pkg/PLIST b/net/nmap/pkg/PLIST index 6dc12f1b627..705edef7eb0 100644 --- a/net/nmap/pkg/PLIST +++ b/net/nmap/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.12 2004/10/31 18:06:14 sturm Exp $ +@comment $OpenBSD: PLIST,v 1.13 2005/02/08 19:06:42 sturm Exp $ bin/nmap @man man/man1/nmap.1 share/nmap/ @@ -9,3 +9,5 @@ share/nmap/nmap-rpc share/nmap/nmap-service-probes share/nmap/nmap-services !%%no_x11%% +share/nmap/nmap.dtd +share/nmap/nmap.xsl