autu: Update to 0.0.7-1

3 files changed, 33 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f04b9ba3aa7b..a59ec47e7fed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
+# Generated by mksrcinfo v8
+# Mon Apr  8 01:20:34 UTC 2019
 pkgbase = joomscan
 	pkgdesc = Detects file inclusion, sql injection, command execution vulnerabilities of a target Joomla! web site.
-	pkgver = 2012_03_10
+	pkgver = 0.0.7
 	pkgrel = 1
-	url = http://joomscan.sourceforge.net/
+	url = https://github.com/rezasp/joomscan
 	arch = any
 	license = LGPL3
 	makedepends = unzip
-	depends = perl-switch
-	depends = perl-www-mechanize
-	noextract = joomscan-latest.zip
+	depends = perl
+	depends = perl-libwww
+	noextract = 0.0.7.tar.gz
+	options = !strip
 	source = joomscan.sh
-	source = http://sourceforge.net/projects/joomscan/files/joomscan/2012-03-10/joomscan-latest.zip
-	sha256sums = 67de695ba7db7ef5864bd0c888dc9578de6a7139d4286ed4bc6ba42a486cda32
-	sha256sums = 7edbcf069fe60b032cd273d06de1f8c40459c65ae8e604602e8f60150f08ec6e
+	source = joomscan-0.0.7.tgz::https://github.com/rezasp/joomscan/archive/0.0.7.tar.gz
+	sha256sums = 68e29fe5e982b34ab5e35633fac2e3f4672571ed520aca952c80fb0f110124cd
+	sha256sums = e5bd03f77409a65f7fa4a9768ee640f86e03e422b5def5008d5abe14b4ffc04f
 
 pkgname = joomscan
 
diff --git a/PKGBUILD b/PKGBUILD
index 06610481a9f3..7a8c117d5939 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,42 @@
 # Maintainer:  Chris Severance aur.severach aATt spamgourmet dott com
 # Contributor: /dev/rs0 <rs0@secretco.de.com>
 
+# TODO: Improve /usr/share/joomla detection for proper packaging
+# TODO: eliminate chmod 777 on reports
+
 set -u
 pkgname='joomscan'
-pkgver='2012_03_10'
+pkgver='0.0.7'
 pkgrel='1'
 pkgdesc='Detects file inclusion, sql injection, command execution vulnerabilities of a target Joomla! web site.'
 arch=('any')
-url="http://${pkgname}.sourceforge.net/"
+#url="http://${pkgname}.sourceforge.net/"
+url="https://github.com/rezasp/joomscan"
 license=('LGPL3')
-
-depends=('perl-switch' 'perl-www-mechanize')
+depends=('perl' 'perl-libwww') # 'perl-switch' 'perl-www-mechanize'
 makedepends=('unzip')
-
+options=('!strip')
 _srcdir="${pkgname}-${pkgver}"
 source=(
     'joomscan.sh'
-    "http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver//_/-}/${pkgname}-latest.zip"
+    #"http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver//_/-}/${pkgname}-latest.zip"
+    "${_srcdir}.tgz::https://github.com/rezasp/joomscan/archive/${pkgver}.tar.gz"
 )
 noextract=("${source[1]##*/}")
-sha256sums=('67de695ba7db7ef5864bd0c888dc9578de6a7139d4286ed4bc6ba42a486cda32'
-            '7edbcf069fe60b032cd273d06de1f8c40459c65ae8e604602e8f60150f08ec6e')
-
-prepare() {
-  set -u
-  unzip -oaq -d "${_srcdir%%/*}" "${source[1]##*/}"
-  set +u
-}
+sha256sums=('68e29fe5e982b34ab5e35633fac2e3f4672571ed520aca952c80fb0f110124cd'
+            'e5bd03f77409a65f7fa4a9768ee640f86e03e422b5def5008d5abe14b4ffc04f')
 
 package() {
   set -u
   cd "${_srcdir}"
-  install -Dpm0755 "${pkgname}.pl" "${srcdir}/${pkgname}.sh" -t "${pkgdir}/usr/share/${pkgname}/"
-  install -Dpm0644 "${pkgname}"{db,db-info}.txt -t "${pkgdir}/usr/share/${pkgname}"
-
-  mv 'report' "${pkgdir}/usr/share/${pkgname}"
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  mv 'doc'/* "${pkgdir}/usr/share/doc/${pkgname}"
-
-  install -d "${pkgdir}/usr/bin"
-  ln -sf "/usr/share/${pkgname}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-
-  install -d "${pkgdir}/usr/share/${pkgname}/doc"
-  touch "${pkgdir}/usr/share/${pkgname}/doc/AGREEMENT"
+  install -Dpm644 'LICENSE.md' -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  rm 'version' 'CHANGELOG.md' 'love.txt' 'README.md' 'LICENSE.md'
+  install -d "${pkgdir}/usr/share/${pkgname}/"
+  chmod 777 'reports'
+  mv * "${pkgdir}/usr/share/${pkgname}/"
+  cd ..
+  install -Dpm0755 "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  ln -s 'joomscan' "${pkgdir}/usr/bin/${pkgname}.pl"
   set +u
 }
 set +u
diff --git a/joomscan.sh b/joomscan.sh
index b1b811b31612..8f0925f66fe6 100755
--- a/joomscan.sh
+++ b/joomscan.sh
@@ -1,2 +1,2 @@
-#!/usr/bin/env sh
-cd /usr/share/joomscan && ./joomscan.pl $*
+#!/usr/bin/bash
+cd '/usr/share/joomscan' && ./joomscan.pl "$@"