pkgbuild: use mgr-dashboard fix backport

and remove the now unneeded py deps:

- python-pyjwt
- python-cryptography

2 files changed, 13 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c3b95bbac0b..69932d14de5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -98,6 +98,7 @@ pkgbase = ceph
 	source = ceph-18.2.0-fmt10-fixes.patch
 	source = ceph-18.2.0-fix-ecode-shec-test.patch
 	source = ceph-18.2.0-backport-log-runway-expansion.patch
+	source = ceph-18.2.2-backport-mgr-dashboard-simplify-authentication-protocol.patch
 	sha512sums = 88e1c18bc6c824b6203cf026cca4c9409000e7cf5b2b986e22ab74d2790d8b93d91556bd3af15a320dbdd0cf2302308f0b2c75fd1243bc5a65f76fc6b3d70736
 	sha512sums = 4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049
 	sha512sums = 41dbc1c395cdf9b3edf5c5d91bbc90f416b4338ad964fa3471f26a4312d3ec2a5dcebbc351a1640dc4b047b4f71aa134ac7486747e5f62980092b0176e7567f5
@@ -116,6 +117,7 @@ pkgbase = ceph
 	sha512sums = 4613232e5a0003c08d233e40fe3ac1cd00e1195d29bdd9892188587b4a782d6979004232927c0a1bff554eabf2fb9b18eb751682b7ad90762292b63891f3b301
 	sha512sums = 9a1183c08f8799b14235c9271519203cbf93e48ca3a8607d3a0500910efca5379c8a08421c377227f93d8436a850f5ca99784f28aaa920e55f0457c657511f17
 	sha512sums = e238b326609636bc7dd10cec59290e22898948ef105c49643c38d2621abf16c2efcf9581b0b6bad65066607510c9827d00a7abdb14f2054701cc33b7101ea054
+	sha512sums = 965f1174ed682409f5aebfe689ccc870a860f323b00dcd4c9ee079839108ee27ed4d8b42d8b59c7e3cc5fb61d554929d9f779ce224691d20b868acf7f15adb2c
 
 pkgname = ceph-common
 	pkgdesc = Ceph Storage common libraries and dependencies
@@ -229,7 +231,6 @@ pkgname = ceph-mgr
 	depends = gperftools
 	depends = python-requests
 	depends = python-typing_extensions
-	depends = python-pyjwt
 	depends = python-coverage
 	depends = python-jinja
 	depends = python-pyopenssl
@@ -245,7 +246,6 @@ pkgname = ceph-mgr
 	depends = python-cheroot
 	depends = python-urllib3
 	depends = python-jsonpatch
-	depends = python-cryptography
 	optdepends = cephadm: Required if cluster is managed via cephadm
 	optdepends = python-kubernetes: For mgr/module:rook,k8sevents
 	optdepends = python-numpy: For mgr/module:diskprediction_local
diff --git a/PKGBUILD b/PKGBUILD
index e9a039a43489..9f8ebbe7bc6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -106,6 +106,11 @@ source=(
   # test_concurrent_dir_link_and_compact_log_56210 due to the strange mount/umount/mount
   # pattern
   'ceph-18.2.0-backport-log-runway-expansion.patch'
+
+  # Backport https://github.com/ceph/ceph/pull/55689, removing the mgr dependency on
+  # python-pyjwt -> python-cryptography (-> pyo3)
+  # See https://github.com/bazaah/aur-ceph/issues/20 for more
+  'ceph-18.2.2-backport-mgr-dashboard-simplify-authentication-protocol.patch'
 )
 sha512sums=('88e1c18bc6c824b6203cf026cca4c9409000e7cf5b2b986e22ab74d2790d8b93d91556bd3af15a320dbdd0cf2302308f0b2c75fd1243bc5a65f76fc6b3d70736'
             '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
@@ -124,7 +129,8 @@ sha512sums=('88e1c18bc6c824b6203cf026cca4c9409000e7cf5b2b986e22ab74d2790d8b93d91
             '0c5124693bd317a73707dfd34b17664cc05233aec08e07739fe08fc9a73be7a1f4446052b1addde832cba141a382c35f45e60c89a00bb7dab81cee7ed6be07e1'
             '4613232e5a0003c08d233e40fe3ac1cd00e1195d29bdd9892188587b4a782d6979004232927c0a1bff554eabf2fb9b18eb751682b7ad90762292b63891f3b301'
             '9a1183c08f8799b14235c9271519203cbf93e48ca3a8607d3a0500910efca5379c8a08421c377227f93d8436a850f5ca99784f28aaa920e55f0457c657511f17'
-            'e238b326609636bc7dd10cec59290e22898948ef105c49643c38d2621abf16c2efcf9581b0b6bad65066607510c9827d00a7abdb14f2054701cc33b7101ea054')
+            'e238b326609636bc7dd10cec59290e22898948ef105c49643c38d2621abf16c2efcf9581b0b6bad65066607510c9827d00a7abdb14f2054701cc33b7101ea054'
+            '965f1174ed682409f5aebfe689ccc870a860f323b00dcd4c9ee079839108ee27ed4d8b42d8b59c7e3cc5fb61d554929d9f779ce224691d20b868acf7f15adb2c')
 __version="${pkgver}-${pkgrel}"
 
 # -fno-plt causes linker errors (undefined reference to internal methods)
@@ -730,11 +736,10 @@ package_ceph-mgr() {
 
     'sqlite'   'python'   'boost-libs'   'fmt'   'gperftools'
 
-    'python-requests'    'python-typing_extensions'   'python-pyjwt'        'python-coverage'      'python-jinja'
-    'python-pyopenssl'   'python-cherrypy'            'python-werkzeug'     'python-prettytable'   'python-pecan'
-    'python-scipy'       'python-yaml'                'python-setuptools'   'python-bcrypt'        'python-dateutil'
-    'python-cheroot'     'python-urllib3'             'python-jsonpatch'    'python-cryptography'
-
+    'python-requests'   'python-typing_extensions'   'python-coverage'      'python-jinja'      'python-pyopenssl'
+    'python-cherrypy'   'python-werkzeug'            'python-prettytable'   'python-pecan'      'python-scipy'
+    'python-yaml'       'python-setuptools'          'python-bcrypt'        'python-dateutil'
+    'python-cheroot'    'python-urllib3'             'python-jsonpatch'
   )
   optdepends=(
     'cephadm: Required if cluster is managed via cephadm'