From owner-dev-commits-ports-main@freebsd.org Mon Aug 2 03:58:57 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2046066BA95; Mon, 2 Aug 2021 03:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GdPPs02bzz4hbT; Mon, 2 Aug 2021 03:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE65A18E92; Mon, 2 Aug 2021 03:58:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1723wu9s074652; Mon, 2 Aug 2021 03:58:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1723wu4v074651; Mon, 2 Aug 2021 03:58:56 GMT (envelope-from git) Date: Mon, 2 Aug 2021 03:58:56 GMT Message-Id: <202108020358.1723wu4v074651@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 35a043739b0e - main - net-mgmt/aircrack-ng: further improve the port (+) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35a043739b0e2592403eccec68c3b034f3eaebf1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2021 03:58:57 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=35a043739b0e2592403eccec68c3b034f3eaebf1 commit 35a043739b0e2592403eccec68c3b034f3eaebf1 Author: Alexey Dokuchaev AuthorDate: 2021-08-02 03:56:42 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-08-02 03:57:22 +0000 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 --- net-mgmt/aircrack-ng/Makefile | 13 ++++++++----- .../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