merge: master <--- feature/v18.2.2-2

* HEAD
| \
| * c8a69c3 <github@luxolus.com> pkgbuild: pkgrel=2
| * a6b3328 <github@luxolus.com> pkgbuild: use mgr-alias-ceph-bcrypt.patch
| * 8f49d39 <github@luxolus.com> repo: add mgr-alias-ceph-bcrypt.patch
| /
| master

Signed-off-by: Bazaah <github@luxolus.com>

3 files changed, 101 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdd384a20c3d..dea048257772 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ceph
 	pkgdesc = Distributed, fault-tolerant storage platform delivering object, block, and file system
 	pkgver = 18.2.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://ceph.com/
 	arch = x86_64
 	license = GPL
@@ -104,6 +104,7 @@ pkgbase = ceph
 	source = ceph-18.2.0-backport-log-runway-expansion.patch
 	source = ceph-18.2.2-backport-mgr-dashboard-simplify-authentication-protocol.patch
 	source = ceph-18.2.2-mgr-ceph-module-stub.patch
+	source = ceph-18.2.2-mgr-alias-ceph-bcrypt.patch
 	source = python-bcrypt-4.1.2.tar.gz::https://github.com/pyca/bcrypt/archive/4.1.2.tar.gz
 	source = python-bcrypt-prefix-ceph.patch
 	source = python-bcrypt-allow-subinterpreters.patch
@@ -127,15 +128,16 @@ pkgbase = ceph
 	sha512sums = e238b326609636bc7dd10cec59290e22898948ef105c49643c38d2621abf16c2efcf9581b0b6bad65066607510c9827d00a7abdb14f2054701cc33b7101ea054
 	sha512sums = 965f1174ed682409f5aebfe689ccc870a860f323b00dcd4c9ee079839108ee27ed4d8b42d8b59c7e3cc5fb61d554929d9f779ce224691d20b868acf7f15adb2c
 	sha512sums = 494290871b12be79a3e74618912d552f4802a7580abcd8e174b890944917ac04e1a52ddd7c039fa230cf43463ed479f9abf6f9a7d403d4ba5b522297184b09a5
+	sha512sums = 692b9cea0199366fdfbcaff2d9590e3a1e439b948a1a5030215e81fcc8a22ac562b3261e2057470cc8acc20f404869a5a0c4550177788dc2f824523e5267b1eb
 	sha512sums = 9cd6535249b88d83efd6f84e36c552cfb68d080c12b5f35167976219fd298efa03010c8674aa6d173242c098194c7d6ace3e2a5173a910bebf63791f60e7ade3
 	sha512sums = 26e4569396005f7461764dbe57634ab6d20ca9bfe777b4eeae3def8e3c887333b4d64470ad1db15a8170979f85372c111abfc043bdc1deae219183cc7539980e
 	sha512sums = 80f0d698d03b18c7168818983e150b34c19480f629f33d5537f76f810bdc7394dea68409ededa5d7f369bf9377cbaa7a9f11caa8874e3ecb29fd8bb06d45aeb2
 
 pkgname = ceph-common
 	pkgdesc = Ceph Storage common libraries and dependencies
-	depends = ceph-compressor=18.2.2-1
-	depends = ceph-crypto=18.2.2-1
-	depends = ceph-erasure=18.2.2-1
+	depends = ceph-compressor=18.2.2-2
+	depends = ceph-crypto=18.2.2-2
+	depends = ceph-erasure=18.2.2-2
 	depends = boost-libs
 	depends = curl
 	depends = glibc
@@ -172,7 +174,7 @@ pkgname = ceph-erasure
 
 pkgname = ceph-tools
 	pkgdesc = Ceph Storage miscellaneous tooling and utilities
-	depends = ceph-base=18.2.2-1
+	depends = ceph-base=18.2.2-2
 	depends = bash
 	depends = boost-libs
 	depends = gperftools
