From nobody Wed Dec 15 13:23:43 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5F45818DCF4B; Wed, 15 Dec 2021 13:23:44 +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 4JDbYD0t5Tz3kV4; Wed, 15 Dec 2021 13:23:44 +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 E77DC1CD49; Wed, 15 Dec 2021 13:23:43 +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 1BFDNhQc056229; Wed, 15 Dec 2021 13:23:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BFDNh7O056228; Wed, 15 Dec 2021 13:23:43 GMT (envelope-from git) Date: Wed, 15 Dec 2021 13:23:43 GMT Message-Id: <202112151323.1BFDNh7O056228@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: 0eaddcadddf4 - main - net-mgmt/aircrack-ng: unbreak the build on recent -CURRENT. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 0eaddcadddf4a961a9fafc72c4a413df74273898 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639574624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/N/bC2qI/db6+wp8iYT7bsM2f3dqtOmBU1akEjkjSE=; b=Be9Z/bqWK5dyKRg/dPtryFQ+BHwF7jiyyIv/6K1w8DHobJ0jiyESFlGndWeMKuOY6MofWB rFGiYoOiVZ1zIg3y3JF/rB00RoV+V/iN1turnPOO8cWwjRTA2T644jx3PllNnpu1+51TK7 wr0blzVIwUZfQ7CHGe5REJ5BO1r+LP0XjJiBoQg+Qwib2RHXDWmS1KVenn02xW4ZwxMjvP JRUyv6FnUcq3lm1NecP4iZJ+pIAZC49ujEpSoL5G6WaeK6i6xxC9IVyfvKFtyaYze4HUpL Dm3JUolAJ3aTDKsCIDs6T3ox82+BGd7ujRORF0+wgMG7iIPRdHXdf6jW7nNASQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639574624; a=rsa-sha256; cv=none; b=B0qzmFAfJ0OEhVtz8Rmhkep6BUoqJabuMpjANeqxXLYoye45xlOnmoo2os3FL9sVoOdL8y K2x/0EFIPhp3idgUg7Hc3kUxlydYQkBDS4JfmvQ0xPoGAZCvRkwxm62KMo9hPb/2qYAs5u bX/aCeaQy3bvJPgCMtfJ/r8vBSNyr40RuSK+iBgxYV+IyP8CJeiss2XecAX98rRK7DxCON sAisWriSLoOJHUr8cS7nca1xisMfZ43L3rALmvt/nj5GijizFJ/FxovDXv/kR9z5abrj/4 TdQCVmAT460udTLhlLXYci2gsraqdYOg0qGVxnJLGn1MRs4GS74Xqr1CIJCKoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=0eaddcadddf4a961a9fafc72c4a413df74273898 commit 0eaddcadddf4a961a9fafc72c4a413df74273898 Author: Alexey Dokuchaev AuthorDate: 2021-12-15 13:22:44 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-12-15 13:22:44 +0000 net-mgmt/aircrack-ng: unbreak the build on recent -CURRENT. Reported by: pkg-fallout --- net-mgmt/aircrack-ng/files/patch-src_aircrack-ng.c | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/net-mgmt/aircrack-ng/files/patch-src_aircrack-ng.c b/net-mgmt/aircrack-ng/files/patch-src_aircrack-ng.c new file mode 100644 index 000000000000..e129f7334dfa --- /dev/null +++ b/net-mgmt/aircrack-ng/files/patch-src_aircrack-ng.c @@ -0,0 +1,49 @@ +--- src/aircrack-ng.c.orig 2018-12-09 22:53:44 UTC ++++ src/aircrack-ng.c +@@ -149,7 +149,7 @@ struct WPA_data wpa_data[MAX_THREADS]; + int wpa_wordlists_done = 0; + static pthread_mutex_t mx_nb = PTHREAD_MUTEX_INITIALIZER; + static pthread_mutex_t mx_wpastats = PTHREAD_MUTEX_INITIALIZER; +-ac_cpuset_t * cpuset = NULL; ++static ac_cpuset_t * acng_cpuset = NULL; + + #define GOT_IV 0x00000001 + #define USE_IV 0x00000002 +@@ -690,10 +690,10 @@ static void clean_exit(int ret) + dso_ac_crypto_engine_destroy(&engine); + ac_crypto_engine_loader_unload(); + +- if (cpuset != NULL) ++ if (acng_cpuset != NULL) + { +- ac_cpuset_destroy(cpuset); +- ac_cpuset_free(cpuset); ++ ac_cpuset_destroy(acng_cpuset); ++ ac_cpuset_free(acng_cpuset); + } + + if (opt.totaldicts) +@@ -5371,10 +5371,10 @@ static int perform_wpa_crack(struct AP_info * ap_cur) + return missing_wordlist_dictionary(ap_cur); + } + +- cpuset = ac_cpuset_new(); +- ALLEGE(cpuset); +- ac_cpuset_init(cpuset); +- ac_cpuset_distribute(cpuset, (size_t) opt.nbcpu); ++ acng_cpuset = ac_cpuset_new(); ++ ALLEGE(acng_cpuset); ++ ac_cpuset_init(acng_cpuset); ++ ac_cpuset_distribute(acng_cpuset, (size_t) opt.nbcpu); + + ap_cur = get_first_target(); + +@@ -5462,7 +5462,7 @@ static int perform_wpa_crack(struct AP_info * ap_cur) + return (FAILURE); + } + +- ac_cpuset_bind_thread_at(cpuset, tid[id], (size_t) i); ++ ac_cpuset_bind_thread_at(acng_cpuset, tid[id], (size_t) i); + + id++; + }