diff options
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/Manifest.gz | bin | 99685 -> 99674 bytes | |||
-rw-r--r-- | dev-libs/boost/Manifest | 5 | ||||
-rw-r--r-- | dev-libs/boost/boost-1.87.0-r3.ebuild (renamed from dev-libs/boost/boost-1.87.0-r1.ebuild) | 2 | ||||
-rw-r--r-- | dev-libs/boost/boost-1.87.0.ebuild | 344 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.87.0-smart_ptr-operator.patch | 40 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.87.0-thread-typo.patch | 28 | ||||
-rw-r--r-- | dev-libs/libuev/Manifest | 4 | ||||
-rw-r--r-- | dev-libs/libuev/libuev-2.3.2-r1.ebuild | 37 | ||||
-rw-r--r-- | dev-libs/libuev/libuev-2.4.0.ebuild | 24 | ||||
-rw-r--r-- | dev-libs/openssl/Manifest | 4 | ||||
-rw-r--r-- | dev-libs/openssl/openssl-3.5.0.ebuild | 293 | ||||
-rw-r--r-- | dev-libs/openssl/openssl-3.5.9999.ebuild | 293 | ||||
-rw-r--r-- | dev-libs/wayland-protocols/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/wayland-protocols/wayland-protocols-1.41.ebuild | 2 |
14 files changed, 665 insertions, 413 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 38abfb0894e9..d13a3c2b40fd 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 910aeb0d850c..3a7615632450 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -10,11 +10,12 @@ AUX boost-1.85.0-container-aliasing.patch 15219 BLAKE2B 438e5cbeed4626b22172722a AUX boost-1.85.0-python-numpy-2.patch 986 BLAKE2B 5f4cd317c75f8eb3183f720ac76afeffeb4f1e2617f32a795a94d9db56c7c27cba7a1b2591f2f851223b85ce962293bf54733e0d3f830340d2ef174a869284ed SHA512 46b3831acbd89980abc8312d8ba0a991d9c8531f0f8b63f5218ef8920fcf18b1ff207748abef2f3753baf6ea0932dc0c4ef524daec7fb265f64e35c5335f7a96 AUX boost-1.86.0-uuid-compute-backport.patch 1118 BLAKE2B 4fe636ec17f9dce29d37d8dafcbb4e5c45cdcbf1a867d127b44ea9a2c533f7c184f738ba08d244fecdd8805d1d6a91eaa17d1a024653148d8ac512522ee27f62 SHA512 d2eac74fb297618f185bccfd2921efa767901d1b2f3516385a0f3894cee3cee49a437e456eb4b656a5fe67278b02191b2fbca02e3d32ca3e1be211144a92253e AUX boost-1.87.0-move.patch 2611 BLAKE2B 7d184f1e2c20dfa254dec57b601422a3d2ca44766886bd51be582168729fedd2a426290e6267ddfc7685c85f4101d456999d7fb0de57740610fc84d7a112f32b SHA512 3141cea043907bb8d94c4bf0e7e46eca109841783701210a020037ffe43bbfe4102ac5cf03195dfefad80b3548abd76904784973e8d86f10f95ca9811712c7b9 +AUX boost-1.87.0-smart_ptr-operator.patch 1663 BLAKE2B a66be2ab0b62623242c5185e9d53514a6132d4f7d3b9306a93baeac1ab7c8533b248b29f345690247f15ad2e17e7ebfccd47a54e021fa8fcb2db888dcc5b7688 SHA512 a72188bb0ac227a48ac65f3c570f60ee7b1d23890603fdc8db2494df7489ec3d8837501c4a41cb42ba2dc29449fae0d986bcdc7613ccbb618dd490986d1e09bc +AUX boost-1.87.0-thread-typo.patch 889 BLAKE2B b3e1efbecb4bf809aa07c8e30977aeea747218c9881842b6a4f7d4d4f304b0094863ee1bd42ffa4cc432846d68c45ac6d025447d92f94537d8fd739c62345e6e SHA512 07e17f31604c6baac4f12ef63db3313bcc68dbfdbfaa9157314a58c03e52a13840822b494ed319dde306f8e78c99179b2faa8ea721549d0a0ed06a83e73b15d8 DIST boost_1_85_0.tar.bz2 124015250 BLAKE2B dd72a9299cd78d2c260e1c94e28ba04daaa352f5bd023d99e43caa3540b1e0f8c09fc04b91f68db0ef8532e4a91fdef0b66a80bf0f9f838303bccaf0729bf581 SHA512 b4489813a4192b57626589457932338cfc47c4ec05c19b3a58b2d8df9e95f022ff2f5f452811ff82d1cec4fb0a490e991c8825bad0fb5a81318d07a8788d8ca0 DIST boost_1_86_0.tar.bz2 126220652 BLAKE2B de3d262e3dc174813e8e9abc8fb083ae101949dbd3b818b1114457497607085dc998f6f0fdd095a87c38c90700761c825ce239b082144389507c0fec77d527dd SHA512 9f8144e07a44cc5b5be6c6da17b2e6f29f0637dda345764c89eac0bcb9ce2878469a7e6fcd2c96d25034937025768450b33fc14fb40470fa4806bfcf03330e75 DIST boost_1_87_0.tar.bz2 131473200 BLAKE2B 8bbd163ab2fcdd29e2dbe74fdab49b2c80b4ea58df40e39148d151911f2c81188e7fe44faf61905eddfc5615b5003932e0ea85a6527844f55ee121595173adfa SHA512 a2d5007953f67b816169efe0cf11675cd63fc6bae63f87ee1372515e57913ef6cf6ae8c3f2c400fef8ce63a035a02a0cad0da5acc29e977a85d458625b2a719c EBUILD boost-1.85.0-r1.ebuild 11716 BLAKE2B 996aa8d021a98f774cc995652eab02ba0d832ed5de84181e07d526267e60af89311450658bda9d5503870f7df16257358ca107bc914d5bf52a51d73b5d453c23 SHA512 5814a53c5d8a117ed468f8fe309c896df300e5b6deb644e0de419f99fabf2ebc4c258724b758d4c9a1543fbc2e61eb222b5fb3b76a441724a594d8f66ba90529 EBUILD boost-1.86.0-r1.ebuild 11388 BLAKE2B a7c1d65690a0971d16db8930a669f11b8a995551a9e3acca5447b222255505972c0115522c10fde1ca26bf4f9f4e3b6e59d2563d3c64c9970ed6472edd29a4bf SHA512 87700a1a472aa34f2e4f384cbd3b901cd8c0ce7c4b3ac936c9203536dd9e65d4f0572e27ac6d42b925f54bc829b7a9c72da8d8e603383cb86a8d057e3ae7fc58 -EBUILD boost-1.87.0-r1.ebuild 11209 BLAKE2B 2b280e098f1ef02d56ed5b137168674baceedc1b7cbc91fd2349b3de5a0aeb5c5408a22b42689d82924bd3e2e931d4f5a6dcbe6c59647f3d254b1a7c318fbf12 SHA512 88c2e2906db2c1a2081c956394382213a9fa713bad088bb49d0e5679fd82c77becba42054fb7d868ea87bd494c416b322bf1fd361ea46fe0959d34e437826615 -EBUILD boost-1.87.0.ebuild 11170 BLAKE2B ca57abbb41b1304a3b879c4dec60366991cab22ee8e331be179fd15e62ca10ad40eace4571af52a0d403675d863a14f793d5239d9a289c5981740049addacb9d SHA512 63b146d90c365441360e6786628cf2bd23a1c5a8585618865a3e85e53d33a784997b0918580f80ac47a28c90c9c0dbe57883ab757f2ecf7b0e4cc0000970c792 +EBUILD boost-1.87.0-r3.ebuild 11308 BLAKE2B fedbc49a2901762614ca786356a27eca42ef3f6174d4dc08466fc6a91fbb403cfc0d7f9d0b0ccb32de0b1a3a98ae1b8238f17fee521b976c4f0bb1085852a262 SHA512 6951e40060c30a1121a127ec0864d01e43f73d5b45830f49ca3bbd3b69e745904e5ecf8b42712ebf1c18331aeb1733e94f944b125ad4c97c0035561e8c7eac14 MISC metadata.xml 9162 BLAKE2B c8df087c7fe1e4af3a59f21763777d3f1318aebcd524e077b6a93c374e0910ff31b1e73b8b4908130d63c2bb7d060348602cffd215648f09afd8015c782e2340 SHA512 3c45d74e046e0fd09f152fcfa7af942c9097e3ed91a0915a2541caad14a8b94b9faceccdbc74bf8aa7c8f7b383db7e91e09babba9c2c28fd7855a7b809616839 diff --git a/dev-libs/boost/boost-1.87.0-r1.ebuild b/dev-libs/boost/boost-1.87.0-r3.ebuild index 8a57900a1cbd..fd197c65f52f 100644 --- a/dev-libs/boost/boost-1.87.0-r1.ebuild +++ b/dev-libs/boost/boost-1.87.0-r3.ebuild @@ -51,6 +51,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch "${FILESDIR}"/${PN}-1.87.0-move.patch + "${FILESDIR}"/${PN}-1.87.0-smart_ptr-operator.patch + "${FILESDIR}"/${PN}-1.87.0-thread-typo.patch ) create_user-config.jam() { diff --git a/dev-libs/boost/boost-1.87.0.ebuild b/dev-libs/boost/boost-1.87.0.ebuild deleted file mode 100644 index 01957b702836..000000000000 --- a/dev-libs/boost/boost-1.87.0.ebuild +++ /dev/null @@ -1,344 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Keep an eye on both of these after releases for patches: -# * https://www.boost.org/patches/ -# * https://www.boost.org/users/history/version_${MY_PV}.html -# (e.g. https://www.boost.org/users/history/version_1_83_0.html) -# Note that the latter may sometimes feature patches not on the former too. - -PYTHON_COMPAT=( python3_{10..13} ) - -inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal - -MY_PV="$(ver_rs 1- _)" - -DESCRIPTION="Boost Libraries for C++" -HOMEPAGE="https://www.boost.org/" -SRC_URI="https://archives.boost.io/release/${PV}/source/boost_${MY_PV}.tar.bz2" -S="${WORKDIR}/${PN}_${MY_PV}" - -LICENSE="Boost-1.0" -SLOT="0/${PV}" -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" -IUSE="bzip2 +context debug doc icu lzma +nls mpi numpy python +stacktrace tools zlib zstd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -# the tests will never fail because these are not intended as sanity -# tests at all. They are more a way for upstream to check their own code -# on new compilers. Since they would either be completely unreliable -# (failing for no good reason) or completely useless (never failing) -# there is no point in having them in the ebuild to begin with. -RESTRICT="test" - -RDEPEND=" - bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) - icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) - !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) - mpi? ( virtual/mpi[${MULTILIB_USEDEP},cxx,threads] ) - python? ( - ${PYTHON_DEPS} - numpy? ( dev-python/numpy:=[${PYTHON_USEDEP}] ) - ) - zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-build/b2-5.1.0" - -PATCHES=( - "${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch - "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch -) - -create_user-config.jam() { - local user_config_jam="${BUILD_DIR}"/user-config.jam - if [[ -s ${user_config_jam} ]]; then - einfo "${user_config_jam} already exists, skipping configuration" - return - else - einfo "Creating configuration in ${user_config_jam}" - fi - - local compiler compiler_version compiler_executable="$(tc-getCXX)" - compiler="gcc" - compiler_version="$(gcc-version)" - - if use mpi; then - local mpi_configuration="using mpi ;" - fi - - cat > "${user_config_jam}" <<- __EOF__ || die - using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CPPFLAGS} ${CFLAGS}" <cxxflags>"${CPPFLAGS} ${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ; - ${mpi_configuration} - __EOF__ - - if multilib_native_use python; then - append_to_user_config() { - local py_config - if tc-is-cross-compiler; then - py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;" - else - py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;" - fi - echo "${py_config}" >> "${user_config_jam}" || die - } - python_foreach_impl append_to_user_config - fi - - if multilib_native_use python && use numpy; then - einfo "Enabling support for NumPy extensions in Boost.Python" - else - einfo "Disabling support for NumPy extensions in Boost.Python" - - # Boost.Build does not allow for disabling of numpy - # extensions, thereby leading to automagic numpy - # https://github.com/boostorg/python/issues/111#issuecomment-280447482 - sed \ - -e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \ - -i "${BUILD_DIR}"/libs/python/build/Jamfile || die - fi -} - -pkg_setup() { - # Bail out on unsupported build configuration, bug #456792 - if [[ -f "${EROOT}"/etc/site-config.jam ]]; then - if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then - eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." - eerror "Boost can not be built in such configuration." - eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it." - die "Unsupported target in ${EROOT}/etc/site-config.jam" - fi - fi -} - -src_prepare() { - default - multilib_copy_sources -} - -ejam() { - create_user-config.jam - - local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" ) - if multilib_native_use python; then - append_to_b2_opts() { - b2_opts+=( python="${EPYTHON#python}" ) - } - python_foreach_impl append_to_b2_opts - else - b2_opts+=( --without-python ) - fi - b2_opts+=( "$@" ) - - echo b2 "${b2_opts[@]}" >&2 - b2 "${b2_opts[@]}" -} - -src_configure() { - # Workaround for too many parallel processes requested, bug #506064 - [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" - - # We don't want to end up with -L/usr/lib on our linker lines - # which then gives us lots of - # skipping incompatible /usr/lib/libc.a when searching for -lc - # warnings - [[ -n ${ESYSROOT} ]] && local icuarg="-sICU_PATH=${ESYSROOT}/usr" - - OPTIONS=( - $(usex debug gentoodebug gentoorelease) - "-j$(makeopts_jobs)" - -q - -d+2 - pch=off - $(usex icu "${icuarg}" '--disable-icu boost.locale.icu=off') - $(usev !mpi --without-mpi) - $(usev !nls --without-locale) - $(usev !context '--without-context --without-coroutine --without-fiber') - $(usev !stacktrace --without-stacktrace) - --boost-build="${BROOT}"/usr/share/b2/src - --layout=system - # building with threading=single is currently not possible - # https://svn.boost.org/trac/boost/ticket/7105 - threading=multi - link=shared - # this seems to be the only way to disable compression algorithms - # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build - -sNO_BZIP2=$(usex bzip2 0 1) - -sNO_LZMA=$(usex lzma 0 1) - -sNO_ZLIB=$(usex zlib 0 1) - -sNO_ZSTD=$(usex zstd 0 1) - boost.stacktrace.from_exception=off - ) - - if [[ ${CHOST} == *-darwin* ]]; then - # We need to add the prefix, and in two cases this exceeds, so prepare - # for the largest possible space allocation. - append-ldflags -Wl,-headerpad_max_install_names - fi - - # Use C++17 globally as of 1.80 - append-cxxflags -std=c++17 - - if [[ ${CHOST} != *-darwin* ]]; then - # On modern macOS, file I/O is already 64-bit by default, - # there's no support for special options like O_LARGEFILE. - # Thus, LFS must be disabled. - # - # On other systems, we need to enable LFS explicitly for 64-bit - # offsets on 32-bit hosts (#894564) - append-lfs-flags - fi -} - -multilib_src_compile() { - ejam \ - --prefix="${EPREFIX}"/usr \ - "${OPTIONS[@]}" || die - - if multilib_native_use tools; then - pushd tools >/dev/null || die - ejam \ - --prefix="${EPREFIX}"/usr \ - "${OPTIONS[@]}" \ - || die "Building of Boost tools failed" - popd >/dev/null || die - fi -} - -multilib_src_install() { - ejam \ - --prefix="${ED}"/usr \ - --includedir="${ED}"/usr/include \ - --libdir="${ED}"/usr/$(get_libdir) \ - "${OPTIONS[@]}" install || die "Installation of Boost libraries failed" - - if multilib_native_use tools; then - dobin dist/bin/* - - insinto /usr/share - doins -r dist/share/boostbook - fi - - # boost's build system truely sucks for not having a destdir. Because for - # this reason we are forced to build with a prefix that includes the - # DESTROOT, dynamic libraries on Darwin end messed up, referencing the - # DESTROOT instread of the actual EPREFIX. There is no way out of here - # but to do it the dirty way of manually setting the right install_names. - if [[ ${CHOST} == *-darwin* ]]; then - einfo "Working around completely broken build-system(tm)" - local d - for d in "${ED}"/usr/lib/*.dylib; do - if [[ -f ${d} ]]; then - # fix the "soname" - ebegin " correcting install_name of ${d#${ED}}" - install_name_tool -id "/${d#${D}}" "${d}" - eend $? - # fix references to other libs - # these paths look like this: - # bin.v2/libs/thread/build/gcc-12.1/gentoorelease/pch-off/ - # threadapi-pthread/threading-multi/visibility-hidden/ - # libboost_thread.dylib - refs=$(otool -XL "${d}" | \ - sed -e '1d' -e 's/^\t//' | \ - grep "libboost_" | \ - cut -f1 -d' ') - local r - for r in ${refs}; do - # strip path prefix from references, so we obtain - # something like libboost_thread.dylib. - local r_basename=${r##*/} - - ebegin " correcting reference to ${r_basename}" - install_name_tool -change \ - "${r}" \ - "${EPREFIX}/usr/lib/${r_basename}" \ - "${d}" - eend $? - done - fi - done - fi -} - -multilib_src_install_all() { - if ! use numpy; then - rm -r "${ED}"/usr/include/boost/python/numpy* || die - fi - - if use python; then - if use mpi; then - move_mpi_py_into_sitedir() { - python_moduleinto boost - - python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so - rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die - - python_optimize - } - python_foreach_impl move_mpi_py_into_sitedir - else - rm -r "${ED}"/usr/include/boost/mpi/python* || die - fi - else - rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die - fi - - if ! use nls; then - rm -r "${ED}"/usr/include/boost/locale || die - fi - - if ! use context; then - rm -r "${ED}"/usr/include/boost/context || die - rm -r "${ED}"/usr/include/boost/coroutine{,2} || die - rm "${ED}"/usr/include/boost/asio/spawn.hpp || die - fi - - if use doc; then - # find extraneous files that shouldn't be installed - # as part of the documentation and remove them. - find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die - find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die - find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die - - docinto html - dodoc *.{htm,html,png,css} - dodoc -r doc libs more tools - - # To avoid broken links - dodoc LICENSE_1_0.txt - - dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost - fi -} - -pkg_preinst() { - # Yay for having symlinks that are nigh-impossible to remove without - # resorting to dirty hacks like these. Removes lingering symlinks - # from the slotted versions. - local symlink - for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do - if [[ -L ${symlink} ]]; then - rm -f "${symlink}" || die - fi - done - - # some ancient installs still have boost cruft lying around - # for unknown reasons, causing havoc for reverse dependencies - # Bug: 607734 - rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die -} - -pkg_postinst() { - elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as" - elog - elog " undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation" - elog " <char>::transform_primary[abi:cxx11](char const*, char const*) const'" - elog - elog "Then you need to recompile Boost and all its reverse dependencies" - elog "using the same toolchain. In general, *every* change of the C++ toolchain" - elog "requires a complete rebuild of the Boost-dependent ecosystem." - elog - elog "See for instance https://bugs.gentoo.org/638138" -} diff --git a/dev-libs/boost/files/boost-1.87.0-smart_ptr-operator.patch b/dev-libs/boost/files/boost-1.87.0-smart_ptr-operator.patch new file mode 100644 index 000000000000..6a008d528a65 --- /dev/null +++ b/dev-libs/boost/files/boost-1.87.0-smart_ptr-operator.patch @@ -0,0 +1,40 @@ +https://github.com/boostorg/smart_ptr/issues/115 +https://github.com/boostorg/smart_ptr/commit/e7433ba54596da97cb7859455cd37ca140305a9c + +From e7433ba54596da97cb7859455cd37ca140305a9c Mon Sep 17 00:00:00 2001 +From: Peter Dimov <pdimov@gmail.com> +Date: Mon, 13 Jan 2025 16:13:04 +0200 +Subject: [PATCH] Fix operator<< for shared_ptr and intrusive_ptr. Fixes #115. + +--- + include/boost/smart_ptr/intrusive_ptr.hpp | 2 +- + include/boost/smart_ptr/shared_ptr.hpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git boost/smart_ptr/intrusive_ptr.hpp boost/smart_ptr/intrusive_ptr.hpp +index ddb20c0b0e..11b476513a 100644 +--- a/boost/smart_ptr/intrusive_ptr.hpp ++++ b/boost/smart_ptr/intrusive_ptr.hpp +@@ -285,7 +285,7 @@ template<class T, class U> intrusive_ptr<T> dynamic_pointer_cast( intrusive_ptr< + + // operator<< + +-template<class Y> std::ostream & operator<< (std::ostream & os, intrusive_ptr<Y> const & p) ++template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, intrusive_ptr<Y> const & p) + { + os << p.get(); + return os; +diff --git boost/smart_ptr/shared_ptr.hpp boost/smart_ptr/shared_ptr.hpp +index 2431a33590..2deed9b632 100644 +--- a/boost/smart_ptr/shared_ptr.hpp ++++ b/boost/smart_ptr/shared_ptr.hpp +@@ -775,7 +775,7 @@ template<class T> inline typename shared_ptr<T>::element_type * get_pointer(shar + + // operator<< + +-template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p) ++template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, shared_ptr<Y> const & p) + { + os << p.get(); + return os; + diff --git a/dev-libs/boost/files/boost-1.87.0-thread-typo.patch b/dev-libs/boost/files/boost-1.87.0-thread-typo.patch new file mode 100644 index 000000000000..2674cffe9367 --- /dev/null +++ b/dev-libs/boost/files/boost-1.87.0-thread-typo.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/945916 +https://github.com/boostorg/thread/pull/408 + +From 49ccf9c30a0ca556873dbf64b12b0d741d1b3e66 Mon Sep 17 00:00:00 2001 +From: Arvid Norlander <arvid-norlander@users.noreply.github.com> +Date: Fri, 8 Nov 2024 16:48:43 +0100 +Subject: [PATCH] Fix build on clang-19 (which checks more things in + uninstantiated templates) + +Fixes issue #402 +--- + include/boost/thread/future.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/boost/thread/future.hpp b/include/boost/thread/future.hpp +index 00f504b9b..d15d7ffa5 100644 +--- a/boost/thread/future.hpp ++++ b/boost/thread/future.hpp +@@ -4668,7 +4668,7 @@ namespace detail + } + run_it& operator=(BOOST_THREAD_RV_REF(run_it) x) BOOST_NOEXCEPT { + if (this != &x) { +- that_=x.that; ++ that_=x.that_; + x.that_.reset(); + } + return *this; + diff --git a/dev-libs/libuev/Manifest b/dev-libs/libuev/Manifest index 4d2b5f010bf9..b9b52dd152ac 100644 --- a/dev-libs/libuev/Manifest +++ b/dev-libs/libuev/Manifest @@ -1,9 +1,5 @@ AUX libuev-fix-tests.patch 378 BLAKE2B fd5f675e9734e10be8c136b44ee8eeb3ef7ce3a4182051c2e38009e004d8854a97c266ec126b5037f66f95961eb485ac5fd2922f8dbdb9a9134f7c2b3df05775 SHA512 85fb791829d08ec42725157f8d90b7101b8520f9c25fe5207db1baec53d340574298f4d288f0940ef4bf3eff447452b98cd0336051f0f87fbe92946d8977f701 AUX libuev-large-files-fix.patch 412 BLAKE2B 4deb78a3702c0dfa2fc0bb86b21be32abb5e94d3a14a37f5385845cbc8661404a8c896ac1de800e7ddce63af2e1072558f3740af9ebcc349dc52c5228205d04f SHA512 a4536d9f0bc4b877a6e0fd8b404e740f0de492b6a083b59a58da6cae5090f421d2306fcb20644fa3833dc7f07db27f7f3e14bd4d1e01ea33dc34b193822ed603 -DIST libuev-2.3.2.tar.xz 247784 BLAKE2B 30f9ca2d71c2f05173d4c5863e0dce64e7a77987e3472b11ac5f3ecf677712ddc5fe9e9cc9587f73d6a5acfb716d02dfa744bb301d55b834d44e944bf09f3bd0 SHA512 dccf83ea61dd4841d2b7e1e75b8c46f41607b26aeefd49bc3d594d864408a282c2ff4cf6ff84cf596fe3382c02e53631593f12d5b79afd9f2e57fb9d021b60a8 -DIST libuev-2.4.0.tar.xz 281344 BLAKE2B b3bc81205510729b73e52717eb647c37b446d6c947032e09480413a8a52e93b0dc6539189639aca9e045b1c48dcb34e3115c074f41b8f1d716815a8f8a5ac08a SHA512 0f33ca8f8ce43fb746befdc09585db5bfeabc3bd1aac7e336e01ed21baaf58f3ce618feb34e7ef4e692708cc182b09edfa920b43647a7a61dc3c33eaf87d3c31 DIST libuev-2.4.1.tar.xz 285528 BLAKE2B 4867564adde9a994096413d410ce8beb911089ee6124ecab5ad5325aa7f05a363cbd9fd556305a20b21417f267f2c4683e2c2a534ce855cfcd9d961cfa631494 SHA512 a08aa6a5a92f8059851e4a9881502113fa309ce6398a20f0ae2c33f83e6e0d9e6468b49d6cb76753f470322745b9b309509ed4230bd819cdc023418c8be9a589 -EBUILD libuev-2.3.2-r1.ebuild 748 BLAKE2B 79116713035e509f1bd113755dda16ed2e39d8628f58115010f5e5124d9d75fa8362c444894321e94b2e2bee0d039f9018d6863a315fc88d2b78c66e4aeb11f8 SHA512 2088a9bb455953c2e839c0507544adeca41051b785a37944dd88f67b5bfcd359c372491bea28b6d042675ee9d702a40c1c68043592be0fbbd57956e586ddcc76 -EBUILD libuev-2.4.0.ebuild 572 BLAKE2B 07819a4c359ac519df0d91ce6a52ed92ea440e922b8f6c55b718338a65e78d7652271c6c6622d2602ec0672b70fb5fefb2f3bd17daa9be1d169510f45eb701d1 SHA512 a4bb3ee4bf91543a22277c491511d252d214ecc63908b36c73db06ccdbb43151d77de47e4c593705376240ae8084e116c52b07664681962429c5ac0ab8bd5105 EBUILD libuev-2.4.1.ebuild 572 BLAKE2B ed7d9d03711d2fef23381fd0cf2a9a6d55877f492d6a69605df5ce0ca9a5d3744ec4717dc391be1ff4172b907b974895464662f8e361a05c2e4e7a0b68423f2c SHA512 7161f1d27b39a60a78be750cfa6e799c238693ca98850af9743cc30190d00b331e3cbf416e1da0af20044e3c5012df45ddb947e0849aeadb510c9d21c824966c MISC metadata.xml 728 BLAKE2B 53b2361b48ee3ec6aefd2df57085086744ae67b1e88a2327d22e3c608165e3147209639d9ed44c4a0fb5fdda85c970d4140211b6f4a3508a079e67b4073a78a6 SHA512 ead8ab50cf78faaade004f31faaa6c5090df43e95afe917d0ca302af45adfa9f6724f14c955bb5685f3434749e1593e1271eed707ffaeace9c2960b31dab81f6 diff --git a/dev-libs/libuev/libuev-2.3.2-r1.ebuild b/dev-libs/libuev/libuev-2.3.2-r1.ebuild deleted file mode 100644 index f8a20c0605ff..000000000000 --- a/dev-libs/libuev/libuev-2.3.2-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Lightweight event loop library for Linux epoll() family APIs" -HOMEPAGE="https://github.com/troglobit/libuev" -SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="static-libs" - -PATCHES=( - "${FILESDIR}/${PN}"-fix-tests.patch - "${FILESDIR}/${PN}"-large-files-fix.patch -) - -src_prepare() { - default - - # Needed for glibc/LFS patches - eautoreconf -} - -src_configure() { - econf --enable-static=$(usex static-libs) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - rm "${D}/usr/share/doc/${PF}/LICENSE" || die -} diff --git a/dev-libs/libuev/libuev-2.4.0.ebuild b/dev-libs/libuev/libuev-2.4.0.ebuild deleted file mode 100644 index 011168732e7f..000000000000 --- a/dev-libs/libuev/libuev-2.4.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Lightweight event loop library for Linux epoll() family APIs" -HOMEPAGE="https://github.com/troglobit/libuev" -SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="static-libs" - -src_configure() { - econf --enable-static=$(usex static-libs) -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - rm "${ED}"/usr/share/doc/${PF}/LICENSE || die -} diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 2f4c10bcc957..90f38ebc991c 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -18,6 +18,8 @@ DIST openssl-3.3.3.tar.gz 18102481 BLAKE2B c2033e357963e339faaf3b35b18c660da4861 DIST openssl-3.3.3.tar.gz.asc 833 BLAKE2B dbb8436f7e8e015eca740ccddcbfc159884089c7540e47d03d65efcc607a28d29889f7eaf53412e50362d201941df3061e7877b6216215d4cab04bdb149d23a7 SHA512 2fde16310fc0a2985ea9df5b8485c17391a589297679687634b833b453e9c5d04ddb3b8b4f117259af9b13813ca0ea9ee6cec2d854dfc7e1add3dbb78962ccd0 DIST openssl-3.4.1.tar.gz 18346056 BLAKE2B 328a2a4f0536b15ffe6421afc99bdb5dcdf3d29f44437fdd80bbf4089f5f2658ca10907e033eda2e04c6b862e49b150ea59d8ab1807d14a3dcf64e10c32e78af SHA512 1de6307c587686711f05d1e96731c43526fa3af51e4cd94c06c880954b67f6eb4c7db3177f0ea5937d41bc1f8cadcf5bce75025b5c1a46a469376960f1001c5f DIST openssl-3.4.1.tar.gz.asc 833 BLAKE2B 321a5593ce5a1ff07553dcca722b0da0e9e9f3ef639176d663b6a92be2a32d3379536a788930f7f78dccc4e4d4922fe696f8d1bd65aa54f51c3c75accad34b1f SHA512 b007d5a35a7904d5d5e053e232a54b2ba75fb43f80bf1fe2175528e86e31cca8161da09d7417b50359008ce1955497e4d11c46794f15cc7c3220aa92eff99ccb +DIST openssl-3.5.0.tar.gz 53136912 BLAKE2B 9bf55ad242863123ec117296ff4d3067a27da9e0aa104a70203009536440198bacbb155c6431801e139dee6deaf6a26e0ac9a5e71fdcf963d00ba3ec7434440f SHA512 39cc80e2843a2ee30f3f5de25cd9d0f759ad8de71b0b39f5a679afaaa74f4eb58d285ae50e29e4a27b139b49343ac91d1f05478f96fb0c6b150f16d7b634676f +DIST openssl-3.5.0.tar.gz.asc 833 BLAKE2B 3c92d7f08ae64b175140215be633e72b80fb49de0ef3485ab0738999fa339b40ca09bdc3ae9fb4b0738ae7182b3d5821cb4d04811796775e6648621fcfc8941b SHA512 6a73755c34f4caabf531d2b4335bf1c800548b41c6e6436ed4bf3ab25cf7c01f1a0594d641deac7e1aa66c3beed00091265d49c2711dadaacd8bba1ce2075d02 EBUILD openssl-1.0.2u-r1.ebuild 9768 BLAKE2B 46d26e3dd92c898c6fe715e5d07b4e2e9c3e3a66d3566798774d1d30ca267c8815beb1a777c75d555060934761c43f7b92d89fca73617262ea33a7cab96d44e6 SHA512 3888a1bc9a604bbbd04dd4bc843ba79dbadc85d8a396dde3d657bc05423478f225896c5274b883c309a9b79da42738342a83bba9f7157cda16e46c6a8b7ba84b EBUILD openssl-1.1.1w.ebuild 8230 BLAKE2B 6f6b6e79512141bac0507e76e61d341ccc4088c6f86a7979c48401d78dec8d6e90b54a73af63a956d1704fdda8ffc9c83f4a06254f6be51b8569f2856dfae2b3 SHA512 81087aa984e4b385da11d8c533a31ddb39c49c96b1e9e281ae57c6901c148cc8e226475b650ea58db8cb629f344c2449cd581aae548f7c30829ceb8b55897fa4 EBUILD openssl-3.0.16.ebuild 8692 BLAKE2B 3e851d34dfcb09eb098caf657aab659fcb33dfd1bff7ae4b61afb829b3befdf24d845b90cde05c896793b5b99a029f5db1b4d51233797ba5fe2d0171b783d7f0 SHA512 a8939722fc7066b338d3b70839207a6780ad11fd76b879a8a8453e8bade3faef67f8c5131606e1c599d3b3e76bd9e83ab2456a61c4699ec36cf3df3bd21b6300 @@ -30,4 +32,6 @@ EBUILD openssl-3.3.3.ebuild 9171 BLAKE2B 7f3800118aeb6ff72cd9091cc1db40c3f21e0fc EBUILD openssl-3.3.9999.ebuild 9117 BLAKE2B 0ea48090d34a85fd8002dd3a36c533199c3f145ef0d7784468d8ca1aa81b531ac55a63cf9e55a035f2cb15f03baeccfcf96c7de94e45f0d2e35567a35c00e50e SHA512 f09b49a4615f615d0ed4c93b4f84e37ad543764dab9ef9ff20f4561507a3da3b90a0aeb1511fc6773e42b3ff574d1da276b5776bbc924453562e6ce5fa1b6822 EBUILD openssl-3.4.1.ebuild 9117 BLAKE2B 0ea48090d34a85fd8002dd3a36c533199c3f145ef0d7784468d8ca1aa81b531ac55a63cf9e55a035f2cb15f03baeccfcf96c7de94e45f0d2e35567a35c00e50e SHA512 f09b49a4615f615d0ed4c93b4f84e37ad543764dab9ef9ff20f4561507a3da3b90a0aeb1511fc6773e42b3ff574d1da276b5776bbc924453562e6ce5fa1b6822 EBUILD openssl-3.4.9999.ebuild 9117 BLAKE2B 0ea48090d34a85fd8002dd3a36c533199c3f145ef0d7784468d8ca1aa81b531ac55a63cf9e55a035f2cb15f03baeccfcf96c7de94e45f0d2e35567a35c00e50e SHA512 f09b49a4615f615d0ed4c93b4f84e37ad543764dab9ef9ff20f4561507a3da3b90a0aeb1511fc6773e42b3ff574d1da276b5776bbc924453562e6ce5fa1b6822 +EBUILD openssl-3.5.0.ebuild 9120 BLAKE2B 368aef5a81ae92dae2b5c85f723687f93d847a8b4514ff65b98281f319fa610384fde7c6eee66db79b2ad42396e174aeab5eb98cf32bf1aa3ed2cb96344f04da SHA512 0ee32c07b8a0b7985e7530a4cb233f599443cd44d58d4e896c4e7c1e75e5430fb7c5e230e474a601f1c1a586ec8d877968b1d88b7c01884bfc0f69a921fa1b58 +EBUILD openssl-3.5.9999.ebuild 9117 BLAKE2B 0ea48090d34a85fd8002dd3a36c533199c3f145ef0d7784468d8ca1aa81b531ac55a63cf9e55a035f2cb15f03baeccfcf96c7de94e45f0d2e35567a35c00e50e SHA512 f09b49a4615f615d0ed4c93b4f84e37ad543764dab9ef9ff20f4561507a3da3b90a0aeb1511fc6773e42b3ff574d1da276b5776bbc924453562e6ce5fa1b6822 MISC metadata.xml 1674 BLAKE2B 2195a6538e1b4ec953c707460988f153e40abe7495fd761403c9a54b44ecb7cb5c69ac37ac7d4d18bc0086cf9b4accaaac19926fe5b2ac4b2c547ce1c9e08a6d SHA512 d4eda999c1027f9d8102c59275665f5b01d234c4a7636755a6d3c64b9aad2a657d14256b1527d9b7067cb653458b058db7f5bb20873e48927291092d9ccdd1c6 diff --git a/dev-libs/openssl/openssl-3.5.0.ebuild b/dev-libs/openssl/openssl-3.5.0.ebuild new file mode 100644 index 000000000000..feb4d056141d --- /dev/null +++ b/dev-libs/openssl/openssl-3.5.0.ebuild @@ -0,0 +1,293 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc +inherit edo flag-o-matic linux-info toolchain-funcs +inherit multilib multilib-minimal multiprocessing preserve-libs + +DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" +HOMEPAGE="https://openssl-library.org/" + +MY_P=${P/_/-} + +if [[ ${PV} == *9999 ]] ; then + [[ ${PV} == *.*.9999 ]] && EGIT_BRANCH="openssl-${PV%%.9999}" + EGIT_REPO_URI="https://github.com/openssl/openssl.git" + + inherit git-r3 +else + inherit verify-sig + SRC_URI=" + https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz + verify-sig? ( + https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc + ) + " + + #if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then + # KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + #fi + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )" +fi + +S="${WORKDIR}"/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto +IUSE="+asm cpu_flags_x86_sse2 fips ktls +quic rfc3779 sctp static-libs test tls-compression vanilla weak-ssl-ciphers" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + !<net-misc/openssh-9.2_p1-r3 + tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) +" +BDEPEND+=" + >=dev-lang/perl-5 + sctp? ( >=net-misc/lksctp-tools-1.0.12 ) + test? ( + sys-apps/diffutils + app-alternatives/bc + sys-process/procps + ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +PDEPEND="app-misc/ca-certificates" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/openssl/configuration.h +) + +pkg_setup() { + if use ktls ; then + if kernel_is -lt 4 18 ; then + ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" + else + CONFIG_CHECK="~TLS ~TLS_DEVICE" + ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" + ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" + use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" + + linux-info_pkg_setup + fi + fi + + [[ ${MERGE_TYPE} == binary ]] && return + + # must check in pkg_setup; sysctl doesn't work with userpriv! + if use test && use sctp ; then + # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" + # if sctp.auth_enable is not enabled. + local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) + if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then + die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" + fi + fi +} + +src_prepare() { + # Make sure we only ever touch Makefile.org and avoid patching a file + # that gets blown away anyways by the Configure script in src_configure + rm -f Makefile || die + + if ! use vanilla ; then + PATCHES+=( + # Add patches which are Gentoo-specific customisations here + ) + fi + + default + + if use test && use sctp && has network-sandbox ${FEATURES} ; then + einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." + rm test/recipes/80-test_ssl_new.t || die + fi + + # Test fails depending on kernel configuration, bug #699134 + rm test/recipes/30-test_afalg.t || die +} + +src_configure() { + # Keep this in sync with app-misc/c_rehash + SSL_CNF_DIR="/etc/ssl" + + # Quiet out unknown driver argument warnings since openssl + # doesn't have well-split CFLAGS and we're making it even worse + # and 'make depend' uses -Werror for added fun (bug #417795 again) + tc-is-clang && append-flags -Qunused-arguments + + # We really, really need to build OpenSSL w/ strict aliasing disabled. + # It's filled with violations and it *will* result in miscompiled + # code. This has been in the ebuild for > 10 years but even in 2022, + # it's still relevant: + # - https://github.com/llvm/llvm-project/issues/55255 + # - https://github.com/openssl/openssl/issues/12247 + # - https://github.com/openssl/openssl/issues/18225 + # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 + # Don't remove the no strict aliasing bits below! + filter-flags -fstrict-aliasing + append-flags -fno-strict-aliasing + # The OpenSSL developers don't test with LTO right now, it leads to various + # warnings/errors (which may or may not be false positives), it's considered + # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663. + filter-lto + + append-flags $(test-flags-CC -Wa,--noexecstack) + + # bug #895308 -- check inserts GNU ld-compatible arguments + [[ ${CHOST} == *-darwin* ]] || append-atomic-flags + # Configure doesn't respect LIBS + export LDLIBS="${LIBS}" + + # bug #197996 + unset APPS + # bug #312551 + unset SCRIPTS + # bug #311473 + unset CROSS_COMPILE + + tc-export AR CC CXX RANLIB RC + + multilib-minimal_src_configure +} + +multilib_src_configure() { + use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } + + local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") + + # See if our toolchain supports __uint128_t. If so, it's 64bit + # friendly and can use the nicely optimized code paths, bug #460790. + #local ec_nistp_64_gcc_128 + # + # Disable it for now though (bug #469976) + # Do NOT re-enable without substantial discussion first! + # + #echo "__uint128_t i;" > "${T}"/128.c + #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then + # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" + #fi + + local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") + einfo "Using configuration: ${sslout:-(openssl knows best)}" + + # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features + local myeconfargs=( + ${sslout} + + $(multilib_is_native_abi || echo "no-docs") + $(use cpu_flags_x86_sse2 || echo "no-sse2") + enable-camellia + enable-ec + enable-ec2m + enable-sm2 + enable-srp + $(use elibc_musl && echo "no-async") + enable-idea + enable-mdc2 + enable-rc5 + $(use fips && echo "enable-fips") + $(use quic && echo "enable-quic") + $(use_ssl asm) + $(use_ssl ktls) + $(use_ssl rfc3779) + $(use_ssl sctp) + $(use test || echo "no-tests") + $(use_ssl tls-compression zlib) + $(use_ssl weak-ssl-ciphers) + + --prefix="${EPREFIX}"/usr + --openssldir="${EPREFIX}"${SSL_CNF_DIR} + --libdir=$(get_libdir) + + shared + threads + ) + + edo perl "${S}/Configure" "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake build_sw +} + +multilib_src_test() { + # See https://github.com/openssl/openssl/blob/master/test/README.md for options. + # + # VFP = show subtests verbosely and show failed tests verbosely + # Normal V=1 would show everything verbosely but this slows things down. + # + # -j1 here for https://github.com/openssl/openssl/issues/21999, but it + # shouldn't matter as tests were already built earlier, and HARNESS_JOBS + # controls running the tests. + emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test +} + +multilib_src_install() { + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake DESTDIR="${D}" -j1 install_sw + if use fips; then + emake DESTDIR="${D}" -j1 install_fips + # Regen this in pkg_preinst, bug 900625 + rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die + fi + + if multilib_is_native_abi; then + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs + fi + + # This is crappy in that the static archives are still built even + # when USE=static-libs. But this is due to a failing in the openssl + # build system: the static archives are built as PIC all the time. + # Only way around this would be to manually configure+compile openssl + # twice; once with shared lib support enabled and once without. + if ! use static-libs ; then + rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die + fi +} + +multilib_src_install_all() { + # openssl installs perl version of c_rehash by default, but + # we provide a shell version via app-misc/c_rehash + rm "${ED}"/usr/bin/c_rehash || die + + dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el + + # Create the certs directory + keepdir ${SSL_CNF_DIR}/certs + + # bug #254521 + dodir /etc/sandbox.d + echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl + + diropts -m0700 + keepdir ${SSL_CNF_DIR}/private +} + +pkg_preinst() { + if use fips; then + # Regen fipsmodule.cnf, bug 900625 + ebegin "Running openssl fipsinstall" + "${ED}/usr/bin/openssl" fipsinstall -quiet \ + -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ + -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" + eend $? + fi + + preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ + /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) +} + +pkg_postinst() { + ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" + openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" + eend $? + + preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ + /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) +} diff --git a/dev-libs/openssl/openssl-3.5.9999.ebuild b/dev-libs/openssl/openssl-3.5.9999.ebuild new file mode 100644 index 000000000000..41de3131f213 --- /dev/null +++ b/dev-libs/openssl/openssl-3.5.9999.ebuild @@ -0,0 +1,293 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc +inherit edo flag-o-matic linux-info toolchain-funcs +inherit multilib multilib-minimal multiprocessing preserve-libs + +DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" +HOMEPAGE="https://openssl-library.org/" + +MY_P=${P/_/-} + +if [[ ${PV} == *9999 ]] ; then + [[ ${PV} == *.*.9999 ]] && EGIT_BRANCH="openssl-${PV%%.9999}" + EGIT_REPO_URI="https://github.com/openssl/openssl.git" + + inherit git-r3 +else + inherit verify-sig + SRC_URI=" + https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz + verify-sig? ( + https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc + ) + " + + if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )" +fi + +S="${WORKDIR}"/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto +IUSE="+asm cpu_flags_x86_sse2 fips ktls +quic rfc3779 sctp static-libs test tls-compression vanilla weak-ssl-ciphers" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + !<net-misc/openssh-9.2_p1-r3 + tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) +" +BDEPEND+=" + >=dev-lang/perl-5 + sctp? ( >=net-misc/lksctp-tools-1.0.12 ) + test? ( + sys-apps/diffutils + app-alternatives/bc + sys-process/procps + ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +PDEPEND="app-misc/ca-certificates" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/openssl/configuration.h +) + +pkg_setup() { + if use ktls ; then + if kernel_is -lt 4 18 ; then + ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" + else + CONFIG_CHECK="~TLS ~TLS_DEVICE" + ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" + ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" + use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" + + linux-info_pkg_setup + fi + fi + + [[ ${MERGE_TYPE} == binary ]] && return + + # must check in pkg_setup; sysctl doesn't work with userpriv! + if use test && use sctp ; then + # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" + # if sctp.auth_enable is not enabled. + local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) + if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then + die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" + fi + fi +} + +src_prepare() { + # Make sure we only ever touch Makefile.org and avoid patching a file + # that gets blown away anyways by the Configure script in src_configure + rm -f Makefile || die + + if ! use vanilla ; then + PATCHES+=( + # Add patches which are Gentoo-specific customisations here + ) + fi + + default + + if use test && use sctp && has network-sandbox ${FEATURES} ; then + einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." + rm test/recipes/80-test_ssl_new.t || die + fi + + # Test fails depending on kernel configuration, bug #699134 + rm test/recipes/30-test_afalg.t || die +} + +src_configure() { + # Keep this in sync with app-misc/c_rehash + SSL_CNF_DIR="/etc/ssl" + + # Quiet out unknown driver argument warnings since openssl + # doesn't have well-split CFLAGS and we're making it even worse + # and 'make depend' uses -Werror for added fun (bug #417795 again) + tc-is-clang && append-flags -Qunused-arguments + + # We really, really need to build OpenSSL w/ strict aliasing disabled. + # It's filled with violations and it *will* result in miscompiled + # code. This has been in the ebuild for > 10 years but even in 2022, + # it's still relevant: + # - https://github.com/llvm/llvm-project/issues/55255 + # - https://github.com/openssl/openssl/issues/12247 + # - https://github.com/openssl/openssl/issues/18225 + # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 + # Don't remove the no strict aliasing bits below! + filter-flags -fstrict-aliasing + append-flags -fno-strict-aliasing + # The OpenSSL developers don't test with LTO right now, it leads to various + # warnings/errors (which may or may not be false positives), it's considered + # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663. + filter-lto + + append-flags $(test-flags-CC -Wa,--noexecstack) + + # bug #895308 -- check inserts GNU ld-compatible arguments + [[ ${CHOST} == *-darwin* ]] || append-atomic-flags + # Configure doesn't respect LIBS + export LDLIBS="${LIBS}" + + # bug #197996 + unset APPS + # bug #312551 + unset SCRIPTS + # bug #311473 + unset CROSS_COMPILE + + tc-export AR CC CXX RANLIB RC + + multilib-minimal_src_configure +} + +multilib_src_configure() { + use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } + + local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") + + # See if our toolchain supports __uint128_t. If so, it's 64bit + # friendly and can use the nicely optimized code paths, bug #460790. + #local ec_nistp_64_gcc_128 + # + # Disable it for now though (bug #469976) + # Do NOT re-enable without substantial discussion first! + # + #echo "__uint128_t i;" > "${T}"/128.c + #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then + # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" + #fi + + local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") + einfo "Using configuration: ${sslout:-(openssl knows best)}" + + # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features + local myeconfargs=( + ${sslout} + + $(multilib_is_native_abi || echo "no-docs") + $(use cpu_flags_x86_sse2 || echo "no-sse2") + enable-camellia + enable-ec + enable-ec2m + enable-sm2 + enable-srp + $(use elibc_musl && echo "no-async") + enable-idea + enable-mdc2 + enable-rc5 + $(use fips && echo "enable-fips") + $(use quic && echo "enable-quic") + $(use_ssl asm) + $(use_ssl ktls) + $(use_ssl rfc3779) + $(use_ssl sctp) + $(use test || echo "no-tests") + $(use_ssl tls-compression zlib) + $(use_ssl weak-ssl-ciphers) + + --prefix="${EPREFIX}"/usr + --openssldir="${EPREFIX}"${SSL_CNF_DIR} + --libdir=$(get_libdir) + + shared + threads + ) + + edo perl "${S}/Configure" "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake build_sw +} + +multilib_src_test() { + # See https://github.com/openssl/openssl/blob/master/test/README.md for options. + # + # VFP = show subtests verbosely and show failed tests verbosely + # Normal V=1 would show everything verbosely but this slows things down. + # + # -j1 here for https://github.com/openssl/openssl/issues/21999, but it + # shouldn't matter as tests were already built earlier, and HARNESS_JOBS + # controls running the tests. + emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test +} + +multilib_src_install() { + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake DESTDIR="${D}" -j1 install_sw + if use fips; then + emake DESTDIR="${D}" -j1 install_fips + # Regen this in pkg_preinst, bug 900625 + rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die + fi + + if multilib_is_native_abi; then + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs + fi + + # This is crappy in that the static archives are still built even + # when USE=static-libs. But this is due to a failing in the openssl + # build system: the static archives are built as PIC all the time. + # Only way around this would be to manually configure+compile openssl + # twice; once with shared lib support enabled and once without. + if ! use static-libs ; then + rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die + fi +} + +multilib_src_install_all() { + # openssl installs perl version of c_rehash by default, but + # we provide a shell version via app-misc/c_rehash + rm "${ED}"/usr/bin/c_rehash || die + + dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el + + # Create the certs directory + keepdir ${SSL_CNF_DIR}/certs + + # bug #254521 + dodir /etc/sandbox.d + echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl + + diropts -m0700 + keepdir ${SSL_CNF_DIR}/private +} + +pkg_preinst() { + if use fips; then + # Regen fipsmodule.cnf, bug 900625 + ebegin "Running openssl fipsinstall" + "${ED}/usr/bin/openssl" fipsinstall -quiet \ + -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ + -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" + eend $? + fi + + preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ + /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) +} + +pkg_postinst() { + ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" + openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" + eend $? + + preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ + /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) +} diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest index 6b66b67977d1..ab3f00ba13df 100644 --- a/dev-libs/wayland-protocols/Manifest +++ b/dev-libs/wayland-protocols/Manifest @@ -5,7 +5,7 @@ DIST wayland-protocols-1.42.tar.xz 121168 BLAKE2B 7dc9cf43f82ee7522419327eaeaa36 DIST wayland-protocols-1.43.tar.xz 121860 BLAKE2B a13d62e6870e70d1ffdf2e8ca97f4ab09e500e1b0f552fe05e5ce51325b40c050d6ab86260dc6778e191582d797f08909cfe77ea733f119f622082a974133fd0 SHA512 e568ef57d169235426044c1dcffe1e55daaa0ac6071e72e20e50f509d7d506a01fb49a394954308d5e8d329482e74d0d0a326f11e1c8b4c628453db2adea7274 EBUILD wayland-protocols-1.38.ebuild 769 BLAKE2B c2a4d37a807bba72de674824610a0a8128390d876af363e86ffd6f2234a5a647fa36e85ec358c0bc8768dd46e2e7f9ba65a809a871144cd57e9b3ea63353de5b SHA512 cb18b4fc2ab33815005544ee2b2cd2f69b633e70c57aa4beb94d21cd51b266dba7821f24cdc0f2691f1ef6e85c83b2fa0ec2e1c440c8419bbf02b23c7ba13796 EBUILD wayland-protocols-1.39.ebuild 778 BLAKE2B 16e0d05aebffaa5468173ba94b9716f08fbb8e856c731c2aaf15f2f7f3ce021381e8a2f8f3bd85571dc4248e9f2de0ef540a94e3b10bdcbbd60b17e6f9bdad38 SHA512 4cf179a757063df5b4fdaa7e577e4e87527ac2ec11dc2ddc9198605899a90b438a9456f0cc58b6d0dbef3cd5fc2935c063ec3f1eaaeed45cc89e3d01d3c8eb96 -EBUILD wayland-protocols-1.41.ebuild 785 BLAKE2B 516aaa8cdc7ddd6dea0ba637007fb9cebd0167ab621f69d7eb5fbc36ec23c91d395054d4aa1d414072542039c12746e6819f294944aa36874d054ae260fdfe84 SHA512 c25aab9122161bee4ebd8d903726a445946413ed3cc897fc1f0da1f4112cf70a0bfc7267102a5c908fb32b981f84394db32a57b014c9e6bfd49fba6147516ba0 +EBUILD wayland-protocols-1.41.ebuild 780 BLAKE2B be491b5f43dcfdf60edb669b3ee3716df4b9e35fada50a73ae5a06d2b77169550f0cda4c179435cb488157279a591acf34e49c6bdb62df96fe1f199b077baa24 SHA512 703fcf373f1bbe012a6da7f753f17b4a041fead00e478534ae7ea38a1b0584f3057f1473f297183e34e31c6746ef7644f9066c7d02fdfe0099ff1dca71877ea3 EBUILD wayland-protocols-1.42.ebuild 785 BLAKE2B 516aaa8cdc7ddd6dea0ba637007fb9cebd0167ab621f69d7eb5fbc36ec23c91d395054d4aa1d414072542039c12746e6819f294944aa36874d054ae260fdfe84 SHA512 c25aab9122161bee4ebd8d903726a445946413ed3cc897fc1f0da1f4112cf70a0bfc7267102a5c908fb32b981f84394db32a57b014c9e6bfd49fba6147516ba0 EBUILD wayland-protocols-1.43.ebuild 785 BLAKE2B 516aaa8cdc7ddd6dea0ba637007fb9cebd0167ab621f69d7eb5fbc36ec23c91d395054d4aa1d414072542039c12746e6819f294944aa36874d054ae260fdfe84 SHA512 c25aab9122161bee4ebd8d903726a445946413ed3cc897fc1f0da1f4112cf70a0bfc7267102a5c908fb32b981f84394db32a57b014c9e6bfd49fba6147516ba0 EBUILD wayland-protocols-9999.ebuild 785 BLAKE2B d6d355660e85518b18aa11ab4cdd37ab7e496ce6f91a92cece804e02c4b212ce98ac90e817767aa9061fb3a2ff7986a8b3e71a5f987fe6bf622787ecc94b28e8 SHA512 00f6eddf096ba24aca61fc25200f8e9a8a6bc1b1101b464445f98067bf81b4b078436d25d9d6f5b0f44b0fd3caa54acf6c90848ab548f3130e40f0da695314cb diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.41.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.41.ebuild index 88fd7ea8817d..b6c7a2261275 100644 --- a/dev-libs/wayland-protocols/wayland-protocols-1.41.ebuild +++ b/dev-libs/wayland-protocols/wayland-protocols-1.41.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz" - 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 LICENSE="MIT" |