Re: wip update: net/nmap

2016-01-03 Thread Jérémie Courrèges-Anglas 
Giovanni Bechis  writes:

> On 12/29/15 21:21, Stuart Henderson wrote:
>> On 2015/12/29 11:23, Giovanni Bechis wrote:
>>> Hi,
>>> I do not use it anymore so I am dropping maintainership, anyway attached a 
>>> wip port to update it to latest version
>>> if someone wants to step over.
>> 
>> Here's a smaller diff for PLIST-zenmap for this.
>> 
> New diff with suggestions by jca@ and sthen@, new maintainer is David Carlier.
>  ok ?

ok jca@

>   Cheers
>Giovanni
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: wip update: net/nmap

2015-12-30 Thread Giovanni Bechis 
On 12/29/15 21:21, Stuart Henderson wrote:
> On 2015/12/29 11:23, Giovanni Bechis wrote:
>> Hi,
>> I do not use it anymore so I am dropping maintainership, anyway attached a 
>> wip port to update it to latest version
>> if someone wants to step over.
> 
> Here's a smaller diff for PLIST-zenmap for this.
> 
New diff with suggestions by jca@ and sthen@, new maintainer is David Carlier.
 ok ?
  Cheers
   Giovanni
Index: Makefile
===
RCS file: /var/cvs/ports/net/nmap/Makefile,v
retrieving revision 1.116
diff -u -p -r1.116 Makefile
--- Makefile	8 Oct 2015 21:19:22 -	1.116
+++ Makefile	30 Dec 2015 11:18:46 -
@@ -5,8 +5,7 @@ SHARED_ONLY=	Yes
 COMMENT-main=	scan ports and fingerprint stack of network hosts
 COMMENT-zenmap=	graphical frontend for nmap
 
-MODPY_EGG_VERSION=	6.47
-REVISION-main=		1
+MODPY_EGG_VERSION=	7.01
 DISTNAME=		nmap-${MODPY_EGG_VERSION}
 PKGNAME-main=		${DISTNAME}
 PKGNAME-zenmap=		nmap-zenmap-${MODPY_EGG_VERSION}
@@ -17,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 
 HOMEPAGE=	http://www.nmap.org/
 
-MAINTAINER=	Giovanni Bechis 
+MAINTAINER=	David Carlier 
 
 # GPL (v2 only), with additional clarifications and exceptions, see COPYING
 PERMIT_PACKAGE_CDROM=	Yes
@@ -55,8 +54,6 @@ RUN_DEPENDS-zenmap=	x11/py-gtk2 \
 			databases/py-sqlite2 \
 			devel/desktop-file-utils \
 			net/nmap
-
-NO_TEST=		Yes
 
 post-extract:
 	@cd ${WRKSRC} && rm -rf liblua/ libpcre/
Index: distinfo
===
RCS file: /var/cvs/ports/net/nmap/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo	25 Sep 2014 17:33:15 -	1.30
+++ distinfo	29 Dec 2015 09:47:15 -
@@ -1,2 +1,2 @@
-SHA256 (nmap-6.47.tgz) = Wl/CVDVmMJ0U5Ftcg8k91dEGiiwBPeEgA2+r/BOfVWE=
-SIZE (nmap-6.47.tgz) = 9796783
+SHA256 (nmap-7.01.tgz) = jK86y+k8D6CmhcPm+zpfgM5Jk2vX1AJpoJs+rW/YXtU=
+SIZE (nmap-7.01.tgz) = 11029121
Index: patches/patch-Makefile_in
===
RCS file: /var/cvs/ports/net/nmap/patches/patch-Makefile_in,v
retrieving revision 1.15
diff -u -p -r1.15 patch-Makefile_in
--- patches/patch-Makefile_in	16 May 2014 15:08:54 -	1.15
+++ patches/patch-Makefile_in	29 Dec 2015 09:49:37 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.15 2014/05/16 15:08:54 sthen Exp $
 Makefile.in.orig	Fri Feb 21 23:11:41 2014
-+++ Makefile.in	Thu May 15 20:12:32 2014
-@@ -45,7 +45,7 @@ DEFS += -D_FORTIFY_SOURCE=2
+--- Makefile.in.orig	Tue Dec  8 21:54:07 2015
 Makefile.in	Tue Dec 29 10:47:48 2015
+@@ -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)
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.15 2014/
  export CFLAGS = $(CXXFLAGS)
  # CFLAGS = $(DEFS) $(INCLS)
  STATIC =
-@@ -288,8 +288,8 @@ $(NPINGDIR)/nping.h: nmap.h
+@@ -319,8 +319,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.6
diff -u -p -r1.6 patch-libnetutil_netutil_cc
--- patches/patch-libnetutil_netutil_cc	16 Jun 2014 10:22:15 -	1.6
+++ patches/patch-libnetutil_netutil_cc	29 Dec 2015 09:49:37 -
@@ -8,9 +8,9 @@ http://marc.info/?l=nmap-dev=140179174
 
 chunks dealing with iovec: ???
 
 libnetutil/netutil.cc.orig	Thu Nov  7 19:32:33 2013
