[PATCH pve-ceph] refresh patches for 19.2.7

[Kefu Chai <k.chai@proxmox.com>]

No patch has been merged upstream in Squid 19.2.7, so none gets dropped
and the numbering stays as it is.

Refresh the ten patches whose context had drifted so that they apply
cleanly.

Signed-off-by: Kefu Chai <k.chai@proxmox.com>
---
 .../0003-ceph-mgr-only-suggest-mgr-plugins.patch    |  3 +--
 ...-record-python3-packaging-dependency-for-c.patch |  3 +--
 ...d-control-fix-lua-dependencies-for-librgw2.patch |  3 +--
 ...astic_shared_blob-to-prevent-crashing-OSDs.patch |  3 +--
 ...ard-replace-direct-use-of-bcrypt-in-dashbo.patch |  5 +----
 ...mon-cryptotools-create-module-for-selectin.patch |  6 +-----
 ...-disable-on_progress-callbacks-to-prevent-.patch | 13 ++++++-------
 ...-track-pending-key-use-per-accepted-sessio.patch |  8 +-------
 ...-allow-manual-pending-key-promotion-for-cl.patch |  6 +-----
 ...n-record-which-key-authenticated-a-session.patch |  9 +--------
 10 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/patches/0003-ceph-mgr-only-suggest-mgr-plugins.patch b/patches/0003-ceph-mgr-only-suggest-mgr-plugins.patch
index 67b411e5f1..ddf96235ca 100644
--- a/patches/0003-ceph-mgr-only-suggest-mgr-plugins.patch
+++ b/patches/0003-ceph-mgr-only-suggest-mgr-plugins.patch
@@ -12,10 +12,9 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/debian/control b/debian/control
-index b440b729b97..80b39d32c6a 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -239,11 +239,11 @@ Depends: ceph-base (= ${binary:Version}),
+@@ -241,11 +241,11 @@ Depends: ceph-base (= ${binary:Version}),
           ${misc:Depends},
           ${python3:Depends},
           ${shlibs:Depends},
diff --git a/patches/0011-debian-pkg-record-python3-packaging-dependency-for-c.patch b/patches/0011-debian-pkg-record-python3-packaging-dependency-for-c.patch
index ca7c3c7009..1ceb9e1bcc 100644
--- a/patches/0011-debian-pkg-record-python3-packaging-dependency-for-c.patch
+++ b/patches/0011-debian-pkg-record-python3-packaging-dependency-for-c.patch
@@ -10,10 +10,9 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/debian/control b/debian/control
-index 80b39d32c6a..9a40b598e11 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -458,6 +458,7 @@ Depends: ceph-osd (= ${binary:Version}),
+@@ -460,6 +460,7 @@ Depends: ceph-osd (= ${binary:Version}),
           e2fsprogs,
           lvm2,
           parted,
diff --git a/patches/0012-d-control-fix-lua-dependencies-for-librgw2.patch b/patches/0012-d-control-fix-lua-dependencies-for-librgw2.patch
index 2b0c445926..8fc57aed30 100644
--- a/patches/0012-d-control-fix-lua-dependencies-for-librgw2.patch
+++ b/patches/0012-d-control-fix-lua-dependencies-for-librgw2.patch
@@ -30,10 +30,9 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/debian/control b/debian/control
-index 9a40b598e11..6de32680daf 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -948,10 +948,10 @@ Package: librgw2
+@@ -950,10 +950,10 @@ Package: librgw2
  Architecture: linux-any
  Section: libs
  Depends: librados2 (= ${binary:Version}),
diff --git a/patches/0013-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch b/patches/0013-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch
index ba16bd803c..eda0b5519d 100644
--- a/patches/0013-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch
+++ b/patches/0013-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch
@@ -18,10 +18,9 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in
-index a434852f88a..39217b781a2 100644
 --- a/src/common/options/global.yaml.in
 +++ b/src/common/options/global.yaml.in
-@@ -5010,7 +5010,7 @@ options:
+@@ -5055,7 +5055,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/0037-mgr-dashboard-replace-direct-use-of-bcrypt-in-dashbo.patch b/patches/0037-mgr-dashboard-replace-direct-use-of-bcrypt-in-dashbo.patch
index e63de069c6..c88463f1d2 100644
--- a/patches/0037-mgr-dashboard-replace-direct-use-of-bcrypt-in-dashbo.patch
+++ b/patches/0037-mgr-dashboard-replace-direct-use-of-bcrypt-in-dashbo.patch
@@ -14,7 +14,6 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  3 files changed, 36 insertions(+), 2 deletions(-)
 
 diff --git a/src/pybind/mgr/dashboard/services/access_control.py b/src/pybind/mgr/dashboard/services/access_control.py
