v5.1.1-1

3 files changed, 32 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2d69e7a7071..026c8d89ae41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,27 @@
 pkgbase = recon-ng
 	pkgdesc = A full-featured Web Reconnaissance framework written in Python
-	pkgver = 4.9.6
+	pkgver = 5.1.1
 	pkgrel = 1
-	url = https://bitbucket.org/LaNMaSteR53/recon-ng
+	url = https://github.com/lanmaster53/recon-ng
 	arch = any
 	license = GPL3
-	depends = python2
-	depends = python2-dicttoxml
-	depends = python2-dnspython
-	depends = python2-jsonrpclib-pelix
-	depends = python2-lxml
-	depends = python2-mechanize
-	depends = python2-slowaes
-	depends = python2-xlsxwriter
-	depends = python2-olefile
-	depends = python2-pypdf2
-	depends = python2-flask
-	depends = python2-unicodecsv
-	source = recon-ng-4.9.6.tar.gz::https://bitbucket.org/LaNMaSteR53/recon-ng/get/v4.9.6.tar.gz
+	depends = python
+	depends = python-pyaml
+	depends = python-dnspython
+	depends = python-lxml
+	depends = python-mechanize
+	depends = python-requests
+	depends = python-flask
+	depends = python-flask-restful
+	depends = python-flasgger
+	depends = python-dicttoxml
+	depends = python-xlsxwriter
+	depends = python-unicodecsv
+	depends = python-rq
+	source = https://github.com/lanmaster53/recon-ng/archive/v5.1.1/recon-ng-5.1.1.tar.gz
 	source = opt-in-analytics.patch
-	sha256sums = 0192a9882bb9800f2177fcdb31cda8031bbc3895db9fe4a0966ebdd771b66915
-	sha256sums = 3208e111fb44e0799272429b6d87544a2a54a6f48ef640524a19a8c0a37d3d00
+	sha256sums = 470e293e931c23a0dc76e6915098e04db7f2e254a0639bb2c0383e0758c4fbc2
+	sha256sums = 72d1e10a2b4bdbacb85bc8d3b430e406fc0ec5b7bf5cad85476cd29281053385
 
 pkgname = recon-ng
 
diff --git a/PKGBUILD b/PKGBUILD
index 7eddfc122536..af5f1d8e2ef3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,21 @@
 # Maintainer: kpcyrd <git@rxv.cc>
 
 pkgname=recon-ng
-pkgver=4.9.6
+pkgver=5.1.1
 pkgrel=1
 pkgdesc='A full-featured Web Reconnaissance framework written in Python'
-url='https://bitbucket.org/LaNMaSteR53/recon-ng'
+url="https://github.com/lanmaster53/recon-ng"
 license=('GPL3')
 arch=('any')
-depends=('python2' 'python2-dicttoxml' 'python2-dnspython'
-         'python2-jsonrpclib-pelix'
-         'python2-lxml' 'python2-mechanize' 'python2-slowaes'
-         'python2-xlsxwriter' 'python2-olefile' 'python2-pypdf2'
-         'python2-flask' 'python2-unicodecsv')
-source=(${pkgname}-${pkgver}.tar.gz::https://bitbucket.org/LaNMaSteR53/recon-ng/get/v${pkgver}.tar.gz
+depends=('python' 'python-pyaml' 'python-dnspython' 'python-lxml' 'python-mechanize'
+         'python-requests' 'python-flask' 'python-flask-restful' 'python-flasgger'
+         'python-dicttoxml' 'python-xlsxwriter' 'python-unicodecsv' 'python-rq')
+source=("https://github.com/lanmaster53/${pkgname}/archive/v${pkgver}/recon-ng-${pkgver}.tar.gz"
         opt-in-analytics.patch)
-sha256sums=('0192a9882bb9800f2177fcdb31cda8031bbc3895db9fe4a0966ebdd771b66915'
-            '3208e111fb44e0799272429b6d87544a2a54a6f48ef640524a19a8c0a37d3d00')
+sha256sums=('470e293e931c23a0dc76e6915098e04db7f2e254a0639bb2c0383e0758c4fbc2'
+            '72d1e10a2b4bdbacb85bc8d3b430e406fc0ec5b7bf5cad85476cd29281053385')
 
 prepare() {
-  rm -rf "recon-ng-${pkgver}"
-  mv LaNMaSteR53-recon-ng-* "recon-ng-${pkgver}"
   cd "${pkgname}-${pkgver}"
   # change analytics from opt-out to opt-in
   patch -Np1 -i ../opt-in-analytics.patch
@@ -36,7 +32,7 @@ package() {
     cat > "${pkgdir}/usr/bin/${bin}" << EOF
 #!/bin/sh
 cd /opt/recon-ng
-exec python2 ${bin} "\$@"
+exec python ${bin} "\$@"
 EOF
     chmod +x "${pkgdir}/usr/bin/${bin}"
   done
diff --git a/opt-in-analytics.patch b/opt-in-analytics.patch
index ca50a1fc973d..9d76e785bad6 100644
--- a/opt-in-analytics.patch
+++ b/opt-in-analytics.patch
@@ -1,10 +1,11 @@
 --- a/recon-ng
 +++ b/recon-ng
-@@ -42,6 +42,6 @@ parser = argparse.ArgumentParser(description=description, version=base.__version
+@@ -48,7 +48,7 @@
  parser.add_argument('-w', help='load/create a workspace', metavar='workspace', dest='workspace', action='store')
  parser.add_argument('-r', help='load commands from a resource file', metavar='filename', dest='script_file', action='store')
- parser.add_argument('--no-check', help='disable version check', dest='check', default=True, action='store_false')
+ parser.add_argument('--no-version', help='disable version check', dest='check', default=True, action='store_false')
 -parser.add_argument('--no-analytics', help='disable analytics reporting', dest='analytics', default=True, action='store_false')
 +parser.add_argument('--analytics', help='enable analytics reporting', dest='analytics', default=False, action='store_true')
- args = parser.parse_args()
- recon_ui(args)
+ parser.add_argument('--no-marketplace', help='disable remote module management', dest='marketplace', default=True, action='store_false')
+ parser.add_argument('--stealth', help='disable all passive requests (--no-*)', dest='stealth', default=False, action='store_true')
+ parser.add_argument('--version', help='displays the current version', action='version', version=base.__version__)