update to 2.4.157

3 files changed, 78 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e5457150b9b..4aa5cf238c4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,32 @@
 pkgbase = python-pymisp
 	pkgdesc = Python library to access MISP platforms via their REST API
-	pkgver = 2.4.143
+	pkgver = 2.4.157
 	pkgrel = 1
-	url = https://github.com/MISP/PyMISP/
+	url = https://github.com/MISP/PyMISP
 	arch = any
-	license = custom
-	makedepends = python
-	makedepends = python-setuptools
-	depends = python
+	license = BSD
+	makedepends = python-poetry-core
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
+	depends = python>=3.8
 	depends = python-jsonschema
 	depends = python-requests
 	depends = python-dateutil
 	depends = python-deprecated
-	depends = python-cachetools
-	optdepends = lief
-	optdepends = python-oletools
-	optdepends = python-magic
-	optdepends = python-beautifulsoup4
-	optdepends = python-validators
-	optdepends = python-recommonmark
-	optdepends = python-reportlab
-	optdepends = python-urllib3
-	source = PyMISP-2.4.143.tar.gz::https://github.com/MISP/PyMISP/archive/v2.4.143.tar.gz
-	sha512sums = 5b987c74f1556489a02d32452d62f188a3e91a27b4e4c5329c586acda88bee6cecdbfd374ee668ce5dc92645b4a485215dbc5b2f676cd7f618132d8925e6fbed
+	optdepends = lief: python-pymisp[fileobjects] support
+	optdepends = python-oletools: python-pymisp[email] support
+	optdepends = python-magic: python-pymisp[fileobjects] support
+	optdepends = python-beautifulsoup4: python-pymisp[openioc] support
+	optdepends = python-validators: python-pymisp[virustotal] support
+	optdepends = python-recommonmark: python-pymisp[docs] support
+	optdepends = python-reportlab: python-pymisp[reportlab] support
+	optdepends = python-urllib3: python-pymisp[brotli] support
+	optdepends = python-pyfaup: python-pymisp[url] support
+	optdepends = python-chardet: python-pymisp[url] support
+	source = python-pymisp-2.4.157.tar.gz::https://files.pythonhosted.org/packages/source/p/pymisp/pymisp-2.4.157.tar.gz
+	source = remove-datafiles.patch
+	sha256sums = b19d6d565972b391f90e8fe7050101b3b84f45f83214d3bf9b339a6490856cf2
+	sha256sums = e97b356e9e3f8af08bb19c4c2356ed7f729b6a3d652b85f9ff4fb263763bb0fc
 
 pkgname = python-pymisp
-
diff --git a/PKGBUILD b/PKGBUILD
index 43e9caedc784..0a13896a2cc8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,53 @@
-# Maintainer: Alexander Bruegmann <mail[at]abruegmann[dot]eu>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: Alexander Bruegmann <mail[at]abruegmann[dot]eu>
 # Contributor: Christian Rebischke <chris.rebischke[at]archlinux[dot]org>
-pkgname=('python-pymisp')
-_pyname=PyMISP
-pkgver=2.4.143
+
+pkgname=python-pymisp
+_pkg="${pkgname#python-}"
+pkgver=2.4.157
 pkgrel=1
 pkgdesc="Python library to access MISP platforms via their REST API"
 arch=('any')
-url="https://github.com/MISP/PyMISP/"
-license=('custom')
-makedepends=('python' 'python-setuptools')
-depends=('python' 'python-jsonschema' 'python-requests' 'python-dateutil' 'python-deprecated' 'python-cachetools')
-optdepends=('lief' 'python-oletools' 'python-magic' 'python-beautifulsoup4' 'python-validators' 'python-recommonmark'
-  'python-reportlab' 'python-urllib3')
-source=("${_pyname}-${pkgver}.tar.gz::https://github.com/MISP/PyMISP/archive/v${pkgver}.tar.gz")
-sha512sums=('5b987c74f1556489a02d32452d62f188a3e91a27b4e4c5329c586acda88bee6cecdbfd374ee668ce5dc92645b4a485215dbc5b2f676cd7f618132d8925e6fbed')
+url="https://github.com/MISP/PyMISP"
+license=('BSD')
+depends=(
+	'python>=3.8'
+	'python-jsonschema'
+	'python-requests'
+	'python-dateutil'
+	'python-deprecated')
+optdepends=(
+	'lief: python-pymisp[fileobjects] support'
+	'python-oletools: python-pymisp[email] support'
+	'python-magic: python-pymisp[fileobjects] support'
+	'python-beautifulsoup4: python-pymisp[openioc] support'
+	'python-validators: python-pymisp[virustotal] support'
+	'python-recommonmark: python-pymisp[docs] support'
+  'python-reportlab: python-pymisp[reportlab] support'
+	'python-urllib3: python-pymisp[brotli] support'
+	'python-pyfaup: python-pymisp[url] support'
+	'python-chardet: python-pymisp[url] support')
+makedepends=('python-poetry-core' 'python-build' 'python-installer' 'python-wheel')
+source=("$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkg::1}/$_pkg/$_pkg-$pkgver.tar.gz"
+        'remove-datafiles.patch')
+sha256sums=('b19d6d565972b391f90e8fe7050101b3b84f45f83214d3bf9b339a6490856cf2'
+            'e97b356e9e3f8af08bb19c4c2356ed7f729b6a3d652b85f9ff4fb263763bb0fc')
+
+prepare() {
+	patch -p1 -d "$_pkg-$pkgver" < remove-datafiles.patch
+}
 
 build() {
-  cd "${srcdir}/${_pyname}-${pkgver}"
-  python setup.py build
+	cd "$_pkg-$pkgver"
+	python -m build --wheel --no-isolation
 }
 
 package() {
-  cd "${srcdir}/${_pyname}-${pkgver}"
-  python setup.py install -O1 --root="${pkgdir}" --skip-build
-  rm -rf "$pkgdir/usr/lib/python3.8/site-packages/tests"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	cd "$_pkg-$pkgver"
+	PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir/" dist/*.whl
+	local _site="$(python -c 'import site; print(site.getsitepackages()[0])')"
+	install -d "$pkgdir/usr/share/licenses/$pkgname/"
+	ln -s \
+		"$_site/$_pkg-$pkgver.dist-info/LICENSE" \
+		"$pkgdir/usr/share/licenses/$pkgname/"
 }
diff --git a/remove-datafiles.patch b/remove-datafiles.patch
new file mode 100644
index 000000000000..67195c5753c4
--- /dev/null
+++ b/remove-datafiles.patch
@@ -0,0 +1,13 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 542d1e9..776a6b4 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -26,8 +26,6 @@ classifiers=[
+ ]
+ 
+ include = [
+-    "CHANGELOG.txt",
+-    "README.md",
+     "pymisp/data/*.json",
+     "pymisp/data/misp-objects/schema_objects.json",
+     "pymisp/data/misp-objects/schema_relationships.json",