projects/aports·commit 0bc8d088

main/nmap: build against system pcre, libssh2 and lua5.3

0bc8d088 · alpine-mips-patches <[email protected]> · 2018-12-11 09:19:57 +00:00

- 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.
Commit
0bc8d0888c308b0fe86fb873b2dbff99800983e1
Parents
8ba9da38

Changes

1 files changed · +9 −7

FileStatusAddDelContent
main/nmap/APKBUILDmodified+9−7View file

main/nmap/APKBUILD

View file
diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index b2dd5ed..a71a7e0 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Leonardo Arena <[email protected]>
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() {