python-theharvester-git: 0001-Fix-dependencies-and-several-other-issues.patch

From 3c58f86d6b025a0be2d886d45123d44538e35f84 Mon Sep 17 00:00:00 2001
From: Denis Kasak <[email protected]>
Date: Sat, 12 Sep 2020 17:20:28 +0200
Subject: [PATCH] Fix dependencies and several other issues.

- Fix dependencies by removing some stale ones and adding missing ones.
  The list was sourced from the requirements.txt file from upstream.
- Move python-pytest to makedepends.
- Update post-install message to mention the new location for API keys
  in /etc and to enumerate all APIs requiring keys.
- PKGBUILD style fixes (retab, delete trailing spaces).
---
 .SRCINFO             | 31 +++++++++++++-----------
 PKGBUILD             | 56 ++++++++++++++++++++++++--------------------
 theHarvester.install | 14 +++++------
 3 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 41f93ba..585cafe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,36 @@
 pkgbase = python-theharvester-git
 	pkgdesc = A tool for gathering e-mail accounts, subdomain names, virtual hosts, open ports/ banners, and employee names from different public sources (search engines, pgp key servers).
-	pkgver = 3.0.6.r424.g838892e
-	pkgrel = 1
+	pkgver = 3.2.0.r0.g3b454cd
+	pkgrel = 2
 	url = https://github.com/laramies/theHarvester
 	install = theHarvester.install
 	arch = any
 	license = GPL2
 	makedepends = git
 	makedepends = python-setuptools
+	makedepends = python-pytest
 	depends = python
+	depends = python-aiodns
+	depends = python-aiohttp
+	depends = python-aiosqlite
+	depends = python-beautifulsoup4
+	depends = python-certifi
+	depends = python-dnspython
+	depends = python-netaddr
+	depends = python-plotly
+	depends = python-pyppeteer
 	depends = python-yaml
 	depends = python-requests
-	depends = python-plotly
-	depends = python-pytest
-	depends = python-texttable
+	depends = python-retrying
 	depends = python-shodan
-	depends = python-beautifulsoup4
-	depends = python-yaml
-	depends = python-decorator
-	depends = python-censys
+	depends = python-texttable
+	depends = python-lxml
+	depends = python-uvloop
 	depends = python-gevent
-	depends = python-grequests
-	depends = python-aiodns
-	depends = python-pycares
-	depends = python-dnspython
 	provides = python-theharvester-git
 	conflicts = python-theharvester-git
 	source = python-theharvester-git::git+https://github.com/laramies/theHarvester.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = python-theharvester-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0f59656..fcd2e2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,48 @@
 # Maintainer: ocelot <amitchell AT airmail DOT cc>
+# Contributor: dkasak <dkasak AT termina DOT org DOT uk>
+
 pkgbase=python-theharvester-git
 pkgname=python-theharvester-git
-pkgver=3.0.6.r424.g838892e
-pkgrel=1
+pkgver=3.2.0.r0.g3b454cd
+pkgrel=2
 pkgdesc="A tool for gathering e-mail accounts, subdomain names, virtual hosts, open ports/ banners, and employee names from different public sources (search engines, pgp key servers)."
 arch=('any')
 url="https://github.com/laramies/theHarvester"
 license=('GPL2')
 depends=(
-	'python'
-	'python-yaml'
-	'python-requests'
-	'python-plotly'
-	'python-pytest'
-	'python-texttable'
-	'python-shodan'
-	'python-beautifulsoup4'
-	'python-yaml'
-	'python-decorator'
-	'python-censys'
-	'python-gevent'
-	'python-grequests'
-	'python-aiodns'
-	'python-pycares'
-	'python-dnspython'
+    'python'
+    'python-aiodns'
+    'python-aiohttp'
+    'python-aiosqlite'
+    'python-beautifulsoup4'
+    'python-certifi'
+    'python-dnspython'
+    'python-netaddr'
+    'python-plotly'
+    'python-pyppeteer'
+    'python-yaml'
+    'python-requests'
+    'python-retrying'
+    'python-shodan'
+    'python-texttable'
+    'python-lxml'
+    'python-uvloop'
+    'python-gevent'
 )
-makedepends=('git' 'python-setuptools')
+makedepends=('git' 'python-setuptools' 'python-pytest')
 provides=("${pkgname}")
 conflicts=("${pkgname}")
 install="theHarvester.install"
 source=("$pkgname::git+https://github.com/laramies/theHarvester.git")
-md5sums=('SKIP')
+sha256sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname}"
-	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'	
+    cd "${srcdir}/${pkgname}"
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-	cd "${srcdir}/${pkgname}"
+    cd "${srcdir}/${pkgname}"
     python setup.py build
 }
 
@@ -47,7 +51,7 @@ package() {
     python setup.py install --root=${pkgdir} --optimize=1 --skip-build
 }
 
-check(){
-	cd "$srcdir"
-	pytest
+check() {
+    cd "${srcdir}/${pkgname}"
+    pytest
 }
diff --git a/theHarvester.install b/theHarvester.install
index 0daed8c..e3df8ff 100644
--- a/theHarvester.install
+++ b/theHarvester.install
@@ -1,10 +1,8 @@
 post_install() {
-    echo "IMPORTANT: The location of API keys has changed!"
-    echo "Add your keys to <CURRENT-DIRECTORY>/api-keys.yml"
-	echo "This will change to a more appropriate location in the future."
-    echo "	bingapi"
-	echo "	hunter"
-    echo "	intelx"
-	echo "	securitytrails"
-    echo "	shodan"
+    printf '%s\n\n' "IMPORTANT: The location of API keys has changed to /etc/theHarvester/api-keys.yml"
+    printf '%s\n' "APIs requiring keys:"
+    printf '\t- %s\n' "bing" "github" "hunter" \
+                      "intelx" "pentesttools"  \
+                      "projecdiscovery" "securityTrails" \
+                      "shodan" "spyse"
 }
-- 
2.28.0