From fbf05aaad19ef1496afa4753af7401df2b579a05 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@gmail.com>
Date: Fri, 25 Mar 2016 17:35:26 -0400
Subject: [PATCH] john: new version of libressl

---
 srcpkgs/john/patches/libressl.patch  | 4 ++--
 srcpkgs/john/patches/truecrypt.patch | 4 ++--
 srcpkgs/john/template                | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/john/patches/libressl.patch b/srcpkgs/john/patches/libressl.patch
index 9414aff294b..2995bff6af6 100644
--- a/srcpkgs/john/patches/libressl.patch
+++ b/srcpkgs/john/patches/libressl.patch
@@ -1,5 +1,5 @@
---- common.h	2015-02-02 15:49:37.819305586 +0100
-+++ common.h	2015-02-02 15:47:25.449554007 +0100
+--- src/common.h	2015-02-02 15:49:37.819305586 +0100
++++ src/common.h	2015-02-02 15:47:25.449554007 +0100
 @@ -75,4 +75,6 @@
   */
  extern void common_init(void);
diff --git a/srcpkgs/john/patches/truecrypt.patch b/srcpkgs/john/patches/truecrypt.patch
index c88648472c5..16d37471a30 100644
--- a/srcpkgs/john/patches/truecrypt.patch
+++ b/srcpkgs/john/patches/truecrypt.patch
@@ -5,8 +5,8 @@ Date:   Thu Dec 18 21:24:01 2014 +0100
 
     Fix a bug in truecrypt for non-x86 archs. Closes #912.
 
---- truecrypt_fmt_plug.c
-+++ truecrypt_fmt_plug.c
+--- src/truecrypt_fmt_plug.c
++++ src/truecrypt_fmt_plug.c
 @@ -310,8 +310,8 @@ static int crypt_all(int *pcount, struct db_salt *salt)
  			pbkdf2_sha512_sse((const unsigned char **)pin, lens, psalt->salt, 64, psalt->num_iterations, &(x.poutc), sizeof(key), 0);
  		}
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index 256ec1d0db5..3918f08b0b4 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,9 +1,10 @@
 # Template file for 'john'
 pkgname=john
 version=1.8.0
+revision=6
 _jumbover=1
-revision=5
-wrksrc="${pkgname}-${version}-jumbo-${_jumbover}/src"
+wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
+build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--disable-native-tests --disable-native-macro"
 hostmakedepends="libgomp-devel pkg-config"