Attachment 236643 Details for Bug 266227 – Proposed patch for security/hashcat

[patch] Proposed patch for security/hashcat

0001-security-hashcat-unbreak-on-CURRENT-after-GNU-qsort_.patch (text/plain), 2.15 KB, created by Xin LI on 2022-09-17 19:36:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xin LI

Created: 2022-09-17 19:36:49 UTC

Size: 2.15 KB

patch

obsolete

>From 4012221c36330f04e81b19f2d6b59a8f7e9074a2 Mon Sep 17 00:00:00 2001
>From: Xin LI <delphij@FreeBSD.org>
>Date: Sat, 17 Sep 2022 12:35:28 -0700
>Subject: [PATCH] security/hashcat: unbreak on -CURRENT after GNU qsort_r
>
>PR:		ports/266227
>---
> .../hashcat/files/patch-include_sort__r.h     | 33 +++++++++++++++++++
> 1 file changed, 33 insertions(+)
> create mode 100644 security/hashcat/files/patch-include_sort__r.h
>
>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);
>+ 
>-- 
>2.37.3
>

Flags:

delphij: maintainer-approval? (se)

Actions: View | Diff

Attachments on bug 266227: 236360 | 236386 | 236388 | 236389 | 236429 | 236470 | 236483 | 236507 | 236621 | 236638 | 236643 | 236644 | 236652 | 236678 | 236744 | 236760