Version update, no more Python 2 support

2 files changed, 15 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 713ef87beaba..d5866a050dfe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = ivre
-	pkgdesc = Network recon framework based on Nmap, Masscan, Zeek (Bro), Argus, Netflow,...
-	pkgver = 0.9.16
-	pkgrel = 3
+	pkgdesc = Network recon framework based on Nmap, Masscan, Zgrab2, Nuclei, httpx, Zeek (Bro), Argus, Netflow,...
+	pkgver = 0.9.17
+	pkgrel = 1
 	url = https://ivre.rocks/
 	arch = any
 	license = GPL3
 	makedepends = python
-	makedepends = python2
-	source = https://files.pythonhosted.org/packages/source/i/ivre/ivre-0.9.16.tar.gz
-	source = https://raw.githubusercontent.com/ivre/ivre/v0.9.16/pkg/apache/ivre.conf
-	sha512sums = 0fc0c1bf614805ccbf656916c89f175fd2cf26d3acd89c3865615214360953f6a068796280154b5bab5c06bae4b33e1f572ebc0fbff2926cd1af47acc6c86ef2
+	source = https://files.pythonhosted.org/packages/source/i/ivre/ivre-0.9.17.tar.gz
+	source = https://raw.githubusercontent.com/ivre/ivre/v0.9.17/pkg/apache/ivre.conf
+	sha512sums = 6bb852080c54c490450b9904717fdf93ce9750d560c9c4a70824ab7a2cdaaa46553156dac3a17798c17acbc47e701afe04b257602949088b72bf33d8af06c247
 	sha512sums = 9db82963976ed0134c88ca779ab2d8ac92fdaf5eff8f6e6c47014b56f92cb78313acd6b6ddee8de13de6c3ae8a2988f216a659496f16b756836475a9b774b0c5
 
 pkgname = ivre
@@ -27,7 +26,7 @@ pkgname = ivre
 	optdepends = ffmpeg: RTSP Screenshots via Nmap script
 
 pkgname = ivre-web
-	pkgdesc = Network recon framework based on Nmap, Masscan, Zeek (Bro), Argus, Netflow,... (web application)
+	pkgdesc = Network recon framework based on Nmap, Masscan, Zgrab2, Nuclei, httpx, Zeek (Bro), Argus, Netflow,... (web application)
 	depends = ivre
 	depends = python-bottle
 	optdepends = apache: Web server
@@ -36,10 +35,10 @@ pkgname = ivre-web
 	backup = etc/httpd/conf/extra/ivre.conf
 
 pkgname = ivre-docs
-	pkgdesc = Network recon framework based on Nmap, Masscan, Zeek (Bro), Argus, Netflow,... (documentation)
+	pkgdesc = Network recon framework based on Nmap, Masscan, Zgrab2, Nuclei, httpx, Zeek (Bro), Argus, Netflow,... (documentation)
 
 pkgname = python-ivre
-	pkgdesc = Network recon framework based on Nmap, Masscan, Zeek (Bro), Argus, Netflow,... (library)
+	pkgdesc = Network recon framework based on Nmap, Masscan, Zgrab2, Nuclei, httpx, Zeek (Bro), Argus, Netflow,... (library)
 	depends = python
 	depends = python-pymongo
 	depends = python-future
@@ -57,23 +56,3 @@ pkgname = python-ivre
 	optdepends = python-dbus: 3D traceroute graphs
 	optdepends = mongodb: database server
 	optdepends = postgresql: database server (experimental backend)
