From owner-dev-commits-ports-all@freebsd.org Sat Jul 31 15:34:49 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 C7F2E65FBCC; Sat, 31 Jul 2021 15:34:49 +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 4GcSxj55R2z4gGM; Sat, 31 Jul 2021 15:34:49 +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 9327F1B624; Sat, 31 Jul 2021 15:34:49 +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 16VFYni4067039; Sat, 31 Jul 2021 15:34:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16VFYn5B067038; Sat, 31 Jul 2021 15:34:49 GMT (envelope-from git) Date: Sat, 31 Jul 2021 15:34:49 GMT Message-Id: <202107311534.16VFYn5B067038@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: 88fd22f03605 - main - net-mgmt/aircrack-ng: in sight of upcoming update, 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: 88fd22f03605be9c1bed8fec098949bc61b35fea Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jul 2021 15:34:49 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=88fd22f03605be9c1bed8fec098949bc61b35fea commit 88fd22f03605be9c1bed8fec098949bc61b35fea Author: Alexey Dokuchaev AuthorDate: 2021-07-31 15:32:24 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-07-31 15:32:34 +0000 net-mgmt/aircrack-ng: in sight of upcoming update, improve the port - Uncomment INSTALL_TARGET and set it to `install-strip'; also, remove the bogus related comment, as setting WITH_DEBUG prevents stripping - Allow to use Hardware Locality (devel/hwloc2) to improve performance - Fix broken option disabling code: passing corresponding --disable-foo configure switch is sufficient except that for PCRE, small change to m4 code was required - Fix `post-patch' target so it actually does what it supposed to and assume maintainership of the port --- net-mgmt/aircrack-ng/Makefile | 23 ++++++++++++---------- .../files/patch-build_m4_aircrack__ng__pcre.m4 | 23 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile index dd371959a952..899d57c31ad5 100644 --- a/net-mgmt/aircrack-ng/Makefile +++ b/net-mgmt/aircrack-ng/Makefile @@ -2,11 +2,11 @@ PORTNAME= aircrack-ng DISTVERSION= 1.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt security MASTER_SITES= http://download.aircrack-ng.org/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= danfe@FreeBSD.org COMMENT= 802.11 WEP and WPA-PSK keys cracking program LICENSE= GPLv2 BSD3CLAUSE APACHE20 @@ -27,21 +27,24 @@ CPE_UPDATE= ${DISTVERSION:C/^[^-]*$//:C/.*-//} DOS2UNIX_FILES= src/aircrack-osdep/byteorder.h CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} -# Don't call 'strip' target with WITH_DEBUG set -#INSTALL_TARGET= ${STRIP:S/-s/strip/} install +INSTALL_TARGET= install-strip -OPTIONS_DEFINE= PCRE SQLITE -OPTIONS_DEFAULT=PCRE SQLITE +OPTIONS_DEFINE= HWLOC PCRE SQLITE +OPTIONS_DEFAULT= HWLOC PCRE SQLITE OPTIONS_SUB= yes +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_MAKE_ARGS= pcre=true 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 SQLITE_USES= sqlite -SQLITE_MAKE_ARGS= sqlite=true +SQLITE_CONFIGURE_OFF= --without-sqlite3 .include @@ -54,8 +57,8 @@ PLIST_SUB+= PPC="@comment " \ .endif post-patch: - @${REINPLACE_CMD} \ - -e 's|%%ETCDIR%%|${ETCDIR}|' ${WRKSRC}/scripts/airodump-ng-oui-update + @${REINPLACE_CMD} -e 's,/usr/local/etc/aircrack-ng,${ETCDIR},' \ + ${WRKSRC}/scripts/airodump-ng-oui-update post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} 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 new file mode 100644 index 000000000000..5f399844478b --- /dev/null +++ b/net-mgmt/aircrack-ng/files/patch-build_m4_aircrack__ng__pcre.m4 @@ -0,0 +1,23 @@ +--- 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 + dnl program, then also delete it here. + + AC_DEFUN([AIRCRACK_NG_PCRE], [ ++ ++AC_ARG_ENABLE([pcre], ++ AS_HELP_STRING([--disable-pcre],[Disable PCRE (libpcre).])) ++ + 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 + fi + else ++ if test x$enable_pcre != xno; then + PKG_CHECK_MODULES(PCRE, libpcre, HAVE_PCRE=yes, HAVE_PCRE=no) ++ fi + fi + + AS_IF([test "x$HAVE_PCRE" = "xyes"], [