@@ -182,7 +184,7 @@ pkgname = ceph-tools
 
 pkgname = ceph-test
 	pkgdesc = Ceph Storage tools for benchmarking and testing live clusters
-	depends = ceph-base=18.2.2-1
+	depends = ceph-base=18.2.2-2
 	depends = libcap
 	depends = libaio
 	depends = boost-libs
@@ -192,8 +194,8 @@ pkgname = ceph-test
 
 pkgname = ceph-volume
 	pkgdesc = Ceph Storage utility for preparing block devices for use as OSDs
-	depends = python-ceph-common=18.2.2-1
-	depends = ceph-osd=18.2.2-1
+	depends = python-ceph-common=18.2.2-2
+	depends = ceph-osd=18.2.2-2
 	depends = python
 	depends = lvm2
 	depends = python-setuptools
@@ -208,22 +210,22 @@ pkgname = ceph-cephadm
 
 pkgname = ceph-rados
 	pkgdesc = Ceph Storage utilities and tools for librados
-	depends = librados=18.2.2-1
+	depends = librados=18.2.2-2
 	depends = gcc-libs
 
 pkgname = ceph-base
 	pkgdesc = Ceph Storage cluster base utilities and configuration
-	depends = ceph-common=18.2.2-1
-	depends = librados=18.2.2-1
-	depends = python-ceph-common=18.2.2-1
-	depends = python-rados=18.2.2-1
+	depends = ceph-common=18.2.2-2
+	depends = librados=18.2.2-2
+	depends = python-ceph-common=18.2.2-2
+	depends = python-rados=18.2.2-2
 	depends = python
 	backup = etc/logrotate.d/ceph
 	backup = etc/sudoers.d/90-ceph
 
 pkgname = ceph-mon
 	pkgdesc = Ceph Storage cluster monitor daemon, for distributed state storage via PAXOS
-	depends = ceph-base=18.2.2-1
+	depends = ceph-base=18.2.2-2
 	depends = bash
 	depends = boost-libs
 	depends = fmt
@@ -232,10 +234,10 @@ pkgname = ceph-mon
 
 pkgname = ceph-mgr
 	pkgdesc = Ceph Storage cluster manager daemon, the API gateway for cluster management
-	depends = ceph-base=18.2.2-1
-	depends = python-cephfs=18.2.2-1
-	depends = python-rbd=18.2.2-1
-	depends = libcephsqlite=18.2.2-1
+	depends = ceph-base=18.2.2-2
+	depends = python-cephfs=18.2.2-2
+	depends = python-rbd=18.2.2-2
+	depends = libcephsqlite=18.2.2-2
 	depends = sqlite
 	depends = python
 	depends = boost-libs
@@ -265,7 +267,7 @@ pkgname = ceph-mgr
 
 pkgname = ceph-osd
 	pkgdesc = Ceph Storage cluster object storage daemon, for managing block devices
-	depends = ceph-base=18.2.2-1
+	depends = ceph-base=18.2.2-2
 	depends = fuse3
 	depends = bash
 	depends = boost-libs
@@ -282,14 +284,14 @@ pkgname = ceph-osd
 
 pkgname = ceph-mds
 	pkgdesc = Ceph Storage cluster metadata server, the API gateway for CephFS
-	depends = ceph-base=18.2.2-1
+	depends = ceph-base=18.2.2-2
 	depends = lua
 	depends = fmt
 	depends = gperftools
 
 pkgname = ceph-rbd
 	pkgdesc = Ceph Storage utilities and tooling for librbd
-	depends = librbd=18.2.2-1
+	depends = librbd=18.2.2-2
 	depends = libnl
 	depends = fmt
 	depends = fuse3
@@ -301,7 +303,7 @@ pkgname = ceph-rbd
 
 pkgname = ceph-cephfs
 	pkgdesc = Ceph Storage utilities and tooling for libcephfs
-	depends = libcephfs=18.2.2-1
+	depends = libcephfs=18.2.2-2
 	depends = fuse3
 	depends = fmt
 	depends = gperftools
@@ -313,7 +315,7 @@ pkgname = ceph-cephfs
 
 pkgname = ceph-rgw
 	pkgdesc = Ceph Storage cluster RADOS Object Gateway daemon, for serving RESTful traffic
-	depends = librgw=18.2.2-1
+	depends = librgw=18.2.2-2
 	depends = gawk
 	depends = oath-toolkit
 	depends = boost-libs
@@ -325,7 +327,7 @@ pkgname = ceph-rgw
 
 pkgname = librados
 	pkgdesc = Ceph Storage client library to the RADOS distributed object store
-	depends = ceph-common=18.2.2-1
+	depends = ceph-common=18.2.2-2
 	depends = bash
 	depends = boost-libs
 	depends = fmt
@@ -336,13 +338,13 @@ pkgname = librados
 
 pkgname = libcephfs
 	pkgdesc = Ceph Storage client library for CephFS, a distributed POSIX filesystem
-	depends = librados=18.2.2-1
+	depends = librados=18.2.2-2
 	depends = fmt
 	provides = libcephfs.so
 
 pkgname = librbd
 	pkgdesc = Ceph Storage client library for RADOS block devices
-	depends = librados=18.2.2-1
+	depends = librados=18.2.2-2
 	depends = cryptsetup
 	depends = fmt
 	provides = librbd.so
@@ -350,7 +352,7 @@ pkgname = librbd
 
 pkgname = librgw
 	pkgdesc = Ceph Storage client library to RADOS Object Gateway, a S3 and Swift compatible REST API
-	depends = librados=18.2.2-1
+	depends = librados=18.2.2-2
 	depends = librabbitmq-c
 	depends = lua
 	depends = librdkafka
@@ -361,13 +363,13 @@ pkgname = librgw
 
 pkgname = libcephsqlite
 	pkgdesc = Ceph Storage client library for a RADOS backed sqlite3 VFS extension
-	depends = librados=18.2.2-1
+	depends = librados=18.2.2-2
 	depends = fmt
 	provides = libcephsqlite.so
 
 pkgname = python-ceph-common
 	pkgdesc = Ceph Storage python module for common classes, objects and types
-	depends = ceph-common=18.2.2-1
+	depends = ceph-common=18.2.2-2
 	depends = python
 	depends = python-setuptools
 	depends = python-prettytable
@@ -375,81 +377,81 @@ pkgname = python-ceph-common
 
 pkgname = python-rados
 	pkgdesc = Ceph Storage python library for librados
-	depends = python-ceph-common=18.2.2-1
-	depends = librados=18.2.2-1
+	depends = python-ceph-common=18.2.2-2
+	depends = librados=18.2.2-2
 	depends = libxcrypt
 
 pkgname = python-rbd
 	pkgdesc = Ceph Storage python library for librbd
-	depends = python-ceph-common=18.2.2-1
-	depends = python-rados=18.2.2-1
-	depends = librbd=18.2.2-1
+	depends = python-ceph-common=18.2.2-2
+	depends = python-rados=18.2.2-2
+	depends = librbd=18.2.2-2
 	depends = libxcrypt
 
 pkgname = python-cephfs
 	pkgdesc = Ceph Storage python library for libcephfs
-	depends = python-ceph-common=18.2.2-1
-	depends = python-rados=18.2.2-1
-	depends = libcephfs=18.2.2-1
+	depends = python-ceph-common=18.2.2-2
+	depends = python-rados=18.2.2-2
+	depends = libcephfs=18.2.2-2
 	depends = libxcrypt
 
 pkgname = python-rgw
 	pkgdesc = Ceph Storage python library for librgw
-	depends = python-ceph-common=18.2.2-1
-	depends = python-rados=18.2.2-1
-	depends = librgw=18.2.2-1
+	depends = python-ceph-common=18.2.2-2
+	depends = python-rados=18.2.2-2
+	depends = librgw=18.2.2-2
 	depends = libxcrypt
 
 pkgname = cephfs-top
 	pkgdesc = Ceph Storage utility for a top(1) inspired curses TUI for CephFS metrics
