merge: master <--- feature/v18.2.1-1

* HEAD
| \
| * 41cb754 <github@luxolus.com> pkgbuild: pkgver=18.2.1 pkgrel=1
| * bb264d0 <github@luxolus.com> repo: rm ceph-17.2.6-mgr-dashboard-node-version.patch
| /
| master

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

3 files changed, 74 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb05696de9c0..f12371f5f969 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.0
-	pkgrel = 2
+	pkgver = 18.2.1
+	pkgrel = 1
 	url = https://ceph.com/
 	arch = x86_64
 	license = GPL
@@ -81,7 +81,7 @@ pkgbase = ceph
 	makedepends = python-yaml
 	options = emptydirs
 	options = !lto
-	source = https://download.ceph.com/tarballs/ceph-18.2.0.tar.gz
+	source = https://download.ceph.com/tarballs/ceph-18.2.1.tar.gz
 	source = ceph.sysusers
 	source = ceph.sudoers
 	source = ceph-13.2.2-dont-install-sysvinit-script.patch
@@ -93,14 +93,13 @@ pkgbase = ceph
 	source = ceph-17.2.4-pybind-unmock-cythonize.patch
 	source = ceph-17.2.5-fix-iterator-depreciations.patch
 	source = ceph-17.2.5-rgw-client-boost-string-view.patch
-	source = ceph-17.2.6-mgr-dashboard-node-version.patch
 	source = ceph-17.2.6-mgr-dashboard-cherrypy-18.patch
 	source = ceph-17.2.6-mgr-dashboard-pylint-217.patch
 	source = ceph-17.2.6-cython-fixes.patch
 	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
-	sha512sums = fe6a3ca4227cc05b5effc33a02670c466583ec9e4c7c025241248223992254e6e6551d7db486d5ead36bf0ba922d54e0aabc2aaf456d4593679376ec88bd971a
+	sha512sums = 88e1c18bc6c824b6203cf026cca4c9409000e7cf5b2b986e22ab74d2790d8b93d91556bd3af15a320dbdd0cf2302308f0b2c75fd1243bc5a65f76fc6b3d70736
 	sha512sums = 4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049
 	sha512sums = 41dbc1c395cdf9b3edf5c5d91bbc90f416b4338ad964fa3471f26a4312d3ec2a5dcebbc351a1640dc4b047b4f71aa134ac7486747e5f62980092b0176e7567f5
 	sha512sums = ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e
@@ -112,7 +111,6 @@ pkgbase = ceph
 	sha512sums = 781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf
 	sha512sums = 612faebfb5eec3651832f349ea3c23b50d2386889ff77592b0acff653049efdc5c2254f63c30d88b9a730813bf1f1945dda0d0beab0db7db3e0708ba8d057a40
 	sha512sums = 02ca1a9bf15f9cd6f474f264ba2bf66ae725bac990a7cac315dabe377c66935a7afd8117f18a1f82c78bdf9ab2c3e5a2a227f2ffc166974dd7bb99b290f1f233
-	sha512sums = d9729c33f2b8c03ab918919e3b62cbc0825314ad09596dc12984ac5964f8b421db3376b84fa26e0952e0781deb218f8aff6ba32f9c8e5a22bd27afac8dcaf6d3
 	sha512sums = 79be1630ae4a599509e5d789d4aefe412ce47e67ad482f853664fa4b01e063c20593e3da668e6a776ad038fb07606ae948eea41bab20776c33c87f9ab49505e0
 	sha512sums = c767a8e6fd02ea2ab88e99b50b206d0f825acdf177136ded38d93594fc7663b7c9612af7195b85e0b2b501d8ee482af5e088e9abb5ebee7b8a69e0153ce89782
 	sha512sums = 0c5124693bd317a73707dfd34b17664cc05233aec08e07739fe08fc9a73be7a1f4446052b1addde832cba141a382c35f45e60c89a00bb7dab81cee7ed6be07e1
@@ -122,9 +120,9 @@ pkgbase = ceph
 
 pkgname = ceph-common
 	pkgdesc = Ceph Storage common libraries and dependencies
-	depends = ceph-compressor=18.2.0-2
-	depends = ceph-crypto=18.2.0-2
-	depends = ceph-erasure=18.2.0-2
+	depends = ceph-compressor=18.2.1-1
+	depends = ceph-crypto=18.2.1-1
+	depends = ceph-erasure=18.2.1-1
 	depends = boost-libs
 	depends = curl
 	depends = glibc
@@ -161,7 +159,7 @@ pkgname = ceph-erasure
 
 pkgname = ceph-tools
 	pkgdesc = Ceph Storage miscellaneous tooling and utilities
-	depends = ceph-base=18.2.0-2
+	depends = ceph-base=18.2.1-1
 	depends = bash
 	depends = boost-libs
 	depends = gperftools
