upgpkg: hashcat-git 3.20.2954.fa598a4-1 (remove upstreamed patch)

upstream release

3 files changed, 4 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f02653a42781..c66d70680c76 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hashcat-git
 	pkgdesc = Multithreaded advanced password recovery utility
-	pkgver = 3.20.2949.2039e2c
+	pkgver = 3.20.2954.fa598a4
 	pkgrel = 1
 	url = https://hashcat.net/hashcat
 	arch = i686
@@ -14,9 +14,7 @@ pkgbase = hashcat-git
 	provides = hashcat
 	conflicts = hashcat
 	source = hashcat-git::git+https://github.com/hashcat/hashcat
-	source = fix-make-flags.patch
 	sha512sums = SKIP
-	sha512sums = 04d86c0480c221f3e781534b0a9a50950a376a8c798ebee8042446f5d2e11f78677f7c670deb5f132fcf38c962ea13c64ac522e2a18712efbad559a5077dc211
 
 pkgname = hashcat-git
 
diff --git a/PKGBUILD b/PKGBUILD
index f28741f3f982..182afd644b89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Sam Stuewe <halosghost at archlinux dot info>
 
 pkgname=hashcat-git
-pkgver=3.20.2949.2039e2c
+pkgver=3.20.2954.fa598a4
 pkgrel=1
 pkgdesc='Multithreaded advanced password recovery utility'
 url='https://hashcat.net/hashcat'
@@ -13,15 +13,8 @@ makedepends=('git' 'opencl-headers')
 license=('MIT')
 provides=('hashcat')
 conflicts=('hashcat')
-source=(${pkgname}::git+https://github.com/hashcat/hashcat
-        fix-make-flags.patch)
-sha512sums=('SKIP'
-            '04d86c0480c221f3e781534b0a9a50950a376a8c798ebee8042446f5d2e11f78677f7c670deb5f132fcf38c962ea13c64ac522e2a18712efbad559a5077dc211')
-
-prepare() {
-  cd ${pkgname}
-  patch -p1 < "${srcdir}/fix-make-flags.patch"
-}
+source=(${pkgname}::git+https://github.com/hashcat/hashcat)
+sha512sums=('SKIP')
 
 pkgver() {
   cd ${pkgname}
diff --git a/fix-make-flags.patch b/fix-make-flags.patch
deleted file mode 100644
index ed704d612b91..000000000000
--- a/fix-make-flags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
-