-	depends = python-ceph-common=18.2.2-1
-	depends = python-cephfs=18.2.2-1
+	depends = python-ceph-common=18.2.2-2
+	depends = python-cephfs=18.2.2-2
 	depends = python
 
 pkgname = cephfs-shell
 	pkgdesc = Ceph Storage utility for accessing a CephFS filesystem shell
-	depends = python-ceph-common=18.2.2-1
-	depends = python-cephfs=18.2.2-1
+	depends = python-ceph-common=18.2.2-2
+	depends = python-cephfs=18.2.2-2
 	depends = python
 	depends = python-cmd2
 	depends = python-colorama
 
 pkgname = java-cephfs
 	pkgdesc = Ceph Storage JNI bindings for CephFS
-	depends = libcephfs=18.2.2-1
+	depends = libcephfs=18.2.2-2
 	depends = java-runtime
 
 pkgname = ceph
 	pkgdesc = Ceph Storage full install [VIRTUAL]
-	depends = ceph-libs=18.2.2-1
-	depends = ceph-cluster=18.2.2-1
-	depends = ceph-rados=18.2.2-1
-	depends = ceph-rbd=18.2.2-1
-	depends = ceph-cephfs=18.2.2-1
-	depends = ceph-tools=18.2.2-1
-	depends = ceph-test=18.2.2-1
-	depends = python-rados=18.2.2-1
-	depends = python-rbd=18.2.2-1
-	depends = python-cephfs=18.2.2-1
-	depends = python-rgw=18.2.2-1
+	depends = ceph-libs=18.2.2-2
+	depends = ceph-cluster=18.2.2-2
+	depends = ceph-rados=18.2.2-2
+	depends = ceph-rbd=18.2.2-2
+	depends = ceph-cephfs=18.2.2-2
+	depends = ceph-tools=18.2.2-2
+	depends = ceph-test=18.2.2-2
+	depends = python-rados=18.2.2-2
+	depends = python-rbd=18.2.2-2
+	depends = python-cephfs=18.2.2-2
+	depends = python-rgw=18.2.2-2
 
 pkgname = ceph-libs
 	pkgdesc = Ceph Storage client libraries [VIRTUAL]
-	depends = librados=18.2.2-1
-	depends = librbd=18.2.2-1
-	depends = libcephfs=18.2.2-1
-	depends = librgw=18.2.2-1
-	depends = libcephsqlite=18.2.2-1
+	depends = librados=18.2.2-2
+	depends = librbd=18.2.2-2
+	depends = libcephfs=18.2.2-2
+	depends = librgw=18.2.2-2
+	depends = libcephsqlite=18.2.2-2
 
 pkgname = ceph-cluster
 	pkgdesc = Ceph Storage cluster daemons and components [VIRTUAL]
-	depends = ceph-mon=18.2.2-1
-	depends = ceph-mgr=18.2.2-1
-	depends = ceph-osd=18.2.2-1
-	depends = ceph-mds=18.2.2-1
-	depends = ceph-rgw=18.2.2-1
-	depends = ceph-volume=18.2.2-1
+	depends = ceph-mon=18.2.2-2
+	depends = ceph-mgr=18.2.2-2
+	depends = ceph-osd=18.2.2-2
+	depends = ceph-mds=18.2.2-2
+	depends = ceph-rgw=18.2.2-2
+	depends = ceph-volume=18.2.2-2
 
 pkgname = ceph-cli
 	pkgdesc = Ceph Storage CLI utility [VIRTUAL]
-	depends = ceph-base=18.2.2-1
+	depends = ceph-base=18.2.2-2
diff --git a/PKGBUILD b/PKGBUILD
index b122533e25eb..556f148d165c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase='ceph'
 pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
 pkgver=18.2.2
-pkgrel=1
+pkgrel=2
 url='https://ceph.com/'
 arch=('x86_64')
 license=('GPL')
