| 1 |
commit: addb9b18a8f99b1be688372f1bb0e2d95cd4ace6 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Fri Oct 29 20:49:25 2021 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 29 20:49:25 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=addb9b18 |
| 7 |
|
| 8 |
sys-cluster/ceph: 14.2.22 add fix for newer snappy |
| 9 |
|
| 10 |
Copyright: Sony Interactive Entertainment Inc. |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-cluster/ceph/ceph-14.2.22.ebuild | 1 + |
| 15 |
sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch | 13 +++++++++++++ |
| 16 |
2 files changed, 14 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sys-cluster/ceph/ceph-14.2.22.ebuild b/sys-cluster/ceph/ceph-14.2.22.ebuild |
| 19 |
index 1288ebd6a78..7e642968cc1 100644 |
| 20 |
--- a/sys-cluster/ceph/ceph-14.2.22.ebuild |
| 21 |
+++ b/sys-cluster/ceph/ceph-14.2.22.ebuild |
| 22 |
@@ -185,6 +185,7 @@ PATCHES=( |
| 23 |
"${FILESDIR}/ceph-14.2.22-build-without-mgr.patch" |
| 24 |
"${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch" |
| 25 |
"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch" |
| 26 |
+ "${FILESDIR}/ceph-14.2.22-snappy-uint32.patch" |
| 27 |
) |
| 28 |
|
| 29 |
check-reqs_export_vars() { |
| 30 |
|
| 31 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch b/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..c783558a175 |
| 34 |
--- /dev/null |
| 35 |
+++ b/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch |
| 36 |
@@ -0,0 +1,13 @@ |
| 37 |
+diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h |
| 38 |
+index 0291a923112..352ab9a9bcf 100644 |
| 39 |
+--- a/src/compressor/snappy/SnappyCompressor.h |
| 40 |
++++ b/src/compressor/snappy/SnappyCompressor.h |
| 41 |
+@@ -96,7 +96,7 @@ class SnappyCompressor : public Compressor { |
| 42 |
+ if (qat_enabled) |
| 43 |
+ return qat_accel.decompress(p, compressed_len, dst); |
| 44 |
+ #endif |
| 45 |
+- snappy::uint32 res_len = 0; |
| 46 |
++ uint32_t res_len = 0; |
| 47 |
+ BufferlistSource source_1(p, compressed_len); |
| 48 |
+ if (!snappy::GetUncompressedLength(&source_1, &res_len)) { |
| 49 |
+ return -1; |
Archives