pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

hashcat: partially fix the build for NetBSD



Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Thu Jan 6 00:08:12 2022 +0100
Changeset:	a1ab1f38bbc0175190c983ff7858388cdaecc415

Modified Files:
	hashcat/distinfo
	hashcat/patches/patch-src_folder.c

Log Message:
hashcat: partially fix 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=a1ab1f38bbc0175190c983ff7858388cdaecc415

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

diffstat:
 hashcat/distinfo                   |  2 +-
 hashcat/patches/patch-src_folder.c | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diffs:
diff --git a/hashcat/distinfo b/hashcat/distinfo
index 02ab4c93c5..2728969a7c 100644
--- a/hashcat/distinfo
+++ b/hashcat/distinfo
@@ -6,4 +6,4 @@ 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) = 6054fea2478244292bd855bb8eb8d064aa0d81d1
-SHA1 (patch-src_folder.c) = 9db8506a5fa6aaceb05acb772ab4a58d8f3cac57
+SHA1 (patch-src_folder.c) = f4764cf02338e9f7ecced7c1bac28f1943cdac85
diff --git a/hashcat/patches/patch-src_folder.c b/hashcat/patches/patch-src_folder.c
index 0ca26a729b..6e7aaee2fc 100644
--- a/hashcat/patches/patch-src_folder.c
+++ b/hashcat/patches/patch-src_folder.c
@@ -1,17 +1,27 @@
 $NetBSD$
 
-Tentatively fix the build for NetBSD
+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
+@@ -13,6 +13,9 @@
+ 
+ #if defined (__APPLE__)
+ #include "event.h"
++#elif defined (__FreeBSD__) || defined (__NetBSD__)
++#include <sys/param.h>
++#include <sys/sysctl.h>
+ #endif
+ 
+ static int get_exec_path (char *exec_path, const size_t exec_path_sz)
+@@ -43,9 +46,7 @@ static int get_exec_path (char *exec_pat
  
    const size_t len = strlen (exec_path);
  
 -  #elif defined (__FreeBSD__)
+-
+-  #include <sys/sysctl.h>
 +  #elif defined (__FreeBSD__) || defined (__NetBSD__)
  
-+  #include <sys/param.h>
-   #include <sys/sysctl.h>
- 
    int mib[4];
+ 


Home | Main Index | Thread Index | Old Index