diff options
Diffstat (limited to 'sys-block/open-iscsi')
| -rw-r--r-- | sys-block/open-iscsi/Manifest | 3 | ||||
| -rw-r--r-- | sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch | 43 | ||||
| -rw-r--r-- | sys-block/open-iscsi/open-iscsi-2.1.9.ebuild | 1 |
3 files changed, 46 insertions, 1 deletions
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest index da091431cfca..7aa1c740baca 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -2,8 +2,9 @@ AUX initiatorname.iscsi 1152 BLAKE2B 32ddfef007a3cef2c22c6f49319587065d527000d0d AUX iscsid-conf.d 422 BLAKE2B 2871024472d5308b395aeb8c67f7b47aed4618790295d3ef7e51aaddd32f12fafbe1b8542fc8a34d5da0233a26ee557c7e9613fa8436d9c9312a9e2f6902a1e5 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a AUX iscsid-init.d 2094 BLAKE2B e13fc820e74a79e3c1f220b827c3188b6cb3bc149f450e3ee668d851faacd59e1e44b51250ba3f53a321d287eb81b580a332605226564269dbcd3e2762c0c95e SHA512 a5544e35da3433dfde96984d2e5783991d961554b8843f4f96d4317a38d7534864882342633ed0dc15c2f9e49a419e51958593b0de1ce84644938dafabe392fc AUX open-iscsi-2.1.7-fix_bitwise.patch 1480 BLAKE2B c5076f91885866042d99eef8d905fef4375645863bbf840fbec6c1bbc568ee98866b7fc74b2a78eb675a72cf800c82d11fd28438e9653e696f7d6260896b3f1a SHA512 b9474d78f1616bfdcfc2e11f51faa4a0398a30d00af50a7ae885a8ea07fdf1ba06a354e2ffec777ee2d9598c386093a1f89c4bb633a85a85011f6fa42b307a71 +AUX open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch 1429 BLAKE2B 5ac6b28fc6003a5335a3ce24b9fe5fda4cc3dd4d164574b40aaaa8ef3236f4721a54aae3dc84a7a9e7e5df8087543c5f8969bfaf2146f97b3d3e6f12c75bb9bf SHA512 1a5ff5acf08dcce356425ce4bcd7a867ec3f9ec176f83d3d187da7b96669b56e61e46317d9c3b983fca4c3ebbd137ee424342d41735eab562145951bc715654e DIST open-iscsi-2.1.8.tar.gz 638346 BLAKE2B 1e85b6bd75ac31e5aaa65ea8869c2e6e13190786e28e473ab8bd1ea3edb0ef835624194e2ba53718fb2a49c25af53bff9035f5109e1a569155244f03a7dccdc0 SHA512 168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1 DIST open-iscsi-2.1.9.tar.gz 641974 BLAKE2B 87570329dd5902bf96f1c11786c7a814892c851eabb63148f35b85494242f7379db1770a93549dcb871bafa148d37b320b389a98eed2ac46b7252ed22187ecd1 SHA512 25c28da5918b775ca54d3e55591eca0b4f7b5be33d803cad28fce1e9b2334b43cee1423a4e1819497b322e0f420dcd8d74226f442ca432233d1753565b11a5bb EBUILD open-iscsi-2.1.8.ebuild 3346 BLAKE2B b575b5b9238c7218fcc7d2dc64d7ca76c032100df942b72782d1c7b3a8d3628dde40126933cbf5b5e85a928dba7b96a8a8080e99d50dbedb67a5c17c83d340a5 SHA512 0780ea38e6b96d7a02867dbb3467aa4bfe22899644dfc65c100f8622e15257c9ff5f78a75a00a5b54108c9434ca96dad17ca84f99c8ef54d20d3b4de2173b8a6 -EBUILD open-iscsi-2.1.9.ebuild 3482 BLAKE2B 2974da5b3294770a70ba014ce5c2f5404e99cf14540bba4e47e2dc3a903802bd12ba45cbd578e62717c28cf48936240db87d27cbd542ad829314164106439455 SHA512 570aa4e9565cbc2c4e0881af44a8e511ccb40a385e9df463ff2977d2a0aef7908663843e3a9c62f579755d51e3d4ee6d4e603ae35816bca3e971f8c42841ccf7 +EBUILD open-iscsi-2.1.9.ebuild 3538 BLAKE2B df3fcb0b6f73c893fd31826fef4413b2d5f00046d9867db1593691c0b62f7a62cced7f6800ab5ee7c33c6f8e68ad31fd99383b6c74ae23fd2d3d17c26d2466ba SHA512 f70da5936347427583248e5a292fcd76da7d7cd1ba179c191eeb7c2bb92a79a0786f34e8f3fa6a22598d144c3dc9f41766a11b4b2a5bb5d86a30ee0eee13e58e MISC metadata.xml 532 BLAKE2B 201e4a44b240ad6ba1096927924ef8c84027f092ffed238db0d92cce1fe8f37e4c927dc1f8ae8393578cf66831df2c2590409349b980edb09e5187ac4369aad0 SHA512 67ed8a95407e6cce2fbfc35a6b0df99586eff99ec51f41666de298739f233282cad15c4d9d73fb42d3d2972f85da274fe47699c87f8ba2ccc44a841d563087f4 diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch new file mode 100644 index 000000000000..13215dafbb69 --- /dev/null +++ b/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch @@ -0,0 +1,43 @@ +https://github.com/open-iscsi/open-iscsi/commit/11bdc17938ba648c81a853355a6bbddad69a9fc7 +https://bugs.gentoo.org/908587 + +From 11bdc17938ba648c81a853355a6bbddad69a9fc7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Wed, 4 Oct 2023 23:18:20 +0200 +Subject: [PATCH] usr/idbm.c: fix musl build (#426) + +Fix the following musl build failure raised since version 2.1.9 and +https://github.com/open-iscsi/open-iscsi/commit/7b571d76d6937a78c141630fc38c3c57c532466c: + +../usr/idbm.c: In function 'idbm_rec_write_old': +../usr/idbm.c:2230:27: error: 'GLOB_ONLYDIR' undeclared (first use in this function) + 2230 | rc = glob(portal, GLOB_ONLYDIR, NULL, &globbuf); + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/14fc1c139f055b5b1eaa6e04e327863c06176a7b + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + usr/idbm.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/usr/idbm.c b/usr/idbm.c +index ca4a4ec..c39abb6 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -45,6 +45,11 @@ + #include "fw_context.h" + #include "iscsi_err.h" + ++// GLOB_ONLYDIR is not defined under musl ++#ifndef GLOB_ONLYDIR ++#define GLOB_ONLYDIR 0x100 ++#endif ++ + #define IDBM_HIDE 0 /* Hide parameter when print. */ + #define IDBM_SHOW 1 /* Show parameter when print. */ + #define IDBM_MASKED 2 /* Show "stars" instead of real value when print */ +-- +2.41.0 + diff --git a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild index a64f3cc0f0b1..d5126eaad442 100644 --- a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild @@ -34,6 +34,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch + "${FILESDIR}"/${P}-usr-idbm.c-fix-musl-build-426.patch ) pkg_setup() { |