Rebase to libnbd 1.22.0

Synch spec file with Fedora Rawhide.

resolves: RHEL-78831

0001-docs-libnbd-release-notes-1.22.pod-Set-release-date.patch

@@ -0,0 +1,25 @@
+From a6e16c3b81f59baffd3530ead7a6617166113dbb Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 11 Feb 2025 14:00:16 +0000
+Subject: [PATCH] docs/libnbd-release-notes-1.22.pod: Set release date
+
+---
+ docs/libnbd-release-notes-1.22.pod | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/libnbd-release-notes-1.22.pod b/docs/libnbd-release-notes-1.22.pod
+index 13307085..6deb95b6 100644
+--- a/docs/libnbd-release-notes-1.22.pod
++++ b/docs/libnbd-release-notes-1.22.pod
+@@ -7,7 +7,7 @@ libnbd-release-notes-1.22 - release notes for libnbd 1.22
+ These are the release notes for libnbd stable release 1.22.
+ This describes the major changes since 1.20.
+ 
+-libnbd 1.22.0 was released on B<XXX XXX 2025>.
++libnbd 1.22.0 was released on B<11 February 2025>.
+ 
+ =head2 Security
+ 
+-- 
+2.47.1
+

0001-generator-Print-full-error-in-handle_reply_error.patch

@@ -1,191 +0,0 @@
-From adab173b12c3c33311736d8bf801beb7539ebf80 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 23 Jul 2024 17:22:12 +0100
-Subject: [PATCH] generator: Print full error in handle_reply_error
-
-Print the full error from the server during handshaking.  This
-modifies the contract of handle_reply_error so it calls set_error,
-which can be overridden by callers or ignored completely.
-
-(cherry picked from commit cf49a49adc8abc8c917437db7461ed9956583877)
----
- generator/states-newstyle-opt-go.c           | 32 +--------
- generator/states-newstyle-opt-list.c         |  5 +-
- generator/states-newstyle-opt-meta-context.c |  8 +--
- generator/states-newstyle.c                  | 68 ++++++++++++++++++--
- 4 files changed, 69 insertions(+), 44 deletions(-)
-
-diff --git a/generator/states-newstyle-opt-go.c b/generator/states-newstyle-opt-go.c
-index 5bc9a9ae..f6eb8afc 100644
---- a/generator/states-newstyle-opt-go.c
-+++ b/generator/states-newstyle-opt-go.c
-@@ -247,37 +247,9 @@ STATE_MACHINE {
-       SET_NEXT_STATE (%.DEAD);
-       return 0;
-     }
--    /* Decode expected known errors into a nicer string */
--    switch (reply) {
--    case NBD_REP_ERR_UNSUP:
-+    if (reply == NBD_REP_ERR_UNSUP)
-       assert (h->opt_current == NBD_OPT_INFO);
--      set_error (ENOTSUP, "handshake: server lacks NBD_OPT_INFO support");
--      break;
--    case NBD_REP_ERR_POLICY:
--    case NBD_REP_ERR_PLATFORM:
--      set_error (0, "handshake: server policy prevents NBD_OPT_GO");
--      break;
--    case NBD_REP_ERR_INVALID:
--    case NBD_REP_ERR_TOO_BIG:
--      set_error (EINVAL, "handshake: server rejected NBD_OPT_GO as invalid");
--      break;
--    case NBD_REP_ERR_TLS_REQD:
--      set_error (ENOTSUP, "handshake: server requires TLS encryption first");
--      break;
--    case NBD_REP_ERR_UNKNOWN:
--      set_error (ENOENT, "handshake: server has no export named '%s'",
--                 h->export_name);
--      break;
--    case NBD_REP_ERR_SHUTDOWN:
--      set_error (ESHUTDOWN, "handshake: server is shutting down");
--      break;
--    case NBD_REP_ERR_BLOCK_SIZE_REQD:
--      set_error (EINVAL, "handshake: server requires specific block sizes");
--      break;
--    default:
--      set_error (0, "handshake: unknown reply from NBD_OPT_GO: 0x%" PRIx32,
--                 reply);
--    }
-+
-     nbd_internal_reset_size_and_flags (h);
-     h->meta_valid = false;
-     err = nbd_get_errno () ? : ENOTSUP;
-diff --git a/generator/states-newstyle-opt-list.c b/generator/states-newstyle-opt-list.c
-index cdd4676e..6605ee0a 100644
---- a/generator/states-newstyle-opt-list.c
-+++ b/generator/states-newstyle-opt-list.c
-@@ -127,9 +127,8 @@ STATE_MACHINE {
-       SET_NEXT_STATE (%.DEAD);
-       return 0;
-     }
--    err = ENOTSUP;
--    set_error (err, "unexpected response, possibly the server does not "
--               "support listing exports");
-+    debug (h, "unexpected response, possibly the server does not "
-+           "support listing exports");
-     break;
-   }
- 
-diff --git a/generator/states-newstyle-opt-meta-context.c b/generator/states-newstyle-opt-meta-context.c
-index 6f016e66..3945411e 100644
---- a/generator/states-newstyle-opt-meta-context.c
-+++ b/generator/states-newstyle-opt-meta-context.c
-@@ -270,12 +270,8 @@ STATE_MACHINE {
-     }
- 
-     if (opt == h->opt_current) {
--      /* XXX Should we decode specific expected errors, like
--       * REP_ERR_UNKNOWN to ENOENT or REP_ERR_TOO_BIG to ERANGE?
--       */
--      err = ENOTSUP;
--      set_error (err, "unexpected response, possibly the server does not "
--                 "support meta contexts");
-+      debug (h, "unexpected response, possibly the server does not "
-+             "support meta contexts");
-       CALL_CALLBACK (h->opt_cb.completion, &err);
-       nbd_internal_free_option (h);
-       SET_NEXT_STATE (%.NEGOTIATING);
-diff --git a/generator/states-newstyle.c b/generator/states-newstyle.c
-index 45893a8b..6c7cc45c 100644
---- a/generator/states-newstyle.c
-+++ b/generator/states-newstyle.c
-@@ -79,14 +79,18 @@ prepare_for_reply_payload (struct nbd_handle *h, uint32_t opt)
-   return 0;
- }
- 
--/* Check an unexpected server reply. If it is an error, log any
-- * message from the server and return 0; otherwise, return -1.
-+/* Check an unexpected server reply error.
-+ *
-+ * This calls set_error with a descriptive error message and returns
-+ * 0.  Unless there is a further unexpected error while processing
-+ * this error, in which case it calls set_error and returns -1.
-  */
- static int
- handle_reply_error (struct nbd_handle *h)
- {
-   uint32_t len;
-   uint32_t reply;
-+  char *msg = NULL;
- 
-   len = be32toh (h->sbuf.or.option_reply.replylen);
-   reply = be32toh (h->sbuf.or.option_reply.reply);
-@@ -101,9 +105,63 @@ handle_reply_error (struct nbd_handle *h)
-     return -1;
-   }
- 
--  if (len > 0)
--    debug (h, "handshake: server error message: %.*s", (int)len,
--           h->sbuf.or.payload.err_msg);
-+  /* Decode expected errors into a nicer string.
-+   *
-+   * XXX Note this string comes directly from the server, and most
-+   * libnbd users simply print the error using 'fprintf'.  We really
-+   * ought to quote this string somehow, but we don't have a useful
-+   * function for that.
-+   */
-+  if (len > 0) {
-+    if (asprintf (&msg, ": %.*s",
-+                  (int)len, h->sbuf.or.payload.err_msg) == -1) {
-+      set_error (errno, "asprintf");
-+      return -1;
-+    }
-+  }
-+
-+  switch (reply) {
-+  case NBD_REP_ERR_UNSUP:
-+    set_error (ENOTSUP, "the operation is not supported by the server%s",
-+               msg ? : "");
-+      break;
-+    case NBD_REP_ERR_POLICY:
-+      set_error (0, "server policy prevents the operation%s",
-+                 msg ? : "");
-+      break;
-+    case NBD_REP_ERR_PLATFORM:
-+      set_error (0, "the operation is not supported by the server platform%s",
-+                 msg ? : "");
-+      break;
-+    case NBD_REP_ERR_INVALID:
-+      set_error (EINVAL, "the server rejected this operation as invalid%s",
-+                 msg ? : "");
-+      break;
-+    case NBD_REP_ERR_TOO_BIG:
-+      set_error (EINVAL, "the operation is too large to process%s",
-+                 msg ? : "");
-+      break;
-+    case NBD_REP_ERR_TLS_REQD:
-+      set_error (ENOTSUP, "the server requires TLS encryption first%s",
-+                 msg ? : "");
-+      break;
-+    case NBD_REP_ERR_UNKNOWN:
-+      set_error (ENOENT, "the server has no export named '%s'%s",
-+                 h->export_name, msg ? : "");
-+      break;
-+    case NBD_REP_ERR_SHUTDOWN:
-+      set_error (ESHUTDOWN, "the server is shutting down%s",
-+                 msg ? : "");
-+      break;
-+    case NBD_REP_ERR_BLOCK_SIZE_REQD:
-+      set_error (EINVAL, "the server requires specific block sizes%s",
-+                 msg ? : "");
-+      break;
-+    default:
-+      set_error (0, "handshake: unknown reply from the server: 0x%" PRIx32 "%s",
-+                 reply, msg ? : "");
-+    }
-+  free (msg);
- 
-   return 0;
- }
--- 
-2.43.0
-

0002-lib-Don-t-overwrite-error-in-nbd_opt_-go-info.patch

@@ -1,38 +0,0 @@
-From 3e96626c70d172ff464f31547924537d957d5929 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 23 Jul 2024 17:26:39 +0100
-Subject: [PATCH] lib: Don't overwrite error in nbd_opt_{go,info}
-
-We already set the error in handle_reply_error, so don't overwrite
-that here.
-
-(cherry picked from commit 474a4ae6c8d11212a4a8c06ea3e8b3fd97a7e97d)
----
- lib/opt.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/opt.c b/lib/opt.c
-index 600265a0..5872dd54 100644
---- a/lib/opt.c
-+++ b/lib/opt.c
-@@ -99,7 +99,7 @@ nbd_unlocked_opt_go (struct nbd_handle *h)
-   if (r == 0 && err) {
-     assert (nbd_internal_is_state_negotiating (get_next_state (h)) ||
-             nbd_internal_is_state_dead (get_next_state (h)));
--    set_error (err, "server replied with error to opt_go request");
-+    /* handle_reply_error already called set_error */
-     return -1;
-   }
-   if (r == 0)
-@@ -122,7 +122,7 @@ nbd_unlocked_opt_info (struct nbd_handle *h)
-   if (r == 0 && err) {
-     assert (nbd_internal_is_state_negotiating (get_next_state (h)) ||
-             nbd_internal_is_state_dead (get_next_state (h)));
--    set_error (err, "server replied with error to opt_info request");
-+    /* handle_reply_error already called set_error */
-     return -1;
-   }
-   return r;
--- 
-2.43.0
-

0003-generator-Restore-assignment-to-local-err.patch

@@ -1,43 +0,0 @@
-From 72f72dede6a0dc7d56ce2660ca232db1a0de8145 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 25 Jul 2024 13:39:28 +0100
-Subject: [PATCH] generator: Restore assignment to local 'err'
-
-I accidentally removed the assignment of local variable 'err' along
-these paths in commit cf49a49adc ("generator: Print full error in
-handle_reply_error").
-
-Fixes: commit cf49a49adc8abc8c917437db7461ed9956583877
-(cherry picked from commit e75d20b9e19143b1bd0d232fc49cb2e0287f824a)
----
- generator/states-newstyle-opt-list.c         | 1 +
- generator/states-newstyle-opt-meta-context.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/generator/states-newstyle-opt-list.c b/generator/states-newstyle-opt-list.c
-index 6605ee0a..48559574 100644
---- a/generator/states-newstyle-opt-list.c
-+++ b/generator/states-newstyle-opt-list.c
-@@ -129,6 +129,7 @@ STATE_MACHINE {
-     }
-     debug (h, "unexpected response, possibly the server does not "
-            "support listing exports");
-+    err = ENOTSUP;
-     break;
-   }
- 
-diff --git a/generator/states-newstyle-opt-meta-context.c b/generator/states-newstyle-opt-meta-context.c
-index 3945411e..699e24aa 100644
---- a/generator/states-newstyle-opt-meta-context.c
-+++ b/generator/states-newstyle-opt-meta-context.c
-@@ -272,6 +272,7 @@ STATE_MACHINE {
-     if (opt == h->opt_current) {
-       debug (h, "unexpected response, possibly the server does not "
-              "support meta contexts");
-+      err = ENOTSUP;
-       CALL_CALLBACK (h->opt_cb.completion, &err);
-       nbd_internal_free_option (h);
-       SET_NEXT_STATE (%.NEGOTIATING);
--- 
-2.43.0
-

0004-generator-states-newstyle.c-Quote-untrusted-string-f.patch

@@ -1,175 +0,0 @@
-From 8b4c86f8a0457ae32ebb6abbb55cb5809842ee3f Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 25 Jul 2024 13:25:34 +0100
-Subject: [PATCH] generator/states-newstyle.c: Quote untrusted string from the
- server
-
-Updates: commit cf49a49adc8abc8c917437db7461ed9956583877
-(cherry picked from commit 5dbfc418cb6176102634acea2256b2335520159c)
----
- generator/states-newstyle.c | 124 ++++++++++++++++++++----------------
- 1 file changed, 68 insertions(+), 56 deletions(-)
-
-diff --git a/generator/states-newstyle.c b/generator/states-newstyle.c
-index 6c7cc45c..8c483bd2 100644
---- a/generator/states-newstyle.c
-+++ b/generator/states-newstyle.c
-@@ -18,6 +18,7 @@
- 
- #include <assert.h>
- 
-+#include "ascii-ctype.h"
- #include "internal.h"
- 
- /* Common code for parsing a reply to NBD_OPT_*. */
-@@ -88,80 +89,91 @@ prepare_for_reply_payload (struct nbd_handle *h, uint32_t opt)
- static int
- handle_reply_error (struct nbd_handle *h)
- {
--  uint32_t len;
-   uint32_t reply;
--  char *msg = NULL;
-+  uint32_t replylen;
-+  FILE *fp;
-+  char *s = NULL;
-+  size_t len = 0;
-+  int err = 0;
- 
--  len = be32toh (h->sbuf.or.option_reply.replylen);
-   reply = be32toh (h->sbuf.or.option_reply.reply);
-   if (!NBD_REP_IS_ERR (reply)) {
-     set_error (0, "handshake: unexpected option reply type %d", reply);
-     return -1;
-   }
- 
-+  replylen = be32toh (h->sbuf.or.option_reply.replylen);
-   assert (NBD_MAX_STRING < sizeof h->sbuf.or.payload);
--  if (len > NBD_MAX_STRING) {
-+  if (replylen > NBD_MAX_STRING) {
-     set_error (0, "handshake: option error string too long");
-     return -1;
-   }
- 
--  /* Decode expected errors into a nicer string.
--   *
--   * XXX Note this string comes directly from the server, and most
--   * libnbd users simply print the error using 'fprintf'.  We really
--   * ought to quote this string somehow, but we don't have a useful
--   * function for that.
--   */
--  if (len > 0) {
--    if (asprintf (&msg, ": %.*s",
--                  (int)len, h->sbuf.or.payload.err_msg) == -1) {
--      set_error (errno, "asprintf");
--      return -1;
--    }
-+  /* Decode expected errors into a nicer string. */
-+  fp = open_memstream (&s, &len);
-+  if (fp == NULL) {
-+    set_error (errno, "open_memstream");
-+    return -1;
-   }
- 
-   switch (reply) {
-   case NBD_REP_ERR_UNSUP:
--    set_error (ENOTSUP, "the operation is not supported by the server%s",
--               msg ? : "");
--      break;
--    case NBD_REP_ERR_POLICY:
--      set_error (0, "server policy prevents the operation%s",
--                 msg ? : "");
--      break;
--    case NBD_REP_ERR_PLATFORM:
--      set_error (0, "the operation is not supported by the server platform%s",
--                 msg ? : "");
--      break;
--    case NBD_REP_ERR_INVALID:
--      set_error (EINVAL, "the server rejected this operation as invalid%s",
--                 msg ? : "");
--      break;
--    case NBD_REP_ERR_TOO_BIG:
--      set_error (EINVAL, "the operation is too large to process%s",
--                 msg ? : "");
--      break;
--    case NBD_REP_ERR_TLS_REQD:
--      set_error (ENOTSUP, "the server requires TLS encryption first%s",
--                 msg ? : "");
--      break;
--    case NBD_REP_ERR_UNKNOWN:
--      set_error (ENOENT, "the server has no export named '%s'%s",
--                 h->export_name, msg ? : "");
--      break;
--    case NBD_REP_ERR_SHUTDOWN:
--      set_error (ESHUTDOWN, "the server is shutting down%s",
--                 msg ? : "");
--      break;
--    case NBD_REP_ERR_BLOCK_SIZE_REQD:
--      set_error (EINVAL, "the server requires specific block sizes%s",
--                 msg ? : "");
--      break;
--    default:
--      set_error (0, "handshake: unknown reply from the server: 0x%" PRIx32 "%s",
--                 reply, msg ? : "");
-+    err = ENOTSUP;
-+    fprintf (fp, "the operation is not supported by the server");
-+    break;
-+  case NBD_REP_ERR_POLICY:
-+    fprintf (fp, "server policy prevents the operation");
-+    break;
-+  case NBD_REP_ERR_PLATFORM:
-+    fprintf (fp, "the operation is not supported by the server platform");
-+    break;
-+  case NBD_REP_ERR_INVALID:
-+    err = EINVAL;
-+    fprintf (fp, "the server rejected this operation as invalid");
-+    break;
-+  case NBD_REP_ERR_TOO_BIG:
-+    err = EINVAL;
-+    fprintf (fp, "the operation is too large to process");
-+    break;
-+  case NBD_REP_ERR_TLS_REQD:
-+    err = ENOTSUP;
-+    fprintf (fp, "the server requires TLS encryption first");
-+    break;
-+  case NBD_REP_ERR_UNKNOWN:
-+    err = ENOENT;
-+    fprintf (fp, "the server has no export named '%s'", h->export_name);
-+    break;
-+  case NBD_REP_ERR_SHUTDOWN:
-+    err = ESHUTDOWN;
-+    fprintf (fp, "the server is shutting down");
-+    break;
-+  case NBD_REP_ERR_BLOCK_SIZE_REQD:
-+    err = EINVAL;
-+    fprintf (fp, "the server requires specific block sizes");
-+    break;
-+  default:
-+    fprintf (fp, "handshake: unknown reply from the server: 0x%" PRIx32,
-+             reply);
-+  }
-+
-+  if (replylen > 0) {
-+    /* Since this message comes from the server, take steps to quote it. */
-+    uint32_t i;
-+    const char *msg = h->sbuf.or.payload.err_msg;
-+
-+    fprintf (fp, ": ");
-+    for (i = 0; i < replylen; ++i) {
-+      if (ascii_isprint (msg[i]))
-+        fputc (msg[i], fp);
-+      else
-+        fprintf (fp, "\\x%02x", msg[i]);
-     }
--  free (msg);
-+  }
-+
-+  fclose (fp);
-+
-+  set_error (err, "%s", s);
-+  free (s);
- 
-   return 0;
- }
--- 
-2.43.0
-

0005-generator-states-newstyle.c-Don-t-sign-extend-escape.patch

@@ -1,27 +0,0 @@
-From de5c0067d38d161fcaf6b94236468517bc168324 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 25 Jul 2024 15:48:46 +0100
-Subject: [PATCH] generator/states-newstyle.c: Don't sign extend escaped chars
-
-Fixes: commit 5dbfc418cb6176102634acea2256b2335520159c
-(cherry picked from commit 0d6c6bbb3386de3b60ab6c4831045f2b1896051b)
----
- generator/states-newstyle.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/generator/states-newstyle.c b/generator/states-newstyle.c
-index 8c483bd2..1e026a8a 100644
---- a/generator/states-newstyle.c
-+++ b/generator/states-newstyle.c
-@@ -159,7 +159,7 @@ handle_reply_error (struct nbd_handle *h)
-   if (replylen > 0) {
-     /* Since this message comes from the server, take steps to quote it. */
-     uint32_t i;
--    const char *msg = h->sbuf.or.payload.err_msg;
-+    const unsigned char *msg = (unsigned char *) h->sbuf.or.payload.err_msg;
- 
-     fprintf (fp, ": ");
-     for (i = 0; i < replylen; ++i) {
--- 
-2.43.0
-

copy-patches.sh

@@ -6,7 +6,7 @@ set -e
 # directory.  Use it like this:
 #   ./copy-patches.sh
 
-rhel_version=10.0
+rhel_version=10.1
 
 # Check we're in the right directory.
 if [ ! -f libnbd.spec ]; then

libnbd.spec

@@ -17,11 +17,11 @@
 %global verify_tarball_signature 1
 
 # The source directory.
-%global source_directory 1.20-stable
+%global source_directory 1.22-stable
 
 Name:           libnbd
-Version:        1.20.3
+Version:        1.22.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPL-2.0-or-later AND BSD-3-Clause
@@ -38,14 +38,10 @@ Source2:       libguestfs.keyring
 Source3:        copy-patches.sh
 
 # Patches are stored in the upstream repository:
-# https://gitlab.com/nbdkit/libnbd/-/commits/rhel-10.0/
+# https://gitlab.com/nbdkit/libnbd/-/commits/rhel-10.1/
 
 # Patches.
-Patch0001:     0001-generator-Print-full-error-in-handle_reply_error.patch
+Patch0001:     0001-docs-libnbd-release-notes-1.22.pod-Set-release-date.patch
-Patch0002:     0002-lib-Don-t-overwrite-error-in-nbd_opt_-go-info.patch
-Patch0003:     0003-generator-Restore-assignment-to-local-err.patch
-Patch0004:     0004-generator-states-newstyle.c-Quote-untrusted-string-f.patch
-Patch0005:     0005-generator-states-newstyle.c-Don-t-sign-extend-escape.patch
 
 %if 0%{verify_tarball_signature}
 BuildRequires:  gnupg2
@@ -386,6 +382,11 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Mon Feb 24 2025 Richard W.M. Jones <rjones@redhat.com> - 1.22.0-1
+- Rebase to libnbd 1.22.0
+- Synch spec file with Fedora Rawhide.
+- resolves: RHEL-78831
+
 * Wed Oct 30 2024 Troy Dawson <tdawson@redhat.com> - 1.20.3-2
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018

sources

@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.20.3.tar.gz) = 31c23f91892719d3d109c24bdce559005057f6469c930c9eee7c3241f001c92ec37d75d5e999fe76e9d6afd045458a7e25b694d4b4044b9df74d2ff2cab63dc9
+SHA512 (libnbd-1.22.0.tar.gz) = 68204a00d35cd6356e302543f993609cb39fb58c7b5478e9d6a4afafaf6ca91723b8586b4319502aadf546b2e9d5508089ed483a461d7857e6cad9d8f833fa36
-SHA512 (libnbd-1.20.3.tar.gz.sig) = 33a20f04652136de62263dceff2798bc261267818553fae9ec313d0756bce0817a5523086ca493fca4a673136d8453a62e5cc0475eed84556ce0158e6fead52c
+SHA512 (libnbd-1.22.0.tar.gz.sig) = 070a6ead2df7fe5b8158dfd96b8b0ae0c8434d52fa0e903b89f0fe5709a8c361ba8c21e1cb8eecf56abe7093bb0d257422bbeda801a28482625995d99cfa51b6