hashcat: make progress fixing the build for NetBSD

[Pierre Pronchery <khorben%defora.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Wed Jan 5 23:19:32 2022 +0100
Changeset:	320cd5aa980058f3cff518680ab0348b881dc296

Modified Files:
	hashcat/distinfo
Added Files:
	hashcat/patches/patch-include_sort__r.h
	hashcat/patches/patch-src_affinity.c
	hashcat/patches/patch-src_folder.c

Log Message:
hashcat: make progress fixing the build for NetBSD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=320cd5aa980058f3cff518680ab0348b881dc296

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 hashcat/distinfo                        |  3 +++
 hashcat/patches/patch-include_sort__r.h | 15 +++++++++++++++
 hashcat/patches/patch-src_affinity.c    | 18 ++++++++++++++++++
 hashcat/patches/patch-src_folder.c      | 17 +++++++++++++++++
 4 files changed, 53 insertions(+)

diffs:
diff --git a/hashcat/distinfo b/hashcat/distinfo
index fd958838de..422863960a 100644
--- a/hashcat/distinfo
+++ b/hashcat/distinfo
@@ -3,4 +3,7 @@ $NetBSD$
 BLAKE2s (hashcat-6.2.5.tar.gz) = 425d720ca0bb48e585988dc0557a829b3906d697ad14722c68e34fb5b4f7ebaa
 SHA512 (hashcat-6.2.5.tar.gz) = 2b881146c625172c91cb74b33851473155dcde2421fba1b4acfba28116499b9cff832a62c4dbc24e16df06a827494f30699a7d0e5195d5ed107704f525255383
 Size (hashcat-6.2.5.tar.gz) = 6341872 bytes
+SHA1 (patch-include_sort__r.h) = 710a6866d1f1b0ba4c499e07897cdaaed5d2f2cb
 SHA1 (patch-src_Makefile) = 2781200f402b5cebaded0cce72023d6e1cda7ef9
+SHA1 (patch-src_affinity.c) = 83621bdd3f9a891cc80ef4a864c14864e917d6d8
+SHA1 (patch-src_folder.c) = 9db8506a5fa6aaceb05acb772ab4a58d8f3cac57
diff --git a/hashcat/patches/patch-include_sort__r.h b/hashcat/patches/patch-include_sort__r.h
new file mode 100644
index 0000000000..8949ffdcf8
--- /dev/null
+++ b/hashcat/patches/patch-include_sort__r.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Tentatively fix the build for NetBSD
+
+--- include/sort_r.h.orig	2022-01-05 22:11:43.619407583 +0000
++++ include/sort_r.h
+@@ -25,7 +25,7 @@ Slightly modified to work with hashcat t
+ */
+ 
+ #if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \
+-     defined __FreeBSD__ || defined __DragonFly__)
++     defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__)
+ #  define _SORT_R_BSD
+ #  define _SORT_R_INLINE inline
+ #elif (defined __linux__) || defined (__CYGWIN__)
diff --git a/hashcat/patches/patch-src_affinity.c b/hashcat/patches/patch-src_affinity.c
new file mode 100644
index 0000000000..2a9a18f327
--- /dev/null
+++ b/hashcat/patches/patch-src_affinity.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Tentatively fix the build for NetBSD
+
+--- src/affinity.c.orig	2022-01-05 22:06:04.906472892 +0000
++++ src/affinity.c
+@@ -45,6 +45,11 @@ static int pthread_setaffinity_np (pthre
+ typedef cpuset_t cpu_set_t;
+ #endif
+ 
++#if defined(__NetBSD__)
++#include <sys/intrio.h>
++typedef cpuset_t cpu_set_t;
++#endif
++
+ int set_cpu_affinity (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx)
+ {
+ #if defined (__CYGWIN__)
diff --git a/hashcat/patches/patch-src_folder.c b/hashcat/patches/patch-src_folder.c
new file mode 100644
index 0000000000..0ca26a729b
--- /dev/null
+++ b/hashcat/patches/patch-src_folder.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Tentatively fix the build for NetBSD
+
+--- src/folder.c.orig	2022-01-05 22:09:38.453961988 +0000
++++ src/folder.c
+@@ -43,8 +43,9 @@ static int get_exec_path (char *exec_pat
+ 
+   const size_t len = strlen (exec_path);
+ 
+-  #elif defined (__FreeBSD__)
++  #elif defined (__FreeBSD__) || defined (__NetBSD__)
+ 
++  #include <sys/param.h>
+   #include <sys/sysctl.h>
+ 
+   int mib[4];