From nobody Fri Sep 30 22:29:58 2022 X-Original-To: dev-commits-ports-main@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 4MfQ062RDVz4d2pm; Fri, 30 Sep 2022 22:29:58 +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 4MfQ061gCZz3jpQ; Fri, 30 Sep 2022 22:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664576998; 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=+o+uujAEbIBSXZZIlvZIOhwow0UjQxm0OstVMvjVJtc=; b=umNDxYyHtfZoXn7jnISOC2hdtkzqevWxe3dNdAt4NfVlgSlAL5Hpvaj9FXh2NvD+CPFmPF PNOYJ+kZLXiGpl/+jkhIQnctmHgubJ8eMdB418rI1CMsnKG4Jh9faN/E8M4dqYqLepuDNY AwlztTZqgvQ4D/u2ohbLkKns89hJGvMlD4SGz1YfllgPyhxhqmIYRv2qpfKBZQU3CJSgBF h6s1PfcUnN2SE7VMrWgIgHFFOOw65hcDtDhsHe5Vd3IqSu6tVOSZpIERJF5q88jj8PPpHJ A3wyv1aCZ6InOP09iIIJ2UViUSFXd1aowydM4ZrRbL+upEZeaZ6lSSJ0dsyA3A== 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 4MfQ060XzLzKHl; Fri, 30 Sep 2022 22:29:58 +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 28UMTwfS019741; Fri, 30 Sep 2022 22:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28UMTwg9019740; Fri, 30 Sep 2022 22:29:58 GMT (envelope-from git) Date: Fri, 30 Sep 2022 22:29:58 GMT Message-Id: <202209302229.28UMTwg9019740@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: a7c48b30a0ac - main - security/hashcat: unbreak on -CURRENT after GNU qsort_r List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7c48b30a0ac7dac2ecf8d4dc3acdf5c5c02c452 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664576998; 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=+o+uujAEbIBSXZZIlvZIOhwow0UjQxm0OstVMvjVJtc=; b=OJljOoy8rYqtyNUlNVIsPGedoispjEW3wU1B3ZWea9kb9rWNzH0KtfeVEGN9P0AyoIWmXt g6Rk7CuVFhzUzoiei21vCgelmaz9vFkDoxpK1Bq+qyaIKERl1aj2LDJIrymVmWpl0pQLb2 0y8nErabG/Td3CmECOQ082LSVHoqyR2+Ctu89hopew7TkEdnxhFOTNjxiG60ElPDiac4HX 1vMUiMYgwPlVksnC+kSpUn8usrT9LjJzG8/tVdISruZIoAlJi1imPazxL6mm+JZboYbtCQ Q+bGs8To6TeFkPVBzTKCWMGpbqHerIUxqOTQtp4LfUCE8sT73IXmyuK9El6FKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664576998; a=rsa-sha256; cv=none; b=cnjdsThFk3Wf6a312I8etB9tIBdyWp8FF8VG8bq1TxuxLMFcfPBQ3vZvhHiGPng86MZ0p6 L9KvZaMk6dooVR78DXiTX4YL48n5H408+5/CgdAHX8+JAxedWStabI4OYiQLaxhHFXH+h5 XU66CjXZ/Mcf0vU2PKRgrBlnJfddur5trdcXh5tDRldL9h7vDNtSjLdWcg73uOB7KX+lks sGtSzeUg66IiysFS7Q0vaMplI0LAlo1VO9vxvUCEfTCBkXMZ8N3ycDpTpcbvXunTY/rnRn McOOFpfRM8KM+XzZe+QSZ+QMTf2wjK2dphaHbKxHWLxc/Y6TRlVRbJPVYS4e3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7c48b30a0ac7dac2ecf8d4dc3acdf5c5c02c452 commit a7c48b30a0ac7dac2ecf8d4dc3acdf5c5c02c452 Author: Xin LI AuthorDate: 2022-09-30 20:34:40 +0000 Commit: Xin LI CommitDate: 2022-09-30 22:28:04 +0000 security/hashcat: unbreak on -CURRENT after GNU qsort_r PR: ports/266227 Exp-run by: antoine Approved by: portmgr --- security/hashcat/files/patch-include_sort__r.h | 33 ++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/security/hashcat/files/patch-include_sort__r.h b/security/hashcat/files/patch-include_sort__r.h new file mode 100644 index 000000000000..3e1d0e0d9d33 --- /dev/null +++ b/security/hashcat/files/patch-include_sort__r.h @@ -0,0 +1,33 @@ +--- include/sort_r.h.orig 2022-09-02 14:58:13 UTC ++++ include/sort_r.h +@@ -25,10 +25,10 @@ Slightly modified to work with hashcat to no falsly de + */ + + #if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \ +- defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__) ++ (defined __FreeBSD__ && !defined(qsort_r)) || defined __DragonFly__ || defined __NetBSD__) + # define _SORT_R_BSD + # define _SORT_R_INLINE inline +-#elif (defined __linux__) || defined (__CYGWIN__) ++#elif (defined __linux__) || defined (__CYGWIN__) || (defined (__FreeBSD__) && defined(qsort_r)) + # define _SORT_R_LINUX + # define _SORT_R_INLINE inline + #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__) +@@ -167,7 +167,7 @@ static _SORT_R_INLINE void sort_r_simple(void *base, s + #if defined _SORT_R_LINUX + + typedef int(* __compar_d_fn_t)(const void *, const void *, void *); +- extern void qsort_r(void *base, size_t nel, size_t width, ++ extern void (qsort_r)(void *base, size_t nel, size_t width, + __compar_d_fn_t __compar, void *arg) + __attribute__((nonnull (1, 4))); + +@@ -186,7 +186,7 @@ static _SORT_R_INLINE void sort_r_simple(void *base, s + /* no qsort_r in glibc before 2.8, need to use nested qsort */ + sort_r_simple(base, nel, width, compar, arg); + +- #elif defined __GLIBC__ ++ #elif defined __GLIBC__ || (defined(__FreeBSD__) && defined(qsort_r)) + + qsort_r(base, nel, width, compar, arg); +