ports/56920: Maintainer Update: security/nmap
Marius Strobl
marius at alchemy.franken.de
Tue Sep 16 16:00:38 UTC 2003
The following reply was made to PR ports/56920; it has been noted by GNATS.
From: Marius Strobl <marius at alchemy.franken.de>
To: freebsd-gnats-submit at FreeBSD.org
Cc: dom at wirespeed.org.uk
Subject: Re: ports/56920: Maintainer Update: security/nmap
Date: Tue, 16 Sep 2003 17:57:00 +0200
--WIyZ46R2i8wDzkSu
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi,
attached is a revised patch. In addition to the original patch to update
the nmap port to 3.45 it does the following:
- Use DATADIR in PLIST.
- Fix PLIST for nmap 3.45 (DATADIR/nmap-service-probes was missing).
- Also strip(1) the nmapfe binary.
- Properly record the dependency on OpenSSL so that the nmap port can also
be built with the OpenSSL port instead of the base version.
- Add a WITHOUT_SSL knob.
--WIyZ46R2i8wDzkSu
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="security::nmap.diff4"
Index: Makefile
===================================================================
RCS file: /mnt/futile/usr/data/bsd/cvs/fbsd/ports/security/nmap/Makefile,v
retrieving revision 1.70
diff -u -r1.70 Makefile
--- Makefile 1 Jul 2003 07:27:43 -0000 1.70
+++ Makefile 16 Sep 2003 15:07:07 -0000
@@ -7,7 +7,7 @@
#
PORTNAME?= nmap
-PORTVERSION= 3.30
+PORTVERSION= 3.45
CATEGORIES= security ipv6
MASTER_SITES= http://download.insecure.org/nmap/dist/
DISTNAME= nmap-${PORTVERSION:S/.b/BETA/}
@@ -18,6 +18,9 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-localdirs
USE_BZIP2= yes
+.if ${PORTNAME} == "nmap" && !defined(WITHOUT_SSL)
+USE_OPENSSL= yes
+.endif
MAN1?= nmap.1
@@ -27,16 +30,19 @@
CFLAGS+= -DDLT_RAW=12 # for obsoleted <net/bpf.h>
.endif
-CONFIGURE_TARGET= -build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
.if ${PORTNAME} == "nmap"
CONFIGURE_ARGS+= --without-nmapfe
+.if defined(WITHOUT_SSL)
+CONFIGURE_ARGS+= --without-openssl
+.else
+CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
+.endif
+.else
+# Shut up warnings.
+CONFIGURE_ARGS+= --without-openssl
.endif
ALL_TARGET?= nmap
INSTALL_TARGET?= install-nmap
-
-.if !target(post-install) && (${PORTNAME} == "nmap")
-post-install:
- @strip ${PREFIX}/bin/nmap
-.endif
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /mnt/futile/usr/data/bsd/cvs/fbsd/ports/security/nmap/distinfo,v
retrieving revision 1.44
diff -u -r1.44 distinfo
--- distinfo 1 Jul 2003 03:38:03 -0000 1.44
+++ distinfo 16 Sep 2003 12:32:50 -0000
@@ -1 +1 @@
-MD5 (nmap-3.30.tar.bz2) = 639fc1c91f48319eca97401e74f9c90e
+MD5 (nmap-3.45.tar.bz2) = 9219fe0907a83bddbfd1b99a21ba35ac
Index: pkg-plist
===================================================================
RCS file: /mnt/futile/usr/data/bsd/cvs/fbsd/ports/security/nmap/pkg-plist,v
retrieving revision 1.12
diff -u -r1.12 pkg-plist
--- pkg-plist 1 Jul 2003 03:38:03 -0000 1.12
+++ pkg-plist 16 Sep 2003 15:31:30 -0000
@@ -1,6 +1,7 @@
bin/nmap
-share/nmap/nmap-os-fingerprints
-share/nmap/nmap-protocols
-share/nmap/nmap-services
-share/nmap/nmap-rpc
- at dirrm share/nmap
+%%DATADIR%%/nmap-os-fingerprints
+%%DATADIR%%/nmap-protocols
+%%DATADIR%%/nmap-rpc
+%%DATADIR%%/nmap-service-probes
+%%DATADIR%%/nmap-services
+ at dirrm %%DATADIR%%
Index: files/patch-Makefile.in
===================================================================
RCS file: /mnt/futile/usr/data/bsd/cvs/fbsd/ports/security/nmap/files/patch-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile.in
--- files/patch-Makefile.in 1 Jul 2003 07:27:43 -0000 1.1
+++ files/patch-Makefile.in 16 Sep 2003 14:49:03 -0000
@@ -1,6 +1,6 @@
--- Makefile.in.orig Fri Mar 9 22:25:19 2001
+++ Makefile.in Sun May 27 17:49:17 2001
-@@ -9,14 +9,14 @@
+@@ -9,7 +9,7 @@
mandir = @mandir@
srcdir = @srcdir@
nmapdatadir = @datadir@/nmap
@@ -8,21 +8,33 @@
+deskdir = $(X11BASE)/share/gnome/apps/Utilities
NBASEDIR=@NBASEDIR@
- CC = @CC@
- CXX = @CXX@
+ NSOCKDIR=@NSOCKDIR@
+@@ -18,7 +18,7 @@
CCOPT =
LIBPCAPDIR = @libpcapdir@
+ LIBPCREDIR = @LIBPCREDIR@
-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 @@
+@@ -254,8 +254,8 @@
$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
install-nmap: $(TARGET)
- $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir)
+- $(INSTALL) -c -m 755 nmap $(bindir)/nmap
+ $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir)
- $(INSTALL) -c -m 755 nmap $(bindir)/nmap
++ $(INSTALL) -c -m 755 nmap -s $(bindir)/nmap
$(INSTALL) -c -m 644 docs/$(TARGET).1 $(mandir)/man1/$(TARGET).1
$(INSTALL) -c -m 644 nmap-os-fingerprints $(nmapdatadir)/nmap-os-fingerprints
+ $(INSTALL) -c -m 644 nmap-service-probes $(nmapdatadir)/nmap-service-probes
+@@ -266,7 +266,7 @@
+ install-nmapfe: $(TARGETNMAPFE)
+ $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir)
+ @echo "If the next command fails -- you cannot use the X front end"
+- -test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 nmapfe/nmapfe $(bindir)/nmapfe && rm -f $(bindir)/xnmap && $(SHTOOL) mkln -f -s $(bindir)/nmapfe $(bindir)/xnmap && $(INSTALL) -c -m 644 nmapfe.desktop $(deskdir)/nmapfe.desktop && $(INSTALL) -c -m 644 docs/nmapfe.1 $(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644 docs/xnmap.1 $(mandir)/man1/xnmap.1
++ -test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 -s nmapfe/nmapfe $(bindir)/nmapfe && rm -f $(bindir)/xnmap && $(SHTOOL) mkln -f -s $(bindir)/nmapfe $(bindir)/xnmap && $(INSTALL) -c -m 644 nmapfe.desktop $(deskdir)/nmapfe.desktop && $(INSTALL) -c -m 644 docs/nmapfe.1 $(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644 docs/xnmap.1 $(mandir)/man1/xnmap.1
+
+ install: install-nmap $(INSTALLNMAPFE)
+
Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-configure 16 Sep 2003 13:54:34 -0000
@@ -0,0 +1,10 @@
+--- configure.orig Tue Sep 16 15:52:41 2003
++++ configure Tue Sep 16 15:54:10 2003
+@@ -4251,6 +4251,7 @@
+ ;;
+ *)
+ specialssldir="$with_openssl"
++ CXXFLAGS="$CXXFLAGS -I$with_openssl/include"
+ LDFLAGS="$LDFLAGS -L$with_openssl/lib"
+ ;;
+ esac
--WIyZ46R2i8wDzkSu--
More information about the freebsd-ports-bugs
mailing list