@@ -171,7 +169,7 @@ pkgname = ceph-tools
 
 pkgname = ceph-test
 	pkgdesc = Ceph Storage tools for benchmarking and testing live clusters
-	depends = ceph-base=18.2.0-2
+	depends = ceph-base=18.2.1-1
 	depends = libcap
 	depends = libaio
 	depends = boost-libs
@@ -181,8 +179,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.0-2
-	depends = ceph-osd=18.2.0-2
+	depends = python-ceph-common=18.2.1-1
+	depends = ceph-osd=18.2.1-1
 	depends = python
 	depends = lvm2
 	depends = python-setuptools
@@ -197,22 +195,22 @@ pkgname = ceph-cephadm
 
 pkgname = ceph-rados
 	pkgdesc = Ceph Storage utilities and tools for librados
-	depends = librados=18.2.0-2
+	depends = librados=18.2.1-1
 	depends = gcc-libs
 
 pkgname = ceph-base
 	pkgdesc = Ceph Storage cluster base utilities and configuration
-	depends = ceph-common=18.2.0-2
-	depends = librados=18.2.0-2
-	depends = python-ceph-common=18.2.0-2
-	depends = python-rados=18.2.0-2
+	depends = ceph-common=18.2.1-1
+	depends = librados=18.2.1-1
+	depends = python-ceph-common=18.2.1-1
+	depends = python-rados=18.2.1-1
 	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.0-2
+	depends = ceph-base=18.2.1-1
 	depends = bash
 	depends = boost-libs
 	depends = fmt
@@ -221,10 +219,10 @@ pkgname = ceph-mon
 
 pkgname = ceph-mgr
 	pkgdesc = Ceph Storage cluster manager daemon, the API gateway for cluster management
-	depends = ceph-base=18.2.0-2
-	depends = python-cephfs=18.2.0-2
-	depends = python-rbd=18.2.0-2
-	depends = libcephsqlite=18.2.0-2
+	depends = ceph-base=18.2.1-1
+	depends = python-cephfs=18.2.1-1
+	depends = python-rbd=18.2.1-1
+	depends = libcephsqlite=18.2.1-1
 	depends = sqlite
 	depends = python
 	depends = boost-libs
@@ -256,7 +254,7 @@ pkgname = ceph-mgr
 
 pkgname = ceph-osd
 	pkgdesc = Ceph Storage cluster object storage daemon, for managing block devices
-	depends = ceph-base=18.2.0-2
+	depends = ceph-base=18.2.1-1
 	depends = fuse3
 	depends = bash
 	depends = boost-libs
@@ -273,14 +271,14 @@ pkgname = ceph-osd
 
 pkgname = ceph-mds
 	pkgdesc = Ceph Storage cluster metadata server, the API gateway for CephFS
-	depends = ceph-base=18.2.0-2
+	depends = ceph-base=18.2.1-1
 	depends = lua
 	depends = fmt
 	depends = gperftools
 
 pkgname = ceph-rbd
 	pkgdesc = Ceph Storage utilities and tooling for librbd
-	depends = librbd=18.2.0-2
+	depends = librbd=18.2.1-1
 	depends = libnl
 	depends = fmt
 	depends = fuse3
@@ -292,7 +290,7 @@ pkgname = ceph-rbd
 
 pkgname = ceph-cephfs
 	pkgdesc = Ceph Storage utilities and tooling for libcephfs
-	depends = libcephfs=18.2.0-2
+	depends = libcephfs=18.2.1-1
 	depends = fuse3
 	depends = fmt
 	depends = gperftools
@@ -304,7 +302,7 @@ pkgname = ceph-cephfs
 
 pkgname = ceph-rgw
 	pkgdesc = Ceph Storage cluster RADOS Object Gateway daemon, for serving RESTful traffic
-	depends = librgw=18.2.0-2
+	depends = librgw=18.2.1-1
 	depends = gawk
 	depends = oath-toolkit
 	depends = boost-libs
@@ -316,7 +314,7 @@ pkgname = ceph-rgw
 
 pkgname = librados
 	pkgdesc = Ceph Storage client library to the RADOS distributed object store
-	depends = ceph-common=18.2.0-2
+	depends = ceph-common=18.2.1-1
 	depends = bash
 	depends = boost-libs
 	depends = fmt
@@ -327,13 +325,13 @@ pkgname = librados
 
 pkgname = libcephfs
 	pkgdesc = Ceph Storage client library for CephFS, a distributed POSIX filesystem
-	depends = librados=18.2.0-2
+	depends = librados=18.2.1-1
 	depends = fmt
 	provides = libcephfs.so
 
 pkgname = librbd
 	pkgdesc = Ceph Storage client library for RADOS block devices
