Upgrade to ivre 0.9.10, add python-bottle dependency

3 files changed, 15 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 18bb01ea5f84..a769b855bdec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ivre
 	pkgdesc = Network recon framework
-	pkgver = 0.9.8
+	pkgver = 0.9.10
 	pkgrel = 1
 	url = https://ivre.rocks/
 	arch = any
@@ -10,6 +10,7 @@ pkgbase = ivre
 	depends = python-crypto
 	depends = python-pymongo
 	depends = python-future
+	depends = python-bottle
 	optdepends = python-py2neo: flow analysis support
 	optdepends = python-sqlalchemy: PostgreSQL backend support
 	optdepends = python-psycopg2: PostgreSQL backend support
@@ -31,10 +32,10 @@ pkgbase = ivre
 	optdepends = ffmpeg: Screenshots (rtsp)
 	optdepends = tesseract: Screenshots analysis
 	backup = etc/httpd/conf/extra/ivre.conf
-	source = https://files.pythonhosted.org/packages/source/i/ivre/ivre-0.9.8.tar.gz
-	source = apache.example.conf
-	sha256sums = d3eb6c48ea53111991883fdff5cb5170797a8cf1287fe1bcd29ef760b0c882af
-	sha256sums = 3e372f51f2ad441baf8268ce29d35b3a1cb9ef4cb29e7864fab389759694f72e
+	source = https://files.pythonhosted.org/packages/source/i/ivre/ivre-0.9.10.tar.gz
+	source = https://raw.githubusercontent.com/cea-sec/ivre/v0.9.10/pkg/apache/ivre.conf
+	sha256sums = 1e820dc1fddbf319e9a86c941eea4db8158afc08619198f05e062d1c59631319
+	sha256sums = 9c7267b7b2bde354e03a0cf683b56c0ca2410296bdd7424a964fb2b4f14c7ee3
 
 pkgname = ivre
 
diff --git a/PKGBUILD b/PKGBUILD
index e4b764ef34c4..e1c48488e52e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Pierre Lalet <pl@ivre.rocks>
 
 pkgname=ivre
-pkgver=0.9.8
+pkgver=0.9.10
 pkgrel=1
 pkgdesc="Network recon framework"
 url="https://ivre.rocks/"
 arch=('any')
 license=('GPL3')
-depends=('python' 'python-crypto' 'python-pymongo' 'python-future')
+depends=('python' 'python-crypto' 'python-pymongo' 'python-future'
+         'python-bottle')
 optdepends=('python-py2neo: flow analysis support'
             'python-sqlalchemy: PostgreSQL backend support'
             'python-psycopg2: PostgreSQL backend support'
@@ -30,10 +31,10 @@ optdepends=('python-py2neo: flow analysis support'
             'tesseract: Screenshots analysis')
 makedepends=('python-setuptools')
 backup=('etc/httpd/conf/extra/ivre.conf')
-source=(https://files.pythonhosted.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz
-        'apache.example.conf')
-sha256sums=('d3eb6c48ea53111991883fdff5cb5170797a8cf1287fe1bcd29ef760b0c882af'
-            '3e372f51f2ad441baf8268ce29d35b3a1cb9ef4cb29e7864fab389759694f72e')
+source=("https://files.pythonhosted.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz"
+        "https://raw.githubusercontent.com/cea-sec/$pkgname/v$pkgver/pkg/apache/ivre.conf")
+sha256sums=('1e820dc1fddbf319e9a86c941eea4db8158afc08619198f05e062d1c59631319'
+            '9c7267b7b2bde354e03a0cf683b56c0ca2410296bdd7424a964fb2b4f14c7ee3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -41,8 +42,8 @@ build() {
 }
 
 package() {
+  install -Dm0644 "$srcdir/ivre.conf" "$pkgdir/etc/httpd/conf/extra/ivre.conf"
   cd "$srcdir/$pkgname-$pkgver"
-  install -Dm0644 -t "$pkgdir/usr/share/licenses/ivre/" doc/LICENSE*
-  install -Dm0644 "$srcdir"/apache.example.conf "$pkgdir/etc/httpd/conf/extra/ivre.conf"
+  install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" doc/LICENSE*
   python setup.py install --root="$pkgdir" --optimize=1
 }
diff --git a/apache.example.conf b/apache.example.conf
deleted file mode 100644
index c9ca6e0eb87f..000000000000
--- a/apache.example.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Apache configuration file for IVRE
-
-<IfModule !mpm_prefork_module>
-        LoadModule cgid_module modules/mod_cgid.so
-</IfModule>
-<IfModule mpm_prefork_module>
-        LoadModule cgi_module modules/mod_cgi.so
-</IfModule>
-
-ScriptAlias /ivre/cgi-bin "/usr/share/ivre/web/cgi-bin"
-Alias /ivre "/usr/share/ivre/web/static"
-
-<Directory "/usr/share/ivre/web">
-    Options None
-    AllowOverride None
-    Require all granted
-</Directory>