summaryrefslogtreecommitdiff
path: root/sys-cluster
diff options
context:
space:
mode:
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/Manifest.gzbin11562 -> 11570 bytes
-rw-r--r--sys-cluster/ceph/Manifest8
-rw-r--r--sys-cluster/ceph/ceph-18.2.4-r4.ebuild1
-rw-r--r--sys-cluster/ceph/ceph-19.2.0-r3.ebuild1
-rw-r--r--sys-cluster/ceph/ceph-19.2.1-r2.ebuild (renamed from sys-cluster/ceph/ceph-19.2.1-r1.ebuild)6
-rw-r--r--sys-cluster/ceph/files/ceph-19.2.1-isa-l.patch73
-rw-r--r--sys-cluster/ceph/files/ceph-19.2.1-quiet-stringop-truncation.patch13
7 files changed, 96 insertions, 6 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index ad6e2981af23..06c3b4bd22ef 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
Binary files differ
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index d8cc4dfdf297..de5022fd20fa 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -30,8 +30,10 @@ AUX ceph-19.2.0-importlib.patch 1722 BLAKE2B eb4ae542799f30f5b8d3e2092f622510c58
AUX ceph-19.2.1-exporter.patch 476 BLAKE2B aeccf75786175c3d94496e2373b1badce79d16cff156567710ab27c95f21af641f0c19e1f18c6b845c00186e3c2c4f5ff536d2b557563e8b314984c3b30265f9 SHA512 9ff693e42b1255351951d1e927e1cd14a72b33ec64674a072c4a564bfa58919000292d2838c2660645dddf0e2d0d12a0d78a4fa586e26038eba8449faf5f76a4
AUX ceph-19.2.1-graylog.patch 1008 BLAKE2B 1d2f4e4bc2f5263a0e0fa6286b58f53074df0ee208787661c84899bc846b3a1888f8f87984663a7edd68d11f3d675bfa5269de34c535841166a34fa0ef197726 SHA512 39ed4d643bde64f18ce7d7f3f8abaa32d6ed0a4fcd24c481fbfcdce8247e9dd85fb2d20e42f6932da93247a08748eb7f2e6b043116ecf53fb5dc75c3c00bea7f
AUX ceph-19.2.1-immutableobjectcache.patch 4294 BLAKE2B 95a4b0680e5d8ccea37c77ae1ea4e6e48cf61f2ab9090611395740c86aa0175a20ab932713b5d91082d4c9b87cb470c4100219e134d1937ab279ba03df42f32f SHA512 21bbf7998e06ac4db59464c8a089a7b4e35fc7dce6d9fa6c79052b966f084ac4c5dbadb6146e4182af2a7618d4e1006d8eb3520fa2592246e19047a80d45c234
+AUX ceph-19.2.1-isa-l.patch 2971 BLAKE2B feb564ece4e08dde462c5adb775bd019b048f142c0fbf10e13ffb566af20b38c312166d7a8667fc6ca2b416ef83f81a7e5abc0ec0de30517332ee27ef4df07f3 SHA512 efe99392450c7a794758cc47c161f9902f19e98e8b8a3b374e5da2ae285170d17497a08fefc4850e0170285f44ef87c44fb8784363ea120a106c5c443f5c4c11
AUX ceph-19.2.1-librbd.patch 7566 BLAKE2B 5212e4e271840cebb95c7457d7fd99b719830c2ff7861708e230f2b983dae5b03f468549ff1d731ce26e386fcbc209f895994db050ccfb8c549c7de25d32e0d4 SHA512 ffd27706a104673d74157bce4f8dc5575e9a3499cf2eb0f71d5433a3b29acefa2fa1eaaa40bda338820f98ff44f5d56ec04922240563840b168968066359b662
AUX ceph-19.2.1-mgr.patch 1351 BLAKE2B 8c8d59bb210cd380292d9cae3b5095a0abb8fe74bc0f00aef2b859b61fc3f5c20044c0ffd726013c75e9be21069a8a7cd407d9d0d78e8e3fadde88439e6f9cda SHA512 b5c09734f6534dd03d08df73e12a397c404f32241d1ee151800223d90991cf73fbeea5818ecfad887d620c27e6f8fe252e175b6502cf98ee06edaec561476658
+AUX ceph-19.2.1-quiet-stringop-truncation.patch 401 BLAKE2B 320f21c404098c84f95518611f951f8532fbc8435d0d205b1a273b6a59d61dbafc63c4dcfad3e82ba1298e70c969e8def3ea28a9cac3b8b80b42b422d3ff3158 SHA512 d282f5bba40b2e6d30117466f24174e3ea7fe9358f4a51de7bb6af4e9b3beaf6044fad07bab491dd4c4c1e60d20fdbf672b90dfb3c608da70b35be8c227d89c4
AUX ceph-19.2.1-rgw.patch 2869 BLAKE2B 988a4e05e1de601ef7e5c5764e3dfad113fe4b7d4a39596778e32021f0e82f665b90798ea0923af6fe635263362717de93084ade37830172c7e9c1d85eaf42da SHA512 32b97ae54aa6135c02c21f21f03666da545e739744f97129e9c18c0eedfb4cde3acd0147e3ecb2a3afc9408435a131bb5ad876f00d6601dacc2ed0e8a36768bc
AUX ceph-19.2.1-uuid.patch 1461 BLAKE2B a0fa36d30febc77709f099c0e965081aacbde917f7fe7992efcf9bbfd16d8fe09387653d5563d2be5995f93aac5ced1784d9071fd016e9e40b1792164f1eeac3 SHA512 d28da8cc56c49d7ac5e5c1a3f006652e911e090351cdeddf04a002458f90cfb51ec1529c8e98824aa0609face7cdb8b0872aaa092ae552368876889bb2cc3e47
AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
@@ -52,7 +54,7 @@ DIST ceph-19.2.1.tar.gz 240610402 BLAKE2B d2caddfafdace8e8ced3445daa7c8ec6f2a3f1
DIST ceph-xsimd-18.2.4.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
DIST ceph-xsimd-19.2.0.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
DIST ceph-xsimd-19.2.1.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
-EBUILD ceph-18.2.4-r4.ebuild 13795 BLAKE2B bca627715674bef6797e75ca8ade8848f162d509cba6f6a503556c5e4a36347b967e518314e215deccb9f7ffdd0b42003d3639d0e4844043940c991454f9546e SHA512 fab9820f2b528ee85c1a6d076f97f0d3fb59c455ca426f0cbabf4d7d116e5a8827bcb843a97a72e781ffe7eeea1a694e6dd522e00a2337f54d80031c8d8c667e
-EBUILD ceph-19.2.0-r3.ebuild 14506 BLAKE2B 90d2d88312f6bf5c6d382043559fa64a76bc276d5d1d1d29294e3880b546e5f1f070d54c4dd3808b28b230fb3750e0b902c1f82dbf28a156ba6020d75dfccfee SHA512 531c3f44d8ffc5ea541ec1ee4427808ed4ff8a6ddfff626da1773b2a35001bc2eeafa8f5fd819741d10955ea03812cd91f08ee5c68c5bc8110dc18814b679c5a
-EBUILD ceph-19.2.1-r1.ebuild 14829 BLAKE2B b35864f3cb4de20668c6c85468dc34581fb5cba2bfff67b1754572d8cfe5fef2673889eb93522c51861b797d4f064ffbed930c2b2974b65bc2336249a37efd77 SHA512 1a974d83e035dbdddb5a0ed5595998cb94a49da4047f4224cbfd7b2c9dfb1139c10891436df32a3949972a9c2bf86bc0a22c944fbf634fd988d6aed1f9f84251
+EBUILD ceph-18.2.4-r4.ebuild 13834 BLAKE2B b7061195bdbd8867de2f1074758a6d35138325f85df256d2080d158deb603ed4118467bde3f9e1e0e8478ce518febe1c19799599a45efb9e17d1377b22fd0bf7 SHA512 fc0f33eb86ef360d30747cb1b3e559fcbf6b95ce066c4f62bef9b489e40f380365838c342dba5385e119b2cf127ab4b383a30b921172e2d2db2206fff1005aa3
+EBUILD ceph-19.2.0-r3.ebuild 14545 BLAKE2B 8f4c8b50438ecc4c065566f53642fa1f327f88e387ef68fc59fe6afe711bcc1705d7119cfd6c571f213e16a0313d2c5491445284c225600cc8317f499091bee1 SHA512 932ae3ed752c784b33e75f7104e2f75a646843a82514dbaadfaa856aac9def23cff67c5085038014db4a5b976eb16d479ea60fd691e45c192f770d5b1ddf9a29
+EBUILD ceph-19.2.1-r2.ebuild 14856 BLAKE2B 5a4af4b21b5f1bbc01b875ba0134b507c6541046d21eecca98c1a1e3f72c2fa90af57fda42b992279f777f768448c335272176a3857bea4aef94c895db98dd18 SHA512 72214f87a061e99fc1f0d6c30f366bbf6852aeecb13ef9723f8d367f253d60ef3a3a86db608fa624f56b0610f08f038047e8e36b01393bc1f1e9364634be7cd6
MISC metadata.xml 2368 BLAKE2B 9a2248908694f7e9a06142c9348b142d78dffd48bb9d71400a94e48c6ee8b5da337aa7e758cb43155cded6e4198dcce50ce613d386b7dd808fa39ca4de57fe4c SHA512 3ca50f703b83aef7a9c49137cd991858b13dc609882c69da4ee407098e9609254eec1181e2c63c06e607338d3a78b5caf7f0f3cdc02ee6001af40d451016b027
diff --git a/sys-cluster/ceph/ceph-18.2.4-r4.ebuild b/sys-cluster/ceph/ceph-18.2.4-r4.ebuild
index 407b3b7643a3..5ff77f4bdc82 100644
--- a/sys-cluster/ceph/ceph-18.2.4-r4.ebuild
+++ b/sys-cluster/ceph/ceph-18.2.4-r4.ebuild
@@ -235,6 +235,7 @@ PATCHES=(
"${FILESDIR}/ceph-18.2.1-gcc14-2.patch"
"${FILESDIR}/ceph-18.2.4-liburing.patch"
"${FILESDIR}/ceph-18.2.4-spdk.patch"
+ "${FILESDIR}/ceph-19.2.1-isa-l.patch"
)
check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/ceph-19.2.0-r3.ebuild b/sys-cluster/ceph/ceph-19.2.0-r3.ebuild
index 121fdfc85a33..ed6a7ba4d171 100644
--- a/sys-cluster/ceph/ceph-19.2.0-r3.ebuild
+++ b/sys-cluster/ceph/ceph-19.2.0-r3.ebuild
@@ -233,6 +233,7 @@ PATCHES=(
"${FILESDIR}/ceph-18.2.4-spdk.patch"
# https://bugs.gentoo.org/941069
"${FILESDIR}/ceph-19.2.0-importlib.patch"
+ "${FILESDIR}/ceph-19.2.1-isa-l.patch"
)
check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/ceph-19.2.1-r1.ebuild b/sys-cluster/ceph/ceph-19.2.1-r2.ebuild
index 415d128974f9..2b979e4ae6b7 100644
--- a/sys-cluster/ceph/ceph-19.2.1-r1.ebuild
+++ b/sys-cluster/ceph/ceph-19.2.1-r2.ebuild
@@ -239,7 +239,9 @@ PATCHES=(
"${FILESDIR}/ceph-19.2.1-immutableobjectcache.patch"
"${FILESDIR}/ceph-19.2.1-mgr.patch"
"${FILESDIR}/ceph-19.2.1-exporter.patch"
- )
+ "${FILESDIR}/ceph-19.2.1-isa-l.patch"
+ "${FILESDIR}/ceph-19.2.1-quiet-stringop-truncation.patch"
+)
check-reqs_export_vars() {
CHECKREQS_DISK_BUILD="6G"
@@ -364,8 +366,6 @@ ceph_src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_fmt=ON
-Wno-dev
-DCEPHADM_BUNDLED_DEPENDENCIES=none
- # isa-l is very question mark exclamation mark
- -DHAVE_NASM_X64=no
)
# this breaks when re-configuring for python impl
diff --git a/sys-cluster/ceph/files/ceph-19.2.1-isa-l.patch b/sys-cluster/ceph/files/ceph-19.2.1-isa-l.patch
new file mode 100644
index 000000000000..2acc50c0e55f
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-19.2.1-isa-l.patch
@@ -0,0 +1,73 @@
+https://bugs.gentoo.org/950294
+
+Similar to dev-libs/isa-l/files/isa-l-2.31.0_makefile-no-D.patch
+and dev-libs/isa-l_crypto/files/isa-l_crypto-2.24.0_makefile-no-D.patch.
+--- a/src/crypto/isa-l/isa-l_crypto/Makefile.am
++++ b/src/crypto/isa-l/isa-l_crypto/Makefile.am
+@@ -125,8 +125,8 @@ CCAS = $(as_filter)
+ EXTRA_DIST += tools/yasm-filter.sh tools/nasm-filter.sh
+ EXTRA_DIST += tools/yasm-cet-filter.sh tools/nasm-cet-filter.sh
+
+-AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${D}
+-AM_CCASFLAGS = ${yasm_args} ${INCLUDE} $(src_include) ${DEFS} ${D}
++AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${DIST_D}
++AM_CCASFLAGS = ${yasm_args} ${INCLUDE} $(src_include) ${DEFS} ${DIST_D}
+
+ .asm.s:
+ @echo " MKTMP " $@;
+--- a/src/crypto/isa-l/isa-l_crypto/make.inc
++++ b/src/crypto/isa-l/isa-l_crypto/make.inc
+@@ -111,7 +111,7 @@ INCLUDE = $(patsubst %,-I%/,$(subst :, ,$(VPATH)))
+ CFLAGS = $(CFLAGS_$(arch)) $(CFLAGS_$(CC)) $(DEBUG) -O2 $(DEFINES) $(INCLUDE)
+ ASFLAGS = $(ASFLAGS_$(arch)) $(ASFLAGS_$(CC)) $(DEBUG_$(AS)) $(DEFINES) $(INCLUDE)
+ ARFLAGS = $(ARFLAGS_$(arch))
+-DEFINES += $(addprefix -D , $D)
++DEFINES += $(addprefix -D , ${DIST_D})
+ CLEANFILES += $(O) *.o *.a $(all_tests) $(lib_name) $(so_lib_name)
+
+ ifeq ($(filter aarch64 x86_%,$(host_cpu)),)
+@@ -193,7 +193,7 @@ $(addsuffix .run,$(all_tests)): %.run : %
+ @echo Completed run: $<
+
+ # Other build rules
+-msg = $(if $(DEBUG),DEBUG) $(patsubst 32,32-bit,$(host_cpu)) $D
++msg = $(if $(DEBUG),DEBUG) $(patsubst 32,32-bit,$(host_cpu)) ${DIST_D}
+
+ # gcc assembly files
+ $(O)/%.o: $(host_cpu)/%.S
+--- a/src/isa-l/Makefile.am
++++ b/src/isa-l/Makefile.am
+@@ -142,11 +142,11 @@ CCAS = $(as_filter)
+ EXTRA_DIST += tools/yasm-filter.sh tools/nasm-filter.sh
+ EXTRA_DIST += tools/yasm-cet-filter.sh tools/nasm-cet-filter.sh
+
+-AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${D}
++AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${DIST_D}
+ if CPU_AARCH64
+ AM_CCASFLAGS = ${AM_CFLAGS}
+ else
+-AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${src_include} ${DEFS} ${D}
++AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${src_include} ${DEFS} ${DIST_D}
+ endif
+
+ .asm.s:
+--- a/src/isa-l/make.inc
++++ b/src/isa-l/make.inc
+@@ -118,7 +118,7 @@ INCLUDE = $(patsubst %,-I%/,$(subst :, ,$(VPATH)))
+ CFLAGS = $(CFLAGS_$(arch)) $(CFLAGS_$(CC)) $(DEBUG) -O2 $(DEFINES) $(INCLUDE)
+ ASFLAGS = $(ASFLAGS_$(arch)) $(ASFLAGS_$(CC)) $(DEBUG_$(AS)) $(DEFINES) $(INCLUDE)
+ ARFLAGS = $(ARFLAGS_$(arch))
+-DEFINES += $(addprefix -D , $D)
++DEFINES += $(addprefix -D , ${DIST_D})
+ CLEANFILES += $(O) *.o *.a $(all_tests) $(bin_PROGRAMS) $(lib_name) $(so_lib_name) $(all_llvm_fuzz_tests)
+
+ # set host_cpu=base_aliases for unsupported CPUs
+@@ -224,7 +224,7 @@ $(addsuffix .run,$(all_tests)): %.run : %
+ @echo Completed run: $<
+
+ # Other build rules
+-msg = $(if $(DEBUG),DEBUG) $(patsubst 32,32-bit,$(host_cpu)) $D
++msg = $(if $(DEBUG),DEBUG) $(patsubst 32,32-bit,$(host_cpu)) ${DIST_D}
+
+ # yasm/nasm assembly files
+ $(O)/%.o: %.asm
diff --git a/sys-cluster/ceph/files/ceph-19.2.1-quiet-stringop-truncation.patch b/sys-cluster/ceph/files/ceph-19.2.1-quiet-stringop-truncation.patch
new file mode 100644
index 000000000000..5332b029cf2d
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-19.2.1-quiet-stringop-truncation.patch
@@ -0,0 +1,13 @@
+diff --git a/src/log/Entry.h b/src/log/Entry.h
+index db39eca0ef3..5e414b1d2f3 100644
+--- a/src/log/Entry.h
++++ b/src/log/Entry.h
+@@ -32,7 +32,7 @@ public:
+ m_prio(pr),
+ m_subsys(sub)
+ {
+- strncpy(m_thread_name, Thread::get_thread_name().data(), 16);
++ strncpy(m_thread_name, Thread::get_thread_name().data(), 15);
+ m_thread_name[15] = '\0';
+ }
+ Entry(const Entry &) = default;
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-09 13:56:04 +0000