ports/57646: [MAINTAINER] port security/nmap: update to version 3.48
Oliver Eikemeier
eikemeier at fillmore-labs.com
Mon Oct 6 14:20:10 UTC 2003
>Number: 57646
>Category: ports
>Synopsis: [MAINTAINER] port security/nmap: update to version 3.48
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 06 07:20:06 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Oliver Eikemeier
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
Fillmore Labs - http://www.fillmore-labs.com
>Environment:
System: FreeBSD nuuk.fillmore-labs.com 5.1-CURRENT
>Description:
- improved version detection
- integrates most FreeBSD fixes, thanks to
Marius Strobl <marius at alchemy.franken.de>
- install localized man pages
>How-To-Repeat:
>Fix:
--- nmap-3.48.patch begins here ---
diff -Nur security/nmap.orig/Makefile security/nmap/Makefile
--- security/nmap.orig/Makefile Thu Sep 25 18:19:24 2003
+++ security/nmap/Makefile Mon Oct 6 15:57:45 2003
@@ -6,9 +6,10 @@
#
PORTNAME?= nmap
-PORTVERSION= 3.46
+PORTVERSION= 3.48
CATEGORIES= security ipv6
-MASTER_SITES= http://download.insecure.org/nmap/dist/
+MASTER_SITES= http://download.insecure.org/nmap/dist/ \
+ http://www.mirrors.wiretapped.net/security/network-mapping/nmap/
DISTNAME= nmap-${PORTVERSION}
MAINTAINER= eikemeier at fillmore-labs.com
@@ -24,6 +25,8 @@
.ifndef BUILD_NMAPFE
MAN1= nmap.1
+MANLANG= "" de.ISO8859-1 es.ISO8859-1 fr.ISO8859-1 it.ISO8859-15 \
+ lt.ISO8859-13 pt.ISO8859-1 ru.KOI8-R
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
@@ -42,7 +45,13 @@
INSTALL_TARGET= install-nmap
post-install:
- @${STRIP_CMD} ${PREFIX}/bin/nmap
+ @for lang in de.ISO8859-1=german es.ISO8859-1=spanish fr.ISO8859-1=french it.ISO8859-15=italian \
+ lt.ISO8859-13=lithuanian pt.ISO8859-1=portuguese ru.KOI8-R=russian; do \
+ llang="`expr $${lang} : '\([^=]*\)'`"; \
+ elang="`expr $${lang} : '.*=\([^=]*\)'`"; \
+ ${MKDIR} ${MAN1PREFIX}/man/$${llang}/man1; \
+ ${INSTALL_MAN} ${WRKSRC}/docs/nmap_$${elang}.1 ${MAN1PREFIX}/man/$${llang}/man1/nmap.1; \
+ done
.ifndef NOPORTDOCS
@${MKDIR} ${DOCSDIR}
@for doc in CHANGELOG HACKING docs/nmap.dtd; do \
@@ -69,9 +78,6 @@
ALL_TARGET= nbase/libnbase.a nmapfe/nmapfe
INSTALL_TARGET= install-nmapfe
-
-post-install:
- @${STRIP_CMD} ${PREFIX}/bin/nmapfe
.endif
diff -Nur security/nmap.orig/distinfo security/nmap/distinfo
--- security/nmap.orig/distinfo Thu Sep 25 18:19:24 2003
+++ security/nmap/distinfo Mon Oct 6 12:19:27 2003
@@ -1 +1 @@
-MD5 (nmap-3.46.tar.bz2) = 58974b2d4059752a9f66adc4659f7878
+MD5 (nmap-3.48.tar.bz2) = 8c38559a863efd476c5b042123f1ee3a
diff -Nur security/nmap.orig/files/patch-Makefile.in security/nmap/files/patch-Makefile.in
--- security/nmap.orig/files/patch-Makefile.in Thu Sep 25 18:19:24 2003
+++ security/nmap/files/patch-Makefile.in Mon Oct 6 12:58:01 2003
@@ -1,5 +1,5 @@
---- Makefile.in.orig Sat Sep 20 11:00:04 2003
-+++ Makefile.in Wed Sep 24 23:59:42 2003
+--- Makefile.in.orig Mon Oct 6 12:57:49 2003
++++ Makefile.in Mon Oct 6 12:58:00 2003
@@ -9,7 +9,7 @@
mandir = @mandir@
srcdir = @srcdir@
@@ -9,11 +9,3 @@
NBASEDIR=@NBASEDIR@
NSOCKDIR=@NSOCKDIR@
-@@ -23,6 +23,7 @@
- # For mtrace debugging -- see MTRACE define in main.cc for instructions
- # Should only be enabled during debugging and not in any real release.
- # DEFS += -DMTRACE=1
-+CPPFLAGS = @CPPFLAGS@
- CXXFLAGS = @CXXFLAGS@ $(CCOPT) $(DEFS) $(INCLS)
- # CFLAGS = $(CXXFLAGS)
- # CFLAGS = $(DEFS) $(INCLS)
diff -Nur security/nmap.orig/files/patch-configure security/nmap/files/patch-configure
--- security/nmap.orig/files/patch-configure Fri Sep 26 14:05:12 2003
+++ security/nmap/files/patch-configure Mon Oct 6 13:03:43 2003
@@ -1,14 +1,5 @@
---- configure.orig Sat Sep 20 09:06:56 2003
-+++ configure Wed Sep 24 23:09:21 2003
-@@ -1302,7 +1302,7 @@
- fi
- if test -d /usr/local/include; then
- CFLAGS="$CFLAGS -I/usr/local/include"
-- CXXFLAGS="$CFLAGS -I/usr/local/include"
-+ CXXFLAGS="$CXXFLAGS -I/usr/local/include"
- fi
- fi
-
+--- configure.orig Mon Oct 6 13:03:26 2003
++++ configure Mon Oct 6 13:03:38 2003
@@ -3299,7 +3299,7 @@
@@ -18,95 +9,3 @@
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -4319,7 +4319,7 @@
- ;;
- *)
- specialssldir="$with_openssl"
-- CXXFLAGS="$CXXFLAGS -I$with_openssl/include"
-+ CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
- LDFLAGS="$LDFLAGS -L$with_openssl/lib"
- ;;
- esac
-@@ -5105,10 +5105,10 @@
-
- ;;
- *)
-- _cppflags=$CXXFLAGS
-+ _cppflags=$CPPFLAGS
- _ldflags=$LDFLAGS
-
-- CXXFLAGS="-I$with_libpcap/include $CXXFLAGS"
-+ CPPFLAGS="-I$with_libpcap/include $CPPFLAGS"
- LDFLAGS="-L$with_libpcap/lib $LDFLAGS"
-
- if test "${ac_cv_header_pcap_h+set}" = set; then
-@@ -5307,7 +5307,7 @@
-
-
- LDFLAGS=$_ldflags
-- CXXFLAGS=$_cppflags
-+ CPPFLAGS=$_cppflags
- ;;
- esac
-
-@@ -5323,10 +5323,10 @@
-
- if test $have_libpcap = yes; then
- if test "${LIBPCAP_INC+set}" = "set"; then
-- _cflags=$CXXFLAGS
-+ _cppflags=$CPPFLAGS
- _ldflags=$LDFLAGS
-
-- CXXFLAGS="-I$LIBPCAP_INC $CXXFLAGS"
-+ CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS"
- LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS"
- fi
-
-@@ -5336,6 +5336,8 @@
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; have_libpcap=no
- else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpcap $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -5391,6 +5393,7 @@
- echo "${ECHO_T}no" >&6; have_libpcap=no
- fi
- rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
- fi
-
-@@ -5406,10 +5409,10 @@
- else
- if test "${LIBPCAP_INC+set}" = "set"; then
- LDFLAGS="-L$libpcapdir $_ldflags"
-- CXXFLAGS="$_cflags -I$libpcapdir"
-+ CPPFLAGS="$_cppflags -I$libpcapdir"
- else
- LDFLAGS="-L$libpcapdir $LDFLAGS"
-- CXXFLAGS="$CXXFLAGS -I$libpcapdir"
-+ CPPFLAGS="$CPPFLAGS -I$libpcapdir"
- fi
- PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
- PCAP_CLEAN="pcap_clean"
-@@ -5433,7 +5436,7 @@
- yes)
- ;;
- *)
-- CXXFLAGS="-I$with_libpcre/include $CXXFLAGS"
-+ CPPFLAGS="-I$with_libpcre/include $CPPFLAGS"
- LDFLAGS="-L$with_libpcre/lib $LDFLAGS"
- have_pcre=yes
- ;;
-@@ -5844,7 +5847,7 @@
-
- subdirs="$subdirs libpcre "
-
-- CXXFLAGS="-I$LIBPCREDIR $CXXFLAGS"
-+ CPPFLAGS="-I$LIBPCREDIR $CPPFLAGS"
- LIBPCRE_LIB="$LIBPCREDIR"
- LIBS="$LIBS $LIBPCRE_LIB/libpcre.a"
- PCRE_DEPENDS="$LIBPCRE_LIB/libpcre.a"
diff -Nur security/nmap.orig/files/patch-nbase::configure security/nmap/files/patch-nbase::configure
--- security/nmap.orig/files/patch-nbase::configure Fri Sep 26 14:05:12 2003
+++ security/nmap/files/patch-nbase::configure Mon Oct 6 13:04:09 2003
@@ -1,5 +1,5 @@
---- nbase/configure.orig Sat Sep 20 11:13:26 2003
-+++ nbase/configure Wed Sep 24 23:10:21 2003
+--- nbase/configure.orig Mon Oct 6 13:03:52 2003
++++ nbase/configure Mon Oct 6 13:04:08 2003
@@ -2971,7 +2971,7 @@
@@ -9,12 +9,3 @@
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -5905,7 +5905,7 @@
- ;;
- *)
- specialssldir="$with_openssl"
-- CXXFLAGS="-I$with_openssl/include $CXXFLAGS"
-+ CPPFLAGS="-I$with_openssl/include $CPPFLAGS"
- ;;
- esac
-
diff -Nur security/nmap.orig/files/patch-nmapfe::Makefile.in security/nmap/files/patch-nmapfe::Makefile.in
--- security/nmap.orig/files/patch-nmapfe::Makefile.in Tue Jul 1 05:38:04 2003
+++ security/nmap/files/patch-nmapfe::Makefile.in Mon Oct 6 13:01:06 2003
@@ -1,11 +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 @@
+--- nmapfe/Makefile.in.orig Mon Oct 6 13:00:32 2003
++++ nmapfe/Makefile.in Mon Oct 6 13:01:05 2003
+@@ -72,7 +72,7 @@
+ CONFIG_CLEAN_FILES =
+ PROGRAMS = $(bin_PROGRAMS)
+
-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:
++DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DHAVE_CONFIG_H=1 -DNMAP_PATH=\"$(bindir)/\" -I$(srcdir)
+ CPPFLAGS = @CPPFLAGS@
+ STATIC =
+ LDFLAGS = @LDFLAGS@ $(STATIC)
diff -Nur security/nmap.orig/files/patch-nmapfe::nmapfe_sig.c security/nmap/files/patch-nmapfe::nmapfe_sig.c
--- security/nmap.orig/files/patch-nmapfe::nmapfe_sig.c Tue Jul 1 05:38:04 2003
+++ security/nmap/files/patch-nmapfe::nmapfe_sig.c Mon Oct 6 13:00:08 2003
@@ -1,6 +1,6 @@
---- 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 @@
+--- nmapfe/nmapfe_sig.c.orig Mon Oct 6 12:59:49 2003
++++ nmapfe/nmapfe_sig.c Mon Oct 6 13:00:06 2003
+@@ -410,7 +410,7 @@
if (size > command_size)
command = realloc(command, size);
@@ -8,4 +8,4 @@
+ strcpy(command, NMAP_PATH "nmap ");
/* select the scan type */
- if (opt.scanValue == CONNECT_SCAN) {
\ No newline at end of file
+ if (opt.scanValue == CONNECT_SCAN) {
diff -Nur security/nmap.orig/files/patch-nsock::src::configure security/nmap/files/patch-nsock::src::configure
--- security/nmap.orig/files/patch-nsock::src::configure Fri Sep 26 14:05:12 2003
+++ security/nmap/files/patch-nsock::src::configure Thu Jan 1 01:00:00 1970
@@ -1,67 +0,0 @@
---- nsock/src/configure.orig Sat Sep 20 09:07:00 2003
-+++ nsock/src/configure Wed Sep 24 22:05:32 2003
-@@ -3169,27 +3169,6 @@
-
-
-
--# Check whether --with-libnbase or --without-libnbase was given.
--if test "${with_libnbase+set}" = set; then
-- withval="$with_libnbase"
-- case "$with_libnbase" in
-- yes)
-- ;;
-- *)
-- NBASEDIR="$with_libnbase"
-- ;;
-- esac
--else
-- NBASEDIR="../../nbase"
--
--fi;
--
--LDFLAGS="$LDFLAGS -L$NBASEDIR"
--CFLAGS="$CFLAGS -I$NBASEDIR"
--LIBS="$LIBS -lnbase"
--
--
--
- # First we test whether they specified openssl desires explicitly
- use_openssl="yes"
- specialssldir=""
-@@ -3206,7 +3185,7 @@
- ;;
- *)
- specialssldir="$with_openssl"
-- CXXFLAGS="-I$with_openssl/include $CXXFLAGS"
-+ CPPFLAGS="-I$with_openssl/include $CPPFLAGS"
- ;;
- esac
-
-@@ -3856,6 +3835,27 @@
- _ACEOF
-
- fi
-+
-+
-+# Check whether --with-libnbase or --without-libnbase was given.
-+if test "${with_libnbase+set}" = set; then
-+ withval="$with_libnbase"
-+ case "$with_libnbase" in
-+ yes)
-+ ;;
-+ *)
-+ NBASEDIR="$with_libnbase"
-+ ;;
-+ esac
-+else
-+ NBASEDIR="../../nbase"
-+
-+fi;
-+
-+LDFLAGS="$LDFLAGS -L$NBASEDIR"
-+CFLAGS="$CFLAGS -I$NBASEDIR"
-+LIBS="$LIBS -lnbase"
-+
-
-
- echo "$as_me:$LINENO: checking struct ip" >&5
--- nmap-3.48.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list