Attachment 173861 Details for Bug 211998 – security/hashcat: 3.00 -> 3.10

[patch] security/hashcat: 3.00 -> 3.10

hashcat-3.10.diff (text/plain), 8.39 KB, created by Nikolai Lifanov on 2016-08-19 14:51:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2016-08-19 14:51:01 UTC

Size: 8.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 420473)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	hashcat
>-PORTVERSION=	3.00
>+PORTVERSION=	3.10
> DISTVERSIONPREFIX=	v
> CATEGORIES=	security
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 420473)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1468849069
>-SHA256 (hashcat-hashcat-v3.00_GH0.tar.gz) = 0283791b91db9dd7ee7431d8975c63419c73232945b76eedcefbe12becfa19c4
>-SIZE (hashcat-hashcat-v3.00_GH0.tar.gz) = 4068649
>+TIMESTAMP = 1471617716
>+SHA256 (hashcat-hashcat-v3.10_GH0.tar.gz) = 8de4f4ae8baa10dbe9139d670cc26dcd49e0e7e343bcbcadbe912cc52fb8255f
>+SIZE (hashcat-hashcat-v3.10_GH0.tar.gz) = 4077706
>Index: files/patch-include_common.h
>===================================================================
>--- files/patch-include_common.h	(revision 420473)
>+++ files/patch-include_common.h	(nonexistent)
>@@ -1,14 +0,0 @@
>---- include/common.h.orig	2016-06-28 09:47:32 UTC
>-+++ include/common.h
>-@@ -51,6 +51,11 @@
>- #include <mach/mach.h>
>- #endif
>- 
>-+#ifdef __FreeBSD__
>-+#include <termios.h>
>-+#include <sys/ioctl.h>
>-+#endif
>-+
>- typedef void *OCL_LIB;
>- 
>- #ifdef HAVE_HWMON
>
>Property changes on: files/patch-include_common.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-include_ext__OpenCL.h
>===================================================================
>--- files/patch-include_ext__OpenCL.h	(revision 420473)
>+++ files/patch-include_ext__OpenCL.h	(nonexistent)
>@@ -1,13 +0,0 @@
>---- include/ext_OpenCL.h.orig	2016-06-28 09:47:32 UTC
>-+++ include/ext_OpenCL.h
>-@@ -27,6 +27,10 @@
>- // #include <CL/cl_ext.h> // used for CL_DEVICE_TOPOLOGY_AMD but broken for dual GPU
>- #endif
>- 
>-+#ifdef __FreeBSD__
>-+#include <CL/cl.h>
>-+#endif
>-+
>- #include <shared.h>
>- 
>- typedef cl_mem (CL_API_CALL *OCL_CLCREATEBUFFER)                 (cl_context, cl_mem_flags, size_t, void *, cl_int *);
>
>Property changes on: files/patch-include_ext__OpenCL.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_Makefile
>===================================================================
>--- files/patch-src_Makefile	(revision 420473)
>+++ files/patch-src_Makefile	(nonexistent)
>@@ -1,52 +0,0 @@
>---- src/Makefile.orig	2016-06-28 09:47:32 UTC
>-+++ src/Makefile
>-@@ -17,7 +17,7 @@ UNAME                    := $(shell unam
>- # we need to strip the windows version number to be able to build hashcat on cygwin hosts
>- UNAME                    := $(patsubst CYGWIN_NT-%,CYGWIN_NT-,$(UNAME))
>- 
>--ifeq (,$(filter $(UNAME),Linux Darwin CYGWIN_NT-))
>-+ifeq (,$(filter $(UNAME),Linux Darwin CYGWIN_NT- FreeBSD))
>- $(error "! Your Operating System ($(UNAME)) is not supported by $(PROG_NAME) Makefile")
>- endif
>- 
>-@@ -58,7 +58,6 @@ OPENCL_HEADERS_KHRONOS   := deps/OpenCL-
>- ## Native compiler paths
>- ##
>- 
>--CC                       := gcc
>- FIND                     := find
>- INSTALL                  := install
>- RM                       := rm
>-@@ -87,7 +86,7 @@ VERSION_TAG              := $(shell test
>- ## Compiler flags
>- ##
>- 
>--CFLAGS                   := -pipe -W -Wall -std=c99 -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/
>-+CFLAGS                   += -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/
>- 
>- ifndef DEBUG
>- CFLAGS                   += -O2
>-@@ -97,6 +96,9 @@ ifeq ($(DEBUG),2)
>- CFLAGS                   += -fsanitize=address -fno-omit-frame-pointer
>- endif
>- endif
>-+ifeq ($(UNAME),FreeBSD)
>-+SED                      := gsed
>-+endif
>- 
>- ##
>- ## Native compilation target
>-@@ -122,6 +124,13 @@ LFLAGS_NATIVE            := -lpthread -l
>- CFLAGS_NATIVE            += -DHAVE_HWMON
>- endif # linux
>- 
>-+ifeq ($(UNAME),FreeBSD)
>-+CFLAGS_NATIVE            := -D_POSIX
>-+CFLAGS_NATIVE            += $(CFLAGS)
>-+LFLAGS_NATIVE            := -lpthread
>-+LFLAGS_NATIVE            += $(LDFLAGS)
>-+endif # freebsd
>-+
>- ##
>- ## Cross compilation target
>- ##
>
>Property changes on: files/patch-src_Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_hashcat.c
>===================================================================
>--- files/patch-src_hashcat.c	(revision 420473)
>+++ files/patch-src_hashcat.c	(nonexistent)
>@@ -1,20 +0,0 @@
>---- src/hashcat.c.orig	2016-06-28 09:47:32 UTC
>-+++ src/hashcat.c
>-@@ -6,7 +6,7 @@
>-  * License.....: MIT
>-  */
>- 
>--#ifdef DARWIN
>-+#if defined(DARWIN) || defined(__FreeBSD__)
>- #include <stdio.h>
>- #endif
>- 
>-@@ -6134,7 +6134,7 @@ int main (int argc, char **argv)
>- 
>-   char *exec_path = get_exec_path ();
>- 
>--  #ifdef LINUX
>-+  #if defined(LINUX) || defined(__FreeBSD__)
>- 
>-   char *resolved_install_folder = realpath (INSTALL_FOLDER, NULL);
>-   char *resolved_exec_path      = realpath (exec_path, NULL);
>
>Property changes on: files/patch-src_hashcat.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_shared.c
>===================================================================
>--- files/patch-src_shared.c	(revision 420473)
>+++ files/patch-src_shared.c	(nonexistent)
>@@ -1,67 +0,0 @@
>---- src/shared.c.orig	2016-06-28 09:47:32 UTC
>-+++ src/shared.c
>-@@ -10,6 +10,11 @@
>- #include <stdio.h>
>- #endif
>- 
>-+#ifdef __FreeBSD__
>-+#include <stdio.h>
>-+#include <pthread_np.h>
>-+#endif
>-+
>- #include <shared.h>
>- #include <limits.h>
>- 
>-@@ -2382,7 +2387,7 @@ int tty_fix()
>- }
>- #endif
>- 
>--#ifdef DARWIN
>-+#if defined(DARWIN) || defined(__FreeBSD__)
>- static struct termios savemodes;
>- static int havemodes = 0;
>- 
>-@@ -4371,6 +4376,23 @@ char *get_exec_path ()
>- 
>-   const int len = strlen (exec_path);
>- 
>-+  #elif __FreeBSD__
>-+
>-+  #include <sys/sysctl.h>
>-+
>-+  int mib[4];
>-+  mib[0] = CTL_KERN;
>-+  mib[1] = KERN_PROC;
>-+  mib[2] = KERN_PROC_PATHNAME;
>-+  mib[3] = -1;
>-+
>-+  char tmp[32] = { 0 };
>-+
>-+  size_t size = exec_path_len;
>-+  sysctl(mib, 4, exec_path, &size, NULL, 0);
>-+
>-+  const int len = readlink (tmp, exec_path, exec_path_len - 1);
>-+
>-   #else
>-   #error Your Operating System is not supported or detected
>-   #endif
>-@@ -4523,6 +4545,9 @@ void set_cpu_affinity (char *cpu_affinit
>- {
>-   #ifdef _WIN
>-   DWORD_PTR aff_mask = 0;
>-+  #elif __FreeBSD__
>-+  cpuset_t cpuset;
>-+  CPU_ZERO (&cpuset);
>-   #elif _POSIX
>-   cpu_set_t cpuset;
>-   CPU_ZERO (&cpuset);
>-@@ -4570,6 +4595,9 @@ void set_cpu_affinity (char *cpu_affinit
>-   #ifdef _WIN
>-   SetProcessAffinityMask (GetCurrentProcess (), aff_mask);
>-   SetThreadAffinityMask (GetCurrentThread (), aff_mask);
>-+  #elif __FreeBSD__
>-+  pthread_t thread = pthread_self ();
>-+  pthread_setaffinity_np (thread, sizeof (cpuset_t), &cpuset);
>-   #elif _POSIX
>-   pthread_t thread = pthread_self ();
>-   pthread_setaffinity_np (thread, sizeof (cpu_set_t), &cpuset);
>
>Property changes on: files/patch-src_shared.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 420473)
>+++ pkg-plist	(working copy)
>@@ -94,6 +94,9 @@
> %%DATADIR%%/OpenCL/m01100_a0.cl
> %%DATADIR%%/OpenCL/m01100_a1.cl
> %%DATADIR%%/OpenCL/m01100_a3.cl
>+%%DATADIR%%/OpenCL/m13900_a0.cl
>+%%DATADIR%%/OpenCL/m13900_a1.cl
>+%%DATADIR%%/OpenCL/m13900_a3.cl
> %%DATADIR%%/OpenCL/m01400_a0.cl
> %%DATADIR%%/OpenCL/m01400_a1.cl
> %%DATADIR%%/OpenCL/m01400_a3.cl

Actions: View | Diff

Attachments on bug 211998: 173861 | 173862