-	depends = librados=18.2.0-2
+	depends = librados=18.2.1-1
 	depends = cryptsetup
 	depends = fmt
 	provides = librbd.so
@@ -341,7 +339,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.0-2
+	depends = librados=18.2.1-1
 	depends = librabbitmq-c
 	depends = lua
 	depends = librdkafka
@@ -352,13 +350,13 @@ pkgname = librgw
 
 pkgname = libcephsqlite
 	pkgdesc = Ceph Storage client library for a RADOS backed sqlite3 VFS extension
-	depends = librados=18.2.0-2
+	depends = librados=18.2.1-1
 	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.0-2
+	depends = ceph-common=18.2.1-1
 	depends = python
 	depends = python-setuptools
 	depends = python-prettytable
@@ -366,81 +364,81 @@ pkgname = python-ceph-common
 
 pkgname = python-rados
 	pkgdesc = Ceph Storage python library for librados
-	depends = python-ceph-common=18.2.0-2
-	depends = librados=18.2.0-2
+	depends = python-ceph-common=18.2.1-1
+	depends = librados=18.2.1-1
 	depends = libxcrypt
 
 pkgname = python-rbd
 	pkgdesc = Ceph Storage python library for librbd
-	depends = python-ceph-common=18.2.0-2
-	depends = python-rados=18.2.0-2
-	depends = librbd=18.2.0-2
+	depends = python-ceph-common=18.2.1-1
+	depends = python-rados=18.2.1-1
+	depends = librbd=18.2.1-1
 	depends = libxcrypt
 
 pkgname = python-cephfs
 	pkgdesc = Ceph Storage python library for libcephfs
-	depends = python-ceph-common=18.2.0-2
-	depends = python-rados=18.2.0-2
-	depends = libcephfs=18.2.0-2
+	depends = python-ceph-common=18.2.1-1
+	depends = python-rados=18.2.1-1
+	depends = libcephfs=18.2.1-1
 	depends = libxcrypt
 
 pkgname = python-rgw
 	pkgdesc = Ceph Storage python library for librgw
-	depends = python-ceph-common=18.2.0-2
-	depends = python-rados=18.2.0-2
-	depends = librgw=18.2.0-2
+	depends = python-ceph-common=18.2.1-1
+	depends = python-rados=18.2.1-1
+	depends = librgw=18.2.1-1
 	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.0-2
-	depends = python-cephfs=18.2.0-2
+	depends = python-ceph-common=18.2.1-1
+	depends = python-cephfs=18.2.1-1
 	depends = python
 
 pkgname = cephfs-shell
 	pkgdesc = Ceph Storage utility for accessing a CephFS filesystem shell
-	depends = python-ceph-common=18.2.0-2
-	depends = python-cephfs=18.2.0-2
+	depends = python-ceph-common=18.2.1-1
+	depends = python-cephfs=18.2.1-1
 	depends = python
 	depends = python-cmd2
 	depends = python-colorama
 
 pkgname = java-cephfs
 	pkgdesc = Ceph Storage JNI bindings for CephFS
-	depends = libcephfs=18.2.0-2
+	depends = libcephfs=18.2.1-1
 	depends = java-runtime
 
 pkgname = ceph
 	pkgdesc = Ceph Storage full install [VIRTUAL]
-	depends = ceph-libs=18.2.0-2
-	depends = ceph-cluster=18.2.0-2
-	depends = ceph-rados=18.2.0-2
-	depends = ceph-rbd=18.2.0-2
-	depends = ceph-cephfs=18.2.0-2
-	depends = ceph-tools=18.2.0-2
-	depends = ceph-test=18.2.0-2
-	depends = python-rados=18.2.0-2
-	depends = python-rbd=18.2.0-2
-	depends = python-cephfs=18.2.0-2
-	depends = python-rgw=18.2.0-2
+	depends = ceph-libs=18.2.1-1
+	depends = ceph-cluster=18.2.1-1
+	depends = ceph-rados=18.2.1-1
+	depends = ceph-rbd=18.2.1-1
+	depends = ceph-cephfs=18.2.1-1
+	depends = ceph-tools=18.2.1-1
+	depends = ceph-test=18.2.1-1
+	depends = python-rados=18.2.1-1
+	depends = python-rbd=18.2.1-1
+	depends = python-cephfs=18.2.1-1
+	depends = python-rgw=18.2.1-1
 
 pkgname = ceph-libs
 	pkgdesc = Ceph Storage client libraries [VIRTUAL]
-	depends = librados=18.2.0-2
-	depends = librbd=18.2.0-2
-	depends = libcephfs=18.2.0-2
-	depends = librgw=18.2.0-2
-	depends = libcephsqlite=18.2.0-2
+	depends = librados=18.2.1-1
+	depends = librbd=18.2.1-1
+	depends = libcephfs=18.2.1-1
+	depends = librgw=18.2.1-1
+	depends = libcephsqlite=18.2.1-1
 
 pkgname = ceph-cluster
 	pkgdesc = Ceph Storage cluster daemons and components [VIRTUAL]
