upd

5 files changed, 31 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 480acbd1881d..32ac625f0dc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,15 @@
 
 pkgbase=sentry
 pkgname=('sentry')
-pkgver=9.1.2
+pkgver=23.3.1
 pkgrel=1
 pkgdesc="Python-based realtime logging and aggregation server."
 arch=(any)
 url="http://pypi.python.org/pypi/sentry"
 license=(BSD)
 makedepends=(
-    'python2-pip'
-    'python2-setuptools'
-    'python2-virtualenv'
+    'python-pip'
+    'python-setuptools'
 )
 install='sentry.install'
 
@@ -21,8 +20,9 @@ depends=(
     'libjpeg-turbo'
     'libxml2'
     'libxslt'
-    'python2'
+    'python'
     'postgresql-libs'
+    'xmlsec'
 )
 
 # Redis is declared in the `optdepends` array because it is a "soft"
@@ -38,6 +38,7 @@ optdepends=(
 
 options=(!strip)
 source=(
+    "sentry"
     "sentry.install"
     "sentry-celery.service"
     "sentry-cron.service"
@@ -46,35 +47,20 @@ source=(
     "sentry.target"
     "sentry-sysusers.conf"
 )
-sha256sums=(
-    3be04bc47f4f037bf157da9986874c343e6c7d1af9e30269b4f0aabf303d3291 # sentry.install
-    d60b097721ec4acbc5b1232a0f29ef9d21d60228d17db655848a8e2a5c9a5281 # sentry-celery.service
-    d22b9bde7c39d9d0f031ba1b01c955c9dbe4ffe3f3f083875fe557f75f0050f7 # sentry-cron.service
-    3c471417a279ac6605d3bb82b7377eaab0e24efe9cf582a11eef0d9e4c89428e # sentry.service
-    0fe0062a77f78b01ab3729f0217a9d6b448cbfb7521c4a04c79d6e3062b4c635 # sentry-web.service
-    94121159756f7ac863e2b1149b530ea633efa2f3eeef57cc332e1f4cba724e2d # sentry.target
-    682917f4da89a526949fec71c1afa5849a3a73453b812c8edd945e2f8b146926 # sentry-sysusers.conf
-)
+sha256sums=('3be04bc47f4f037bf157da9986874c343e6c7d1af9e30269b4f0aabf303d3291'
+            '104beae867352c577d3c8f2d3c53d44fa14eb052208ed787ebb515f8dd2eb40d'
+            'f22d39acafe5ed22d21fc8e2735835388ad0f1a126cccc8783c9eef3207364b1'
+            '3c471417a279ac6605d3bb82b7377eaab0e24efe9cf582a11eef0d9e4c89428e'
+            '285d82c9b2f26685a0686c71d662e398e6dc9a852a2b1cdcbf24116102031f8d'
+            '94121159756f7ac863e2b1149b530ea633efa2f3eeef57cc332e1f4cba724e2d'
+            '682917f4da89a526949fec71c1afa5849a3a73453b812c8edd945e2f8b146926')
 
 package() {
-
     mkdir -p "${pkgdir}/opt/sentry"
-    virtualenv2 --python=python2.7 "${pkgdir}/opt/sentry"
-    source "${pkgdir}/opt/sentry/bin/activate"
-
-    # Begin Sentry installation for our specific version via PyPI. This
-    # guarantees we'll grab all of the appropriate dependencies and
-    # automates the process.
-    #
-    # If you're running GCC 6.1 and Sentry won't build, uncomment the following
-    # line and comment-out or remove the one immediately after it. If you wish
-    # to be more specific, replace -Wno-error with -Wno-misleading-indentation.
-    #CFLAGS="-Wno-error" "${pkgdir}/opt/sentry/bin/pip" install "sentry==${pkgver}"
-    "${pkgdir}/opt/sentry/bin/pip" install "more-itertools==5.0.0" "psycopg2==2.7.3" "six==1.10.0" "sentry==${pkgver}" --no-binary "psycopg2"
-
-    # Make certain the virtualenv is relocatable.
-    virtualenv2 --relocatable "${pkgdir}/opt/sentry"
-    sed -i "s#${pkgdir}##" "${pkgdir}/opt/sentry/bin/activate"
+    pip install --isolated --root="$pkgdir"/opt/sentry --ignore-installed \
+        sentry-auth-ldap \
+        django==2.2.28 \
+        "sentry==$pkgver"
 
     mkdir -p "${pkgdir}/opt/sentry/.python-eggs"
     mkdir -p "${pkgdir}/etc/sentry"
@@ -84,11 +70,16 @@ package() {
     # them. :) More information: http://en.wikipedia.org/wiki/.DS_Store
     find "${pkgdir}" -name '.DS_Store' -delete
 
+    # fixes
+    touch /opt/sentry/usr/lib/python3.10/site-packages/sentry_auth_ldap/__init__.py
+    ln -s sentry_ldap_auth /opt/sentry/usr/lib/python3.10/site-packages/sentry_auth_ldap
+
+    # systemd files and wrappers
+    install -Dm0644 "${srcdir}/sentry" "${pkgdir}/opt/sentry/bin/sentry"
     install -Dm0644 "${srcdir}/sentry-celery.service" "${pkgdir}/usr/lib/systemd/system/sentry-celery.service"
     install -Dm0644 "${srcdir}/sentry-cron.service" "${pkgdir}/usr/lib/systemd/system/sentry-cron.service"
     install -Dm0644 "${srcdir}/sentry-web.service" "${pkgdir}/usr/lib/systemd/system/sentry-web.service"
     install -Dm0644 "${srcdir}/sentry.service" "${pkgdir}/usr/lib/systemd/system/sentry.service"
     install -Dm0644 "${srcdir}/sentry.target" "${pkgdir}/usr/lib/systemd/system/sentry.target"
     install -Dm0644 "${srcdir}/sentry-sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/sentry.conf"
-
 }
diff --git a/sentry b/sentry
new file mode 100755
index 000000000000..31c984c7acda
--- /dev/null
+++ b/sentry
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+export PYTHONPATH=/opt/sentry/usr/lib/python3.10/site-packages/
+export PATH=/opt/sentry/bin:/opt/sentry/usr/bin:/usr/bin
+exec /opt/sentry/usr/bin/sentry $*
diff --git a/sentry-celery.service b/sentry-celery.service
index ccdc167ea4c2..9704676dd7f1 100644
--- a/sentry-celery.service
+++ b/sentry-celery.service
@@ -6,6 +6,7 @@ PartOf=sentry.service
 [Service]
 User=sentry
 Restart=always
+Environment=PYTHONPATH=/opt/sentry/usr/lib/python3.10/site-packages/
 ExecStart=/opt/sentry/bin/sentry --config=/etc/sentry run worker --loglevel=ERROR
 
 [Install]
diff --git a/sentry-cron.service b/sentry-cron.service
index 4b8e1e3b2689..3cd3d4aed789 100644
--- a/sentry-cron.service
+++ b/sentry-cron.service
@@ -6,6 +6,7 @@ PartOf=sentry.service
 [Service]
 User=sentry
 Restart=always
+Environment=PYTHONPATH=/opt/sentry/usr/lib/python3.10/site-packages/
 ExecStart=/opt/sentry/bin/sentry --config=/etc/sentry run cron --loglevel=ERROR
 
 [Install]
diff --git a/sentry-web.service b/sentry-web.service
index c8d83e1a0b4e..0b8e9ff3c875 100644
--- a/sentry-web.service
+++ b/sentry-web.service
@@ -8,6 +8,7 @@ PartOf=sentry.service
 [Service]
 User=sentry
 Restart=always
+Environment=PYTHONPATH=/opt/sentry/usr/lib/python3.10/site-packages/
 ExecStart=/opt/sentry/bin/sentry --config=/etc/sentry run web
 KillSignal=SIGINT