sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nmap: Use system libssh2

Browse Source
This commit is contained in:
Fredrik Fornwall 2018-09-12 06:44:08 +02:00
parent 84000a3812
commit b320c2b623
2 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/nmap/build.sh
View File

@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e
TERMUX_PKG_SRCURL=https://nmap.org/dist/nmap-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=https://nmap.org/dist/nmap-${TERMUX_PKG_VERSION}.tar.bz2
# Depend on netcat so that it gets installed automatically when installing # Depend on netcat so that it gets installed automatically when installing
# nmap, since the ncat program is usually distributed as part of nmap. # nmap, since the ncat program is usually distributed as part of nmap.
TERMUX_PKG_DEPENDS="libpcap, pcre, openssl, resolv-conf, netcat, liblua" TERMUX_PKG_DEPENDS="libpcap, pcre, openssl, resolv-conf, netcat, liblua, libssh2"
# --without-nmap-update to avoid linking against libsvn_client: # --without-nmap-update to avoid linking against libsvn_client:
# --without-zenmap to avoid python scripts for graphical gtk frontend: # --without-zenmap to avoid python scripts for graphical gtk frontend:
# --without-ndiff to avoid python2-using ndiff utility: # --without-ndiff to avoid python2-using ndiff utility:

29
packages/nmap/libssh2-src-openssl.h.patch
View File

@ -1,29 +0,0 @@
diff -u -r ../nmap-7.70/libssh2/src/openssl.h ./libssh2/src/openssl.h
--- ../nmap-7.70/libssh2/src/openssl.h 2017-11-11 17:43:24.000000000 +0000
+++ ./libssh2/src/openssl.h 2018-08-24 08:59:09.372633959 +0000
@@ -227,14 +227,18 @@
#endif
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-#define libssh2_crypto_init() \
- ENGINE_load_builtin_engines(); \
- ENGINE_register_all_complete()
+# ifdef OPENSSL_NO_ENGINE
+# define libssh2_crypto_init()
+# else
+# define libssh2_crypto_init() \
+ ENGINE_load_builtin_engines(); \
+ ENGINE_register_all_complete()
+# endif
#else
-#define libssh2_crypto_init() \
- OpenSSL_add_all_algorithms(); \
- ENGINE_load_builtin_engines(); \
- ENGINE_register_all_complete()
+# define libssh2_crypto_init() \
+ OpenSSL_add_all_algorithms(); \
+ ENGINE_load_builtin_engines(); \
+ ENGINE_register_all_complete()
#endif
#define libssh2_crypto_exit()