From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id E59561FF142 for ; Tue, 07 Apr 2026 15:19:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A5AD81B528; Tue, 7 Apr 2026 15:19:41 +0200 (CEST) From: Kefu Chai To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-ceph] refresh patches and drop applied ones for 20.2.1 Date: Tue, 7 Apr 2026 21:18:58 +0800 Message-ID: <20260407131858.1348828-1-k.chai@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1775567879217 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.399 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: LTDEWAQ4BUOZIQVMXI3DLVV5FSWCOITX X-Message-ID-Hash: LTDEWAQ4BUOZIQVMXI3DLVV5FSWCOITX X-MailFrom: k.chai@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Drop patches that have been merged upstream in Tentacle 20.2.1: - cryptotools series - python3-packaging dependency - ceph-volume@ systemd unit fix Refresh remaining patches so that they apply cleanly. Signed-off-by: Kefu Chai --- ...aldoc-override-and-ship-upstream-cha.patch | 4 +- ...03-ceph-mgr-only-suggest-mgr-plugins.patch | 4 +- ...hared_blob-to-prevent-crashing-OSDs.patch} | 4 +- ...11-d-rules-disable-jaeger-telemetry.patch} | 0 ...thon3-distutils-not-available-in-De.patch} | 0 ...p-legacy-init.d-ceph-script-anymore.patch} | 4 +- ...port-by-making-NOTIFY_TYPES-in-py-m.patch} | 0 ...e-on_progress-callbacks-to-prevent-.patch} | 14 +++---- patches/series | 38 +++---------------- 9 files changed, 21 insertions(+), 47 deletions(-) rename patches/{0011-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch => 0010-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch} (94%) rename patches/{0012-d-rules-disable-jaeger-telemetry.patch => 0011-d-rules-disable-jaeger-telemetry.patch} (100%) rename patches/{0013-d-py3dist-drop-python3-distutils-not-available-in-De.patch => 0012-d-py3dist-drop-python3-distutils-not-available-in-De.patch} (100%) rename patches/{0014-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch => 0013-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch} (95%) rename patches/{0039-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch => 0014-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch} (100%) rename patches/{0040-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch => 0015-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch} (96%) diff --git a/patches/0002-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch b/patches/0002-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch index 8c2e61a2baa..42dd58f3dbc 100644 --- a/patches/0002-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch +++ b/patches/0002-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch @@ -16,10 +16,10 @@ Signed-off-by: Max R. Carrara 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules -index b935efaa8cd..48f2aad2e1b 100755 +index ee4eff2bdc5..63d9e4a3c1f 100755 --- a/debian/rules +++ b/debian/rules -@@ -88,7 +88,7 @@ override_dh_auto_install: +@@ -89,7 +89,7 @@ override_dh_auto_install: # doc/changelog is a directory, which confuses dh_installchangelogs override_dh_installchangelogs: diff --git a/patches/0003-ceph-mgr-only-suggest-mgr-plugins.patch b/patches/0003-ceph-mgr-only-suggest-mgr-plugins.patch index c504dec8680..2ecc2e1c5af 100644 --- a/patches/0003-ceph-mgr-only-suggest-mgr-plugins.patch +++ b/patches/0003-ceph-mgr-only-suggest-mgr-plugins.patch @@ -13,10 +13,10 @@ Signed-off-by: Max R. Carrara 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control -index 35c1dbe5bd2..e868d2aa29e 100644 +index 7d770df19c6..a4ea16807f9 100644 --- a/debian/control +++ b/debian/control -@@ -239,11 +239,11 @@ Depends: ceph-base (= ${binary:Version}), +@@ -243,11 +243,11 @@ Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, diff --git a/patches/0011-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch b/patches/0010-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch similarity index 94% rename from patches/0011-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch rename to patches/0010-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch index 61be59130c7..d8fc5e86787 100644 --- a/patches/0011-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch +++ b/patches/0010-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch @@ -19,10 +19,10 @@ Signed-off-by: Max R. Carrara 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in -index 5b7d589277c..bc15b16a266 100644 +index 99cadcdf35e..f2148e936f8 100644 --- a/src/common/options/global.yaml.in +++ b/src/common/options/global.yaml.in -@@ -5116,7 +5116,7 @@ options: +@@ -5140,7 +5140,7 @@ options: long_desc: Overwrites on snapped objects cause shared blob count to grow. It has a very negative performance effect. When enabled shared blob count is significantly reduced. diff --git a/patches/0012-d-rules-disable-jaeger-telemetry.patch b/patches/0011-d-rules-disable-jaeger-telemetry.patch similarity index 100% rename from patches/0012-d-rules-disable-jaeger-telemetry.patch rename to patches/0011-d-rules-disable-jaeger-telemetry.patch diff --git a/patches/0013-d-py3dist-drop-python3-distutils-not-available-in-De.patch b/patches/0012-d-py3dist-drop-python3-distutils-not-available-in-De.patch similarity index 100% rename from patches/0013-d-py3dist-drop-python3-distutils-not-available-in-De.patch rename to patches/0012-d-py3dist-drop-python3-distutils-not-available-in-De.patch diff --git a/patches/0014-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch b/patches/0013-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch similarity index 95% rename from patches/0014-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch rename to patches/0013-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch index c6ac01cb2f1..6270d5e4700 100644 --- a/patches/0014-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch +++ b/patches/0013-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch @@ -31,10 +31,10 @@ index 196dc084135..aa257a14632 100644 rm_conffile /etc/logrotate.d/ceph.logrotate +rm_conffile /etc/init.d/ceph 19.2.2-pve6~ ceph-base diff --git a/debian/rules b/debian/rules -index fa7e55b03be..212b931d21e 100755 +index 12208a0a080..77bba513bca 100755 --- a/debian/rules +++ b/debian/rules -@@ -101,8 +101,6 @@ override_dh_installinit: +@@ -102,8 +102,6 @@ override_dh_installinit: install -m0644 etc/default/ceph debian/ceph-common/etc/default/ install -d -m0755 debian/ceph-common/usr/lib/tmpfiles.d install -m 0644 -D systemd/ceph.tmpfiles.d debian/ceph-common/usr/lib/tmpfiles.d/ceph.conf diff --git a/patches/0039-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch b/patches/0014-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch similarity index 100% rename from patches/0039-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch rename to patches/0014-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch diff --git a/patches/0040-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch b/patches/0015-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch similarity index 96% rename from patches/0040-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch rename to patches/0015-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch index a5459f3154b..ba85753d5c6 100644 --- a/patches/0040-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch +++ b/patches/0015-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch @@ -103,10 +103,10 @@ Signed-off-by: Max R. Carrara 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx -index 2185f62e2f1..a5d373eb50d 100644 +index a00fc22d673..f8629daa735 100644 --- a/src/pybind/rbd/rbd.pyx +++ b/src/pybind/rbd/rbd.pyx -@@ -793,8 +793,7 @@ class RBD(object): +@@ -794,8 +794,7 @@ class RBD(object): librbd_progress_fn_t _prog_cb = &no_op_progress_callback void *_prog_arg = NULL if on_progress: @@ -116,7 +116,7 @@ index 2185f62e2f1..a5d373eb50d 100644 with nogil: ret = rbd_remove_with_progress(_ioctx, _name, _prog_cb, _prog_arg) if ret != 0: -@@ -901,8 +900,7 @@ class RBD(object): +@@ -902,8 +901,7 @@ class RBD(object): librbd_progress_fn_t _prog_cb = &no_op_progress_callback void *_prog_arg = NULL if on_progress: @@ -126,7 +126,7 @@ index 2185f62e2f1..a5d373eb50d 100644 with nogil: ret = rbd_trash_remove_with_progress(_ioctx, _image_id, _force, _prog_cb, _prog_arg) -@@ -1142,8 +1140,7 @@ class RBD(object): +@@ -1143,8 +1141,7 @@ class RBD(object): librbd_progress_fn_t _prog_cb = &no_op_progress_callback void *_prog_arg = NULL if on_progress: @@ -136,7 +136,7 @@ index 2185f62e2f1..a5d373eb50d 100644 with nogil: ret = rbd_migration_execute_with_progress(_ioctx, _image_name, _prog_cb, _prog_arg) -@@ -1169,8 +1166,7 @@ class RBD(object): +@@ -1170,8 +1167,7 @@ class RBD(object): librbd_progress_fn_t _prog_cb = &no_op_progress_callback void *_prog_arg = NULL if on_progress: @@ -146,7 +146,7 @@ index 2185f62e2f1..a5d373eb50d 100644 with nogil: ret = rbd_migration_commit_with_progress(_ioctx, _image_name, _prog_cb, _prog_arg) -@@ -1196,8 +1192,7 @@ class RBD(object): +@@ -1197,8 +1193,7 @@ class RBD(object): librbd_progress_fn_t _prog_cb = &no_op_progress_callback void *_prog_arg = NULL if on_progress: @@ -156,7 +156,7 @@ index 2185f62e2f1..a5d373eb50d 100644 with nogil: ret = rbd_migration_abort_with_progress(_ioctx, _image_name, _prog_cb, _prog_arg) -@@ -4332,8 +4327,7 @@ written." % (self.name, ret, length)) +@@ -4333,8 +4328,7 @@ written." % (self.name, ret, length)) librbd_progress_fn_t _prog_cb = &no_op_progress_callback void *_prog_arg = NULL if on_progress: diff --git a/patches/series b/patches/series index d775a8a068d..7734bdd102e 100644 --- a/patches/series +++ b/patches/series @@ -7,35 +7,9 @@ 0007-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch 0008-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch 0009-ceph-crash-change-order-of-client-names.patch -0010-debian-pkg-record-python3-packaging-dependency-for-c.patch -0011-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch -0012-d-rules-disable-jaeger-telemetry.patch -0013-d-py3dist-drop-python3-distutils-not-available-in-De.patch -0014-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch -0015-pybind-mgr-Hack-around-the-ImportError-PyO3-modules-.patch -0016-python-common-cryptotools-use-json-for-structured-ou.patch -0017-python-common-cryptotools-create-CrytpoCaller-interf.patch -0018-python-common-cryptotools-use-one-single-dir-for-cry.patch -0019-python-common-remove-unused-dir.patch -0020-pybind-mgr-update-mgr_util-to-use-cryptotools-Crypto.patch -0021-python-common-Correct-typo-in-private_key-naming-fie.patch -0022-python-common-cryptotools-Always-encode-Err-via-stde.patch -0023-pybind-mgr-Correct-code-to-ensure-cephadm-tests-test.patch -0024-python-common-cryptotools-fix-error-path-in-verify-t.patch -0025-python-common-cryptotools-Remove-ascii-and-utf-8-ref.patch -0026-pybind-mgr-Appropriately-rename-function.patch -0027-python-common-cryptotools-give-the-parsers-more-sens.patch -0028-mgr-dashboard-replace-direct-use-of-bcrypt-in-dashbo.patch -0029-pybind-mgr-fix-test-case-in-test_tls.py.patch -0030-python-common-cryptotools-move-actual-crypto-opts-in.patch -0031-python-common-cryptotools-use-a-main-function.patch -0032-python-common-cryptotools-unify-and-organize-all-end.patch -0033-python-common-cryptotools-add-caller-module-for-base.patch -0034-python-common-cryptotools-move-internal-crypto-calle.patch -0035-python-common-cryptotools-create-module-for-selectin.patch -0036-python-common-cryptotools-catch-all-failures-to-read.patch -0037-mgr-cephadm-always-use-the-internal-cryptocaller.patch -0038-mgr-dashboard-add-an-option-to-control-the-dashboard.patch -0039-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch -0040-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch -0041-systemd-services-fix-installing-ceph-volume.patch +0010-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch +0011-d-rules-disable-jaeger-telemetry.patch +0012-d-py3dist-drop-python3-distutils-not-available-in-De.patch +0013-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch +0014-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch +0015-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch