Tue Oct 31 16:22:47 2017 UTC ()
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


(spz)
diff -r1.136 -r1.136.4.1 pkgsrc/net/nmap/Makefile
diff -r1.18 -r1.18.8.1 pkgsrc/net/nmap/options.mk
cvs diff -r1.136 -r1.136.4.1 pkgsrc/net/nmap/Makefile (expand / switch to unified diff)

--- pkgsrc/net/nmap/Makefile 2017/08/03 13:52:00 1.136
+++ pkgsrc/net/nmap/Makefile 2017/10/31 16:22:46 1.136.4.1
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.136 2017/08/03 13:52:00 adam Exp $ 1# $NetBSD: Makefile,v 1.136.4.1 2017/10/31 16:22:46 spz Exp $
2 2
3DISTNAME= nmap-7.60 3DISTNAME= nmap-7.60
 4PKGREVISION= 1
4CATEGORIES= net security 5CATEGORIES= net security
5MASTER_SITES= http://nmap.org/dist/ 6MASTER_SITES= http://nmap.org/dist/
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= pettai@NetBSD.org 9MAINTAINER= pettai@NetBSD.org
9HOMEPAGE= http://insecure.org/nmap/ 10HOMEPAGE= http://insecure.org/nmap/
10COMMENT= Network/port scanner with OS detection 11COMMENT= Network/port scanner with OS detection
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13BUILDLINK_API_DEPENDS.libpcap+= libpcap>=1.0.0 14BUILDLINK_API_DEPENDS.libpcap+= libpcap>=1.0.0
14BUILDLINK_API_DEPENDS.libpcre+= libpcre>=7.6 15BUILDLINK_API_DEPENDS.libpcre+= libpcre>=7.6
15BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8 16BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8
16 17
cvs diff -r1.18 -r1.18.8.1 pkgsrc/net/nmap/options.mk (expand / switch to unified diff)

--- pkgsrc/net/nmap/options.mk 2017/01/01 14:43:50 1.18
+++ pkgsrc/net/nmap/options.mk 2017/10/31 16:22:46 1.18.8.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.18 2017/01/01 14:43:50 wiz Exp $ 1# $NetBSD: options.mk,v 1.18.8.1 2017/10/31 16:22:46 spz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nmap 3PKG_OPTIONS_VAR= PKG_OPTIONS.nmap
4 4
5PKG_SUPPORTED_OPTIONS= inet6 ndiff zenmap lua 5PKG_SUPPORTED_OPTIONS= inet6 ndiff zenmap lua
6PKG_SUGGESTED_OPTIONS= inet6 6PKG_SUGGESTED_OPTIONS= inet6
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10PLIST_VARS+= ndiff zenmap lua 10PLIST_VARS+= ndiff zenmap lua
11 11
12.if !empty(PKG_OPTIONS:Minet6) 12.if !empty(PKG_OPTIONS:Minet6)
13CONFIGURE_ARGS+= --enable-ipv6 13CONFIGURE_ARGS+= --enable-ipv6
14.else 14.else
@@ -27,26 +27,27 @@ REPLACE_PYTHON+= zenmap/zenmapGUI/higwid @@ -27,26 +27,27 @@ REPLACE_PYTHON+= zenmap/zenmapGUI/higwid
27REPLACE_PYTHON+= zenmap/test/*.py 27REPLACE_PYTHON+= zenmap/test/*.py
28PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-xml, py-sqlite2, py-gtk2 28PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-xml, py-sqlite2, py-gtk2
29.include "../../lang/python/application.mk" 29.include "../../lang/python/application.mk"
30.include "../../lang/python/extension.mk" 30.include "../../lang/python/extension.mk"
31.include "../../x11/py-gtk2/buildlink3.mk" 31.include "../../x11/py-gtk2/buildlink3.mk"
32.include "../../databases/py-sqlite2/buildlink3.mk" 32.include "../../databases/py-sqlite2/buildlink3.mk"
33.include "../../textproc/py-xml/buildlink3.mk" 33.include "../../textproc/py-xml/buildlink3.mk"
34.include "../../sysutils/desktop-file-utils/desktopdb.mk" 34.include "../../sysutils/desktop-file-utils/desktopdb.mk"
35.else 35.else
36CONFIGURE_ARGS+= --without-zenmap 36CONFIGURE_ARGS+= --without-zenmap
37.endif 37.endif
38 38
39.if !empty(PKG_OPTIONS:Mlua) 39.if !empty(PKG_OPTIONS:Mlua)
 40LUA_VERSIONS_ACCEPTED= 53 # needs lua_isyieldable, introduced in Lua 5.3
40.include "../../lang/lua/buildlink3.mk" 41.include "../../lang/lua/buildlink3.mk"
41CONFIGURE_ARGS+= --with-liblua=${BUILDLINK_PREFIX.lua} 42CONFIGURE_ARGS+= --with-liblua=${BUILDLINK_PREFIX.lua}
42PLIST.lua= yes 43PLIST.lua= yes
43.else 44.else
44CONFIGURE_ARGS+= --without-liblua 45CONFIGURE_ARGS+= --without-liblua
45.endif 46.endif
46 47
47# this needs to be below zenmap option handling, because that restricts python versions 48# this needs to be below zenmap option handling, because that restricts python versions
48.if !empty(PKG_OPTIONS:Mndiff) 49.if !empty(PKG_OPTIONS:Mndiff)
49CONFIGURE_ARGS+= --with-ndiff 50CONFIGURE_ARGS+= --with-ndiff
50PLIST.ndiff= yes 51PLIST.ndiff= yes
51PY_PATCHPLIST= yes 52PY_PATCHPLIST= yes
52REPLACE_PYTHON+= ndiff/*.py 53REPLACE_PYTHON+= ndiff/*.py