[arch-commits] Commit in john/trunk (PKGBUILD)

[Caleb Maclennan]

    Date: Saturday, December 25, 2021 @ 10:18:06
  Author: alerque
Revision: 1083545

upgpkg: john 1.9.0.jumbo1-6; drop python2 optdepends, patch for build with gcc11

Modified:
  john/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-25 09:58:17 UTC (rev 1083544)
+++ PKGBUILD	2021-12-25 10:18:06 UTC (rev 1083545)
@@ -1,4 +1,5 @@
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Caleb Maclennan <caleb at alerque.com>
 # Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Dale Blount <dale at archlinux.org>
@@ -9,7 +10,7 @@
 _jumbover=1
 _johnver=1.9.0
 pkgver=${_johnver}.jumbo${_jumbover}
-pkgrel=5
+pkgrel=6
 pkgdesc='John the Ripper password cracker'
 url='https://www.openwall.com/john'
 arch=('x86_64')
@@ -21,15 +22,18 @@
   'lua: lua based john scripts'
   'perl: perl based john scripts'
   'ruby: ruby based john scripts'
-  'python2: python2 based john scripts'
   'python: python based john scripts')
 makedepends=('pkg-config' 'opencl-headers')
 backup=('etc/john/john.conf')
 source=(https://www.openwall.com/john/k/john-${_johnver}-jumbo-${_jumbover}.tar.xz{,.sign}
-        john-pdf2john-path-fix.patch::https://github.com/openwall/john/commit/66cf12d17e9fa453b34bcd9d0b8dc4f1954e8cff.patch)
+        john-pdf2john-path-fix.patch::https://github.com/openwall/john/commit/66cf12d17e9fa453b34bcd9d0b8dc4f1954e8cff.patch
+        john-fix-gcc11-build.patch::https://github.com/openwall/john/commit/8152ac071bce1ebc98fac6bed962e90e9b92d8cf.patch
+        john-fix-opencl-topology.patch::https://raw.githubusercontent.com/hlein/gentoo/bfdb9a0c7b1a88f607a7f33137ff60f2bf8002c0/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-opencl-fix.patch)
 sha512sums=('c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808'
             'SKIP'
-            '8ab1eb9736aa9114fc2ac6713a186e9938caeeb642ace820a6403a7f76959bb6b2fa42587a5ce7ce9e8569892d92bbd1c26248a4a577ecacfb5ed141958bf281')
+            '8ab1eb9736aa9114fc2ac6713a186e9938caeeb642ace820a6403a7f76959bb6b2fa42587a5ce7ce9e8569892d92bbd1c26248a4a577ecacfb5ed141958bf281'
+            '340e7effa0560665dc06c85bde464fad2b2e0aa051ba206e306c3286f43db83af089196cda79feb6fc0e512cb27b80808ee11436f07fd2d2956d7f10bb972cd8'
+            '81f9dabc6d8ad54944be7eb9b3c7204ce426db842325c31662038e213775c0a86288c860712e6d3c24f7a9d0b7a0fd8962126a25242f45e5f242307691a97d38')
 validpgpkeys=(
   '297AD21CF86C948081520C1805C027FD4BDC136E' # Openwall offline signing key
 )
@@ -37,6 +41,8 @@
 prepare() {
   cd ${pkgname}-${_johnver}-jumbo-${_jumbover}
   patch -Np1 < "${srcdir}/john-pdf2john-path-fix.patch"
+  patch -Np1 < "${srcdir}/john-fix-gcc11-build.patch"
+  patch -Np1 < "${srcdir}/john-fix-opencl-topology.patch"
   cd src
   sed 's|$prefix/bin|/usr/lib/john|' -i configure.ac
   autoreconf -fiv