Re: UPDATE net/nmap 7.30

2016-09-30 Thread Giovanni Bechis
On 09/30/16 08:31, David CARLIER wrote:
> Thanks ! here a corrected version I believe.
> Regards.
> 
egg.info line is wrong in PLIST, updated diff.
 Cheers
  Giovanni

> On 30 September 2016 at 07:09, Giovanni Bechis  wrote:
>> Python stuff should go in PLIST-zenmap, do not always trust make-plist.
>>   Cheers
>> Giovanni
>>
>> Il giorno 29 set 2016, alle ore 23:22, David CARLIER  ha
>> scritto:
>>>
>>> Hello,
>>>
>>> here an attempt to update nmap to 7.30.
>>>
>>> Regards.

Index: Makefile
===
RCS file: /var/cvs/ports/net/nmap/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile	30 Mar 2016 21:26:45 -	1.121
+++ Makefile	30 Sep 2016 14:35:25 -
@@ -3,7 +3,7 @@
 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
 
Index: distinfo
===
RCS file: /var/cvs/ports/net/nmap/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo	30 Mar 2016 21:26:45 -	1.34
+++ distinfo	30 Sep 2016 14:35:25 -
@@ -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
Index: patches/patch-Makefile_in
===
RCS file: /var/cvs/ports/net/nmap/patches/patch-Makefile_in,v
retrieving revision 1.16
diff -u -p -r1.16 patch-Makefile_in
--- patches/patch-Makefile_in	7 Jan 2016 13:23:47 -	1.16
+++ patches/patch-Makefile_in	30 Sep 2016 14:35:25 -
@@ -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
+--- 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.
Index: patches/patch-libnetutil_netutil_cc
===
RCS file: /var/cvs/ports/net/nmap/patches/patch-libnetutil_netutil_cc,v
retrieving revision 1.8
diff -u -p -r1.8 patch-libnetutil_netutil_cc
--- patches/patch-libnetutil_netutil_cc	18 Mar 2016 21:13:38 -	1.8
+++ patches/patch-libnetutil_netutil_cc	30 Sep 2016 14:35:25 -
@@ -8,9 +8,9 @@ http://marc.info/?l=nmap-dev=140179174
 
 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, , , RTA_SRC, spoofss, intf_index);
}
  
@@ -41,7 +41,7 @@ chunks dealing with iovec: ???
len = recvmsg(fd, , 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

Re: UPDATE net/nmap 7.30

2016-09-30 Thread David CARLIER
Thanks ! here a corrected version I believe.
Regards.

On 30 September 2016 at 07:09, Giovanni Bechis  wrote:
> Python stuff should go in PLIST-zenmap, do not always trust make-plist.
>   Cheers
> Giovanni
>
> Il giorno 29 set 2016, alle ore 23:22, David CARLIER  ha
> scritto:
>>
>> Hello,
>>
>> here an attempt to update nmap to 7.30.
>>
>> Regards.
Index: Makefile
===
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile30 Mar 2016 21:26:45 -  1.121
+++ Makefile30 Sep 2016 06:30:07 -
@@ -3,7 +3,7 @@
 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
 
Index: distinfo
===
RCS file: /cvs/ports/net/nmap/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo30 Mar 2016 21:26:45 -  1.34
+++ distinfo30 Sep 2016 06:30:07 -
@@ -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
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/nmap/patches/patch-Makefile_in,v
retrieving revision 1.16
diff -u -p -r1.16 patch-Makefile_in
--- patches/patch-Makefile_in   7 Jan 2016 13:23:47 -   1.16
+++ patches/patch-Makefile_in   30 Sep 2016 06:30:07 -
@@ -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.inTue Dec 29 10:47:48 2015
+--- Makefile.in.orig   Tue Aug 16 10:31:59 2016
 Makefile.inThu 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.
Index: patches/patch-libnetutil_netutil_cc
===
RCS file: /cvs/ports/net/nmap/patches/patch-libnetutil_netutil_cc,v
retrieving revision 1.8
diff -u -p -r1.8 patch-libnetutil_netutil_cc
--- patches/patch-libnetutil_netutil_cc 18 Mar 2016 21:13:38 -  1.8
+++ patches/patch-libnetutil_netutil_cc 30 Sep 2016 06:30:07 -
@@ -8,9 +8,9 @@ http://marc.info/?l=nmap-dev=140179174
 
 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, , , RTA_SRC, spoofss, intf_index);
}
  
@@ -41,7 +41,7 @@ chunks dealing with iovec: ???
len = recvmsg(fd, , 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 

Re: UPDATE net/nmap 7.30

2016-09-30 Thread Giovanni Bechis
Python stuff should go in PLIST-zenmap, do not always trust make-plist.
  Cheers
    Giovanni



Il giorno 29 set 2016, 23:22, alle ore 23:22, David CARLIER 
 ha scritto:
>Hello,
>
>here an attempt to update nmap to 7.30.
>
>Regards.


UPDATE net/nmap 7.30

2016-09-29 Thread David CARLIER
Hello,

here an attempt to update nmap to 7.30.

Regards.
Index: Makefile
===
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile30 Mar 2016 21:26:45 -  1.121
+++ Makefile29 Sep 2016 21:18:48 -
@@ -3,7 +3,7 @@
 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
 
Index: distinfo
===
RCS file: /cvs/ports/net/nmap/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo30 Mar 2016 21:26:45 -  1.34
+++ distinfo29 Sep 2016 21:18:48 -
@@ -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
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/nmap/patches/patch-Makefile_in,v
retrieving revision 1.16
diff -u -p -r1.16 patch-Makefile_in
--- patches/patch-Makefile_in   7 Jan 2016 13:23:47 -   1.16
+++ patches/patch-Makefile_in   29 Sep 2016 21:18:48 -
@@ -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.inTue Dec 29 10:47:48 2015
+--- Makefile.in.orig   Tue Aug 16 10:31:59 2016
 Makefile.inThu 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.
Index: patches/patch-libnetutil_netutil_cc
===
RCS file: /cvs/ports/net/nmap/patches/patch-libnetutil_netutil_cc,v
retrieving revision 1.8
diff -u -p -r1.8 patch-libnetutil_netutil_cc
--- patches/patch-libnetutil_netutil_cc 18 Mar 2016 21:13:38 -  1.8
+++ patches/patch-libnetutil_netutil_cc 29 Sep 2016 21:18:48 -
@@ -8,9 +8,9 @@ http://marc.info/?l=nmap-dev=140179174
 
 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, , , RTA_SRC, spoofss, intf_index);
}
  
@@ -41,7 +41,7 @@ chunks dealing with iovec: ???
len = recvmsg(fd, , 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 =