On 2009/04/03 11:49, Stuart Henderson wrote:
> On 2009/04/03 10:03, Giovanni Bechis wrote:
> (offlist, replying back on-list with permission mainly to discuss the
> desktop-file-utils thing below)
>
> > Stuart Henderson wrote:
> >> Here's a diff updating the nmap port to 4.85BETA6, which comes with
> >> a conficker scanner.
>
> updated diff below.
helps if i remember "cvs add", thanks giovanni:
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.82
diff -N -u -p Makefile
--- Makefile 21 Jan 2009 17:58:48 -0000 1.82
+++ Makefile 3 Apr 2009 11:16:50 -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= 4.85BETA6
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/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nmap/distinfo,v
retrieving revision 1.22
diff -N -u -p distinfo
--- distinfo 17 Sep 2008 18:09:54 -0000 1.22
+++ distinfo 3 Apr 2009 11:16:50 -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-4.85BETA6.tgz) = M68qmAMrLmYXzqjeI4COZA==
+RMD160 (nmap-4.85BETA6.tgz) = BqAj6Z8woINfHD808cK3/Rj2BaE=
+SHA1 (nmap-4.85BETA6.tgz) = nOLbFapaoTmSQNgIN6DHaQRGuGs=
+SHA256 (nmap-4.85BETA6.tgz) = qBH0LoiDYMPVS/1ft6Q9rT7iMDjSiy7d58NYP7RcDDY=
+SIZE (nmap-4.85BETA6.tgz) = 7297149
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-Makefile_in,v
retrieving revision 1.9
diff -N -u -p patches/patch-Makefile_in
--- patches/patch-Makefile_in 17 Sep 2008 18:09:54 -0000 1.9
+++ patches/patch-Makefile_in 3 Apr 2009 11:16:50 -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 Thu Mar 26 22:51:20 2009
++++ Makefile.in Wed Apr 1 14:56:16 2009
+@@ -208,8 +208,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 -N -u -p patches/patch-configure
--- patches/patch-configure 17 Sep 2008 18:09:54 -0000 1.9
+++ patches/patch-configure 3 Apr 2009 11:16:50 -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 Fri Jan 30 05:29:08 2009
++++ configure Wed Apr 1 14:56:16 2009
+@@ -6923,6 +6923,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/17 18:09:54 ki
sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
if (major > 0)
exit(0);
-@@ -7008,7 +7009,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -7243,7 +7244,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.9 2008/09/17 18:09:54 ki
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -7203,7 +7204,7 @@ if test $have_pcre != yes ; then
+@@ -7438,7 +7439,7 @@ if test $have_pcre != yes ; then
else
# We only need to check for and use this if we are NOT using included pcre
Index: patches/patch-ndiff_setup_py
===================================================================
RCS file: patches/patch-ndiff_setup_py
diff -N -u -p patches/patch-ndiff_setup_py
--- /dev/null 3 Apr 2009 11:16:50 -0000
+++ patches/patch-ndiff_setup_py 3 Apr 2009 11:16:50 -0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- ndiff/setup.py.orig Fri Apr 3 11:28:55 2009
++++ ndiff/setup.py Fri Apr 3 11:29:01 2009
+@@ -15,5 +15,5 @@ class null_command(Command):
+ pass
+
+ 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})
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 -N -u -p patches/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 3 Apr 2009 11:16:50 -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 03:08:33 2009
++++ nsock/src/nsock_pcap.c Wed Apr 1 14:56:16 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 -N -u -p patches/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 3 Apr 2009 11:16:50 -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 03:08:33 2009
++++ nsock/src/nsock_pcap.h Wed Apr 1 14:56:16 2009
+@@ -75,7 +75,7 @@ typedef struct{
typedef struct{
Index: patches/patch-tcpip_cc
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-tcpip_cc,v
retrieving revision 1.9
diff -N -u -p patches/patch-tcpip_cc
--- patches/patch-tcpip_cc 17 Sep 2008 18:09:54 -0000 1.9
+++ patches/patch-tcpip_cc 3 Apr 2009 11:16:50 -0000
@@ -1,7 +1,7 @@
$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 Tue Mar 31 05:16:12 2009
++++ tcpip.cc Wed Apr 1 14:56:16 2009
+@@ -2237,7 +2237,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: pkg/PFRAG.shared-main
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PFRAG.shared-main,v
retrieving revision 1.6
diff -N -u -p pkg/PFRAG.shared-main
--- pkg/PFRAG.shared-main 17 Sep 2008 18:09:54 -0000 1.6
+++ pkg/PFRAG.shared-main 3 Apr 2009 11:16:50 -0000
@@ -8,62 +8,78 @@ share/nmap/nselib/http.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-open-proxy.nse
+share/nmap/scripts/http-passwd.nse
+share/nmap/scripts/http-trace.nse
+share/nmap/scripts/iax2-version.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/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/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 -N -u -p pkg/PLIST-main
--- pkg/PLIST-main 17 Jun 2008 21:18:03 -0000 1.2
+++ pkg/PLIST-main 3 Apr 2009 11:16:50 -0000
@@ -1,8 +1,13 @@
@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 bin/nmap
+...@comment lib/python${MODPY_VERSION}/
+...@comment lib/python${MODPY_VERSION}/site-packages/
+...@man man/man1/ncat.1
@man man/man1/nmap.1
+...@comment share/applications/
share/nmap/
share/nmap/nmap-mac-prefixes
share/nmap/nmap-os-db
Index: pkg/PLIST-zenmap
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PLIST-zenmap,v
retrieving revision 1.7
diff -N -u -p pkg/PLIST-zenmap
--- pkg/PLIST-zenmap 21 Jan 2009 17:58:48 -0000 1.7
+++ pkg/PLIST-zenmap 3 Apr 2009 11:16:50 -0000
@@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST-zenmap,v 1.7 2009/01/21 17:58:48 giovanni Exp $
+bin/ndiff
bin/nmapfe
bin/xnmap
bin/zenmap
-...@comment lib/python${MODPY_VERSION}/
-...@comment lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/radialnet/
lib/python${MODPY_VERSION}/site-packages/radialnet/__init__.py
lib/python${MODPY_VERSION}/site-packages/radialnet/__init__.pyc
@@ -81,8 +80,6 @@ lib/python${MODPY_VERSION}/site-packages/zenmapCore/Bu
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
@@ -215,6 +212,7 @@ lib/python${MODPY_VERSION}/site-packages/zenmapGUI/hig
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/higwidgets/higwindows.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/higwidgets/utils.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/higwidgets/utils.pyc
+...@man man/man1/ndiff.1
@man man/man1/zenmap.1
share/applications/zenmap-root.desktop
share/applications/zenmap.desktop
@@ -226,11 +224,19 @@ 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/
@@ -254,9 +260,6 @@ 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
