proxmox-mirrors/ceph
1
0
Fork 0
mirror of https://git.proxmox.com/git/ceph.git synced 2025-04-28 12:39:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refresh patches and clean-up their context on current 19.2.0

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2024-11-07 09:12:47 +01:00
parent 650abcd90e
commit c6b34d0182
10 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/0001-cmake-disable-version-from-git.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 7 deletions(-) 1 file changed, 7 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f91dd1abe7f..ef2e54b7d71 100644 index da3102f9e5a..a5795ec764a 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -35,17 +35,10 @@ configure_file(ceph-crash.in @@ -35,17 +35,10 @@ configure_file(ceph-crash.in

6
patches/0002-debian-control-add-break-libpvestorage-perl.patch
View File

@ -9,10 +9,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index ddba52be7bb..484804f6b7a 100644 index 041dfcc7980..03a16b8db26 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -154,6 +154,7 @@ Replaces: ceph (<< 10), @@ -157,6 +157,7 @@ Replaces: ceph (<< 10),
Breaks: ceph (<< 10), Breaks: ceph (<< 10),
ceph-test (<< 12.2.2-14), ceph-test (<< 12.2.2-14),
python-ceph (<< 0.92-1223), python-ceph (<< 0.92-1223),
@ -20,7 +20,7 @@ index ddba52be7bb..484804f6b7a 100644
Description: common ceph daemon libraries and management tools Description: common ceph daemon libraries and management tools
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
storage system that runs on commodity hardware and delivers object, 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), ceph-test (<< 9.0.3-1646),
librbd1 (<< 0.92-1238), librbd1 (<< 0.92-1238),
python-ceph (<< 0.92-1223), python-ceph (<< 0.92-1223),

4
patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch
View File

@ -15,10 +15,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index 68c69e04474..f821908340e 100755 index 442ea28d4e0..24d43f5c7e7 100755
--- a/debian/rules --- a/debian/rules
+++ b/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 # doc/changelog is a directory, which confuses dh_installchangelogs
override_dh_installchangelogs: override_dh_installchangelogs:

4
patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch
View File

@ -12,10 +12,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index 484804f6b7a..fa61368ad8b 100644 index 03a16b8db26..1d45d47b413 100644
--- a/debian/control --- a/debian/control
+++ b/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}, ${misc:Depends},
${python3:Depends}, ${python3:Depends},
${shlibs:Depends}, ${shlibs:Depends},

11
patches/0011-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch
View File

@ -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 [1]: https://docs.ceph.com/en/reef/mgr/dashboard/#ssl-tls-support
Signed-off-by: Max Carrara <m.carrara@proxmox.com> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
src/pybind/mgr/dashboard/module.py | 58 ++++++++++++++++++++++-------- src/pybind/mgr/dashboard/module.py | 58 ++++++++++++++++++++++--------
1 file changed, 43 insertions(+), 15 deletions(-) 1 file changed, 43 insertions(+), 15 deletions(-)
diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py 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 --- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py +++ b/src/pybind/mgr/dashboard/module.py
@@ -23,8 +23,7 @@ if TYPE_CHECKING: @@ -23,8 +23,7 @@ if TYPE_CHECKING:
@ -53,7 +54,7 @@ index 68725be6e35..0759da05064 100644
from . import mgr from . import mgr
from .controllers import Router, json_error_page from .controllers import Router, json_error_page
@@ -172,11 +171,29 @@ class CherryPyConfig(object): @@ -173,11 +172,29 @@ class CherryPyConfig(object):
else: else:
pkey_fname = self.get_localized_module_option('key_file') # type: ignore 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 = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
- context.load_cert_chain(cert_fname, pkey_fname) - context.load_cert_chain(cert_fname, pkey_fname)
if sys.version_info >= (3, 7): if sys.version_info >= (3, 7):
if Settings.UNSAFE_TLS_v1_2: context.minimum_version = ssl.TLSVersion.TLSv1_3
context.minimum_version = ssl.TLSVersion.TLSv1_2 else:
@@ -473,15 +490,26 @@ class Module(MgrModule, CherryPyConfig): @@ -468,15 +485,26 @@ class Module(MgrModule, CherryPyConfig):
@CLIWriteCommand("dashboard create-self-signed-cert") @CLIWriteCommand("dashboard create-self-signed-cert")
def set_mgr_created_self_signed_cert(self): def set_mgr_created_self_signed_cert(self):

1
patches/0012-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch
View File

@ -21,6 +21,7 @@ will need to be adjusted to apply the sysctl settings on upgrade too.
Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Friedrich Weber <f.weber@proxmox.com> Signed-off-by: Friedrich Weber <f.weber@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/ceph-osd.postinst | 6 +++++- debian/ceph-osd.postinst | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)

1
patches/0013-debian-recursively-adjust-permissions-of-var-lib-cep.patch
View File

@ -18,6 +18,7 @@ of `find | xargs`.
[0]: https://github.com/ceph/ceph/pull/48713 [0]: https://github.com/ceph/ceph/pull/48713
Signed-off-by: Max Carrara <m.carrara@proxmox.com> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/ceph-base.postinst | 16 +++++++++------- debian/ceph-base.postinst | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-) 1 file changed, 9 insertions(+), 7 deletions(-)

1
patches/0014-ceph-crash-change-order-of-client-names.patch
View File

@ -6,6 +6,7 @@ Subject: [PATCH] ceph-crash: change order of client names
This simply puts 'client.crash' before 'client.crash.${HOSTNAME}'. This simply puts 'client.crash' before 'client.crash.${HOSTNAME}'.
Signed-off-by: Max Carrara <m.carrara@proxmox.com> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
src/ceph-crash.in | 4 ++-- src/ceph-crash.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)

4
patches/0017-debian-pkg-record-python3-packaging-dependency-for-c.patch → patches/0015-debian-pkg-record-python3-packaging-dependency-for-c.patch
View File

@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index fa61368ad8b..fb1d5d5ac74 100644 index 1d45d47b413..ef64f2bea29 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -453,6 +453,7 @@ Depends: ceph-osd (= ${binary:Version}), @@ -433,6 +433,7 @@ Depends: ceph-osd (= ${binary:Version}),
e2fsprogs, e2fsprogs,
lvm2, lvm2,
parted, parted,

4
patches/0018-d-control-fix-lua-dependencies-for-librgw2.patch → patches/0016-d-control-fix-lua-dependencies-for-librgw2.patch
View File

@ -30,10 +30,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index 041dfcc7980..0a519635f47 100644 index ef64f2bea29..b508a585938 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -921,10 +921,10 @@ Package: librgw2 @@ -924,10 +924,10 @@ Package: librgw2
Architecture: linux-any Architecture: linux-any
Section: libs Section: libs
Depends: librados2 (= ${binary:Version}), Depends: librados2 (= ${binary:Version}),