-+++ libnetutil/netutil.cc	Sun Jun 15 20:36:36 2014
-@@ -916,7 +916,7 @@ void set_ttl(int sd, int ttl) {
+--- libnetutil/netutil.cc.orig	Wed Oct 28 04:21:15 2015
 libnetutil/netutil.cc	Tue Dec 29 10:47:48 2015
+@@ -915,7 +915,7 @@ void set_ttl(int sd, int ttl) {
  /* Other than WIN32, what these systems have in common is that they use BPF for
 packet capture. (Solaris 10 and earlier used DLPI and had valid selectable
 fds.) */
@@ -19,7 +19,7 @@ chunks dealing with iovec: ???
  /* Returns whether the system supports pcap_get_selectable_fd() properly */
  int pcap_selectable_fd_valid() {
return 0;
-@@ -3140,7 +3140,6 @@ static int route_dst_netlink(const struct sockaddr_sto
+@@ -3139,7 +3139,6 @@ static int route_dst_netlink(const struct sockaddr_sto
   const struct sockaddr_storage *spoofss) {
struct sockaddr_nl snl;
struct msghdr msg;
@@ -27,7 +27,7 @@ chunks dealing with iovec: ???
struct nlmsghdr *nlmsg;
struct rtmsg *rtmsg;
struct rtattr *rtattr;
-@@ -3192,22 +3191,14 @@ static int route_dst_netlink(const struct sockaddr_sto
+@@ -3191,22 +3190,14 @@ static int route_dst_netlink(const struct sockaddr_sto
  add_rtattr_addr(nlmsg, , , RTA_SRC, spoofss, intf_index);
}
  
@@ -50,7 +50,7 @@ chunks dealing with iovec: ???
len = recvmsg(fd, , 0);

Re: wip update: net/nmap

2015-12-29 Thread Jérémie Courrèges-Anglas 
Giovanni Bechis  writes:

> Hi,

Hi,

> I do not use it anymore so I am dropping maintainership, anyway attached a 
> wip port to update it to latest version
> if someone wants to step over.
>  Cheers
>Giovanni

Works fine for basic usage on i386.  Note that NO_TEST should go away
(even though tests are failing right now).

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: wip update: net/nmap

2015-12-29 Thread Stuart Henderson 
On 2015/12/29 11:23, Giovanni Bechis wrote:
> Hi,
> I do not use it anymore so I am dropping maintainership, anyway attached a 
> wip port to update it to latest version
> if someone wants to step over.

Here's a smaller diff for PLIST-zenmap for this.

Index: PLIST-zenmap
===
RCS file: /cvs/ports/net/nmap/pkg/PLIST-zenmap,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST-zenmap
--- PLIST-zenmap16 May 2014 15:08:54 -  1.15
+++ PLIST-zenmap29 Dec 2015 20:20:43 -
@@ -244,6 +244,9 @@ share/zenmap/locale/de/LC_MESSAGES/zenma
 share/zenmap/locale/fr/
 share/zenmap/locale/fr/LC_MESSAGES/
 share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/hi/
+share/zenmap/locale/hi/LC_MESSAGES/
+share/zenmap/locale/hi/LC_MESSAGES/zenmap.mo
 share/zenmap/locale/hr/
 share/zenmap/locale/hr/LC_MESSAGES/
 share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
@@ -262,6 +265,9 @@ share/zenmap/locale/pt_BR/LC_MESSAGES/ze
 share/zenmap/locale/ru/
 share/zenmap/locale/ru/LC_MESSAGES/
 share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/zh/
+share/zenmap/locale/zh/LC_MESSAGES/
+share/zenmap/locale/zh/LC_MESSAGES/zenmap.mo
 share/zenmap/misc/
 share/zenmap/misc/profile_editor.xml
 share/zenmap/pixmaps/

wip update: net/nmap

2015-12-29 Thread Giovanni Bechis 
Hi,
I do not use it anymore so I am dropping maintainership, anyway attached a wip 
port to update it to latest version
if someone wants to step over.
 Cheers
   Giovanni
Index: Makefile
===
RCS file: /var/cvs/ports/net/nmap/Makefile,v
retrieving revision 1.116
diff -u -p -r1.116 Makefile
--- Makefile	8 Oct 2015 21:19:22 -	1.116
+++ Makefile	29 Dec 2015 10:20:14 -
@@ -5,8 +5,7 @@ SHARED_ONLY=	Yes
 COMMENT-main=	scan ports and fingerprint stack of network hosts
 COMMENT-zenmap=	graphical frontend for nmap
 
-MODPY_EGG_VERSION=	6.47
-REVISION-main=		1
+MODPY_EGG_VERSION=	7.01
 DISTNAME=		nmap-${MODPY_EGG_VERSION}
 PKGNAME-main=		${DISTNAME}
 PKGNAME-zenmap=		nmap-zenmap-${MODPY_EGG_VERSION}
@@ -16,8 +15,6 @@ MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tgz
 
 HOMEPAGE=	http://www.nmap.org/
-
-MAINTAINER=	Giovanni Bechis 
 
 # GPL (v2 only), with additional clarifications and exceptions, see COPYING
 PERMIT_PACKAGE_CDROM=	Yes
Index: distinfo
===
RCS file: /var/cvs/ports/net/nmap/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo	25 Sep 2014 17:33:15 -	1.30
+++ distinfo	29 Dec 2015 09:47:15 -
@@ -1,2 +1,2 @@
-SHA256 (nmap-6.47.tgz) = Wl/CVDVmMJ0U5Ftcg8k91dEGiiwBPeEgA2+r/BOfVWE=
-SIZE (nmap-6.47.tgz) = 9796783
+SHA256 (nmap-7.01.tgz) = jK86y+k8D6CmhcPm+zpfgM5Jk2vX1AJpoJs+rW/YXtU=
+SIZE (nmap-7.01.tgz) = 11029121
Index: patches/patch-Makefile_in
===
RCS file: /var/cvs/ports/net/nmap/patches/patch-Makefile_in,v
retrieving revision 1.15
diff -u -p -r1.15 patch-Makefile_in
--- patches/patch-Makefile_in	16 May 2014 15:08:54 -	1.15
+++ patches/patch-Makefile_in	29 Dec 2015 09:49:37 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.15 2014/05/16 15:08:54 sthen Exp $
 Makefile.in.orig	Fri Feb 21 23:11:41 2014
-+++ Makefile.in	Thu May 15 20:12:32 2014
-@@ -45,7 +45,7 @@ DEFS += -D_FORTIFY_SOURCE=2
+--- Makefile.in.orig	Tue Dec  8 21:54:07 2015
 Makefile.in	Tue Dec 29 10:47:48 2015
+@@ -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)
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.15 2014/
  export CFLAGS = $(CXXFLAGS)
  # CFLAGS = $(DEFS) $(INCLS)
  STATIC =
-@@ -288,8 +288,8 @@ $(NPINGDIR)/nping.h: nmap.h
+@@ -319,8 +319,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.6
diff -u -p -r1.6 patch-libnetutil_netutil_cc
--- patches/patch-libnetutil_netutil_cc	16 Jun 2014 10:22:15 -	1.6
+++ patches/patch-libnetutil_netutil_cc	29 Dec 2015 09:49:37 -
@@ -8,9 +8,9 @@ http://marc.info/?l=nmap-dev=140179174
 
 chunks dealing with iovec: ???
 
 libnetutil/netutil.cc.orig	Thu Nov  7 19:32:33 2013
-+++ libnetutil/netutil.cc	Sun Jun 15 20:36:36 2014
-@@ -916,7 +916,7 @@ void set_ttl(int sd, int ttl) {
+--- libnetutil/netutil.cc.orig	Wed Oct 28 04:21:15 2015
 libnetutil/netutil.cc	Tue Dec 29 10:47:48 2015
+@@ -915,7 +915,7 @@ void set_ttl(int sd, int ttl) {
  /* Other than WIN32, what these systems have in common is that they use BPF for
 packet capture. (Solaris 10 and earlier used DLPI and had valid selectable
 fds.) */
@@ -19,7 +19,7 @@ chunks dealing with iovec: ???
  /* Returns whether the system supports pcap_get_selectable_fd() properly */
  int pcap_selectable_fd_valid() {
return 0;
-@@ -3140,7 +3140,6 @@ static int route_dst_netlink(const struct sockaddr_sto
+@@ -3139,7 +3139,6 @@ static int route_dst_netlink(const struct sockaddr_sto
   const struct sockaddr_storage *spoofss) {
struct sockaddr_nl snl;
struct msghdr msg;
@@ -27,7 +27,7 @@ chunks dealing with iovec: ???
struct nlmsghdr *nlmsg;
struct rtmsg *rtmsg;
struct rtattr *rtattr;
-@@ -3192,22 +3191,14 @@ static int route_dst_netlink(const struct sockaddr_sto
+@@ -3191,22 +3190,14 @@ static int route_dst_netlink(const struct sockaddr_sto
  add_rtattr_addr(nlmsg, , , RTA_SRC, spoofss, intf_index);
}
  
@@ -50,7 +50,7 @@ chunks dealing with iovec: ???
len = recvmsg(fd, , 0);
if (len <= 0)
  netutil_fatal("%s: cannot recvmsg: %s", __func__, strerror(errno));
-@@ -3838,7 +3829,6 @@ static const unsigned char *add_exthdr_ancillary(struc
+@@ -3837,7 +3828,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;
@@ -58,7 +58,7 @@ chunks dealing with iovec: ???
  
const unsigned char

Re: Wip update: net/nmap

2012-05-31 Thread Benoit Lecocq 

On 05/31/12 09:22, Giovanni Bechis wrote:

On 05/30/12 17:08, Giovanni Bechis wrote:


On 05/30/12 16:22, Lawrence Teo wrote:


Build failed for me at the following location.. not sure if it is due to the
libpcap bump:



cvs ate a file.



Correct diff tested on a clean machine, this one should finally work.
  Cheers
   Giovanni


Yes it works now !

Cheers,
benoit