ospd-openvas: update to 22.6.2

+ updating to PEP 517 guidelines

2 files changed, 28 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 273615c61c30..a5ccb6719178 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,31 @@
 pkgbase = ospd-openvas
 	pkgdesc = OSP Server for openvas
-	pkgver = 22.4.0
-	pkgrel = 2
+	pkgver = 22.6.2
+	pkgrel = 1
 	url = https://github.com/greenbone/ospd-openvas
 	arch = x86_64
 	groups = greenbone-vulnerability-manager
 	license = GPL
-	makedepends = python-setuptools
-	makedepends = python-poetry
+	makedepends = python-build
 	makedepends = python-installer
-	depends = python-ospd
+	makedepends = python-wheel
+	makedepends = python-poetry
+	depends = openvas-scanner
 	depends = python-redis
 	depends = python-psutil
 	depends = python-packaging
-	depends = openvas-scanner
+	depends = python-lxml
+	depends = python-defusedxml
+	depends = python-deprecated
 	depends = python-paho-mqtt
 	depends = python-gnupg
 	provides = python-ospd-openvas
 	conflicts = python-ospd-openvas
 	backup = etc/default/ospd-openvas
-	source = ospd-openvas-22.4.0.tar.gz::https://github.com/greenbone/ospd-openvas/archive/v22.4.0.tar.gz
+	source = ospd-openvas-22.6.2.tar.gz::https://github.com/greenbone/ospd-openvas/archive/v22.6.2.tar.gz
 	source = ospd-openvas
 	source = ospd-openvas.service
-	sha512sums = 9ceaca7843c406361aeaa6c15386c150c449c08586382f95074cf346a4ebf7dd57ee97cda2784758845d03852488989ad18963eba0f01c4bb190fafa3480df9b
+	sha512sums = a405779b9ea89b1300122c39553f8f9bf079b8610dc61ec6244affa9c9273725234a4a556df05e3013045681678646226cf12af66f051def8b042b84bb639ffe
 	sha512sums = 3461820543ac6bc0cd50026023a6271e015123366fc44ce66ead1221d52c9e534063881f3b46a50a6e43ec9caff697376c35f1ce2cd22944e7b58f02070a78a8
 	sha512sums = ddaa5ad183265df4a89661acde7f0c8a5d1fd4c0748e3ca2dd267d3e7e05e6975a62023833bdd048ab97076c9ec839e7ad2fd463ef16b246e5813e328956b50e
 
diff --git a/PKGBUILD b/PKGBUILD
index 25a2ff14b654..b1bc071515d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,38 @@
-# Maintainer  : Matthias Fulz < mfulz [at] olznet [dot] de >
+# Contributor: Matthias Fulz < mfulz [at] olznet [dot] de >
 
 pkgname=ospd-openvas
-pkgver=22.4.0
-pkgrel=2
+pkgver=22.6.2
+pkgrel=1
 pkgdesc='OSP Server for openvas'
 arch=('x86_64')
 url="https://github.com/greenbone/ospd-openvas"
 license=('GPL')
-depends=('python-ospd' 'python-redis' 'python-psutil' 'python-packaging' 'openvas-scanner' 'python-paho-mqtt' 'python-gnupg')
+depends=('openvas-scanner' 'python-redis' 'python-psutil' 'python-packaging' 'python-lxml' 'python-defusedxml' 'python-deprecated' 'python-paho-mqtt' 'python-gnupg')
+makedepends=('python-build' 'python-installer' 'python-wheel' 'python-poetry')
 provides=('python-ospd-openvas')
 conflicts=('python-ospd-openvas')
-makedepends=('python-setuptools' 'python-poetry' 'python-installer')
 groups=('greenbone-vulnerability-manager')
+backup=("etc/default/ospd-openvas")
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/greenbone/ospd-openvas/archive/v${pkgver}.tar.gz"
         "ospd-openvas"
         "ospd-openvas.service")
-sha512sums=('9ceaca7843c406361aeaa6c15386c150c449c08586382f95074cf346a4ebf7dd57ee97cda2784758845d03852488989ad18963eba0f01c4bb190fafa3480df9b'
+sha512sums=('a405779b9ea89b1300122c39553f8f9bf079b8610dc61ec6244affa9c9273725234a4a556df05e3013045681678646226cf12af66f051def8b042b84bb639ffe'
             '3461820543ac6bc0cd50026023a6271e015123366fc44ce66ead1221d52c9e534063881f3b46a50a6e43ec9caff697376c35f1ce2cd22944e7b58f02070a78a8'
             'ddaa5ad183265df4a89661acde7f0c8a5d1fd4c0748e3ca2dd267d3e7e05e6975a62023833bdd048ab97076c9ec839e7ad2fd463ef16b246e5813e328956b50e')
 
-backup=(
-        "etc/default/ospd-openvas"
-       )
 
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-    LANG=en_US.UTF-8 pytest
+build() {
+    cd "$pkgname-$pkgver"
+    python -m build --wheel --no-isolation
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+    cd "$pkgname-$pkgver"
+    python -m installer --destdir="$pkgdir" dist/*.whl
 
-  #python setup.py install --root="$pkgdir" --optimize=1
-  poetry build 
-
-  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python -m installer -d "$pkgdir" dist/*.whl
-  install -d $pkgdir/etc/default
-  install -m 644 $srcdir/ospd-openvas $pkgdir/etc/default
-  install -d $pkgdir/usr/lib/systemd/system
-  install -m 644 $srcdir/ospd-openvas.service $pkgdir/usr/lib/systemd/system
+    install -d $pkgdir/etc/default
+    install -m 644 $srcdir/ospd-openvas $pkgdir/etc/default
+    install -d $pkgdir/usr/lib/systemd/system
+    install -m 644 $srcdir/ospd-openvas.service $pkgdir/usr/lib/systemd/system
 }
+