Pawlowski Marcin Piotr wrote:
Hi,
try this diff it should work now.
Two thing corrected from previous:
0) ndiff.1 now is in proper place.
1) Nmap uses sctp protocol for -sS but AFAIK we don't have this
protocol in pcap so I've just removed that from pcap filter rules and
it works well now.
But still there is fatal error in all man pages from nmap package...
Reworked a bit the port:
- sctp.h is in files directory
- patched ndiff/setup.py to properly install ndiff man page
- some cleanups
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- Makefile 21 Jan 2009 17:58:48 -0000 1.82
+++ Makefile 21 Jul 2009 18:21:04 -0000
@@ -3,10 +3,10 @@
COMMENT-main= scan ports and fingerprint stack of network hosts
COMMENT-zenmap= graphical frontend for nmap
-MODPY_EGG_VERSION= 4.76
+MODPY_EGG_VERSION= 5.00
DISTNAME= nmap-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
-PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}p0
+PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
CATEGORIES= net security
MASTER_SITES= http://download.insecure.org/nmap/dist/
@@ -14,9 +14,9 @@ EXTRACT_SUFX= .tgz
HOMEPAGE= http://www.nmap.org/
-MAINTAINER= Giovanni Bechis <[email protected]>
+MAINTAINER= Giovanni Bechis <[email protected]>
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -38,7 +38,8 @@ CONFIGURE_ARGS= --with-libpcap=/usr \
--with-openssl=/usr \
--with-libdnet=${LOCALBASE} \
--with-liblua=${LOCALBASE} \
- --with-libpcre=${LOCALBASE}
+ --with-libpcre=${LOCALBASE} \
+ --with-mandir=${LOCALBASE}/man
LIB_DEPENDS= pcre::devel/pcre \
dnet::net/libdnet \
@@ -55,6 +56,7 @@ RUN_DEPENDS-zenmap= ::x11/py-gtk2 \
NO_REGRESS= Yes
post-extract:
+ cp files/sctp.h ${WRKSRC}/sctp.h
@cd ${WRKSRC} && rm -rf libpcap/ libdnet-stripped/ liblua/ libpcre/
pre-configure:
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nmap/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo 17 Sep 2008 18:09:54 -0000 1.22
+++ distinfo 21 Jul 2009 18:21:04 -0000
@@ -1,5 +1,5 @@
-MD5 (nmap-4.76.tgz) = VLXJ4/RMGt3hffaBcOt8/g==
-RMD160 (nmap-4.76.tgz) = rnuA70zm26puZXb5yjhKIjuJvTo=
-SHA1 (nmap-4.76.tgz) = Q3TPnKiCLChd6dAOj2cG0Lz6pAM=
-SHA256 (nmap-4.76.tgz) = DpYOBVPrdkcMhRegA4CSo5adtly+I8A/1trvGs3Mllg=
-SIZE (nmap-4.76.tgz) = 6810205
+MD5 (nmap-5.00.tgz) = a1so9CHK5x/ScQwSR8jbZg==
+RMD160 (nmap-5.00.tgz) = DFPJh6U8idH9ZPZ8VgaDUHfP8m8=
+SHA1 (nmap-5.00.tgz) = 1bbU5FIqpdpYQHcPuBDELoCQYMo=
+SHA256 (nmap-5.00.tgz) = ddzr5P1zzJGyY0DZ9rM7WhA20iqEl51DzRJ+RgdaOPI=
+SIZE (nmap-5.00.tgz) = 9902346
Index: files/sctp.h
===================================================================
RCS file: files/sctp.h
diff -N files/sctp.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/sctp.h 21 Jul 2009 18:21:04 -0000
@@ -0,0 +1,108 @@
+/*
+ * Stream Control Transmission Protocol (RFC 2960).
+ *
+ * Copyright (c) 2008 Daniel Roethlisberger <[email protected]>
+ * Copyright (c) 2000 Dug Song <[email protected]>
+ *
+ */
+
+#ifndef SCTP_H
+#define SCTP_H
+
+#define SCTP_HDR_LEN 12
+
+struct sctp_hdr {
+ uint16_t sh_sport; /* source port */
+ uint16_t sh_dport; /* destination port */
+ uint32_t sh_vtag; /* sctp verification tag */
+ uint32_t sh_sum; /* sctp checksum */
+};
+
+#define SCTP_PORT_MAX 65535
+
+#define sctp_pack_hdr(hdr, sport, dport, vtag) do { \
+ struct sctp_hdr *sctp_pack_p = (struct sctp_hdr *)(hdr); \
+ sctp_pack_p->sh_sport = htons(sport); \
+ sctp_pack_p->sh_dport = htons(dport); \
+ sctp_pack_p->sh_vtag = htonl(vtag); \
+} while (0)
+
+struct sctp_chunkhdr {
+ uint8_t sch_type; /* chunk type */
+ uint8_t sch_flags; /* chunk flags */
+ uint16_t sch_length; /* chunk length */
+};
+
+/* chunk types */
+#define SCTP_DATA 0x00
+#define SCTP_INIT 0x01
+#define SCTP_INIT_ACK 0x02
+#define SCTP_SACK 0x03
+#define SCTP_HEARTBEAT 0x04
+#define SCTP_HEARTBEAT_ACK 0x05
+#define SCTP_ABORT 0x06
+#define SCTP_SHUTDOWN 0x07
+#define SCTP_SHUTDOWN_ACK 0x08
+#define SCTP_ERROR 0x09
+#define SCTP_COOKIE_ECHO 0x0a
+#define SCTP_COOKIE_ACK 0x0b
+#define SCTP_ECNE 0x0c
+#define SCTP_CWR 0x0d
+#define SCTP_SHUTDOWN_COMPLETE 0x0e
+#define SCTP_AUTH 0x0f /* RFC 4895 */
+#define SCTP_ASCONF_ACK 0x80 /* RFC 5061 */
+#define SCTP_PKTDROP 0x81 /* draft-stewart-sctp-pktdrprep-08 */
+#define SCTP_PAD 0x84 /* RFC 4820 */
+#define SCTP_FORWARD_TSN 0xc0 /* RFC 3758 */
+#define SCTP_ASCONF 0xc1 /* RFC 5061 */
+
+/* chunk types bitmask flags */
+#define SCTP_TYPEFLAG_REPORT 1
+#define SCTP_TYPEFLAG_SKIP 2
+
+#define sctp_pack_chunkhdr(hdr, type, flags, length) do { \
+ struct sctp_chunkhdr *sctp_pack_chp = (struct sctp_chunkhdr *)(hdr);\
+ sctp_pack_chp->sch_type = type; \
+ sctp_pack_chp->sch_flags = flags; \
+ sctp_pack_chp->sch_length = htons(length); \
+} while (0)
+
+struct sctp_chunkhdr_init {
+ struct sctp_chunkhdr chunkhdr;
+
+ int32_t schi_itag; /* Initiate Tag */
+ int32_t schi_arwnd; /* Advertised Receiver Window Credit */
+ int16_t schi_nos; /* Number of Outbound Streams */
+ int16_t schi_nis; /* Number of Inbound Streams */
+ int32_t schi_itsn; /* Initial TSN */
+};
+
+#define sctp_pack_chunkhdr_init(hdr, type, flags, length, itag, \
+ arwnd, nos, nis, itsn) do { \
+ struct sctp_chunkhdr_init *sctp_pack_chip = (struct sctp_chunkhdr_init
*)(hdr);\
+ sctp_pack_chunkhdr(sctp_pack_chip, type, flags, length);\
+ sctp_pack_chip->schi_itag = htonl(itag); \
+ sctp_pack_chip->schi_arwnd = htonl(arwnd); \
+ sctp_pack_chip->schi_nos = htons(nos); \
+ sctp_pack_chip->schi_nis = htons(nis); \
+ sctp_pack_chip->schi_itsn = htonl(itsn); \
+} while (0)
+
+/*
+ * COOKIE ECHO chunk
+ */
+struct sctp_chunkhdr_cookie_echo {
+ struct sctp_chunkhdr chunkhdr;
+
+ /* empty */
+};
+
+#define sctp_pack_chunkhdr_cookie_echo(hdr, type, flags, length) do { \
+ struct sctp_chunkhdr_cookie_echo *sctp_pack_chip = \
+ (struct sctp_chunkhdr_cookie_echo *)(hdr); \
+ sctp_pack_chunkhdr(sctp_pack_chip, type, flags, length); \
+} while (0)
+
+#endif /* SCTP_H */
+
+
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-Makefile_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-Makefile_in
--- patches/patch-Makefile_in 17 Sep 2008 18:09:54 -0000 1.9
+++ patches/patch-Makefile_in 21 Jul 2009 18:21:04 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.9 2008/09/17 18:09:54 kili Exp $
---- Makefile.in.orig Fri Sep 5 07:32:06 2008
-+++ Makefile.in Thu Sep 11 15:32:16 2008
-@@ -180,8 +180,8 @@ install-nmap: $(TARGET)
- $(INSTALL) -c -m 644 nmap-mac-prefixes $(DESTDIR)$(nmapdatadir)/
+--- Makefile.in.orig Wed Jun 24 23:35:54 2009
++++ Makefile.in Tue Jul 21 20:16:43 2009
+@@ -217,8 +217,8 @@ $(NCATDIR)/ncat.h: nmap.h
+ sed -i -e 's/^#[ \t]*define[ \t]\+NCAT_VERSION[ \t]\+\(".*"\)/#define
NCAT_VERSION "$(NMAP_VERSION)"/' $@
# Update the version number used by Zenmap.
-$(ZENMAPDIR)/zenmapCore/Version.py
$(ZENMAPDIR)/share/zenmap/config/zenmap_version: nmap.h
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-configure,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure
--- patches/patch-configure 17 Sep 2008 18:09:54 -0000 1.9
+++ patches/patch-configure 21 Jul 2009 18:21:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.9 2008/09/17 18:09:54 kili Exp $
---- configure.orig Tue Sep 9 01:37:03 2008
-+++ configure Mon Sep 15 09:30:03 2008
-@@ -6688,6 +6688,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+--- configure.orig Wed Jun 24 23:35:54 2009
++++ configure Tue Jul 21 19:57:38 2009
+@@ -7108,6 +7108,7 @@ cat >>conftest.$ac_ext <<_ACEOF
extern char pcap_version[];
int main() {
int major, minor1, minor2;
@@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.9 2008/09/
sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
if (major > 0)
exit(0);
-@@ -7008,7 +7009,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -7439,7 +7440,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -18,12 +18,12 @@ $OpenBSD: patch-configure,v 1.9 2008/09/
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -7203,7 +7204,7 @@ if test $have_pcre != yes ; then
+@@ -7640,7 +7641,7 @@ if test $have_pcre != yes ; then
else
# We only need to check for and use this if we are NOT using included pcre
-for ac_header in pcre/pcre.h
+for ac_header in pcre.h
do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
Index: patches/patch-ndiff_setup_py
===================================================================
RCS file: patches/patch-ndiff_setup_py
diff -N patches/patch-ndiff_setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ndiff_setup_py 21 Jul 2009 18:21:04 -0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- ndiff/setup.py.orig Tue Jul 21 20:17:10 2009
++++ ndiff/setup.py Tue Jul 21 20:17:18 2009
+@@ -29,5 +29,5 @@ class checked_install(distutils.command.install.instal
+ + "Installing your distribution's python-dev package may
solve this problem.")
+
+ distutils.core.setup(name = u"ndiff", scripts = [u"ndiff"],
+- data_files = [(u"share/man/man1", [u"docs/ndiff.1"])],
++ data_files = [(u"man/man1", [u"docs/ndiff.1"])],
+ cmdclass = {"install_egg_info": null_command, "install": checked_install})
Index: patches/patch-nsock_include_nsock_h
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-nsock_include_nsock_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-nsock_include_nsock_h
--- patches/patch-nsock_include_nsock_h 17 Sep 2008 18:09:54 -0000 1.3
+++ patches/patch-nsock_include_nsock_h 21 Jul 2009 18:21:04 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-nsock_include_nsock_h,v 1.3 2008/09/17 18:09:54 kili Exp $
---- nsock/include/nsock.h.orig Mon Jul 14 21:37:26 2008
-+++ nsock/include/nsock.h Thu Sep 11 15:32:16 2008
+--- nsock/include/nsock.h.orig Sat May 30 01:19:07 2009
++++ nsock/include/nsock.h Tue Jul 21 19:57:38 2009
@@ -79,6 +79,8 @@
extern "C" {
#endif
@@ -10,7 +10,7 @@ $OpenBSD: patch-nsock_include_nsock_h,v
/* The read calls will generally return after reading at least this
* much data so that the caller can process it and so that the
* connection spewing data doesn't monopolize resources. The caller
-@@ -523,7 +525,7 @@ nsock_event_id nsock_pcap_read_packet(nsock_pool nsp,
+@@ -542,7 +544,7 @@ nsock_event_id nsock_pcap_read_packet(nsock_pool nsp,
void nse_readpcap(nsock_event nsee,
const unsigned char **l2_data, size_t *l2_len,
const unsigned char **l3_data, size_t *l3_len,
Index: patches/patch-nsock_src_nsock_pcap_c
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-nsock_src_nsock_pcap_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-nsock_src_nsock_pcap_c
--- patches/patch-nsock_src_nsock_pcap_c 25 Jan 2008 01:21:17 -0000
1.1
+++ patches/patch-nsock_src_nsock_pcap_c 21 Jul 2009 18:21:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-nsock_src_nsock_pcap_c,v 1.1 2008/01/25 01:21:17 okan Exp $
---- nsock/src/nsock_pcap.c.orig Mon Jan 14 17:10:14 2008
-+++ nsock/src/nsock_pcap.c Mon Jan 14 17:10:31 2008
-@@ -324,7 +324,7 @@ int do_actual_pcap_read(msevent *nse)
+--- nsock/src/nsock_pcap.c.orig Wed Mar 4 04:08:33 2009
++++ nsock/src/nsock_pcap.c Tue Jul 21 19:57:38 2009
+@@ -325,7 +325,7 @@ int do_actual_pcap_read(msevent *nse)
void nse_readpcap(nsock_event nsee,
const unsigned char **l2_data, size_t *l2_len,
const unsigned char **l3_data, size_t *l3_len,
Index: patches/patch-nsock_src_nsock_pcap_h
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-nsock_src_nsock_pcap_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-nsock_src_nsock_pcap_h
--- patches/patch-nsock_src_nsock_pcap_h 17 Sep 2008 18:09:54 -0000
1.2
+++ patches/patch-nsock_src_nsock_pcap_h 21 Jul 2009 18:21:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-nsock_src_nsock_pcap_h,v 1.2 2008/09/17 18:09:54 kili Exp $
---- nsock/src/nsock_pcap.h.orig Wed Aug 13 09:02:22 2008
-+++ nsock/src/nsock_pcap.h Thu Sep 11 15:32:17 2008
-@@ -72,7 +72,7 @@ typedef struct{
+--- nsock/src/nsock_pcap.h.orig Wed Mar 4 04:08:33 2009
++++ nsock/src/nsock_pcap.h Tue Jul 21 19:57:38 2009
+@@ -75,7 +75,7 @@ typedef struct{
typedef struct{
Index: patches/patch-scan-engine_cc
===================================================================
RCS file: patches/patch-scan-engine_cc
diff -N patches/patch-scan-engine_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-scan-engine_cc 21 Jul 2009 18:21:04 -0000
@@ -0,0 +1,26 @@
+--- scan_engine.cc.orig Wed Jun 24 23:35:54 2009
++++ scan_engine.cc Tue Jul 21 19:57:38 2009
+@@ -107,6 +107,7 @@
+ #include <math.h>
+ #include <list>
+ #include <map>
++#include "sctp.h"
+
+ using namespace std;
+ extern NmapOps o;
+@@ -5061,13 +5062,13 @@ static void begin_sniffer(UltraScanInfo *USI, vector<T
+ if (doIndividual){
+ pcap_filter="dst host ";
+ pcap_filter+=inet_ntoa(Targets[0]->v4source());
+- pcap_filter+=" and (icmp or ((tcp or udp or sctp) and (";
++ pcap_filter+=" and (icmp or ((tcp or udp) and (";
+ pcap_filter+=dst_hosts;
+ pcap_filter+=")))";
+ }else{
+ pcap_filter="dst host ";
+ pcap_filter+=inet_ntoa(Targets[0]->v4source());
+- pcap_filter+=" and (icmp or tcp or udp or sctp)";
++ pcap_filter+=" and (icmp or tcp or udp)";
+ }
+ }else assert(0);
+ if (o.debugging > 2) log_write(LOG_PLAIN, "Pcap filter: %s\n",
pcap_filter.c_str());
Index: patches/patch-tcpip_cc
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-tcpip_cc,v
retrieving revision 1.9
diff -u -p -r1.9 patch-tcpip_cc
--- patches/patch-tcpip_cc 17 Sep 2008 18:09:54 -0000 1.9
+++ patches/patch-tcpip_cc 21 Jul 2009 18:21:04 -0000
@@ -1,7 +1,15 @@
-$OpenBSD: patch-tcpip_cc,v 1.9 2008/09/17 18:09:54 kili Exp $
---- tcpip.cc.orig Thu Sep 4 16:41:59 2008
-+++ tcpip.cc Thu Sep 11 15:32:17 2008
-@@ -2244,7 +2244,7 @@ bool pcap_selectable_fd_valid() {
+--- tcpip.cc.orig Wed Jun 24 23:35:54 2009
++++ tcpip.cc Tue Jul 21 19:57:38 2009
+@@ -127,6 +127,8 @@
+ #endif /* NETINET_IF_ETHER_H */
+ #endif /* HAVE_NETINET_IF_ETHER_H */
+
++#include "sctp.h"
++
+ extern NmapOps o;
+
+ #ifdef WIN32
+@@ -2314,7 +2316,7 @@ bool pcap_selectable_fd_valid() {
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) {
Index: patches/patch-traceroute_cc
===================================================================
RCS file: patches/patch-traceroute_cc
diff -N patches/patch-traceroute_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-traceroute_cc 21 Jul 2009 18:21:04 -0000
@@ -0,0 +1,10 @@
+--- traceroute.cc.orig Fri Jul 17 22:43:30 2009
++++ traceroute.cc Fri Jul 17 22:44:21 2009
+@@ -172,6 +172,7 @@
+ #include "utils.h"
+ #include <algorithm>
+ #include <stdlib.h>
++#include "sctp.h"
+
+ using namespace std;
+ extern NmapOps o;
Index: patches/patch-zenmap_install_scripts_unix_su-to-zenmap_sh
===================================================================
RCS file:
/cvs/ports/net/nmap/patches/patch-zenmap_install_scripts_unix_su-to-zenmap_sh,v
retrieving revision 1.1
diff -u -p -r1.1 patch-zenmap_install_scripts_unix_su-to-zenmap_sh
--- patches/patch-zenmap_install_scripts_unix_su-to-zenmap_sh 17 Sep 2008
18:09:54 -0000 1.1
+++ patches/patch-zenmap_install_scripts_unix_su-to-zenmap_sh 21 Jul 2009
18:21:04 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-zenmap_install_scripts_unix_su-to-zenmap_sh,v 1.1 2008/09/17
18:09:54 kili Exp $
---- zenmap/install_scripts/unix/su-to-zenmap.sh.orig Fri Aug 29 01:32:36 2008
-+++ zenmap/install_scripts/unix/su-to-zenmap.sh Mon Sep 15 09:38:05 2008
+--- zenmap/install_scripts/unix/su-to-zenmap.sh.orig Sun May 3 06:33:50 2009
++++ zenmap/install_scripts/unix/su-to-zenmap.sh Tue Jul 21 20:11:45 2009
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@@ -12,14 +12,14 @@ $OpenBSD: patch-zenmap_install_scripts_u
if which kdesu >/dev/null 2>&1 ; then
SU_TO_ROOT_X=kdesu
- elif test -x /usr/lib/kde4/libexec/kdesu ; then
-+ elif test -x ${LOCALBASE}/lib/kde4/libexec/kdesu ; then
++ elif test -x /usr/local/lib/kde4/libexec/kdesu ; then
SU_TO_ROOT_X=kde4su
fi;
fi;
elif which kdesu >/dev/null 2>&1 ; then
SU_TO_ROOT_X=kdesu
- elif test -x /usr/lib/kde4/libexec/kdesu ; then
-+ elif test -x ${LOCALBASE}/lib/kde4/libexec/kdesu ; then
++ elif test -x /usr/local/lib/kde4/libexec/kdesu ; then
SU_TO_ROOT_X=kde4su
elif which ktsuss >/dev/null 2>&1 ; then
SU_TO_ROOT_X=ktsuss
@@ -28,7 +28,7 @@ $OpenBSD: patch-zenmap_install_scripts_u
gksu) gksu -u "$PRIV" "$COMMAND";;
kdesu) kdesu -u "$PRIV" "$COMMAND";;
- kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
-+ kde4su) ${LOCALBASE}/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
++ kde4su) /usr/local/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
# As a last resort, open a new xterm use sudo/su
sdterm) xterm -e "sudo -u $PRIV $COMMAND";;
Index: patches/patch-zenmap_setup_py
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-zenmap_setup_py,v
retrieving revision 1.5
diff -u -p -r1.5 patch-zenmap_setup_py
--- patches/patch-zenmap_setup_py 17 Sep 2008 18:09:54 -0000 1.5
+++ patches/patch-zenmap_setup_py 21 Jul 2009 18:21:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-zenmap_setup_py,v 1.5 2008/09/17 18:09:54 kili Exp $
---- zenmap/setup.py.orig Fri Sep 12 06:41:38 2008
-+++ zenmap/setup.py Tue Sep 16 08:54:24 2008
-@@ -126,12 +126,11 @@ def path_strip_prefix(path, prefix):
+--- zenmap/setup.py.orig Thu May 28 08:26:49 2009
++++ zenmap/setup.py Tue Jul 21 19:57:38 2009
+@@ -125,12 +125,11 @@ def path_strip_prefix(path, prefix):
class my_install(install):
def run(self):
@@ -15,7 +15,7 @@ $OpenBSD: patch-zenmap_setup_py,v 1.5 20
self.write_installed_files()
def get_installed_files(self):
-@@ -285,17 +284,10 @@ for dir in dirs:
+@@ -284,17 +283,10 @@ for dir in dirs:
"MISC_DIR": os.path.join(self.prefix, misc_dir),
"PIXMAPS_DIR": os.path.join(self.prefix,
pixmaps_dir)}
@@ -36,7 +36,7 @@ $OpenBSD: patch-zenmap_setup_py,v 1.5 20
# Replace the path definitions.
for path, replacement in interesting_paths.items():
-@@ -316,11 +308,6 @@ for dir in dirs:
+@@ -315,11 +307,6 @@ for dir in dirs:
desktop_filename = None
root_desktop_filename = None
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PFRAG.shared-main,v
retrieving revision 1.6
diff -u -p -r1.6 PFRAG.shared-main
--- pkg/PFRAG.shared-main 17 Sep 2008 18:09:54 -0000 1.6
+++ pkg/PFRAG.shared-main 21 Jul 2009 18:21:05 -0000
@@ -5,65 +5,86 @@ share/nmap/nselib/comm.lua
share/nmap/nselib/datafiles.lua
share/nmap/nselib/dns.lua
share/nmap/nselib/http.lua
+share/nmap/nselib/imap.lua
share/nmap/nselib/ipOps.lua
share/nmap/nselib/listop.lua
share/nmap/nselib/match.lua
+share/nmap/nselib/msrpc.lua
+share/nmap/nselib/msrpcperformance.lua
+share/nmap/nselib/msrpctypes.lua
+share/nmap/nselib/netbios.lua
+share/nmap/nselib/nsedebug.lua
share/nmap/nselib/packet.lua
share/nmap/nselib/pop3.lua
share/nmap/nselib/shortport.lua
+share/nmap/nselib/smb.lua
+share/nmap/nselib/smbauth.lua
share/nmap/nselib/snmp.lua
+share/nmap/nselib/ssh1.lua
+share/nmap/nselib/ssh2.lua
share/nmap/nselib/stdnse.lua
share/nmap/nselib/strbuf.lua
share/nmap/nselib/tab.lua
share/nmap/nselib/unpwdb.lua
share/nmap/nselib/url.lua
share/nmap/scripts/
-share/nmap/scripts/ASN.nse
-share/nmap/scripts/HTTPAuth.nse
-share/nmap/scripts/HTTP_open_proxy.nse
-share/nmap/scripts/HTTPpasswd.nse
-share/nmap/scripts/HTTPtrace.nse
-share/nmap/scripts/MSSQLm.nse
-share/nmap/scripts/MySQLinfo.nse
-share/nmap/scripts/PPTPversion.nse
-share/nmap/scripts/RealVNC_auth_bypass.nse
-share/nmap/scripts/SMTP_openrelay_test.nse
-share/nmap/scripts/SMTPcommands.nse
-share/nmap/scripts/SNMPcommunitybrute.nse
-share/nmap/scripts/SNMPsysdescr.nse
-share/nmap/scripts/SQLInject.nse
-share/nmap/scripts/SSHv1-support.nse
-share/nmap/scripts/SSLv2-support.nse
-share/nmap/scripts/UPnP-info.nse
-share/nmap/scripts/anonFTP.nse
-share/nmap/scripts/brutePOP3.nse
-share/nmap/scripts/bruteTelnet.nse
-share/nmap/scripts/chargenTest.nse
-share/nmap/scripts/daytimeTest.nse
-share/nmap/scripts/dns-safe-recursion-port.nse
-share/nmap/scripts/dns-safe-recursion-txid.nse
-share/nmap/scripts/dns-test-open-recursion.nse
-share/nmap/scripts/echoTest.nse
+share/nmap/scripts/asn-query.nse
+share/nmap/scripts/auth-owners.nse
+share/nmap/scripts/auth-spoof.nse
+share/nmap/scripts/banner.nse
+share/nmap/scripts/daytime.nse
+share/nmap/scripts/dns-random-srcport.nse
+share/nmap/scripts/dns-random-txid.nse
+share/nmap/scripts/dns-recursion.nse
+share/nmap/scripts/dns-zone-transfer.nse
share/nmap/scripts/finger.nse
-share/nmap/scripts/ftpbounce.nse
-share/nmap/scripts/iax2Detect.nse
-share/nmap/scripts/ircServerInfo.nse
-share/nmap/scripts/ircZombieTest.nse
+share/nmap/scripts/ftp-anon.nse
+share/nmap/scripts/ftp-bounce.nse
+share/nmap/scripts/ftp-brute.nse
+share/nmap/scripts/html-title.nse
+share/nmap/scripts/http-auth.nse
+share/nmap/scripts/http-iis-webdav-vuln.nse
+share/nmap/scripts/http-open-proxy.nse
+share/nmap/scripts/http-passwd.nse
+share/nmap/scripts/http-trace.nse
+share/nmap/scripts/iax2-version.nse
+share/nmap/scripts/imap-capabilities.nse
+share/nmap/scripts/irc-info.nse
+share/nmap/scripts/ms-sql-info.nse
+share/nmap/scripts/mysql-info.nse
share/nmap/scripts/nbstat.nse
-share/nmap/scripts/netbios-smb-os-discovery.nse
-share/nmap/scripts/popcapa.nse
-share/nmap/scripts/promiscuous.nse
-share/nmap/scripts/ripeQuery.nse
-share/nmap/scripts/robots.nse
+share/nmap/scripts/p2p-conficker.nse
+share/nmap/scripts/pop3-brute.nse
+share/nmap/scripts/pop3-capabilities.nse
+share/nmap/scripts/pptp-version.nse
+share/nmap/scripts/realvnc-auth-bypass.nse
+share/nmap/scripts/robots.txt.nse
share/nmap/scripts/rpcinfo.nse
share/nmap/scripts/script.db
-share/nmap/scripts/showHTMLTitle.nse
-share/nmap/scripts/showHTTPVersion.nse
-share/nmap/scripts/showOwner.nse
-share/nmap/scripts/showSMTPVersion.nse
-share/nmap/scripts/showSSHVersion.nse
-share/nmap/scripts/skype_v2-version.nse
-share/nmap/scripts/strangeSMTPport.nse
+share/nmap/scripts/skypev2-version.nse
+share/nmap/scripts/smb-brute.nse
+share/nmap/scripts/smb-check-vulns.nse
+share/nmap/scripts/smb-enum-domains.nse
+share/nmap/scripts/smb-enum-processes.nse
+share/nmap/scripts/smb-enum-sessions.nse
+share/nmap/scripts/smb-enum-shares.nse
+share/nmap/scripts/smb-enum-users.nse
+share/nmap/scripts/smb-os-discovery.nse
+share/nmap/scripts/smb-pwdump.nse
+share/nmap/scripts/smb-security-mode.nse
+share/nmap/scripts/smb-server-stats.nse
+share/nmap/scripts/smb-system-info.nse
+share/nmap/scripts/smtp-commands.nse
+share/nmap/scripts/smtp-open-relay.nse
+share/nmap/scripts/smtp-strangeport.nse
+share/nmap/scripts/sniffer-detect.nse
+share/nmap/scripts/snmp-brute.nse
+share/nmap/scripts/snmp-sysdescr.nse
+share/nmap/scripts/socks-open-proxy.nse
+share/nmap/scripts/sql-injection.nse
+share/nmap/scripts/ssh-hostkey.nse
+share/nmap/scripts/sshv1.nse
+share/nmap/scripts/sslv2.nse
+share/nmap/scripts/telnet-brute.nse
+share/nmap/scripts/upnp-info.nse
share/nmap/scripts/whois.nse
-share/nmap/scripts/xamppDefaultPass.nse
-share/nmap/scripts/zoneTrans.nse
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 17 Jun 2008 21:18:03 -0000 1.2
+++ pkg/PLIST-main 21 Jul 2009 18:21:05 -0000
@@ -1,8 +1,17 @@
@comment $OpenBSD: PLIST-main,v 1.2 2008/06/17 21:18:03 steven Exp $
@pkgpath net/nmap
@pkgpath net/nmap,no_x11
+...@bin bin/ncat
+bin/ndiff
@bin bin/nmap
+lib/python${MODPY_VERSION}/
+lib/python${MODPY_VERSION}/site-packages/
+...@man man/man1/ncat.1
+...@man man/man1/ndiff.1
@man man/man1/nmap.1
+share/applications/
+share/ncat/
+share/ncat/ca-bundle.crt
share/nmap/
share/nmap/nmap-mac-prefixes
share/nmap/nmap-os-db
@@ -13,3 +22,4 @@ share/nmap/nmap-services
share/nmap/nmap.dtd
share/nmap/nmap.xsl
%%SHARED%%
+share/nmap/nse_main.lua
Index: pkg/PLIST-zenmap
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PLIST-zenmap,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-zenmap
--- pkg/PLIST-zenmap 21 Jan 2009 17:58:48 -0000 1.7
+++ pkg/PLIST-zenmap 21 Jul 2009 18:21:05 -0000
@@ -58,6 +58,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/NodeWindow.pyc
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/RadialNet.py
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/RadialNet.pyc
+lib/python${MODPY_VERSION}/site-packages/radialnet/gui/SaveDialog.py
+lib/python${MODPY_VERSION}/site-packages/radialnet/gui/SaveDialog.pyc
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/Toolbar.py
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/Toolbar.pyc
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/__init__.py
@@ -81,8 +83,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zenmapCore/BugRegister.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapCore/Diff.py
lib/python${MODPY_VERSION}/site-packages/zenmapCore/Diff.pyc
-lib/python${MODPY_VERSION}/site-packages/zenmapCore/DiffHtml.py
-lib/python${MODPY_VERSION}/site-packages/zenmapCore/DiffHtml.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapCore/I18N.py
lib/python${MODPY_VERSION}/site-packages/zenmapCore/I18N.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapCore/Name.py
@@ -174,8 +174,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/TargetCombo.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/TopologyPage.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/TopologyPage.pyc
-lib/python${MODPY_VERSION}/site-packages/zenmapGUI/Wizard.py
-lib/python${MODPY_VERSION}/site-packages/zenmapGUI/Wizard.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/__init__.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/higwidgets/
@@ -226,76 +224,64 @@ share/zenmap/config/zenmap_version
share/zenmap/docs/
share/zenmap/docs/help.html
share/zenmap/locale/
+share/zenmap/locale/de/
+share/zenmap/locale/de/LC_MESSAGES/
+share/zenmap/locale/de/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/fr/
+share/zenmap/locale/fr/LC_MESSAGES/
+share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/hr/
+share/zenmap/locale/hr/LC_MESSAGES/
+share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
share/zenmap/locale/pt_BR/
share/zenmap/locale/pt_BR/LC_MESSAGES/
-share/zenmap/locale/pt_BR/LC_MESSAGES/umit.mo
+share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo
share/zenmap/misc/
-share/zenmap/misc/options.xml
share/zenmap/misc/profile_editor.xml
-share/zenmap/misc/wizard.xml
share/zenmap/pixmaps/
-share/zenmap/pixmaps/default.svg
share/zenmap/pixmaps/default_32.png
share/zenmap/pixmaps/default_75.png
-share/zenmap/pixmaps/freebsd.svg
share/zenmap/pixmaps/freebsd_32.png
share/zenmap/pixmaps/freebsd_75.png
-share/zenmap/pixmaps/irix.svg
share/zenmap/pixmaps/irix_32.png
share/zenmap/pixmaps/irix_75.png
-share/zenmap/pixmaps/linux.svg
share/zenmap/pixmaps/linux_32.png
share/zenmap/pixmaps/linux_75.png
-share/zenmap/pixmaps/macosx.svg
share/zenmap/pixmaps/macosx_32.png
share/zenmap/pixmaps/macosx_75.png
-share/zenmap/pixmaps/openbsd.svg
share/zenmap/pixmaps/openbsd_32.png
share/zenmap/pixmaps/openbsd_75.png
share/zenmap/pixmaps/radialnet/
share/zenmap/pixmaps/radialnet/border.png
-share/zenmap/pixmaps/radialnet/close.png
-share/zenmap/pixmaps/radialnet/collapse.png
-share/zenmap/pixmaps/radialnet/expand.png
share/zenmap/pixmaps/radialnet/firewall.png
share/zenmap/pixmaps/radialnet/logo.png
-share/zenmap/pixmaps/radialnet/logo.svg
share/zenmap/pixmaps/radialnet/padlock.png
share/zenmap/pixmaps/radialnet/router.png
share/zenmap/pixmaps/radialnet/switch.png
share/zenmap/pixmaps/radialnet/wireless.png
-share/zenmap/pixmaps/redhat.svg
share/zenmap/pixmaps/redhat_32.png
share/zenmap/pixmaps/redhat_75.png
-share/zenmap/pixmaps/solaris.svg
share/zenmap/pixmaps/solaris_32.png
share/zenmap/pixmaps/solaris_75.png
share/zenmap/pixmaps/splash.png
-share/zenmap/pixmaps/ubuntu.svg
+share/zenmap/pixmaps/throbber.gif
+share/zenmap/pixmaps/throbber.png
share/zenmap/pixmaps/ubuntu_32.png
share/zenmap/pixmaps/ubuntu_75.png
-share/zenmap/pixmaps/unknown.svg
share/zenmap/pixmaps/unknown_32.png
share/zenmap/pixmaps/unknown_75.png
-share/zenmap/pixmaps/vl_1.svg
share/zenmap/pixmaps/vl_1_32.png
share/zenmap/pixmaps/vl_1_75.png
-share/zenmap/pixmaps/vl_2.svg
share/zenmap/pixmaps/vl_2_32.png
share/zenmap/pixmaps/vl_2_75.png
-share/zenmap/pixmaps/vl_3.svg
share/zenmap/pixmaps/vl_3_32.png
share/zenmap/pixmaps/vl_3_75.png
-share/zenmap/pixmaps/vl_4.svg
share/zenmap/pixmaps/vl_4_32.png
share/zenmap/pixmaps/vl_4_75.png
-share/zenmap/pixmaps/vl_5.svg
share/zenmap/pixmaps/vl_5_32.png
share/zenmap/pixmaps/vl_5_75.png
-share/zenmap/pixmaps/win.svg
share/zenmap/pixmaps/win_32.png
share/zenmap/pixmaps/win_75.png
-share/zenmap/pixmaps/wizard_logo.png
share/zenmap/pixmaps/zenmap.png
share/zenmap/su-to-zenmap.sh
@exec %D/bin/update-desktop-database
