[arch-commits] Commit in hashcat/repos/community-x86_64 (3 files)
Levente Polyak
anthraxx at archlinux.org
Sat Nov 10 15:20:35 UTC 2018
Date: Saturday, November 10, 2018 @ 15:20:35
Author: anthraxx
Revision: 405674
archrelease: copy trunk to community-x86_64
Added:
hashcat/repos/community-x86_64/0001-add-optional-support-for-system-xxhash.patch
(from rev 405673, hashcat/trunk/0001-add-optional-support-for-system-xxhash.patch)
hashcat/repos/community-x86_64/PKGBUILD
(from rev 405673, hashcat/trunk/PKGBUILD)
Deleted:
hashcat/repos/community-x86_64/PKGBUILD
---------------------------------------------------+
0001-add-optional-support-for-system-xxhash.patch | 83 ++++++++++++++++++++
PKGBUILD | 77 +++++++++++-------
2 files changed, 129 insertions(+), 31 deletions(-)
Copied: hashcat/repos/community-x86_64/0001-add-optional-support-for-system-xxhash.patch (from rev 405673, hashcat/trunk/0001-add-optional-support-for-system-xxhash.patch)
===================================================================
--- 0001-add-optional-support-for-system-xxhash.patch (rev 0)
+++ 0001-add-optional-support-for-system-xxhash.patch 2018-11-10 15:20:35 UTC (rev 405674)
@@ -0,0 +1,83 @@
+From bd803a71f7f6381ff06ab93c53ed173427b2d5df Mon Sep 17 00:00:00 2001
+From: anthraxx <levente at leventepolyak.net>
+Date: Thu, 8 Nov 2018 00:47:55 +0100
+Subject: [PATCH] add optional support for system xxhash
+
+---
+ src/Makefile | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/Makefile b/src/Makefile
+index 8d3eca9a..cd43b654 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -145,6 +145,7 @@ WIN_ICONV_64 := /opt/win-iconv-64
+
+ COMPTIME := $(shell date +%s)
+ SYSTEM_LZMA_SDK := 0
++SYSTEM_XXHASH := 0
+
+ LZMA_SDK_INCLUDE := $(LIBRARY_DEV_ROOT_FOLDER)/lzma-sdk/C
+
+@@ -189,7 +190,11 @@ endif
+ # brain and xxHash
+ ifeq ($(ENABLE_BRAIN),1)
+ CFLAGS += -DWITH_BRAIN
++ifeq ($(SYSTEM_XXHASH),0)
+ CFLAGS += -Ideps/git/xxHash
++else
++LFLAGS += -lxxhash
++endif
+ endif
+
+ ##
+@@ -313,6 +318,7 @@ WIN_32_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.32.o)
+ WIN_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.64.o)
+
+ ifeq ($(ENABLE_BRAIN),1)
++ifeq ($(SYSTEM_XXHASH),0)
+ OBJS_XXHASH := xxhash
+
+ NATIVE_STATIC_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).NATIVE.STATIC.o)
+@@ -324,6 +330,7 @@ LINUX_64_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).LINUX.64.o)
+ WIN_32_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).WIN.32.o)
+ WIN_64_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).WIN.64.o)
+ endif
++endif
+
+ ifeq ($(SYSTEM_LZMA_SDK),0)
+ OBJS_LZMA := Alloc Lzma2Dec LzmaDec
+@@ -474,12 +481,14 @@ obj/%.NATIVE.SHARED.o: src/%.c
+ $(CC) -c $(CFLAGS_NATIVE) $< -o $@ -fpic
+
+ ifeq ($(ENABLE_BRAIN),1)
++ifeq ($(SYSTEM_XXHASH),0)
+ obj/%.NATIVE.STATIC.o: deps/git/xxHash/%.c
+ $(CC) -c $(CFLAGS_NATIVE) $< -o $@
+
+ obj/%.NATIVE.SHARED.o: deps/git/xxHash/%.c
+ $(CC) -c $(CFLAGS_NATIVE) $< -o $@ -fpic
+ endif
++endif
+
+ ifeq ($(SYSTEM_LZMA_SDK),0)
+ obj/%.NATIVE.STATIC.o: deps/lzma_sdk/%.c
+@@ -522,6 +531,7 @@ obj/%.WIN.64.o: src/%.c
+ $(CC_WIN_64) $(CFLAGS_CROSS_WIN64) -c -o $@ $<
+
+ ifeq ($(ENABLE_BRAIN),1)
++ifeq ($(SYSTEM_XXHASH),0)
+ obj/%.LINUX.32.o: deps/git/xxHash/%.c
+ $(CC_LINUX_32) $(CFLAGS_CROSS_LINUX32) -c -o $@ $<
+
+@@ -534,6 +544,7 @@ obj/%.WIN.32.o: deps/git/xxHash/%.c
+ obj/%.WIN.64.o: deps/git/xxHash/%.c
+ $(CC_WIN_64) $(CFLAGS_CROSS_WIN64) -c -o $@ $<
+ endif
++endif
+
+ ifeq ($(SYSTEM_LZMA_SDK),0)
+ obj/%.LINUX.32.o: deps/lzma_sdk/%.c
+--
+2.19.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-10 15:20:27 UTC (rev 405673)
+++ PKGBUILD 2018-11-10 15:20:35 UTC (rev 405674)
@@ -1,31 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Sam Stuewe <halosghost at archlinux dot info>
-
-pkgname=hashcat
-pkgver=4.2.1
-pkgrel=1
-epoch=1
-pkgdesc='Multithreaded advanced password recovery utility'
-url='https://hashcat.net/hashcat'
-arch=('x86_64')
-depends=('opencl-icd-loader')
-optdepends=('libxnvctrl: NVIDIA X driver configuration support')
-makedepends=('opencl-headers' 'libxnvctrl')
-license=('MIT')
-source=(https://hashcat.net/files/${pkgname}-${pkgver}.tar.gz{,.asc})
-sha512sums=('a2cfc7e19e82b237892bacc79ca1a62a3b2ea598e4e5f60d4e275a0c128d865945595d8f918e3bb93bf62376f11f448ff53257faa12fd051dfc64973fbb6ed1e'
- 'SKIP')
-validpgpkeys=('A70833229D040B4199CC00523C17DA8B8A16544F') # Hashcat signing key <signing at hashcat.net>
-
-build() {
- cd ${pkgname}-${pkgver}
- make PREFIX=/usr SHARED=1
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" PREFIX=/usr SHARED=1 install
- install -Dm 644 docs/license.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-# vim: ts=2 sw=2 et:
Copied: hashcat/repos/community-x86_64/PKGBUILD (from rev 405673, hashcat/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-10 15:20:35 UTC (rev 405674)
@@ -0,0 +1,46 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Sam Stuewe <halosghost at archlinux dot info>
+
+pkgname=hashcat
+pkgver=5.0.0
+pkgrel=1
+epoch=1
+pkgdesc='Multithreaded advanced password recovery utility'
+url='https://hashcat.net/hashcat'
+arch=('x86_64')
+depends=('ocl-icd' 'xxhash')
+makedepends=('opencl-headers')
+provides=('libhashcat.so')
+license=('MIT')
+source=(https://hashcat.net/files/${pkgname}-${pkgver}.tar.gz{,.asc}
+ 0001-add-optional-support-for-system-xxhash.patch)
+sha512sums=('090f07a011961a2c9a9bdf31e8a5efae4b443b6b205e964a6cd74bed6efe8fae2377f22ce7728ad7e732e9f943cf30da88066fe0990d085547f1e2ba000a3d95'
+ 'SKIP'
+ '3c1311e07d624b929e35273e282f1bfa0e86d5d1c46bb04a6576278a5455c440621f673e3c22846dda21cec4b328ec1276e15f4b286094fe7b40a7506cfa7a46')
+validpgpkeys=('A70833229D040B4199CC00523C17DA8B8A16544F') # Hashcat signing key <signing at hashcat.net>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 < ../0001-add-optional-support-for-system-xxhash.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ make \
+ PREFIX=/usr \
+ SHARED=1 \
+ SYSTEM_XXHASH=1
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make \
+ DESTDIR="${pkgdir}" \
+ PREFIX=/usr \
+ SHARED=1 \
+ SYSTEM_XXHASH=1 \
+ install
+ install -Dm 644 docs/license.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+# vim: ts=2 sw=2 et:
More information about the arch-commits
mailing list