diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2021-08-02 03:56:42 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2021-08-02 03:57:22 +0000 |
| commit | 35a043739b0e2592403eccec68c3b034f3eaebf1 (patch) | |
| tree | 2da43a6b4e3759c9ee5ad3c2152536969e3a96b4 | |
| parent | f0c759b9700cec03fcd820b4095c3487ba82ec59 (diff) | |
| download | ports-35a043739b0e2592403eccec68c3b034f3eaebf1.tar.gz ports-35a043739b0e2592403eccec68c3b034f3eaebf1.zip | |
net-mgmt/aircrack-ng: further improve the port (+)
- Show in the configure summary if PCRE support had been disabled
- USES+=pkgconfig is required for successful configure regardless
of the selected options, without it fail with ``configure.ac:62:
error: possibly undefined macro: AC_SUBST''
- Allow to build against GNU crypt library, rather than OpenSSL,
as a crypto engine
| -rw-r--r-- | net-mgmt/aircrack-ng/Makefile | 13 | ||||
| -rw-r--r-- | net-mgmt/aircrack-ng/files/patch-build_m4_aircrack__ng__pcre.m4 | 15 |
2 files changed, 20 insertions, 8 deletions
diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile index 899d57c31ad5..e5ba79395193 100644 --- a/net-mgmt/aircrack-ng/Makefile +++ b/net-mgmt/aircrack-ng/Makefile @@ -16,7 +16,7 @@ BROKEN_aarch64= fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major BROKEN_armv6= fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major BROKEN_armv7= fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major -USES= autoreconf cpe dos2unix gmake libtool ssl +USES= autoreconf cpe dos2unix gmake libtool pkgconfig USE_GCC= yes USE_LDCONFIG= yes @@ -25,21 +25,24 @@ CONFIGURE_ARGS= --with-experimental CPE_VERSION= ${DISTVERSION:C/-.*//} CPE_UPDATE= ${DISTVERSION:C/^[^-]*$//:C/.*-//} DOS2UNIX_FILES= src/aircrack-osdep/byteorder.h -CFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} INSTALL_TARGET= install-strip -OPTIONS_DEFINE= HWLOC PCRE SQLITE +OPTIONS_DEFINE= GCRYPT HWLOC PCRE SQLITE OPTIONS_DEFAULT= HWLOC PCRE SQLITE OPTIONS_SUB= yes +GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error +GCRYPT_CONFIGURE_ON= --with-gcrypt +GCRYPT_USES_OFF= ssl +GCRYPT_VARS_OFF= CFLAGS+=-I${OPENSSLINC} LDFLAGS+=-L${OPENSSLLIB} + HWLOC_DESC= Use Hardware Locality to improve performance HWLOC_LIB_DEPENDS= libhwloc.so:devel/hwloc2 HWLOC_CONFIGURE_OFF= --disable-hwloc PCRE_DESC= Use Perl Compatible Regular Expressions for wesside PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -PCRE_USES= pkgconfig PCRE_CONFIGURE_OFF= --disable-pcre SQLITE_DESC= Use SQLite for storing pre-computed key tables diff --git a/net-mgmt/aircrack-ng/files/patch-build_m4_aircrack__ng__pcre.m4 b/net-mgmt/aircrack-ng/files/patch-build_m4_aircrack__ng__pcre.m4 index 5f399844478b..d2596e1d3a5a 100644 --- a/net-mgmt/aircrack-ng/files/patch-build_m4_aircrack__ng__pcre.m4 +++ b/net-mgmt/aircrack-ng/files/patch-build_m4_aircrack__ng__pcre.m4 @@ -1,6 +1,6 @@ --- build/m4/aircrack_ng_pcre.m4.orig 2018-12-09 22:53:44 UTC +++ build/m4/aircrack_ng_pcre.m4 -@@ -38,6 +38,10 @@ dnl If you delete this exception statement from all so +@@ -38,21 +38,27 @@ dnl If you delete this exception statement from all so dnl program, then also delete it here. AC_DEFUN([AIRCRACK_NG_PCRE], [ @@ -11,8 +11,17 @@ AC_ARG_ENABLE(static-pcre, AS_HELP_STRING([--enable-static-pcre], [Enable statically linked PCRE libpcre.]), -@@ -52,7 +56,9 @@ if test "x$static_pcre" != "xno"; then - HAVE_PCRE=no + [static_pcre=$enableval], [static_pcre=no]) + ++HAVE_PCRE=no ++ + if test "x$static_pcre" != "xno"; then + AC_REQUIRE([AX_EXT_HAVE_STATIC_LIB_DETECT]) + AX_EXT_HAVE_STATIC_LIB(PCRE, ${DEFAULT_STATIC_LIB_SEARCH_PATHS}, pcre libpcre, pcre_version) + if test "x$PCRE_FOUND" = xyes; then + HAVE_PCRE=yes +- else +- HAVE_PCRE=no fi else + if test x$enable_pcre != xno; then |