aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2022-04-07 22:27:43 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2022-04-08 06:37:16 +0000
commit060ea15f484b650dbf459ff497754a850b6cd850 (patch)
treecbff7cef5a4018d3d62a88c7022d24c5b7fcce22
parent232dfe0653e7f5c158247cc3a0f7cc545e93164c (diff)
downloadaports-060ea15f484b650dbf459ff497754a850b6cd850.tar.gz
aports-060ea15f484b650dbf459ff497754a850b6cd850.tar.bz2
aports-060ea15f484b650dbf459ff497754a850b6cd850.tar.xz
community/ospd-openvas: build with py3-build
-rw-r--r--community/ospd-openvas/APKBUILD12
-rw-r--r--community/ospd-openvas/create-setuppy.patch16
2 files changed, 6 insertions, 22 deletions
diff --git a/community/ospd-openvas/APKBUILD b/community/ospd-openvas/APKBUILD
index 5f1bc4f469..3129601e79 100644
--- a/community/ospd-openvas/APKBUILD
+++ b/community/ospd-openvas/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=ospd-openvas
pkgver=21.4.4
-pkgrel=1
+pkgrel=2
pkgdesc="ospd-openvas is an OSP server implementation to allow GVM to remotely control an OpenVAS Scanner"
url="https://github.com/greenbone/ospd-openvas"
arch="noarch"
@@ -12,17 +12,17 @@ pkgusers="gvm"
pkggroups="gvm"
depends="py3-psutil py3-redis py3-packaging
py3-deprecated py3-defusedxml py3-lxml py3-paho-mqtt" # missing py3-gnupg in testing
-makedepends="py3-setuptools pyproject2setuppy"
+makedepends="py3-build py3-installer py3-poetry-core py3-wheel"
checkdepends="py3-pytest"
subpackages="$pkgname-openrc"
install="$pkgname.post-install"
source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/ospd-openvas/archive/v$pkgver.tar.gz
- create-setuppy.patch
$pkgname.initd
ospd.conf"
build() {
- python3 setup.py build
+ # XXX: poetry hack to not ignore files
+ GIT_DIR=. python3 -m build --no-isolation --wheel
}
check() {
@@ -30,7 +30,8 @@ check() {
}
package() {
- python3 setup.py install --root="$pkgdir" --optimize=1
+ python3 -m installer -d "$pkgdir" \
+ dist/ospd_openvas-$pkgver-py3-none-any.whl
install -d -o $pkgusers -g $pkggroups "$pkgdir"/run/ospd
install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
install -Dm644 "$srcdir"/ospd.conf "$pkgdir"/etc/openvas/ospd.conf
@@ -38,7 +39,6 @@ package() {
sha512sums="
3981b0a9044f90243fe06f15b0d8ee5a6b1a334556f6de76955aecda0404da2f8bd1d39bf547093a31c244f0aabae819f5e45e8c518984fc7d50764a267086e9 ospd-openvas-21.4.4.tar.gz
-f0e30be7c0bff657c54d50fa5f05ee3815b82ca341259425afab384e008417a9d92247aea2440d5a57ddce0bf34edb16bf56a56396f4c12145f047fcc43ff373 create-setuppy.patch
7567dd8541fb84b8a8ef82c51c8a1e9d29f9a78483525f55f59cb29a57d42ca96499b7e3bf30e5fef0e02293ecb1455a7a748e3093b1892b2be80632f75e7e32 ospd-openvas.initd
c3714d1555dac2b557e8faa1dba7bd3d4b27930b0a18ec644f3bd4ef4e02d598eaca012651b105899d2ca192196cbbdb2eeef1d70a514222bbe2698c1874ae19 ospd.conf
"
diff --git a/community/ospd-openvas/create-setuppy.patch b/community/ospd-openvas/create-setuppy.patch
deleted file mode 100644
index 22ac6163b8..0000000000
--- a/community/ospd-openvas/create-setuppy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-commit 2bb0927a9cfe4bdf5e790469c6c1e0058b3e5a5b
-Author: Francesco Colista <fcolista@alpinelinux.org>
-Date: Tue Feb 22 13:30:57 2022 +0000
-
- added setup.py to build package with setuptools
-
-diff --git a/setup.py b/setup.py
-new file mode 100644
-index 0000000..1801db5
---- /dev/null
-+++ b/setup.py
-@@ -0,0 +1,4 @@
-+#!/usr/bin/env python3
-+from pyproject2setuppy.main import main
-+main()
-+