From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jan 3 16:20:18 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BA94F16A403 for ; Wed, 3 Jan 2007 16:20:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 9225613C46B for ; Wed, 3 Jan 2007 16:20:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l03GKItb085934 for ; Wed, 3 Jan 2007 16:20:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l03GKIYx085933; Wed, 3 Jan 2007 16:20:18 GMT (envelope-from gnats) Resent-Date: Wed, 3 Jan 2007 16:20:18 GMT Resent-Message-Id: <200701031620.l03GKIYx085933@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Daniel Roethlisberger Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7C2C816A407 for ; Wed, 3 Jan 2007 16:13:40 +0000 (UTC) (envelope-from roe@dragon.roe.ch) Received: from calvin.roe.ch (calvin.roe.ch [213.144.141.26]) by mx1.freebsd.org (Postfix) with ESMTP id 1477113C44C for ; Wed, 3 Jan 2007 16:13:40 +0000 (UTC) (envelope-from roe@dragon.roe.ch) Received: from d212-53-102-185.cust.tele2.ch ([212.53.102.185] helo=dragon.roe.ch) by calvin.roe.ch (envelope-from ) with ESMTPS (TLSv1:AES256-SHA:256) id 1H28jf-0006Ez-4k for FreeBSD-gnats-submit@freebsd.org; Wed, 03 Jan 2007 17:13:03 +0100 Received: from adsl-130-143.dsl.init7.net ([213.144.130.143] helo=aphrodite.roe) by dragon.roe.ch (envelope-from ) with ESMTP (TLSv1:AES256-SHA:256) id 1H28kD-0007A4-00 ; Wed, 03 Jan 2007 17:13:37 +0100 Received: from aphrodite.roe (aphrodite [127.0.0.1]) by aphrodite.roe (8.13.6/8.13.6) with ESMTP id l03GPQSf009440; Wed, 3 Jan 2007 17:25:26 +0100 (CET) (envelope-from roe@aphrodite.roe) Received: (from roe@localhost) by aphrodite.roe (8.13.6/8.13.6/Submit) id l03GPQfD009439; Wed, 3 Jan 2007 17:25:26 +0100 (CET) (envelope-from roe) Message-Id: <200701031625.l03GPQfD009439@aphrodite.roe> Date: Wed, 3 Jan 2007 17:25:26 +0100 (CET) From: Daniel Roethlisberger To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: daniel@roe.ch Subject: ports/107478: [maintainer] security/nmap fix build on AMD64 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Daniel Roethlisberger List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jan 2007 16:20:18 -0000 >Number: 107478 >Category: ports >Synopsis: [maintainer] security/nmap fix build on AMD64 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jan 03 16:20:18 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Daniel Roethlisberger >Release: FreeBSD 6.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD aphrodite.roe 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #9: Sat Oct 21 15:21:13 CEST 2006 root@aphrodite.roe:/usr/obj/usr/src/sys/APHRODITE i386 >Description: Attached patch should fix build on all platforms where va_copy(a,b) cannot be replaced by a = b. Breakage was due to the fact that OSVERSION was used incorrectly in a previous FreeBSD 4.x specific fix. >How-To-Repeat: >Fix: --- nmap-4.20-osrel.diff begins here --- diff -ruN nmap.orig/files/patch-output.cc nmap/files/patch-output.cc --- nmap.orig/files/patch-output.cc Wed Jan 3 17:12:46 2007 +++ nmap/files/patch-output.cc Wed Jan 3 17:16:21 2007 @@ -1,12 +1,20 @@ --- output.cc.orig Fri Dec 8 04:01:19 2006 -+++ output.cc Mon Dec 18 15:50:13 2006 -@@ -742,8 +742,8 @@ ++++ output.cc Wed Jan 3 17:10:43 2007 +@@ -109,6 +109,7 @@ + #include "NmapOutputTable.h" + #include "MACLookup.h" + ++#include + #include + + /* Workaround for lack of namespace std on HP-UX 11.00 */ +@@ -742,8 +743,8 @@ case LOG_MACHINE: case LOG_SKID: case LOG_XML: -#ifdef WIN32 - apcopy = ap; -+#if defined(WIN32) || (defined(FREEBSD) && (OSVERSION < 500000)) ++#if defined(WIN32) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) + apcopy = ap; #else va_copy(apcopy, ap); /* Needed in case we need to so a second vnsprintf */ diff -ruN nmap.orig/files/patch-tcpip.cc nmap/files/patch-tcpip.cc --- nmap.orig/files/patch-tcpip.cc Wed Jan 3 17:12:46 2007 +++ nmap/files/patch-tcpip.cc Wed Jan 3 17:15:57 2007 @@ -1,20 +1,29 @@ --- tcpip.cc.orig Fri Dec 8 04:01:19 2006 -+++ tcpip.cc Mon Dec 18 15:48:46 2006 -@@ -1959,7 +1959,7 @@ ++++ tcpip.cc Wed Jan 3 17:15:05 2007 +@@ -133,6 +133,8 @@ + #endif /* NETINET_IF_ETHER_H */ + #endif /* HAVE_NETINET_IF_ETHER_H */ + ++#include ++ + extern NmapOps o; + + #ifdef WIN32 +@@ -1959,7 +1961,7 @@ // Returns whether the system supports pcap_get_selectable_fd() properly bool pcap_selectable_fd_valid() { -#if defined(WIN32) || defined(MACOSX) -+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (OSVERSION < 500000)) ++#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) return false; #endif return true; -@@ -1972,7 +1972,7 @@ +@@ -1972,7 +1974,7 @@ results. If you just want to test whether the function is supported, use pcap_selectable_fd_valid() instead. */ int my_pcap_get_selectable_fd(pcap_t *p) { -#if defined(WIN32) || defined(MACOSX) -+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (OSVERSION < 500000)) ++#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) return -1; #else assert(pcap_selectable_fd_valid()); --- nmap-4.20-osrel.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: