zmap: Bump to 3.0.0

This commit is contained in:
Tee KOBAYASHI 2023-06-24 12:38:56 +09:00 committed by xtkoba
parent ff0b3c8fb5
commit 23d6a5fa34
2 changed files with 13 additions and 25 deletions

View File

@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://zmap.io/
TERMUX_PKG_DESCRIPTION="A fast single packet network scanner designed for Internet-wide network surveys"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.0.0-beta1"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/zmap/zmap/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=c97c452930ad6af95ad9ad79e66fea742f904b8e102c185f1001822cc5b5ceb3
TERMUX_PKG_VERSION=1:3.0.0
TERMUX_PKG_SRCURL=https://github.com/zmap/zmap/archive/refs/tags/v${TERMUX_PKG_VERSION#*:}.tar.gz
TERMUX_PKG_SHA256=e3151cdcdf695ab7581e01a7c6ee78678717d6a62ef09849b34db39682535454
TERMUX_PKG_DEPENDS="json-c, libgmp, libpcap, libunistring"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DRESPECT_INSTALL_PREFIX_CONFIG=ON

View File

@ -11,25 +11,14 @@ index 817c184..b390da7 100644
### Optionally print a summary at the end
#summary
diff --git a/src/zmap.c b/src/zmap.c
index 77674e0..0ed66cc 100644
--- a/src/zmap.c
+++ b/src/zmap.c
@@ -650,14 +650,14 @@ int main(int argc, char *argv[])
zconf.destination_cidrs = args.inputs;
zconf.destination_cidrs_len = args.inputs_num;
if (zconf.destination_cidrs && zconf.blocklist_filename &&
- !strcmp(zconf.blocklist_filename, "/etc/zmap/blocklist.conf")) {
+ !strcmp(zconf.blocklist_filename, "@TERMUX_PREFIX@/etc/zmap/blocklist.conf")) {
log_warn(
"blocklist",
"ZMap is currently using the default blocklist located "
- "at /etc/zmap/blocklist.conf. By default, this blocklist excludes locally "
+ "at @TERMUX_PREFIX@/etc/zmap/blocklist.conf. By default, this blocklist excludes locally "
"scoped networks (e.g. 10.0.0.0/8, 127.0.0.1/8, and 192.168.0.0/16). If you are"
" trying to scan local networks, you can change the default blocklist by "
- "editing the default ZMap configuration at /etc/zmap/zmap.conf.");
+ "editing the default ZMap configuration at @TERMUX_PREFIX@/etc/zmap/zmap.conf.");
}
SET_IF_GIVEN(zconf.allowlist_filename, allowlist_file);
--- a/src/constants.h
+++ b/src/constants.h
@@ -10,7 +10,7 @@
#define ZMAP_CONSTANTS_H
#ifndef ZMAP_DEFAULT_BLOCKLIST
-#define ZMAP_DEFAULT_BLOCKLIST "/etc/zmap/blocklist.conf"
+#define ZMAP_DEFAULT_BLOCKLIST "@TERMUX_PREFIX@/etc/zmap/blocklist.conf"
#endif
#endif /* ZMAP_CONSTANTS_H */