From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 30 11:50:23 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F04337B401 for ; Mon, 30 Jun 2003 11:50:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C95343FDF for ; Mon, 30 Jun 2003 11:50:22 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5UIoMUp089909 for ; Mon, 30 Jun 2003 11:50:22 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5UIoLY3089864; Mon, 30 Jun 2003 11:50:21 -0700 (PDT) Date: Mon, 30 Jun 2003 11:50:21 -0700 (PDT) Message-Id: <200306301850.h5UIoLY3089864@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Dominic Marks Subject: Re: ports/53933: Maintainer Update: security/nmap X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Dominic Marks List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 18:50:23 -0000 The following reply was made to PR ports/53933; it has been noted by GNATS. From: Dominic Marks To: freebsd-gnats-submit@FreeBSD.org Cc: marius@alchemy.franken.de Subject: Re: ports/53933: Maintainer Update: security/nmap Date: Mon, 30 Jun 2003 19:49:12 +0100 On 30/06/2003 19:31, Dominic Marks wrote: > Hi, > > I forgot to update the port to use the new --without-localdirs configure > argument. Here is revised patch. > > Reminded by: Marius Strobl > > Thanks, > -- > Dominic > Amazingly, I do this regularly. Reminded again by: Marius Strobl diff -ruN --exclude=CVS /usr/ports/security/nmap/Makefile /home/dom/ports/freebsd/security/nmap/Makefile --- /usr/ports/security/nmap/Makefile Wed Jun 25 23:03:53 2003 +++ /home/dom/ports/freebsd/security/nmap/Makefile Mon Jun 30 19:28:35 2003 @@ -7,7 +7,7 @@ # PORTNAME?= nmap -PORTVERSION= 3.28 +PORTVERSION= 3.30 CATEGORIES= security ipv6 MASTER_SITES= http://download.insecure.org/nmap/dist/ DISTNAME= nmap-${PORTVERSION:S/.b/BETA/} @@ -16,6 +16,7 @@ COMMENT?= Port scanning utility for large networks GNU_CONFIGURE= yes +CONFIGURE_ARGS= --without-localdirs USE_BZIP2= yes MAN1?= nmap.1 diff -ruN --exclude=CVS /usr/ports/security/nmap/distinfo /home/dom/ports/freebsd/security/nmap/distinfo --- /usr/ports/security/nmap/distinfo Mon Jun 16 05:43:50 2003 +++ /home/dom/ports/freebsd/security/nmap/distinfo Mon Jun 30 18:22:34 2003 @@ -1 +1 @@ -MD5 (nmap-3.28.tar.bz2) = ac46d6d7a5f7eec8d0281f656c23f2b4 +MD5 (nmap-3.30.tar.bz2) = 639fc1c91f48319eca97401e74f9c90e diff -ruN --exclude=CVS /usr/ports/security/nmap/files/patch-Makefile.in /home/dom/ports/freebsd/security/nmap/files/patch-Makefile.in --- /usr/ports/security/nmap/files/patch-Makefile.in Thu Jan 1 01:00:00 1970 +++ /home/dom/ports/freebsd/security/nmap/files/patch-Makefile.in Fri Apr 11 11:00:50 2003 @@ -0,0 +1,28 @@ +--- Makefile.in.orig Fri Mar 9 22:25:19 2001 ++++ Makefile.in Sun May 27 17:49:17 2001 +@@ -9,14 +9,14 @@ + mandir = @mandir@ + srcdir = @srcdir@ + nmapdatadir = @datadir@/nmap +-deskdir = $(prefix)/share/gnome/apps/Utilities ++deskdir = $(X11BASE)/share/gnome/apps/Utilities + + NBASEDIR=@NBASEDIR@ + CC = @CC@ + CXX = @CXX@ + CCOPT = + LIBPCAPDIR = @libpcapdir@ +-INCLS = -I$(LIBPCAPDIR) ++#INCLS = -I$(LIBPCAPDIR) + 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. +@@ -200,7 +200,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 -ruN --exclude=CVS /usr/ports/security/nmap/files/patch-aa /home/dom/ports/freebsd/security/nmap/files/patch-aa --- /usr/ports/security/nmap/files/patch-aa Fri Apr 11 11:00:50 2003 +++ /home/dom/ports/freebsd/security/nmap/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,28 +0,0 @@ ---- Makefile.in.orig Fri Mar 9 22:25:19 2001 -+++ Makefile.in Sun May 27 17:49:17 2001 -@@ -9,14 +9,14 @@ - mandir = @mandir@ - srcdir = @srcdir@ - nmapdatadir = @datadir@/nmap --deskdir = $(prefix)/share/gnome/apps/Utilities -+deskdir = $(X11BASE)/share/gnome/apps/Utilities - - NBASEDIR=@NBASEDIR@ - CC = @CC@ - CXX = @CXX@ - CCOPT = - LIBPCAPDIR = @libpcapdir@ --INCLS = -I$(LIBPCAPDIR) -+#INCLS = -I$(LIBPCAPDIR) - 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. -@@ -200,7 +200,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 -ruN --exclude=CVS /usr/ports/security/nmap/files/patch-ab /home/dom/ports/freebsd/security/nmap/files/patch-ab --- /usr/ports/security/nmap/files/patch-ab Sat Mar 17 01:06:24 2001 +++ /home/dom/ports/freebsd/security/nmap/files/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- nmapfe/Makefile.in.orig Mon Jan 1 22:22:37 2001 -+++ nmapfe/Makefile.in Fri Mar 16 16:56:47 2001 -@@ -75 +75 @@ --DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DHAVE_CONFIG_H=1 -I$(srcdir) -+DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DHAVE_CONFIG_H=1 -I$(srcdir) -DNMAP_PATH=\"$(bindir)/\" -@@ -236 +236 @@ --%.o: %.c -+.c.o: -@@ -240 +240 @@ --%.lo: %.c -+.c.lo: diff -ruN --exclude=CVS /usr/ports/security/nmap/files/patch-ac /home/dom/ports/freebsd/security/nmap/files/patch-ac --- /usr/ports/security/nmap/files/patch-ac Mon Jun 16 05:43:50 2003 +++ /home/dom/ports/freebsd/security/nmap/files/patch-ac Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- nmapfe/nmapfe_sig.c.old Sun Jun 15 17:37:46 2003 -+++ nmapfe/nmapfe_sig.c Sun Jun 15 17:44:47 2003 -@@ -433,7 +433,7 @@ - if (size > command_size) - command = realloc(command, size); - -- strcpy(command, "nmap "); -+ strcpy(command, NMAP_PATH "nmap "); - /* Uhm... yeah.. Spit out which scan to perform based - on the which_scan variable */ - diff -ruN --exclude=CVS /usr/ports/security/nmap/files/patch-nmapfe::Makefile.in /home/dom/ports/freebsd/security/nmap/files/patch-nmapfe::Makefile.in --- /usr/ports/security/nmap/files/patch-nmapfe::Makefile.in Thu Jan 1 01:00:00 1970 +++ /home/dom/ports/freebsd/security/nmap/files/patch-nmapfe::Makefile.in Sat Mar 17 01:06:24 2001 @@ -0,0 +1,11 @@ +--- nmapfe/Makefile.in.orig Mon Jan 1 22:22:37 2001 ++++ nmapfe/Makefile.in Fri Mar 16 16:56:47 2001 +@@ -75 +75 @@ +-DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DHAVE_CONFIG_H=1 -I$(srcdir) ++DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DHAVE_CONFIG_H=1 -I$(srcdir) -DNMAP_PATH=\"$(bindir)/\" +@@ -236 +236 @@ +-%.o: %.c ++.c.o: +@@ -240 +240 @@ +-%.lo: %.c ++.c.lo: diff -ruN --exclude=CVS /usr/ports/security/nmap/files/patch-nmapfe::nmapfe_sig.c /home/dom/ports/freebsd/security/nmap/files/patch-nmapfe::nmapfe_sig.c --- /usr/ports/security/nmap/files/patch-nmapfe::nmapfe_sig.c Thu Jan 1 01:00:00 1970 +++ /home/dom/ports/freebsd/security/nmap/files/patch-nmapfe::nmapfe_sig.c Mon Jun 30 18:27:30 2003 @@ -0,0 +1,11 @@ +--- nmapfe/nmapfe_sig.c Mon Jun 30 18:23:48 2003 ++++ nmapfe/nmapfe_sig.c.new Mon Jun 30 18:26:03 2003 +@@ -372,7 +372,7 @@ + if (size > command_size) + command = realloc(command, size); + +- strcpy(command, "nmap "); ++ strcpy(command, NMAP_PATH "nmap "); + + /* select the scan type */ + if (opt.scanValue == CONNECT_SCAN) { -- Dominic