From c6b34d01822316ab1e12c758cdee80bdc69776fe Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 7 Nov 2024 09:12:47 +0100 Subject: [PATCH] refresh patches and clean-up their context on current 19.2.0 Signed-off-by: Thomas Lamprecht --- patches/0001-cmake-disable-version-from-git.patch | 2 +- ...-debian-control-add-break-libpvestorage-perl.patch | 6 +++--- ...fix-instaldoc-override-and-ship-upstream-cha.patch | 4 ++-- patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch | 4 ++-- ...board-remove-ability-to-create-and-check-TLS.patch | 11 ++++++----- ...-postinst-do-not-always-reload-all-sysctl-se.patch | 1 + ...ecursively-adjust-permissions-of-var-lib-cep.patch | 1 + ...0014-ceph-crash-change-order-of-client-names.patch | 1 + ...g-record-python3-packaging-dependency-for-c.patch} | 4 ++-- ...-d-control-fix-lua-dependencies-for-librgw2.patch} | 4 ++-- 10 files changed, 21 insertions(+), 17 deletions(-) rename patches/{0017-debian-pkg-record-python3-packaging-dependency-for-c.patch => 0015-debian-pkg-record-python3-packaging-dependency-for-c.patch} (85%) rename patches/{0018-d-control-fix-lua-dependencies-for-librgw2.patch => 0016-d-control-fix-lua-dependencies-for-librgw2.patch} (95%) diff --git a/patches/0001-cmake-disable-version-from-git.patch b/patches/0001-cmake-disable-version-from-git.patch index 6040b9ade..dded6a547 100644 --- a/patches/0001-cmake-disable-version-from-git.patch +++ b/patches/0001-cmake-disable-version-from-git.patch @@ -11,7 +11,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f91dd1abe7f..ef2e54b7d71 100644 +index da3102f9e5a..a5795ec764a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,17 +35,10 @@ configure_file(ceph-crash.in diff --git a/patches/0002-debian-control-add-break-libpvestorage-perl.patch b/patches/0002-debian-control-add-break-libpvestorage-perl.patch index a30527c22..3fa74f041 100644 --- a/patches/0002-debian-control-add-break-libpvestorage-perl.patch +++ b/patches/0002-debian-control-add-break-libpvestorage-perl.patch @@ -9,10 +9,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control -index ddba52be7bb..484804f6b7a 100644 +index 041dfcc7980..03a16b8db26 100644 --- a/debian/control +++ b/debian/control -@@ -154,6 +154,7 @@ Replaces: ceph (<< 10), +@@ -157,6 +157,7 @@ Replaces: ceph (<< 10), Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14), python-ceph (<< 0.92-1223), @@ -20,7 +20,7 @@ index ddba52be7bb..484804f6b7a 100644 Description: common ceph daemon libraries and management tools Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, -@@ -659,6 +660,7 @@ Breaks: ceph (<< 10), +@@ -639,6 +640,7 @@ Breaks: ceph (<< 10), ceph-test (<< 9.0.3-1646), librbd1 (<< 0.92-1238), python-ceph (<< 0.92-1223), diff --git a/patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch b/patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch index 32ae8db22..ad0f8cd42 100644 --- a/patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch +++ b/patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch @@ -15,10 +15,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules -index 68c69e04474..f821908340e 100755 +index 442ea28d4e0..24d43f5c7e7 100755 --- a/debian/rules +++ b/debian/rules -@@ -80,7 +80,7 @@ override_dh_auto_install: +@@ -81,7 +81,7 @@ override_dh_auto_install: # doc/changelog is a directory, which confuses dh_installchangelogs override_dh_installchangelogs: diff --git a/patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch b/patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch index 499343849..f6cfff7ce 100644 --- a/patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch +++ b/patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch @@ -12,10 +12,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control -index 484804f6b7a..fa61368ad8b 100644 +index 03a16b8db26..1d45d47b413 100644 --- a/debian/control +++ b/debian/control -@@ -235,11 +235,11 @@ Depends: ceph-base (= ${binary:Version}), +@@ -238,11 +238,11 @@ Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, diff --git a/patches/0011-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch b/patches/0011-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch index fec2ae522..943e0ea9b 100644 --- a/patches/0011-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch +++ b/patches/0011-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch @@ -35,12 +35,13 @@ These changes allow the dashboard to launch with TLS enabled again. [1]: https://docs.ceph.com/en/reef/mgr/dashboard/#ssl-tls-support Signed-off-by: Max Carrara +Signed-off-by: Thomas Lamprecht --- src/pybind/mgr/dashboard/module.py | 58 ++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py -index 68725be6e35..0759da05064 100644 +index 41160b698aa..8f57061abe2 100644 --- a/src/pybind/mgr/dashboard/module.py +++ b/src/pybind/mgr/dashboard/module.py @@ -23,8 +23,7 @@ if TYPE_CHECKING: @@ -53,7 +54,7 @@ index 68725be6e35..0759da05064 100644 from . import mgr from .controllers import Router, json_error_page -@@ -172,11 +171,29 @@ class CherryPyConfig(object): +@@ -173,11 +172,29 @@ class CherryPyConfig(object): else: pkey_fname = self.get_localized_module_option('key_file') # type: ignore @@ -85,9 +86,9 @@ index 68725be6e35..0759da05064 100644 - context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) - context.load_cert_chain(cert_fname, pkey_fname) if sys.version_info >= (3, 7): - if Settings.UNSAFE_TLS_v1_2: - context.minimum_version = ssl.TLSVersion.TLSv1_2 -@@ -473,15 +490,26 @@ class Module(MgrModule, CherryPyConfig): + context.minimum_version = ssl.TLSVersion.TLSv1_3 + else: +@@ -468,15 +485,26 @@ class Module(MgrModule, CherryPyConfig): @CLIWriteCommand("dashboard create-self-signed-cert") def set_mgr_created_self_signed_cert(self): diff --git a/patches/0012-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch b/patches/0012-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch index 6030ba44e..4fee8dc43 100644 --- a/patches/0012-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch +++ b/patches/0012-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch @@ -21,6 +21,7 @@ will need to be adjusted to apply the sysctl settings on upgrade too. Suggested-by: Fabian Grünbichler Signed-off-by: Friedrich Weber +Signed-off-by: Thomas Lamprecht --- debian/ceph-osd.postinst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/patches/0013-debian-recursively-adjust-permissions-of-var-lib-cep.patch b/patches/0013-debian-recursively-adjust-permissions-of-var-lib-cep.patch index 1feefea08..a8c75dfb6 100644 --- a/patches/0013-debian-recursively-adjust-permissions-of-var-lib-cep.patch +++ b/patches/0013-debian-recursively-adjust-permissions-of-var-lib-cep.patch @@ -18,6 +18,7 @@ of `find | xargs`. [0]: https://github.com/ceph/ceph/pull/48713 Signed-off-by: Max Carrara +Signed-off-by: Thomas Lamprecht --- debian/ceph-base.postinst | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/patches/0014-ceph-crash-change-order-of-client-names.patch b/patches/0014-ceph-crash-change-order-of-client-names.patch index a6638ee59..dd5d2682b 100644 --- a/patches/0014-ceph-crash-change-order-of-client-names.patch +++ b/patches/0014-ceph-crash-change-order-of-client-names.patch @@ -6,6 +6,7 @@ Subject: [PATCH] ceph-crash: change order of client names This simply puts 'client.crash' before 'client.crash.${HOSTNAME}'. Signed-off-by: Max Carrara +Signed-off-by: Thomas Lamprecht --- src/ceph-crash.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/0017-debian-pkg-record-python3-packaging-dependency-for-c.patch b/patches/0015-debian-pkg-record-python3-packaging-dependency-for-c.patch similarity index 85% rename from patches/0017-debian-pkg-record-python3-packaging-dependency-for-c.patch rename to patches/0015-debian-pkg-record-python3-packaging-dependency-for-c.patch index 7666cbacd..d163deebe 100644 --- a/patches/0017-debian-pkg-record-python3-packaging-dependency-for-c.patch +++ b/patches/0015-debian-pkg-record-python3-packaging-dependency-for-c.patch @@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control -index fa61368ad8b..fb1d5d5ac74 100644 +index 1d45d47b413..ef64f2bea29 100644 --- a/debian/control +++ b/debian/control -@@ -453,6 +453,7 @@ Depends: ceph-osd (= ${binary:Version}), +@@ -433,6 +433,7 @@ Depends: ceph-osd (= ${binary:Version}), e2fsprogs, lvm2, parted, diff --git a/patches/0018-d-control-fix-lua-dependencies-for-librgw2.patch b/patches/0016-d-control-fix-lua-dependencies-for-librgw2.patch similarity index 95% rename from patches/0018-d-control-fix-lua-dependencies-for-librgw2.patch rename to patches/0016-d-control-fix-lua-dependencies-for-librgw2.patch index 92380fcda..7028f0224 100644 --- a/patches/0018-d-control-fix-lua-dependencies-for-librgw2.patch +++ b/patches/0016-d-control-fix-lua-dependencies-for-librgw2.patch @@ -30,10 +30,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control -index 041dfcc7980..0a519635f47 100644 +index ef64f2bea29..b508a585938 100644 --- a/debian/control +++ b/debian/control -@@ -921,10 +921,10 @@ Package: librgw2 +@@ -924,10 +924,10 @@ Package: librgw2 Architecture: linux-any Section: libs Depends: librados2 (= ${binary:Version}),