fix build with openssl >= 1.1.0

2 files changed, 67 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b27c60423bdf..768f643f9066 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,21 @@
+# Generated by mksrcinfo v8
+# Thu Nov 30 22:28:11 UTC 2017
 pkgbase = john-mpi
 	pkgdesc = JohnTheRipper password cracker with Jumbo patch and MPI support
 	pkgver = 1.8.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://openwall.info
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = mpich
+	makedepends = unzip
 	depends = mpich
+	depends = libpcap
+	depends = gcc6-libs
+	optdepends = perl
+	optdepends = python2
+	optdepends = ruby
 	provides = john
 	conflicts = john
 	conflicts = john-latest
@@ -15,11 +23,9 @@ pkgbase = john-mpi
 	backup = etc/john/dumb32.conf
 	backup = etc/john/dumb16.conf
 	backup = etc/john/dynamic.conf
-	source = http://www.openwall.com/john/j/john-1.8.0-jumbo-1.tar.xz
-	source = https://github.com/magnumripper/JohnTheRipper/commit/e2e868db3e153b3f959e119a51703d4afb99c624.patch
+	source = https://github.com/magnumripper/JohnTheRipper/archive/76109448e1a42e6a900d61ee87d0c9e3b6f76215.zip
 	source = params.h.patch
-	sha256sums = bac93d025995a051f055adbd7ce2f1975676cac6c74a6c7a3ee4cfdd9c160923
-	sha256sums = c84d53f4e2b5c15c9ab83aea05d72a7e1492e4f0cb547e0047aa91458851aee5
+	sha256sums = ca8a7099b8f121ee0e3061d8bc0e7c875a8785d5aff74266a354466d9afd548f
 	sha256sums = 432466152dda1bfaae66095ac6d1db48e91c2557e412c799b8c01921b749414a
 
 pkgname = john-mpi
diff --git a/PKGBUILD b/PKGBUILD
index 04e3c9449ee1..5af521ac1b70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,9 @@
-#Contributor: MatToufoutu <mattoufootu[at]gmail[dot]com>
-#Contributor: Jan Lieven jan[at]das<minus>labor(dot)org
-
 pkgname=john-mpi
 pkgver=1.8.0
-pkgrel=3
+pkgrel=4
 _patchlevel=jumbo-1
+_commit=76109448e1a42e6a900d61ee87d0c9e3b6f76215
+_pkgname=JohnTheRipper
 arch=('i686' 'x86_64')
 pkgdesc='JohnTheRipper password cracker with Jumbo patch and MPI support'
 url='http://openwall.info'
@@ -12,86 +11,88 @@ license=('GPL')
 provides=('john')
 conflicts=('john' 'john-latest')
 # For OpenCL support change swap the {make}depends arrays
-depends=('mpich')
-makedepends=('mpich')
+depends=('mpich' 'libpcap' 'gcc6-libs')
+optdepends=('perl' 'python2' 'ruby')
+makedepends=('mpich' 'unzip')
 # Remember to include one of the following packages into the depends
 # array for OpenCL to work:
 # opencl-mesa
 # amdapp-sdk
 # opencl-nvidia
+# cuda
 # intel-opencl-sdk
-#depends=('mpich' 'opencl-nvidia')
-#makedepends=('opencl-headers')
+#depends=('mpich'
+#         'libcl'
+#         'YOUR_OPENCL_VENDOR_HERE')
+#makedepends=('opencl-headers'
+#             'libcl')
 backup=(etc/john/john.conf
         etc/john/dumb32.conf
         etc/john/dumb16.conf
         etc/john/dynamic.conf)
 
-source=("http://www.openwall.com/john/j/john-${pkgver}-${_patchlevel}.tar.xz"
-        "https://github.com/magnumripper/JohnTheRipper/commit/e2e868db3e153b3f959e119a51703d4afb99c624.patch"
+source=("https://github.com/magnumripper/${_pkgname}/archive/${_commit}.zip"
         "params.h.patch")
 
 prepare() {
-  cd ${srcdir}/john-${pkgver}-${_patchlevel}/src
+  cd ${srcdir}/${_pkgname}-${_commit}/src
   patch -p0 < ${srcdir}/params.h.patch
-	patch -p2 < ${srcdir}/e2e868db3e153b3f959e119a51703d4afb99c624.patch
 }
 
 build() {
   export PATH=/opt/mpich/bin:${PATH}
-	export CFLAGS="${CFLAGS} -DJOHN_SYSTEMWIDE=1"
+  export CFLAGS="${CFLAGS} -DJOHN_SYSTEMWIDE=1"
 
-  cd ${srcdir}/john-${pkgver}-${_patchlevel}/src
-	./configure --prefix=/usr --enable-mpi
+  cd ${srcdir}/${_pkgname}-${_commit}/src
+  ./configure --prefix=/usr --enable-mpi
 
-	if [ $(which icc) -eq 0 ]; then
-		case "${CARCH}" in
-			"x86_64")
-				make sse-intrinsics-64.S
-				break
-				;;
-			"i686")
-				make sse-intrinsics-32.S
-				break
-				;;
-		esac
-	fi
+  if [ $(which icc &>/dev/null; echo $?) -eq 0 ]; then
+    case "${CARCH}" in
+      "x86_64")
+        make sse-intrinsics-64.S
+        break
+        ;;
+      "i686")
+        make sse-intrinsics-32.S
+        break
+        ;;
+    esac
+  fi
 
