cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 7.30

Browse Source 
from David Carlier with tweaks by me
This commit is contained in:
giovanni 2016-10-06 05:47:35 +00:00
parent 4fb98d7af2
commit f3ebf4c308
8 changed files with 60 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/nmap/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.121 2016/03/30 21:26:45 giovanni Exp $
# $OpenBSD: Makefile,v 1.122 2016/10/06 05:47:35 giovanni Exp $
COMMENT-main= scan ports and fingerprint stack of network hosts
COMMENT-zenmap= graphical frontend for nmap
MODPY_EGG_VERSION= 7.12
MODPY_EGG_VERSION= 7.30
DISTNAME= nmap-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
@ -23,7 +23,7 @@ MULTI_PACKAGES= -main -zenmap
USE_GMAKE= Yes
MODLUA_SA= Yes
MODLUA_VERSION= 5.2
MODLUA_VERSION= 5.3
MODULES= lang/python \
lang/lua

4
net/nmap/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nmap-7.12.tgz) = pgqQNTSTIvECaQfWfk1CTcMBHARKcz/4ci34tQKJ++4=
SIZE (nmap-7.12.tgz) = 11094463
SHA256 (nmap-7.30.tgz) = LdYrr7IGxgBe5SLhKNTpXd+4pVwLtaUz/hF0y4DjS4w=
SIZE (nmap-7.30.tgz) = 11106693

14
net/nmap/patches/patch-Makefile_in
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.16 2016/01/07 13:23:47 giovanni Exp $
--- Makefile.in.orig Tue Dec 8 21:54:07 2015
+++ Makefile.in Tue Dec 29 10:47:48 2015
$OpenBSD: patch-Makefile_in,v 1.17 2016/10/06 05:47:35 giovanni Exp $
--- Makefile.in.orig Tue Aug 16 10:31:59 2016
+++ Makefile.in Thu Sep 29 22:07:52 2016
@@ -46,7 +46,7 @@ DEFS += -D_FORTIFY_SOURCE=2
# Should only be enabled during debugging and not in any real release.
# DEFS += -DMTRACE=1
CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT)
-CPPFLAGS = @CPPFLAGS@ $(DEFS)
+CPPFLAGS = -I./libdnet-stripped/include @CPPFLAGS@ $(DEFS)
export CFLAGS = $(CXXFLAGS)
# CFLAGS = $(DEFS) $(INCLS)
+CPPFLAGS = -I../libdnet-stripped/include @CPPFLAGS@ $(DEFS)
CFLAGS = @CFLAGS@ $(DBGFLAGS) $(CCOPT)
STATIC =
@@ -319,8 +319,8 @@ $(NPINGDIR)/nping.h: nmap.h
LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC)
@@ -318,8 +318,8 @@ $(NPINGDIR)/nping.h: nmap.h
mv -f $@.tmp $@
# Update the version number used by Zenmap.

