summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-12-08 16:53:40 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-12-08 16:53:40 -0300
commite80e2efe702f235e72000ad8a27a0cb7ca3f2248 (patch)
tree7acc42c4b796220713b2b0f3412f1a8e7805706a
parent9a3e5868b223754d0b303d34f4332e7abfa33073 (diff)
hashcat-3.20-2.parabola1: fix march and flags
-rw-r--r--libre/hashcat/PKGBUILD13
-rw-r--r--libre/hashcat/fix-make-flags.patch40
2 files changed, 50 insertions, 3 deletions
diff --git a/libre/hashcat/PKGBUILD b/libre/hashcat/PKGBUILD
index 37458b3a8..4e93ec750 100644
--- a/libre/hashcat/PKGBUILD
+++ b/libre/hashcat/PKGBUILD
@@ -4,18 +4,25 @@
pkgname=hashcat
pkgver=3.20
-pkgrel=1.parabola1
+pkgrel=2.parabola1
pkgdesc='Multithreaded advanced password recovery utility, without nonfree libxnvctrl recommendation'
url='https://hashcat.net/hashcat'
arch=('i686' 'x86_64' 'armv7h')
depends=('gmp' 'opencl-icd-loader')
makedepends=('opencl-headers')
license=('MIT')
-source=(https://hashcat.net/files/${pkgname}-${pkgver}.tar.gz{,.asc})
+source=(https://hashcat.net/files/${pkgname}-${pkgver}.tar.gz{,.asc}
+ fix-make-flags.patch)
sha512sums=('2d227b6d73eeb06461dba995368cad2e1b0df9ab5c60a6aec101a30cca213ff50424576b1e6674d362e258bb8fd2158ca6c19925d781f9fefcaa8024217460af'
- 'SKIP')
+ 'SKIP'
+ '04d86c0480c221f3e781534b0a9a50950a376a8c798ebee8042446f5d2e11f78677f7c670deb5f132fcf38c962ea13c64ac522e2a18712efbad559a5077dc211')
validpgpkeys=('A70833229D040B4199CC00523C17DA8B8A16544F') # Hashcat signing key <signing@hashcat.net>
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 < "${srcdir}/fix-make-flags.patch"
+}
+
build() {
cd ${pkgname}-${pkgver}
make PREFIX=/usr
diff --git a/libre/hashcat/fix-make-flags.patch b/libre/hashcat/fix-make-flags.patch
new file mode 100644
index 000000000..ed704d612
--- /dev/null
+++ b/libre/hashcat/fix-make-flags.patch
@@ -0,0 +1,40 @@
+From 62fc436a4f2b1ed3adbab920cf3b1572a5c53e9b Mon Sep 17 00:00:00 2001
+From: anthraxx <levente@leventepolyak.net>
+Date: Tue, 6 Dec 2016 20:39:04 +0100
+Subject: [PATCH] extend global CFLAGS and LDFLAGS to aid distro packaging
+
+This preserves globally defined CFLAGS and LDFLAGS and simply
+extends those variables to aid distro based packaging toolchains
+and predefined distro wide defaults like SSP, relro etc.
+
+this re-fixes 7f8aaf74302816d03fbff62dab5c987d498acdde after it was
+somehow undone ;)
+---
+ src/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 308ad41..e7d8307 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -101,7 +101,7 @@ BINARY_NATIVE := $(PROG_NAME)
+ ## General compiler and linker options
+ ##
+
+-CFLAGS := -pipe -std=c99 -Iinclude/ -IOpenCL/
++CFLAGS += -pipe -std=c99 -Iinclude/ -IOpenCL/
+ CFLAGS += -W
+ CFLAGS += -Wall
+ CFLAGS += -Wextra
+@@ -137,7 +137,7 @@ CFLAGS += -ftrapv
+
+ #CFLAGS += -Wstack-usage=524288
+
+-LFLAGS :=
++LFLAGS := $(LDFLAGS)
+
+ ifndef DEBUG
+ CFLAGS += -O2
+--
+2.10.2
+