Date: Sun, 10 Aug 2003 16:37:18 +0000 (GMT) From: Yonatan@xpert.com To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/55446: Update net/xprobe Message-ID: <20030810163718.1942ED9C@110.xpert.com> Resent-Message-ID: <200308101340.h7ADeGG8068399@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 55446
>Category: ports
>Synopsis: Update net/xprobe
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 10 06:40:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Yonatan@xpert.com
>Release: FreeBSD 4.8-RC i386
>Organization:
>Environment:
System: FreeBSD Temujin 4.8-RC FreeBSD 4.8-RC #1: Sat Apr 12 03:02:22 GMT 2003 root@Temujin:/usr/obj/usr/src/sys/TEMUJIN-G i386
>Description:
Commiter, I haven't the time to complete this, so please continue for me.
Three issues require your attention:
1. This tools is now called "xprobe2". Should we change it from "xprobe"? example: "hping" is actually called "hping2".
2. The configure script in ${SRKSRC}/libs-external/USI++/src dies. I worked around it by removing "subdirs" in the configure script, and running it manually in the pre-configure. This is a hack. We can do better.
3. portlint dislikes the PORTVERSION. huh?
Other than these, the code compiles, installs, runs and deinstalls correctly (albeit with way too much compilation warnings).
>How-To-Repeat:
N/A
>Fix:
--- xprobe2.diff begins here ---
diff -urN xprobe.orig/Makefile xprobe/Makefile
--- xprobe.orig/Makefile Sun May 11 13:48:45 2003
+++ xprobe/Makefile Sun Aug 10 16:26:24 2003
@@ -5,16 +5,27 @@
# $FreeBSD: ports/net/xprobe/Makefile,v 1.3 2003/05/11 04:54:41 kris Exp $
#
-PORTNAME= xprobe
-PORTVERSION= 0.0.2
+PORTNAME= xprobe2
+PORTVERSION= 0.2rc1
CATEGORIES= net security
-MASTER_SITES= http://www.sys-security.com/archive/tools/X/
+MASTER_SITES= http://www.sys-security.com/archive/tools/xprobe2/
MAINTAINER= ports@FreeBSD.org
COMMENT= ICMP active OS fingerprint scanner
GNU_CONFIGURE= yes
-MAN1= xprobe.1
+MAN1= xprobe2.1
+
+pre-configure:
+ ( cd ${WRKSRC}/libs-external/USI++/src ; ./configure --prefix=${PREFIX} --target=${CONFIGURE_TARGET} ; cd ${WRKSRC} )
+
+post-install:
+. if !defined(NOPORTDOCS)
+ ${MKDIR} ${DOCSDIR}
+. for i in AUTHORS COPYING CHANGELOG README TODO docs/modules_howto.txt docs/new-fingerprints-howto.txt docs/xprobe-phrack-chinese.txt docs/xprobe-phrack.txt docs/xprobe2-defcon10.pdf
+ ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+. endfor
+. endif
.include <bsd.port.mk>
diff -urN xprobe.orig/distinfo xprobe/distinfo
--- xprobe.orig/distinfo Sun May 11 13:48:45 2003
+++ xprobe/distinfo Sun Aug 10 12:02:35 2003
@@ -1 +1 @@
-MD5 (xprobe-0.0.2.tar.gz) = 72761231d7829e0ce4eb8f7db9049405
+MD5 (xprobe2-0.2rc1.tar.gz) = e97cf2f230408a1ade8a6769125159f3
diff -urN xprobe.orig/files/patch-Makefile_in xprobe/files/patch-Makefile_in
--- xprobe.orig/files/patch-Makefile_in Sun May 11 13:48:45 2003
+++ xprobe/files/patch-Makefile_in Sun Aug 10 15:18:05 2003
@@ -1,28 +1,34 @@
---- Makefile.in.orig Wed Oct 16 22:23:24 2002
-+++ Makefile.in Wed Oct 16 22:25:19 2002
-@@ -28,8 +28,8 @@
- DESTDIR=
+--- Makefile.in.orig Tue Apr 22 19:59:54 2003
++++ Makefile.in Sun Aug 10 15:17:36 2003
+@@ -29,9 +29,9 @@
+ INSTALL_DATA=@INSTALL_DATA@
prefix=@prefix@
exec_prefix=@exec_prefix@
-bindir=@bindir@
-mandir=@mandir@
+-sysconfdir=@sysconfdir@
+BINDIR=@bindir@
+MANDIR=@mandir@
++SYSCONFDIR=@sysconfdir@
+ CFGDIR=@CFGDIR@
PACKAGE=@PACKAGE@
VERSION=@VERSION@
- CPPFLAGS=@CPPFLAGS@
-@@ -58,10 +58,10 @@
- rm -f config.h config.cache config.log config.status Makefile
-
- install: xprobe
+@@ -55,12 +55,12 @@
+ cd libs-external/USI++/src; ${MAKE} distclean
+ cd src; ${MAKE} distclean
+ install: src/xprobe2
- $(INSTALL_PROGRAM) -d $(DESTDIR)/$(bindir)
- $(INSTALL_PROGRAM) -d $(DESTDIR)/$(mandir)/man1
-- $(INSTALL_PROGRAM) -m 0755 xprobe $(DESTDIR)/$(bindir)
-- $(INSTALL_DATA) xprobe.1 $(mandir)/man1
-+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
-+ $(INSTALL_PROGRAM) -m 0755 xprobe $(DESTDIR)$(BINDIR)
-+ $(INSTALL_DATA) xprobe.1 $(DESTDIR)$(MANDIR)/man1
+- $(INSTALL_PROGRAM) -d $(DESTDIR)/$(sysconfdir)/xprobe2
+- $(INSTALL_PROGRAM) -m 0755 src/xprobe2 $(DESTDIR)/$(bindir)
+- $(INSTALL_PROGRAM) -m 0444 etc/xprobe2.conf $(DESTDIR)/$(sysconfdir)/xprobe2
+- $(INSTALL_DATA) docs/xprobe2.1 $(DESTDIR)/$(mandir)/man1
++ $(INSTALL) -d $(DESTDIR)/$(BINDIR)
++ $(INSTALL) -d $(DESTDIR)/$(MANDIR)/man1
++ $(INSTALL) -d $(DESTDIR)/$(SYSCONFDIR)/xprobe2
++ $(INSTALL_PROGRAM) -m 0755 src/xprobe2 $(DESTDIR)/$(BINDIR)
++ $(INSTALL_DATA) -m 0444 etc/xprobe2.conf $(DESTDIR)/$(SYSCONFDIR)/xprobe2
++ $(INSTALL_DATA) docs/xprobe2.1 $(DESTDIR)/$(MANDIR)/man1
configure: configure.in
autoheader
diff -urN xprobe.orig/files/patch-configure xprobe/files/patch-configure
--- xprobe.orig/files/patch-configure Sun May 11 13:48:45 2003
+++ xprobe/files/patch-configure Sun Aug 10 13:42:20 2003
@@ -1,11 +1,25 @@
---- configure.orig Wed Oct 16 22:25:33 2002
-+++ configure Wed Oct 16 22:26:15 2002
-@@ -9,7 +9,7 @@
-
- # Defaults:
- ac_help=
+--- configure.orig Thu Jul 24 15:02:56 2003
++++ configure Sun Aug 10 13:42:05 2003
+@@ -239,7 +239,7 @@
+ #
+ # Initializations.
+ #
-ac_default_prefix=/usr/local
+ac_default_prefix=${LOCALBASE}
- # Any additions from configure.in:
- ac_help="$ac_help
- --enable-debug enable debugging )"
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+@@ -4095,11 +4095,11 @@
+ fi
+
+
+-subdirs="libs-external/USI++/src"
++#subdirs="libs-external/USI++/src"
+
+
+
+-subdirs="$subdirs $subdirs"
++#subdirs="$subdirs $subdirs"
+
+
+ ac_config_files="$ac_config_files Makefile src/defines.h src/Makefile src/xplib/Makefile src/xpmodules/Makefile src/xpmodules/alive_probe/Makefile src/xpmodules/alive_probe/ttl_calc/Makefile src/xpmodules/alive_probe/portscanner/Makefile src/xpmodules/os_probe/Makefile src/xpmodules/os_probe/icmp_echo_id/Makefile src/xpmodules/os_probe/icmp_timestamp/Makefile src/xpmodules/os_probe/icmp_addrmask/Makefile src/xpmodules/os_probe/icmp_inforeq/Makefile src/xpmodules/os_probe/icmp_port_unreach/Makefile src/xpmodules/os_probe/tcp_handshake/Makefile"
diff -urN xprobe.orig/files/patch-libs-external:USI++:src:Makefile_in xprobe/files/patch-libs-external:USI++:src:Makefile_in
--- xprobe.orig/files/patch-libs-external:USI++:src:Makefile_in Thu Jan 1 00:00:00 1970
+++ xprobe/files/patch-libs-external:USI++:src:Makefile_in Sun Aug 10 13:30:37 2003
@@ -0,0 +1,24 @@
+--- libs-external/USI++/src/Makefile.in.orig Sun Aug 10 13:28:08 2003
++++ libs-external/USI++/src/Makefile.in Sun Aug 10 13:29:38 2003
+@@ -48,15 +48,15 @@
+ $(CXX) $(CFLAGS) -c -O2 TX_IP.cc
+
+ install:
+- $(INSTALL) -g bin -o root -m 0755 libusi++.* /usr/lib
+- mkdir -m 0755 /usr/include/usi++||true
+- cp -R usi++/* /usr/include/usi++
+- chown -R root /usr/include/usi++
++ $(INSTALL) -g bin -o root -m 0755 libusi++.* ${PREFIX}/lib
++ mkdir -m 0755 ${PREFIX}/include/usi++||true
++ cp -R usi++/* ${PREFIX}/include/usi++
++ chown -R root ${PREFIX}/include/usi++
+ @echo To build programs using libusi++, you have to do \'c++ foo.cc -lusi++ $(LIBS)\'
+
+ uninstall:
+- rm -f /usr/lib/libusi++.a
+- rm -rf /usr/include/usi++
++ rm -f ${PREFIX}/lib/libusi++.a
++ rm -rf ${PREFIX}/include/usi++
+
+ clean:
+ rm -f *.o *.a
diff -urN xprobe.orig/pkg-plist xprobe/pkg-plist
--- xprobe.orig/pkg-plist Thu Aug 23 13:10:57 2001
+++ xprobe/pkg-plist Sun Aug 10 15:31:51 2003
@@ -1 +1,14 @@
-bin/xprobe
+bin/xprobe2
+etc/xprobe2/xprobe2.conf
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/modules_howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/new-fingerprints-howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/xprobe-phrack-chinese.txt
+%%PORTDOCS%%%%DOCSDIR%%/xprobe-phrack.txt
+%%PORTDOCS%%%%DOCSDIR%%/xprobe2-defcon10.pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/xprobe2
--- xprobe2.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?20030810163718.1942ED9C>