Use SHA512, clean-up

2 files changed, 55 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d30445eab39..d961143df8a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,8 +7,8 @@ pkgbase = ivre
 	license = GPL3
 	source = https://files.pythonhosted.org/packages/source/i/ivre/ivre-0.9.13.tar.gz
 	source = https://raw.githubusercontent.com/cea-sec/ivre/v0.9.13/pkg/apache/ivre.conf
-	sha256sums = 056388ea0b6da1205ec531f9689043b91449d5b18a658345389de6e30d34f8f7
-	sha256sums = 1befe4daf20ccdf1b1906de244df2de5519843210e95491f3d8fe62ec660848c
+	sha512sums = 58d4ff1a6ddef512ea447916ab658fa3f20527e91c58cb249e84b27c57101db8aa944e7089a3df3a60dba6cc2e3a3799622ef4cee6756445240fed16d4af6098
+	sha512sums = 9db82963976ed0134c88ca779ab2d8ac92fdaf5eff8f6e6c47014b56f92cb78313acd6b6ddee8de13de6c3ae8a2988f216a659496f16b756836475a9b774b0c5
 
 pkgname = ivre
 	depends = python-ivre
diff --git a/PKGBUILD b/PKGBUILD
index 194e7eaf6aaa..80cba2908576 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Pierre Lalet <pl@ivre.rocks>
 
-pkgbase='ivre'
+pkgbase=ivre
 pkgname=('ivre' 'ivre-web' 'ivre-docs' 'python-ivre' 'python2-ivre')
 pkgver=0.9.13
 pkgrel=1
@@ -10,20 +10,22 @@ url='https://ivre.rocks/'
 license=('GPL3')
 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=('056388ea0b6da1205ec531f9689043b91449d5b18a658345389de6e30d34f8f7'
-            '1befe4daf20ccdf1b1906de244df2de5519843210e95491f3d8fe62ec660848c')
+sha512sums=('58d4ff1a6ddef512ea447916ab658fa3f20527e91c58cb249e84b27c57101db8aa944e7089a3df3a60dba6cc2e3a3799622ef4cee6756445240fed16d4af6098'
+            '9db82963976ed0134c88ca779ab2d8ac92fdaf5eff8f6e6c47014b56f92cb78313acd6b6ddee8de13de6c3ae8a2988f216a659496f16b756836475a9b774b0c5')
 
 prepare() {
-    cp -a ${pkgbase}-${pkgver}{,-py2}
+  cp -a $pkgbase-$pkgver{,-py2}
 }
 
 build() {
   (
     cd "$srcdir/$pkgbase-$pkgver"
+
     python setup.py build
   )
   (
     cd "$srcdir/$pkgbase-$pkgver-py2"
+
     python2 setup.py build
   )
 }
@@ -41,22 +43,29 @@ package_ivre() {
               'imagemagick: Screenshots via Nmap scripts'
               'phantomjs: HTTP screenshots via Nmap script'
               'ffmpeg: RTSP Screenshots via Nmap script')
+
   cd "$srcdir/$pkgbase-$pkgver"
-  python setup.py install --root="${pkgdir}" --prefix=/usr --optimize=1
-  rm -r "${pkgdir}/usr/lib" \
-     "${pkgdir}/usr/share/doc" \
-     "${pkgdir}/usr/share/ivre/dokuwiki" \
-     "${pkgdir}/usr/share/ivre/web"
+
+  python setup.py install --root="$pkgdir" --prefix=/usr --optimize=1
+
+  rm -r "$pkgdir/usr/lib" \
+     "$pkgdir/usr/share/doc" \
+     "$pkgdir/usr/share/ivre/dokuwiki" \
+     "$pkgdir/usr/share/ivre/web"
+
   install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" doc/LICENSE*
 }
 
 package_ivre-docs() {
   pkgdesc+=' (documentation)'
+
   cd "$srcdir/$pkgbase-$pkgver"
-  python setup.py install --root="${pkgdir}" --prefix=/usr --optimize=1
-  rm -r "${pkgdir}/usr/bin" "${pkgdir}/usr/lib" \
-     "${pkgdir}/usr/share/ivre" \
-     "${pkgdir}/etc/bash_completion.d"
+
+  python setup.py install --root="$pkgdir" --prefix=/usr --optimize=1
+
+  rm -r "$pkgdir/usr/bin" "$pkgdir/usr/lib" \
+     "$pkgdir/usr/share/ivre" \
+     "$pkgdir/etc/bash_completion.d"
 }
 
 package_ivre-web() {
@@ -66,17 +75,21 @@ package_ivre-web() {
               'dokuwiki: Web server (notebook)')
   pkgdesc+=' (web application)'
   backup=('etc/httpd/conf/extra/ivre.conf')
+
   cd "$srcdir/$pkgbase-$pkgver"
-  python setup.py install --root="${pkgdir}" --prefix=/usr --optimize=1
-  rm -r "${pkgdir}/usr/bin" "${pkgdir}/usr/lib" \
-     "${pkgdir}/usr/share/doc" \
-     "${pkgdir}/usr/share/ivre/bro" \
-     "${pkgdir}/usr/share/ivre/data" \
-     "${pkgdir}/usr/share/ivre/docker" \
-     "${pkgdir}/usr/share/ivre/geoip" \
-     "${pkgdir}/usr/share/ivre/honeyd" \
-     "${pkgdir}/usr/share/ivre/nmap_scripts" \
-     "${pkgdir}/etc/bash_completion.d"
+
+  python setup.py install --root="$pkgdir" --prefix=/usr --optimize=1
+
+  rm -r "$pkgdir/usr/bin" "$pkgdir/usr/lib" \
+     "$pkgdir/usr/share/doc" \
+     "$pkgdir/usr/share/ivre/bro" \
+     "$pkgdir/usr/share/ivre/data" \
+     "$pkgdir/usr/share/ivre/docker" \
+     "$pkgdir/usr/share/ivre/geoip" \
+     "$pkgdir/usr/share/ivre/honeyd" \
+     "$pkgdir/usr/share/ivre/nmap_scripts" \
+     "$pkgdir/etc/bash_completion.d"
+
   install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" doc/LICENSE*
   install -Dm0644 "$srcdir/ivre.conf" "$pkgdir/etc/httpd/conf/extra/ivre.conf"
 }
@@ -96,11 +109,15 @@ package_python-ivre() {
               'postgresql: database server (experimental backend)'
               'neo4j-community: database server (experimental flow analysis)')
   pkgdesc+=' (library)'
+
   cd "$srcdir/$pkgbase-$pkgver"
-  python setup.py install --root="${pkgdir}" --prefix=/usr --optimize=1
-  rm -r "${pkgdir}/usr/bin" \
-     "${pkgdir}/usr/share" \
-     "${pkgdir}/etc/bash_completion.d"
+
+  python 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*
 }
 
@@ -119,10 +136,15 @@ package_python2-ivre() {
               'postgresql: database server (experimental backend)'
               'neo4j-community: database server (experimental flow analysis)')
   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"
+
+  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*
 }
+