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

[Levente Polyak]

    Date: Tuesday, August 23, 2016 @ 20:47:17
  Author: anthraxx
Revision: 187428

upgpkg: john 1.8.0.jumbo1-2 (FS#50332)

distribute special scripts to /usr/lib/john and optdepend
on python2

Modified:
  john/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-23 19:52:41 UTC (rev 187427)
+++ PKGBUILD	2016-08-23 20:47:17 UTC (rev 187428)
@@ -9,7 +9,7 @@
 _jumbover=1
 _johnver=1.8.0
 pkgver=${_johnver}.jumbo${_jumbover}
-pkgrel=1
+pkgrel=2
 pkgdesc='John the Ripper password cracker'
 url='http://www.openwall.com/john'
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
   'bash-completion: completion for bash'
   'perl: perl based john scripts'
   'ruby: ruby based john scripts'
-  'python: python based john scripts'
+  'python2: python based john scripts'
   'opencl-nvidia: OpenCL implemention for NVIDIA'
   'opencl-mesa: OpenCL support for AMD/ATI Radeon mesa drivers'
 )
@@ -43,6 +43,8 @@
   patch -p1 < "${srcdir}/gcc5.patch"
   patch -p1 < "${srcdir}/fix-32bit.patch"
   patch -Rp1 < "${srcdir}/fix-i686-openmp.patch"
+  sed 's|env python|env python2|' -i run/*.py
+  sed 's|/usr/bin/python|/usr/bin/python2|' -i run/*.py
 }
 
 build() {
@@ -115,7 +117,7 @@
   done
 
   # scripts
-  install -Dm 755 run/*.py run/*.pl run/*.rb run/{mailer,benchmark-unify} -t "${pkgdir}/usr/share/john"
+  install -Dm 755 run/*.py run/*.pl run/*.rb run/{mailer,benchmark-unify} -t "${pkgdir}/usr/lib/john"
 
   # data
   install -Dm 644 run/*.chr run/*.lst run/dictionary* run/stats -t "${pkgdir}/usr/share/john"