[alpine-aports] [PATCH] main/nmap: build against system pcre, libssh2 and lua5.3

alpine-mips-patches
Details
Message ID
<20181211093408.A822055ED6@mx12.valuehost.ru>
Sender timestamp
1544519997
DKIM signature
missing
Download raw message
Patch: +9 -7
 - properly require openssl (status quo, just use a correct parameter)
 - explicitly require system libpcap (status quo)
 - explicitly require system libpcre [1]
 - explicitly require zlib (status quo)
 - explicitly require system libssh2 [2]
 - explicitly require system lua5.3 [3]
 - adjust makedepends accordingly

[1] System pcre is newer and properly configured for mips*.
[2] This is the ./configure default, just make sure the choice is stable.
[3] This is the ./configure default, just let it find the system version.

check() passes on x86_64 and mipseln8hf at least, however this commit does
not re-enable it due to unclear aarch64 / arm* status.
---
 main/nmap/APKBUILD | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index b2dd5ed2e5..a71a7e0f1a 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=nmap
 pkgver=7.70
-pkgrel=2
+pkgrel=3
 pkgdesc="A network exploration tool and security/port scanner"
 url="http://nmap.org"
 arch="all"
 license="custom"
 depends=""
-makedepends="libpcap-dev openssl-dev lua-dev linux-headers"
+makedepends="linux-headers openssl-dev libpcap-dev pcre-dev zlib-dev libssh2-dev lua5.3-dev"
 options="!check" #FIXME: fails on armhf and aarch64
 subpackages="
 	$pkgname-doc
@@ -34,11 +34,13 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--without-zenmap \
-		--with-liblua=/usr/include \
-		--with-openssl=/usr/lib
-
-	# fix LUA libs linking order
-	make "LUA_LIBS=../liblua/liblua.a -ldl -lm"
+		--with-openssl=yes \
+		--with-libpcap=yes \
+		--with-libpcre=yes \
+		--with-libz=yes \
+		--with-libssh2=yes \
+		--with-liblua=/usr/lua5.3
+	make
 }
 
 check() {
-- 
2.19.2




---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---