Date: Sun, 25 Jun 2006 20:50:52 +0200 (CEST) From: Daniel Roethlisberger <daniel@roe.ch> To: FreeBSD-gnats-submit@FreeBSD.org Cc: daniel@roe.ch Subject: ports/99461: [maintainer] Update security/nmap to 4.10 Message-ID: <200606251850.k5PIoq7N056393@aphrodite.roe> Resent-Message-ID: <200606251850.k5PIoQfp078258@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99461 >Category: ports >Synopsis: [maintainer] Update security/nmap to 4.10 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jun 25 18:50:26 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Daniel Roethlisberger >Release: FreeBSD 6.1-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD aphrodite.roe 6.1-RELEASE-p1 FreeBSD 6.1-RELEASE-p1 #6: Sun Jun 4 22:43:07 CEST 2006 root@aphrodite.roe:/usr/obj/usr/src/sys/APHRODITE i386 >Description: cvs delete files/patch-scan_engine.cc Update nmap to 4.10. Port changes: * Remove obsoleted patch Upstream changes: * See http://seclists.org/lists/nmap-hackers/2006/Apr-Jun/0003.html >How-To-Repeat: >Fix: --- nmap-4.01-4.10.diff begins here --- diff -ruN nmap.orig/Makefile nmap/Makefile --- nmap.orig/Makefile Wed Mar 15 15:30:41 2006 +++ nmap/Makefile Sat Jun 24 20:42:33 2006 @@ -7,7 +7,6 @@ PORTNAME?= nmap PORTVERSION= ${DISTVERSION:L:C/([a-z])[a-z]+/\1/g:C/[^a-z0-9+]+/./g} -PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= http://download.insecure.org/nmap/dist/ \ http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \ @@ -18,7 +17,7 @@ MAINTAINER= daniel@roe.ch COMMENT?= Port scanning utility for large networks -DISTVERSION= 4.01 +DISTVERSION= 4.10 USE_BZIP2= yes USE_GMAKE= yes diff -ruN nmap.orig/distinfo nmap/distinfo --- nmap.orig/distinfo Sat Feb 11 00:42:16 2006 +++ nmap/distinfo Sat Jun 24 19:26:17 2006 @@ -1,3 +1,3 @@ -MD5 (nmap-4.01.tar.bz2) = 09c259837b24f6c7385c2c1c49760a7c -SHA256 (nmap-4.01.tar.bz2) = 2b2cebaeee196dbf779cf7212b01dab8bb06b7e6807f45f3b62902bf84ffb58e -SIZE (nmap-4.01.tar.bz2) = 1895276 +MD5 (nmap-4.10.tar.bz2) = 4c3fc7d227034892ade86892d8306b2a +SHA256 (nmap-4.10.tar.bz2) = b90411a0030a188580de26ec3fd791fee590a946e4d0ecc5a9eff6a1aa29427b +SIZE (nmap-4.10.tar.bz2) = 2130202 diff -ruN nmap.orig/files/patch-scan_engine.cc nmap/files/patch-scan_engine.cc --- nmap.orig/files/patch-scan_engine.cc Wed Mar 15 15:30:41 2006 +++ nmap/files/patch-scan_engine.cc Thu Jan 1 01:00:00 1970 @@ -1,45 +0,0 @@ -$FreeBSD: ports/security/nmap/files/patch-scan_engine.cc,v 1.1 2006/03/15 14:30:41 sem Exp $ - -Patch taken from <20060217013528.GG7214@syn.lnxnet.net>. -http://seclists.org/lists/nmap-dev/2006/Jan-Mar/0205.html -Will be included in nmap 4.02. - ---- scan_engine.cc.ORIG Wed Mar 8 13:36:06 2006 -+++ scan_engine.cc Wed Mar 8 13:40:44 2006 -@@ -807,6 +807,7 @@ - - /* Returns true if the GLOBAL system says that sending is OK.*/ - bool GroupScanStats::sendOK() { -+ int recentsends; - - if (USI->scantype == CONNECT_SCAN && CSI->numSDs >= CSI->maxSocketsAllowed) - return false; -@@ -815,7 +816,9 @@ - the last listen call, at least for systems such as Windoze that - don't give us a proper pcap time. Also for connect scans, since - we don't get an exact response time with them either. */ -- if (USI->scantype == CONNECT_SCAN || !pcap_recv_timeval_valid()) { -+ recentsends = USI->gstats->probes_sent - USI->gstats->probes_sent_at_last_wait; -+ if (recentsends > 0 && -+ (USI->scantype == CONNECT_SCAN || !pcap_recv_timeval_valid())) { - int to_ms = (int) MAX(to.srtt * .75 / 1000, 50); - if (TIMEVAL_MSEC_SUBTRACT(USI->now, last_wait) > to_ms) - return false; -@@ -828,7 +831,7 @@ - responses when I scan localhost. And half of those are the @#$# - sends being received. I think I'll put a limit of 50 sends per - wait */ -- if (USI->gstats->probes_sent - USI->gstats->probes_sent_at_last_wait >= 50) -+ if (recentsends >= 50) - return false; - - /* When there is only one target left, let the host congestion -@@ -969,7 +972,7 @@ - - getTiming(&tmng); - if (tmng.cwnd >= num_probes_active + .5 && -- (freshPortsLeft() || num_probes_waiting_retransmit)) { -+ (freshPortsLeft() || num_probes_waiting_retransmit || !retry_stack.empty())) { - if (when) *when = USI->now; - return true; - } --- nmap-4.01-4.10.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606251850.k5PIoq7N056393>