@@ -120,6 +120,9 @@ source=(
   # importing type stub (.pyi) files directly, without a .py skeleton
   'ceph-18.2.2-mgr-ceph-module-stub.patch'
 
+  # Make the mgr import our ceph_bcrypt fork instead of the system bcrypt
+  'ceph-18.2.2-mgr-alias-ceph-bcrypt.patch'
+
   # ===== ceph-python-bcrypt sources ===== #
   "python-bcrypt-${__bcrypt_version}.tar.gz::https://github.com/pyca/bcrypt/archive/${__bcrypt_version}.tar.gz"
 
@@ -149,6 +152,7 @@ sha512sums=('2fcd3d67512754947adc8780edbbee9498ef666056b804298cdc998a3eb4a2916c8
             'e238b326609636bc7dd10cec59290e22898948ef105c49643c38d2621abf16c2efcf9581b0b6bad65066607510c9827d00a7abdb14f2054701cc33b7101ea054'
             '965f1174ed682409f5aebfe689ccc870a860f323b00dcd4c9ee079839108ee27ed4d8b42d8b59c7e3cc5fb61d554929d9f779ce224691d20b868acf7f15adb2c'
             '494290871b12be79a3e74618912d552f4802a7580abcd8e174b890944917ac04e1a52ddd7c039fa230cf43463ed479f9abf6f9a7d403d4ba5b522297184b09a5'
+            '692b9cea0199366fdfbcaff2d9590e3a1e439b948a1a5030215e81fcc8a22ac562b3261e2057470cc8acc20f404869a5a0c4550177788dc2f824523e5267b1eb'
             '9cd6535249b88d83efd6f84e36c552cfb68d080c12b5f35167976219fd298efa03010c8674aa6d173242c098194c7d6ace3e2a5173a910bebf63791f60e7ade3'
             '26e4569396005f7461764dbe57634ab6d20ca9bfe777b4eeae3def8e3c887333b4d64470ad1db15a8170979f85372c111abfc043bdc1deae219183cc7539980e'
             '80f0d698d03b18c7168818983e150b34c19480f629f33d5537f76f810bdc7394dea68409ededa5d7f369bf9377cbaa7a9f11caa8874e3ecb29fd8bb06d45aeb2')
diff --git a/ceph-18.2.2-mgr-alias-ceph-bcrypt.patch b/ceph-18.2.2-mgr-alias-ceph-bcrypt.patch
new file mode 100644
index 000000000000..6c8ad96b03c5
--- /dev/null
+++ b/ceph-18.2.2-mgr-alias-ceph-bcrypt.patch
@@ -0,0 +1,26 @@
+diff --git a/src/pybind/mgr/dashboard/services/access_control.py b/src/pybind/mgr/dashboard/services/access_control.py
+index 0cbe49bb160..3a8b4ace288 100644
+--- a/src/pybind/mgr/dashboard/services/access_control.py
++++ b/src/pybind/mgr/dashboard/services/access_control.py
+@@ -12,7 +12,7 @@ from datetime import datetime, timedelta
+ from string import ascii_lowercase, ascii_uppercase, digits, punctuation
+ from typing import List, Optional, Sequence
+ 
+-import bcrypt
++import ceph_bcrypt as bcrypt
+ from mgr_module import CLICheckNonemptyFileInput, CLIReadCommand, CLIWriteCommand
+ from mgr_util import password_hash
+ 
+diff --git a/src/pybind/mgr/mgr_util.py b/src/pybind/mgr/mgr_util.py
+index 8684f801318..b2ab1c1568e 100644
+--- a/src/pybind/mgr/mgr_util.py
++++ b/src/pybind/mgr/mgr_util.py
+@@ -3,7 +3,7 @@ import os
+ if 'UNITTEST' in os.environ:
+     import tests
+ 
+-import bcrypt
++import ceph_bcrypt as bcrypt
+ import cephfs
+ import contextlib
+ import datetime