Updated for python3.12

3 files changed, 17 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f823a767fcbd..f8c00ac2ee4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = graphite-web
 	pkgdesc = a Django-based web application that renders graphs and dashboards
 	pkgver = 1.1.10
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/graphite-project/graphite-web/
 	arch = any
 	license = Apache
@@ -19,9 +19,11 @@ pkgbase = graphite-web
 	depends = python3-django-tagging
 	optdepends = python-flask-cache: For caching
 	optdepends = python-raven: For sentry support
-	source = graphite-web-1.1.10.tar.gz::https://github.com/graphite-project/graphite-web/archive/1.1.10.tar.gz
+	source = git+https://github.com/graphite-project/graphite-web/
 	source = graphite-web.service
+	source = 0001-convert-to-importlib.patch
 	sha256sums = SKIP
-	sha256sums = 5e2d2a0b026e07d1f50baeef4526ba7f44bb300a3e89d2c1fd18300d5a952694
+	sha256sums = aab399da65ecc32f105d0af955d1dafb5eaa4e86ebc28e96ce7af7d300f12f9f
+	sha256sums = f2d8cac1135cfa5f10cf2b813b34971929470dd26eaea59b2b029ddfe99ce43c
 
 pkgname = graphite-web
diff --git a/PKGBUILD b/PKGBUILD
index 64522761bd3e..d61dd86c795a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=graphite-web
 pkgver=1.1.10
-pkgrel=3
+pkgrel=4
 pkgdesc="a Django-based web application that renders graphs and dashboards"
 url="https://github.com/graphite-project/graphite-web/"
 license=('Apache')
@@ -13,13 +13,18 @@ makedepends=('python-setuptools' 'python-pip')
 optdepends=('python-flask-cache: For caching'
             'python-raven: For sentry support')
 arch=('any')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/graphite-project/${pkgname}/archive/${pkgver}.tar.gz"
-        "graphite-web.service")
+source=("git+https://github.com/graphite-project/${pkgname}/"
+        "graphite-web.service"
+	"0001-convert-to-importlib.patch")
 sha256sums=('SKIP'
-            '5e2d2a0b026e07d1f50baeef4526ba7f44bb300a3e89d2c1fd18300d5a952694')
+            'aab399da65ecc32f105d0af955d1dafb5eaa4e86ebc28e96ce7af7d300f12f9f'
+            'f2d8cac1135cfa5f10cf2b813b34971929470dd26eaea59b2b029ddfe99ce43c')
 
 build() {
-        cd "$srcdir/$pkgname-$pkgver"
+        cd "$srcdir/$pkgname"
+	#git patch to importlib
+	msg2 "applying importlib fix"
+	git apply ../*.patch
 
 	#Dirty fixing obselete references
 	find . -type f -exec sed -i 's/post-install/post_install/g' {} +
@@ -66,7 +71,7 @@ build() {
 }
 
 package() {
-        cd "$srcdir/$pkgname-$pkgver"
+        cd "$srcdir/$pkgname"
 
 	pip install --no-deps --root="$pkgdir" dist/*.whl
 
@@ -74,7 +79,7 @@ package() {
 	mkdir -p $pkgdir/opt/graphite/
 	mv $pkgdir/usr/* $pkgdir/opt/graphite/
 	mkdir -p $pkgdir/opt/graphite/webapp/graphite/
-	mv $pkgdir/opt/graphite/lib/python3.11/site-packages/graphite/* $pkgdir/opt/graphite/webapp/graphite/
+	mv $pkgdir/opt/graphite/lib/python3.12/site-packages/opt/graphite/webapp/graphite/* $pkgdir/opt/graphite/webapp/graphite/
 
         mkdir -p "$pkgdir/var/lib/graphite"
         install -Dm0644 "$srcdir/graphite-web.service" "$pkgdir/usr/lib/systemd/system/graphite-web.service"
diff --git a/graphite-web.service b/graphite-web.service
index 37a1a2d0a357..b99f29aed348 100644
--- a/graphite-web.service
+++ b/graphite-web.service
@@ -7,14 +7,6 @@ Environment=PYTHONPATH=/opt/graphite/whisper
 ExecStart=/opt/graphite/bin/run-graphite-devel-server.py --libs=/opt/graphite/webapp/ /opt/graphite/
 Type=simple
 
-# some hardening
-PrivateTmp=true
-PrivateDevices=true
-ProtectSystem=full
-ProtectHome=true
-NoNewPrivileges=true
-CapabilityBoundingSet=
-
 [Install]
 WantedBy=multi-user.target