-	depends = ceph-mon=18.2.0-2
-	depends = ceph-mgr=18.2.0-2
-	depends = ceph-osd=18.2.0-2
-	depends = ceph-mds=18.2.0-2
-	depends = ceph-rgw=18.2.0-2
-	depends = ceph-volume=18.2.0-2
+	depends = ceph-mon=18.2.1-1
+	depends = ceph-mgr=18.2.1-1
+	depends = ceph-osd=18.2.1-1
+	depends = ceph-mds=18.2.1-1
+	depends = ceph-rgw=18.2.1-1
+	depends = ceph-volume=18.2.1-1
 
 pkgname = ceph-cli
 	pkgdesc = Ceph Storage CLI utility [VIRTUAL]
-	depends = ceph-base=18.2.0-2
+	depends = ceph-base=18.2.1-1
diff --git a/PKGBUILD b/PKGBUILD
index 7f9d3dff46e6..42edf3234ff0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbase='ceph'
 pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
-pkgver=18.2.0
-pkgrel=2
+pkgver=18.2.1
+pkgrel=1
 url='https://ceph.com/'
 arch=('x86_64')
 license=('GPL')
@@ -88,9 +88,6 @@ source=(
   # https://github.com/boostorg/beast/issues/2594
   'ceph-17.2.5-rgw-client-boost-string-view.patch'
 
-  # Fixes node-gyp errors due to py3.11 incompatibilities
-  'ceph-17.2.6-mgr-dashboard-node-version.patch'
-
   # Fixes inspect.getargspec errors due to removal in py3.11
   'ceph-17.2.6-mgr-dashboard-cherrypy-18.patch'
 
@@ -111,7 +108,7 @@ source=(
   # pattern
   'ceph-18.2.0-backport-log-runway-expansion.patch'
 )
-sha512sums=('fe6a3ca4227cc05b5effc33a02670c466583ec9e4c7c025241248223992254e6e6551d7db486d5ead36bf0ba922d54e0aabc2aaf456d4593679376ec88bd971a'
+sha512sums=('88e1c18bc6c824b6203cf026cca4c9409000e7cf5b2b986e22ab74d2790d8b93d91556bd3af15a320dbdd0cf2302308f0b2c75fd1243bc5a65f76fc6b3d70736'
             '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
             '41dbc1c395cdf9b3edf5c5d91bbc90f416b4338ad964fa3471f26a4312d3ec2a5dcebbc351a1640dc4b047b4f71aa134ac7486747e5f62980092b0176e7567f5'
             'ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e'
@@ -123,7 +120,6 @@ sha512sums=('fe6a3ca4227cc05b5effc33a02670c466583ec9e4c7c025241248223992254e6e65
             '781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf'
             '612faebfb5eec3651832f349ea3c23b50d2386889ff77592b0acff653049efdc5c2254f63c30d88b9a730813bf1f1945dda0d0beab0db7db3e0708ba8d057a40'
             '02ca1a9bf15f9cd6f474f264ba2bf66ae725bac990a7cac315dabe377c66935a7afd8117f18a1f82c78bdf9ab2c3e5a2a227f2ffc166974dd7bb99b290f1f233'
-            'd9729c33f2b8c03ab918919e3b62cbc0825314ad09596dc12984ac5964f8b421db3376b84fa26e0952e0781deb218f8aff6ba32f9c8e5a22bd27afac8dcaf6d3'
             '79be1630ae4a599509e5d789d4aefe412ce47e67ad482f853664fa4b01e063c20593e3da668e6a776ad038fb07606ae948eea41bab20776c33c87f9ab49505e0'
             'c767a8e6fd02ea2ab88e99b50b206d0f825acdf177136ded38d93594fc7663b7c9612af7195b85e0b2b501d8ee482af5e088e9abb5ebee7b8a69e0153ce89782'
             '0c5124693bd317a73707dfd34b17664cc05233aec08e07739fe08fc9a73be7a1f4446052b1addde832cba141a382c35f45e60c89a00bb7dab81cee7ed6be07e1'
diff --git a/ceph-17.2.6-mgr-dashboard-node-version.patch b/ceph-17.2.6-mgr-dashboard-node-version.patch
deleted file mode 100644
index b2db11e5b544..000000000000
--- a/ceph-17.2.6-mgr-dashboard-node-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
-index 4fd2130b93a..7df5de57c66 100644
---- a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
-@@ -63,7 +63,7 @@ else(WITH_SYSTEM_NPM)
-     OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
-     COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
-     COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
--    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=14.15.1
-+    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=16.15.0
-     COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm
-     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-     COMMENT "dashboard nodeenv is being installed")