From d495cd485f34217a910aa5a195aba7acdfce5e49 Mon Sep 17 00:00:00 2001 From: Marius Schiffer Date: Sat, 26 Mar 2022 17:46:14 +0000 Subject: [PATCH] Fix boost string patch --- ceph/PKGBUILD | 7 +------ ceph/ceph-16.2.0-boost-string.patch | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ceph/PKGBUILD b/ceph/PKGBUILD index e6ca189..2a10716 100644 --- a/ceph/PKGBUILD +++ b/ceph/PKGBUILD @@ -42,23 +42,18 @@ options=('emptydirs') source=( "https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz" 'ceph.sysusers' - "zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz" - #'glibc2.32-strsignal-compat-backported.patch' 'ceph-14.2.0-cflags.patch' 'ceph-12.2.4-boost-build-none-options.patch' 'ceph-13.2.0-cflags.patch' 'ceph-13.2.2-dont-install-sysvinit-script.patch' - # 'ceph-14.2.0-link-crc32-statically.patch' 'ceph-14.2.0-cython-0.29.patch' 'ceph-15.2.0-rocksdb-cmake.patch' 'ceph-16.2.0-liburing.patch' 'ceph-16.2.0-boost-string.patch' - # 'ceph-15.2.5-missing-includes.patch' 'disable-empty-readable.sh-test.patch' ) sha512sums=('eab047e646970d444acf1064d98237b8b1677fb16b5e771082d55880f7bc6d8bdb278c2fe514c82ae12c438878d9ecea29139fa6b8d890f9f737138f10fb740c' '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049' - '25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33' '9e6bb46d5bbdc5d93f4f026b2a8d6bdb692d9ea6e7018c1bb0188d95ea8574c76238d968b340fd67ddaa3d8183b310e393e3549dc3a63a795fde696413b0ca94' '6ff46a90d76f667fa23be0f9eb1ed2fb7e30af9a2621aec19944d0a22a431a0f5721603c588286e483ff55c14aac920adfccb039c9678a87cc59640dd70367ae' '8ec0d668fefee12d2c7f5b5297dd81fc6a559f5823d069e6395d9b4240110eb8f95049d3054697a459948c1f3784b4450539849cf9d7f3b1aa1c7fbd96c475df' @@ -66,7 +61,7 @@ sha512sums=('eab047e646970d444acf1064d98237b8b1677fb16b5e771082d55880f7bc6d8bdb2 '82c1608928ee669ef60b8930ce82c443152c446e669e7bde9ce32f78571afb19a9620c3818b69ac8cb3ea33e7d7ac40f77c89162c71b19b157336d907fa23e3d' '2e62020cce33e3152cdb9a128023ee673124c4bcfdb9ee17718891ba5c9a16d98eb03ed06fe7dc7833c98487c1c1eb67fadfad1aa2f40c2c648829c86b4caab0' 'e8d03f04cbc307b131a0a55cb90d8a568b78a8e8f294d7e4415b7da7acec05b4d1dc32632935841fe2a492de7ee8ff52e544aab91b838431fda3815ca377fa64' - 'ced317fd8e5171aee1c68bae02ac8d197d88bf6f3edda653d401953b99fc1751e14d1b452a75376fe1998b3d5a21af2cea9c9bc91d76720d1775165ae02b6c99' + 'f467aba61f61036d8b655f39dd090b7dc20f1308d8581ebfba8b9ae341ed03eb80b2c7b7f4936a4f994ff1d1958ac2f1e431b94ad77b04e418725dea2268a9be' '2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222') diff --git a/ceph/ceph-16.2.0-boost-string.patch b/ceph/ceph-16.2.0-boost-string.patch index 0295cf4..7f9491b 100644 --- a/ceph/ceph-16.2.0-boost-string.patch +++ b/ceph/ceph-16.2.0-boost-string.patch @@ -1,7 +1,7 @@ -diff --git a/src/ceph-16.2.7/src/rgw/rgw_string.h b/src/ceph-16.2.7/src/rgw/rgw_string.h +diff --git a/src/rgw/rgw_string.h b/src/rgw/rgw_string.h index 257daa9..90e64f9 100644 ---- a/src/ceph-16.2.7/src/rgw/rgw_string.h -+++ b/tmp/rgw_string.h +--- a/src/rgw/rgw_string.h ++++ b/src/rgw/rgw_string.h @@ -8,6 +8,8 @@ #include #include