-index 01d0557740b..b427190203d 100644
 --- a/src/pybind/mgr/dashboard/services/access_control.py
 +++ b/src/pybind/mgr/dashboard/services/access_control.py
 @@ -12,7 +12,6 @@ from datetime import datetime, timedelta
@@ -34,7 +33,7 @@ index 01d0557740b..b427190203d 100644
  logger = logging.getLogger('access_control')
  DEFAULT_FILE_DESC = 'password/secret'
  
-@@ -890,7 +891,10 @@ def ac_user_set_password_hash(_, username: str, inbuf: str):
+@@ -895,7 +896,10 @@ def ac_user_set_password_hash(_, username: str, inbuf: str):
      hashed_password = inbuf
      try:
          # make sure the hashed_password is actually a bcrypt hash
@@ -47,7 +46,6 @@ index 01d0557740b..b427190203d 100644
          user.set_password_hash(hashed_password)
  
 diff --git a/src/python-common/ceph/cryptotools/cryptotools.py b/src/python-common/ceph/cryptotools/cryptotools.py
-index 0b2dc828b79..26102135250 100644
 --- a/src/python-common/ceph/cryptotools/cryptotools.py
 +++ b/src/python-common/ceph/cryptotools/cryptotools.py
 @@ -33,6 +33,17 @@ def password_hash(args: Namespace) -> None:
@@ -80,7 +78,6 @@ index 0b2dc828b79..26102135250 100644
      args = parser.parse_args()
      args.func(args)
 diff --git a/src/python-common/ceph/cryptotools/remote.py b/src/python-common/ceph/cryptotools/remote.py
-index 6271288e4f8..40e01d19912 100644
 --- a/src/python-common/ceph/cryptotools/remote.py
 +++ b/src/python-common/ceph/cryptotools/remote.py
 @@ -167,3 +167,18 @@ class CryptoCaller:
diff --git a/patches/0044-python-common-cryptotools-create-module-for-selectin.patch b/patches/0044-python-common-cryptotools-create-module-for-selectin.patch
index 8871a0628d..b26db0ef15 100644
--- a/patches/0044-python-common-cryptotools-create-module-for-selectin.patch
+++ b/patches/0044-python-common-cryptotools-create-module-for-selectin.patch
@@ -18,7 +18,6 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  create mode 100644 src/python-common/ceph/cryptotools/select.py
 
 diff --git a/src/pybind/mgr/dashboard/services/access_control.py b/src/pybind/mgr/dashboard/services/access_control.py
-index b427190203d..490c6e3fcc9 100644
 --- a/src/pybind/mgr/dashboard/services/access_control.py
 +++ b/src/pybind/mgr/dashboard/services/access_control.py
 @@ -23,7 +23,7 @@ from ..exceptions import PasswordPolicyException, PermissionNotValid, \
@@ -30,7 +29,7 @@ index b427190203d..490c6e3fcc9 100644
  
  logger = logging.getLogger('access_control')
  DEFAULT_FILE_DESC = 'password/secret'
-@@ -892,7 +892,7 @@ def ac_user_set_password_hash(_, username: str, inbuf: str):
+@@ -897,7 +897,7 @@ def ac_user_set_password_hash(_, username: str, inbuf: str):
      try:
          # make sure the hashed_password is actually a bcrypt hash
          # catch a ValueError if hashed_password is not valid.
@@ -40,7 +39,6 @@ index b427190203d..490c6e3fcc9 100644
  
          user = mgr.ACCESS_CTRL_DB.get_user(username)
 diff --git a/src/pybind/mgr/mgr_util.py b/src/pybind/mgr/mgr_util.py
-index 14fb26fbadb..f979aa4ceab 100644
 --- a/src/pybind/mgr/mgr_util.py
 +++ b/src/pybind/mgr/mgr_util.py
 @@ -24,7 +24,7 @@ else:
@@ -96,7 +94,6 @@ index 14fb26fbadb..f979aa4ceab 100644
 +    cc = get_crypto_caller()
      return cc.password_hash(password, salt_password)
 diff --git a/src/python-common/ceph/cryptotools/remote.py b/src/python-common/ceph/cryptotools/remote.py
-index 76438b3d132..2574b4ecdac 100644
 --- a/src/python-common/ceph/cryptotools/remote.py
 +++ b/src/python-common/ceph/cryptotools/remote.py
 @@ -1,5 +1,6 @@
@@ -131,7 +128,6 @@ index 76438b3d132..2574b4ecdac 100644
      Running the crypto functions in a separate process avoids conflicts
 diff --git a/src/python-common/ceph/cryptotools/select.py b/src/python-common/ceph/cryptotools/select.py
 new file mode 100644
-index 00000000000..989382ce983
 --- /dev/null
 +++ b/src/python-common/ceph/cryptotools/select.py
 @@ -0,0 +1,51 @@
diff --git a/patches/0052-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch b/patches/0052-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch
index e758ae4e9f..c794e603f4 100644
--- a/patches/0052-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch
+++ b/patches/0052-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch
@@ -103,10 +103,9 @@ Signed-off-by: Max R. Carrara <m.carrara@proxmox.com>
  1 file changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
-index f206e78ed1d..921c150803b 100644
 --- a/src/pybind/rbd/rbd.pyx
 +++ b/src/pybind/rbd/rbd.pyx
-@@ -790,8 +790,7 @@ class RBD(object):
+@@ -791,8 +791,7 @@ class RBD(object):
              librbd_progress_fn_t _prog_cb = &no_op_progress_callback
              void *_prog_arg = NULL
          if on_progress:
@@ -116,7 +115,7 @@ index f206e78ed1d..921c150803b 100644
          with nogil:
              ret = rbd_remove_with_progress(_ioctx, _name, _prog_cb, _prog_arg)
          if ret != 0:
-@@ -898,8 +897,7 @@ class RBD(object):
+@@ -899,8 +898,7 @@ class RBD(object):
              librbd_progress_fn_t _prog_cb = &no_op_progress_callback
              void *_prog_arg = NULL
          if on_progress:
@@ -126,7 +125,7 @@ index f206e78ed1d..921c150803b 100644
          with nogil:
              ret = rbd_trash_remove_with_progress(_ioctx, _image_id, _force,
                                                   _prog_cb, _prog_arg)
-@@ -1137,8 +1135,7 @@ class RBD(object):
+@@ -1139,8 +1137,7 @@ class RBD(object):
              librbd_progress_fn_t _prog_cb = &no_op_progress_callback
              void *_prog_arg = NULL
          if on_progress:
@@ -136,7 +135,7 @@ index f206e78ed1d..921c150803b 100644
          with nogil:
              ret = rbd_migration_execute_with_progress(_ioctx, _image_name,
                                                        _prog_cb, _prog_arg)
-@@ -1164,8 +1161,7 @@ class RBD(object):
+@@ -1166,8 +1163,7 @@ class RBD(object):
              librbd_progress_fn_t _prog_cb = &no_op_progress_callback
              void *_prog_arg = NULL
          if on_progress:
@@ -146,7 +145,7 @@ index f206e78ed1d..921c150803b 100644
          with nogil:
              ret = rbd_migration_commit_with_progress(_ioctx, _image_name,
                                                       _prog_cb, _prog_arg)
-@@ -1191,8 +1187,7 @@ class RBD(object):
+@@ -1193,8 +1189,7 @@ class RBD(object):
              librbd_progress_fn_t _prog_cb = &no_op_progress_callback
              void *_prog_arg = NULL
          if on_progress:
@@ -156,7 +155,7 @@ index f206e78ed1d..921c150803b 100644
          with nogil:
              ret = rbd_migration_abort_with_progress(_ioctx, _image_name,
                                                      _prog_cb, _prog_arg)
-@@ -4189,8 +4184,7 @@ written." % (self.name, ret, length))
+@@ -4191,8 +4186,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/0055-auth-cephx-track-pending-key-use-per-accepted-sessio.patch b/patches/0055-auth-cephx-track-pending-key-use-per-accepted-sessio.patch
index eaadc494a7..315bada8fa 100644
--- a/patches/0055-auth-cephx-track-pending-key-use-per-accepted-sessio.patch
+++ b/patches/0055-auth-cephx-track-pending-key-use-per-accepted-sessio.patch
@@ -21,7 +21,6 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  6 files changed, 82 insertions(+), 19 deletions(-)
 
 diff --git a/src/auth/AuthServiceHandler.h b/src/auth/AuthServiceHandler.h
-index 39f17b81e91..28ec5ae7f7e 100644
 --- a/src/auth/AuthServiceHandler.h
 +++ b/src/auth/AuthServiceHandler.h
 @@ -66,6 +66,10 @@ public:
@@ -36,7 +35,6 @@ index 39f17b81e91..28ec5ae7f7e 100644
    const EntityName& get_entity_name() { return entity_name; }
    uint64_t get_global_id() { return global_id; }
 diff --git a/src/auth/cephx/CephxServiceHandler.cc b/src/auth/cephx/CephxServiceHandler.cc
-index ea65c4d688e..c87001ddd51 100644
 --- a/src/auth/cephx/CephxServiceHandler.cc
 +++ b/src/auth/cephx/CephxServiceHandler.cc
 @@ -174,6 +174,7 @@ int CephxServiceHandler::handle_request(
@@ -73,7 +71,6 @@ index ea65c4d688e..c87001ddd51 100644
  {
    struct CephXResponseHeader header;
 diff --git a/src/auth/cephx/CephxServiceHandler.h b/src/auth/cephx/CephxServiceHandler.h
-index 3d9bc2cd183..6ccf32ecb7c 100644
 --- a/src/auth/cephx/CephxServiceHandler.h
 +++ b/src/auth/cephx/CephxServiceHandler.h
 @@ -27,6 +27,9 @@ struct CephXServiceTicketInfo;
@@ -95,7 +92,6 @@ index 3d9bc2cd183..6ccf32ecb7c 100644
  private:
    int do_start_session(bool is_new_global_id,
 diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
-index 00d3fe99344..f627909a06e 100644
 --- a/src/mon/AuthMonitor.cc
 +++ b/src/mon/AuthMonitor.cc
 @@ -957,9 +957,14 @@ bool AuthMonitor::prep_auth(MonOpRequestRef op, bool paxos_writable)
@@ -115,10 +111,9 @@ index 00d3fe99344..f627909a06e 100644
        ret = 0;
      }
 diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
-index e5a1011dc28..af2255cbda6 100644
 --- a/src/mon/Monitor.cc
 +++ b/src/mon/Monitor.cc
-@@ -6631,11 +6631,11 @@ int Monitor::handle_auth_request(
+@@ -6635,11 +6635,11 @@ int Monitor::handle_auth_request(
        &auth_meta->session_key,
        &auth_meta->connection_secret);
    }
@@ -134,7 +129,6 @@ index e5a1011dc28..af2255cbda6 100644
  
    dout(30) << " r " << r << " reply:\n";
 diff --git a/src/test/mon/test_cephx_service_handler.cc b/src/test/mon/test_cephx_service_handler.cc
-index 6310988f72e..8da6dae5991 100644
 --- a/src/test/mon/test_cephx_service_handler.cc
 +++ b/src/test/mon/test_cephx_service_handler.cc
 @@ -56,6 +56,8 @@ protected:
diff --git a/patches/0056-auth-cephx-allow-manual-pending-key-promotion-for-cl.patch b/patches/0056-auth-cephx-allow-manual-pending-key-promotion-for-cl.patch
index 0e4e7ba8f4..f0cb32c67b 100644
--- a/patches/0056-auth-cephx-allow-manual-pending-key-promotion-for-cl.patch
+++ b/patches/0056-auth-cephx-allow-manual-pending-key-promotion-for-cl.patch
@@ -30,7 +30,6 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  4 files changed, 134 insertions(+), 1 deletion(-)
 
 diff --git a/qa/workunits/mon/auth_key_rotation.sh b/qa/workunits/mon/auth_key_rotation.sh
-index 1a53bab6d8a..884a1f8b42e 100755
 --- a/qa/workunits/mon/auth_key_rotation.sh
 +++ b/qa/workunits/mon/auth_key_rotation.sh
 @@ -6,6 +6,8 @@ function expect_false()
@@ -107,7 +106,6 @@ index 1a53bab6d8a..884a1f8b42e 100755
 +
  echo ok
 diff --git a/src/auth/cephx/CephxServiceHandler.cc b/src/auth/cephx/CephxServiceHandler.cc
-index c87001ddd51..76388d23895 100644
 --- a/src/auth/cephx/CephxServiceHandler.cc
 +++ b/src/auth/cephx/CephxServiceHandler.cc
 @@ -349,7 +349,10 @@ int CephxServiceHandler::handle_request(
@@ -123,10 +121,9 @@ index c87001ddd51..76388d23895 100644
  	}
  
 diff --git a/src/common/options/mon.yaml.in b/src/common/options/mon.yaml.in
-index 7f956a43fb0..2621d09e0b3 100644
 --- a/src/common/options/mon.yaml.in
 +++ b/src/common/options/mon.yaml.in
-@@ -782,6 +782,19 @@ options:
+@@ -790,6 +790,19 @@ options:
    - mon
    flags:
    - runtime
@@ -147,7 +144,6 @@ index 7f956a43fb0..2621d09e0b3 100644
    type: str
    level: advanced
 diff --git a/src/test/mon/test_cephx_service_handler.cc b/src/test/mon/test_cephx_service_handler.cc
-index 8da6dae5991..aa891af9c3e 100644
 --- a/src/test/mon/test_cephx_service_handler.cc
 +++ b/src/test/mon/test_cephx_service_handler.cc
 @@ -58,9 +58,12 @@ protected:
diff --git a/patches/0057-mon-record-which-key-authenticated-a-session.patch b/patches/0057-mon-record-which-key-authenticated-a-session.patch
index 52d2f511fd..f4666ef1b2 100644
--- a/patches/0057-mon-record-which-key-authenticated-a-session.patch
+++ b/patches/0057-mon-record-which-key-authenticated-a-session.patch
@@ -29,7 +29,6 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  7 files changed, 98 insertions(+)
 
 diff --git a/src/auth/AuthServiceHandler.h b/src/auth/AuthServiceHandler.h
-index 28ec5ae7f7e..6acb5fa9b42 100644
 --- a/src/auth/AuthServiceHandler.h
 +++ b/src/auth/AuthServiceHandler.h
 @@ -17,6 +17,8 @@
@@ -57,7 +56,6 @@ index 28ec5ae7f7e..6acb5fa9b42 100644
    uint64_t get_global_id() { return global_id; }
    global_id_status_t get_global_id_status() { return global_id_status; }
 diff --git a/src/auth/cephx/CephxServiceHandler.cc b/src/auth/cephx/CephxServiceHandler.cc
-index 76388d23895..1e98bed9c8c 100644
 --- a/src/auth/cephx/CephxServiceHandler.cc
 +++ b/src/auth/cephx/CephxServiceHandler.cc
 @@ -22,6 +22,7 @@
@@ -93,7 +91,6 @@ index 76388d23895..1e98bed9c8c 100644
  {
    if (matched_pending_key.empty()) {
 diff --git a/src/auth/cephx/CephxServiceHandler.h b/src/auth/cephx/CephxServiceHandler.h
-index 6ccf32ecb7c..0f1dcb14da2 100644
 --- a/src/auth/cephx/CephxServiceHandler.h
 +++ b/src/auth/cephx/CephxServiceHandler.h
 @@ -30,6 +30,10 @@ class CephxServiceHandler  : public AuthServiceHandler {
@@ -125,7 +122,6 @@ index 6ccf32ecb7c..0f1dcb14da2 100644
  private:
    int do_start_session(bool is_new_global_id,
 diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
-index f627909a06e..2e083b764af 100644
 --- a/src/mon/AuthMonitor.cc
 +++ b/src/mon/AuthMonitor.cc
 @@ -965,6 +965,7 @@ bool AuthMonitor::prep_auth(MonOpRequestRef op, bool paxos_writable)
@@ -137,10 +133,9 @@ index f627909a06e..2e083b764af 100644
        ret = 0;
      }
 diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
-index af2255cbda6..4b91fa783e6 100644
 --- a/src/mon/Monitor.cc
 +++ b/src/mon/Monitor.cc
-@@ -6636,6 +6636,7 @@ int Monitor::handle_auth_request(
+@@ -6640,6 +6640,7 @@ int Monitor::handle_auth_request(
        return -EACCES;
      }
      s->auth_handler->on_authenticated();
@@ -149,7 +144,6 @@ index af2255cbda6..4b91fa783e6 100644
  
    dout(30) << " r " << r << " reply:\n";
 diff --git a/src/mon/Session.h b/src/mon/Session.h
-index e090e742404..d749ccd6d2b 100644
 --- a/src/mon/Session.h
 +++ b/src/mon/Session.h
 @@ -65,6 +65,10 @@ struct MonSession : public RefCountedObject {
@@ -192,7 +186,6 @@ index e090e742404..d749ccd6d2b 100644
      f->dump_stream("global_id_status") << global_id_status;
      f->dump_unsigned("osd_epoch", osd_epoch);
 diff --git a/src/test/mon/test_cephx_service_handler.cc b/src/test/mon/test_cephx_service_handler.cc
-index aa891af9c3e..402bef70c51 100644
 --- a/src/test/mon/test_cephx_service_handler.cc
 +++ b/src/test/mon/test_cephx_service_handler.cc
 @@ -495,3 +495,46 @@ TEST_F(CephxServiceHandlerPendingKey,
-- 
2.47.3