diff options
Diffstat (limited to 'dev-libs')
34 files changed, 587 insertions, 348 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex d13a3c2b40fd..4ee9e5579615 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest index fcb5a5cf498b..403a32c88940 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -6,9 +6,11 @@ DIST ell-0.71.tar.xz 574408 BLAKE2B ccd0f15504621c183b9f3e8d109f1f66c23d88b2e077 DIST ell-0.72.tar.xz 582352 BLAKE2B 8e1dfdc1d61c8d1975cd28f1ee961d2d4ba689a736e4b21f7e9e3cca319f514770738bcdfbc7893df4a07ccb75f0b1d282280d631ee53b4dd002e1561c13545b SHA512 40917478291aeca536f79af366fa3cf83ddfd917a42a26bea00cf8f4c60f206839bf427e7fe4dc1e3417e45ea05d80a08616850646543da06316e11ea2505739 DIST ell-0.73.tar.xz 581984 BLAKE2B 62e4ec267a29374fced8243c7a7b1fe1bd88146dd732b63720a6821df38c8154c2257f26a00dce7191ee210a868f506909a4c2c66bf14319f09b3d976dae1d14 SHA512 234df7e0445c2c160e9973158db0f14f3acd8d97c4605d0061e63fda60abd037ecd2b32638769ddfc243df09bab7f3ecbc3a819ebd318754ecf49fc14204d7a5 DIST ell-0.74.tar.xz 583132 BLAKE2B 5e1a7766bdfe27ab9c825df7ed9a9b1ecebec4fc25e2ebf39d1b00bcd21832557d78d26c48b0602ea4be7d7ba21cb4ef50a410b54af5bb1cacc7b9a58317034d SHA512 098ac3d225598a2bc9e312bc4a2643504691715acf5ba3657349274b2b3439998fd2975bf39a11affea60ae991750ab4741cb215ec4185d51b6b23f8223396c8 +DIST ell-0.76.tar.xz 593312 BLAKE2B 667e522bef5a400a549f194468283db95b528f94a1721e062e79f14e0a9d1620669ba8fa050a47f56906aba17cce1e27e584fe4374da390e8b9556d46369622e SHA512 cb2fe252c40133ffb5cb1ce64cf8e6f7df488dfd775efac8be1237464274f2077043146d4836b5ac9f2b1ca2ebd705a826769d05fcb3b3b3fcc13e125fadaaf2 EBUILD ell-0.71.ebuild 1296 BLAKE2B a5453b031c599df714f6499b49287e3b95e8aeb18239a82df124e3e107daf72916f33dda1cb5fb6e01ee23b14a89a644ef78bd5a70b96d931042d82054e7e15e SHA512 6eb6de16d13d811fcb013d6b45e1b565c65ded0068a5c8cec64c94bd52083682cdea72bda4e6641adbdddc81c4f551bba5a2bd10679dbe12ce83198108ab6e66 EBUILD ell-0.72.ebuild 1302 BLAKE2B a4f8c57859e90b883dd3b59658622d375f62d191f54f81b6757532f2d69bcdba7fcf781322b8171a8aa1ca62b39deebbbbf1d9d9d0ce0f67fd2607c00a80c141 SHA512 d9ec1d4c3b2670621b62a94457235553cee107e0678dc5fc5e447a7c0e6ebd0492fd071c1af9801ed913ea12549600b85f2d45cc931275925998fef8e256a369 EBUILD ell-0.73.ebuild 1302 BLAKE2B a4f8c57859e90b883dd3b59658622d375f62d191f54f81b6757532f2d69bcdba7fcf781322b8171a8aa1ca62b39deebbbbf1d9d9d0ce0f67fd2607c00a80c141 SHA512 d9ec1d4c3b2670621b62a94457235553cee107e0678dc5fc5e447a7c0e6ebd0492fd071c1af9801ed913ea12549600b85f2d45cc931275925998fef8e256a369 EBUILD ell-0.74.ebuild 1302 BLAKE2B a4f8c57859e90b883dd3b59658622d375f62d191f54f81b6757532f2d69bcdba7fcf781322b8171a8aa1ca62b39deebbbbf1d9d9d0ce0f67fd2607c00a80c141 SHA512 d9ec1d4c3b2670621b62a94457235553cee107e0678dc5fc5e447a7c0e6ebd0492fd071c1af9801ed913ea12549600b85f2d45cc931275925998fef8e256a369 +EBUILD ell-0.76.ebuild 1302 BLAKE2B a4f8c57859e90b883dd3b59658622d375f62d191f54f81b6757532f2d69bcdba7fcf781322b8171a8aa1ca62b39deebbbbf1d9d9d0ce0f67fd2607c00a80c141 SHA512 d9ec1d4c3b2670621b62a94457235553cee107e0678dc5fc5e447a7c0e6ebd0492fd071c1af9801ed913ea12549600b85f2d45cc931275925998fef8e256a369 EBUILD ell-9999.ebuild 1205 BLAKE2B e1dd3bc3e8d0da0757b52ef4af94cb63b2336f5a1524198532e757f10f2825c5d2663c6b5ea431c8a9d75344dbacd5536786867243292c434a136a4f92380753 SHA512 1d8d958b73087fb3dea18458fb72c08fa4ad7dce7e9173183ceef10a80f1a4186a3c9c62ebfccf4b6f622069570f69c473c46d5474a4fc834060952c160b3c29 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f diff --git a/dev-libs/ell/ell-0.76.ebuild b/dev-libs/ell/ell-0.76.ebuild new file mode 100644 index 000000000000..09d88fbab270 --- /dev/null +++ b/dev-libs/ell/ell-0.76.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic linux-info + +DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git" +if [[ "${PV}" == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" +else + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +LICENSE="LGPL-2.1+" +SLOT="0" + +IUSE="pie test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( sys-apps/dbus )" + +CONFIG_CHECK=" + ~TIMERFD + ~EVENTFD + ~CRYPTO_USER_API + ~CRYPTO_USER_API_HASH + ~CRYPTO_MD5 + ~CRYPTO_SHA1 + ~KEY_DH_OPERATIONS +" + +src_prepare() { + default + sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \ + unit/test-dbus*.c unit/dbus.conf || die + [[ "${PV}" == *9999 ]] && eautoreconf +} + +src_configure() { + append-cflags "-fsigned-char" #662694 + local myeconfargs=( + $(use_enable pie) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name "*.la" -delete || die +} + +src_test() { + # New dbus tests fail with >3 jobs, this should get fixed soon + emake -j1 check +} diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest index e8409cede96e..df32eb351061 100644 --- a/dev-libs/ffcall/Manifest +++ b/dev-libs/ffcall/Manifest @@ -1,8 +1,9 @@ AUX ffcall-2.4-slibtool.patch 5050 BLAKE2B 45db7c7c1dcbbcad4860e99806cc4e2a260877df5d122872964f94c968ea63b231e2f44426d9b0836fe9eccc8e9056ced77eaae9b38ad6f5248d1ce5a808c2d1 SHA512 36df8951ff2f33b06bcf479cf6e5e7b445dae613551f02f4d8af9792781baad60ab48de290068487b265185361a9615b0eeccbb636eedb6c5ffa54bd1b85ee78 AUX ffcall-2.4-vacall-riscv-pic.patch 16090 BLAKE2B db91cee446d8542d48b7bc33cc134e572cb4d4901bb756ba7d4541ddfdb76fec829e1626d2cfab6d79f6d4d5ca5488e87a3e9b08dda4a99250bdb55ca598ebe7 SHA512 360c6abae6c617bad70d68800065980ca06bc68eb855f6d4c976d11ca7d3f22a12eaa9dd6c00c6ee4596748984011827ba0bb6ed4614c338ca8ea72d283a17ef +AUX ffcall-2.5-add-support-for-clang.patch 2071 BLAKE2B bf74d0bd53ea79d417d8362a981c8df9429803a4ae15e397fdade049a517c6c3f247b4dfc0720f4068aff646eb557f0920e357339c8d8e846db276603eac702b SHA512 988395aa8d3c03b9e59f78688d845a401090de09738387595617beea4ff70c1694c5a3340c9eb7bfe0440ee79546761a836c54461e4dac728f7a04ff74b73469 DIST libffcall-2.4.tar.gz 1253767 BLAKE2B 669bf556f082b533eb7d71ebc6fadeac464b1a6054ac8078c9315678929bcfb8ad4b7376b345bcfbb5d2caf9d45179012d4bb5a08ad675f475f58570ae96b7ae SHA512 c9451662764a888e3be21499c29673bfb0e1df4915814da3506db5d395a2b00ea2f0c08d1c9dffebf030179f9347794876ec6ec9e6710b4fc70fd760960335e6 DIST libffcall-2.5.tar.gz 1451999 BLAKE2B 552a0a33bbed91380ced4bdb0f87f38be0a531e729b9530d80dd777ce93b4fe3515a984c2da0221e0110756fbbc099d666b1fed6f5cfacfccbedda7f97e58054 SHA512 5e5b1c34b9e66bde00e1deea464099ef09e439070e8180c04f2520442933e369e76632346ae59a5720356128787e88255bd75764736ac9b5334a592eb6cf5878 EBUILD ffcall-2.4-r1.ebuild 1630 BLAKE2B 2e5b662fb270eba863d831c6d27ed4405d2288fe505acc01eeeef407395ccd0c36f95decad2d71ca491164c8add183f2003e9cfc195702812b40dd4e0a9df162 SHA512 1ecf15e944ef23e12368499453f8106ecff69c2d5856296488c05985c256ad790bcd7598c11219a49d2ff8b2b9df318e4b9210b7c1d63ec5ccbae506e6f56602 EBUILD ffcall-2.4.ebuild 1560 BLAKE2B a78adc67982e5e4bfc9f4cb3ea111f956fd712d45e0944a9fb46a0af4d288ed6252317d5321ba4db4338e3ce155d340661c1f35e2b37c91d16f3f1804daf7a99 SHA512 d50da56b5d0219ed0e4b2878272df9fb3270ddda99cf7bdf715e1b7a946b609a0b729bc2865364c07dbaaa3674422632bff7d76ba82baa1c37020f31926ea9a1 -EBUILD ffcall-2.5.ebuild 1443 BLAKE2B 823451abe95b288323f3e212fd361af88f9e4fbea3e489ac0ccdbe9194ccd973a0a2c63845f7abb01cd8ad50faacf0cb2580314987e436ae989acd16a62254f7 SHA512 782cb77d98d9886a03c7a6588c60a73a2dd5ca4e509973a77098a5a44d70304fa89eff6cbcc0f8679cbf6d12ce8714e67502d8e4f485d814a9c2d899c40817d5 -MISC metadata.xml 859 BLAKE2B a3c2244f2545985f3000c06357c8494bda02e082d089a1b44793a944bdd2592eac8b6e567be29943d07a0eb2930dfda1eb20695f213ec469a1457fd3f8d4360f SHA512 49e8a58e4839ee6d15de7165fede7f8b5f1f200731f8d3a0c4ceee97b8ff1c6e03550ca6be6531d928d43000ec7ded5922f85ef8e3a97d1853be94c9c3d3afe0 +EBUILD ffcall-2.5.ebuild 1612 BLAKE2B 6f0cc411ac9c15e120f9bfd5cf0d2fcd564c07f17f1d1c9b34bfa081c306f4545ccbc4bf6556d1bfb120a25321555df2f424809d3e4c748d784b43b3b0201edd SHA512 a1e1bad3a73893c2385b783f8beb3319de62067099194e51ff3f1a74a34cbcc3330aa8928b44c06885b5c742385a3ce128b5941cfa5bf2180fdd32187e0f7f98 +MISC metadata.xml 866 BLAKE2B 9a835c7bf2579a98d7d547f376347ff2c67445bf041d4392ba0c18261b5ed29b7b015db45f61aa70b99ccadb706088ac84a381948540a9390256394950605eb4 SHA512 bb83f9b791d8de4fb680a64f4164720caabc1f953edfedfdfd7a17c2f6e167b6f6987dda37e3a59f32b772c511015a153f7d93fe39d9cde51f9c6e4bb56b6083 diff --git a/dev-libs/ffcall/ffcall-2.5.ebuild b/dev-libs/ffcall/ffcall-2.5.ebuild index 7f9d8f6bfae9..2ab0965e1c5c 100644 --- a/dev-libs/ffcall/ffcall-2.5.ebuild +++ b/dev-libs/ffcall/ffcall-2.5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic libtool +inherit autotools flag-o-matic libtool MY_PV="libffcall-${PV}" @@ -19,6 +19,10 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +PATCHES=( + "${FILESDIR}"/ffcall-2.5-add-support-for-clang.patch +) + src_prepare() { # The build system is a strange mix of autogenerated # files and manual tweaks on top. Uses $CFLAGS / $LDFLAGS randomly. @@ -35,6 +39,12 @@ src_prepare() { default elibtoolize + eautoreconf + + if use kernel_linux ; then + QA_CONFIG_IMPL_DECL_SKIP=( PROT_MPROTECT ) + fi + } src_configure() { diff --git a/dev-libs/ffcall/files/ffcall-2.5-add-support-for-clang.patch b/dev-libs/ffcall/files/ffcall-2.5-add-support-for-clang.patch new file mode 100644 index 000000000000..2a8cc2676401 --- /dev/null +++ b/dev-libs/ffcall/files/ffcall-2.5-add-support-for-clang.patch @@ -0,0 +1,53 @@ +https://git.savannah.gnu.org/cgit/libffcall.git/commit/?id=fe6d9f089d8326b077420c10fec8c2174557be30 + +From fe6d9f089d8326b077420c10fec8c2174557be30 Mon Sep 17 00:00:00 2001 +From: Bruno Haible <bruno@clisp.org> +Date: Tue, 20 Aug 2024 13:38:19 +0200 +Subject: [PATCH] Add support for Android. + +* m4/cc-gcc.m4 (CL_CC_GCC): If using clang as compiler, add the option +-no-integrated-as to GCC_X_NONE. +* NEWS: Mention Android as supported. + +diff --git a/m4/cc-gcc.m4 b/m4/cc-gcc.m4 +index 1e12d8e..97c2dac 100644 +--- a/m4/cc-gcc.m4 ++++ b/m4/cc-gcc.m4 +@@ -1,5 +1,5 @@ + dnl -*- Autoconf -*- +-dnl Copyright (C) 1993-2017 Free Software Foundation, Inc. ++dnl Copyright (C) 1993-2024 Free Software Foundation, Inc. + dnl This file is free software, distributed under the terms of the GNU + dnl General Public License as published by the Free Software Foundation; + dnl either version 2 of the License, or (at your option) any later version. +@@ -27,6 +27,27 @@ AC_DEFUN([CL_CC_GCC], + if test $cl_cv_prog_cc_gcc = yes; then + CC_GCC=true + GCC_X_NONE='-x none' ++ ++ dnl On arm, there are two slightly different syntaxes for assembly language: ++ dnl The "divided" syntax (standard since ca. 2000) and the "unified" syntax ++ dnl (supported by GNU binutils since 2009). See ++ dnl https://sourceware.org/binutils/docs/as/ARM_002dInstruction_002dSet.html ++ dnl While GNU as and thus GCC supports both, clang by default uses an ++ dnl "integrated" assembler that supports only the "unified" syntax, leading ++ dnl to errors "error: invalid instruction" on instructions such as stmeqia. ++ dnl We therefore need to tell clang to use the external assembler. ++ AC_CACHE_CHECK([whether using clang], [cl_cv_prog_cc_clang], ++ [AC_EGREP_CPP([yes], ++ [#ifdef __clang__ ++ yes ++ #endif ++ ], ++ [cl_cv_prog_cc_clang=yes], ++ [cl_cv_prog_cc_clang=no]) ++ ]) ++ if test $cl_cv_prog_cc_clang = yes; then ++ GCC_X_NONE="$GCC_X_NONE -no-integrated-as" ++ fi + else + CC_GCC=false + GCC_X_NONE='' +-- +2.45.2 + diff --git a/dev-libs/ffcall/metadata.xml b/dev-libs/ffcall/metadata.xml index 8f3e6241df19..0ce3519235e9 100644 --- a/dev-libs/ffcall/metadata.xml +++ b/dev-libs/ffcall/metadata.xml @@ -25,6 +25,6 @@ callback - closures with variable arguments as first-class C functions (a reentrant combination of vacall and trampoline) </longdescription> <upstream> - <remote-id type="sourceforge">clisp</remote-id> + <remote-id type="cpe">cpe:/a:gnu:libffcall</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest index 0f63a83ddcfe..2de6565b447a 100644 --- a/dev-libs/intel-compute-runtime/Manifest +++ b/dev-libs/intel-compute-runtime/Manifest @@ -1,5 +1,5 @@ DIST intel-compute-runtime-24.35.30872.32.tar.gz 7376572 BLAKE2B af924c111d288621ddcb14b9d77ff384c632668705e4858ed27424522b6c96e1e7b54012b202c6ade64da668681f3089d0a35d64ecb97ddec642ace8774b3e47 SHA512 2ac8dbefcc1a86b33afd78b8a1d30a959fb980e47402852514d43503df87ea70ea35f192243b78faedce749b3087f244631080f16ddb099a93ec79698176f6b5 DIST intel-compute-runtime-25.09.32961.8.tar.gz 7567124 BLAKE2B 16eb850359309ab52aa8caf6f0acb5df99b10d93b7f0ee7eea45f71b22df027d2f3ee79e10ca97ffed339a1469c5912364a842c158b2e9fb1c5ea90b9710e2fe SHA512 992e41b4dd9da830f7b9240982ae0ea09d94e0d6e6eb426829b1a39dab63e99ec5a8bda424f46bbd6c9c0420fec30b7dd7b6cbd6567cabffdf2b3e2eafc96a7b -EBUILD intel-compute-runtime-24.35.30872.32.ebuild 2067 BLAKE2B 41102162ecb453b5ab09eca4e61464c683a9e21626a1a632dfcb8a28c7f9def988c3474ebb5b594dc6adbde7157191ab21700b066317bd515db137790bd9ac44 SHA512 8ad8578411698e8d6c45f502dd84ebde8ad34002d605f5f2e93764a625bd50a6bd88852d932ab6fab1ac5bc26eb10ef43dd85f8c120ec118bae3e522a80588a5 -EBUILD intel-compute-runtime-25.09.32961.8.ebuild 2062 BLAKE2B a77e8561d1bf12a2eaff0004e809722124d545619b2a061d2ad0dd3b9cfe861b4e4fee671f974d325588e8946925d0e35d332ae74b06698267186fc019fc9b58 SHA512 232c6fb74cf205c1e0d450ebb8f217a5b7bc7d4f79f904ce2cafa89ec4bd41ceb15e7b48b17f437c667010eafc495c6a637f0d34eab89c2e9b295dfb1f9d26c7 +EBUILD intel-compute-runtime-24.35.30872.32.ebuild 2116 BLAKE2B 68a92af3c8335b4fa6b02f884145bd7b9480e8bb5f9a25a4ce522b75169444205ba0620b7485df9152ede886ba9077bff7bf1cf752fc32e038e296bbe78ac779 SHA512 e10da18c852f38c6129bea09a65d89b68eb8a9dd5bc5706a733bfee41a0c8cbf892f43f9e6a2a3d911380207659d7af16eec0dea3d01a2b6b35afc39f19bfe83 +EBUILD intel-compute-runtime-25.09.32961.8-r1.ebuild 2106 BLAKE2B aa0c37d3c255a361adad8f8cb9f307f918795b2062bc591ef17e218f2120eef29a6d99b2e8d9e19c070f143369fc2cdd30892650b1e96d9293cc0eac27b27cac SHA512 0f910a4c2d5a161e6674393540a7d56fd424ce5dfc6e126d92b7201fe1abb73fb21ac4321477b2093133b87b03d53c0243ae5f8246006ce006e3e190aa14b340 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.32.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.32.ebuild index 7779047d4124..7328f899d296 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.32.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.32.ebuild @@ -15,12 +15,13 @@ SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P S="${WORKDIR}/${MY_P}" LICENSE="MIT" -SLOT="0/1.5.30872" +SLOT="legacy/1.5.30872" KEYWORDS="amd64" IUSE="+l0 +vaapi" RDEPEND=" - >=dev-util/intel-graphics-compiler-1.0.17791.18 + >=dev-util/intel-graphics-compiler-1.0.17791.18:legacy + !dev-util/intel-graphics-compiler:0 >=media-libs/gmmlib-22.5.2:= " diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-25.09.32961.8.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-25.09.32961.8-r1.ebuild index 2e44ebe9a9ee..25e16e8f0451 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-25.09.32961.8.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-25.09.32961.8-r1.ebuild @@ -20,7 +20,8 @@ KEYWORDS="~amd64" IUSE="+l0 +vaapi" RDEPEND=" - >=dev-util/intel-graphics-compiler-2.10.2 + >=dev-util/intel-graphics-compiler-2.10.2:0 + !dev-util/intel-graphics-compiler:legacy >=media-libs/gmmlib-22.7.1:= " diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest index 288c6adca86c..9b6c73ae683e 100644 --- a/dev-libs/level-zero/Manifest +++ b/dev-libs/level-zero/Manifest @@ -1,7 +1,3 @@ -DIST level-zero-1.20.6.tar.gz 918321 BLAKE2B 21936943bc3836adbd97bca673c554e49f1209cbb0cfe46672c833a6a4bdbea9e1be82a483bbbb38f6c2212ae79604446656b8c32a98fd472c6327610e84a2fd SHA512 128b5b2eafd28f4d1ebfab26743df3ed433e64f640c682c3a40e3d7f30fd25e5b6c9aa6661207d993d0ab0ece2490342489cf59c32b2eb7ab76d937519c7eed0 -DIST level-zero-1.21.1.tar.gz 922104 BLAKE2B 809ed5dbf2f39a57466eaea3fda229a6d2fdd2cd0d6fe83ebef111a7ee17bef15cb3390bac5ff93923b60a673c32ad8a07395c96bd1a78493e4e52b9e5f2f742 SHA512 584eec3601fd1eb826518a29302bcdecdc0ab3bac0d6ecb4bf6654aeec10cef04f4a57113c5734ede828191be956aa316a4e264bb807edd7e97f93b1364c708c DIST level-zero-1.21.2.tar.gz 924737 BLAKE2B cbcd845587035b5df29e8f1f95469ab9fe375470a12977deb554fe20ca7d2a6c65847c3702a1b38d8fe2ca68e694ef24e86808a8ec22071a54ac81a7fb47ad92 SHA512 eb2936cdaf983b8f9f991281e7d2fb8c5644ed131199bb10b4c5ff04ecbcf263473558447985b91df6bf2f847889a2b6555218a5de3e1925d1137508bf212f0b -EBUILD level-zero-1.20.6.ebuild 847 BLAKE2B ac0df5aabfe7bf9254d7b20d010fe55f8e1ed50c95e82f66686e98f2924a61d67456609ac3de91c625c8e18f8c983d59619dbe8a429dcaf5a8e08d534e022f26 SHA512 638f065118c672bc51d5e8ff47808208fef030a79e8d1a8e6e19653740239a91484dbb7d0627328d1a01bb494bbdb1fcabef335fa402cef63b7074176305740c -EBUILD level-zero-1.21.1.ebuild 848 BLAKE2B 50d777352fc6eaf2d223c91e80635ccb411ec45f8e168a939648f995588dfb321ef762028d802416bc8a45498d84bbaaca47e50348a27c23a07fd4cfb59dceed SHA512 427054bd9546a77f059b5c2e51f556dbc3562568958ba4ec824dac903fccd3dd3bcc8549cefb8121827033a28ec9a63e9f870fbca36bb47b773d1f5e5c3e662f -EBUILD level-zero-1.21.2.ebuild 848 BLAKE2B 50d777352fc6eaf2d223c91e80635ccb411ec45f8e168a939648f995588dfb321ef762028d802416bc8a45498d84bbaaca47e50348a27c23a07fd4cfb59dceed SHA512 427054bd9546a77f059b5c2e51f556dbc3562568958ba4ec824dac903fccd3dd3bcc8549cefb8121827033a28ec9a63e9f870fbca36bb47b773d1f5e5c3e662f +EBUILD level-zero-1.21.2.ebuild 847 BLAKE2B ac0df5aabfe7bf9254d7b20d010fe55f8e1ed50c95e82f66686e98f2924a61d67456609ac3de91c625c8e18f8c983d59619dbe8a429dcaf5a8e08d534e022f26 SHA512 638f065118c672bc51d5e8ff47808208fef030a79e8d1a8e6e19653740239a91484dbb7d0627328d1a01bb494bbdb1fcabef335fa402cef63b7074176305740c MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e diff --git a/dev-libs/level-zero/level-zero-1.20.6.ebuild b/dev-libs/level-zero/level-zero-1.20.6.ebuild deleted file mode 100644 index 3d4bf0c57a6f..000000000000 --- a/dev-libs/level-zero/level-zero-1.20.6.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="oneAPI Level Zero headers, loader and validation layer" -HOMEPAGE="https://github.com/oneapi-src/level-zero" -SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64" - -RDEPEND="dev-libs/spdlog:=" -DEPEND="${RDEPEND}" - -src_prepare() { - # Don't hardcore -Werror - sed -e 's/-Werror//g' -i CMakeLists.txt || die - - cmake_src_prepare - - # According to upstream, release tarballs should contain this file but at least - # some of them do not. Fortunately it is trivial to make one ourselves. - echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die -} - -src_configure() { - local mycmakeargs=( - -DSYSTEM_SPDLOG="ON" - ) - - cmake_src_configure -} diff --git a/dev-libs/level-zero/level-zero-1.21.1.ebuild b/dev-libs/level-zero/level-zero-1.21.1.ebuild deleted file mode 100644 index 7855ea438290..000000000000 --- a/dev-libs/level-zero/level-zero-1.21.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="oneAPI Level Zero headers, loader and validation layer" -HOMEPAGE="https://github.com/oneapi-src/level-zero" -SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" - -RDEPEND="dev-libs/spdlog:=" -DEPEND="${RDEPEND}" - -src_prepare() { - # Don't hardcore -Werror - sed -e 's/-Werror//g' -i CMakeLists.txt || die - - cmake_src_prepare - - # According to upstream, release tarballs should contain this file but at least - # some of them do not. Fortunately it is trivial to make one ourselves. - echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die -} - -src_configure() { - local mycmakeargs=( - -DSYSTEM_SPDLOG="ON" - ) - - cmake_src_configure -} diff --git a/dev-libs/level-zero/level-zero-1.21.2.ebuild b/dev-libs/level-zero/level-zero-1.21.2.ebuild index 7855ea438290..3d4bf0c57a6f 100644 --- a/dev-libs/level-zero/level-zero-1.21.2.ebuild +++ b/dev-libs/level-zero/level-zero-1.21.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND="dev-libs/spdlog:=" DEPEND="${RDEPEND}" diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest index 9c08fee7ac8b..700bbf8a93bc 100644 --- a/dev-libs/libbpf/Manifest +++ b/dev-libs/libbpf/Manifest @@ -8,6 +8,6 @@ EBUILD libbpf-0.8.1.ebuild 1147 BLAKE2B c0c10714096db810d25692acad787234592c5bba EBUILD libbpf-1.3.0.ebuild 1238 BLAKE2B 6926e0e5225dbd7309c2a798ccc1363dd44b0241ea53a386a85866ba6e5f1d349a677de4f6aab03baff1da5bc8d7a652e4da435041f12a403d98a58cccb1a9e4 SHA512 9fb7caf6e30f9ba9883e23fb5eb046132a8daa539672929e3512bb01363ede70a03ff3707f148ec420360774ba6f92230422a1e5e351568c6675c2f75ef4a787 EBUILD libbpf-1.3.2.ebuild 1251 BLAKE2B fcbc494ffb33028e683620340d5ccbfc95d3fc42808fb00efebc004803c837d229fd64457049ba7c727de9713861c3b7c18828010e720771ded5067e9dadd3e1 SHA512 113e2ad470ef92e461e7a3b7c9a2627858b68bae74211e2bb5c521a80c47873da6d287b3e6bf4a4e8d6c3b6485044b2f9e61b1a51ec4e4831aea1c7640b67630 EBUILD libbpf-1.4.5.ebuild 1244 BLAKE2B 26f24a80d2105864021e587deb91026307c04e371a7e479e49e4b05d66f9f19ad42456300391512fe507ec74362235e48a667c530c230e08990005f211c86190 SHA512 8c91e88b11fe73322025c2318e9c5780bf818e6501fb640273ffef80a2ee361cbb6a1d8d940ce722cbb976547b9e319c65e77ced9a2ec0582f4cae01276b9858 -EBUILD libbpf-1.5.0.ebuild 1250 BLAKE2B d0604773008dde90d14f6a202b4cece3a80f4389837cb5a99f0b75a3ada3de5ff86d496a59b57d48bee7adbb41234b394d67754518ceb1bc9adeef7f3255fce0 SHA512 eb24ed0f2f72a77ec0e077945fb04a282ab4915e50ead1bd1894b4d9de19fa43ee6a217cfdb47e91bae4f419cc16fc0abf4c86e0eab9ecc34c12116c1999a370 +EBUILD libbpf-1.5.0.ebuild 1244 BLAKE2B 26f24a80d2105864021e587deb91026307c04e371a7e479e49e4b05d66f9f19ad42456300391512fe507ec74362235e48a667c530c230e08990005f211c86190 SHA512 8c91e88b11fe73322025c2318e9c5780bf818e6501fb640273ffef80a2ee361cbb6a1d8d940ce722cbb976547b9e319c65e77ced9a2ec0582f4cae01276b9858 EBUILD libbpf-9999.ebuild 1245 BLAKE2B 1706a684e48f10e12cf3cfa6d8f809e8197cf8464c6d266425c2d7b501cb8130aab346eb5b006dfc5399a4e03d287b5557c5770f73e94d0cabc608ebba04d437 SHA512 fe39c6714dd55685b00d3db971d29f2bea386f0ac398cc9b503c2f04e5740fef4b3100a2003c4726fc2c0064a25d4e5fbed1f05a5154bcc739cd6cb65defefae MISC metadata.xml 306 BLAKE2B 6af2288a09cffb8801efe6841d11dae5e8f3659dd75be45f746bab3f48686458916dab796fd9d535e1a6fa0ca78567e8227e29ef06cc22c4a9d0b1cbebd30ab0 SHA512 c027c14965069ece90130984bab710dc19f199a184e834666449f4bc0874de3b5f5d878f3a1fe6f817a85eef2bc45914e640f0140878b7454a32738a7f500032 diff --git a/dev-libs/libbpf/libbpf-1.5.0.ebuild b/dev-libs/libbpf/libbpf-1.5.0.ebuild index 85766b0dcb76..b481220c5694 100644 --- a/dev-libs/libbpf/libbpf-1.5.0.ebuild +++ b/dev-libs/libbpf/libbpf-1.5.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi S="${WORKDIR}/${P}/src" diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest index 7bd3e605f41d..f51fcab24bd8 100644 --- a/dev-libs/libbson/Manifest +++ b/dev-libs/libbson/Manifest @@ -1,3 +1,6 @@ +AUX libbson-1.24.4-CVE-2023-0437.patch 768 BLAKE2B 8a4fb350325e23b69a77dc125de2600479077fcef5a0c7c50085b4e973126f98812a9ef63f53f2ba4ddac3f60b498156507a74fa728f9449d1172e46ed3e8dc1 SHA512 7ecf3f5f10cb1469e50bfc05abf691011ee706609a6abc7e589b2fba6653cbfc118928c37b613e07bebd39e0dbd83a377072a22d6817c4430ec6440bdda6f882 DIST libbson-1.24.4.tar.gz 7916661 BLAKE2B e361b52bf16eed7437428b0481d792ecf2f9cc283fdd6f23916d4a3ffb1b7d7c9ea7a7c4cf5f369e21fb6d4f564b91e07ac2ee44656855993218593dc4f1c166 SHA512 3563c061565d17a76581e188f6e184d7e41f2729812c8815afd34e03ebe6c1d25d7498a2cb1b599a09d24f6268c36473ef5113a14c7585a1532c9abf2e56e936 +DIST mongo-c-driver-1.24.4.tar.gz 7916661 BLAKE2B e361b52bf16eed7437428b0481d792ecf2f9cc283fdd6f23916d4a3ffb1b7d7c9ea7a7c4cf5f369e21fb6d4f564b91e07ac2ee44656855993218593dc4f1c166 SHA512 3563c061565d17a76581e188f6e184d7e41f2729812c8815afd34e03ebe6c1d25d7498a2cb1b599a09d24f6268c36473ef5113a14c7585a1532c9abf2e56e936 +EBUILD libbson-1.24.4-r1.ebuild 1409 BLAKE2B cda876dbd257442e69529c3d46527f05caa9269a16fd91fe81d0fb486095f86b244791a1b1c32c63fc9f7e804ad678904fdc878581893bfd7945841c7c3c0a0f SHA512 881c35e1d7421f338be7d1813dae3723533198be6f88d725f2c3c9c614f2860b29dd1a6c0626dd91810e110840fab2307d57efb1fe8b96d325aebc261e8be30b EBUILD libbson-1.24.4.ebuild 1102 BLAKE2B d0febec58998e31408b078b0c36cb9dbc52c3d8d9c5b6be51da9894fc013cceb4750d57769067bc3de79aee64b699d04c8abbbf583162120459ed7a39c743d42 SHA512 6ad1435f5fc844c475509205a094fc6fcc776320935ad0572a496927229f57b8deba339990475eb4841cef7bd3b67146a379df8269d5c363be058d5c2c92a23f -MISC metadata.xml 341 BLAKE2B ddeb43b42ef985263efa22e2ea22db33ab03c51aac7775baef0f4fea0f9441ec599eea7c62d65cd4f9f9a76853a97f4daab183103b1773a7daa1c84afbe10180 SHA512 925511347dd3d1d955ad86319b4c5560d5e759be66b7f9d127e4d47fb98fbd2fd625b373302c8d4170ae8bddfdbf0ce7b774dc89568d7aa6a19fbf95f23a4f75 +MISC metadata.xml 402 BLAKE2B 13d3814173f8e12463a50787ad4ec7841191d8bb269ecfa8d06d3b569fda304233cea5ec18c9d8e218af6654bc597b71386e9dadfa4e8c9f5ae0e98e31b4e80a SHA512 f1852dfadb69f6f7917ddf9147831a0d9185f66d318bb545f85cd258fe23f02aba93e89a5a52fb3831aef13f4df28fb6af9de438b8b7873a218993d9fc0f0a18 diff --git a/dev-libs/libbson/files/libbson-1.24.4-CVE-2023-0437.patch b/dev-libs/libbson/files/libbson-1.24.4-CVE-2023-0437.patch new file mode 100644 index 000000000000..d9ac4b171e40 --- /dev/null +++ b/dev-libs/libbson/files/libbson-1.24.4-CVE-2023-0437.patch @@ -0,0 +1,25 @@ +From be865dd759a28aa268232766f304d1bc11f1e8f7 Mon Sep 17 00:00:00 2001 +From: Kevin Albertson <kevin.albertson@mongodb.com> +Date: Mon, 30 Oct 2023 18:01:30 +0000 +Subject: [PATCH] CDRIVER-4747 use `size_t` consistently in + `bson_utf8_validate` (#1458) + +--- + src/libbson/src/bson/bson-utf8.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libbson/src/bson/bson-utf8.c b/src/libbson/src/bson/bson-utf8.c +index e122ac31f7..1cebd27069 100644 +--- a/src/libbson/src/bson/bson-utf8.c ++++ b/src/libbson/src/bson/bson-utf8.c +@@ -118,8 +118,8 @@ bson_utf8_validate (const char *utf8, /* IN */ + bson_unichar_t c; + uint8_t first_mask; + uint8_t seq_length; +- unsigned i; +- unsigned j; ++ size_t i; ++ size_t j; + + BSON_ASSERT (utf8); + diff --git a/dev-libs/libbson/libbson-1.24.4-r1.ebuild b/dev-libs/libbson/libbson-1.24.4-r1.ebuild new file mode 100644 index 000000000000..3a3050f47fca --- /dev/null +++ b/dev-libs/libbson/libbson-1.24.4-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} pypy3_11 ) + +inherit cmake python-any-r1 + +DESCRIPTION="Library routines related to building,parsing and iterating BSON documents" +HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson" +SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo-c-driver-${PV}.tar.gz" +S="${WORKDIR}/mongo-c-driver-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~ppc ~riscv ~sparc ~x86" +IUSE="examples static-libs" + +# tests are covered in mongo-c-driver and are not easily runnable in here +RESTRICT="test" + +BDEPEND=" + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ') +" + +PATCHES=( + "${FILESDIR}/${P}-CVE-2023-0437.patch" +) + +python_check_deps() { + python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +src_prepare() { + cmake_src_prepare + + # remove doc files + sed -i '/^\s*install\s*(FILES COPYING NEWS/,/^\s*)/ {d}' CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DENABLE_EXAMPLES=OFF + -DENABLE_MAN_PAGES=ON + -DENABLE_MONGOC=OFF + -DENABLE_TESTS=OFF + -DENABLE_STATIC="$(usex static-libs ON OFF)" + -DENABLE_UNINSTALL=OFF + ) + + cmake_src_configure +} + +src_install() { + if use examples; then + docinto examples + dodoc src/libbson/examples/*.c + fi + + cmake_src_install +} diff --git a/dev-libs/libbson/metadata.xml b/dev-libs/libbson/metadata.xml index c01295da36f6..dc70db85ec30 100644 --- a/dev-libs/libbson/metadata.xml +++ b/dev-libs/libbson/metadata.xml @@ -6,6 +6,7 @@ <name>Ultrabug</name> </maintainer> <upstream> + <remote-id type="cpe">cpe:/a:mongodb:libbson</remote-id> <remote-id type="github">mongodb/mongo-c-driver</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest index 2d18e7a03418..93282941f96c 100644 --- a/dev-libs/libdnet/Manifest +++ b/dev-libs/libdnet/Manifest @@ -1,4 +1,4 @@ -AUX libdnet-1.18.0-fix-incompatible-function-pointer.patch 4151 BLAKE2B 8da8a817ca8cacece72e42be69c9a3053bf58436700fd3664d0eb3ccd370c501272433700fdf23324dcd641a0b1d1c9929fe4b6eac5535660759790a600e8d86 SHA512 64c208929e843c53180b78c6aa645730e6b4f62a6a88863358585a3db00929bc32aca26d3610940decd3cb1720b78de2ab8dc7e19056aef8dc7530bba3c14cd7 +AUX libdnet-1.18.0-fix-incompatible-function-pointer.patch 7342 BLAKE2B 0254c52161f1e03cb9dc2e253f9b668fa8cd1bfe779f9bbe7f83d9b7bbbb410212a8bacf74e0b09964e48b9b4ab2b44105688484b9e3277a30342494731c25a8 SHA512 e6ea48a8a418327a7adfa0cced0bd41c907bca12d9d27c09de790165e85cd83b8bbd33ccb3401b6873898cb0047fcdb56fa14328d2f56febc7bb9a696ccc9e5a DIST libdnet-1.18.0.tar.gz 740145 BLAKE2B 67f9257e0a05c6c768609c288de9a8704a7ba9d66142bcf849929fa3dbc7b59e379cef2a917d01d4ccfa63b5dfffaf7225f9c67f94e6e91c528a3066fae8c933 SHA512 c074828a1ecd21c292f9120c7afb6b3c11e967d1e0aaca78e75a5558e96f5e65e0d24b68b8386c33c1c28734a3d30f5857d394796e049d521c8b4a9a2c8dcea9 EBUILD libdnet-1.18.0-r1.ebuild 1868 BLAKE2B 4f8e7856ff1bac545d1edd2807449c4d68b94c3c6c357c20d42d8ad581e13b8d0735cc8530cb26b38c37e89242d0005c4a0940942cd8df4a57a0e2a58690a74c SHA512 907829dccc306024b2cb957b44709d652a43bf9e3354467e259e42d8b6f42d86a59dcaad03c4f20c830f5a645bf7989b96560e97ad8c2598cbafbaa39bbc88df EBUILD libdnet-1.18.0-r2.ebuild 1956 BLAKE2B af70c76bd7dd0978bef35f6b7ca2720ce147114e2876fddb9fb322c83ba1938c7ec1ba4ad05230935e28f83a66ddb39b5555d57b2bc251cc34a048d6d0980984 SHA512 f655c6f75bb5900e5296dd946f342552a894885424571c0060c37ae46bfdebc1c4b5bb3347eddc1e7ae1aaa5988fc78178a827af2fa169bac82095762126eb5b diff --git a/dev-libs/libdnet/files/libdnet-1.18.0-fix-incompatible-function-pointer.patch b/dev-libs/libdnet/files/libdnet-1.18.0-fix-incompatible-function-pointer.patch index 054bb9853ce9..836296f3895f 100644 --- a/dev-libs/libdnet/files/libdnet-1.18.0-fix-incompatible-function-pointer.patch +++ b/dev-libs/libdnet/files/libdnet-1.18.0-fix-incompatible-function-pointer.patch @@ -3,13 +3,16 @@ https://github.com/ofalk/libdnet/pull/104 From de57a2349172148496386e284db91abe6406b02a Mon Sep 17 00:00:00 2001 From: "Z. Liu" <zhixu.liu@gmail.com> Date: Wed, 19 Feb 2025 11:37:37 +0800 -Subject: [PATCH] python/dnet.pyx: fix incompatible-function-pointer-types for - modern compiler +Subject: [PATCH 1/2] python/dnet.pyx: fix incompatible-function-pointer-types + for modern compiler which is error now, see https://bugs.gentoo.org/933360, clang 19 (maybe earlier) has the same problem too Signed-off-by: Z. Liu <zhixu.liu@gmail.com> +--- + python/dnet.pyx | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/python/dnet.pyx b/python/dnet.pyx index 4e3604f..04db2c6 100644 @@ -108,3 +111,73 @@ index 4e3604f..04db2c6 100644 -- 2.45.2 + +From 0a742400b2167f67067e13bfcbecb9f17a7eefe8 Mon Sep 17 00:00:00 2001 +From: "Z. Liu" <zhixu.liu@gmail.com> +Date: Thu, 3 Apr 2025 08:09:26 +0000 +Subject: [PATCH 2/2] python/dnet.pyx: fix -Wincompatible-pointer-types + reported by gcc14 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +./dnet.c:8451:52: error: passing argument 2 of ‘PyObject_AsReadBuffer’ from incompatible pointer type [-Wincompatible-pointer-types] + 8451 | __pyx_t_1 = (PyObject_AsReadBuffer(__pyx_v_pkt, (&__pyx_v_p), (&__pyx_v_n)) == 0); + | ~^~~~~~~~~~~ + | | + | char ** +/usr/include/python3.12/abstract.h:370:52: note: expected ‘const void **’ but argument is of type ‘char **’ + 370 | const void **buffer, + | ~~~~~~~~~~~~~^~~~~~ +./dnet.c:8451:66: error: passing argument 3 of ‘PyObject_AsReadBuffer’ from incompatible pointer type [-Wincompatible-pointer-types] + 8451 | __pyx_t_1 = (PyObject_AsReadBuffer(__pyx_v_pkt, (&__pyx_v_p), (&__pyx_v_n)) == 0); + | ~^~~~~~~~~~~ + | | + | int * +/usr/include/python3.12/abstract.h:371:51: note: expected ‘Py_ssize_t *’ {aka ‘long int *’} but argument is of type ‘int *’ + 371 | Py_ssize_t *buffer_len); + | ~~~~~~~~~~~~^~~~~~~~~~ + +Signed-off-by: Z. Liu <zhixu.liu@gmail.com> +--- + python/dnet.pyx | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/python/dnet.pyx b/python/dnet.pyx +index 04db2c6..6aefaa2 100644 +--- a/python/dnet.pyx ++++ b/python/dnet.pyx +@@ -25,7 +25,7 @@ cdef extern from "dnet.h": + cdef extern from "Python.h": + object PyBytes_FromStringAndSize(char *s, int len) + int PyBytes_Size(object o) +- int PyObject_AsReadBuffer(object o, char **pp, int *lenp) ++ int PyObject_AsReadBuffer(object o, const void **pp, ssize_t *lenp) + int PyLong_Check(object o) + int PyLong_Check(object o) + long PyLong_AsLong(object o) +@@ -294,8 +294,8 @@ def ip_checksum(pkt): + """ + cdef char buf[2048] + cdef char *p +- cdef int n +- if PyObject_AsReadBuffer(pkt, &p, &n) == 0: ++ cdef ssize_t n ++ if PyObject_AsReadBuffer(pkt, <const void **>&p, &n) == 0: + if n < 2048: + memcpy(buf, p, n) + __ip_checksum(buf, n) +@@ -310,8 +310,8 @@ def ip_checksum(pkt): + + def ip_cksum_add(buf, int sum): + cdef char *p +- cdef int n +- if PyObject_AsReadBuffer(buf, &p, &n) == 0: ++ cdef ssize_t n ++ if PyObject_AsReadBuffer(buf, <const void **>&p, &n) == 0: + return __ip_cksum_add(p, n, sum) + else: + raise TypeError +-- +2.45.2 + diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index b18970b2f6c1..f6f6c272b786 100644 --- a/dev-libs/libffi/Manifest +++ b/dev-libs/libffi/Manifest @@ -20,10 +20,12 @@ AUX libffi-3.4.7-Revert-Fix-x86-ffi64-calls-with-6-gp-and-some-sse-re.patch 1177 DIST libffi-3.4.4.tar.gz 1362394 BLAKE2B 189fe1ffe9507f204581b0ab09995dc7e7b761bb4eac7e338e9f5ff81431aebcef6c182c1839c9f9acb2706697a260c67e6d1351cf7e2aed7c4eb5d694f6f8fd SHA512 88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889 DIST libffi-3.4.6.tar.gz 1391684 BLAKE2B af8402a09bdbd59b4e9400d2d71bd5ce98f6f1d981d35d1ab40d77a831b13b32c5bd34ca54ff75999e39f0d8a9c066381fae7a8d6c5216d955e064f929f08b88 SHA512 033d2600e879b83c6bce0eb80f69c5f32aa775bf2e962c9d39fbd21226fa19d1e79173d8eaa0d0157014d54509ea73315ad86842356fc3a303c0831c94c6ab39 DIST libffi-3.4.7.tar.gz 1393979 BLAKE2B 0dd17b4fd358beb9842889168437443137445a5dba1f0a7e8669ae420d8efb927815c08602c1b1b141acfdfdbaa12b417863402a5c8df5f36519fd3e772d3f37 SHA512 d19f59a5b5d61bd7d9e8a7a74b8bf2e697201a19c247c410c789e93ca8678a4eb9f13c9bee19f129be80ade8514f6b1acb38d66f44d86edd32644ed7bbe31dd6 +DIST libffi-3.4.8.tar.gz 1397992 BLAKE2B 10b3d970dc598fb8689bca49751cda499ddc5216baf89d38625385b0d42d57f10d15cce3c4c044c9c73a4fce384c26f2a8e1b99269e9db1174c2631201c6bfd4 SHA512 05344c6c1a1a5b44704f6cf99277098d1ea3ac1dc11c2a691c501786a214f76184ec0637135588630db609ce79e49df3dbd00282dd61e7f21137afba70e24ffe EBUILD libffi-3.4.4-r4.ebuild 2540 BLAKE2B 6a85dd1d002e6ec61c57a4d5db58a20ff58e987da7ceb6630abfdd08ebd9f2fad574c29ab10d7a623310bb61b161e4c26c23a5d26af91e67bfa193d191e8a822 SHA512 f5d4049d6e5fe432321df11c0295a7bc579212eb5db54613d0ecc986975bdae1d9f26b9abcd9949db7e2efe156f4e5c9f8a90d870b9cf380308a848ad533c747 EBUILD libffi-3.4.6-r2.ebuild 2857 BLAKE2B 2093f9063231caac22da1644250a51cd4784a636fa0595532386dbee45d3cd0d7ccd0ed58b44652841b84cf5e11b9072af5605d8e5fb13c041773347d19bbf8e SHA512 9e2ecc7f9712576b79c18e5aa9ded1f977114a7211a6cd3e29e55a739404afb4c873b40d9014a4b8e8e1e4b469bc4f87ab19840f6607ade4f9791f3e38e158f5 EBUILD libffi-3.4.6-r3.ebuild 2791 BLAKE2B 40d0960dca2327fcc805e5a73125b92b363c62ca87adfb93f6fb22be06a585ec4f74e3c687adcb8004354a9e8de8af3f0b9fd68166b3e5de7f3232e30e57c56e SHA512 9ca523f3d6f376fe894e297885a29baa30c19ef00371d956533c0a1a8fdf6e8fa78110406bbf01de5fcd732cb7e6fcfc5702983ae16d08b6aac36c015d0dad1e EBUILD libffi-3.4.6.ebuild 2270 BLAKE2B a8af8687618bc1541f71db585727f33228b96c446729761accd7e2dc3ebd59de141e629371b97a3e7fc6e7c412f4696a7cac7e02ca8c271e103747f7c9d439b4 SHA512 6447b4fd561836bee7cd7148f1b2fdf7e100ffa292a1e94051aca03ed19acf5446f1db74241e6ecc445317f272b3773930f1184f25588658aa12234472897ce0 EBUILD libffi-3.4.7.ebuild 2534 BLAKE2B b834d3f2d3a44149e2d32068eac6072c373ee417cec4a28bf43682d8b80fe7a3deff4a69e31259e4372f9b12f270faa8d2df8e9425fab7d1af5a1ca57d7a78d9 SHA512 cf4af86505759d8d9ab948988a71bfebde8ca46f86a6cc71e77312a40aaa17916e4e1adc2d77a7f549c2abed0ae46e6518977883e3d34d263f9e7f7d18c53e3d +EBUILD libffi-3.4.8.ebuild 2435 BLAKE2B aca48a8185b3dcfca33d625e1cb295e6928316b3e7b0b9296e0364b1f8ad169a7279ac4dc97e720c795a1ca9062f76044a27678b5144478e491fba27dd428dff SHA512 1aabab732505ec334cfadafd445f03cce03a0ad2756d592f823698d1000648518c7555dc1a9c158a30ff0aea2adfe8aedcf77affdafdf9856bf81391b36c9a59 EBUILD libffi-9999.ebuild 2534 BLAKE2B b834d3f2d3a44149e2d32068eac6072c373ee417cec4a28bf43682d8b80fe7a3deff4a69e31259e4372f9b12f270faa8d2df8e9425fab7d1af5a1ca57d7a78d9 SHA512 cf4af86505759d8d9ab948988a71bfebde8ca46f86a6cc71e77312a40aaa17916e4e1adc2d77a7f549c2abed0ae46e6518977883e3d34d263f9e7f7d18c53e3d MISC metadata.xml 2110 BLAKE2B 2653be2cf09c047e45e489d7265d00165ddab2f94744988e4e8bca449bd1e40eeab74cb0b8d7d47a2d8b73563869460fcccb06e1fbccad697a9f213be362cb03 SHA512 e1a280792b929d38451fea1eb360053ed3a452592094f3e327ce4a4ff7eb8e0119435e8ee98f215585d8d98440512b5b68f92d1cd472a3bfd12e2f382e1981a1 diff --git a/dev-libs/libffi/libffi-3.4.8.ebuild b/dev-libs/libffi/libffi-3.4.8.ebuild new file mode 100644 index 000000000000..e000b77b4e7a --- /dev/null +++ b/dev-libs/libffi/libffi-3.4.8.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal preserve-libs + +MY_PV=${PV/_rc/-rc} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Portable, high level programming interface to various calling conventions" +HOMEPAGE="https://sourceware.org/libffi/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/libffi/libffi" + inherit autotools git-r3 +else + SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}"/${MY_P} + +LICENSE="MIT" +# This is a core package which is depended on by e.g. Python. +# Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users +# with FEATURES="-preserved-libs" or another package manager if SONAME changes. +SLOT="0/8" # SONAME=libffi.so.8 +IUSE="debug +exec-static-trampoline pax-kernel static-libs test" + +RESTRICT="!test? ( test )" +BDEPEND="test? ( dev-util/dejagnu )" + +src_prepare() { + default + + [[ ${PV} == 9999 ]] && eautoreconf + + if [[ ${CHOST} == arm64-*-darwin* ]] ; then + # ensure we use aarch64 asm, not x86 on arm64 + sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \ + configure configure.host || die + fi +} + +multilib_src_configure() { + # --includedir= path maintains a few properties: + # 1. have stable name across libffi versions: some packages like + # dev-lang/ghc or kde-frameworks/networkmanager-qt embed + # ${includedir} at build-time. Don't require those to be + # rebuilt unless SONAME changes. bug #695788 + # + # We use /usr/.../${PN} (instead of former /usr/.../${P}). + # + # 2. have ${ABI}-specific location as ffi.h is target-dependent. + # + # We use /usr/$(get_libdir)/... to have ABI identifier. + ECONF_SOURCE="${S}" econf \ + --includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \ + --disable-multi-os-directory \ + $(use_enable static-libs static) \ + $(use_enable exec-static-trampoline exec-static-tramp) \ + $(use_enable pax-kernel pax_emutramp) \ + $(use_enable debug) +} + +multilib_src_test() { + emake -Onone check +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name "*.la" -delete || die +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/libffi.so.7 +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/libffi.so.7 +} diff --git a/dev-libs/libkdumpfile/Manifest b/dev-libs/libkdumpfile/Manifest index 5e7b29427f3a..e8015de3bf04 100644 --- a/dev-libs/libkdumpfile/Manifest +++ b/dev-libs/libkdumpfile/Manifest @@ -1,9 +1,5 @@ -AUX libkdumpfile-0.5.4-32-bit-tests.patch 2197 BLAKE2B 3368b373a0e8e7127bc560fdfa5b370e4a42920c04d18d05a5c60bd29ad6b33703e52e0dcaa886bc91444f5e90a11e3a97e3d64692d26430d48df5c2b43e3c3b SHA512 6cc17ef0214f8fab33e6c36df457a11c2dd1feaa18804e93fde94c7e68fe96ba3ba6869231de3215a38944025741028d696ef679d44dbcbb24d2cd363ea537db -AUX libkdumpfile-0.5.4-c99.patch 1500 BLAKE2B f7879cf9d08660ce89ae3e771c36cbe07a51767288c6dbd36be2e97a795698ca381370f16d7a3ff134b147eb2c5c01efba0bf792c5da7637df6597a355f283a9 SHA512 5b67254f2f113ea6e86a4024917bf02683ae8c9a6757edbc01f26d107ff86ae30dc111285e66513f81e36fe32188b45d52927235198217de40c256ee2effadaa -AUX libkdumpfile-0.5.4-disabled-compression-tests.patch 2006 BLAKE2B b4c8555ca7ea47dc5f842c71dee21967d1044d874538b8f02d30f11e6dc10306ceab52de0b0e0d3e20182234ce0a2c6a2885a528831ca7fda0d4c753620f5848 SHA512 27bcd11b409bc547eaa125736015ca319a9fbaa720b078dc7eec0274ab95302dff231048404957dea5c4cfed2854909faf23df4126efcadb767e44c5926983c4 AUX libkdumpfile-0.5.5-bfd-include.patch 17521 BLAKE2B 2f900b524e6288cb2bca74f756ff35747704095ed4a9f28931105c24906a1e373c3d771cb9bb43957794348aa16dd3b37fbf9daf9f8187d836d97f598db9a7cf SHA512 9e9837c41815cdb5a7f1ddd9de06904aaf724c62cc1795c0d0a9586a3663f4d204e2971446fbed6ca6571f5fd5894330327081c4a2ac221fda44505faa54bde3 -DIST libkdumpfile-0.5.4.tar.bz2 623108 BLAKE2B 17a425c2a0545f60574255d5ec139f60a59dd2c9c047a89f9d021afe31cae959c691b550d9ad4e10c88a11f5f1bab1a4d94dab025060dcd2598837442281b3b9 SHA512 6cdd77e3460b324f4e0641fc8f4cf1dcd8b7de4ec82a37ca11e4edfa7730f90305c2724825f8b1cf8ac2e8ad104fee1b6a36775287b084db802ae2f44a55cd85 +AUX libkdumpfile-0.5.5-parallel-tests.patch 1749 BLAKE2B 471c88e980cfa210149351e9ed55ef0cb04fd2ac21108b16537b55d5e607356405f33066b790347c4714593d552524a12861f63cf35416515b9f3e00d2de005d SHA512 5f1c4daad659fbd626608ea9d89661dcd1d2f1b7e9eaa620c44d004cf5da1a81c0bcdb7b9e64aaf49d9663375ea03b47c0fc40bbbd9336d8438b2e1cbfac68e1 DIST libkdumpfile-0.5.5.tar.bz2 672321 BLAKE2B 41c2044ac7f11ab94b2c80771d28ded5dbd75693d3adffc84a96e9595b1a7b52229cac9ba6622e6715261a877fb7a90de570c791039287e6c44b8fa8e3c9e688 SHA512 35935bab7e7e9d5914b6f20efd545f89d89d7edf74c07e26057fdd07823aa73a87cde7765632289709b071d80501648c9373a202432f64ff469f95dd9a50adf3 -EBUILD libkdumpfile-0.5.4-r1.ebuild 1192 BLAKE2B 52aa2fb439d4924da30e7987c069254604371e972d832cebb919a24ed51b8dfb174bcebd58ae6b2d7cada02d0b00c3864262d0a7e3c039e9a132deade418cc28 SHA512 365a38362b7795d9166d00262f3d544b5f00f87376493682431ebac8662bd1d7b3183088aadea09be662e7087c36413d39675aa10ec7d02bcc30da07e165173b -EBUILD libkdumpfile-0.5.5-r2.ebuild 1047 BLAKE2B 25dc0972851b47a220e019ca35f60540ce169e9c45379abdc0d7e33f97434c518c3451e36669dda071a9181f073e731d1b5f5510d34822c6601edc2dd3746910 SHA512 747156864e23174bce4e05888c387416f6824d2dfb4dc89bae8dfb7395f76fb7056b5456fccc195aa5acd3166e123206dbb28103e5bcf8840bdc409ea16356b0 +EBUILD libkdumpfile-0.5.5-r2.ebuild 1086 BLAKE2B 0075a03c5692bcb2fd4a3ce9527309ad3b644d0a5a490e29513d3ef2291276bc094221af94356f86cbaf7b4bea956094c861f8b37d60836e13ee119a1645ed68 SHA512 b8f696911738931fe86cab5927d9407d87ab4f4a6640fdc6c2ad4a58e1c80896a5e4cec8f8c8be5acd23e823f44383e8bc35333e1470d31662be1b8599becf07 MISC metadata.xml 326 BLAKE2B 13b23cbf5c4089460907bebe9e73dad724bfea465300417f82d20748779d865459c6791d0a6d27237db88819690b4124235721c555895b3ca0a3aa5fa63ad2cf SHA512 aae2510a5c9a7662d7beaccef7c19b42be69e34bc0a2e6fb7f31d332ec7a5389f38aef97123b2f213bd4bb3376630b6989a6d71785f0198f563f9ce5d05cfdca diff --git a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-32-bit-tests.patch b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-32-bit-tests.patch deleted file mode 100644 index 4b5c0cb4c8fc..000000000000 --- a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-32-bit-tests.patch +++ /dev/null @@ -1,73 +0,0 @@ -https://github.com/ptesarik/libkdumpfile/commit/16c73b83a78c1bfb55f3e9823b09fce549c8ec11 - -From 16c73b83a78c1bfb55f3e9823b09fce549c8ec11 Mon Sep 17 00:00:00 2001 -From: Petr Tesarik <petr@tesarici.cz> -Date: Thu, 23 May 2024 13:01:17 +0200 -Subject: [PATCH] Fix file cache test for 32-bit architectures - -If 64-bit file offsets are selected with _FILE_OFFSET_BITS on a 32-bit -architecture, the default mmap() call takes a 64-bit off_t, but dlsym() -returns a pointer to a function that takes a 32-bit off_t. - -To fix it: - -- always call original mmap64() if it is available, -- use XSTRINGIFY(mmap) instead of "mmap". - -The latter is needed, because some systems define mmap as a macro which -expands to another identifier. - -Fixes: #80 -Signed-off-by: Petr Tesarik <petr@tesarici.cz> ---- - configure.ac | 2 ++ - src/kdumpfile/test-fcache.c | 13 ++++++++++++- - 3 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 04d1c6fa..93ebb39d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -61,6 +61,8 @@ AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(off_t) - AC_SUBST(SIZEOF_OFF_T, $ac_cv_sizeof_off_t) - -+AC_CHECK_FUNCS(mmap64) -+ - dnl This makes sure pkg.m4 is available. - m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) - -diff --git a/src/kdumpfile/test-fcache.c b/src/kdumpfile/test-fcache.c -index 1ed57447..604ed540 100644 ---- a/src/kdumpfile/test-fcache.c -+++ b/src/kdumpfile/test-fcache.c -@@ -64,9 +64,20 @@ static char *mmapbuf; - - static int failmmap; - -+#ifdef HAVE_MMAP64 -+ -+#define STR_MMAP XSTRINGIFY(mmap64) -+static void* (*orig_mmap)(void *addr, size_t length, int prot, int flags, -+ int fd, off64_t offset); -+ -+#else -+ -+#define STR_MMAP XSTRINGIFY(mmap) - static void* (*orig_mmap)(void *addr, size_t length, int prot, int flags, - int fd, off_t offset); - -+#endif -+ - void * - mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset) - { -@@ -445,7 +456,7 @@ main(int argc, char **argv) - return TEST_ERR; - } - -- orig_mmap = dlsym(RTLD_NEXT, "mmap"); -+ orig_mmap = dlsym(RTLD_NEXT, STR_MMAP); - if (!orig_mmap) { - fprintf(stderr, "Cannot get original mmap() address: %s\n", - dlerror()); diff --git a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-c99.patch b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-c99.patch deleted file mode 100644 index 959af60454ef..000000000000 --- a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-c99.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://github.com/ptesarik/libkdumpfile/commit/3682f5cad70146ab35d05af251d4461ef650b4b5 - -From 3682f5cad70146ab35d05af251d4461ef650b4b5 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Thu, 4 Jan 2024 12:36:53 +0100 -Subject: [PATCH] Python 3 does not have a tp_print member in PyTypeObject - -This avoids an int-conversion compiler error with current -compilers: - -./kdumpfile.c:1449:9: error: initialization of 'long int' from 'int (*)(PyObject *, FILE *, int)' {aka 'int (*)(struct _object *, FILE *, int)'} makes integer from pointer without a cast - 1449 | attr_dir_print, /* tp_print*/ - | ^~~~~~~~~~~~~~ - - -In Python 3.11, the field at this position is called tp_vectorcall_offset -and has type Py_ssize_t, hence the error. ---- a/python/kdumpfile.c -+++ b/python/kdumpfile.c -@@ -1143,7 +1143,6 @@ attr_dir_repr(PyObject *_self) - Py_XDECREF(colon); - return result; - } --#endif - - static int - attr_dir_print(PyObject *_self, FILE *fp, int flags) -@@ -1214,6 +1213,7 @@ attr_dir_print(PyObject *_self, FILE *fp, int flags) - kdump_attr_iter_end(ctx, &iter); - return -1; - } -+#endif - - static PyObject * - attr_iterkey_new(PyObject *_self) -@@ -1446,7 +1446,11 @@ static PyTypeObject attr_dir_object_type = - sizeof(char), /* tp_itemsize*/ - /* methods */ - attr_dir_dealloc, /* tp_dealloc*/ -+#if PY_MAJOR_VERSION < 3 - attr_dir_print, /* tp_print*/ -+#else -+ 0, -+#endif - 0, /* tp_getattr*/ - 0, /* tp_setattr*/ - 0, /* tp_compare*/ - diff --git a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-disabled-compression-tests.patch b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-disabled-compression-tests.patch deleted file mode 100644 index 5748a27e1e81..000000000000 --- a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-disabled-compression-tests.patch +++ /dev/null @@ -1,68 +0,0 @@ -https://github.com/ptesarik/libkdumpfile/commit/d529a573ab2cdbda501309e377007812e6de3351 - -From d529a573ab2cdbda501309e377007812e6de3351 Mon Sep 17 00:00:00 2001 -From: Stephen Brennan <stephen.s.brennan@oracle.com> -Date: Fri, 19 Jan 2024 11:52:24 -0800 -Subject: [PATCH] tests: skip tests which apply to disabled compression - -If configured --without-libzstd, for example, the diskdump-basic-zstd -test will return an ERROR code, causing "make check" to fail. Even using -XFAIL_TESTS will not resolve the error, because the return code is -ERROR, not FAIL. - -Instead, conditionally include the tests based on whether we are -compiling with each compression format. This way, we don't test -unsupported features. - -Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com> ---- - m4/compression.m4 | 1 + - tests/Makefile.am | 17 +++++++++++++---- - 2 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/m4/compression.m4 b/m4/compression.m4 -index 6755ef13..8cb7ce2d 100644 ---- a/m4/compression.m4 -+++ b/m4/compression.m4 -@@ -32,4 +32,5 @@ AC_SUBST([$2][_REQUIRES]) - AC_SUBST([$2][_CFLAGS]) - AC_SUBST([$2][_LIBS]) - AC_SUBST([$2][_PC_LIBS]) -+AM_CONDITIONAL(HAVE_$2, test "x$have_$1" = xyes) - ]) -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 0c03b20b..8ac90b39 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -196,10 +196,6 @@ test_scripts = \ - diskdump-empty-s390x \ - diskdump-empty-x86_64 \ - diskdump-basic-raw \ -- diskdump-basic-zlib \ -- diskdump-basic-lzo \ -- diskdump-basic-snappy \ -- diskdump-basic-zstd \ - diskdump-flat-raw \ - diskdump-multiread \ - diskdump-excluded \ -@@ -331,6 +327,19 @@ test_scripts = \ - xlat-xen-x86_64-4.6-bigmem \ - zero-size - -+if HAVE_ZSTD -+test_scripts += diskdump-basic-zstd -+endif -+if HAVE_ZLIB -+test_scripts += diskdump-basic-zlib -+endif -+if HAVE_LZO -+test_scripts += diskdump-basic-lzo -+endif -+if HAVE_SNAPPY -+test_scripts += diskdump-basic-snappy -+endif -+ - dist_check_DATA = \ - addrmap-single-begin.expect \ - addrmap-single-middle.expect \ - diff --git a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.5-parallel-tests.patch b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.5-parallel-tests.patch new file mode 100644 index 000000000000..20282a7a2df2 --- /dev/null +++ b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.5-parallel-tests.patch @@ -0,0 +1,55 @@ +https://github.com/ptesarik/libkdumpfile/commit/cc927b9e22ebe6de1a6ed23ca8d14d1f3d790fb5 + +From cc927b9e22ebe6de1a6ed23ca8d14d1f3d790fb5 Mon Sep 17 00:00:00 2001 +From: Petr Tesarik <petr@tesarici.cz> +Date: Fri, 27 Dec 2024 12:17:35 +0100 +Subject: [PATCH] tests: Fix xlat-linux-x86_64-6.11-pti-user-ver with parallel + runs + +The xlat-linux-x86_64-6.11-pti-user and xlat-linux-x86_64-6.11-pti-user-ver +test cases use the same input files, but the logic is flawed, because they +also use the same output file names. That fails if both run in parallel. + +Fixes: #85 +Signed-off-by: Petr Tesarik <petr@tesarici.cz> +--- + tests/xlat-linux-x86_64-6.11-pti-user-ver | 2 +- + tests/xlat-os-common | 11 ++++++----- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/tests/xlat-linux-x86_64-6.11-pti-user-ver b/tests/xlat-linux-x86_64-6.11-pti-user-ver +index 43d500d1..427985bc 100755 +--- a/tests/xlat-linux-x86_64-6.11-pti-user-ver ++++ b/tests/xlat-linux-x86_64-6.11-pti-user-ver +@@ -14,5 +14,5 @@ opts=( + osver=0x060b00 + ) + +-name=xlat-linux-x86_64-6.11-pti-user ++srcname=xlat-linux-x86_64-6.11-pti-user + . "$srcdir"/xlat-os-common +diff --git a/tests/xlat-os-common b/tests/xlat-os-common +index a308a743..7dcdee91 100644 +--- a/tests/xlat-os-common ++++ b/tests/xlat-os-common +@@ -4,13 +4,14 @@ + + mkdir -p out || exit 99 + +-if [ -z "$name" ]; then +- name=$( basename "$0" ) ++name=$( basename "$0" ) ++if [ -z "$srcname" ]; then ++ srcname="$name" + fi + resultfile="out/${name}.result" +-expectfile="$srcdir/$name.expect" +-symfile="$srcdir/$name.sym" +-datafile="$srcdir/$name.data" ++expectfile="$srcdir/$srcname.expect" ++symfile="$srcdir/$srcname.sym" ++datafile="$srcdir/$srcname.data" + cfgfile="out/${name}.cfg" + + optspec= + diff --git a/dev-libs/libkdumpfile/libkdumpfile-0.5.4-r1.ebuild b/dev-libs/libkdumpfile/libkdumpfile-0.5.4-r1.ebuild deleted file mode 100644 index a0f045ef6f41..000000000000 --- a/dev-libs/libkdumpfile/libkdumpfile-0.5.4-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Kernel coredump file access" -HOMEPAGE="https://github.com/ptesarik/libkdumpfile" -SRC_URI="https://github.com/ptesarik/libkdumpfile/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="|| ( LGPL-3+ GPL-2+ )" -SLOT="0" -KEYWORDS="~amd64" -IUSE="lzo snappy zlib zstd" - -DEPEND=" - lzo? ( dev-libs/lzo ) - snappy? ( app-arch/snappy:= ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-c99.patch - "${FILESDIR}"/${P}-disabled-compression-tests.patch - "${FILESDIR}"/${P}-32-bit-tests.patch -) - -src_prepare() { - default - - # Can drop on next release >0.5.4 - eautoreconf -} - -src_configure() { - local myeconfargs=( - # The Python bindings within libkdumpfile are deprecated - # and don't work w/ PEP517. There's a new CFFI bindings - # project we can use if anyone asks for them. - --without-python - $(use_with lzo lzo2) - $(use_with snappy) - $(use_with zlib) - $(use_with zstd libzstd) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libkdumpfile/libkdumpfile-0.5.5-r2.ebuild b/dev-libs/libkdumpfile/libkdumpfile-0.5.5-r2.ebuild index 2c9c9ab35874..f60bded6e070 100644 --- a/dev-libs/libkdumpfile/libkdumpfile-0.5.5-r2.ebuild +++ b/dev-libs/libkdumpfile/libkdumpfile-0.5.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,8 @@ RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-0.5.5-bfd-include.patch + "${FILESDIR}"/${P}-bfd-include.patch + "${FILESDIR}"/${P}-parallel-tests.patch ) src_configure() { diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest index fe4e274cf8e5..aef4ea1d572f 100644 --- a/dev-libs/mongo-c-driver/Manifest +++ b/dev-libs/mongo-c-driver/Manifest @@ -1,3 +1,4 @@ DIST mongo-c-driver-1.24.4.tar.gz 7916661 BLAKE2B e361b52bf16eed7437428b0481d792ecf2f9cc283fdd6f23916d4a3ffb1b7d7c9ea7a7c4cf5f369e21fb6d4f564b91e07ac2ee44656855993218593dc4f1c166 SHA512 3563c061565d17a76581e188f6e184d7e41f2729812c8815afd34e03ebe6c1d25d7498a2cb1b599a09d24f6268c36473ef5113a14c7585a1532c9abf2e56e936 +EBUILD mongo-c-driver-1.24.4-r1.ebuild 3019 BLAKE2B 4c742361ffca33fa3fe77b64b060acaeaa157d837fb97a28cb57d5d5e6f6efa1a81295cd487282782c5d7a9cdd197943eb1a035e980182ff62805dcacc3413db SHA512 3db26a6f56c76750799b790b76e53bb4c816dcc355718dacef6bde1ea8b0adf93aa545a1fc35b9d80fd05256fa1663fcd341743bb8ba0038a21eae6188c47c9d EBUILD mongo-c-driver-1.24.4.ebuild 2778 BLAKE2B a4018c0ddc04121d8684d1c21877009e6b33fdf35b20865ee2604accd47b28765b151e3e78a5a854ade9cc4c42f17d564335a41842710ad676d713c3d3a46bf6 SHA512 e3ff92096ca489c6acdd8d648a68744d7a76a9eeee07cc16c30f599456789b510779aaa3cebf8e00278b66f0848931d4738ee78fa3604e7780d248ec08c2b2a3 -MISC metadata.xml 335 BLAKE2B d7b8f44f6698d86dbad1ae9fc535f6c75acb827b07d32af1ba02c94da5196f00f1c3c2d2f519ca388d586867c6b033a3c53d3e3f5856ba32efed730c34316642 SHA512 7c0bf1f1f5065e82ebb03a00b68d41888fbdf4b92c67b116e46016490fbc74c5a44ca8f8245217a7926e85f5d53bc3bcab7499d5ceaf4d4593ab9953e36fc2a1 +MISC metadata.xml 528 BLAKE2B 761008bffc7d3453fc3deb649d5d8931eeb180a1514b764e8cf6be6b99264380ac1ea26912823b953d38c9f87ad0b1b9975077dc8344dbbcda4c2621ecead1e3 SHA512 2b10117ec3450ac31f473732c44ddfe05987a1d24fbdf2a30c1a7517269ef995ec6e6415cdb430deec4ab4357bcb1b31a72ea9b4b12f3d0f5bc3bdacb2427ad6 diff --git a/dev-libs/mongo-c-driver/metadata.xml b/dev-libs/mongo-c-driver/metadata.xml index 6969885d798c..f874ffe22648 100644 --- a/dev-libs/mongo-c-driver/metadata.xml +++ b/dev-libs/mongo-c-driver/metadata.xml @@ -5,7 +5,14 @@ <email>ultrabug@gentoo.org</email> <name>Alexys Jacob</name> </maintainer> + <use> + <flag name="test-full"> + Run test suite in full, including tests that run a local + database instance. + </flag> + </use> <upstream> + <remote-id type="cpe">cpe:/a:mongodb:c_driver</remote-id> <remote-id type="github">mongodb/mongo-c-driver</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4-r1.ebuild new file mode 100644 index 000000000000..352fb267a4f3 --- /dev/null +++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} pypy3_11 ) + +inherit cmake python-any-r1 + +DESCRIPTION="Client library written in C for MongoDB" +HOMEPAGE="https://github.com/mongodb/mongo-c-driver" +SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86" +IUSE="debug examples icu sasl ssl static-libs test +test-full" +REQUIRED_USE="test? ( static-libs )" + +RESTRICT="!test? ( test )" + +RDEPEND="app-arch/snappy:= + app-arch/zstd:= + ~dev-libs/libbson-${PV}[static-libs?] + dev-python/sphinx + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + sasl? ( dev-libs/cyrus-sasl:= ) + ssl? ( + dev-libs/openssl:= + )" +DEPEND=" + ${RDEPEND} + test? ( + dev-libs/libbson[static-libs] + test-full? ( + dev-db/mongodb + ) + ) +" +BDEPEND=" + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ') +" + +python_check_deps() { + python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +src_prepare() { + cmake_src_prepare + + # copy private headers for tests since we don't build libbson + if use test; then + mkdir -p src/libbson/tests/bson || die + cp src/libbson/src/bson/bson-*.h src/libbson/tests/bson/ || die + fi + + # remove doc files + sed -i '/^\s*install\s*(FILES COPYING NEWS/,/^\s*)/{d}' CMakeLists.txt || die + + # enable tests + sed -i '/message (STATUS "disabling test-libmongoc since using system libbson")/{d}' CMakeLists.txt || die + sed -i '/SET (ENABLE_TESTS OFF)/{d}' CMakeLists.txt || die + sed -i 's#<bson/bson-private.h>#"bson/bson-private.h"#' src/libbson/tests/test-bson.c || die +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath + -DUSE_SYSTEM_LIBBSON=ON + -DENABLE_EXAMPLES=OFF + -DENABLE_ICU="$(usex icu ON OFF)" + -DENABLE_MAN_PAGES=ON + -DENABLE_MONGOC=ON + -DENABLE_SNAPPY=ON + -DENABLE_ZLIB=SYSTEM + -DENABLE_SASL="$(usex sasl CYRUS OFF)" + -DENABLE_SSL="$(usex ssl $(usex ssl OPENSSL) OFF)" + -DENABLE_STATIC="$(usex static-libs ON OFF)" + -DENABLE_TESTS="$(usex test ON OFF)" + -DENABLE_TRACING="$(usex debug ON OFF)" + -DENABLE_UNINSTALL=OFF + -DENABLE_ZSTD=ON + ) + + cmake_src_configure +} + +src_test() { + export MONGOC_TEST_OFFLINE=on + export MONGOC_TEST_SKIP_MOCK=on + echo "/Samples" >> "${T}/skip-tests.txt" + if ! use test-full; then + export MONGOC_TEST_SKIP_LIVE=on + else + local PORT=27099 + export MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" + export MONGOC_ENABLE_MAJORITY_READ_CONCERN=on + LC_ALL=C \ + mongod --setParameter enableTestCommands=1 \ + --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket \ + --fork --dbpath="${T}"\ + --logpath="${T}/mongod.log" || die + fi + + ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc \ + --skip-tests "${T}/skip-tests.txt" || die + if use test-full; then + kill $(<"${T}/mongod.lock") + fi + +} + +src_install() { + if use examples; then + docinto examples + dodoc src/libmongoc/examples/*.c + fi + + cmake_src_install +} |