[pkgsrc/pkgsrc-2017Q3]: pkgsrc/net/nmap Pullup ticket #5604 - requested by sevan

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/043c82bff90b
branches:  pkgsrc-2017Q3
changeset: 408553:043c82bff90b
user:      spz <spz%pkgsrc.org@localhost>
date:      Tue Oct 31 16:22:46 2017 +0000

description:
Pullup ticket #5604 - requested by sevan
net/nmap: build fix for nmap with Lua option

Revisions pulled up:
- net/nmap/Makefile                                             1.137
- net/nmap/options.mk                                           1.19

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   leot
   Date:           Thu Oct 19 21:43:25 UTC 2017

   Modified Files:
           pkgsrc/net/nmap: Makefile options.mk

   Log Message:
   nmap: set LUA_VERSIONS_ACCEPTED to avoid using internal Lua provided by nmap

   Without that change the nmap configure script checks for `lua_isyield'
   symbol (appeared on Lua 5.3), and for LUA_VERSION_DEFAULT != 53
   (pkgsrc by default set LUA_VERSION_DEFAULT to 52) it will just
   silently use its internal version.

   Set LUA_VERSIONS_ACCEPTED to 53 to avoid that.

   Fix PR pkg/52624 reported by Patrick Mackey.

   Bump PKGREVISION.


   To generate a diff of this commit:
   cvs rdiff -u -r1.136 -r1.137 pkgsrc/net/nmap/Makefile
   cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/nmap/options.mk

diffstat:

 net/nmap/Makefile   |  3 ++-
 net/nmap/options.mk |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r b90f410422af -r 043c82bff90b net/nmap/Makefile
--- a/net/nmap/Makefile Tue Oct 31 15:53:48 2017 +0000
+++ b/net/nmap/Makefile Tue Oct 31 16:22:46 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2017/08/03 13:52:00 adam Exp $
+# $NetBSD: Makefile,v 1.136.4.1 2017/10/31 16:22:46 spz Exp $
 
 DISTNAME=      nmap-7.60
+PKGREVISION=   1
 CATEGORIES=    net security
 MASTER_SITES=  http://nmap.org/dist/
 EXTRACT_SUFX=  .tar.bz2
diff -r b90f410422af -r 043c82bff90b net/nmap/options.mk
--- a/net/nmap/options.mk       Tue Oct 31 15:53:48 2017 +0000
+++ b/net/nmap/options.mk       Tue Oct 31 16:22:46 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2017/01/01 14:43:50 wiz Exp $
+# $NetBSD: options.mk,v 1.18.8.1 2017/10/31 16:22:46 spz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nmap
 
@@ -37,6 +37,7 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mlua)
+LUA_VERSIONS_ACCEPTED= 53      # needs lua_isyieldable, introduced in Lua 5.3
 .include "../../lang/lua/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-liblua=${BUILDLINK_PREFIX.lua}
 PLIST.lua=             yes