-
-pkgname = python2-ivre
-	pkgdesc = Network recon framework based on Nmap, Masscan, Zeek (Bro), Argus, Netflow,... (library)
-	depends = python2
-	depends = python2-pymongo
-	depends = python2-future
-	depends = python2-pyopenssl
-	depends = python2-cryptography
-	optdepends = python2-sqlalchemy: experimental PostgreSQL & SQLite backends
-	optdepends = python2-psycopg2: experimental PostgreSQL backend
-	optdepends = python2-elasticsearch: experimental Elasticsearch backend
-	optdepends = python2-elasticsearch-dsl: experimental Elasticsearch backend
-	optdepends = python2-tinydb: experimental file-based backend (no DB server)
-	optdepends = python2-pillow: trim screenshots on insertion
-	optdepends = tesseract: extract words from screenshots on insertion
-	optdepends = python2-scapy: parse PCAP files for ARP inspection (flow analysis)
-	optdepends = python2-matplotlib: create graphs from command line tools
-	optdepends = python2-dbus: 3D traceroute graphs
-	optdepends = mongodb: database server
-	optdepends = postgresql: database server (experimental backend)
diff --git a/PKGBUILD b/PKGBUILD
index 66689c435742..90283fa4f172 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,25 @@
 # Maintainer: Pierre Lalet <pl@ivre.rocks>
 
 pkgbase=ivre
-pkgname=('ivre' 'ivre-web' 'ivre-docs' 'python-ivre' 'python2-ivre')
-pkgver=0.9.16
-pkgrel=3
-pkgdesc='Network recon framework based on Nmap, Masscan, Zeek (Bro), Argus, Netflow,...'
+pkgname=('ivre' 'ivre-web' 'ivre-docs' 'python-ivre')
+pkgver=0.9.17
+pkgrel=1
+pkgdesc='Network recon framework based on Nmap, Masscan, Zgrab2, Nuclei, httpx, Zeek (Bro), Argus, Netflow,...'
 arch=('any')
 url='https://ivre.rocks/'
 license=('GPL3')
-makedepends=('python' 'python2')
+makedepends=('python')
 source=("https://files.pythonhosted.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz"
         "https://raw.githubusercontent.com/ivre/$pkgname/v$pkgver/pkg/apache/ivre.conf")
-sha512sums=('0fc0c1bf614805ccbf656916c89f175fd2cf26d3acd89c3865615214360953f6a068796280154b5bab5c06bae4b33e1f572ebc0fbff2926cd1af47acc6c86ef2'
+sha512sums=('6bb852080c54c490450b9904717fdf93ce9750d560c9c4a70824ab7a2cdaaa46553156dac3a17798c17acbc47e701afe04b257602949088b72bf33d8af06c247'
             '9db82963976ed0134c88ca779ab2d8ac92fdaf5eff8f6e6c47014b56f92cb78313acd6b6ddee8de13de6c3ae8a2988f216a659496f16b756836475a9b774b0c5')
 
-prepare() {
-  cp -a $pkgbase-$pkgver{,-py2}
-}
-
 build() {
   (
     cd "$srcdir/$pkgbase-$pkgver"
 
     python setup.py build
   )
-  (
-    cd "$srcdir/$pkgbase-$pkgver-py2"
-
-    python2 setup.py build
-  )
 }
 
 package_ivre() {
@@ -123,31 +114,3 @@ package_python-ivre() {
 
   install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" doc/license*
 }
-
-package_python2-ivre() {
-  depends=('python2' 'python2-pymongo' 'python2-future' 'python2-pyopenssl' 'python2-cryptography')
-  optdepends=('python2-sqlalchemy: experimental PostgreSQL & SQLite backends'
-              'python2-psycopg2: experimental PostgreSQL backend'
-              'python2-elasticsearch: experimental Elasticsearch backend'
-              'python2-elasticsearch-dsl: experimental Elasticsearch backend'
-              'python2-tinydb: experimental file-based backend (no DB server)'
-              'python2-pillow: trim screenshots on insertion'
-              'tesseract: extract words from screenshots on insertion'
-              'python2-scapy: parse PCAP files for ARP inspection (flow analysis)'
-              'python2-matplotlib: create graphs from command line tools'
-              'python2-dbus: 3D traceroute graphs'
-              'mongodb: database server'
-              'postgresql: database server (experimental backend)')
-  pkgdesc+=' (library)'
-
-  cd "$srcdir/$pkgbase-$pkgver-py2"
-
-  python2 setup.py install --root="$pkgdir" --prefix=/usr --optimize=1
-
-  rm -r "$pkgdir/usr/bin" \
-     "$pkgdir/usr/share" \
-     "$pkgdir/etc/bash_completion.d"
-
-  install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" doc/license*
-}
-