-	make
+  make
 }
 
 package() {
-	# config file
-	sed -i 's|$JOHN|/usr/share/john|g' ${srcdir}/john-${pkgver}-${_patchlevel}/run/john.conf
-  sed -i 's|/usr/share/john/dumb|/etc/john/dumb|g' ${srcdir}/john-${pkgver}-${_patchlevel}/run/john.conf
-  sed -i 's|/usr/share/john/korelogic.conf|/etc/john/korelogic.conf|g' ${srcdir}/john-${pkgver}-${_patchlevel}/run/john.conf
-  sed -i 's|/usr/share/john/repeats16.conf|/etc/john/repeats16.conf|g' ${srcdir}/john-${pkgver}-${_patchlevel}/run/john.conf
-  sed -i 's|/usr/share/john/repeats32.conf|/etc/john/repeats32.conf|g' ${srcdir}/john-${pkgver}-${_patchlevel}/run/john.conf
-  sed -i 's|.include <regex_alphabets.conf>|.include /etc/john/regex_alphabets.conf|g' ${srcdir}/john-${pkgver}-${_patchlevel}/run/john.conf
-  sed -i 's|.include <dynamic.conf>|.include /etc/john/dynamic.conf|g' ${srcdir}/john-${pkgver}-${_patchlevel}/run/john.conf
-  sed -i 's|.include "/usr/share/john/john.local.conf"|#.include "/usr/share/john/john.local.conf"|g' ${srcdir}/john-${pkgver}-${_patchlevel}/run/john.conf
+  # config file
+  sed -i 's|$JOHN|/usr/share/john|g' ${srcdir}/${_pkgname}-${_commit}/run/john.conf
+  sed -i 's|/usr/share/john/dumb|/etc/john/dumb|g' ${srcdir}/${_pkgname}-${_commit}/run/john.conf
+  sed -i 's|/usr/share/john/korelogic.conf|/etc/john/korelogic.conf|g' ${srcdir}/${_pkgname}-${_commit}/run/john.conf
+  sed -i 's|/usr/share/john/repeats16.conf|/etc/john/repeats16.conf|g' ${srcdir}/${_pkgname}-${_commit}/run/john.conf
+  sed -i 's|/usr/share/john/repeats32.conf|/etc/john/repeats32.conf|g' ${srcdir}/${_pkgname}-${_commit}/run/john.conf
+  sed -i 's|.include <regex_alphabets.conf>|.include /etc/john/regex_alphabets.conf|g' ${srcdir}/${_pkgname}-${_commit}/run/john.conf
+  sed -i 's|.include <dynamic.conf>|.include /etc/john/dynamic.conf|g' ${srcdir}/${_pkgname}-${_commit}/run/john.conf
+  sed -i 's|.include "/usr/share/john/john.local.conf"|#.include "/usr/share/john/john.local.conf"|g' ${srcdir}/${_pkgname}-${_commit}/run/john.conf
   install -dm755 ${pkgdir}/etc/john
-	install -m644 ${srcdir}/john-${pkgver}-${_patchlevel}/run/*.conf ${pkgdir}/etc/john/
-	
-	# docs
-	install -d -m755 ${pkgdir}/usr/share/doc/john
-	install -m644 ${srcdir}/john-${pkgver}-${_patchlevel}/doc/* ${pkgdir}/usr/share/doc/john/
-	install -d -m755 ${pkgdir}/usr/share/john/
-	install -m644 ${srcdir}/john-${pkgver}-${_patchlevel}/run/*.chr ${pkgdir}/usr/share/john/
-	install -m644 ${srcdir}/john-${pkgver}-${_patchlevel}/run/password.lst ${pkgdir}/usr/share/john/
-	install -Dm644 ${srcdir}/john-${pkgver}-${_patchlevel}/doc/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+  install -m644 ${srcdir}/${_pkgname}-${_commit}/run/*.conf ${pkgdir}/etc/john/
+  
+  # docs
+  install -d -m755 ${pkgdir}/usr/share/doc/john
+  install -m644 ${srcdir}/${_pkgname}-${_commit}/doc/* ${pkgdir}/usr/share/doc/john/
+  install -d -m755 ${pkgdir}/usr/share/john/
+  install -m644 ${srcdir}/${_pkgname}-${_commit}/run/*.chr ${pkgdir}/usr/share/john/
+  install -m644 ${srcdir}/${_pkgname}-${_commit}/run/password.lst ${pkgdir}/usr/share/john/
+  install -Dm644 ${srcdir}/${_pkgname}-${_commit}/doc/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 
-	# install binaries
-  cd ${srcdir}/john-${pkgver}-${_patchlevel}/run/
+  # install binaries
+  cd ${srcdir}/${_pkgname}-${_commit}/run/
   for i in $(find . -type f -perm 755); do
     install -Dm755 ${i} ${pkgdir}/usr/bin/${i}
   done
-	cd ${pkgdir}/usr/bin
-	ln -s john unafs
-	ln -s john unique
-	ln -s john unshadow
-	ln -s john undrop
+  cd ${pkgdir}/usr/bin
+  ln -s john unafs
+  ln -s john unique
+  ln -s john unshadow
+  ln -s john undrop
 }
-sha256sums=('bac93d025995a051f055adbd7ce2f1975676cac6c74a6c7a3ee4cfdd9c160923'
-            'c84d53f4e2b5c15c9ab83aea05d72a7e1492e4f0cb547e0047aa91458851aee5'
+sha256sums=('ca8a7099b8f121ee0e3061d8bc0e7c875a8785d5aff74266a354466d9afd548f'
             '432466152dda1bfaae66095ac6d1db48e91c2557e412c799b8c01921b749414a')