20
net/nmap/patches/patch-libnetutil_netutil_cc
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-libnetutil_netutil_cc,v 1.8 2016/03/18 21:13:38 giovanni Exp $
$OpenBSD: patch-libnetutil_netutil_cc,v 1.9 2016/10/06 05:47:35 giovanni Exp $
first chunk:
http://marc.info/?l=openbsd-ports&m=140284432321370&w=2
@ -8,9 +8,9 @@ http://marc.info/?l=nmap-dev&m=140179174718457&w=2
chunks dealing with iovec: ???
--- libnetutil/netutil.cc.orig Thu Mar 17 20:17:27 2016
+++ libnetutil/netutil.cc Thu Mar 17 20:19:47 2016
@@ -3142,7 +3142,6 @@ static int route_dst_netlink(const struct sockaddr_sto
--- libnetutil/netutil.cc.orig Thu Aug 25 19:41:03 2016
+++ libnetutil/netutil.cc Thu Sep 29 22:04:48 2016
@@ -3172,7 +3172,6 @@ static int route_dst_netlink(const struct sockaddr_sto
const struct sockaddr_storage *spoofss) {
struct sockaddr_nl snl;
struct msghdr msg;
@ -18,7 +18,7 @@ chunks dealing with iovec: ???
struct nlmsghdr *nlmsg;
struct rtmsg *rtmsg;
struct rtattr *rtattr;
@@ -3194,22 +3193,14 @@ static int route_dst_netlink(const struct sockaddr_sto
@@ -3224,22 +3223,14 @@ static int route_dst_netlink(const struct sockaddr_sto
add_rtattr_addr(nlmsg, &rtattr, &len, RTA_SRC, spoofss, intf_index);
}
@ -41,7 +41,7 @@ chunks dealing with iovec: ???
len = recvmsg(fd, &msg, 0);
if (len <= 0)
netutil_fatal("%s: cannot recvmsg: %s", __func__, strerror(errno));
@@ -3840,7 +3831,6 @@ static const unsigned char *add_exthdr_ancillary(struc
@@ -3870,7 +3861,6 @@ static const unsigned char *add_exthdr_ancillary(struc
static int send_ipv6_ip(const struct sockaddr_in6 *dst,
const unsigned char *packet, size_t packetlen) {
struct msghdr msg;
@ -49,7 +49,7 @@ chunks dealing with iovec: ???
const unsigned char *end;
struct ip6_hdr *hdr;
@@ -3859,8 +3849,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
@@ -3889,8 +3879,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
/* Set up sendmsg data structure. iov is filled in below. */
msg.msg_name = (void *) dst;
msg.msg_namelen = sizeof(*dst);
@ -58,7 +58,7 @@ chunks dealing with iovec: ???
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_flags = 0;
@@ -3919,8 +3907,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
@@ -3949,8 +3937,6 @@ static int send_ipv6_ip(const struct sockaddr_in6 *dst
}
assert(packet <= end);
@ -67,7 +67,7 @@ chunks dealing with iovec: ???
n = sendmsg(sd, &msg, 0);
if (n == -1)
@@ -4123,9 +4109,6 @@ int datalink_offset(int datalink)
@@ -4153,9 +4139,6 @@ int datalink_offset(int datalink)
{
if (datalink == DLT_EN10MB)
return ETH_HDR_LEN;
@ -77,7 +77,7 @@ chunks dealing with iovec: ???
else
return -1;
}
@@ -4262,10 +4245,6 @@ static bool accept_arp(const unsigned char *p, const s
@@ -4281,10 +4264,6 @@ static bool accept_arp(const unsigned char *p, const s
if (datalink == DLT_EN10MB) {
return ntohs(*((u16 *) (p + 12))) == ETH_TYPE_ARP;

8
net/nmap/patches/patch-scan-engine_cc
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-scan-engine_cc,v 1.8 2016/01/07 13:23:47 giovanni Exp $
$OpenBSD: patch-scan-engine_cc,v 1.9 2016/10/06 05:47:35 giovanni Exp $
pcap_filter changes: to deal with base libpcap which doesn't support sctp
(not currently needed as using internal libpcap)
Format changes for 64-bit time_t, should go upstream
--- scan_engine.cc.orig Wed Jun 3 15:01:29 2015
+++ scan_engine.cc Tue Dec 29 10:47:48 2015
@@ -2011,7 +2011,7 @@ void ultrascan_host_probe_update(UltraScanInfo *USI, H
--- scan_engine.cc.orig Fri Aug 19 13:38:29 2016
+++ scan_engine.cc Thu Sep 29 22:04:48 2016
@@ -2029,7 +2029,7 @@ void ultrascan_host_probe_update(UltraScanInfo *USI, H
struct timeval tv;
gettimeofday(&tv, NULL);

8
net/nmap/patches/patch-timing_cc
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-timing_cc,v 1.6 2016/03/18 21:13:38 giovanni Exp $
--- timing.cc.orig Tue Jun 23 01:09:01 2015
+++ timing.cc Thu Mar 17 20:44:33 2016
$OpenBSD: patch-timing_cc,v 1.7 2016/10/06 05:47:35 giovanni Exp $
--- timing.cc.orig Mon Aug 22 20:50:06 2016
+++ timing.cc Thu Sep 29 22:04:48 2016
@@ -125,6 +125,8 @@
/* $Id: patch-timing_cc,v 1.6 2016/03/18 21:13:38 giovanni Exp $ */
/* $Id: patch-timing_cc,v 1.7 2016/10/06 05:47:35 giovanni Exp $ */
+#include <limits>
+

28
net/nmap/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.9 2016/03/18 21:13:38 giovanni Exp $
@comment $OpenBSD: PLIST-main,v 1.10 2016/10/06 05:47:35 giovanni Exp $
@conflict ndiff-*
@pkgpath net/ndiff
@pkgpath net/nmap
@ -34,14 +34,16 @@ share/nmap/nselib/anyconnect.lua
share/nmap/nselib/asn1.lua
share/nmap/nselib/base32.lua
share/nmap/nselib/base64.lua
share/nmap/nselib/bin.luadoc
share/nmap/nselib/bit.luadoc
share/nmap/nselib/bin.lua
share/nmap/nselib/bit.lua
share/nmap/nselib/bitcoin.lua
share/nmap/nselib/bits.lua
share/nmap/nselib/bittorrent.lua
share/nmap/nselib/bjnp.lua
share/nmap/nselib/brute.lua
share/nmap/nselib/cassandra.lua
share/nmap/nselib/citrixxml.lua
share/nmap/nselib/coap.lua
share/nmap/nselib/comm.lua
share/nmap/nselib/creds.lua
share/nmap/nselib/cvs.lua
@ -93,6 +95,7 @@ share/nmap/nselib/data/vhosts-full.lst
share/nmap/nselib/data/wp-plugins.lst
share/nmap/nselib/data/wp-themes.lst
share/nmap/nselib/datafiles.lua
share/nmap/nselib/datetime.lua
share/nmap/nselib/dhcp.lua
share/nmap/nselib/dhcp6.lua
share/nmap/nselib/dns.lua
@ -112,6 +115,7 @@ share/nmap/nselib/ike.lua
share/nmap/nselib/imap.lua
share/nmap/nselib/informix.lua
share/nmap/nselib/ipOps.lua
share/nmap/nselib/ipmi.lua
share/nmap/nselib/ipp.lua
share/nmap/nselib/iscsi.lua
share/nmap/nselib/isns.lua
@ -127,6 +131,7 @@ share/nmap/nselib/match.lua
share/nmap/nselib/membase.lua
share/nmap/nselib/mobileme.lua
share/nmap/nselib/mongodb.lua
share/nmap/nselib/mqtt.lua
share/nmap/nselib/msrpc.lua
share/nmap/nselib/msrpcperformance.lua
share/nmap/nselib/msrpctypes.lua
@ -170,6 +175,7 @@ share/nmap/nselib/srvloc.lua
share/nmap/nselib/ssh1.lua
share/nmap/nselib/ssh2.lua
share/nmap/nselib/sslcert.lua
share/nmap/nselib/sslv2.lua
share/nmap/nselib/stdnse.lua
share/nmap/nselib/strbuf.lua
share/nmap/nselib/strict.lua
@ -257,6 +263,9 @@ share/nmap/scripts/citrix-enum-apps-xml.nse
share/nmap/scripts/citrix-enum-apps.nse
share/nmap/scripts/citrix-enum-servers-xml.nse
share/nmap/scripts/citrix-enum-servers.nse
share/nmap/scripts/clamav-exec.nse
share/nmap/scripts/clock-skew.nse
share/nmap/scripts/coap-resources.nse
share/nmap/scripts/couchdb-databases.nse
share/nmap/scripts/couchdb-stats.nse
share/nmap/scripts/creds-summary.nse
@ -305,6 +314,7 @@ share/nmap/scripts/finger.nse
share/nmap/scripts/firewalk.nse
share/nmap/scripts/firewall-bypass.nse
share/nmap/scripts/flume-master-info.nse
share/nmap/scripts/fox-info.nse
share/nmap/scripts/freelancer-info.nse
share/nmap/scripts/ftp-anon.nse
share/nmap/scripts/ftp-bounce.nse
@ -334,6 +344,7 @@ share/nmap/scripts/http-adobe-coldfusion-apsa1301.nse
share/nmap/scripts/http-affiliate-id.nse
share/nmap/scripts/http-apache-negotiation.nse
share/nmap/scripts/http-apache-server-status.nse
share/nmap/scripts/http-aspnet-debug.nse
share/nmap/scripts/http-auth-finder.nse
share/nmap/scripts/http-auth.nse
share/nmap/scripts/http-avaya-ipoffice-users.nse
@ -380,11 +391,13 @@ share/nmap/scripts/http-icloud-findmyiphone.nse
share/nmap/scripts/http-icloud-sendmsg.nse
share/nmap/scripts/http-iis-short-name-brute.nse
share/nmap/scripts/http-iis-webdav-vuln.nse
share/nmap/scripts/http-internal-ip-disclosure.nse
share/nmap/scripts/http-joomla-brute.nse
share/nmap/scripts/http-litespeed-sourcecode-download.nse
share/nmap/scripts/http-ls.nse
share/nmap/scripts/http-majordomo2-dir-traversal.nse
share/nmap/scripts/http-malware-host.nse
share/nmap/scripts/http-mcmp.nse
share/nmap/scripts/http-method-tamper.nse
share/nmap/scripts/http-methods.nse
share/nmap/scripts/http-mobileversion-checker.nse
@ -461,12 +474,14 @@ share/nmap/scripts/informix-brute.nse
share/nmap/scripts/informix-query.nse
share/nmap/scripts/informix-tables.nse
share/nmap/scripts/ip-forwarding.nse
share/nmap/scripts/ip-geolocation-geobytes.nse
share/nmap/scripts/ip-geolocation-geoplugin.nse
share/nmap/scripts/ip-geolocation-ipinfodb.nse
share/nmap/scripts/ip-geolocation-maxmind.nse
share/nmap/scripts/ip-https-discover.nse
share/nmap/scripts/ipidseq.nse
share/nmap/scripts/ipmi-brute.nse
share/nmap/scripts/ipmi-cipher-zero.nse
share/nmap/scripts/ipmi-version.nse
share/nmap/scripts/ipv6-multicast-mld-list.nse
share/nmap/scripts/ipv6-node-info.nse
share/nmap/scripts/ipv6-ra-flood.nse
@ -507,6 +522,7 @@ share/nmap/scripts/modbus-discover.nse
share/nmap/scripts/mongodb-brute.nse
share/nmap/scripts/mongodb-databases.nse
share/nmap/scripts/mongodb-info.nse
share/nmap/scripts/mqtt-subscribe.nse
share/nmap/scripts/mrinfo.nse
share/nmap/scripts/ms-sql-brute.nse
share/nmap/scripts/ms-sql-config.nse
@ -565,10 +581,12 @@ share/nmap/scripts/oracle-brute-stealth.nse
share/nmap/scripts/oracle-brute.nse
share/nmap/scripts/oracle-enum-users.nse
share/nmap/scripts/oracle-sid-brute.nse
share/nmap/scripts/oracle-tns-version.nse
share/nmap/scripts/ovs-agent-version.nse
share/nmap/scripts/p2p-conficker.nse
share/nmap/scripts/path-mtu.nse
share/nmap/scripts/pcanywhere-brute.nse
share/nmap/scripts/pcworx-info.nse
share/nmap/scripts/pgsql-brute.nse
share/nmap/scripts/pjl-ready-message.nse
share/nmap/scripts/pop3-brute.nse
@ -674,6 +692,7 @@ share/nmap/scripts/ssl-google-cert-catalog.nse
share/nmap/scripts/ssl-heartbleed.nse
share/nmap/scripts/ssl-known-key.nse
share/nmap/scripts/ssl-poodle.nse
share/nmap/scripts/sslv2-drown.nse
share/nmap/scripts/sslv2.nse
share/nmap/scripts/sstp-discover.nse
share/nmap/scripts/stun-info.nse
@ -708,6 +727,7 @@ share/nmap/scripts/versant-info.nse
share/nmap/scripts/vmauthd-brute.nse
share/nmap/scripts/vnc-brute.nse
share/nmap/scripts/vnc-info.nse
share/nmap/scripts/vnc-title.nse
share/nmap/scripts/voldemort-info.nse
share/nmap/scripts/vuze-dht-info.nse
share/nmap/scripts/wdb-version.nse

7
net/nmap/pkg/PLIST-zenmap
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-zenmap,v 1.16 2016/01/07 13:23:47 giovanni Exp $
@comment $OpenBSD: PLIST-zenmap,v 1.17 2016/10/06 05:47:35 giovanni Exp $
bin/nmapfe
bin/xnmap
bin/zenmap
@ -54,6 +54,8 @@ lib/python${MODPY_VERSION}/site-packages/radialnet/gui/HostsViewer.py
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/HostsViewer.pyc
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/Image.py
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/Image.pyc
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/LegendWindow.py
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/LegendWindow.pyc
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/NodeNotebook.py
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/NodeNotebook.pyc
lib/python${MODPY_VERSION}/site-packages/radialnet/gui/NodeWindow.py
@ -241,6 +243,9 @@ share/zenmap/locale/
share/zenmap/locale/de/
share/zenmap/locale/de/LC_MESSAGES/
share/zenmap/locale/de/LC_MESSAGES/zenmap.mo
share/zenmap/locale/es/
share/zenmap/locale/es/LC_MESSAGES/
share/zenmap/locale/es/LC_MESSAGES/zenmap.mo
share/zenmap/locale/fr/
share/zenmap/locale/fr/LC_MESSAGES/
share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo