diff options
Diffstat (limited to 'net-libs')
1021 files changed, 24110 insertions, 21490 deletions
diff --git a/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild b/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild index 1156f64a3ad3..91bb7a91e214 100644 --- a/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild +++ b/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,12 +6,12 @@ EAPI=7 inherit flag-o-matic java-pkg-2 toolchain-funcs DESCRIPTION="NativeThread for priorities on linux for freenet" -HOMEPAGE="https://www.freenetproject.org/" +HOMEPAGE="https://github.com/hyphanet/contrib/blob/master/README" SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" CDEPEND=" dev-java/jna:4 diff --git a/net-libs/NativeThread/metadata.xml b/net-libs/NativeThread/metadata.xml index 8e4916babcbf..31ab7867766f 100644 --- a/net-libs/NativeThread/metadata.xml +++ b/net-libs/NativeThread/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>tommy@gentoo.org</email> - <name>Thomas Sachau (Tommy[D])</name> - </maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">hyphanet/contrib</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/accounts-qml/Manifest b/net-libs/accounts-qml/Manifest index fa099087241c..89f2b085af73 100644 --- a/net-libs/accounts-qml/Manifest +++ b/net-libs/accounts-qml/Manifest @@ -1 +1,3 @@ +DIST accounts-qml-0.7-patches-1.tar.xz 3416 BLAKE2B bbaef28c3d455d4aa458790a875a321870c90e88ba3e6735790b3ea50d89c6ac4ac3ef3320239fb4a120681690af4144ea616638ebe21e51e898e178a94eb5cb SHA512 3f3f4996311fe76c9a438dc2794394879b655373146baa38be13c54a93f0016035d371ae7152df02b56b25f7898ab7d0752de636202e88acae1ee536f2809ad6 +DIST accounts-qml-0.7_p20231028.tar.bz2 50521 BLAKE2B 6704557e50b40d0be6e706c05ce888f959fd2028c7fa9aea9d3f2064828b6869bee454cd88189e70abe483b0809ec857634b0b8fa5f989fca05ae7af55efb80a SHA512 0d366b526873bdeecb9a5582992b8d659777beff3b5449745141a3c8156e130714acd81343440a2edcff7ed7bfeed2ce1afdb89188c8be2a2737491278b44253 DIST accounts-qml-module-VERSION_0.7.tar.gz 62029 BLAKE2B 0924b73868135ad5d9ec7545d5b0ba84f140053f0be4d17f1c6d3754ec19e362af906af60fb45e6405b5d080dd8f63845070815b12e8bfeda30032c9ed172708 SHA512 4e0e5df64d0a477e11f412c0def85d0de1730efff9682790f5339a57d58778282aa8ca0fa201e409b3b9a2a75fea70f10555b1f70224a3b95ab8d44b942cf7e1 diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild deleted file mode 100644 index f00fa00de713..000000000000 --- a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils - -DESCRIPTION="QML bindings for accounts-qt and signond" -HOMEPAGE="https://accounts-sso.gitlab.io/" -SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="doc test" - -BDEPEND=" - doc? ( app-doc/doxygen ) -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - net-libs/accounts-qt - net-libs/signond -" -DEPEND="${RDEPEND} - test? ( - dev-qt/qtgui:5 - dev-qt/qttest:5 - ) -" - -# dbus problems -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${P}-no-tests.patch" ) - -S="${WORKDIR}/${PN}-module-VERSION_${PV}" - -src_prepare() { - default - sed -e 's/-Werror//' -i common-project-config.pri || die -} - -src_configure() { - eqmake5 PREFIX="${EPREFIX}"/usr -} - -src_install() { - emake INSTALL_ROOT="${D}" install_subtargets -} diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild new file mode 100644 index 000000000000..d1a1aa9bc909 --- /dev/null +++ b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils + +DESCRIPTION="QML bindings for accounts-qt and signond" +HOMEPAGE="https://accounts-sso.gitlab.io/" +SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.gz + https://dev.gentoo.org/~asturm/distfiles/${P}-patches-1.tar.xz" +S="${WORKDIR}/${PN}-module-VERSION_${PV}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="doc test" + +# dbus problems +RESTRICT="test" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + net-libs/accounts-qt + net-libs/signond +" +DEPEND="${RDEPEND} + test? ( + dev-qt/qtgui:5 + dev-qt/qttest:5 + ) +" +BDEPEND=" + doc? ( + app-text/doxygen + dev-qt/qdoc:5 + dev-qt/qthelp:5 + ) +" + +DOCS=( README.md ) + +PATCHES=( + "${WORKDIR}/${P}-patches-1" # bug 849773 + "${FILESDIR}/${P}-gcc12.patch" # bug 870157, pending upstream +) + +src_prepare() { + default + rm -v .gitignore doc/html/.gitignore || die +} + +src_configure() { + eqmake5 \ + CONFIG+=no_docs \ + PREFIX="${EPREFIX}"/usr +} + +src_compile() { + default + if use doc; then + $(qt5_get_bindir)/qdoc doc/accounts-qml-module.qdocconf || die + fi +} + +src_install() { + emake INSTALL_ROOT="${D}" install_subtargets + use doc && local HTML_DOCS=( doc/html ) + einstalldocs +} diff --git a/net-libs/accounts-qml/accounts-qml-0.7_p20231028.ebuild b/net-libs/accounts-qml/accounts-qml-0.7_p20231028.ebuild new file mode 100644 index 000000000000..7df58aee3efa --- /dev/null +++ b/net-libs/accounts-qml/accounts-qml-0.7_p20231028.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils multibuild + +if [[ ${PV} = *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/accounts-sso/accounts-qml-module.git/" + inherit git-r3 +else + COMMIT=05e79ebbbf3784a87f72b7be571070125c10dfe3 + if [[ -n ${COMMIT} ]] ; then + SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/${COMMIT}/${PN}-module-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${PN}-module-${COMMIT}" + else + SRC_URI=" + https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.bz2 + https://dev.gentoo.org/~asturm/distfiles/${P}-patches-1.tar.xz + " + S="${WORKDIR}/${PN}-module-VERSION_${PV}" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="QML bindings for accounts-qt and signond" +HOMEPAGE="https://accounts-sso.gitlab.io/" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="doc +qt5 qt6 test" +REQUIRED_USE="|| ( qt5 qt6 )" + +# dbus problems +RESTRICT="test" + +RDEPEND=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + ) + qt6? ( + dev-qt/qtbase:6 + dev-qt/qtdeclarative:6 + ) + >=net-libs/accounts-qt-1.16_p20220803[qt5?,qt6?] + >=net-libs/signond-8.61-r100[qt5?,qt6?] +" +DEPEND="${RDEPEND} + test? ( + qt5? ( + dev-qt/qtgui:5 + dev-qt/qttest:5 + ) + qt6? ( dev-qt/qtbase:6[gui] ) + ) +" +BDEPEND=" + doc? ( + app-text/doxygen + || ( + ( dev-qt/qttools:6[assistant,qdoc] ) + ( + dev-qt/qdoc:5 + dev-qt/qthelp:5 + ) + ) + ) +" + +DOCS=( README.md ) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_prepare() { + default + rm -v doc/html/.gitignore || die + multibuild_copy_sources +} + +src_configure() { + my_src_configure() { + cd "${BUILD_DIR}" || die + + local myqmakeargs=( + CONFIG+=no_docs \ + PREFIX="${EPREFIX}"/usr + ) + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + eqmake6 "${myqmakeargs[@]}" + else + eqmake5 "${myqmakeargs[@]}" + fi + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + my_src_compile() { + emake -C "${BUILD_DIR}" + } + + multibuild_foreach_variant my_src_compile + + if use doc; then + local qtanybindir + if has_version "dev-qt/qttools:6[qdoc]"; then + qtanybindir="$(qt6_get_libdir)" + elif has_version "dev-qt/qdoc:5"; then + qtanybindir="$(qt5_get_bindir)" + else + eerror "dev-qt/qttools:6[qdoc] nor dev-qt/qdoc:5 available even though in deps(?)" + fi + ${qtanybindir}/qdoc doc/accounts-qml-module.qdocconf || die + fi +} + +src_install() { + my_src_install() { + emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install_subtargets + } + + local QT_QPA_PLATFORM=offscreen + multibuild_foreach_variant my_src_install + use doc && local HTML_DOCS=( doc/html ) + einstalldocs +} diff --git a/net-libs/accounts-qml/files/accounts-qml-0.7-gcc12.patch b/net-libs/accounts-qml/files/accounts-qml-0.7-gcc12.patch new file mode 100644 index 000000000000..abe820f2383d --- /dev/null +++ b/net-libs/accounts-qml/files/accounts-qml-0.7-gcc12.patch @@ -0,0 +1,30 @@ +From 6bfa9d24363e28971839d86925d9de3d7aef512c Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 14 Sep 2022 22:40:30 +0100 +Subject: [PATCH] Fix build failure with GCC 12 (missing <algorithms> include) + +Needed for std::sort. + +Bug: https://bugs.gentoo.org/870157 +Fixes: 69e17dec5add40655cd9334ec7ad4eef13fed8a4 +Signed-off-by: Sam James <sam@gentoo.org> +--- + src/account-service-model.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/account-service-model.cpp b/src/account-service-model.cpp +index deb157e..20a445c 100644 +--- a/src/account-service-model.cpp ++++ b/src/account-service-model.cpp +@@ -20,6 +20,8 @@ + #include "debug.h" + #include "manager.h" + ++#include <algorithm> ++ + #include <Accounts/Account> + #include <Accounts/AccountService> + #include <Accounts/Application> +-- +GitLab + diff --git a/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch b/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch deleted file mode 100644 index cfe8dec082bb..000000000000 --- a/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/accounts-qml-module.pro 2016-06-08 09:26:26.000000000 +0200 -+++ b/accounts-qml-module.pro 2019-12-08 14:16:24.058806381 +0100 -@@ -5,8 +5,9 @@ - TEMPLATE = subdirs - CONFIG += ordered - SUBDIRS = \ -- src \ -- tests -+ src -+ -+CONFIG(tests): SUBDIRS += tests - - include(common-installs-config.pri) - diff --git a/net-libs/accounts-qml/metadata.xml b/net-libs/accounts-qml/metadata.xml index 8641e5bdd399..320bd7afdec3 100644 --- a/net-libs/accounts-qml/metadata.xml +++ b/net-libs/accounts-qml/metadata.xml @@ -5,4 +5,7 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="gitlab">accounts-sso/accounts-qml-module</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest index 08e0b3bdd343..420110949655 100644 --- a/net-libs/accounts-qt/Manifest +++ b/net-libs/accounts-qt/Manifest @@ -1 +1,2 @@ DIST accounts-qt-1.16a.tar.gz 64376 BLAKE2B 39abe10249efff2edeae1a8ce210be3ce06656311ed5a3a3fbcb847194ebbd8ec6e111ef070fb29a2a847591304cf22a7cb60e9d1178a201b886313c4c8aaadb SHA512 a2a65899a258ac41c67fe496ba14468a95615fe8cfc518b7aaf7d3e72e0088304c61f5d76d50bd26a95b5f56dea4d0191bf08ecead508286504161aa05b7a05b +DIST accounts-qt-1.17.tar.bz2 55907 BLAKE2B e13debd3f7bc9a17cf73c55777b62e904a6bf7791fe3ad0e1af25a72622a8c21cb56bf033afb50d17a1dd703be0af88de9e557d0947d9b7c12e1ac241b45b743 SHA512 ceab67d5db1acb68e391be0557e5fd4b9675f1401b1fe81ff431d5d1eb1d7124cd5170fde44658d7db8b46f721e9d3f7db719c5b727aa681a9e35ea026a71908 diff --git a/net-libs/accounts-qt/accounts-qt-1.16.ebuild b/net-libs/accounts-qt/accounts-qt-1.16.ebuild index c9337927d70c..e49f56bfcaae 100644 --- a/net-libs/accounts-qt/accounts-qt-1.16.ebuild +++ b/net-libs/accounts-qt/accounts-qt-1.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ S="${WORKDIR}/lib${PN}-VERSION_${PV}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="doc test" # dbus problems @@ -27,13 +27,20 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) " -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + dev-qt/qthelp:5 + ) +" src_prepare() { default sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \ -i doc/doc.pri || die + sed -e "/QHG_LOCATION/s|qhelpgenerator|$(qt5_get_bindir)/&|" \ + -i doc/doxy.conf || die if ! use doc; then sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die fi diff --git a/net-libs/accounts-qt/accounts-qt-1.17.ebuild b/net-libs/accounts-qt/accounts-qt-1.17.ebuild new file mode 100644 index 000000000000..3cb5ade1897a --- /dev/null +++ b/net-libs/accounts-qt/accounts-qt-1.17.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils multibuild + +if [[ ${PV} = *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/accounts-sso/lib${PN}.git/" + inherit git-r3 +else + SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/VERSION_${PV}/lib${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/lib${PN}-VERSION_${PV}" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Qt bindings for libaccounts-glib" +HOMEPAGE="https://accounts-sso.gitlab.io" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="doc +qt5 qt6 test" +REQUIRED_USE="|| ( qt5 qt6 )" + +# dbus problems +RESTRICT="test" + +RDEPEND=" + dev-libs/glib:2 + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtxml:5 + ) + qt6? ( dev-qt/qtbase:6[xml] ) + >=net-libs/libaccounts-glib-1.23:= +" +DEPEND="${RDEPEND} + test? ( qt5? ( dev-qt/qttest:5 ) ) +" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + || ( + dev-qt/qttools:6[assistant] + dev-qt/qthelp:5 + ) + ) +" + +PATCHES=( "${FILESDIR}/${PN}-1.16-libdir.patch" ) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_prepare() { + default + + local qhelpgeneratorpath + if has_version "dev-qt/qttools:6[assistant]"; then + qhelpgeneratorpath="$(qt6_get_libdir)/qt6/libexec" + elif has_version "dev-qt/qthelp:5"; then + qhelpgeneratorpath="$(qt5_get_bindir)" + else + eerror "dev-qt/qttools:6[assistant] nor dev-qt/qthelp:5 available even though in deps(?)" + fi + + sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \ + -i doc/doc.pri || die + sed -e "/QHG_LOCATION/s|qhelpgenerator|${qhelpgeneratorpath}/&|" \ + -i doc/doxy.conf || die + if ! use doc; then + sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die + fi + if ! use test; then + sed -e '/^SUBDIRS/s/tests//' \ + -i accounts-qt.pro || die "couldn't disable tests" + fi + + multibuild_copy_sources +} + +src_configure() { + my_src_configure() { + cd "${BUILD_DIR}" || die + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + eqmake6 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) + else + eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) + fi + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + my_src_compile() { + emake -C "${BUILD_DIR}" + } + + multibuild_foreach_variant my_src_compile +} + +src_install() { + my_src_install() { + emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install + } + + multibuild_foreach_variant my_src_install +} diff --git a/net-libs/accounts-qt/files/accounts-qt-1.16-libdir.patch b/net-libs/accounts-qt/files/accounts-qt-1.16-libdir.patch new file mode 100644 index 000000000000..dfcbe71938b1 --- /dev/null +++ b/net-libs/accounts-qt/files/accounts-qt-1.16-libdir.patch @@ -0,0 +1,116 @@ +From e3882382b2e98bce5be07baf23771856828123fc Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 7 Dec 2023 23:20:32 +0100 +Subject: [PATCH] Make LIBDIR configurable + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + Accounts/AccountsQt5Config.cmake.in | 2 +- + Accounts/AccountsQt6Config.cmake.in | 4 ++-- + Accounts/accounts-qt5.pc.in | 2 +- + Accounts/accounts-qt6.pc.in | 2 +- + common-installs-config.pri | 2 +- + common-pkgconfig.pri | 2 +- + common-project-config.pri | 6 +++--- + 7 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Accounts/AccountsQt5Config.cmake.in b/Accounts/AccountsQt5Config.cmake.in +index 746f689..9280a7d 100644 +--- a/Accounts/AccountsQt5Config.cmake.in ++++ b/Accounts/AccountsQt5Config.cmake.in +@@ -1,5 +1,5 @@ + # ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories + # ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt + +-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) ++set(ACCOUNTSQT_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so) + set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) +diff --git a/Accounts/AccountsQt6Config.cmake.in b/Accounts/AccountsQt6Config.cmake.in +index 55a8964..9280a7d 100644 +--- a/Accounts/AccountsQt6Config.cmake.in ++++ b/Accounts/AccountsQt6Config.cmake.in +@@ -1,5 +1,5 @@ + # ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories + # ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt + +-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) +-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) +\ No newline at end of file ++set(ACCOUNTSQT_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so) ++set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) +diff --git a/Accounts/accounts-qt5.pc.in b/Accounts/accounts-qt5.pc.in +index fbfcea8..faea96b 100644 +--- a/Accounts/accounts-qt5.pc.in ++++ b/Accounts/accounts-qt5.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include/accounts-qt5 + servicefilesdir=${prefix}/share/accounts/services + servicetypefilesdir=${prefix}/share/accounts/service-types +diff --git a/Accounts/accounts-qt6.pc.in b/Accounts/accounts-qt6.pc.in +index c625b2e..cdc0233 100644 +--- a/Accounts/accounts-qt6.pc.in ++++ b/Accounts/accounts-qt6.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include/accounts-qt6 + servicefilesdir=${prefix}/share/accounts/services + servicetypefilesdir=${prefix}/share/accounts/service-types +diff --git a/common-installs-config.pri b/common-installs-config.pri +index 82baf75..420accb 100644 +--- a/common-installs-config.pri ++++ b/common-installs-config.pri +@@ -17,7 +17,7 @@ contains( TEMPLATE, app ) { + #----------------------------------------------------------------------------- + contains( TEMPLATE, lib ) { + +- target.path = $${INSTALL_LIBDIR} ++ target.path = $${INSTALL_PREFIX}/$${LIBDIR} + INSTALLS += target + message("====") + message("==== INSTALLS += target") +diff --git a/common-pkgconfig.pri b/common-pkgconfig.pri +index 975068a..9f010d3 100644 +--- a/common-pkgconfig.pri ++++ b/common-pkgconfig.pri +@@ -3,7 +3,7 @@ + !isEmpty(pkgconfig.files) { + QMAKE_SUBSTITUTES += $${pkgconfig.files}.in + pkgconfig.CONFIG = no_check_exist +- pkgconfig.path = $${INSTALL_LIBDIR}/pkgconfig ++ pkgconfig.path = $${INSTALL_PREFIX}/$${LIBDIR}/pkgconfig + QMAKE_EXTRA_TARGETS += pkgconfig + + QMAKE_CLEAN += $${pkgconfig.files} +diff --git a/common-project-config.pri b/common-project-config.pri +index b856961..0484e36 100644 +--- a/common-project-config.pri ++++ b/common-project-config.pri +@@ -44,15 +44,15 @@ INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib + isEmpty( LIBDIR ) { + message("====") + message("==== NOTE: To override the library installation path run: `qmake LIBDIR=/custom/path'") +- message("==== (current installation path is `$${INSTALL_LIBDIR}')") ++ message("==== (current installation path is `$${INSTALL_PREFIX}/$${LIBDIR}')") + } else { + INSTALL_LIBDIR = $${LIBDIR} + message("====") +- message("==== library install path set to `$${INSTALL_LIBDIR}'") ++ message("==== library install path set to `$${INSTALL_PREFIX}/$${LIBDIR}'") + } + + isEmpty ( CMAKE_CONFIG_PATH ) { +- CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake ++ CMAKE_CONFIG_PATH = $${INSTALL_PREFIX}/$${LIBDIR}/cmake + message("====") + message("==== NOTE: To override the cmake module installation path run: `qmake CMAKE_CONFIG_PATH=/custom/path'") + message("==== (current installation path is `$${CMAKE_CONFIG_PATH}')") +-- +2.43.0 + diff --git a/net-libs/accounts-qt/metadata.xml b/net-libs/accounts-qt/metadata.xml index 8641e5bdd399..17eb6070226c 100644 --- a/net-libs/accounts-qt/metadata.xml +++ b/net-libs/accounts-qt/metadata.xml @@ -5,4 +5,7 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="gitlab">accounts-sso/libaccounts-qt</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest index 47974e204fb9..8e3e6125cf3f 100644 --- a/net-libs/aqbanking/Manifest +++ b/net-libs/aqbanking/Manifest @@ -1 +1 @@ -DIST aqbanking-6.2.5.tar.gz 2611057 BLAKE2B 05ba9b652f60ae79bc8446f65714ec72396669886d34e57ad09a21b4e5a563bc3f9fbb14431be076b9c05171fe6eac17b128d4bcd7af5250fd5c63d8d93e3e65 SHA512 aec71c16d8f0b3bdac1bba32f83fb22d5b4d2272b41845e7f63e770323a622fcabe1d2e1a9fc98977a38c467ab7cc0f934746216c2107363b81f51b90e65c88c +DIST aqbanking-6.5.3.tar.gz 2690700 BLAKE2B 2a6407a9d6bfe6a7cfa3b3f4b6d3183b801bda8914770a11d48491fa7bc48e9b034b7eb5d220c6181725240e4475460a11c64df2d73dac98ccb30a61d5de5bca SHA512 bca4449981f9660dc7de8506a2088981b52dcf4ded765fd337263962b464b7903319878e8efbce6cbef043b65be8edb828fee873f19e8c6b2fed0cf7906d58b2 diff --git a/net-libs/aqbanking/aqbanking-6.2.5.ebuild b/net-libs/aqbanking/aqbanking-6.5.3-r1.ebuild index b13c94109378..a0741935a412 100644 --- a/net-libs/aqbanking/aqbanking-6.2.5.ebuild +++ b/net-libs/aqbanking/aqbanking-6.5.3-r1.ebuild @@ -1,47 +1,41 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -MY_P="${P/_beta/beta}" +EAPI=8 DESCRIPTION="Generic Online Banking Interface" HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php" -SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/342/${MY_P}.tar.gz" +SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/467/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86" IUSE="debug doc ebics examples ofx" BDEPEND=" sys-devel/gettext virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " DEPEND=" app-misc/ktoblzcheck dev-libs/gmp:0= - >=sys-libs/gwenhywfar-5.4.1:= + >=sys-libs/gwenhywfar-5.10.1:= virtual/libintl - ebics? ( dev-libs/xmlsec[gcrypt] ) + ebics? ( dev-libs/xmlsec:=[gcrypt] ) ofx? ( >=dev-libs/libofx-0.9.5:= ) " RDEPEND="${DEPEND}" DOCS=( AUTHORS ChangeLog NEWS README TODO ) -MAKEOPTS="${MAKEOPTS} -j1" # 5.7.8 still fails with > -j1 - -S="${WORKDIR}/${MY_P}" - src_configure() { local backends="aqhbci aqnone aqpaypal" use ofx && backends="${backends} aqofxconnect" use ebics && backends="${backends} aqebics" local myeconfargs=( - --with-docpath=/usr/share/doc/${PF}/apidoc + --docdir="${EPREFIX}"/usr/share/doc/"${PF}" $(use_enable debug) $(use_enable doc full-doc) --with-backends="${backends}" @@ -52,7 +46,7 @@ src_configure() { src_install() { emake DESTDIR="${D}" install - rm -rv "${ED}"/usr/share/doc/ || die + rm -rv "${ED}"/usr/share/doc/ || die "Failed to remove docs" einstalldocs diff --git a/net-libs/axtls/axtls-2.1.5-r101.ebuild b/net-libs/axtls/axtls-2.1.5-r102.ebuild index 5f09e2c9f169..bb734ef2a833 100644 --- a/net-libs/axtls/axtls-2.1.5-r101.ebuild +++ b/net-libs/axtls/axtls-2.1.5-r102.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 LUA_COMPAT=( lua5-{1..4} luajit ) -inherit lua-single multilib-minimal savedconfig toolchain-funcs +inherit lua-single savedconfig toolchain-funcs ################################################################################ # axtls CONFIG MINI-HOWTO @@ -37,18 +37,18 @@ MY_PN=${PN/tls/TLS} DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server" HOMEPAGE="http://axtls.sourceforge.net/" -SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/axtls/${MY_PN}-${PV}.tar.gz" S="${WORKDIR}/${PN}-code" LICENSE="BSD GPL-2" SLOT="0/1" KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86" -IUSE="httpd cgi-lua cgi-php static static-libs doc" +IUSE="httpd cgi-lua cgi-php static doc" # TODO: add ipv6, and c#, java, lua, perl bindings # Currently these all have some issue -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" RDEPEND=" httpd? ( acct-group/axtls @@ -72,14 +72,12 @@ src_prepare() { eapply "${FILESDIR}/explicit-libdir-r1.patch" - #We want CONFIG_DEBUG to avoid stripping - #but not for debugging info + # We want CONFIG_DEBUG to avoid stripping + # but not for debugging info sed -i -e 's: -g::' config/Rules.mak || die sed -i -e 's: -g::' config/makefile.conf || die eapply_user - - multilib_copy_sources } use_flag_config() { @@ -122,12 +120,12 @@ use_flag_config() { emake -j1 oldconfig < <(yes n) > /dev/null } -multilib_src_configure() { - #Per-ABI substitutions. +src_configure() { + # Per-ABI substitutions. sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \ Makefile || die - #Use CC as the host compiler for mconf + # Use CC as the host compiler for mconf sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \ config/Rules.mak || die @@ -145,25 +143,21 @@ multilib_src_configure() { fi } -multilib_src_install() { - if multilib_is_native_abi && use savedconfig; then +src_install() { + if use savedconfig; then save_config config/.config fi emake PREFIX="${ED}/usr" install - if ! use static-libs; then - rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die - fi + rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die # The build system needs to install before it builds docs - if multilib_is_native_abi && use doc; then + if use doc; then emake docs dodoc -r docsrc/html fi -} -multilib_src_install_all() { if [[ -f "${ED}"/usr/bin/htpasswd ]]; then mv "${ED}"/usr/bin/{,ax}htpasswd || die fi diff --git a/net-libs/axtls/metadata.xml b/net-libs/axtls/metadata.xml index f486ea506c75..d7ec512ca3b5 100644 --- a/net-libs/axtls/metadata.xml +++ b/net-libs/axtls/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="httpd">Enables axhttpd web server component</flag> <flag name="static">Statically build axhttpd server</flag> diff --git a/net-libs/balde-markdown/Manifest b/net-libs/balde-markdown/Manifest deleted file mode 100644 index 7074ba7f4d82..000000000000 --- a/net-libs/balde-markdown/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST balde-markdown-0.1.tar.bz2 260429 BLAKE2B 4306a02e363a271c77d9ab3f08261ab9410d6ac8c258bc74dec3b1cabd8728927d12bd0d0b2941f5dbd90256e11ef8e30b5c952c2d7711bf6ae2896068822862 SHA512 ba0a952d1f8480f6173a8af6eb662741ac04db4e39d65158afac97606c2faaaff973dce384b2bc1d42aabbdd345cd451fc5624f1c6d2f941f2630b2e76a01d10 diff --git a/net-libs/balde-markdown/balde-markdown-0.1.ebuild b/net-libs/balde-markdown/balde-markdown-0.1.ebuild deleted file mode 100644 index 810fde09dce0..000000000000 --- a/net-libs/balde-markdown/balde-markdown-0.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/balde/${PN}.git" - inherit git-r3 autotools -fi - -DESCRIPTION="A balde extension that adds Markdown support" -HOMEPAGE="https://github.com/balde/balde-markdown" - -SRC_URI="https://github.com/balde/${PN}/releases/download/v${PV}/${P}.tar.bz2" -KEYWORDS="~amd64 ~x86" -if [[ ${PV} = *9999* ]]; then - SRC_URI="" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-libs/glib-2.34 - >=net-libs/balde-0.1 - app-text/discount" - -DEPEND="${RDEPEND}" - -src_prepare() { - [[ ${PV} = *9999* ]] && eautoreconf - default -} - -src_configure() { - econf \ - --without-valgrind \ - --disable-static -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-libs/balde-markdown/metadata.xml b/net-libs/balde-markdown/metadata.xml deleted file mode 100644 index 0571121e40f6..000000000000 --- a/net-libs/balde-markdown/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <maintainer status="active"> - <email>rafaelmartins@gentoo.org</email> - <name>Rafael G. Martins</name> - </maintainer> - <bugs-to>mailto:balde-dev@googlegroups.com</bugs-to> - <remote-id type="github">balde/balde-markdown</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-libs/balde/Manifest b/net-libs/balde/Manifest deleted file mode 100644 index cb7a523ea240..000000000000 --- a/net-libs/balde/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST balde-0.1.1.tar.bz2 360412 BLAKE2B 88f25e7c409c61f45d5fca0664d3602fd206caade28977d7d38d5626fdbc423c76cc8dda2c5829ea2b6b2f79dd9897b3a890b9a5a862d6defad4e11808edab54 SHA512 fafb9e9344ecb1caf6a4451b99adb3505fb728015e2bcce3d81162f679a70267e49a0dc194c6c977a7a155f9b5ae3318fdfcb63fb0223e43943c0fc5e8503acd diff --git a/net-libs/balde/balde-0.1.1.ebuild b/net-libs/balde/balde-0.1.1.ebuild deleted file mode 100644 index d9d20aa89a46..000000000000 --- a/net-libs/balde/balde-0.1.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - inherit git-r3 autotools -fi - -DESCRIPTION="A microframework for C based on GLib and bad intentions" -HOMEPAGE="https://balde.rgm.io/" - -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2" -KEYWORDS="~amd64 ~x86" -if [[ ${PV} = *9999* ]]; then - SRC_URI="" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-libs/glib-2.34 - dev-libs/fcgi - x11-misc/shared-mime-info" - -if [[ ${PV} = *9999* ]]; then - RDEPEND="${RDEPEND} - dev-util/peg" -fi - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -src_prepare() { - [[ ${PV} = *9999* ]] && eautoreconf - default -} - -src_configure() { - econf \ - $(use_with doc doxygen) \ - --disable-examples \ - --without-valgrind -} - -src_compile() { - default - use doc && emake doxygen -} - -src_install() { - default - use doc && dohtml -r doc/build/html/. -} diff --git a/net-libs/balde/metadata.xml b/net-libs/balde/metadata.xml deleted file mode 100644 index dc226aff2d43..000000000000 --- a/net-libs/balde/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <maintainer status="active"> - <email>rafaelmartins@gentoo.org</email> - <name>Rafael G. Martins</name> - </maintainer> - <bugs-to>mailto:balde-dev@googlegroups.com</bugs-to> - <remote-id type="github">balde/balde</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-libs/biblesync/metadata.xml b/net-libs/biblesync/metadata.xml index c48952d8f1d3..bd707ac30866 100644 --- a/net-libs/biblesync/metadata.xml +++ b/net-libs/biblesync/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>jsmolic@gentoo.org</email> - <name>Jakov Smolić</name> - </maintainer> - <maintainer type="person"> <email>marecki@gentoo.org</email> <name>Marek Szuba</name> </maintainer> diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest index a84c4a83e18d..6a0e06458996 100644 --- a/net-libs/c-client/Manifest +++ b/net-libs/c-client/Manifest @@ -1,2 +1,3 @@ DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142a4e0c4dd561d0a387cb72fea16de656a01bc21a0b30600dc121c8af090b76188d0131852ca6f3d40b9bba8745696faed5a79fb8c59 SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae +DIST uw-imap_2007f~dfsg-7.debian.tar.xz 44960 BLAKE2B 836dfd9a5922cd3043278a89c87276c974c8e91c5831a94caef6e73b2839d246bda879f67bdad88ae59888b5dc8b6ca366aa48b6d197508cd10cdc68f1e7027f SHA512 3a903062c782c942d4c7a1122be686e301ea4d4c6f6ff1dbc78ae29c7ee7b8e02fb25a903401e6a7047ddccaf6bcceba953f6cad1c1890cd6410ea909b014af6 diff --git a/net-libs/c-client/c-client-2007f-r7.ebuild b/net-libs/c-client/c-client-2007f-r8.ebuild index befa819f22a5..6e853ee675f2 100644 --- a/net-libs/c-client/c-client-2007f-r7.ebuild +++ b/net-libs/c-client/c-client-2007f-r8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit flag-o-matic libtool toolchain-funcs @@ -17,11 +17,10 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD pam ssl static-libs topal chappa" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="doc +ipv6 kerberos pam ssl static-libs topal chappa" RDEPEND=" - !net-mail/uw-imap ssl? ( dev-libs/openssl:0= ) @@ -46,6 +45,11 @@ PATCHES=( # openssl-1.1 build fix #647616 "${FILESDIR}/${PN}-2007f-openssl-1.1.patch" + + # build fix for -Werror=implicit-function-declaration and + # incompatible function pointer types, bug #870478 + "${FILESDIR}/${PN}-2007f-implicit-declaration-fix.patch" + "${FILESDIR}/${PN}-2007f-scandir-callback-types.patch" ) src_prepare() { @@ -107,8 +111,6 @@ src_compile() { # Fall back to "slx" when USE=pam is not set. This ensures that # we link in libcrypt to get the crypt() routine (bug #456928). use pam && target=lnp passwdtype=pam || target=slx passwdtype=std - elif use kernel_FreeBSD ; then - target=bsf passwdtype=pam fi use kerberos \ && mymake="EXTRAAUTHENTICATORS=gss" \ diff --git a/net-libs/c-client/c-client-2007f_p7.ebuild b/net-libs/c-client/c-client-2007f_p7.ebuild new file mode 100644 index 000000000000..0d2d1cde0269 --- /dev/null +++ b/net-libs/c-client/c-client-2007f_p7.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic libtool toolchain-funcs + +MY_PN=imap +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="UW IMAP c-client library" +HOMEPAGE="http://www.washington.edu/imap/" +SRC_URI=" + ftp://ftp.cac.washington.edu/imap/${MY_PN}-$(ver_cut 1-2).tar.Z + mirror://debian/pool/main/u/uw-${MY_PN}/uw-${MY_PN}_${PV/_p/"~dfsg-"}.debian.tar.xz +" +S="${WORKDIR}"/${MY_PN}-$(ver_cut 1-2) + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="doc +ipv6 kerberos pam ssl static-libs topal" + +RDEPEND=" + ssl? ( + dev-libs/openssl:= + ) + kernel_linux? ( + pam? ( >=sys-libs/pam-0.72 ) + !pam? ( virtual/libcrypt:= ) + ) + kerberos? ( app-crypt/mit-krb5 ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${WORKDIR}"/debian/patches + + # Apply a patch to only build the stuff we need for c-client + "${FILESDIR}/${PN}-2006k_GENTOO_Makefile.patch" + + # Apply patch to add the compilation of a .so for PHP + # This was previously conditional, but is more widely useful. + "${FILESDIR}/${PN}-2007f_GENTOO_amd64-so-fix.patch" + + # Respect LDFLAGS + "${FILESDIR}/${PN}-2007f_p7-ldflags.patch" + + # build fix for -Werror=implicit-function-declaration and + # incompatible function pointer types, bug #870478 + "${FILESDIR}/${PN}-2007f-scandir-callback-types.patch" + "${FILESDIR}/${PN}-2007f_p7-implicit-declaration-fix.patch" +) + +src_prepare() { + use topal && PATCHES+=( "${FILESDIR}/${PN}-2007f-topal.patch" ) + + default + + # Tarball packed with bad file perms + chmod -R u+rwX,go-w . || die "failed to fix permissions" + + # Lots of things need -fPIC, including various platforms, and this library + # generally should be built with it anyway. + append-flags -fPIC + + # Modifications so we can build it optimally and correctly + sed \ + -e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \ + -e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \ + -e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \ + -i src/osdep/unix/Makefile \ + || die "failed to fix compiler flags and SSL paths in the Makefile" + + # Make the build system more multilib aware + sed \ + -e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \ + -e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \ + -i src/osdep/unix/Makefile \ + || die "failed to fix our libdir in the Makefile" + + # Targets should use the Gentoo (ie linux) fs + sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \ + -i src/osdep/unix/Makefile \ + || die "failed to fix the FreeBSD ACTIVEFILE path in the Makefile" + + # Remove the pesky checks about SSL stuff + sed -e '/read.*exit/d' -i Makefile \ + || die "failed to disable SSL warning in the Makefile" + + sed -e "s:CC=cc:CC=$(tc-getCC):" \ + -e "s:ARRC=ar:ARRC=$(tc-getAR):" \ + -e "s:RANLIB=ranlib:RANLIB=$(tc-getRANLIB):" \ + -i src/osdep/unix/Makefile \ + || die "failed to fix build flags support in the Makefile" + + sed -i -e "s:krb5-config.mit:krb5-config:" src/osdep/unix/Makefile.gss || die + + elibtoolize +} + +src_compile() { + local mymake target passwdtype + + local ipver='IP=4' + if use ipv6 ; then + ipver="IP=6" + touch ip6 || die "failed to create ip6 file" + fi + + local ssltype="none" + if use ssl ; then + ssltype="unix" + fi + + if use kernel_linux ; then + # Fall back to "slx" when USE=pam is not set. This ensures that + # we link in libcrypt to get the crypt() routine (bug #456928). + use pam && target=lnps passwdtype=pam || target=slx passwdtype=std + fi + + if use kerberos ; then + mymake="EXTRAAUTHENTICATORS=gss" + EXTRALIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" + fi + + emake -j1 \ + SSLTYPE=${ssltype} ${target} \ + PASSWDTYPE=${passwdtype} ${ipver} ${mymake} \ + EXTRACFLAGS="${CFLAGS}" \ + EXTRALDFLAGS="${LDFLAGS}" \ + EXTRALIBS="${EXTRALIBS}" \ + GSSDIR=/usr +} + +src_install() { + if use static-libs; then + # Library binary + dolib.a c-client/c-client.a + dosym c-client.a "/usr/$(get_libdir)/libc-client.a" + fi + + # Now the shared library + dolib.so c-client/libc-client.so.1.0.0 + + dosym libc-client.so.1.0.0 "/usr/$(get_libdir)/libc-client.so" + dosym libc-client.so.1.0.0 "/usr/$(get_libdir)/libc-client.so.1" + + # Headers + insinto /usr/include/imap + doins src/osdep/unix/*.h + doins src/c-client/*.h + doins c-client/linkage.h + doins c-client/linkage.c + doins c-client/osdep.h + + if use ssl; then + echo " ssl_onceonlyinit ();" >> "${D}"/usr/include/imap/linkage.c \ + || die "failed to add ssl init statement to linkage.c" + fi + + # Documentation + dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD + if use doc; then + docinto rfc + dodoc docs/rfc/*.txt + docinto draft + dodoc docs/draft/* + fi +} diff --git a/net-libs/c-client/files/c-client-2007f-implicit-declaration-fix.patch b/net-libs/c-client/files/c-client-2007f-implicit-declaration-fix.patch new file mode 100644 index 000000000000..74e223d0f86c --- /dev/null +++ b/net-libs/c-client/files/c-client-2007f-implicit-declaration-fix.patch @@ -0,0 +1,34 @@ +This patch solves build issues with -Werror=implicit-function-declaration +enabled. + +- safe_flock is a function from flocklnx.c but header file for consumers + is missing, the simplest was to add function prototype to other + header file. +- utime.h is needed also in multiple places but os_slx.h header file is + used in all of them + +Bug: https://bugs.gentoo.org/870478 + +diff --git a/src/osdep/unix/os_slx.h b/src/osdep/unix/os_slx.h +index b5f39ff..adad223 100644 +--- a/src/osdep/unix/os_slx.h ++++ b/src/osdep/unix/os_slx.h +@@ -46,6 +46,7 @@ + #include <sys/types.h> + #include <dirent.h> + #include <time.h> /* for struct tm */ ++#include <utime.h> + #include <fcntl.h> + #include <syslog.h> + #include <sys/file.h> +@@ -57,6 +58,7 @@ + + #define direct dirent + ++int safe_flock(int, int); + #define flock safe_flock + + +-- +2.35.1 + diff --git a/net-libs/c-client/files/c-client-2007f-scandir-callback-types.patch b/net-libs/c-client/files/c-client-2007f-scandir-callback-types.patch new file mode 100644 index 000000000000..9e067a8ba493 --- /dev/null +++ b/net-libs/c-client/files/c-client-2007f-scandir-callback-types.patch @@ -0,0 +1,167 @@ +clang-16 compiler complains with following error message in multiple +places: + + error: incompatible function pointer types passing 'int (struct dirent *)' to + parameter of type 'int (*)(const struct dirent *)' [-Wincompatible-function-pointer-types] + + error: incompatible function pointer types passing + 'int (const void *, const void *)' to parameter of type 'int (*)(const struct dirent **, const struct dirent **)' [-Wincompatible-function-pointer-types] + +This patch fixes all those places by correcting function pointer types +for scandir callbacks. + +Bug: https://bugs.gentoo.org/870478 + +diff --git a/src/osdep/unix/mh.c b/src/osdep/unix/mh.c +index 0226b7a..ace2b32 100644 +--- a/src/osdep/unix/mh.c ++++ b/src/osdep/unix/mh.c +@@ -103,8 +103,8 @@ long mh_copy (MAILSTREAM *stream,char *sequence,char *mailbox, + long options); + long mh_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data); + +-int mh_select (struct direct *name); +-int mh_numsort (const void *d1,const void *d2); ++int mh_select (const struct direct *name); ++int mh_numsort (const struct direct **d1,const struct direct **d2); + char *mh_file (char *dst,char *name); + long mh_canonicalize (char *pattern,char *ref,char *pat); + void mh_setdate (char *file,MESSAGECACHE *elt); +@@ -1194,7 +1194,7 @@ long mh_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) + * Returns: T to use file name, NIL to skip it + */ + +-int mh_select (struct direct *name) ++int mh_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -1209,7 +1209,7 @@ int mh_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int mh_numsort (const void *d1,const void *d2) ++int mh_numsort (const struct direct **d1,const struct direct **d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +diff --git a/src/osdep/unix/mix.c b/src/osdep/unix/mix.c +index fbf4a02..0964842 100644 +--- a/src/osdep/unix/mix.c ++++ b/src/osdep/unix/mix.c +@@ -125,7 +125,7 @@ long mix_unsubscribe (MAILSTREAM *stream,char *mailbox); + long mix_create (MAILSTREAM *stream,char *mailbox); + long mix_delete (MAILSTREAM *stream,char *mailbox); + long mix_rename (MAILSTREAM *stream,char *old,char *newname); +-int mix_rselect (struct direct *name); ++int mix_rselect (const struct direct *name); + MAILSTREAM *mix_open (MAILSTREAM *stream); + void mix_close (MAILSTREAM *stream,long options); + void mix_abort (MAILSTREAM *stream); +@@ -140,8 +140,8 @@ THREADNODE *mix_thread (MAILSTREAM *stream,char *type,char *charset, + long mix_ping (MAILSTREAM *stream); + void mix_check (MAILSTREAM *stream); + long mix_expunge (MAILSTREAM *stream,char *sequence,long options); +-int mix_select (struct direct *name); +-int mix_msgfsort (const void *d1,const void *d2); ++int mix_select (const struct direct *name); ++int mix_msgfsort (const struct direct **d1,const struct direct **d2); + long mix_addset (SEARCHSET **set,unsigned long start,unsigned long size); + long mix_burp (MAILSTREAM *stream,MIXBURP *burp,unsigned long *reclaimed); + long mix_burp_check (SEARCHSET *set,size_t size,char *file); +@@ -587,7 +587,7 @@ long mix_rename (MAILSTREAM *stream,char *old,char *newname) + * Returns: T if mix file name, NIL otherwise + */ + +-int mix_rselect (struct direct *name) ++int mix_rselect (const struct direct *name) + { + return mix_dirfmttest (name->d_name); + } +@@ -1146,7 +1146,7 @@ long mix_expunge (MAILSTREAM *stream,char *sequence,long options) + * ".mix" with no suffix was used by experimental versions + */ + +-int mix_select (struct direct *name) ++int mix_select (const struct direct *name) + { + char c,*s; + /* make sure name has prefix */ +@@ -1165,7 +1165,7 @@ int mix_select (struct direct *name) + * Returns: -1 if d1 < d2, 0 if d1 == d2, 1 d1 > d2 + */ + +-int mix_msgfsort (const void *d1,const void *d2) ++int mix_msgfsort (const struct direct **d1,const struct direct **d2) + { + char *n1 = (*(struct direct **) d1)->d_name + sizeof (MIXNAME) - 1; + char *n2 = (*(struct direct **) d2)->d_name + sizeof (MIXNAME) - 1; +diff --git a/src/osdep/unix/mx.c b/src/osdep/unix/mx.c +index 4549527..994f12c 100644 +--- a/src/osdep/unix/mx.c ++++ b/src/osdep/unix/mx.c +@@ -98,8 +98,8 @@ long mx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data); + long mx_append_msg (MAILSTREAM *stream,char *flags,MESSAGECACHE *elt, + STRING *st,SEARCHSET *set); + +-int mx_select (struct direct *name); +-int mx_numsort (const void *d1,const void *d2); ++int mx_select (const struct direct *name); ++int mx_numsort (const struct direct **d1,const struct direct **d2); + char *mx_file (char *dst,char *name); + long mx_lockindex (MAILSTREAM *stream); + void mx_unlockindex (MAILSTREAM *stream); +@@ -1110,7 +1110,7 @@ long mx_append_msg (MAILSTREAM *stream,char *flags,MESSAGECACHE *elt, + * Returns: T to use file name, NIL to skip it + */ + +-int mx_select (struct direct *name) ++int mx_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -1125,7 +1125,7 @@ int mx_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int mx_numsort (const void *d1,const void *d2) ++int mx_numsort (const struct direct **d1,const struct direct **d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +diff --git a/src/osdep/unix/news.c b/src/osdep/unix/news.c +index 4cf5bb7..caa6785 100644 +--- a/src/osdep/unix/news.c ++++ b/src/osdep/unix/news.c +@@ -76,8 +76,8 @@ long news_create (MAILSTREAM *stream,char *mailbox); + long news_delete (MAILSTREAM *stream,char *mailbox); + long news_rename (MAILSTREAM *stream,char *old,char *newname); + MAILSTREAM *news_open (MAILSTREAM *stream); +-int news_select (struct direct *name); +-int news_numsort (const void *d1,const void *d2); ++int news_select (const struct direct *name); ++int news_numsort (const struct direct **d1,const struct direct **d2); + void news_close (MAILSTREAM *stream,long options); + void news_fast (MAILSTREAM *stream,char *sequence,long flags); + void news_flags (MAILSTREAM *stream,char *sequence,long flags); +@@ -402,7 +402,7 @@ MAILSTREAM *news_open (MAILSTREAM *stream) + * Returns: T to use file name, NIL to skip it + */ + +-int news_select (struct direct *name) ++int news_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -417,7 +417,7 @@ int news_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int news_numsort (const void *d1,const void *d2) ++int news_numsort (const struct direct **d1,const struct direct **d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +-- +2.35.1 + diff --git a/net-libs/c-client/files/c-client-2007f_GENTOO_amd64-so-fix.patch b/net-libs/c-client/files/c-client-2007f_GENTOO_amd64-so-fix.patch new file mode 100644 index 000000000000..3a3be7221185 --- /dev/null +++ b/net-libs/c-client/files/c-client-2007f_GENTOO_amd64-so-fix.patch @@ -0,0 +1,12 @@ +--- a/src/osdep/unix/Makefile ++++ b/src/osdep/unix/Makefile +@@ -990,6 +990,9 @@ onceenv: + -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS + echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS + echo "$(ARRC) $(ARCHIVE) $(BINARIES) $(LIBRARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE ++ echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \ ++ -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \ ++ >> ARCHIVE + echo $(ARCHIVE) > ARCHIVENAME + echo $(OS) > OSTYPE + ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy diff --git a/net-libs/c-client/files/c-client-2007f_p7-implicit-declaration-fix.patch b/net-libs/c-client/files/c-client-2007f_p7-implicit-declaration-fix.patch new file mode 100644 index 000000000000..413ddbf43869 --- /dev/null +++ b/net-libs/c-client/files/c-client-2007f_p7-implicit-declaration-fix.patch @@ -0,0 +1,46 @@ +This patch solves build issues with -Werror=implicit-function-declaration +enabled. + +- safe_flock is a function from flocklnx.c but header file for consumers + is missing, the simplest was to add function prototype to other + header file. +- utime.h is needed also in multiple places but os_slx.h header file is + used in all of them + +Bug: https://bugs.gentoo.org/870478 +--- a/src/osdep/unix/os_lnx.h ++++ b/src/osdep/unix/os_lnx.h +@@ -46,6 +46,7 @@ + #include <sys/types.h> + #include <dirent.h> + #include <time.h> /* for struct tm */ ++#include <utime.h> + #include <fcntl.h> + #include <syslog.h> + #include <sys/file.h> +@@ -57,6 +58,7 @@ + + #define direct dirent + ++int safe_flock(int, int); + #define flock safe_flock + + +--- a/src/osdep/unix/os_slx.h ++++ b/src/osdep/unix/os_slx.h +@@ -46,6 +46,7 @@ + #include <sys/types.h> + #include <dirent.h> + #include <time.h> /* for struct tm */ ++#include <utime.h> + #include <fcntl.h> + #include <syslog.h> + #include <sys/file.h> +@@ -57,6 +58,7 @@ + + #define direct dirent + ++int safe_flock(int, int); + #define flock safe_flock + + diff --git a/net-libs/c-client/files/c-client-2007f_p7-ldflags.patch b/net-libs/c-client/files/c-client-2007f_p7-ldflags.patch new file mode 100644 index 000000000000..8a273355c2f9 --- /dev/null +++ b/net-libs/c-client/files/c-client-2007f_p7-ldflags.patch @@ -0,0 +1,33 @@ +--- a/src/osdep/unix/Makefile ++++ b/src/osdep/unix/Makefile +@@ -975,23 +975,24 @@ os_sol.h: + + # Once-only environment setup + +-once: onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c ++once: ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c + + onceenv: + @echo Once-only environment setup... + echo $(CC) > CCTYPE +- echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS +- echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \ ++ echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS ++ echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \ + -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \ + -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \ + -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \ + -DLOCKPGM=\"$(LOCKPGM)\" \ + -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \ + -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS +- echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS ++ echo $(EXTRALIBS) `$(CAT) LDFLAGS` > LIBS ++ echo $(EXTRALDFLAGS) `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) > LDFLAGS + echo "$(ARRC) $(ARCHIVE) $(BINARIES) $(LIBRARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE +- echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \ +- -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \ ++ echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` $(EXTRALDFLAGS) `$(CAT) OSFLAGS` -shared \ ++ -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LIBS` $(BASELDFLAGS) \ + >> ARCHIVE + echo $(ARCHIVE) > ARCHIVENAME + echo $(OS) > OSTYPE diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest index de690807ad1b..59fb34a61891 100644 --- a/net-libs/canlock/Manifest +++ b/net-libs/canlock/Manifest @@ -1,3 +1 @@ -DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b3c02a8e614bffbefafd2fd3ff9f5720b2df0dead30e6d70dcd510380fee8cc2b535268266408719ca030e35 SHA512 fa89d638d87e5cb18bd6c270200cd5d962c5a263855e5cbbd8e944dea633a61d6f0c271da04d56096ef23e0a9f252e3bdead496e9aa9afe31d3f8e7ef679020f -DIST canlock_2b.orig.tar.gz 14099 BLAKE2B 93c991298ed7bf7ab57b290edf6e6b7bcd86ab452002cd61acbff17ec60eed2e15983b3f1cbe8d54acf4f0cfa11480822c7d7ed474e4c51dea018f73933308f2 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e -DIST libcanlock-3.2.2.tar.bz2 467561 BLAKE2B e332c379647c7ad3fbf5f0a8051b888be65674bcb2c9be1b689f009fd35eecbb29644d9f17aaa3812c9405283708207c6f220f630e0dd1c6a5508d41b85a6070 SHA512 3d194a37bdbdf640bb6996383ce988c9177573b6f84c29569d759308564c7636d98d5c267988bd034b33681f814400eb7fbecf78d90f54b126edb3bf384f928f +DIST libcanlock-3.3.0.tar.bz2 625796 BLAKE2B 001512a6d2d226aed93882de8d8f4f02a066cc67e6f21b411b8e1ee2ff0d4580732c90a6fc2756a79f992629cd18fbc319510960c39f33284c86bebfed3d4216 SHA512 100d2b4bf3eadedb7da230317cd37b2c1b259bbd783099a74e0d75fdc6ecddb8a6fd854a2b272bda3629bcf1ac1ae2b3d5657fca9137c17e38aad88f30e4c81c diff --git a/net-libs/canlock/canlock-2b.ebuild b/net-libs/canlock/canlock-2b.ebuild deleted file mode 100644 index d54ed58f3701..000000000000 --- a/net-libs/canlock/canlock-2b.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P="${P/-/_}" - -DESCRIPTION="A library for creating and verifying Usenet cancel locks" -HOMEPAGE="https://packages.qa.debian.org/c/canlock.html" -SRC_URI=" - mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz - mirror://debian/pool/main/c/${PN}/${MY_P}-6.diff.gz" - -LICENSE="BSD MIT" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" - -S="${WORKDIR}/${P/-/}" - -PATCHES=( - "${WORKDIR}"/${MY_P}-6.diff - "${FILESDIR}"/${P}-make.patch -) - -src_configure() { - tc-export CC -} - -src_install() { - dolib.so src/libcanlock.so.2.0.0 - dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so.2 - dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so - - doheader include/canlock.h - - dodoc CHANGES README doc/HOWTO -} diff --git a/net-libs/canlock/canlock-3.2.2.ebuild b/net-libs/canlock/canlock-3.3.0.ebuild index b073927e1e72..d8299aca68c6 100644 --- a/net-libs/canlock/canlock-3.2.2.ebuild +++ b/net-libs/canlock/canlock-3.3.0.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit toolchain-funcs - DESCRIPTION="A library for creating and verifying Usenet cancel locks" HOMEPAGE="https://micha.freeshell.org/libcanlock/" SRC_URI="https://micha.freeshell.org/lib${PN}/src/lib${P}.tar.bz2" @@ -12,13 +10,15 @@ S="${WORKDIR}/lib${P}" LICENSE="BSD MIT" SLOT="0/3" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="+legacy" +KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" +IUSE="header-parser +legacy" -BDEPEND="sys-devel/flex - virtual/yacc" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc +" -DOCS=( ChangeLog{,_V{0..2}} README doc/sec_review.txt ) +DOCS=( ChangeLog{,_V{0..2}} README TODO doc/sec_review.txt ) src_prepare() { default @@ -30,6 +30,7 @@ src_prepare() { src_configure() { local econf_args=( --enable-pc-files + $(use_enable header-parser hp) $(use_enable legacy legacy-api) ) @@ -43,6 +44,6 @@ src_install() { # keep old header location for compability with canlock v2 use legacy && dosym ./libcanlock-3/canlock.h /usr/include/canlock.h - # required for net-nntp/tin + # required for =net-nntp/tin-2.6.0 dosym ./libcanlock-3.pc /usr/$(get_libdir)/pkgconfig/libcanlock3.pc } diff --git a/net-libs/canlock/files/canlock-2b-make.patch b/net-libs/canlock/files/canlock-2b-make.patch deleted file mode 100644 index da90c738af69..000000000000 --- a/net-libs/canlock/files/canlock-2b-make.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,38 +1,39 @@ --CFLAGS = -Iinclude --LDFLAGS = -L. -lcanlock --CC = gcc --STATIC_LIB = libcanlock.a -+CPPFLAGS += -Iinclude -+LDLIBS = -L./src -lcanlock - --all: hmactest canlocktest $(STATIC_LIB) -+all: shared - --sha1test: t/sha1test.c $(STATIC_LIB) -- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS) -+sha1test: t/sha1test.c shared -+ $(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS) - --hmactest: t/hmactest.c $(STATIC_LIB) -- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS) -+hmactest: t/hmactest.c shared -+ $(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS) - --canlocktest: t/canlocktest.c $(STATIC_LIB) -- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS) -+canlocktest: t/canlocktest.c shared -+ $(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS) - --$(STATIC_LIB): -- cd src && make -- ln -s src/libcanlock.a libcanlock.a -+static: -+ cd src && $(MAKE) libcanlock.a -+ ln -sf src/libcanlock.a libcanlock.a -+ -+shared: -+ cd src && $(MAKE) libcanlock.so.2.0.0 - - clean: - rm -f src/*.o t/*.o t/*.out *.gmon gmon.* -- cd src && make clean -+ cd src && $(MAKE) clean - rm -f *.a canlocktest hmactest sha1test *.exe *.h lib-stamp - - install: all -- cd src && make install DESTDIR=$(DESTDIR) -+ cd src && $(MAKE) install DESTDIR=$(DESTDIR) - install --mode=644 include/canlock.h $(DESTDIR)/usr/include -- --test: all -+ -+check: hmactest canlocktest - @echo "hmactest: " -- @./hmactest > t/hmactest.out || echo hmm -+ @LD_LIBRARY_PATH=src/ ./hmactest > t/hmactest.out || echo hmm - @diff t/hmactest.shouldbe t/hmactest.out && echo " Pass." || (echo " **FAIL**" ; exit 1) - @echo "=-=-=-=" - @echo "canlocktest: " -- @./canlocktest > t/canlocktest.out -+ @LD_LIBRARY_PATH=src/ ./canlocktest > t/canlocktest.out - @diff t/canlocktest.shouldbe t/canlocktest.out && echo " Pass." || (echo " **FAIL**" ; exit 1) - @echo "=-=-=-=" ---- a/src/Makefile -+++ b/src/Makefile -@@ -1,32 +1,35 @@ --LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo --CC = gcc - LIBTOOL = libtool --CFLAGS = -I../include -+CPPFLAGS += -I../include - SOURCES = base64.c canlock.c hmac_sha1.c sha1.c --OBJS = base64.o canlock.o hmac_sha1.o sha1.o -+OBJS := $(SOURCES:.c=.o) -+LIBOBJS := $(SOURCES:.c=.lo) - SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2 - SHAREDFLAGS = -fPIC -DPIC - LIBS = libcanlock.a libcanlock.so.2.0.0 - INSTALL = install - -+.SUFFIXES: .c .o .h .lo -+ - all: $(LIBS) - --libcanlock.a: -- $(CC) $(CFLAGS) -c $(SOURCES) -- ar cru libcanlock.a $(OBJS) -- ranlib libcanlock.a -- rm $(OBJS) -- --libcanlock.so.2.0.0: -- $(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES) -- $(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 -+.c.lo: -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(SHAREDFLAGS) -c -o $@ $< -+ -+libcanlock.a: $(OBJS) -+ $(AR) cru libcanlock.a $(OBJS) -+ $(RANLIB) libcanlock.a -+ -+libcanlock.so.2.0.0: $(LIBOBJS) -+ $(CC) -shared $(LIBOBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 -+ ln -s libcanlock.so.2.0.0 libcanlock.so -+ ln -s libcanlock.so.2.0.0 libcanlock.so.2 - - install: all - $(INSTALL) libcanlock.so.2.0.0 $(DESTDIR)/usr/lib - cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so.2 - cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so - $(INSTALL) libcanlock.a $(DESTDIR)/usr/lib/libcanlock.a -- ranlib $(DESTDIR)/usr/lib/libcanlock.a -- -+ $(RANLIB) $(DESTDIR)/usr/lib/libcanlock.a -+ - clean: -- rm -f $(OBJS) $(LIBS) -+ rm -f $(OBJS) $(LIBOBJS) $(LIBS) diff --git a/net-libs/canlock/metadata.xml b/net-libs/canlock/metadata.xml index 84c5f5b30769..74e1f5c9b3cb 100644 --- a/net-libs/canlock/metadata.xml +++ b/net-libs/canlock/metadata.xml @@ -9,8 +9,7 @@ </maintainer> </upstream> <use> - <flag name="legacy" restrict=">=net-libs/canlock-3.0"> - Enable or disable building legacy code (v2 compatible) - </flag> + <flag name="header-parser">Build article header parsers</flag> + <flag name="legacy">Build legacy API (v2 compatible)</flag> </use> </pkgmetadata> diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest index aa1b7ec5f3e4..8a5ce38124eb 100644 --- a/net-libs/courier-authlib/Manifest +++ b/net-libs/courier-authlib/Manifest @@ -1,6 +1,3 @@ -DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614 -DIST courier-authlib-0.70.0.tar.bz2 2183323 BLAKE2B ebf58f8c4e7b58766edc684ced590ea7bfa692eff19a483f4ab7748a73e96e1c66858985ac89e281205838660a72e9a33e3b3c28fce3f94d981b61ca56b1e2b1 SHA512 61ce62860cc7ceb51f255a0659bf9b8f4172d0c1c8aee06d9821144330f9526f54e6bdb0158f2fd754d6ad92fd4cc84306b949d46c92e8aed47a397023b36b65 DIST courier-authlib-0.71.0.tar.bz2 2207895 BLAKE2B 8eb92b2c07acfb662b34a2234759a80f3a1b5a96c9e537cd6215bd9a9a607ed8995461dd599e4fe2698e70510f11815ad13a0511446303ae5e26ff616f05d92f SHA512 7a9700c472fd9d6942bd15dfd8db474a738817608bcd8106b6211b24cdc0631fd69f99e7a5c9e9f6088c16b53a9304ec429c031b16621f8ef52581af8a4256ec -DIST courier-authlib-0.71.1.tar.bz2 2208870 BLAKE2B 5058a5d3182c53020c3be0a693908bd90e6e2397f03124df3efd7c3bd39ebdc794166d49c6153880bbf93518afbf4388160680cd701236b075b6e59624fb6882 SHA512 a1b36f4f3b0f11fb34e5dab197b3a0471bc6a99528fe77836b3b2d12f9dac292be4c181aeba5afa3410685dd6882ed00ff6692e74cd0132ba591de1294d0f2d7 -DIST courier-authlib-0.71.2.tar.bz2 2208460 BLAKE2B 49aaea85032166ba4867e7834bb2f6c8d3eccb0ebe24b94bac3033a3da2154e3162d06892354b37eb0c38db092ce0096b050246db341b18a32065c19f322238a SHA512 b0bd2356013d48a998908d4825901e8e730ec276699005696948781e8af4014e25eded3116fa5a8a38b6236e9713f454170628b51aedab7b7d2ebec082643a47 -DIST courier-authlib-0.71.3.tar.bz2 2208794 BLAKE2B 4b0f56f066368383d471dd8f46941f7b652a87be939ba6319cf99115991c03dd117d6bc246cc802fa7066ce5c75aaa102c59ae397948dd31ddbbb024059566ef SHA512 02c55ff1a91aac581942f8a4a01edd2bb8e2e1a07faf551d40a97583ce2f6eab12e850e3170df255c1e7680a34e418784ec14bb033825d6bac21192ae37ce55d +DIST courier-authlib-0.72.0.tar.bz2 2274507 BLAKE2B 238fbc8d046dd3c1f2eb6357f9b1995dd666171dfb8a6ba40ee68446bc6cfb9624b53f4603376119798130d5319f5489690bf1567d9d59db4448a4478aff2dc9 SHA512 1d04c3a10fffddfd2c3cae1c5543a01ec6fcc4ccdf77b13714542ce7189e4924836a64123a9e7231fda698cca9a930be65a4a2382f3cd96364635f754bf40ce3 +DIST courier-authlib-0.72.1.tar.bz2 2288448 BLAKE2B 0af13cb4d4e8661011acae46c7134ed7d76b5d114129846397bbaf95db3d05ac792a99c9088e1101c0d8f040bccace9e813d54bc864cabb67ba2501701567bce SHA512 2e46f3ee91dc3b0e81e1f2fb2ebae9615fd1bc2349946167ebb0d6701fc60f1ed754f0d9de160730b45991869ab30849f153a0e523777f5eae28f8a38426e814 diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0-r4.ebuild index 14023d2a01b0..ece2afb8970c 100644 --- a/net-libs/courier-authlib/courier-authlib-0.71.0-r3.ebuild +++ b/net-libs/courier-authlib/courier-authlib-0.71.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,12 +6,12 @@ EAPI=7 inherit flag-o-matic DESCRIPTION="Courier authentication library" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2" HOMEPAGE="https://www.courier-mta.org/authlib/" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86" IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs" RESTRICT="!berkdb? ( test )" @@ -22,7 +22,7 @@ DEPEND="net-mail/mailbase gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= - ldap? ( >=net-nds/openldap-1.2.11 ) + ldap? ( >=net-nds/openldap-1.2.11:= ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) @@ -60,7 +60,6 @@ src_configure() { --sharedstatedir=/var/lib/courier/com \ --with-authdaemonvar=/var/lib/courier/authdaemon \ --with-authshadow \ - --without-redhat \ --with-mailuser=mail \ --with-mailgroup=mail \ --cache-file="${S}/configuring.cache" \ diff --git a/net-libs/courier-authlib/courier-authlib-0.71.1-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.1-r3.ebuild deleted file mode 100644 index a72659a6479f..000000000000 --- a/net-libs/courier-authlib/courier-authlib-0.71.1-r3.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Courier authentication library" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" -HOMEPAGE="https://www.courier-mta.org/authlib/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs" - -RESTRICT="!berkdb? ( test )" - -DEPEND="net-mail/mailbase - >=net-libs/courier-unicode-2.1.2:= - virtual/libcrypt:= - gdbm? ( sys-libs/gdbm:= ) - !gdbm? ( sys-libs/db:= ) - dev-libs/openssl:0= - ldap? ( >=net-nds/openldap-1.2.11 ) - mysql? ( dev-db/mysql-connector-c:= ) - pam? ( sys-libs/pam ) - postgres? ( dev-db/postgresql:= ) - sqlite? ( dev-db/sqlite:3 )" - -RDEPEND="${DEPEND}" - -pkg_setup() { - if ! has_version 'dev-tcltk/expect' ; then - ewarn 'The dev-tcltk/expect package is not installed.' - ewarn 'Without it, you will not be able to change system login passwords.' - ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,' - ewarn 'and others) will work just fine.' - fi -} - -src_configure() { - filter-flags -fomit-frame-pointer - local myconf - if use berkdb ; then - if use gdbm ; then - ewarn "Both gdbm and berkdb selected. Using gdbm." - else - myconf="--with-db=db" - fi - fi - use gdbm && myconf="--with-db=gdbm" - use debug && myconf+=" debug=true" - use sqlite && myconf+=" --with-sqlite-libs" - - econf \ - --sysconfdir=/etc/courier \ - --datadir=/usr/share/courier \ - --localstatedir=/var/lib/courier \ - --sharedstatedir=/var/lib/courier/com \ - --with-authdaemonvar=/var/lib/courier/authdaemon \ - --with-authshadow \ - --without-redhat \ - --with-mailuser=mail \ - --with-mailgroup=mail \ - --cache-file="${S}/configuring.cache" \ - $(use_with pam authpam) \ - $(use_with ldap authldap) \ - $(use_with mysql authmysql) \ - $(use_with postgres authpgsql) \ - $(use_with sqlite authsqlite) \ - ${myconf} -} - -orderfirst() { - file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}" - if [[ -e "${file}" ]] ; then - orig="$(grep ^${option}= ${file} | cut -d\" -f 2)" - new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/ / /g\"`\"" - sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die - fi -} - -finduserdb() { - for dir in \ - /etc/courier/authlib /etc/courier /etc/courier-imap \ - /usr/lib/courier/etc /usr/lib/courier-imap/etc \ - /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \ - /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \ - /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do - if [[ -e "${dir}/userdb" ]] ; then - einfo "Found userdb at: ${dir}/userdb" - cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die - chmod go-rwx "${D}/etc/courier/authlib/userdb" || die - continue - fi - done -} - -src_install() { - diropts -o mail -g mail - dodir /etc/courier - keepdir /var/lib/courier/authdaemon - keepdir /etc/courier/authlib - emake DESTDIR="${D}" install - [[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb - emake DESTDIR="${D}" install-configure - rm -f "${D}"/etc/courier/authlib/*.bak - chown mail:mail "${D}"/etc/courier/authlib/* || die - for y in "${D}"/etc/courier/authlib/*.dist ; do - [[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}" - done - use pam && orderfirst authdaemonrc authmodulelist authpam - use ldap && orderfirst authdaemonrc authmodulelist authldap - use sqlite && orderfirst authdaemonrc authmodulelist authsqlite - use postgres && orderfirst authdaemonrc authmodulelist authpgsql - use mysql && orderfirst authdaemonrc authmodulelist authmysql - - DOCS=( AUTHORS ChangeLog* INSTALL NEWS README ) - HTML_DOCS=( README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html ) - if use mysql ; then - DOCS+=( README.authmysql.myownquery ) - HTML_DOCS+=( README.authmysql.html ) - fi - if use postgres ; then - HTML_DOCS+=( README.authpostgres.html README.authmysql.html ) - fi - if use ldap ; then - DOCS+=( README.ldap ) - dodir /etc/openldap/schema - cp -f authldap.schema "${D}/etc/openldap/schema/" || die - fi - if use sqlite ; then - HTML_DOCS+=( README.authsqlite.html README.authmysql.html ) - fi - einstalldocs - - newinitd "${FILESDIR}/${PN}-r2" "${PN}" - - use static-libs || find "${D}" -name "*.a" -delete -} - -pkg_postinst() { - if [[ -e /etc/courier/authlib/userdb ]] ; then - einfo "Running makeuserdb ..." - chmod go-rwx /etc/courier/authlib/userdb || die - makeuserdb - fi -} diff --git a/net-libs/courier-authlib/courier-authlib-0.71.2-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.2-r3.ebuild deleted file mode 100644 index 50ad7474ac45..000000000000 --- a/net-libs/courier-authlib/courier-authlib-0.71.2-r3.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Courier authentication library" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" -HOMEPAGE="https://www.courier-mta.org/authlib/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs" - -RESTRICT="!berkdb? ( test )" - -DEPEND="net-mail/mailbase - >=net-libs/courier-unicode-2.2.3:= - virtual/libcrypt:= - gdbm? ( sys-libs/gdbm:= ) - !gdbm? ( sys-libs/db:= ) - dev-libs/openssl:0= - ldap? ( >=net-nds/openldap-1.2.11 ) - mysql? ( dev-db/mysql-connector-c:= ) - pam? ( sys-libs/pam ) - postgres? ( dev-db/postgresql:= ) - sqlite? ( dev-db/sqlite:3 )" - -RDEPEND="${DEPEND}" - -pkg_setup() { - if ! has_version 'dev-tcltk/expect' ; then - ewarn 'The dev-tcltk/expect package is not installed.' - ewarn 'Without it, you will not be able to change system login passwords.' - ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,' - ewarn 'and others) will work just fine.' - fi -} - -src_configure() { - filter-flags -fomit-frame-pointer - local myconf - if use berkdb ; then - if use gdbm ; then - ewarn "Both gdbm and berkdb selected. Using gdbm." - else - myconf="--with-db=db" - fi - fi - use gdbm && myconf="--with-db=gdbm" - use debug && myconf+=" debug=true" - use sqlite && myconf+=" --with-sqlite-libs" - - econf \ - --sysconfdir=/etc/courier \ - --datadir=/usr/share/courier \ - --localstatedir=/var/lib/courier \ - --sharedstatedir=/var/lib/courier/com \ - --with-authdaemonvar=/var/lib/courier/authdaemon \ - --with-authshadow \ - --without-redhat \ - --with-mailuser=mail \ - --with-mailgroup=mail \ - --cache-file="${S}/configuring.cache" \ - $(use_with pam authpam) \ - $(use_with ldap authldap) \ - $(use_with mysql authmysql) \ - $(use_with postgres authpgsql) \ - $(use_with sqlite authsqlite) \ - ${myconf} -} - -orderfirst() { - file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}" - if [[ -e "${file}" ]] ; then - orig="$(grep ^${option}= ${file} | cut -d\" -f 2)" - new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/ / /g\"`\"" - sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die - fi -} - -finduserdb() { - for dir in \ - /etc/courier/authlib /etc/courier /etc/courier-imap \ - /usr/lib/courier/etc /usr/lib/courier-imap/etc \ - /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \ - /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \ - /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do - if [[ -e "${dir}/userdb" ]] ; then - einfo "Found userdb at: ${dir}/userdb" - cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die - chmod go-rwx "${D}/etc/courier/authlib/userdb" || die - continue - fi - done -} - -src_install() { - diropts -o mail -g mail - dodir /etc/courier - keepdir /var/lib/courier/authdaemon - keepdir /etc/courier/authlib - emake DESTDIR="${D}" install - [[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb - emake DESTDIR="${D}" install-configure - rm -f "${D}"/etc/courier/authlib/*.bak - chown mail:mail "${D}"/etc/courier/authlib/* || die - for y in "${D}"/etc/courier/authlib/*.dist ; do - [[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}" - done - use pam && orderfirst authdaemonrc authmodulelist authpam - use ldap && orderfirst authdaemonrc authmodulelist authldap - use sqlite && orderfirst authdaemonrc authmodulelist authsqlite - use postgres && orderfirst authdaemonrc authmodulelist authpgsql - use mysql && orderfirst authdaemonrc authmodulelist authmysql - - DOCS=( AUTHORS ChangeLog* INSTALL NEWS README ) - HTML_DOCS=( README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html ) - if use mysql ; then - DOCS+=( README.authmysql.myownquery ) - HTML_DOCS+=( README.authmysql.html ) - fi - if use postgres ; then - HTML_DOCS+=( README.authpostgres.html README.authmysql.html ) - fi - if use ldap ; then - DOCS+=( README.ldap ) - dodir /etc/openldap/schema - cp -f authldap.schema "${D}/etc/openldap/schema/" || die - fi - if use sqlite ; then - HTML_DOCS+=( README.authsqlite.html README.authmysql.html ) - fi - einstalldocs - - newinitd "${FILESDIR}/${PN}-r2" "${PN}" - - use static-libs || find "${D}" -name "*.a" -delete -} - -pkg_postinst() { - if [[ -e /etc/courier/authlib/userdb ]] ; then - einfo "Running makeuserdb ..." - chmod go-rwx /etc/courier/authlib/userdb || die - makeuserdb - fi -} diff --git a/net-libs/courier-authlib/courier-authlib-0.71.3-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.3-r1.ebuild deleted file mode 100644 index c96a75a26e05..000000000000 --- a/net-libs/courier-authlib/courier-authlib-0.71.3-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Courier authentication library" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" -HOMEPAGE="https://www.courier-mta.org/authlib/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs" - -RESTRICT="!berkdb? ( test )" - -DEPEND="net-mail/mailbase - >=net-libs/courier-unicode-2.2.3:= - virtual/libcrypt:= - gdbm? ( sys-libs/gdbm:= ) - !gdbm? ( sys-libs/db:= ) - dev-libs/openssl:0= - ldap? ( >=net-nds/openldap-1.2.11 ) - mysql? ( dev-db/mysql-connector-c:= ) - pam? ( sys-libs/pam ) - postgres? ( dev-db/postgresql:= ) - sqlite? ( dev-db/sqlite:3 )" - -RDEPEND="${DEPEND}" - -pkg_setup() { - if ! has_version 'dev-tcltk/expect' ; then - ewarn 'The dev-tcltk/expect package is not installed.' - ewarn 'Without it, you will not be able to change system login passwords.' - ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,' - ewarn 'and others) will work just fine.' - fi -} - -src_configure() { - filter-flags -fomit-frame-pointer - local myconf - if use berkdb ; then - if use gdbm ; then - ewarn "Both gdbm and berkdb selected. Using gdbm." - else - myconf="--with-db=db" - fi - fi - use gdbm && myconf="--with-db=gdbm" - use debug && myconf+=" debug=true" - use sqlite && myconf+=" --with-sqlite-libs" - - econf \ - --sysconfdir=/etc/courier \ - --datadir=/usr/share/courier \ - --localstatedir=/var/lib/courier \ - --sharedstatedir=/var/lib/courier/com \ - --with-authdaemonvar=/var/lib/courier/authdaemon \ - --with-authshadow \ - --without-redhat \ - --with-mailuser=mail \ - --with-mailgroup=mail \ - --cache-file="${S}/configuring.cache" \ - $(use_with pam authpam) \ - $(use_with ldap authldap) \ - $(use_with mysql authmysql) \ - $(use_with postgres authpgsql) \ - $(use_with sqlite authsqlite) \ - ${myconf} -} - -orderfirst() { - file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}" - if [[ -e "${file}" ]] ; then - orig="$(grep ^${option}= ${file} | cut -d\" -f 2)" - new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/ / /g\"`\"" - sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die - fi -} - -finduserdb() { - for dir in \ - /etc/courier/authlib /etc/courier /etc/courier-imap \ - /usr/lib/courier/etc /usr/lib/courier-imap/etc \ - /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \ - /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \ - /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do - if [[ -e "${dir}/userdb" ]] ; then - einfo "Found userdb at: ${dir}/userdb" - cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die - chmod go-rwx "${D}/etc/courier/authlib/userdb" || die - continue - fi - done -} - -src_install() { - diropts -o mail -g mail - dodir /etc/courier - keepdir /var/lib/courier/authdaemon - keepdir /etc/courier/authlib - emake DESTDIR="${D}" install - [[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb - emake DESTDIR="${D}" install-configure - rm -f "${D}"/etc/courier/authlib/*.bak - chown mail:mail "${D}"/etc/courier/authlib/* || die - for y in "${D}"/etc/courier/authlib/*.dist ; do - [[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}" - done - use pam && orderfirst authdaemonrc authmodulelist authpam - use ldap && orderfirst authdaemonrc authmodulelist authldap - use sqlite && orderfirst authdaemonrc authmodulelist authsqlite - use postgres && orderfirst authdaemonrc authmodulelist authpgsql - use mysql && orderfirst authdaemonrc authmodulelist authmysql - - DOCS=( AUTHORS ChangeLog* INSTALL NEWS README ) - HTML_DOCS=( README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html ) - if use mysql ; then - DOCS+=( README.authmysql.myownquery ) - HTML_DOCS+=( README.authmysql.html ) - fi - if use postgres ; then - HTML_DOCS+=( README.authpostgres.html README.authmysql.html ) - fi - if use ldap ; then - DOCS+=( README.ldap ) - dodir /etc/openldap/schema - cp -f authldap.schema "${D}/etc/openldap/schema/" || die - fi - if use sqlite ; then - HTML_DOCS+=( README.authsqlite.html README.authmysql.html ) - fi - einstalldocs - - newinitd "${FILESDIR}/${PN}-r2" "${PN}" - - use static-libs || find "${D}" -name "*.a" -delete -} - -pkg_postinst() { - if [[ -e /etc/courier/authlib/userdb ]] ; then - einfo "Running makeuserdb ..." - chmod go-rwx /etc/courier/authlib/userdb || die - makeuserdb - fi -} diff --git a/net-libs/courier-authlib/courier-authlib-0.70.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.72.0.ebuild index c2e8c3099c6e..df618f6dc122 100644 --- a/net-libs/courier-authlib/courier-authlib-0.70.0-r3.ebuild +++ b/net-libs/courier-authlib/courier-authlib-0.72.0.ebuild @@ -1,28 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic DESCRIPTION="Courier authentication library" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2" HOMEPAGE="https://www.courier-mta.org/authlib/" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs" RESTRICT="!berkdb? ( test )" DEPEND="net-mail/mailbase - >=net-libs/courier-unicode-2.1:= + >=net-libs/courier-unicode-2.2.6:= virtual/libcrypt:= gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= - ldap? ( >=net-nds/openldap-1.2.11 ) + ldap? ( >=net-nds/openldap-1.2.11:= ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) @@ -60,7 +60,6 @@ src_configure() { --sharedstatedir=/var/lib/courier/com \ --with-authdaemonvar=/var/lib/courier/authdaemon \ --with-authshadow \ - --without-redhat \ --with-mailuser=mail \ --with-mailgroup=mail \ --cache-file="${S}/configuring.cache" \ diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r4.ebuild b/net-libs/courier-authlib/courier-authlib-0.72.1.ebuild index 14023d2a01b0..05cd92b25e3a 100644 --- a/net-libs/courier-authlib/courier-authlib-0.69.0-r4.ebuild +++ b/net-libs/courier-authlib/courier-authlib-0.72.1.ebuild @@ -1,28 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic DESCRIPTION="Courier authentication library" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2" HOMEPAGE="https://www.courier-mta.org/authlib/" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs" RESTRICT="!berkdb? ( test )" DEPEND="net-mail/mailbase - >=net-libs/courier-unicode-2.1:= + >=net-libs/courier-unicode-2.3.0:= virtual/libcrypt:= + dev-libs/libltdl gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= - ldap? ( >=net-nds/openldap-1.2.11 ) + ldap? ( >=net-nds/openldap-1.2.11:= ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) @@ -60,7 +61,6 @@ src_configure() { --sharedstatedir=/var/lib/courier/com \ --with-authdaemonvar=/var/lib/courier/authdaemon \ --with-authshadow \ - --without-redhat \ --with-mailuser=mail \ --with-mailgroup=mail \ --cache-file="${S}/configuring.cache" \ diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest index ab8426190239..7765f43bb59c 100644 --- a/net-libs/courier-unicode/Manifest +++ b/net-libs/courier-unicode/Manifest @@ -1,3 +1,3 @@ -DIST courier-unicode-2.1.2.tar.bz2 445242 BLAKE2B 118afeefbb0d957f3a0b7a39e573edbdc3fa1d85c1028f4aca46137402f01a6b4d5df11c48e9d8235483ba277e187863d3f8f7b1cf426a1b5f2d40eb243cca4f SHA512 97d1c12917a1d415b4dfb8155e2573e0e4101112433107e252e393765fa88edd5aa8d349a2c201ea951bf0e9d51ac0f0c6444494c308fbe9909929364661bc24 DIST courier-unicode-2.1.tar.bz2 447917 BLAKE2B 0d225849322ccaacea9eef49225952ac5219ab2967f30ca1c0412b73790b77682a077c2c08cff7b606cc1fdc6542db7e0895afdf7ba34f73e2a71aba5311df99 SHA512 1ee0bb3a548bfae4ebdc92ff8eeff5d22705c0df55e37e98880a12f1bfb186034e0c1ea2e1f03073b40e1d11147828304be93467d5d51e394fe39fd57bbbb46e -DIST courier-unicode-2.2.3.tar.bz2 593337 BLAKE2B b384aaac20ae645f4eaf256c90e50dda4e7b7e78f91188fbadae9851c7fb1c994b1b91b942a02cabbea357e15bc3d9e9d64f97d2810a359604303905b3d03fba SHA512 aab25e9b095e11e5744d4148b50d95ded2a5613c48146f90dacb796eba82aaf41b0ea86ec82a0edd702ad2a8c00bb7f784e12c3ddd01777a19edb3da10a168f3 +DIST courier-unicode-2.2.6.tar.bz2 598551 BLAKE2B 870e3add65747354ea8a91d58272a588bec84553ebbbff68ce6fb1ffc36a3d359a7988b696c6af0dcd5e25bf95dac5de6ce4abc999ab7c41edb6f7d8971087e7 SHA512 02db2da4cec2daecbfc953f4bbe6df34d68554668371a740a20c90707b8d6fe7d516e0c8fec83f6cecdd9bab239cbc1f5adef004babd67d642aed81e5b653940 +DIST courier-unicode-2.3.0.tar.bz2 657354 BLAKE2B 4ccb4743330b5da8b4ab8f39d3ca186bcb826ef466a909d6cc011df5c2e15a8d547cf59f44dc40a02108d08695fa2747eab0050c3cd3e913277c9cc32ddf61db SHA512 f0db382a5c3fbe76fa1395e90f5f5489f83e95753f95058aa1c1b16dbcd5aba0425e88674337d18d32d00ed932609c3e984ae684bb122fea40eaae9489f470d4 diff --git a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild index a80fccb27ac7..d8484f19bb25 100644 --- a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild +++ b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Unicode library used by the courier mail server" HOMEPAGE="https://www.courier-mta.org/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86" IUSE="" src_configure() { diff --git a/net-libs/courier-unicode/courier-unicode-2.1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1.ebuild deleted file mode 100644 index 483c9d41a566..000000000000 --- a/net-libs/courier-unicode/courier-unicode-2.1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Unicode library used by the courier mail server" -HOMEPAGE="https://www.courier-mta.org/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="" - -src_install() { - default - find "${D}" -name '*.la' -delete || die - dodoc AUTHORS ChangeLog README -} diff --git a/net-libs/courier-unicode/courier-unicode-2.2.3-r1.ebuild b/net-libs/courier-unicode/courier-unicode-2.2.6.ebuild index dbb52817c9bf..2f15ac136155 100644 --- a/net-libs/courier-unicode/courier-unicode-2.2.3-r1.ebuild +++ b/net-libs/courier-unicode/courier-unicode-2.2.6.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Unicode library used by the courier mail server" HOMEPAGE="https://www.courier-mta.org/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0/7" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" src_configure() { econf --disable-static diff --git a/net-libs/courier-unicode/courier-unicode-2.1.2.ebuild b/net-libs/courier-unicode/courier-unicode-2.3.0.ebuild index 6948fe87918a..a78fc0a57891 100644 --- a/net-libs/courier-unicode/courier-unicode-2.1.2.ebuild +++ b/net-libs/courier-unicode/courier-unicode-2.3.0.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Unicode library used by the courier mail server" HOMEPAGE="https://www.courier-mta.org/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2" + LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" +SLOT="0/7" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" src_configure() { econf --disable-static diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest index c871669859bc..a146c041ae14 100644 --- a/net-libs/cppzmq/Manifest +++ b/net-libs/cppzmq/Manifest @@ -1 +1 @@ -DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B 282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0 SHA512 f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027 +DIST cppzmq-4.9.0.tar.gz 46936 BLAKE2B 230c5a983fb902bdf880b1b0464033a389c500cae635b501275cc3df0980765bd48c1e1a1bb4e1a3d49b1fe63648d77feebc39a7f35c0474bfdc7e2e918c920f SHA512 a9d1c25084b5b84dfa20a005299213c3bb610e46ac7433236fd8d3c60c7e71153c738da4645343080c0d1cad9008aca1a3091d4247c7a2f08c506ed3054d55a7 diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild b/net-libs/cppzmq/cppzmq-4.9.0.ebuild index 8ac687bd6ab7..2b4063863cad 100644 --- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild +++ b/net-libs/cppzmq/cppzmq-4.9.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x86-linux" IUSE="test" RESTRICT="!test? ( test )" @@ -19,13 +19,10 @@ RESTRICT="!test? ( test )" RDEPEND=">=net-libs/zeromq-4.3.1" # Tests require cmake modules from catch2 and headers from older version of catch DEPEND="${RDEPEND} - test? ( >=dev-cpp/catch-2.5.0 - <dev-cpp/catch-2 - )" + test? ( =dev-cpp/catch-2* )" PATCHES=( - "${FILESDIR}/${PN}-disable-static.patch" - "${FILESDIR}/${PN}-use-system-catch2.patch" + "${FILESDIR}/${P}-disable-static.patch" ) src_configure() { @@ -38,8 +35,3 @@ src_configure() { fi cmake_src_configure } - -src_install() { - cmake_src_install - einstalldocs -} diff --git a/net-libs/cppzmq/files/cppzmq-4.9.0-disable-static.patch b/net-libs/cppzmq/files/cppzmq-4.9.0-disable-static.patch new file mode 100644 index 000000000000..d34893a60f05 --- /dev/null +++ b/net-libs/cppzmq/files/cppzmq-4.9.0-disable-static.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 05001ad..c640fd7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ if (NOT TARGET libzmq AND NOT TARGET libzmq-static) + message(FATAL_ERROR "ZeroMQ was not found, neither as a CMake package nor via pkg-config") + endif() + +- if (ZeroMQ_FOUND AND NOT (TARGET libzmq OR TARGET libzmq-static)) ++ if (ZeroMQ_FOUND AND NOT TARGET libzmq) + message(FATAL_ERROR "ZeroMQ version not supported!") + endif() + endif() +@@ -52,7 +52,6 @@ foreach (target cppzmq cppzmq-static) + endforeach() + + target_link_libraries(cppzmq INTERFACE libzmq) +-target_link_libraries(cppzmq-static INTERFACE libzmq-static) + + include(GNUInstallDirs) + include(CMakePackageConfigHelpers) diff --git a/net-libs/cppzmq/files/cppzmq-disable-static.patch b/net-libs/cppzmq/files/cppzmq-disable-static.patch deleted file mode 100644 index 12b1c2231205..000000000000 --- a/net-libs/cppzmq/files/cppzmq-disable-static.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,7 +20,7 @@ - message(FATAL_ERROR "ZeroMQ was not found, neither as a CMake package nor via pkg-config") - endif() - --if (ZeroMQ_FOUND AND (NOT TARGET libzmq OR NOT TARGET libzmq-static)) -+if (ZeroMQ_FOUND AND NOT TARGET libzmq) - message(FATAL_ERROR "ZeroMQ version not supported!") - endif() - -@@ -43,19 +43,20 @@ - zmq_addon.hpp - ) - --foreach (target cppzmq cppzmq-static) -+set (cppzmq_targets cppzmq cppzmq-static) -+ -+foreach (target ${cppzmq_targets}) - add_library(${target} INTERFACE) - target_include_directories(${target} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - $<INSTALL_INTERFACE:include>) - endforeach() - - target_link_libraries(cppzmq INTERFACE libzmq) --target_link_libraries(cppzmq-static INTERFACE libzmq-static) - - include(GNUInstallDirs) - include(CMakePackageConfigHelpers) - --install(TARGETS cppzmq cppzmq-static -+install(TARGETS ${cppzmq_targets} - EXPORT ${PROJECT_NAME}-targets) - - install(FILES ${CPPZMQ_HEADERS} diff --git a/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch b/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch deleted file mode 100644 index b15b9172ad43..000000000000 --- a/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -9,9 +9,10 @@ - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}) - -+find_package(Catch2 REQUIRED) - include(CTest) --include(cmake/catch.cmake) --include(${CATCH_MODULE_PATH}/Catch.cmake) -+include(Catch) -+find_path(CATCH_INCLUDE_DIR "catch.hpp" HINT /usr/include/catch/) - - find_package(Threads) - -@@ -31,9 +32,9 @@ - utilities.cpp - ) - --add_dependencies(unit_tests catch) -+add_dependencies(unit_tests Catch2::Catch2) - --target_include_directories(unit_tests PUBLIC ${CATCH_MODULE_PATH}) -+target_include_directories(unit_tests PUBLIC ${CATCH_INCLUDE_DIR}) - target_link_libraries( - unit_tests - PRIVATE cppzmq diff --git a/net-libs/cvm/cvm-0.97-r1.ebuild b/net-libs/cvm/cvm-0.97-r2.ebuild index 4f0ebc583cec..7a04cec225ba 100644 --- a/net-libs/cvm/cvm-0.97-r1.ebuild +++ b/net-libs/cvm/cvm-0.97-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/cvm/archive/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ppc sparc x86" +KEYWORDS="~amd64 sparc x86" IUSE="mysql postgres test vpopmail" RESTRICT="!test? ( test )" @@ -19,7 +19,7 @@ RDEPEND="dev-db/cdb:= >=dev-libs/bglibs-2.04:0= virtual/libcrypt:= mysql? ( dev-db/mysql-connector-c:0= ) - postgres? ( dev-db/postgresql[server] ) + postgres? ( dev-db/postgresql:*[server] ) vpopmail? ( net-mail/vpopmail )" DEPEND="${RDEPEND} test? ( diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest index 8e879cecd352..d50579096f33 100644 --- a/net-libs/czmq/Manifest +++ b/net-libs/czmq/Manifest @@ -1,2 +1 @@ -DIST czmq-4.2.0.tar.gz 1522824 BLAKE2B 2b2ec308f37a122d5478f63ed029c5ac01d8da40e676e812ec321e039839c7d364fef3eef67df928e6514f0fd2cd65ae35ba89347ead2b44c610812a012364dd SHA512 a3716efbece193196355fb7055b7e81067d29551765de2533178804ca5d85f98cd8cd01f88b4eecbea905adf3b7513e3b8a7e78e350adf1a6e69edbea5f6260c DIST czmq-4.2.1.tar.gz 1617066 BLAKE2B 5b635ccd7e85f05cd4f81f1ddaef80f7478feccfb916b1a7317f539354d0a4dabb7bf14a9dbee4dae3f6fbfcaf402c51ee9ba9810d952fc837c03c14304d4dab SHA512 776c524ffeba3dbe2534351f91623a6f9db31268aa2e794e29b7eca99c9fd0a726de0f7fba4376a5b3d7321b1033314e86644efaa5a9c7226fc1f06805f7aa9f diff --git a/net-libs/czmq/czmq-4.2.0.ebuild b/net-libs/czmq/czmq-4.2.0.ebuild deleted file mode 100644 index 678a10dbc555..000000000000 --- a/net-libs/czmq/czmq-4.2.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="High-level C Binding for ZeroMQ" -HOMEPAGE="http://czmq.zeromq.org" -SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0/4" -KEYWORDS="amd64 arm arm64 ~hppa x86" -IUSE="curl drafts http-client http-server lz4 static-libs systemd +uuid" - -BDEPEND="app-text/asciidoc - app-text/xmlto - virtual/pkgconfig" - -RDEPEND=">=net-libs/zeromq-4:=[drafts?] - http-client? ( net-misc/curl ) - http-server? ( net-libs/libmicrohttpd:= ) - lz4? ( app-arch/lz4:= ) - systemd? ( sys-apps/systemd ) - uuid? ( sys-apps/util-linux:0= )" - -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS NEWS README.md ) - -src_configure() { - local myeconfargs=( - --enable-drafts=$(usex drafts) - --with-docs=no - --with-uuid=$(usex uuid) - --with-libcurl=$(usex http-client) - --with-libmicrohttpd=$(usex http-server) - --with-libsystemd=$(usex systemd) - --with-liblz4=$(usex lz4) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if ! use static-libs ; then - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die - fi -} diff --git a/net-libs/czmq/czmq-4.2.1.ebuild b/net-libs/czmq/czmq-4.2.1.ebuild index 4811dcd20d22..0e76450ec3f8 100644 --- a/net-libs/czmq/czmq-4.2.1.ebuild +++ b/net-libs/czmq/czmq-4.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -9,8 +9,9 @@ SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="MPL-2.0" SLOT="0/4" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" -IUSE="curl drafts http-client http-server lz4 nss static-libs systemd +uuid" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86" +IUSE="curl drafts http-client http-server lz4 nss static-libs systemd test +uuid" +RESTRICT="!test? ( test )" BDEPEND="app-text/asciidoc app-text/xmlto @@ -41,9 +42,13 @@ src_configure() { --with-libsystemd=$(usex systemd) --with-liblz4=$(usex lz4) --with-nss=$(usex nss) + $(use_enable test czmq_selftest) ) - econf "${myeconfargs[@]}" + # Force bash for configure until the fixes for bug #923922 land in a release + # https://github.com/zeromq/zproject/pull/1336 + # https://github.com/zeromq/libzmq/pull/4651 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" } src_install() { diff --git a/net-libs/czmq/metadata.xml b/net-libs/czmq/metadata.xml index bbd0bd05fd80..85d225c82312 100644 --- a/net-libs/czmq/metadata.xml +++ b/net-libs/czmq/metadata.xml @@ -13,4 +13,7 @@ <flag name="nss">Use <pkg>dev-libs/nss</pkg> for SHA instead of an internal implementation</flag> <flag name="uuid">Enable UUID support using <pkg>sys-apps/util-linux</pkg></flag> </use> + <upstream> + <remote-id type="github">zeromq/czmq</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest index 597a524ae88d..7e4b477841bf 100644 --- a/net-libs/davix/Manifest +++ b/net-libs/davix/Manifest @@ -1 +1,3 @@ -DIST davix-0.7.6.tar 4338692 BLAKE2B 72a918f52993ea358f243df671823a4624ac5650753e06c8f70f75a800f10adfe7f6c63d9c8fdcefb94874e3c60c3909e7aa96969af1210347ea941a42f4b9df SHA512 3e379acc763e72e2e1684121e2688da6c617b2c1f52ffd7a2a2559998a64aba957f09f7b138c57f8f4d7a26caff4fef09952cca48585bb4f6aea1f071aa9a7b7 +DIST davix-0.8.4.tar.gz 7616367 BLAKE2B 0048d066b5ebae0639ea511dfb9147a5c76b73e5f273e0912abd7a10c40228bbbc60fea56f1b91a1c64b396b5ab67a291b42743e037e1e61a14aee2fbb783e09 SHA512 09a0389788b525e3c29639091c11ab4dacf1668efec42a93f3e995663793467b7aaf43daf66351e8a140f760711e96391c1cce0759a7f198110ebe511c0c7a4d +DIST davix-0.8.5.tar.gz 7371985 BLAKE2B 134c4bd35627edcb46bfa5be3ea56b5a6373ea2bfee0261ede722fb4419808e6050b1846a40acf92da75626289e54a6b83f11dd2145b9d647f7cb370d652b696 SHA512 cddd0d7c08566853bb09efbe83041c9261086f972fd207f1ae2b0099dcf6f5ab51ec3889556ad34e28c0be28afcf86fa8adcdc1806a02a884ec3e76573164fe4 +DIST davix-0.8.6.tar.gz 7372108 BLAKE2B 01405cab344d62facc494f2f70f52dc616775830e0ecdd02195fe21c67eea90803eb73138ea0cec91d47f2eb46379d2d2431bbeea74b9487e4c201d3261cac10 SHA512 de9aebb35dc81009fe2f82e5db80f102569d4c6c400e8f99bbead6cc10b1519c598b204ff93606a6d7f824717e8feda4b367234c4a893b7e83705f390a2c9d21 diff --git a/net-libs/davix/davix-0.7.6.ebuild b/net-libs/davix/davix-0.8.4.ebuild index 927b71e5b411..07d1660f6f24 100644 --- a/net-libs/davix/davix-0.7.6.ebuild +++ b/net-libs/davix/davix-0.8.4.ebuild @@ -1,34 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake python-any-r1 DESCRIPTION="High-performance file management over WebDAV/HTTP" -HOMEPAGE="https://dmc.web.cern.ch/projects/davix" -SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN}/${PV}/${P}.tar.gz -> ${P}.tar" +HOMEPAGE="https://github.com/cern-fts/davix" +SRC_URI="https://github.com/cern-fts/${PN}/releases/download/R_${PV//./_}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 x86" -IUSE="doc ipv6 kernel_linux test tools" +IUSE="doc test tools" RESTRICT="!test? ( test )" CDEPEND=" dev-libs/libxml2:2= dev-libs/openssl:0= net-libs/gsoap[ssl,-gnutls] + net-misc/curl:0= kernel_linux? ( sys-apps/util-linux ) " DEPEND="${CDEPEND}" BDEPEND=" doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] dev-python/sphinx ) virtual/pkgconfig + ${PYTHON_DEPS} " RDEPEND="${CDEPEND}" @@ -47,9 +51,12 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DPython_EXECUTABLE="${PYTHON}" -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}" + -DEMBEDDED_LIBCURL=OFF + -DLIBCURL_BACKEND_BY_DEFAULT=OFF -DENABLE_HTML_DOCS=$(usex doc) - -DENABLE_IPV6=$(usex ipv6) + -DENABLE_IPV6=TRUE -DENABLE_TCP_NODELAY=TRUE -DENABLE_THIRD_PARTY_COPY=TRUE -DENABLE_TOOLS=$(usex tools) @@ -71,12 +78,8 @@ src_compile() { src_install() { cmake_src_install - - if ! use tools; then - rm -rf "${ED}/usr/share/man/man1" - fi - if use test; then - rm -rf "${ED}/usr/bin/davix-unit-tests" + rm "${ED}/usr/bin/davix-unit-tests" || die + rm "${ED}/usr/bin/davix-tester" || die fi } diff --git a/net-libs/davix/davix-0.8.5.ebuild b/net-libs/davix/davix-0.8.5.ebuild new file mode 100644 index 000000000000..61e8ecd0f6ec --- /dev/null +++ b/net-libs/davix/davix-0.8.5.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit cmake python-any-r1 + +DESCRIPTION="High-performance file management over WebDAV/HTTP" +HOMEPAGE="https://github.com/cern-fts/davix" +SRC_URI="https://github.com/cern-fts/${PN}/releases/download/R_${PV//./_}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test tools" +RESTRICT="!test? ( test )" + +CDEPEND=" + dev-libs/libxml2:2= + dev-libs/openssl:0= + net-libs/gsoap[ssl,-gnutls] + net-misc/curl:0= + kernel_linux? ( sys-apps/util-linux ) +" + +DEPEND="${CDEPEND}" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + dev-python/sphinx + ) + virtual/pkgconfig + ${PYTHON_DEPS} +" + +RDEPEND="${CDEPEND}" + +REQUIRED_USE="test? ( tools )" + +PATCHES=( + "${FILESDIR}/${P}-gcc14.patch" +) + +src_prepare() { + cmake_src_prepare + + for x in doc test; do + if ! use $x; then + sed -i -e "/add_subdirectory ($x)/d" CMakeLists.txt + fi + done +} + +src_configure() { + local mycmakeargs=( + -DPython_EXECUTABLE="${PYTHON}" + -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}" + -DEMBEDDED_LIBCURL=OFF + -DLIBCURL_BACKEND_BY_DEFAULT=OFF + -DENABLE_HTML_DOCS=$(usex doc) + -DENABLE_IPV6=TRUE + -DENABLE_TCP_NODELAY=TRUE + -DENABLE_THIRD_PARTY_COPY=TRUE + -DENABLE_TOOLS=$(usex tools) + -DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html" + -DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds" + -DSTATIC_LIBRARY=OFF + -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc" + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_src_compile doc + fi +} + +src_install() { + cmake_src_install + if use test; then + rm "${ED}/usr/bin/davix-unit-tests" || die + rm "${ED}/usr/bin/davix-tester" || die + fi +} diff --git a/net-libs/davix/davix-0.8.6.ebuild b/net-libs/davix/davix-0.8.6.ebuild new file mode 100644 index 000000000000..3d0668485246 --- /dev/null +++ b/net-libs/davix/davix-0.8.6.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit cmake python-any-r1 + +DESCRIPTION="High-performance file management over WebDAV/HTTP" +HOMEPAGE="https://github.com/cern-fts/davix" +SRC_URI="https://github.com/cern-fts/${PN}/releases/download/R_${PV//./_}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test tools" +RESTRICT="!test? ( test )" + +CDEPEND=" + dev-libs/libxml2:2= + dev-libs/openssl:0= + net-libs/gsoap[ssl,-gnutls] + net-misc/curl:0= + kernel_linux? ( sys-apps/util-linux ) +" + +DEPEND="${CDEPEND}" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + dev-python/sphinx + ) + virtual/pkgconfig + ${PYTHON_DEPS} +" + +RDEPEND="${CDEPEND}" + +REQUIRED_USE="test? ( tools )" + +PATCHES=( + "${FILESDIR}/${PN}-0.8.5-gcc14.patch" +) + +src_prepare() { + cmake_src_prepare + + for x in doc test; do + if ! use $x; then + sed -i -e "/add_subdirectory ($x)/d" CMakeLists.txt + fi + done +} + +src_configure() { + local mycmakeargs=( + -DPython_EXECUTABLE="${PYTHON}" + -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}" + -DEMBEDDED_LIBCURL=OFF + -DLIBCURL_BACKEND_BY_DEFAULT=OFF + -DENABLE_HTML_DOCS=$(usex doc) + -DENABLE_IPV6=TRUE + -DENABLE_TCP_NODELAY=TRUE + -DENABLE_THIRD_PARTY_COPY=TRUE + -DENABLE_TOOLS=$(usex tools) + -DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html" + -DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds" + -DSTATIC_LIBRARY=OFF + -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc" + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_src_compile doc + fi +} + +src_install() { + cmake_src_install + if use test; then + rm "${ED}/usr/bin/davix-unit-tests" || die + rm "${ED}/usr/bin/davix-tester" || die + fi +} diff --git a/net-libs/davix/files/davix-0.8.5-gcc14.patch b/net-libs/davix/files/davix-0.8.5-gcc14.patch new file mode 100644 index 000000000000..2e2c8bd663ac --- /dev/null +++ b/net-libs/davix/files/davix-0.8.5-gcc14.patch @@ -0,0 +1,12 @@ +Fix bundled rapidjson build with GCC 14. + +--- a/src/libs/rapidjson/document.h ++++ b/src/libs/rapidjson/document.h +@@ -316,8 +316,6 @@ struct GenericStringRef { + + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } +- + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } diff --git a/net-libs/davix/metadata.xml b/net-libs/davix/metadata.xml index e10c61be50c2..caa4378b455e 100644 --- a/net-libs/davix/metadata.xml +++ b/net-libs/davix/metadata.xml @@ -8,4 +8,7 @@ <use> <flag name="tools">Install additional tools</flag> </use> + <upstream> + <remote-id type="github">cern-fts/davix</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/dleyna-connector-dbus/Manifest b/net-libs/dleyna-connector-dbus/Manifest deleted file mode 100644 index 262621e0f630..000000000000 --- a/net-libs/dleyna-connector-dbus/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dleyna-connector-dbus-0.4.0.tar.gz 15046 BLAKE2B 644d9f0703d4675e5173306deffb6b7f300e36b1472d3d31f78d3dac98fa682819b3002e902260e5fe307d1a3060142fb764d3e5e2297362b1a0f0fb154492d5 SHA512 03ad706291549db56c0ad3121a6ecc5f1ecacf0bfa34956a397f8b0682b57fd6f847b0dc73ac5e30684f0ffde38b7b717dcccb00a0498f89b3ccc31e196e279e -DIST dleyna-connector-dbus-0.4.1.tar.gz 15081 BLAKE2B aaff6588da05920b108da5c89c457bc1eeb9d7330ae1c06bc3f95f4d4467c93a6524602cedc455f3db324f0a1fca121d52fdbae135eb57d4fe6face9f86ac680 SHA512 43d9f13304c19bd2fc975283ebc68359d5a7bf174221a8877e31994e393b9c1421440acbbd1b2e9945953c1248e596168aac74b50922080ee6db1b02dac03315 diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.0.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.0.ebuild deleted file mode 100644 index 4b30995f9e4a..000000000000 --- a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="utility library for higher level dLeyna libraries" -HOMEPAGE="https://github.com/phako/dleyna-connector-dbus" -SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="1.0" -KEYWORDS="amd64 ~arm64 ~riscv x86" - -DEPEND=" - >=dev-libs/glib-2.28:2 - >=net-libs/dleyna-core-0.7.0:1.0= -" -RDEPEND="${DEPEND} - >=sys-apps/dbus-1 -" -BDEPEND="virtual/pkgconfig" diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild deleted file mode 100644 index 4b30995f9e4a..000000000000 --- a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="utility library for higher level dLeyna libraries" -HOMEPAGE="https://github.com/phako/dleyna-connector-dbus" -SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="1.0" -KEYWORDS="amd64 ~arm64 ~riscv x86" - -DEPEND=" - >=dev-libs/glib-2.28:2 - >=net-libs/dleyna-core-0.7.0:1.0= -" -RDEPEND="${DEPEND} - >=sys-apps/dbus-1 -" -BDEPEND="virtual/pkgconfig" diff --git a/net-libs/dleyna-connector-dbus/metadata.xml b/net-libs/dleyna-connector-dbus/metadata.xml deleted file mode 100644 index f453528b934f..000000000000 --- a/net-libs/dleyna-connector-dbus/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> -</pkgmetadata> diff --git a/net-libs/dleyna-core/Manifest b/net-libs/dleyna-core/Manifest deleted file mode 100644 index b8ccbd55b1fa..000000000000 --- a/net-libs/dleyna-core/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dleyna-core-0.7.0.tar.gz 28354 BLAKE2B cfc21da2be908701ffe87f653ddbb3e8241f3842031987de9a0615ccc5dcd4f2180aaf9caaf981c6421d9cbfdc4cecb359998988f13f48ac5a5696bf56d7ae79 SHA512 02509d2fc386bc1d7f9295df7a12315a664a9dc4cced871da193dc79e15c3291ad4497cd18c655a7eb3e4d865a6448526c6abc1df2dc086cb7fc94f44c09b7f0 diff --git a/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild deleted file mode 100644 index 80fdf7522e8e..000000000000 --- a/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="utility library for higher level dLeyna libraries" -HOMEPAGE="https://github.com/phako/dleyna-core" -SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="1.0/5" # soname of libdleyna-core-1.0.so -KEYWORDS="amd64 ~arm64 ~riscv x86" - -RDEPEND=" - >=dev-libs/glib-2.28:2 - >=net-libs/gupnp-1.2.0:0= -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" diff --git a/net-libs/dleyna-core/metadata.xml b/net-libs/dleyna-core/metadata.xml deleted file mode 100644 index f453528b934f..000000000000 --- a/net-libs/dleyna-core/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> -</pkgmetadata> diff --git a/net-libs/dleyna-renderer/Manifest b/net-libs/dleyna-renderer/Manifest deleted file mode 100644 index db56df89f045..000000000000 --- a/net-libs/dleyna-renderer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dleyna-renderer-0.7.0.tar.gz 65982 BLAKE2B dc9acf5d3c39cfc8d7b84890b3fda2f4f4856276c1fb900f114a8f07f0459906d99ebe5f941d8953f5b3c635b6eaa5319300510037891aaf2079f88fd92618ec SHA512 6b1b222971780841c5080b769888a42beadaf7cd576f0d07741585e208876179d3cdde123cbd5a2e4129d2b9e0ba18a7edf7626dd8a0cb1d4a45b91340c3e9fe diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild deleted file mode 100644 index 67bf52cbf42d..000000000000 --- a/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="A library to discover and manipulate DLNA renderers" -HOMEPAGE="https://github.com/phako/dleyna-renderer" -SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~riscv" - -DEPEND=" - >=dev-libs/glib-2.28:2 - >=net-libs/gssdp-1.2.0:0= - >=net-libs/gupnp-1.2.0:0= - >=net-libs/gupnp-av-0.11.5 - >=media-libs/gupnp-dlna-0.9.4:2.0 - >=net-libs/libsoup-2.28.2:2.4 - >=net-libs/dleyna-core-0.7.0:1.0= -" -RDEPEND="${DEPEND} - net-libs/dleyna-connector-dbus -" -BDEPEND=" - dev-libs/libxslt - virtual/pkgconfig -" diff --git a/net-libs/dleyna/Manifest b/net-libs/dleyna/Manifest new file mode 100644 index 000000000000..34715dfc69fc --- /dev/null +++ b/net-libs/dleyna/Manifest @@ -0,0 +1 @@ +DIST dLeyna-v0.8.3.tar.bz2 149796 BLAKE2B e1fc2d1d5fa6178856d5114b55dbaae5a969ab7f2b5716ab70c1359755b21927ed0ecfd8d943520254a1ead2b2db368838787f0954bc312712a8075ea3f94896 SHA512 a62c643467b2f75efb9e794802b3bc183a5f8cfe9b80eeaee627aeaa471d7fb107cf1bde549c274ecd86ca06ad5870a481316e1101647c9d7e6243114b5dd06e diff --git a/net-libs/dleyna/dleyna-0.8.3.ebuild b/net-libs/dleyna/dleyna-0.8.3.ebuild new file mode 100644 index 000000000000..faaf7d5b1e06 --- /dev/null +++ b/net-libs/dleyna/dleyna-0.8.3.ebuild @@ -0,0 +1,54 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit meson python-single-r1 + +DESCRIPTION="A set of services and D-Bus APIs to simplify access to UPnP/DLNA media devices" +HOMEPAGE="https://gitlab.gnome.org/World/dLeyna" +SRC_URI="https://gitlab.gnome.org/World/dLeyna/-/archive/v${PV}/dLeyna-v${PV}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="1.0/6" # soname of libdleyna-core-1.0.so +KEYWORDS="amd64 ~arm64 ~loong ~riscv x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + >=dev-libs/glib-2.28:2 + >=net-libs/gssdp-1.6.0:1.6= + >=net-libs/gupnp-1.6.0:1.6= + >=net-libs/gupnp-av-0.12.9:0= + >=media-libs/gupnp-dlna-0.9.4:2.0= + >=net-libs/libsoup-3.0:3.0 + dev-libs/libxml2 + + ${PYTHON_DEPS} + + !net-libs/dleyna-connector-dbus + !net-libs/dleyna-core + !net-libs/dleyna-renderer + !net-misc/dleyna-server +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/docutils + virtual/pkgconfig +" + +S="${WORKDIR}"/dLeyna-v${PV} + +src_configure() { + local emesonargs=( + -Ddbus_service_dir="${EPREFIX}/usr/share/dbus-1/services" + -Dman_pages=true + -Ddocs=false + ) + meson_src_configure +} + +src_install() { + meson_src_install + python_optimize +} diff --git a/net-libs/dleyna/metadata.xml b/net-libs/dleyna/metadata.xml new file mode 100644 index 000000000000..2c3cee540cfe --- /dev/null +++ b/net-libs/dleyna/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">World/dLeyna</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest index daa988d6f3fa..be5c90a2a709 100644 --- a/net-libs/enet/Manifest +++ b/net-libs/enet/Manifest @@ -1,3 +1 @@ -DIST enet-1.2.2.tar.gz 413454 BLAKE2B 3d13ae43a3ce361cf19d7b79c8ec92f76b7c1066659bf4e531a3144b03aac4e7b3738c102eff12bc0748a4a798e7be77473a6b386d29bb416998057f71ffe9d9 SHA512 2c28ab4b650dd4165ee5913c1bc80dc47e43f2363a5fdd7f3aa9be8fb3afbc8aff7a6bce731f7dac45eb930fc6338cd811c07e8dedca5554a7dd32293685062d -DIST enet-1.3.13.tar.gz 669090 BLAKE2B 3041e9b2fe431dda2eae3464417d79b80664ff2c303222607991db28328e8eca2357fbf66248f40344bf93a26e0d1ffdad4698f9fe58939224b830700acee501 SHA512 82501c0248330a3a6bcac907907760e59b18cb662ebb42fe2c91e1557f1bc8ab452bf3fe7477dc01fa7a6e3b6124e1eb8eac46382d5bbebb2394879f9568b5df DIST enet-1.3.17.tar.gz 703278 BLAKE2B d31838a173f629a2216f59173c259cf7cb35985913c5f8f016641ceb189dc20308effa206f03391cafde842ad6e43ec1776d38ce02283bd5990ccf38eadf4d6b SHA512 efa0cb093a6ca295e5012a4fdebc5ffd6516a66a967e97b386b72781b18ce4a118c9bf94e87adbbdcd0ed441e22c62a05c24ff39fd6b475919e8efe9ab4715e4 diff --git a/net-libs/enet/enet-1.2.2-r1.ebuild b/net-libs/enet/enet-1.2.2-r1.ebuild deleted file mode 100644 index a0ddb70b8e30..000000000000 --- a/net-libs/enet/enet-1.2.2-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Relatively thin, simple and robust network communication layer on top of UDP" -HOMEPAGE="http://enet.bespin.org/" -SRC_URI="http://enet.bespin.org/download/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" -IUSE="static-libs" - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-libs/enet/enet-1.3.13.ebuild b/net-libs/enet/enet-1.3.17-r1.ebuild index 0e307002387a..dc2968cf210a 100644 --- a/net-libs/enet/enet-1.3.13.ebuild +++ b/net-libs/enet/enet-1.3.17-r1.ebuild @@ -1,19 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit libtool DESCRIPTION="Relatively thin, simple and robust network communication layer on top of UDP" -HOMEPAGE="http://enet.bespin.org/" +HOMEPAGE="http://enet.bespin.org/ https://github.com/lsalzman/enet/" SRC_URI="http://enet.bespin.org/download/${P}.tar.gz" LICENSE="MIT" SLOT="1.3/7" -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" IUSE="static-libs" RDEPEND="!${CATEGORY}/${PN}:0" +src_prepare() { + default + elibtoolize +} + src_configure() { econf $(use_enable static-libs static) } diff --git a/net-libs/enet/enet-1.3.17.ebuild b/net-libs/enet/enet-1.3.17.ebuild index 9c130da59dac..e3d3d51f4903 100644 --- a/net-libs/enet/enet-1.3.17.ebuild +++ b/net-libs/enet/enet-1.3.17.ebuild @@ -1,19 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit libtool + DESCRIPTION="Relatively thin, simple and robust network communication layer on top of UDP" HOMEPAGE="http://enet.bespin.org/ https://github.com/lsalzman/enet/" SRC_URI="http://enet.bespin.org/download/${P}.tar.gz" LICENSE="MIT" SLOT="1.3/7" -KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm64 ~loong ppc ppc64 ~riscv x86" IUSE="static-libs" RDEPEND="!${CATEGORY}/${PN}:0" +src_prepare() { + default + elibtoolize +} + src_configure() { econf $(use_enable static-libs static) } diff --git a/net-libs/farstream/farstream-0.2.9.ebuild b/net-libs/farstream/farstream-0.2.9-r1.ebuild index df34fa1c2ad0..e582aa3ca3ad 100644 --- a/net-libs/farstream/farstream-0.2.9.ebuild +++ b/net-libs/farstream/farstream-0.2.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream" SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1+" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="+introspection test upnp valgrind" SLOT="0.2/5" # .so version @@ -25,7 +25,7 @@ COMMON_DEPEND=" >=dev-libs/glib-2.40:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11:= ) - upnp? ( >=net-libs/gupnp-igd-0.2:= ) + upnp? ( >=net-libs/gupnp-igd-0.2:0= ) " RDEPEND="${COMMON_DEPEND} >=media-libs/gst-plugins-bad-1.4:1.0 @@ -39,11 +39,11 @@ DEPEND="${COMMON_DEPEND} media-libs/gst-plugins-base:1.0[vorbis] media-libs/gst-plugins-good:1.0 ) - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " BDEPEND=" dev-util/glib-utils - >=dev-util/gtk-doc-am-1.18 + >=dev-build/gtk-doc-am-1.18 virtual/pkgconfig " diff --git a/net-libs/farstream/metadata.xml b/net-libs/farstream/metadata.xml index ccbf1e879a03..74e4881d13b0 100644 --- a/net-libs/farstream/metadata.xml +++ b/net-libs/farstream/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> -<flag name="valgrind">Compile in valgrind memory hints</flag> -</use> + <!-- maintainer-needed --> + <upstream> + <remote-id type="freedesktop-gitlab">farstream/farstream</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-1.0.8_p20190329.ebuild b/net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-1.0.8_p20190329.ebuild index 98bfbc4cad3b..139c106994ea 100644 --- a/net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-1.0.8_p20190329.ebuild +++ b/net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-1.0.8_p20190329.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,9 +20,6 @@ LICENSE="BSD" SLOT="0" IUSE="+promisc" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" PDEPEND="dev-embedded/arduino dev-embedded/freaklabs-boards" diff --git a/net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-9999.ebuild b/net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-9999.ebuild index 98bfbc4cad3b..139c106994ea 100644 --- a/net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-9999.ebuild +++ b/net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,9 +20,6 @@ LICENSE="BSD" SLOT="0" IUSE="+promisc" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" PDEPEND="dev-embedded/arduino dev-embedded/freaklabs-boards" diff --git a/net-libs/freaklabs-chibiarduino/metadata.xml b/net-libs/freaklabs-chibiarduino/metadata.xml index 976a133320d8..51aab496fab4 100644 --- a/net-libs/freaklabs-chibiarduino/metadata.xml +++ b/net-libs/freaklabs-chibiarduino/metadata.xml @@ -8,4 +8,7 @@ <use> <flag name="promisc">Enable promisc in the config file for packet sniffing</flag> </use> + <upstream> + <remote-id type="github">freaklabs/chibiArduino</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest index 7334d2f06e40..023d9d387cf3 100644 --- a/net-libs/glib-networking/Manifest +++ b/net-libs/glib-networking/Manifest @@ -1,3 +1,3 @@ -DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf31737ede5879aa3747416253bacc34d62a1ada944a718223300d63a5b37615492929e63c1c0cad6ef34775ee95e49f6769dc04 SHA512 da38b64e6709c864e1c6a60989d86439e0afb1dbf7b7f60a67f58cf430ae354ef9fe7465e74790b0c2827d2f1c39a250db4372d98fab6ab8d73946a7f51e3b22 -DIST glib-networking-2.68.2.tar.xz 239040 BLAKE2B 2b65a63205d3071d05898ca869ae117c9b9fd548b19d9a1c82869a1eb54b77113f8908cd32108f4ca851cc0975ed34c16df04906b5b3c1f9a9a03574187ba929 SHA512 5c2d485332ff1b5a4d0f257b4e7a371b0bfe899b98ee4157845e5f5d3f10cf6f2df891407396edb6955420064dbaa57a5dc3c62c6392881cff05332db925d32d -DIST glib-networking-2.70.0.tar.xz 259808 BLAKE2B ebd423e9f93fc362cb6cece503de8f579c5c6de460e50f073107017ec0dc35cdd2f38fb780651dc7b68dd833500052c83bfba08e6c4b69c9aca1955f9aa7c7c2 SHA512 c9f8126e3466470ad8e1d588d56b843a4fa4738619a795e6772d95282c54a8356a916a3b0a0b6994606d8a6841ecb0637230f14575ed95ea68bff8f3f81aea71 +DIST glib-networking-2.76.1.tar.xz 280896 BLAKE2B d4fb8e30096e2e0bdca183795e5d6f86f13c887ad61a52a46dd2af90756ced41e540f286b2cdafb4655cf337758e3742508c0e62e0ea3850ab293cd04e12488e SHA512 9da7844dc767c8dc33953bf984aa9fcc12ac6f9945b55b9c0ec34ecf13592deefead37dc27b048f564dc423286224c041b9842034e197d90f93822128fab4f97 +DIST glib-networking-2.78.0.tar.xz 282864 BLAKE2B 24b503a79e3a75c706e5aac98bb4593c6a282d980175633e77097ec8dcb7399f1e197ef42cad9f1f0a7c0456e0f09fbb7a197dcdf1ee2eff0f061ea826e2ee33 SHA512 7574e82aa018332edf99dd284c7fd74b5935bca4a6a70e950ae4b22bbe7be188433fea69e35c742cae120e7ff7d1a6b4f5bf3957fc31f220f50189d3958a3f58 +DIST glib-networking-2.78.1.tar.xz 283472 BLAKE2B 424a7d1f05b8589e9f5ca4e53fe4aead2ded484799b984e80ba8c203633bb5c7cec47cf56d15df4af1cb900025a560b9f07a9ebaeb5428c051f600849630a310 SHA512 dc8076d3ff1c97c44c7ba04f74bed50117b07f703efc1bc4cc44989ffcfada0ab49813556ad5bb1831dfb114c4f74ec7bfe08c9b6b514ae7049700211606b288 diff --git a/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch b/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch deleted file mode 100644 index fc9ccea13952..000000000000 --- a/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch +++ /dev/null @@ -1,52 +0,0 @@ -Workaround/fix test failure on 32-bit arches. Should be in release -after 2.70.0. - -https://gitlab.gnome.org/GNOME/glib-networking/-/commit/4f8ca86a0e460794188c3355f0c7cc11fdbe4229.patch - -From: Simon McVittie <simon.mcvittie@collabora.co.uk> -Date: Tue, 21 Sep 2021 17:07:44 +0000 -Subject: [PATCH] tests: Accept GNUTLS' workaround for limited size of time_t - ---- a/tls/tests/certificate.c -+++ b/tls/tests/certificate.c -@@ -672,6 +672,12 @@ test_certificate_not_valid_before (void) - g_object_unref (cert); - } - -+/* On 32-bit, GNUTLS caps expiry times at 2037-12-31 23:23:23 to avoid -+ * overflowing time_t. Hopefully by 2037, either 32-bit will finally have -+ * died out, or GNUTLS will rethink its approach to -+ * https://gitlab.com/gnutls/gnutls/-/issues/370 */ -+#define GNUTLS_32_BIT_NOT_VALID_AFTER_MAX 2145914603 -+ - static void - test_certificate_not_valid_after (void) - { -@@ -686,7 +692,16 @@ test_certificate_not_valid_after (void) - actual = g_tls_certificate_get_not_valid_after (cert); - g_assert_nonnull (actual); - actual_str = g_date_time_format_iso8601 (actual); -+ -+#if SIZEOF_TIME_T <= 4 -+ if (g_date_time_to_unix (actual) == GNUTLS_32_BIT_NOT_VALID_AFTER_MAX) -+ g_test_incomplete ("not-valid-after date not representable on 32-bit"); -+ else -+ g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER); -+#else - g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER); -+#endif -+ - g_free (actual_str); - g_date_time_unref (actual); - g_object_unref (cert); ---- a/tls/tests/meson.build -+++ b/tls/tests/meson.build -@@ -69,6 +69,7 @@ foreach backend: backends - test_cflags = cflags + [ - '-DBACKEND="@0@"'.format(backend), - '-DBACKEND_IS_' + backend.to_upper(), -+ '-DSIZEOF_TIME_T=@0@'.format(cc.sizeof('time_t', prefix: '#include <time.h>')), - ] - - if backend == 'openssl' -GitLab diff --git a/net-libs/glib-networking/glib-networking-2.70.0.ebuild b/net-libs/glib-networking/glib-networking-2.76.1.ebuild index 8bdcf6b9b5c7..b662291fbe8c 100644 --- a/net-libs/glib-networking/glib-networking-2.70.0.ebuild +++ b/net-libs/glib-networking/glib-networking-2.76.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit gnome.org gnome2-utils meson-multilib xdg @@ -12,12 +12,12 @@ LICENSE="LGPL-2.1+" SLOT="0" IUSE="+gnome +libproxy +ssl test" RESTRICT="!test? ( test )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" - >=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}] - libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] ) - >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.73.3:2[${MULTILIB_USEDEP}] + libproxy? ( >=net-libs/libproxy-0.4.16[${MULTILIB_USEDEP}] ) + >=net-libs/gnutls-3.7.4:=[${MULTILIB_USEDEP}] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas ) " @@ -30,12 +30,9 @@ BDEPEND=" test? ( sys-apps/dbus ) " -PATCHES=( - "${FILESDIR}"/${P}-time_t-32-bit.patch -) - src_prepare() { - xdg_src_prepare + default + xdg_environment_reset if ! use test ; then # Don't build tests unconditionally @@ -43,7 +40,7 @@ src_prepare() { # It may become a real runtime dependency in future # Please check! # bug #777462 - sed -i "/^subdir('tls\/tests')/d" meson.build || die + sed -i "/^subdir('tests')/d" tls/meson.build || die fi } @@ -51,15 +48,21 @@ multilib_src_configure() { local emesonargs=( -Dgnutls=enabled -Dopenssl=disabled + $(meson_feature !libproxy environment_proxy) $(meson_feature libproxy) $(meson_feature gnome gnome_proxy) -Dinstalled_tests=false - -Dstatic_modules=false + -Ddebug_logs=false ) meson_src_configure } multilib_src_test() { + # Pretend the network is available so we get real libproxy parsing + # output rather than it giving up early in e.g. systemd-nspawn in some + # cases. + # https://github.com/libproxy/libproxy/issues/260 (bug #914382) + local -x GIO_USE_NETWORK_MONITOR=base dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' } diff --git a/net-libs/glib-networking/glib-networking-2.68.2.ebuild b/net-libs/glib-networking/glib-networking-2.78.0.ebuild index 8c43ea3df5f3..b662291fbe8c 100644 --- a/net-libs/glib-networking/glib-networking-2.68.2.ebuild +++ b/net-libs/glib-networking/glib-networking-2.78.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit gnome.org gnome2-utils meson-multilib xdg @@ -12,12 +12,12 @@ LICENSE="LGPL-2.1+" SLOT="0" IUSE="+gnome +libproxy +ssl test" RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" - >=dev-libs/glib-2.67.0:2[${MULTILIB_USEDEP}] - libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] ) - >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.73.3:2[${MULTILIB_USEDEP}] + libproxy? ( >=net-libs/libproxy-0.4.16[${MULTILIB_USEDEP}] ) + >=net-libs/gnutls-3.7.4:=[${MULTILIB_USEDEP}] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas ) " @@ -31,7 +31,8 @@ BDEPEND=" " src_prepare() { - xdg_src_prepare + default + xdg_environment_reset if ! use test ; then # Don't build tests unconditionally @@ -39,7 +40,7 @@ src_prepare() { # It may become a real runtime dependency in future # Please check! # bug #777462 - sed -i "/^subdir('tls\/tests')/d" meson.build || die + sed -i "/^subdir('tests')/d" tls/meson.build || die fi } @@ -47,15 +48,21 @@ multilib_src_configure() { local emesonargs=( -Dgnutls=enabled -Dopenssl=disabled + $(meson_feature !libproxy environment_proxy) $(meson_feature libproxy) $(meson_feature gnome gnome_proxy) -Dinstalled_tests=false - -Dstatic_modules=false + -Ddebug_logs=false ) meson_src_configure } multilib_src_test() { + # Pretend the network is available so we get real libproxy parsing + # output rather than it giving up early in e.g. systemd-nspawn in some + # cases. + # https://github.com/libproxy/libproxy/issues/260 (bug #914382) + local -x GIO_USE_NETWORK_MONITOR=base dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' } diff --git a/net-libs/glib-networking/glib-networking-2.68.1.ebuild b/net-libs/glib-networking/glib-networking-2.78.1.ebuild index 566f954f9f9b..b662291fbe8c 100644 --- a/net-libs/glib-networking/glib-networking-2.68.1.ebuild +++ b/net-libs/glib-networking/glib-networking-2.78.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit gnome.org gnome2-utils meson-multilib xdg @@ -12,12 +12,12 @@ LICENSE="LGPL-2.1+" SLOT="0" IUSE="+gnome +libproxy +ssl test" RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" - >=dev-libs/glib-2.67.0:2[${MULTILIB_USEDEP}] - libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] ) - >=net-libs/gnutls-3.6.5:=[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.73.3:2[${MULTILIB_USEDEP}] + libproxy? ( >=net-libs/libproxy-0.4.16[${MULTILIB_USEDEP}] ) + >=net-libs/gnutls-3.7.4:=[${MULTILIB_USEDEP}] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas ) " @@ -31,7 +31,8 @@ BDEPEND=" " src_prepare() { - xdg_src_prepare + default + xdg_environment_reset if ! use test ; then # Don't build tests unconditionally @@ -39,7 +40,7 @@ src_prepare() { # It may become a real runtime dependency in future # Please check! # bug #777462 - sed -i "/^subdir('tls\/tests')/d" meson.build || die + sed -i "/^subdir('tests')/d" tls/meson.build || die fi } @@ -47,15 +48,21 @@ multilib_src_configure() { local emesonargs=( -Dgnutls=enabled -Dopenssl=disabled + $(meson_feature !libproxy environment_proxy) $(meson_feature libproxy) $(meson_feature gnome gnome_proxy) -Dinstalled_tests=false - -Dstatic_modules=false + -Ddebug_logs=false ) meson_src_configure } multilib_src_test() { + # Pretend the network is available so we get real libproxy parsing + # output rather than it giving up early in e.g. systemd-nspawn in some + # cases. + # https://github.com/libproxy/libproxy/issues/260 (bug #914382) + local -x GIO_USE_NETWORK_MONITOR=base dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' } diff --git a/net-libs/glib-networking/metadata.xml b/net-libs/glib-networking/metadata.xml index 83497cd4b751..e5df50a1eed4 100644 --- a/net-libs/glib-networking/metadata.xml +++ b/net-libs/glib-networking/metadata.xml @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag> - <flag name="gnome">Extract HTTP/HTTPS/SOCKS proxy configuration stored using GSettings</flag> - </use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag> + <flag name="gnome">Extract HTTP/HTTPS/SOCKS proxy configuration stored using GSettings</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/glib-networking</remote-id> + <remote-id type="cpe">cpe:/a:gnome:glib</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch b/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch new file mode 100644 index 000000000000..a9e09f113bcc --- /dev/null +++ b/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -51,7 +51,7 @@ if test -z "`${CC} check_atomicbuiltins.c -o check_atomicbuiltins 2>&1`" ; then + HAVE_GCC_ATOMIC_BUILTINS=yes + AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS, 1, [Define to 1 if GCC atomic builtins are available]) + AC_MSG_RESULT([yes]) +- if test $cross_compiling == "yes"; then ++ if test $cross_compiling = "yes"; then + # Some platforms don't seem to be fully happy for libraries using GCC atomic builtins + # unless -lgcc and -lgcc_s are explicitly included. + # (Errors like diff --git a/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch b/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch new file mode 100644 index 000000000000..dc0c4cd1aced --- /dev/null +++ b/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/852182 +--- a/src/tests/tag/tag_perf.cpp ++++ b/src/tests/tag/tag_perf.cpp +@@ -20,6 +20,7 @@ using namespace gloox; + #include <cstdlib> + #include <string> + #include <cstdio> // [s]print[f] ++#include <ctime> + + #include <sys/time.h> + +--- a/src/tests/zlib/zlib_perf.cpp ++++ b/src/tests/zlib/zlib_perf.cpp +@@ -24,6 +24,7 @@ using namespace gloox; + #include <string> + #include <sys/time.h> + #include <cstdio> // [s]print[f] ++#include <ctime> + + #ifdef HAVE_ZLIB + diff --git a/net-libs/gloox/files/gloox-1.0.24-slibtool.patch b/net-libs/gloox/files/gloox-1.0.24-slibtool.patch index eba7ffb40613..2b0328aa02e3 100644 --- a/net-libs/gloox/files/gloox-1.0.24-slibtool.patch +++ b/net-libs/gloox/files/gloox-1.0.24-slibtool.patch @@ -1,4 +1,4 @@ -This fixes build with sys-devel/slibtool +This fixes build with dev-build/slibtool --- gloox-1.0.24/src/Makefile.am +++ gloox-1.0.24/src/Makefile.am diff --git a/net-libs/gloox/gloox-1.0.24-r1.ebuild b/net-libs/gloox/gloox-1.0.24-r1.ebuild new file mode 100644 index 000000000000..4cef23c79743 --- /dev/null +++ b/net-libs/gloox/gloox-1.0.24-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_P="${P/_/-}" +DESCRIPTION="A portable high-level Jabber/XMPP library for C++" +HOMEPAGE="https://camaya.net/gloox/" +SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +# Check upstream changelog: https://camaya.net/gloox/changelog/ +SLOT="0/18" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug gnutls idn ssl static-libs test zlib" +RESTRICT="!test? ( test )" + +DEPEND=" + idn? ( net-dns/libidn:= ) + gnutls? ( net-libs/gnutls:= ) + ssl? ( + dev-libs/openssl:0= + ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.24-musl.patch" + "${FILESDIR}/${PN}-1.0.24-Makefile.patch" + "${FILESDIR}/${PN}-1.0.24-slibtool.patch" + "${FILESDIR}/${PN}-1.0.24-pthread-link.patch" + "${FILESDIR}/${PN}-1.0.24-bashism-configure.patch" + "${FILESDIR}/${PN}-1.0.24-fix-gcc12-time.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # Examples are not installed anyway, so - why should we build them? + local myeconfargs=( + --without-examples + $(usex debug "--enable-debug" '') + $(use_enable static-libs static) + $(use_with idn libidn) + $(use_with gnutls) + $(use_with ssl openssl) + $(use_with test tests) + $(use_with zlib) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name "*.la" -delete || die +} diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest deleted file mode 100644 index f69fc6cf19af..000000000000 --- a/net-libs/gnet/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnet-2.0.8.tar.bz2 514019 BLAKE2B 6e09912d4d438fc55290c9df45b2fe29397efbaf2ca0ff88fa6e22a9935aa1520f4a1faac24720ab1925bd6537a8725766351e4256e036ef61cfea91470bc6d5 SHA512 b52ce73c62eb93d7f68a124128780dcf6c6795e82436d0882469dd7873d482c6b87c77d4efa9f69838a58313d7d958abad5b41a89620014c239030d0294cf11f diff --git a/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch b/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch deleted file mode 100644 index 0ca2156b791d..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a61601a487394cbd5970c3b736aea71bf277ecc1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk> -Date: Sat, 16 Oct 2010 20:13:52 +0100 -Subject: [PATCH] tests: require check >= 0.9.7 for unit tests, and fix for new API - -The check API changed slightly. Fix things for the new API. - -https://bugzilla.gnome.org/show_bug.cgi?id=632258 ---- - tests/check/gnetcheck.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/check/gnetcheck.h b/tests/check/gnetcheck.h -index aeb9f68..14b6c28 100644 ---- a/tests/check/gnetcheck.h -+++ b/tests/check/gnetcheck.h -@@ -311,11 +311,11 @@ int main (int argc, char **argv) \ - gboolean _gnet_check_run_test_func (const gchar * func_name); - - static inline void --__gnet_tcase_add_test (TCase * tc, TFun tf, const gchar * func_name, -- int sig, int start, int end) -+__gnet_tcase_add_test (TCase * tc, TFun tf, const char * fname, int signal, -+ int allowed_exit_value, int start, int end) - { -- if (_gnet_check_run_test_func (func_name)) { -- _tcase_add_test (tc, tf, func_name, sig, start, end); -+ if (_gnet_check_run_test_func (fname)) { -+ _tcase_add_test (tc, tf, fname, signal, allowed_exit_value, start, end); - } - } - --- -1.7.3.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-context-leak.patch b/net-libs/gnet/files/gnet-2.0.8-context-leak.patch deleted file mode 100644 index a56e549edccf..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-context-leak.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d6997987ce7f3e84d1125715b17502452d085073 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tpm@src.gnome.org> -Date: Tue, 13 May 2008 07:10:28 +0000 -Subject: [PATCH] Don't leak main context ref when one was set. Spotted by Kuang-Chun Cheng. - - * src/conn.c: (gnet_conn_unref): - Don't leak main context ref when one was set. - Spotted by Kuang-Chun Cheng. - - -svn path=/trunk/; revision=495 ---- - src/conn.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/conn.c b/src/conn.c -index f4de415..9d41fa6 100644 ---- a/src/conn.c -+++ b/src/conn.c -@@ -305,6 +305,9 @@ gnet_conn_unref (GConn* conn) - if (conn->inetaddr) - gnet_inetaddr_delete (conn->inetaddr); - -+ if (conn->context) -+ g_main_context_unref (conn->context); -+ - g_free (conn->buffer); - - g_free (conn); --- -1.7.3.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch b/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch deleted file mode 100644 index 9c85b72d8e29..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch +++ /dev/null @@ -1,16 +0,0 @@ -Bug-Debian: http://bugs.debian.org/652165 -Author: Julien Cristau <jcristau@debian.org> - -use pkg-config to get the glib include path, not hardcode it. - ---- gnet-2.0.8.orig/gnet-2.0.pc.in -+++ gnet-2.0.8/gnet-2.0.pc.in -@@ -6,5 +6,6 @@ - Name: Gnet - Description: A network compatibility layer library - Version: @VERSION@ --Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ @GLIB_LIBS@ @GTHREAD_LIBS@ --Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ -+Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -+Requires.private: glib-2.0 gthread-2.0 -+Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/ diff --git a/net-libs/gnet/files/gnet-2.0.8-network-tests.patch b/net-libs/gnet/files/gnet-2.0.8-network-tests.patch deleted file mode 100644 index 7bb7cefd133c..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-network-tests.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 576f6de12bf4a509882af0bbe4727e27e8bc9373 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 16 Nov 2010 14:18:08 +0100 -Subject: [PATCH] Do not build network related tests if not enabled - ---- - tests/check/gnet/gnetconn.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/tests/check/gnet/gnetconn.c b/tests/check/gnet/gnetconn.c -index 739b467..0558e28 100644 ---- a/tests/check/gnet/gnetconn.c -+++ b/tests/check/gnet/gnetconn.c -@@ -25,6 +25,7 @@ - - #include <string.h> - -+#ifdef GNET_ENABLE_NETWORK_TESTS - static void - conn_fail_cb (GConn * conn, GConnEvent * event, gpointer data) - { -@@ -243,6 +244,7 @@ GNET_START_TEST (test_conn_new_socket) - g_main_loop_unref (loop); - } - GNET_END_TEST; -+#endif - - static Suite * - gnetconn_suite (void) --- -1.7.3.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch b/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch deleted file mode 100644 index b75258e38d02..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1825f69b1a149cd3f2daa5f6c3333a32f0470f0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk> -Date: Sat, 16 Oct 2010 23:10:15 +0100 -Subject: tests: update GConnHttp unit test to not use inactive domains - -www.gnetlibrary.org has been abandoned. - -diff --git a/tests/check/gnet/gnetconnhttp.c b/tests/check/gnet/gnetconnhttp.c -index b1cecce..4316f74 100644 ---- a/tests/check/gnet/gnetconnhttp.c -+++ b/tests/check/gnet/gnetconnhttp.c -@@ -487,7 +487,7 @@ GNET_END_TEST; - - GNET_START_TEST (test_gnet_http_get) - { -- const gchar *urls[] = {"http://www.gnetlibrary.org/src/", -+ const gchar *urls[] = {"http://www.gnome.org/", - "http://www.heise.de" }; - guint i; - -@@ -514,7 +514,7 @@ GNET_END_TEST; - - GNET_START_TEST (test_get_binary) - { -- gchar *uris[] = { "http://www.gnetlibrary.org/gnet.png" }; -+ gchar *uris[] = { "http://www.gnome.org/img/logo/foot-16.png" }; - guint i; - - for (i = 0; i < G_N_ELEMENTS (uris); ++i) { --- -cgit v0.10.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch b/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch deleted file mode 100644 index 9527dbe5da65..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix build failure with newer releases of check library. - ---- a/tests/check/gnetcheck.h 2014-09-27 15:32:17.088312230 +0200 -+++ b/tests/check/gnetcheck.h 2014-09-27 15:32:35.728239492 +0200 -@@ -281,7 +281,7 @@ - _gnet_check_expecting_log = TRUE; \ - _gnet_check_raised_critical = FALSE; \ - code; \ -- _fail_unless (_gnet_check_raised_critical, __FILE__, __LINE__, \ -+ (_gnet_check_raised_critical) ? _mark_point(__FILE__, __LINE__) : _ck_assert_failed (__FILE__, __LINE__, \ - "Expected g_critical, got nothing", NULL); \ - _gnet_check_expecting_log = FALSE; \ - } G_STMT_END -@@ -291,7 +291,7 @@ - _gnet_check_expecting_log = TRUE; \ - _gnet_check_raised_warning = FALSE; \ - code; \ -- _fail_unless (_gnet_check_raised_warning, __FILE__, __LINE__, \ -+ (_gnet_check_raised_warning) ? _mark_point(__FILE__, __LINE__) : _ck_assert_failed (__FILE__, __LINE__, \ - "Expected g_warning, got nothing", NULL); \ - _gnet_check_expecting_log = FALSE; \ - } G_STMT_END diff --git a/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch b/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch deleted file mode 100644 index f2946aaf438c..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch +++ /dev/null @@ -1,31 +0,0 @@ -Disable unittests requiring a running HTTP server on port 80. - ---- a/tests/check/gnet/gnetinetaddr.c.old 2014-09-27 17:56:51.130350306 +0200 -+++ b/tests/check/gnet/gnetinetaddr.c 2014-09-27 17:57:23.396114568 +0200 -@@ -443,7 +443,7 @@ - - GNET_START_TEST (test_inetaddr_list_async) - { -- do_test_inetaddr_list_async ("localhost"); -+/* do_test_inetaddr_list_async ("localhost"); */ - /* FIXME: these might not work right yet because of the timings in the test - #ifdef GNET_ENABLE_NETWORK_TESTS - do_test_inetaddr_list_async ("www.google.com"); -@@ -573,7 +573,7 @@ - - GNET_START_TEST (test_inetaddr_name_async) - { -- do_test_inetaddr_name_async ("localhost"); -+/* do_test_inetaddr_name_async ("localhost"); */ - - /* FIXME: these might not work right yet because of the timings in the test - #ifdef GNET_ENABLE_NETWORK_TESTS -@@ -798,7 +798,7 @@ - - GNET_START_TEST (test_inetaddr_reverse_async) - { -- do_test_inetaddr_reverse_async ("localhost"); -+/* do_test_inetaddr_reverse_async ("localhost"); */ - - #ifdef GNET_ENABLE_NETWORK_TESTS - do_test_inetaddr_reverse_async ("gabe.freedesktop.org"); diff --git a/net-libs/gnet/gnet-2.0.8-r3.ebuild b/net-libs/gnet/gnet-2.0.8-r3.ebuild deleted file mode 100644 index 27d0d63139f0..000000000000 --- a/net-libs/gnet/gnet-2.0.8-r3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools epatch gnome2 - -DESCRIPTION="A simple network library" -HOMEPAGE="https://wiki.gnome.org/Projects/GNetLibrary" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -# FIXME: automagic use of valgrind -RDEPEND=">=dev-libs/glib-2.6:2" -DEPEND="${RDEPEND} - >=dev-libs/check-0.9.11 - >=dev-util/gtk-doc-am-1.2 - virtual/pkgconfig -" -# FIXME: check should only be needed with USE 'test', bug #349301 -# test? ( >=dev-libs/check-0.9.7 )" - -src_prepare() { - # Do not leak main context reference, from master - epatch "${FILESDIR}"/${PN}-2.0.8-context-leak.patch - - # Fix usage of check framework, bug #296849, from master - # Disable this patch, bug 698654 - # epatch "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch - - # ifdef around network tests code, refs. bug #320759 - epatch "${FILESDIR}"/${PN}-2.0.8-network-tests.patch - - # Do not hardcode glib patch in pkgconfig file, debian bug #652165 - epatch "${FILESDIR}"/${PN}-2.0.8-fix-pkgconfig-abuse.patch - - # Compatibility with recent check releases, bug #498046 - epatch "${FILESDIR}"/${PN}-2.0.8-unittest-build.patch - - # gnetlibrary.org has been adandoned, from master - epatch "${FILESDIR}"/${PN}-2.0.8-test-existing-domain.patch - - # Do not depend on a running HTTP server on port 80 for unittest - epatch "${FILESDIR}"/${PN}-2.0.8-unittest-service.patch - - # Do not pass silly cflags with USE=debug, bug #320759 - sed -i \ - -e 's:-Werror::' \ - -e '/AM_PROG_CC_STDC/d' \ - -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \ - configure.ac || die - - # bug #672170 - AT_M4DIR="macros" eautoreconf - gnome2_src_prepare -} - -src_configure() { - DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README* TODO" - # Do not enable network tests in an ebuild environment - gnome2_src_configure \ - --disable-static \ - --disable-network-tests -} diff --git a/net-libs/gnet/metadata.xml b/net-libs/gnet/metadata.xml deleted file mode 100644 index 7b343b06be8a..000000000000 --- a/net-libs/gnet/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest index 33509ec3204c..4057b4558f43 100644 --- a/net-libs/gnome-online-accounts/Manifest +++ b/net-libs/gnome-online-accounts/Manifest @@ -1,2 +1 @@ -DIST gnome-online-accounts-3.40.0.tar.xz 860724 BLAKE2B 47f22af85b701854396c462df04b9ba2e004ee4a954619916240fef0f8139e3a37608bb9c16e4cfabbb6fc863e7448678a48865620c0293d231f9b125fe9c904 SHA512 ac90226023e2a69ad9cd12faf637844a029814282f164cc905810bf54af6693069b9019ca58211deb8487f6a32886eb072a1223fca32bc4e3fe0bc91ce8f2d6c -DIST gnome-online-accounts-3.40.1.tar.xz 861220 BLAKE2B 668af9cca8524e25b4f65f41983c527e0cac167317c28f6c451c9c9a6cea18a5774c42acd1cf80cfc707ed62524d1381039fd4f16e3e506d4789372a3db85f4f SHA512 ee7835efe6e1afd6a13f823e17eb93e4a3c55e90764f93a766270ef64f07ed18eff2fce325d8248783d7c6f1c0a7a7fe7512ebb7a8bc0a3e3b33b9037a75b088 +DIST gnome-online-accounts-3.48.1.tar.xz 383124 BLAKE2B a9e18bf034454429a84be0920110f4d74fba9462fb1f7f23e74f304e963323413d99af2d84caa9ef1c6841917f5b8249ac94dc433ba04546f2ae23d6268dcd70 SHA512 8f191994b8f38bee4b922b10b94e96d6f7cb323de0e9a1f29febea848cb2002320357262ccf6f28839e32e9216faeb28a871f878e1ad9478c61650fdd3549737 diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild deleted file mode 100644 index f012afee23f2..000000000000 --- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit gnome2 vala - -DESCRIPTION="GNOME framework for accessing online accounts" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" - -LICENSE="LGPL-2+" -SLOT="0/1" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86" - -IUSE="debug gnome +introspection kerberos +vala" -REQUIRED_USE="vala? ( introspection )" - -# pango used in goaeditablelabel -# libsoup used in goaoauthprovider -# goa kerberos provider is incompatible with app-crypt/heimdal, see -# https://bugzilla.gnome.org/show_bug.cgi?id=692250 -# json-glib-0.16 needed for bug #485092 -RDEPEND=" - >=dev-libs/glib-2.52:2 - >=app-crypt/libsecret-0.5 - >=dev-libs/json-glib-0.16 - dev-libs/libxml2:2 - >=net-libs/libsoup-2.42:2.4 - net-libs/rest:0.7 - >=net-libs/webkit-gtk-2.26.0:4 - >=x11-libs/gtk+-3.19.12:3 - x11-libs/pango - - introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) - kerberos? ( - app-crypt/gcr:0=[gtk] - app-crypt/mit-krb5 - ) -" -# goa-daemon can launch gnome-control-center -PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )" - -DEPEND="${RDEPEND} - vala? ( $(vala_depend) ) - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.30.0 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - - dev-libs/gobject-introspection-common - gnome-base/gnome-common -" - -src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - # TODO: Give users a way to set the G/FB/Windows Live secrets - gnome2_src_configure \ - --disable-static \ - --enable-backend \ - --enable-documentation \ - --enable-exchange \ - --enable-facebook \ - --enable-flickr \ - --enable-foursquare \ - --enable-imap-smtp \ - --enable-lastfm \ - --enable-media-server \ - --enable-owncloud \ - --enable-windows-live \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable kerberos) \ - $(use_enable kerberos fedora) \ - $(use_enable introspection) \ - $(use_enable vala) -} diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.1.ebuild index 90a80a4489ec..742566f97ee1 100644 --- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild +++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.1.ebuild @@ -1,38 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VALA_USE_DEPEND="vapigen" +EAPI=8 -inherit gnome2 vala +inherit gnome.org meson vala xdg DESCRIPTION="GNOME framework for accessing online accounts" HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" LICENSE="LGPL-2+" SLOT="0/1" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~sparc x86" -IUSE="debug gnome +introspection kerberos +vala" +IUSE="debug gnome gtk-doc +introspection kerberos man +vala" REQUIRED_USE="vala? ( introspection )" -# pango used in goaeditablelabel # libsoup used in goaoauthprovider # goa kerberos provider is incompatible with app-crypt/heimdal, see # https://bugzilla.gnome.org/show_bug.cgi?id=692250 # json-glib-0.16 needed for bug #485092 RDEPEND=" - >=dev-libs/glib-2.52:2 - >=app-crypt/libsecret-0.5 + >=dev-libs/glib-2.67.4:2 + sys-apps/dbus + introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) + >=x11-libs/gtk+-3.19.12:3 + >=net-libs/webkit-gtk-2.33.1:4.1 >=dev-libs/json-glib-0.16 + >=app-crypt/libsecret-0.5 + >=net-libs/libsoup-3.0:3.0 dev-libs/libxml2:2 - >=net-libs/libsoup-2.42:2.4 - net-libs/rest:0.7 - >=net-libs/webkit-gtk-2.26.0:4 - >=x11-libs/gtk+-3.19.12:3 - x11-libs/pango - - introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) + >=net-libs/rest-0.9.0:1.0 kerberos? ( app-crypt/gcr:0=[gtk] app-crypt/mit-krb5 @@ -51,30 +48,31 @@ DEPEND="${RDEPEND} dev-libs/gobject-introspection-common gnome-base/gnome-common " +BDEPEND="gtk-doc? ( dev-util/gtk-doc )" src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare + default + use vala && vala_setup } src_configure() { # TODO: Give users a way to set the G/FB/Windows Live secrets - gnome2_src_configure \ - --disable-static \ - --enable-backend \ - --enable-documentation \ - --enable-exchange \ - --enable-facebook \ - --enable-flickr \ - --enable-foursquare \ - --enable-imap-smtp \ - --enable-lastfm \ - --enable-media-server \ - --enable-owncloud \ - --enable-windows-live \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable kerberos) \ - $(use_enable kerberos fedora) \ - $(use_enable introspection) \ - $(use_enable vala) + local emesonargs=( + -Dgoabackend=true + -Dinspector=false + -Dexchange=true + -Dfedora=false + -Dgoogle=true + -Dimap_smtp=true + $(meson_use kerberos) + -Dlastfm=true + -Dmedia_server=true + -Downcloud=true + -Dwindows_live=true + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + -Dman=true + $(meson_use vala vapi) + ) + meson_src_configure } diff --git a/net-libs/gnome-online-accounts/metadata.xml b/net-libs/gnome-online-accounts/metadata.xml index ab549712c41f..06d4624d4d58 100644 --- a/net-libs/gnome-online-accounts/metadata.xml +++ b/net-libs/gnome-online-accounts/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="gnome">Use <pkg>gnome-base/gnome-control-center</pkg> - to set GNOME online accounts preferences</flag> -</use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="gnome">Use <pkg>gnome-base/gnome-control-center</pkg> to set GNOME online accounts preferences</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gnome-online-accounts</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index a6767fb17fee..9c87bccf8811 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -1 +1,10 @@ -DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e987618960f57ee36c167a25974711ab8d11bdbd6335fbf18ac902a79b5c6b40bb6a37f4ee07549832d0611df2 SHA512 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329 +DIST gnutls-3.7.8.tar.xz 6029220 BLAKE2B 0a21e63c7cb0ba4eeff23593c7282e0b4d704fa2d2a1cd5289998fd04b58ea36fc343f872225ad05478e278b1cdebbcd0fd376459abcb58547f8fa1488485530 SHA512 4199bcf7c9e3aab2f52266aadceefc563dfe2d938d0ea1f3ec3be95d66f4a8c8e5494d3a800c03dd02ad386dec1738bd63e1fe0d8b394a2ccfc7d6c6a0cc9359 +DIST gnutls-3.7.8.tar.xz.sig 1250 BLAKE2B 66c6a335c3b2290a4e44ffa6ae715ad71d2bcd7df485c1d2d9490985d9dcd445768d6eb021ad3a61614431183c6652254c63ebd8abd0f0a03d3164a6193b6192 SHA512 cecf9843e8683a278d065b663dc98ac2b5fcad1905ee25333038c93c2289b518c974629367e77e66552ac1c9d122d551616edba35cb0c4204202ec676f1a2db7 +DIST gnutls-3.7.9.tar.xz 6377212 BLAKE2B c8263381132b0c96f23a580823cfaf57112056876e5f2cc21aec4eeddec641b0c01fa02ff9493ea686f49fd917190b06f89379eb448a510cf4d50fe3a0742851 SHA512 56ccbab5f214f9e3cf10a43dd90dedc1e10a38d08b8359a4305dc05c59ddb4a1d3680b282077b6446605c31675a4261cd0579c2c0d976e0b2ced02e6dba224c1 +DIST gnutls-3.7.9.tar.xz.sig 685 BLAKE2B 2e7ba793d026cf96c54c75a81160c58cf21d6d5f034a603ffe88d5fa4cbfa1d4fd590efbe81fbee7790cd4956776085b7827fead67c9b07f1d7eadd405815eb7 SHA512 906227a0d6f57878e85e9acdf754d20b7628a7a95b40aeffced398a0a0c6220f5e32191a9f988f55b8b903bf55212179dce2abcc08c2bb3397a2704dd2319438 +DIST gnutls-3.8.0.tar.xz 6378480 BLAKE2B 64784e9c0ac4dcab2c9e90d7d17d0bd8a0021224be285c12a53673f3a52aa3f189152b1b0b4aaae5a8fb41951361af1fd04a5b535774c4a26c26eb895519af40 SHA512 2507b3133423fdaf90fbd826ccb1142e9ff6fc90fcd5531720218f19ddf0e6bbb8267d23bad35c0954860e5a4179da74823e0c8357db56a14f252e6ec9d59629 +DIST gnutls-3.8.0.tar.xz.sig 684 BLAKE2B c5dbed12b8233ed8502dac16b77d6043591296f4b9ddb0445271e8fe875c2a05b9663ad6523cca6355faaa9d244cc6e6fb8ff0d65fee47b36ab6b57f57d89f64 SHA512 9db8db74aa0ebd871287b07b6a8a9f4ce90188633618e669fe07cb8bb314b624c14761f6fe1970e2fbffa87f7c0d6daa4b0fa838bd05f74b8b18cd1b5325c654 +DIST gnutls-3.8.3.tar.xz 6463720 BLAKE2B 27a4bb4d8a5697e2187113351b2ad1e849bca7bcfb556c1b54fc2d02bef16e2789e7c437ac8db8fe6d2bcfc0e3e3467bbff2dd5d2fc0adb9bf8bda81cb89e452 SHA512 74eddba01ce4c2ffdca781c85db3bb52c85f1db3c09813ee2b8ceea0608f92ca3912fd9266f55deb36a8ba4d01802895ca5d5d219e7d9caec45e1a8534e45a84 +DIST gnutls-3.8.3.tar.xz.sig 580 BLAKE2B 25875eb17d9e59bf1f1b6a61dfc7657d838ac154dbb3e26c8df1995884077878ca607de62a8ce3b9287df1ea7ff523c0abc7c4548f1ca789c308eb6bda0edbaa SHA512 5b2ca0648ca5feeda1de933de2bbaf71fadb70e830a8f0d494d2f0380b6d0d7b79445257cc79e59bba1a7ff639ab4573da3e3e124eb80c20ac6141e29a4827ff +DIST gnutls-3.8.5.tar.xz 6491504 BLAKE2B 30ea0e213b426df896af7cddfc39a7c50fd3130f99ced8386dc55e851122a37f6171722d2cb4abb68b9d2523cd3ba044b01248d740571a3bdd0cadf555894cdf SHA512 4bac1aa7ec1dce9b3445cc515cc287a5af032d34c207399aa9722e3dc53ed652f8a57cfbc9c5e40ccc4a2631245d89ab676e3ba2be9563f60ba855aaacb8e23c +DIST gnutls-3.8.5.tar.xz.sig 119 BLAKE2B 62ff7b33fb80422774f8252f574560679b7dc4fa56fa680a4cf570320fa9692aa6f8b6a7e4683a684572287cfd22168f58679d2dc4cc507dc50269ed126990fd SHA512 b0f7a8ec348765112cac75fd732e066adaa1595bb83024cfeff6633aba35277d8aceda145c733c3d95f1e0eb4d34fead2479abdb08d6041362094a235460fa67 diff --git a/net-libs/gnutls/files/gnutls-3.8.5-fix-rsaes-pkcs1-systemd-wide-config.patch b/net-libs/gnutls/files/gnutls-3.8.5-fix-rsaes-pkcs1-systemd-wide-config.patch new file mode 100644 index 000000000000..6905f793ab4f --- /dev/null +++ b/net-libs/gnutls/files/gnutls-3.8.5-fix-rsaes-pkcs1-systemd-wide-config.patch @@ -0,0 +1,261 @@ +https://bugs.gentoo.org/930752 +https://bugs.gentoo.org/930529 +https://gitlab.com/gnutls/gnutls/-/issues/1540 +https://gitlab.com/gnutls/gnutls/-/merge_requests/1830 +https://gitlab.com/gnutls/gnutls/-/commit/2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d + +From 2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d Mon Sep 17 00:00:00 2001 +From: Zoltan Fridrich <zfridric@redhat.com> +Date: Wed, 10 Apr 2024 12:51:33 +0200 +Subject: [PATCH] Fix RSAES-PKCS1-v1_5 system-wide configuration + +Signed-off-by: Zoltan Fridrich <zfridric@redhat.com> +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -1018,6 +1018,12 @@ struct cfg { + bool force_ext_master_secret_set; + }; + ++static inline void cfg_init(struct cfg *cfg) ++{ ++ memset(cfg, 0, sizeof(*cfg)); ++ cfg->allow_rsa_pkcs1_encrypt = true; ++} ++ + static inline void cfg_deinit(struct cfg *cfg) + { + if (cfg->priority_strings) { +@@ -1095,6 +1101,12 @@ struct ini_ctx { + size_t curves_size; + }; + ++static inline void ini_ctx_init(struct ini_ctx *ctx) ++{ ++ memset(ctx, 0, sizeof(*ctx)); ++ cfg_init(&ctx->cfg); ++} ++ + static inline void ini_ctx_deinit(struct ini_ctx *ctx) + { + cfg_deinit(&ctx->cfg); +@@ -1423,9 +1435,6 @@ static inline int cfg_apply(struct cfg *cfg, struct ini_ctx *ctx) + _gnutls_default_priority_string = cfg->default_priority_string; + } + +- /* enable RSA-PKCS1-V1_5 by default */ +- cfg->allow_rsa_pkcs1_encrypt = true; +- + if (cfg->allowlisting) { + /* also updates `flags` of global `hash_algorithms[]` */ + ret = cfg_hashes_set_array(cfg, ctx->hashes, ctx->hashes_size); +@@ -2217,22 +2226,73 @@ update_system_wide_priority_string(void) + return 0; + } + ++/* Returns false on parse error, otherwise true. ++ * The system_wide_config must be locked for writing. ++ */ ++static inline bool load_system_priority_file(void) ++{ ++ int err; ++ FILE *fp; ++ struct ini_ctx ctx; ++ ++ cfg_init(&system_wide_config); ++ ++ fp = fopen(system_priority_file, "re"); ++ if (fp == NULL) { ++ _gnutls_debug_log("cfg: unable to open: %s: %d\n", ++ system_priority_file, errno); ++ return true; ++ } ++ ++ /* Parsing the configuration file needs to be done in 2 phases: ++ * first parsing the [global] section ++ * and then the other sections, ++ * because the [global] section modifies the parsing behavior. ++ */ ++ ini_ctx_init(&ctx); ++ err = ini_parse_file(fp, global_ini_handler, &ctx); ++ if (!err) { ++ if (fseek(fp, 0L, SEEK_SET) < 0) { ++ _gnutls_debug_log("cfg: unable to rewind: %s\n", ++ system_priority_file); ++ if (fail_on_invalid_config) ++ exit(1); ++ } ++ err = ini_parse_file(fp, cfg_ini_handler, &ctx); ++ } ++ fclose(fp); ++ if (err) { ++ ini_ctx_deinit(&ctx); ++ _gnutls_debug_log("cfg: unable to parse: %s: %d\n", ++ system_priority_file, err); ++ return false; ++ } ++ cfg_apply(&system_wide_config, &ctx); ++ ini_ctx_deinit(&ctx); ++ return true; ++} ++ + static int _gnutls_update_system_priorities(bool defer_system_wide) + { +- int ret, err = 0; ++ int ret; ++ bool config_parse_error = false; + struct stat sb; +- FILE *fp; + gnutls_buffer_st buf; +- struct ini_ctx ctx; + + ret = gnutls_rwlock_rdlock(&system_wide_config_rwlock); +- if (ret < 0) { ++ if (ret < 0) + return gnutls_assert_val(ret); +- } + + if (stat(system_priority_file, &sb) < 0) { + _gnutls_debug_log("cfg: unable to access: %s: %d\n", + system_priority_file, errno); ++ ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock); ++ if (ret < 0) ++ goto out; ++ /* If system-wide config is unavailable, apply the defaults */ ++ cfg_init(&system_wide_config); + goto out; + } + +@@ -2240,63 +2300,27 @@ static int _gnutls_update_system_priorities(bool defer_system_wide) + system_priority_last_mod == sb.st_mtime) { + _gnutls_debug_log("cfg: system priority %s has not changed\n", + system_priority_file); +- if (system_wide_config.priority_string) { ++ if (system_wide_config.priority_string) + goto out; /* nothing to do */ +- } + } + + (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + + ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock); +- if (ret < 0) { ++ if (ret < 0) + return gnutls_assert_val(ret); +- } + + /* Another thread could have successfully re-read system-wide config, + * skip re-reading if the mtime it has used is exactly the same. + */ +- if (system_priority_file_loaded) { ++ if (system_priority_file_loaded) + system_priority_file_loaded = + (system_priority_last_mod == sb.st_mtime); +- } + + if (!system_priority_file_loaded) { +- _name_val_array_clear(&system_wide_config.priority_strings); +- +- gnutls_free(system_wide_config.priority_string); +- system_wide_config.priority_string = NULL; +- +- fp = fopen(system_priority_file, "re"); +- if (fp == NULL) { +- _gnutls_debug_log("cfg: unable to open: %s: %d\n", +- system_priority_file, errno); ++ config_parse_error = !load_system_priority_file(); ++ if (config_parse_error) + goto out; +- } +- /* Parsing the configuration file needs to be done in 2 phases: +- * first parsing the [global] section +- * and then the other sections, +- * because the [global] section modifies the parsing behavior. +- */ +- memset(&ctx, 0, sizeof(ctx)); +- err = ini_parse_file(fp, global_ini_handler, &ctx); +- if (!err) { +- if (fseek(fp, 0L, SEEK_SET) < 0) { +- _gnutls_debug_log("cfg: unable to rewind: %s\n", +- system_priority_file); +- if (fail_on_invalid_config) +- exit(1); +- } +- err = ini_parse_file(fp, cfg_ini_handler, &ctx); +- } +- fclose(fp); +- if (err) { +- ini_ctx_deinit(&ctx); +- _gnutls_debug_log("cfg: unable to parse: %s: %d\n", +- system_priority_file, err); +- goto out; +- } +- cfg_apply(&system_wide_config, &ctx); +- ini_ctx_deinit(&ctx); + _gnutls_debug_log("cfg: loaded system config %s mtime %lld\n", + system_priority_file, + (unsigned long long)sb.st_mtime); +@@ -2332,9 +2356,8 @@ static int _gnutls_update_system_priorities(bool defer_system_wide) + out: + (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + +- if (err && fail_on_invalid_config) { ++ if (config_parse_error && fail_on_invalid_config) + exit(1); +- } + + return ret; + } +--- a/tests/system-override-allow-rsa-pkcs1-encrypt.sh ++++ b/tests/system-override-allow-rsa-pkcs1-encrypt.sh +@@ -19,9 +19,8 @@ + # You should have received a copy of the GNU Lesser General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/> + +-: ${srcdir=.} +-TEST=${srcdir}/rsaes-pkcs1-v1_5 +-CONF=${srcdir}/config.$$.tmp ++TEST=${builddir}/rsaes-pkcs1-v1_5 ++CONF=config.$$.tmp + export GNUTLS_SYSTEM_PRIORITY_FILE=${CONF} + export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 + +@@ -38,15 +37,33 @@ cat <<_EOF_ > ${CONF} + allow-rsa-pkcs1-encrypt = true + _EOF_ + +-${TEST} && fail "RSAES-PKCS1-v1_5 expected to succeed" ++${TEST} ++if [ $? != 0 ]; then ++ echo "${TEST} expected to succeed" ++ exit 1 ++fi ++echo "RSAES-PKCS1-v1_5 successfully enabled" + + cat <<_EOF_ > ${CONF} + [overrides] + allow-rsa-pkcs1-encrypt = false + _EOF_ + +-${TEST} || fail "RSAES-PKCS1-v1_5 expected to fail" ++${TEST} ++if [ $? = 0 ]; then ++ echo "${TEST} expected to fail" ++ exit 1 ++fi ++echo "RSAES-PKCS1-v1_5 successfully disabled" + + unset GNUTLS_SYSTEM_PRIORITY_FILE + unset GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID ++ ++${TEST} ++if [ $? != 0 ]; then ++ echo "${TEST} expected to succeed by default" ++ exit 1 ++fi ++echo "RSAES-PKCS1-v1_5 successfully enabled by default" ++ + exit 0 +-- +GitLab diff --git a/net-libs/gnutls/gnutls-3.7.2.ebuild b/net-libs/gnutls/gnutls-3.7.8.ebuild index 5448b73bad2e..be7248ee62ae 100644 --- a/net-libs/gnutls/gnutls-3.7.2.ebuild +++ b/net-libs/gnutls/gnutls-3.7.8.ebuild @@ -1,61 +1,60 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit libtool multilib-minimal +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc +inherit libtool multilib-minimal verify-sig DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols" HOMEPAGE="https://www.gnutls.org/" SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" LICENSE="GPL-3 LGPL-2.1+" -SLOT="0/30" # libgnutls.so number -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind" +SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number> +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" -REQUIRED_USE=" - test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" +REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" RESTRICT="!test? ( test )" -# NOTICE: sys-devel/autogen is required at runtime as we -# use system libopts RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] dev-libs/libunistring:=[${MULTILIB_USEDEP}] >=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}] >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] - tools? ( sys-devel/autogen:= ) + brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] ) dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) - pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] ) - idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )" + pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) + idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} test? ( seccomp? ( sys-libs/libseccomp ) )" -BDEPEND=">=virtual/pkgconfig-0-r1 +BDEPEND=" + dev-build/gtk-doc-am + >=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) - tools? ( sys-devel/autogen ) - valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist(-)] net-dialup/ppp net-misc/socat - )" + ) + verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20221017 )" -DOCS=( - README.md - doc/certtool.cfg -) +DOCS=( README.md doc/certtool.cfg ) HTML_DOCS=() pkg_setup() { - # bug#520818 + # bug #520818 export TZ=UTC use doc && HTML_DOCS+=( @@ -66,12 +65,6 @@ pkg_setup() { src_prepare() { default - # force regeneration of autogen-ed files - local file - for file in $(grep -l AutoGen-ed src/*.c) ; do - rm src/$(basename ${file} .c).{c,h} || die - done - # don't try to use system certificate store on macOS, it is # confusingly ignoring our ca-certificates and more importantly # fails to compile in certain configurations @@ -87,17 +80,24 @@ multilib_src_configure() { local libconf=() # TPM needs to be tested before being enabled - libconf+=( --without-tpm ) + # Note that this may add a libltdl dep when enabled. Check configure.ac. + libconf+=( + --without-tpm + --without-tpm2 + ) - # hardware-accell is disabled on OSX because the asm files force + # hardware-accel is disabled on OSX because the asm files force # GNU-stack (as doesn't support that) and when that's removed ld # complains about duplicate symbols [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - # Cygwin as does not understand these asm files at all - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no local myeconfargs=( + --disable-valgrind-tests $(multilib_native_enable manpages) $(multilib_native_use_enable doc gtk-doc) $(multilib_native_use_enable doc) @@ -106,7 +106,6 @@ multilib_src_configure() { $(multilib_native_use_enable test tests) $(multilib_native_use_enable test-full full-test-suite) $(multilib_native_use_enable tools) - $(multilib_native_use_enable valgrind valgrind-tests) $(use_enable cxx) $(use_enable dane libdane) $(use_enable nls) @@ -115,14 +114,18 @@ multilib_src_configure() { $(use_enable sslv3 ssl3-support) $(use_enable static-libs static) $(use_enable tls-heartbeat heartbeat-support) + $(use_with brotli) $(use_with idn) $(use_with pkcs11 p11-kit) + $(use_with zlib) + $(use_with zstd) --disable-rpath - --with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" + --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt + --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt --without-included-libtasn1 $("${S}/configure" --help | grep -o -- '--without-.*-prefix') ) + ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}" } diff --git a/net-libs/gnutls/gnutls-3.7.9.ebuild b/net-libs/gnutls/gnutls-3.7.9.ebuild new file mode 100644 index 000000000000..a22b20c9947b --- /dev/null +++ b/net-libs/gnutls/gnutls-3.7.9.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc +inherit libtool multilib-minimal verify-sig + +DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols" +HOMEPAGE="https://www.gnutls.org/" +SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" + +LICENSE="GPL-3 LGPL-2.1+" +SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number> +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" + +REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + >=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}] + >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] + brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] ) + dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) + guile? ( >=dev-scheme/guile-2:=[networking] ) + nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) + pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) + idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + test? ( + seccomp? ( sys-libs/libseccomp ) + )" +BDEPEND=" + dev-build/gtk-doc-am + >=virtual/pkgconfig-0-r1 + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + test-full? ( + app-crypt/dieharder + >=app-misc/datefudge-1.22 + dev-libs/softhsm:2[-bindist(-)] + net-dialup/ppp + net-misc/socat + ) + verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20221017 )" + +DOCS=( README.md doc/certtool.cfg ) + +HTML_DOCS=() + +pkg_setup() { + # bug #520818 + export TZ=UTC + + use doc && HTML_DOCS+=( + doc/gnutls.html + ) +} + +src_prepare() { + default + + # don't try to use system certificate store on macOS, it is + # confusingly ignoring our ca-certificates and more importantly + # fails to compile in certain configurations + sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die + + # Use sane .so versioning on FreeBSD. + elibtoolize +} + +multilib_src_configure() { + LINGUAS="${LINGUAS//en/en@boldquot en@quot}" + + local libconf=() + + # TPM needs to be tested before being enabled + # Note that this may add a libltdl dep when enabled. Check configure.ac. + libconf+=( + --without-tpm + --without-tpm2 + ) + + # hardware-accel is disabled on OSX because the asm files force + # GNU-stack (as doesn't support that) and when that's removed ld + # complains about duplicate symbols + [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + local myeconfargs=( + --disable-valgrind-tests + $(multilib_native_enable manpages) + $(multilib_native_use_enable doc gtk-doc) + $(multilib_native_use_enable doc) + $(multilib_native_use_enable guile) + $(multilib_native_use_enable seccomp seccomp-tests) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable test-full full-test-suite) + $(multilib_native_use_enable tools) + $(use_enable cxx) + $(use_enable dane libdane) + $(use_enable nls) + $(use_enable openssl openssl-compatibility) + $(use_enable sslv2 ssl2-support) + $(use_enable sslv3 ssl3-support) + $(use_enable static-libs static) + $(use_enable tls-heartbeat heartbeat-support) + $(use_with brotli) + $(use_with idn) + $(use_with pkcs11 p11-kit) + $(use_with zlib) + $(use_with zstd) + --disable-rpath + --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt + --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt + --without-included-libtasn1 + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') + ) + + ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc doc/examples/*.c + fi +} diff --git a/net-libs/gnutls/gnutls-3.8.0.ebuild b/net-libs/gnutls/gnutls-3.8.0.ebuild new file mode 100644 index 000000000000..535a418e445a --- /dev/null +++ b/net-libs/gnutls/gnutls-3.8.0.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc +inherit libtool multilib-minimal verify-sig + +DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols" +HOMEPAGE="https://www.gnutls.org/" +SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" + +LICENSE="GPL-3 LGPL-2.1+" +# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot +# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds. +# Subslot format: +# <libgnutls.so number>.<libgnutlsxx.so number> +SLOT="0/30.30" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" +REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + >=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}] + >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] + brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] ) + dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) + nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) + pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) + idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + test? ( + seccomp? ( sys-libs/libseccomp ) + )" +BDEPEND=" + dev-build/gtk-doc-am + >=virtual/pkgconfig-0-r1 + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + test-full? ( + app-crypt/dieharder + >=app-misc/datefudge-1.22 + dev-libs/softhsm:2[-bindist(-)] + net-dialup/ppp + net-misc/socat + ) + verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20221017 )" + +DOCS=( README.md doc/certtool.cfg ) + +HTML_DOCS=() + +src_prepare() { + default + + # bug #520818 + export TZ=UTC + + use doc && HTML_DOCS+=( doc/gnutls.html ) + + # don't try to use system certificate store on macOS, it is + # confusingly ignoring our ca-certificates and more importantly + # fails to compile in certain configurations + sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die + + # Use sane .so versioning on FreeBSD. + elibtoolize +} + +multilib_src_configure() { + LINGUAS="${LINGUAS//en/en@boldquot en@quot}" + + local libconf=() + + # TPM needs to be tested before being enabled + # Note that this may add a libltdl dep when enabled. Check configure.ac. + libconf+=( + --without-tpm + --without-tpm2 + ) + + # hardware-accel is disabled on OSX because the asm files force + # GNU-stack (as doesn't support that) and when that's removed ld + # complains about duplicate symbols + [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + local myeconfargs=( + --disable-valgrind-tests + $(multilib_native_enable manpages) + $(multilib_native_use_enable doc gtk-doc) + $(multilib_native_use_enable doc) + $(multilib_native_use_enable seccomp seccomp-tests) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable test-full full-test-suite) + $(multilib_native_use_enable tools) + $(use_enable cxx) + $(use_enable dane libdane) + $(use_enable nls) + $(use_enable openssl openssl-compatibility) + $(use_enable sslv2 ssl2-support) + $(use_enable sslv3 ssl3-support) + $(use_enable static-libs static) + $(use_enable tls-heartbeat heartbeat-support) + $(use_with brotli) + $(use_with idn) + $(use_with pkcs11 p11-kit) + $(use_with zlib) + $(use_with zstd) + --disable-rpath + --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt + --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt + --without-included-libtasn1 + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') + ) + + ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc doc/examples/*.c + fi +} diff --git a/net-libs/gnutls/gnutls-3.8.3.ebuild b/net-libs/gnutls/gnutls-3.8.3.ebuild new file mode 100644 index 000000000000..eefad049e085 --- /dev/null +++ b/net-libs/gnutls/gnutls-3.8.3.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc +inherit libtool multilib-minimal verify-sig + +DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols" +HOMEPAGE="https://www.gnutls.org/" +SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" + +LICENSE="GPL-3 LGPL-2.1+" +# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot +# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds. +# Subslot format: +# <libgnutls.so number>.<libgnutlsxx.so number> +SLOT="0/30.30" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" +REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + >=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}] + >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] + brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] ) + dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) + nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) + pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) + idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] ) +" +DEPEND=" + ${RDEPEND} + test? ( + seccomp? ( sys-libs/libseccomp ) + ) +" +BDEPEND=" + dev-build/gtk-doc-am + >=virtual/pkgconfig-0-r1 + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + test-full? ( + app-crypt/dieharder + || ( sys-libs/libfaketime >=app-misc/datefudge-1.22 ) + dev-libs/softhsm:2[-bindist(-)] + net-dialup/ppp + net-misc/socat + ) + verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20231129 ) +" + +DOCS=( README.md doc/certtool.cfg ) + +HTML_DOCS=() + +QA_CONFIG_IMPL_DECL_SKIP=( + # gnulib FPs + MIN + alignof + static_assert +) + +src_prepare() { + default + + # bug #520818 + export TZ=UTC + + use doc && HTML_DOCS+=( doc/gnutls.html ) + + # don't try to use system certificate store on macOS, it is + # confusingly ignoring our ca-certificates and more importantly + # fails to compile in certain configurations + sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die + + # Use sane .so versioning on FreeBSD. + elibtoolize +} + +multilib_src_configure() { + LINGUAS="${LINGUAS//en/en@boldquot en@quot}" + + local libconf=() + + # TPM needs to be tested before being enabled + # Note that this may add a libltdl dep when enabled. Check configure.ac. + libconf+=( + --without-tpm + --without-tpm2 + ) + + # hardware-accel is disabled on OSX because the asm files force + # GNU-stack (as doesn't support that) and when that's removed ld + # complains about duplicate symbols + [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + local myeconfargs=( + --disable-valgrind-tests + $(multilib_native_enable manpages) + $(multilib_native_use_enable doc gtk-doc) + $(multilib_native_use_enable doc) + $(multilib_native_use_enable seccomp seccomp-tests) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable test-full full-test-suite) + $(multilib_native_use_enable tools) + $(use_enable cxx) + $(use_enable dane libdane) + $(use_enable nls) + $(use_enable openssl openssl-compatibility) + $(use_enable sslv2 ssl2-support) + $(use_enable sslv3 ssl3-support) + $(use_enable static-libs static) + $(use_enable tls-heartbeat heartbeat-support) + $(use_with brotli) + $(use_with idn) + $(use_with pkcs11 p11-kit) + $(use_with zlib) + $(use_with zstd) + --disable-rpath + --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt + --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt + --without-included-libtasn1 + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') + ) + + ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc doc/examples/*.c + fi +} diff --git a/net-libs/gnutls/gnutls-3.8.5-r1.ebuild b/net-libs/gnutls/gnutls-3.8.5-r1.ebuild new file mode 100644 index 000000000000..24fba955fe8e --- /dev/null +++ b/net-libs/gnutls/gnutls-3.8.5-r1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc +inherit libtool multilib-minimal verify-sig + +DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols" +HOMEPAGE="https://www.gnutls.org/" +SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" + +LICENSE="GPL-3 LGPL-2.1+" +# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot +# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds. +# Subslot format: +# <libgnutls.so number>.<libgnutlsxx.so number> +SLOT="0/30.30" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" +REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + >=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}] + >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] + brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] ) + dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) + nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) + pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) + idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] ) +" +DEPEND=" + ${RDEPEND} + test? ( + seccomp? ( sys-libs/libseccomp ) + ) +" +BDEPEND=" + dev-build/gtk-doc-am + >=virtual/pkgconfig-0-r1 + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + test-full? ( + app-crypt/dieharder + || ( sys-libs/libfaketime >=app-misc/datefudge-1.22 ) + dev-libs/softhsm:2[-bindist(-)] + net-dialup/ppp + net-misc/socat + ) + verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20240415 ) +" + +DOCS=( README.md doc/certtool.cfg ) + +HTML_DOCS=() + +QA_CONFIG_IMPL_DECL_SKIP=( + # gnulib FPs + MIN + alignof + static_assert +) + +PATCHES=( + # Should no longer be needed for the next release + # bug #930529 + "${FILESDIR}"/${PN}-3.8.5-fix-rsaes-pkcs1-systemd-wide-config.patch +) + +src_prepare() { + default + + # bug #520818 + export TZ=UTC + + use doc && HTML_DOCS+=( doc/gnutls.html ) + + # don't try to use system certificate store on macOS, it is + # confusingly ignoring our ca-certificates and more importantly + # fails to compile in certain configurations + sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die + + # Use sane .so versioning on FreeBSD. + elibtoolize +} + +multilib_src_configure() { + LINGUAS="${LINGUAS//en/en@boldquot en@quot}" + + local libconf=() + + # TPM needs to be tested before being enabled + # Note that this may add a libltdl dep when enabled. Check configure.ac. + libconf+=( + --without-tpm + --without-tpm2 + ) + + # hardware-accel is disabled on OSX because the asm files force + # GNU-stack (as doesn't support that) and when that's removed ld + # complains about duplicate symbols + [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + local myeconfargs=( + --disable-valgrind-tests + $(multilib_native_enable manpages) + $(multilib_native_use_enable doc gtk-doc) + $(multilib_native_use_enable doc) + $(multilib_native_use_enable seccomp seccomp-tests) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable test-full full-test-suite) + $(multilib_native_use_enable tools) + $(use_enable cxx) + $(use_enable dane libdane) + $(use_enable nls) + $(use_enable openssl openssl-compatibility) + $(use_enable sslv2 ssl2-support) + $(use_enable sslv3 ssl3-support) + $(use_enable static-libs static) + $(use_enable tls-heartbeat heartbeat-support) + $(use_with brotli) + $(use_with idn) + $(use_with pkcs11 p11-kit) + $(use_with zlib) + $(use_with zstd) + --disable-rpath + --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt + --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt + --without-included-libtasn1 + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') + ) + + ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc doc/examples/*.c + fi +} diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml index de9a58df59b6..85a1b4066a43 100644 --- a/net-libs/gnutls/metadata.xml +++ b/net-libs/gnutls/metadata.xml @@ -1,43 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>base-system@gentoo.org</email> - </maintainer> - <use> - <flag name="dane"> - Build libgnutls-dane, implementing DNS-based Authentication of - Named Entities. Requires <pkg>net-dns/unbound</pkg> - </flag> - <flag name="openssl"> - Build openssl compatibility libraries - </flag> - <flag name="pkcs11"> - Add support for PKCS#11 through <pkg>app-crypt/p11-kit</pkg> - </flag> - <flag name="tools"> - Build extra tools - </flag> - <flag name="tls-heartbeat"> - Enable the Heartbeat Extension in TLS and DTLS - </flag> - <flag name="sslv2"> - Support for the old/insecure SSLv2 protocol - </flag> - <flag name="sslv3"> - Support for the old/insecure SSLv3 protocol - </flag> - <flag name="test-full"> - Enable full test mode - </flag> - <flag name="valgrind"> - Enable usage of <pkg>dev-util/valgrind</pkg> in debug - </flag> - </use> - <slots> - <subslots>Reflect ABI compatibility of libgnutls.so</subslots> - </slots> - <upstream> - <remote-id type="cpe">cpe:/a:gnu:gnutls</remote-id> - </upstream> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + </maintainer> + <use> + <flag name="dane"> + Build libgnutls-dane, implementing DNS-based Authentication of + Named Entities. Requires <pkg>net-dns/unbound</pkg> + </flag> + <flag name="openssl"> + Build openssl compatibility libraries + </flag> + <flag name="pkcs11"> + Add support for PKCS#11 through <pkg>app-crypt/p11-kit</pkg> + </flag> + <flag name="tools"> + Build extra tools + </flag> + <flag name="tls-heartbeat"> + Enable the Heartbeat Extension in TLS and DTLS + </flag> + <flag name="sslv2"> + Support for the old/insecure SSLv2 protocol + </flag> + <flag name="sslv3"> + Support for the old/insecure SSLv3 protocol + </flag> + <flag name="test-full"> + Enable full test mode + </flag> + </use> + <slots> + <subslots>Reflect ABI compatibility of libgnutls.so</subslots> + </slots> + <upstream> + <remote-id type="cpe">cpe:/a:gnu:gnutls</remote-id> + <remote-id type="gitlab">gnutls/gnutls</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest index 144c9ba8b13b..ad1605349f85 100644 --- a/net-libs/google-cloud-cpp/Manifest +++ b/net-libs/google-cloud-cpp/Manifest @@ -1,8 +1,7 @@ DIST google-cloud-cpp-0.10.0.tar.gz 2189161 BLAKE2B 1e599478db3f280cddc4232c7e6005c7b5a48b1f22aecc8a99dc60f461dad349d343b40e6545680e7b211ea40a07c9b069052c2a6e36cb7279e400cdebfa95a3 SHA512 9a1774dcc39d1626c8a9cf8630fe3b3110df7e21e452c7b137e1911d10b304997571aadff5fc0216715729db4a29621066a5236a0b2cb027bba4ce3c56492fb3 -DIST google-cloud-cpp-0.2.0.tar.gz 687020 BLAKE2B 45c09c7cb5b9cc93c87e6d1faedf04f29ae81196dda95660abeadeaaf522376b4e50fd42489476c081e8de7336202d3883ab276c0e2334f1ad1b0e4e1f90fdb8 SHA512 ded3b564ef264a8bff4d81b08f2a97462e063127bf75a006bc7b18d18cfaee2f3cbe5957fe2c56cec06da5a7765854444fad8cd5045579c416c5f3de8462382e -DIST google-cloud-cpp-0.5.0.tar.gz 1050893 BLAKE2B 6e96e2ca3f518f3c417d9d395001a42182aaeacdbbcfedc636387dbccedf5e570367bc66e5b3fecbe53d5b61e51b53709b83da90718826ac643fb2c43c1723c6 SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5 -DIST google-cloud-cpp-0.9.0.tar.gz 2209532 BLAKE2B 33b297d4836cf171833a4481b567d22f44aacdb0afd5422ec7da7f3c47fc1284a4a7723e306508c7dc7cc595166f040abe00a92eed58a07dfed77b94f99e9889 SHA512 b62051b9396efe8af8063d28ac958524b762a90c053f82030834bd38f018f0755487f6b39ceb5a0082d7cbf8784854c4effd81de27633086857330dc9bda182b +DIST google-cloud-cpp-1.36.0.tar.gz 4522003 BLAKE2B f436935b3a95fa911fb04429ee20b0712eeaf58f8ebfdd1b75f848e19ffa88d17b1be1d917f5693f1996ce6eaff6bd6053958c2b20cf29370164bccf2794c76c SHA512 a9885f9e0726de64eaee0376f3d1ed3a00c32919f2b9a911479206f2965a62eea5ff292b459f61eae97d5d2fe336c410c615296fcb0c7506faf45c57bd6f8871 +DIST google-cloud-cpp-2.19.0.tar.gz 12289079 BLAKE2B 915acacdc8e757e95244c715b74618e34ae3a22ea39bd0ae3e628dcd07f0dc99a2baaa11f4f69b9d2134ffc10af9e9437cf8862eff19a720ff415e0b1b15e6b8 SHA512 a392da19ac353409ecbf30e390803b2e34670552fd54466a08ee554a77c893d447289b30d5841c7f79b2a23244a269d8ecac8f7fbd8a34dda45ce2d8b1d46817 +DIST googleapis-0e3b813b0d0da539eacbe86b8716feeed00943c5.tar.gz 7914422 BLAKE2B 05dfb0523a4208c84d51e99bb3edd531b1d4069971fb6810ab2c31b7bc1b14824be9a4c5d0e176ad741d1b902242702be7f125595d22dd5a6d75d0a9e8790ed8 SHA512 56a9fd1ff464f33d80dcce1bfc927e4332fe2e986f731b3f8ceb583265a2b23a659273dc6777a100d563ed972672353f8fd0292f894c42b4142bb5d7882f8ef6 +DIST googleapis-28c6bb97cac6f16c69879be4e655674a74b886ef.tar.gz 5448352 BLAKE2B 0421ba9506e931d0bd7b01011832a91235f04ae825489021204da17d543671994e68dfecd97eeb8ee90f42726450d375955e1458e7dfba8551854c036bdc6069 SHA512 59f4d78c268280323314b8d471d4877cacc4238bfac3a769aa86cedd22d79ebeb50f2aaa8a60f9264976d12ef629a2a3d1a0da1c0d6723ec08f517ef0fae9450 DIST googleapis-6a3277c0656219174ff7c345f31fb20a90b30b97.tar.gz 746503 BLAKE2B c0cba88c19c658ba7e9e65b80557903f8ded280d25438120b32f8c29a714b58a527c9218f0f73b53646949ecc073d873fee712b370b95523bdea5c28747eeb25 SHA512 92795397dfb9a6aa931be7b191ee91f9f2678a7175dea6babf19a50f61923373d288832cf10edf1ff252ca5148fe649c1bf95535e7c21513129495afae4c0ff7 -DIST googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz 874997 BLAKE2B c837323124d26364c83dba72d4f73f3147ad117468b271e8d9502991c1f9a7b20d4f5405351147b65e99c57d207a2b8c1471228d2060ad238ade5159be1b009e SHA512 774e56fc30a4daf2e88d8d3b6747c1ac369d016e9d52527565b88d93252a22597339c17e612304f8823867da4b6df4b58a42dc9d4d480fc59962ee5314a85ab8 -DIST nlohmann-json-3.1.2-json.hpp 595822 BLAKE2B 510278344a510a516606f84aea53c682a64a7d1f4703e41503a1688e7c62ab1df8f197a697bd1149e958d21ab986d1b42cb78db6261b07239d9587756813acf5 SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5 DIST nlohmann-json-3.4.0-json.hpp 705920 BLAKE2B 9a22a6420f818038d8c4b352fb92ff0f0041b76232ef8665686399d184cfc62caffb60b4ccf1d8d33ae428839a70fece959f94795d71803623405d041efc9a13 SHA512 a1bdb4b434ee34cbc360e0203f500b25e15d7e1a6d25ea6e3bd3b56a5e7ec47d8c0bbe074930b7a07d6ceaf2112eefa24da9c1f0595aaf12c88697048238166d diff --git a/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch b/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch deleted file mode 100644 index f84cb4be3c27..000000000000 --- a/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur google-cloud-cpp-0.2.0.orig/google/cloud/storage/CMakeLists.txt google-cloud-cpp-0.2.0/google/cloud/storage/CMakeLists.txt ---- google-cloud-cpp-0.2.0.orig/google/cloud/storage/CMakeLists.txt 2018-09-28 00:39:41.170482472 +0800 -+++ google-cloud-cpp-0.2.0/google/cloud/storage/CMakeLists.txt 2018-09-28 00:42:09.679979597 +0800 -@@ -321,7 +321,7 @@ - PATTERN "testing/*" - EXCLUDE) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version_info.h DESTINATION -- include/storage/client) -+ include/google/cloud/storage) - - # Setup global variables used in the following *.in files. - set(GOOGLE_CLOUD_CPP_CONFIG_VERSION_MAJOR ${STORAGE_CLIENT_VERSION_MAJOR}) diff --git a/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch deleted file mode 100644 index a1b9a166ea3c..000000000000 --- a/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ef34b197dd23833c0dde9ea20f62681dbafa7a9b Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Fri, 7 Sep 2018 21:19:11 +0800 -Subject: [PATCH 1/2] cmake: Fix GOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config - -The grpc_cpp_plugin executable needs to be marked imported otherwise -cmake will try (and fail) to build it. Also the location variable was -typo'd. - -Signed-off-by: Jason Zaman <jason@perfinion.com> ---- - cmake/IncludeGrpc.cmake | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/cmake/IncludeGrpc.cmake b/cmake/IncludeGrpc.cmake -index 36dcfe5c..c18f5cbc 100644 ---- a/cmake/IncludeGrpc.cmake -+++ b/cmake/IncludeGrpc.cmake -@@ -225,9 +225,8 @@ elseif("${GOOGLE_CLOUD_CPP_GRPC_PROVIDER}" STREQUAL "pkg-config") - ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release - ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug) - mark_as_advanced(PROTOC_GRPCPP_PLUGIN_EXECUTABLE) -- add_executable(grpc_cpp_plugin ${PROTOC_GRPC_PLUGIN_EXECUTABLE}) -+ add_executable(grpc_cpp_plugin IMPORTED) - set_property(TARGET grpc_cpp_plugin -- PROPERTY IMPORTED_LOCATION -- ${PROTOC_GRPCPP_CPP_PLUGIN_EXECUTABLE}) -+ PROPERTY IMPORTED_LOCATION ${PROTOC_GRPCPP_PLUGIN_EXECUTABLE}) - - endif () --- -2.16.4 - diff --git a/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch b/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch deleted file mode 100644 index 74a57711ed63..000000000000 --- a/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch +++ /dev/null @@ -1,130 +0,0 @@ -From b1d6f58033be92661f91b221b878e333eb02fd7f Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Fri, 7 Sep 2018 22:35:24 +0800 -Subject: [PATCH 2/2] cmake: set library soversions - -Set library soversions so CMake sets the symlinks and soversions -properly. Install the cmake files in the correct dir. - -Signed-off-by: Jason Zaman <jason@perfinion.com> ---- - google/cloud/CMakeLists.txt | 7 +++++++ - google/cloud/bigtable/CMakeLists.txt | 14 ++++++++++++++ - google/cloud/firestore/CMakeLists.txt | 12 ++++++++++-- - google/cloud/storage/CMakeLists.txt | 9 ++++++++- - 4 files changed, 39 insertions(+), 3 deletions(-) - -diff --git a/google/cloud/CMakeLists.txt b/google/cloud/CMakeLists.txt -index 3f3f8742..442f4e17 100644 ---- a/google/cloud/CMakeLists.txt -+++ b/google/cloud/CMakeLists.txt -@@ -98,6 +98,13 @@ target_include_directories(google_cloud_cpp_common - $<INSTALL_INTERFACE:include>) - target_compile_options(google_cloud_cpp_common - PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) -+set_target_properties( -+ google_cloud_cpp_common -+ PROPERTIES -+ VERSION -+ ${GOOGLE_CLOUD_CPP_VERSION_MAJOR}.${GOOGLE_CLOUD_CPP_VERSION_MINOR}.${GOOGLE_CLOUD_CPP_VERSION_PATCH} -+ SOVERSION -+ ${GOOGLE_CLOUD_CPP_VERSION_MAJOR}) - - include(CreateBazelConfig) - create_bazel_config(google_cloud_cpp_common) -diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt -index 9ed778eb..fd9c8797 100644 ---- a/google/cloud/bigtable/CMakeLists.txt -+++ b/google/cloud/bigtable/CMakeLists.txt -@@ -102,6 +102,13 @@ target_include_directories(bigtable_protos - $<INSTALL_INTERFACE:include>) - target_compile_options(bigtable_protos - PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) -+set_target_properties( -+ bigtable_protos -+ PROPERTIES -+ VERSION -+ ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH} -+ SOVERSION -+ ${BIGTABLE_CLIENT_VERSION_MAJOR}) - add_library(bigtable::protos ALIAS bigtable_protos) - - # Enable unit tests -@@ -206,6 +213,13 @@ target_include_directories(bigtable_client - $<INSTALL_INTERFACE:include>) - target_compile_options(bigtable_client - PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) -+set_target_properties( -+ bigtable_client -+ PROPERTIES -+ VERSION -+ ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH} -+ SOVERSION -+ ${BIGTABLE_CLIENT_VERSION_MAJOR}) - add_library(bigtable::client ALIAS bigtable_client) - - include(CreateBazelConfig) -diff --git a/google/cloud/firestore/CMakeLists.txt b/google/cloud/firestore/CMakeLists.txt -index 88c5ad6d..c69e48fd 100644 ---- a/google/cloud/firestore/CMakeLists.txt -+++ b/google/cloud/firestore/CMakeLists.txt -@@ -62,6 +62,13 @@ target_include_directories(firestore_client - $<INSTALL_INTERFACE:include>) - target_compile_options(firestore_client - PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) -+set_target_properties( -+ firestore_client -+ PROPERTIES -+ VERSION -+ ${FIRESTORE_CLIENT_VERSION_MAJOR}.${FIRESTORE_CLIENT_VERSION_MINOR}.${FIRESTORE_CLIENT_VERSION_PATCH} -+ SOVERSION -+ ${FIRESTORE_CLIENT_VERSION_MAJOR}) - add_library(firestore::client ALIAS firestore_client) - - include(CreateBazelConfig) -@@ -104,7 +111,8 @@ install(TARGETS - - # The exports can only be installed if all the dependencies are installed. CMake - # needs to know where the submodules will be installed from, --install(EXPORT firestore-targets DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake) -+install(EXPORT firestore-targets -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/firestore_client") - - install(TARGETS firestore_client - EXPORT firestore-targets -@@ -142,4 +150,4 @@ install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake" - DESTINATION -- ${CMAKE_INSTALL_DATAROOTDIR}/cmake) -+ "${CMAKE_INSTALL_LIBDIR}/cmake/firestore_client") -diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt -index cef3954b..912391cc 100644 ---- a/google/cloud/storage/CMakeLists.txt -+++ b/google/cloud/storage/CMakeLists.txt -@@ -205,6 +205,13 @@ target_include_directories(storage_client - $<INSTALL_INTERFACE:include>) - target_compile_options(storage_client - PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) -+set_target_properties( -+ storage_client -+ PROPERTIES -+ VERSION -+ ${STORAGE_CLIENT_VERSION_MAJOR}.${STORAGE_CLIENT_VERSION_MINOR}.${STORAGE_CLIENT_VERSION_PATCH} -+ SOVERSION -+ ${STORAGE_CLIENT_VERSION_MAJOR}) - - add_library(storage_client_testing - testing/canonical_errors.h -@@ -315,7 +322,7 @@ install(TARGETS storage_client - RUNTIME DESTINATION bin - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) --install(DIRECTORY . DESTINATION include/storage/client -+install(DIRECTORY . DESTINATION include/google/cloud/storage/client - FILES_MATCHING - PATTERN "*.h" - PATTERN "testing/*" --- -2.16.4 - diff --git a/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.5.0-openssl.patch b/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.5.0-openssl.patch deleted file mode 100644 index a5579909e8ab..000000000000 --- a/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.5.0-openssl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur google-cloud-cpp-0.5.0.orig/google/cloud/storage/CMakeLists.txt google-cloud-cpp-0.5.0/google/cloud/storage/CMakeLists.txt ---- google-cloud-cpp-0.5.0.orig/google/cloud/storage/CMakeLists.txt 2019-01-30 14:01:05.657031402 +0800 -+++ google-cloud-cpp-0.5.0/google/cloud/storage/CMakeLists.txt 2019-01-30 14:01:19.969968164 +0800 -@@ -215,9 +215,6 @@ - Crc32c::crc32c - CURL::CURL - Threads::Threads -- OpenSSL::SSL -- OpenSSL::Crypto -- ZLIB::ZLIB - PRIVATE storage_common_options) - target_include_directories(storage_client - PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r1.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r2.ebuild index b1fb2095c0c3..b441242910a4 100644 --- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r1.ebuild +++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r2.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils +CMAKE_MAKEFILE_GENERATOR=emake +inherit cmake JSON_VER="3.4.0" GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97" @@ -36,11 +37,11 @@ PATCHES=( src_configure() { local mycmakeargs=( -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package - -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF + -DCMAKE_CXX_STANDARD=17 ) - cmake-utils_src_configure + cmake_src_configure mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die @@ -56,5 +57,5 @@ src_test() { -E internal_parse_rfc3339_test ) - cmake-utils_src_test + cmake_src_test } diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild deleted file mode 100644 index fe66dc867def..000000000000 --- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -JSON_VER="3.1.2" -GOOGLEAPIS_COMMIT="79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2" - -DESCRIPTION="Google Cloud Client Library for C++" -HOMEPAGE="https://cloud.google.com/" -SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp - https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/protobuf:= - net-misc/curl - net-libs/grpc" -DEPEND="${RDEPEND} - dev-cpp/gtest" - -DOCS=( README.md ) -PATCHES=( - "${FILESDIR}/0001-Make-the-install-target-work.patch" - "${FILESDIR}/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch" - "${FILESDIR}/0002-cmake-set-library-soversions.patch" -) - -src_prepare() { - rm -rf "${S}/third_party/googleapis/" || die - mv "${WORKDIR}/googleapis-${GOOGLEAPIS_COMMIT}/" "${S}/third_party/googleapis/" || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=package - -DGOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config - -DBUILD_SHARED_LIBS=ON - ) - - cmake-utils_src_configure - - mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die - cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die -} - -src_test() { - # test fails - local myctestargs=( - -E internal_parse_rfc3339_test - ) - - cmake-utils_src_test -} diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.5.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.5.0.ebuild deleted file mode 100644 index 4e651cbb6b25..000000000000 --- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.5.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -JSON_VER="3.4.0" -GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97" - -DESCRIPTION="Google Cloud Client Library for C++" -HOMEPAGE="https://cloud.google.com/" -SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp - https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RESTRICT="test" -RDEPEND="dev-cpp/gtest - dev-libs/protobuf:= - dev-libs/crc32c - net-misc/curl - net-libs/grpc" -DEPEND="${RDEPEND}" - -DOCS=( README.md ) -PATCHES=( - "${FILESDIR}/google-cloud-cpp-0.5.0-openssl.patch" -) - -src_prepare() { - rm -rf "${S}/third_party/googleapis/" || die - mv "${WORKDIR}/googleapis-${GOOGLEAPIS_COMMIT}/" "${S}/third_party/googleapis/" || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DGOOGLE_CLOUD_CPP_CRC32C_PROVIDER=package - -DGOOGLE_CLOUD_CPP_CURL_PROVIDER=package - -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=package - -DGOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config - -DBUILD_SHARED_LIBS=ON - -DBUILD_TESTING=OFF - ) - - cmake-utils_src_configure - - mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die - cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die -} - -src_test() { - # test fails - local myctestargs=( - -E internal_parse_rfc3339_test - ) - - cmake-utils_src_test -} diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild deleted file mode 100644 index 0575f7a04ab0..000000000000 --- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -JSON_VER="3.4.0" -GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97" - -DESCRIPTION="Google Cloud Client Library for C++" -HOMEPAGE="https://cloud.google.com/" -SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp - https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RESTRICT="test" -RDEPEND="dev-libs/protobuf:= - dev-libs/crc32c - net-misc/curl - net-libs/grpc:=" -DEPEND="${RDEPEND} - dev-cpp/gtest" - -DOCS=( README.md ) -PATCHES=( - "${FILESDIR}/google-cloud-cpp-0.5.0-openssl.patch" - "${FILESDIR}/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch" -) - -src_configure() { - local mycmakeargs=( - -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package - -DBUILD_SHARED_LIBS=ON - -DBUILD_TESTING=OFF - ) - - cmake-utils_src_configure - - mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die - cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die - - mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die - cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \ - "${BUILD_DIR}/external/googleapis/src/${GOOGLEAPIS_COMMIT}.tar.gz" || die -} - -src_test() { - # test fails - local myctestargs=( - -E internal_parse_rfc3339_test - ) - - cmake-utils_src_test -} diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-1.36.0.ebuild index 0575f7a04ab0..d0954a056cf3 100644 --- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild +++ b/net-libs/google-cloud-cpp/google-cloud-cpp-1.36.0.ebuild @@ -1,49 +1,51 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils +inherit cmake -JSON_VER="3.4.0" -GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97" +# From cmake/GoogleapisConfig.cmake +GOOGLEAPIS_COMMIT="28c6bb97cac6f16c69879be4e655674a74b886ef" DESCRIPTION="Google Cloud Client Library for C++" HOMEPAGE="https://cloud.google.com/" SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="test" +# Tests need a GCP account RESTRICT="test" -RDEPEND="dev-libs/protobuf:= +RDEPEND="dev-cpp/abseil-cpp:= + dev-cpp/nlohmann_json + dev-libs/protobuf:= dev-libs/crc32c + dev-libs/openssl:= + dev-libs/re2:= net-misc/curl - net-libs/grpc:=" + net-libs/grpc:= + sys-libs/zlib" DEPEND="${RDEPEND} - dev-cpp/gtest" + dev-cpp/gtest + test? ( + dev-cpp/benchmark + )" DOCS=( README.md ) -PATCHES=( - "${FILESDIR}/google-cloud-cpp-0.5.0-openssl.patch" - "${FILESDIR}/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch" -) src_configure() { local mycmakeargs=( - -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package - -DBUILD_SHARED_LIBS=ON - -DBUILD_TESTING=OFF + -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF + -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF + -DBUILD_TESTING=$(usex test) + -DCMAKE_CXX_STANDARD=17 ) - cmake-utils_src_configure - - mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die - cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die + cmake_src_configure mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \ @@ -56,5 +58,5 @@ src_test() { -E internal_parse_rfc3339_test ) - cmake-utils_src_test + cmake_src_test } diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-2.19.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-2.19.0.ebuild new file mode 100644 index 000000000000..b8abe9837cc6 --- /dev/null +++ b/net-libs/google-cloud-cpp/google-cloud-cpp-2.19.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +# From cmake/GoogleapisConfig.cmake +GOOGLEAPIS_COMMIT="0e3b813b0d0da539eacbe86b8716feeed00943c5" + +DESCRIPTION="Google Cloud Client Library for C++" +HOMEPAGE="https://cloud.google.com/" +SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-cpp/abseil-cpp:= + dev-cpp/nlohmann_json + dev-libs/protobuf:= + dev-libs/crc32c + dev-libs/openssl:= + dev-libs/re2:= + net-misc/curl + net-libs/grpc:= + sys-libs/zlib" +DEPEND="${RDEPEND} + dev-cpp/gtest + test? ( + dev-cpp/benchmark + )" + +DOCS=( README.md ) + +src_configure() { + local mycmakeargs=( + -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF + -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF + -DBUILD_TESTING=$(usex test) + -DCMAKE_CXX_STANDARD=17 + ) + + cmake_src_configure + + mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die + cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \ + "${BUILD_DIR}/external/googleapis/src/${GOOGLEAPIS_COMMIT}.tar.gz" || die +} + +src_test() { + # ClogEnvironment fails under portage sandbox, no fail outside + cmake_src_test -LE "integration-test" -E common_log_test +} diff --git a/net-libs/google-cloud-cpp/metadata.xml b/net-libs/google-cloud-cpp/metadata.xml index e85252a96df1..bc6224031049 100644 --- a/net-libs/google-cloud-cpp/metadata.xml +++ b/net-libs/google-cloud-cpp/metadata.xml @@ -5,4 +5,7 @@ <email>perfinion@gentoo.org</email> <name>Jason Zaman</name> </maintainer> + <upstream> + <remote-id type="github">GoogleCloudPlatform/google-cloud-cpp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index d12fa3b25701..7f8917ce7461 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -1,4 +1,5 @@ -DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7 -DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2 -DIST grpc-1.41.0.tar.gz 8347643 BLAKE2B e8c0e32d3cfc75413bfcd0bfbd95a5dc592d11f629e63618619ba307a76a62668c1c21efda45836aef8fb6a1912da0c300f3d4cd41f8b93344fa1768a86df6e6 SHA512 bc353bfd8cc10d8b992e4cf680c656ef6ddbcecbaa640c94e9255664d532926e48f3839afc98ef6278ae4e2eb54d166ac67fec7315dc1d08640845ed8120d902 -DIST grpc-1.41.1.tar.gz 8346512 BLAKE2B fbb453f7ab398ac843b19922b7e3f71121bc9ba44b3e0c558796dc519dbbc5d34e31d1059bfa7552fefdd7c05d5a8b03645f5c5257e73126ba14a73bec0b1fb1 SHA512 17d4c0867a51e33c029bcce86371f8e1d4680ba78fe4f02fb63b8614e9c5f7f6078c22b7c56c63c6ff461429a70d2ec87cb3c0d30c897a88321fe7f26de6e052 +DIST grpc-1.52.1.tar.gz 8686340 BLAKE2B 0076ddd4a2840892f4ad11885e18f782b6a645337224974522c5f828d0226d6a1e19aaaf0f30ea3225d56118e0cfc251d45b8d5e6811c2d1a84e274ff037bb53 SHA512 06c69fb817af75b2610761a3a193178b749755eb7bed58875aa251def7c0c253cdaf02cf834c31c8b2cae7b01a6081e2aece4b131a162f64bd45ff0aff4d7758 +DIST grpc-1.55.1.tar.gz 9272441 BLAKE2B b2788d8deeb9791f04073294caa82c10e2cfe6376d09f396b51508a52f809e7f9f48d50ad5a62b2add652633b5c2d3b1ba07857b81111fa810202106251f440d SHA512 ecfa3a5affe33f160032f2ce42a9b44344d217359f68ee99305162ccabc911f44bc22512401183de74347e86add2ce20ec89da87ba6c14ab69874eb0835145d1 +DIST grpc-1.56.1.tar.gz 11750628 BLAKE2B 52ea088d3d19fa7c1d1dc44899cd67bfd0132df2fd37690d855194d3196e4c26cfdd6fe589b5e4f802cdf88e70aad6c33b3ee98c1bd1bc47356d0dee9cdc706d SHA512 2bf9619edb60a6cec4cdaa89ee3c470c52b9745ea954bfe205aef6eb29bb55949de02e8c2afc7352eacdcd33fe4000861fd16fda9e5f66c87222674b17d6322a +DIST grpc-1.57.0.tar.gz 17337863 BLAKE2B 10c6fb35f606806aeb25cd55dd993d9af168eb8b1db64b4515830e2144dc44f35ce8f8329316a38d933b8032a0eff386591a0ddb87f2e405c5deaba012db2824 SHA512 b323de7c1f35b9de3fb7bf02ff4db6993abb0eee6860bbf2082818dda405fbe3a19fad91c5b48565cb65c6318de739bb91e47b5095801c078c6cbf3e8c73600c +DIST grpc-1.60.0.tar.gz 17442762 BLAKE2B 35cc0ea938deb848ca91e3d5f8879b85b80f94ac09b582600f05fee1f55c162ae98f2f744480f69d78e78da0c0f2d9e198f812101daaa1f1959869f26ba7d97a SHA512 91c2406ed4198509ac0d5360b3da6898fa4f40f459eb6fff541faa44cc238eed98fd7489e7ef7a80a6f4a318bc5b9130eaa0ba1beaa358d1c074fc82825648ff diff --git a/net-libs/grpc/files/grpc-1.57.0-fix-cmake.patch b/net-libs/grpc/files/grpc-1.57.0-fix-cmake.patch new file mode 100644 index 000000000000..1caa9e9bb8f8 --- /dev/null +++ b/net-libs/grpc/files/grpc-1.57.0-fix-cmake.patch @@ -0,0 +1,29 @@ +https://github.com/grpc/grpc/pull/33361 + +From 117dc80eb43021dd5619023ef6d02d0d6ec7ae7a Mon Sep 17 00:00:00 2001 +From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> +Date: Wed, 7 Jun 2023 13:06:49 +0800 +Subject: [PATCH] [Build] fix `gRPCConfig.cmake` + +Without this change, calling `find_package(gRPC REQUIRED)` errors out +with + + CMake Error at /opt/homebrew/lib/cmake/grpc/gRPCConfig.cmake:8 (find_dependency): + Unknown CMake command "find_dependency". + +The issue is that `find_dependency` is provided by the +`CMakeFindDependencyMacro` module[^1], so we need to `include` it before +use. + +[^1]: https://cmake.org/cmake/help/v3.26/module/CMakeFindDependencyMacro.html +--- a/cmake/protobuf.cmake ++++ b/cmake/protobuf.cmake +@@ -86,6 +86,6 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package") + set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE}) + endif() + endif() +- set(_gRPC_FIND_PROTOBUF "find_dependency(Protobuf CONFIG)") ++ set(_gRPC_FIND_PROTOBUF "include(CMakeFindDependencyMacro)\nfind_dependency(Protobuf CONFIG)") + endif() + endif() + diff --git a/net-libs/grpc/grpc-1.41.0.ebuild b/net-libs/grpc/grpc-1.52.1.ebuild index e9f7052206f3..69608ae12606 100644 --- a/net-libs/grpc/grpc-1.41.0.ebuild +++ b/net-libs/grpc/grpc-1.52.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake +inherit cmake flag-o-matic MY_PV="${PV//_pre/-pre}" @@ -13,16 +13,16 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt -SLOT="0/19.141" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +SLOT="0/30.152" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="doc examples test" # look for submodule versions in third_party dir RDEPEND=" - =dev-cpp/abseil-cpp-20210324*:= - >=dev-libs/re2-0.2021.04.01:= + =dev-cpp/abseil-cpp-20220623.1*:= + >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] - >=dev-libs/protobuf-3.17.3:= + >=dev-libs/protobuf-3.18.1:= dev-libs/xxhash >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= @@ -58,13 +58,18 @@ src_prepare() { cmake_src_prepare # un-hardcode libdir - sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die + # suppress network access, package builds fine without the submodules + mkdir "${S}/third_party/opencensus-proto/src" || die + soversion_check } src_configure() { + # https://github.com/grpc/grpc/issues/29652 + filter-lto + local mycmakeargs=( -DgRPC_INSTALL=ON -DgRPC_ABSL_PROVIDER=package @@ -78,7 +83,6 @@ src_configure() { -DgRPC_ZLIB_PROVIDER=package -DgRPC_BUILD_TESTS=$(usex test) -DCMAKE_CXX_STANDARD=17 - $(usex test '-DgRPC_GFLAGS_PROVIDER=package' '') $(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '') ) cmake_src_configure diff --git a/net-libs/grpc/grpc-1.41.1.ebuild b/net-libs/grpc/grpc-1.55.1.ebuild index e9f7052206f3..dbbe581c6f0b 100644 --- a/net-libs/grpc/grpc-1.41.1.ebuild +++ b/net-libs/grpc/grpc-1.55.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake +inherit cmake flag-o-matic MY_PV="${PV//_pre/-pre}" @@ -13,16 +13,16 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt -SLOT="0/19.141" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +SLOT="0/32.155" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="doc examples test" # look for submodule versions in third_party dir RDEPEND=" - =dev-cpp/abseil-cpp-20210324*:= - >=dev-libs/re2-0.2021.04.01:= + =dev-cpp/abseil-cpp-20230125.2*:= + >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] - >=dev-libs/protobuf-3.17.3:= + >=dev-libs/protobuf-22:= dev-libs/xxhash >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= @@ -58,29 +58,34 @@ src_prepare() { cmake_src_prepare # un-hardcode libdir - sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die + # suppress network access, package builds fine without the submodules + mkdir "${S}/third_party/opencensus-proto/src" || die + soversion_check } src_configure() { + # https://github.com/grpc/grpc/issues/29652 + filter-lto + local mycmakeargs=( -DgRPC_INSTALL=ON - -DgRPC_ABSL_PROVIDER=package - -DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF - -DgRPC_CARES_PROVIDER=package -DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}" -DgRPC_INSTALL_LIBDIR="$(get_libdir)" + -DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF + -DgRPC_ABSL_PROVIDER=package + -DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_RE2_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_BUILD_TESTS=$(usex test) - -DCMAKE_CXX_STANDARD=17 - $(usex test '-DgRPC_GFLAGS_PROVIDER=package' '') $(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '') + -DCMAKE_CXX_STANDARD=17 ) + cmake_src_configure } diff --git a/net-libs/grpc/grpc-1.38.1.ebuild b/net-libs/grpc/grpc-1.56.1.ebuild index d8cb707cf8aa..c49f2007237e 100644 --- a/net-libs/grpc/grpc-1.38.1.ebuild +++ b/net-libs/grpc/grpc-1.56.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake +inherit cmake flag-o-matic MY_PV="${PV//_pre/-pre}" @@ -13,22 +13,22 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt -SLOT="0/16.138" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +SLOT="0/33.156" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="doc examples test" # look for submodule versions in third_party dir RDEPEND=" - =dev-cpp/abseil-cpp-20210324*:= - >=dev-libs/re2-0.2021.04.01:= + =dev-cpp/abseil-cpp-20230125.2*:= + >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] - >=dev-libs/protobuf-3.15.8:= + >=dev-libs/protobuf-23.3:= dev-libs/xxhash >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= " - -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} test? ( dev-cpp/benchmark dev-cpp/gflags @@ -58,13 +58,18 @@ src_prepare() { cmake_src_prepare # un-hardcode libdir - sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die + # suppress network access, package builds fine without the submodules + mkdir "${S}/third_party/opencensus-proto/src" || die + soversion_check } src_configure() { + # https://github.com/grpc/grpc/issues/29652 + filter-lto + local mycmakeargs=( -DgRPC_INSTALL=ON -DgRPC_ABSL_PROVIDER=package @@ -78,7 +83,6 @@ src_configure() { -DgRPC_ZLIB_PROVIDER=package -DgRPC_BUILD_TESTS=$(usex test) -DCMAKE_CXX_STANDARD=17 - $(usex test '-DgRPC_GFLAGS_PROVIDER=package' '') $(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '') ) cmake_src_configure diff --git a/net-libs/grpc/grpc-1.57.0-r1.ebuild b/net-libs/grpc/grpc-1.57.0-r1.ebuild new file mode 100644 index 000000000000..3b44163c341f --- /dev/null +++ b/net-libs/grpc/grpc-1.57.0-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +MY_PV="${PV//_pre/-pre}" + +DESCRIPTION="Modern open source high performance RPC framework" +HOMEPAGE="https://www.grpc.io" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt +SLOT="0/34.157" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="doc examples test systemd" + +# look for submodule versions in third_party dir +RDEPEND=" + =dev-cpp/abseil-cpp-20230125.3*:= + >=dev-libs/re2-0.2021.11.01:= + >=dev-libs/openssl-1.1.1:0=[-bindist(-)] + >=dev-libs/protobuf-23.3:= + dev-libs/xxhash + >=net-dns/c-ares-1.15.0:= + sys-libs/zlib:= + systemd? ( sys-apps/systemd:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-cpp/benchmark + dev-cpp/gflags + ) +" + +BDEPEND="virtual/pkgconfig" + +# requires sources of many google tools +RESTRICT="test" + +S="${WORKDIR}/${PN}-${MY_PV}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.57.0-fix-cmake.patch +) + +soversion_check() { + local core_sover cpp_sover + # extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION "1.37")' + core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt | sed '/.*\"\(.*\)\".*/ s//\1/')" + cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt | sed '/.*\"\(.*\)\".*/ s//\1/')" + # remove dots, e.g. 1.37 -> 137 + core_sover="${core_sover//./}" + cpp_sover="${cpp_sover//./}" + [[ ${core_sover} -eq $(ver_cut 2 ${SLOT}) ]] || die "fix core sublot! should be ${core_sover}" + [[ ${cpp_sover} -eq $(ver_cut 3 ${SLOT}) ]] || die "fix cpp sublot! should be ${cpp_sover}" +} + +src_prepare() { + cmake_src_prepare + + # un-hardcode libdir + sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die + + # suppress network access, package builds fine without the submodules + mkdir "${S}/third_party/opencensus-proto/src" || die + + soversion_check +} + +src_configure() { + # https://github.com/grpc/grpc/issues/29652 + filter-lto + + local mycmakeargs=( + -DgRPC_INSTALL=ON + -DgRPC_ABSL_PROVIDER=package + -DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF + -DgRPC_CARES_PROVIDER=package + -DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}" + -DgRPC_INSTALL_LIBDIR="$(get_libdir)" + -DgRPC_PROTOBUF_PROVIDER=package + -DgRPC_RE2_PROVIDER=package + -DgRPC_SSL_PROVIDER=package + -DgRPC_ZLIB_PROVIDER=package + -DgRPC_BUILD_TESTS=$(usex test) + -DCMAKE_CXX_STANDARD=17 + -DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex !systemd) + $(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '') + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use examples; then + find examples -name '.gitignore' -delete || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi + + if use doc; then + find doc -name '.gitignore' -delete || die + local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. ) + fi + + einstalldocs +} diff --git a/net-libs/grpc/grpc-1.37.1-r2.ebuild b/net-libs/grpc/grpc-1.60.0.ebuild index 468f9b7a6ac4..4a22cee5664a 100644 --- a/net-libs/grpc/grpc-1.37.1-r2.ebuild +++ b/net-libs/grpc/grpc-1.60.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake +inherit cmake flag-o-matic MY_PV="${PV//_pre/-pre}" @@ -13,21 +13,23 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt -SLOT="0/15.137" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="doc examples test" +SLOT="0/37.160" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="doc examples test systemd" # look for submodule versions in third_party dir RDEPEND=" - =dev-cpp/abseil-cpp-20200923*:=[cxx17(+)] - >=dev-libs/re2-0.2021.04.01:= + =dev-cpp/abseil-cpp-20230802.0*:= + >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] - >=dev-libs/protobuf-3.15.2:= + >=dev-libs/protobuf-23.3:= + dev-libs/xxhash >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= + systemd? ( sys-apps/systemd:= ) " - -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} test? ( dev-cpp/benchmark dev-cpp/gflags @@ -41,6 +43,9 @@ RESTRICT="test" S="${WORKDIR}/${PN}-${MY_PV}" +PATCHES=( +) + soversion_check() { local core_sover cpp_sover # extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION "1.37")' @@ -57,13 +62,18 @@ src_prepare() { cmake_src_prepare # un-hardcode libdir - sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die + # suppress network access, package builds fine without the submodules + mkdir "${S}/third_party/opencensus-proto/src" || die + soversion_check } src_configure() { + # https://github.com/grpc/grpc/issues/29652 + filter-lto + local mycmakeargs=( -DgRPC_INSTALL=ON -DgRPC_ABSL_PROVIDER=package @@ -77,7 +87,7 @@ src_configure() { -DgRPC_ZLIB_PROVIDER=package -DgRPC_BUILD_TESTS=$(usex test) -DCMAKE_CXX_STANDARD=17 - $(usex test '-DgRPC_GFLAGS_PROVIDER=package' '') + -DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex !systemd) $(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '') ) cmake_src_configure diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml index 3114df3e23c1..b99a6e2ce83d 100644 --- a/net-libs/grpc/metadata.xml +++ b/net-libs/grpc/metadata.xml @@ -5,8 +5,8 @@ <email>perfinion@gentoo.org</email> </maintainer> <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> + <email>xen0n@gentoo.org</email> + <name>WANG Xuerui</name> </maintainer> <upstream> <remote-id type="cpe">cpe:/a:grpc:grpc</remote-id> diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest index 270ac1314f74..ce66e72e2664 100644 --- a/net-libs/gsoap/Manifest +++ b/net-libs/gsoap/Manifest @@ -1,2 +1,2 @@ -DIST gsoap_2.8.106.zip 32740371 BLAKE2B b4904290ec5d8ebfc326bfd8d2c99e68c88cc9a07440d97ed8a442331c9f74549f75118f3e237f0796eba060b988d521c3af2bb9485d06e8277c5f18ade8cd82 SHA512 c461870fc563f848bfbdbc492cc5a26fece0d0c9a56092cb06ca3139e88c340969f23865e72187e1141a8f707f14ab6806e6a0b739b3c531161deefd6fbe510a DIST gsoap_2.8.114.zip 34599617 BLAKE2B fe68b057fa288b033f068be33e3f8871af8daf812d77a2fc87399f6750a4a8e23cb323dade3385c9b2147b2cde46980e9c52d393eff6eb16fa52cdbcc7a62537 SHA512 205d38a36c56780fd34bad8ea56525a04d4dc5b58af55676783c78d6eecf47dd0e9c86b0106f68127cfb2f45cb94f6ac9ebe353d1c6687e9faa13badb4a9690a +DIST gsoap_2.8.130.zip 55318989 BLAKE2B 5b118027811787c818c2e4e9be86eae954fc15fcc9f0bc237afec6fb71c697c659ce5071d572ee3178315c9d140e32c0e0c226bfaeb6aba0df7d84a4b90fcd3a SHA512 b82ebc7d058a9e2f59d325e2c50e96f6bd712c65285389cb120c4a9bbf51da1b99a833d8f81ba674e37f34090fde8317990de1906c97434342cbe84568d66b6c diff --git a/net-libs/gsoap/files/gsoap-2.8.130-musl-strerror_r.patch b/net-libs/gsoap/files/gsoap-2.8.130-musl-strerror_r.patch new file mode 100644 index 000000000000..01a7f82b2348 --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.8.130-musl-strerror_r.patch @@ -0,0 +1,59 @@ +Bug: https://bugs.gentoo.org/897870 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Tue, 12 Sep 2023 17:32:42 +0000 +Subject: [PATCH] Fix incompatible integer to pointer conversion on musl + +musl libc only supports XSI-compliant version of strerror_r. Hence we +need to check if __GLIBC__ is defined or not. + +Also it's incorrectly assumed to use a differnt version of gethostbyname_r than +that's available with glibc or musl libc. Without the extra !defined(__GLIBC__) +the condition goes straight to the following section of the code +``` +#elif defined(HAVE_GETHOSTBYNAME_R) + hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &soap->errnum); +#elif defined(VXWORKS) +``` +Which is not the correct implementation of gethostbyname_r present. + +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/gsoap/stdsoap2.c ++++ b/gsoap/stdsoap2.c +@@ -23145,7 +23145,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) || !defined(__GLIBC__) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); +--- a/gsoap/stdsoap2.cpp ++++ b/gsoap/stdsoap2.cpp +@@ -5457,7 +5457,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + { + #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) + struct hostent_data ht_data; +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && defined(HAVE_GETHOSTBYNAME_R) || !defined(__GLIBC__) + int r; + char *tmpbuf = soap->tmpbuf; + size_t tmplen = sizeof(soap->tmpbuf); +@@ -5490,7 +5490,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) || !defined(__GLIBC__) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -23145,7 +23145,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) || !defined(__GLIBC__) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); diff --git a/net-libs/gsoap/files/gsoap-2.8.130-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.130-shared_libs.patch new file mode 100644 index 000000000000..3acb732fb3e3 --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.8.130-shared_libs.patch @@ -0,0 +1,140 @@ +https://bugs.gentoo.org/583398 +https://build.opensuse.org/package/view_file/openSUSE:Factory/gsoap/gsoap-01-sharedlibs.diff?expand=1 +See also: https://src.fedoraproject.org/rpms/gsoap/blob/rawhide/f/gsoap-libtool.patch + +From: Jan Engelhardt <jengelh@medozas.de> +Date: 2011-07-01 17:19:00 +0200 + +build: always use shared libraries + +--- a/configure.ac ++++ b/configure.ac +@@ -15,8 +15,8 @@ AM_PROG_CC_C_O + AM_PROG_LEX([noyywrap]) + AC_PROG_YACC + AC_PROG_CPP +-AC_PROG_RANLIB +-#AM_PROG_LIBTOOL ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) ++LT_INIT + AC_PROG_LN_S + AC_PROG_AWK + AC_PROG_INSTALL +@@ -310,7 +310,7 @@ if test "x$with_openssl" = "xyes"; then + WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" + SAMPLE_INCLUDES= + SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" +- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" + else + if test "x$with_wolfssl" = "xyes"; then + AC_MSG_RESULT(yes) +@@ -318,7 +318,7 @@ if test "x$with_openssl" = "xyes"; then + WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lwolfssl -lz" + SAMPLE_INCLUDES= + SAMPLE_SSL_LIBS="-lwolfssl -lz" +- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" + else + AC_MSG_RESULT(no) + WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" +@@ -326,7 +326,7 @@ if test "x$with_openssl" = "xyes"; then + WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" + SAMPLE_INCLUDES= + SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" +- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" + fi + fi + if test -n "$ZLIB"; then +@@ -346,7 +346,7 @@ else + WSDL2H_EXTRA_FLAGS= + SAMPLE_SSL_LIBS= + SAMPLE_INCLUDES= +- WSDL2H_SOAP_CPP_LIB="libgsoap++.a" ++ WSDL2H_SOAP_CPP_LIB="libgsoap++.la" + fi + AM_CONDITIONAL([WITH_OPENSSL], [test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes" -a "x$with_wolfssl" != "xyes"]) + AC_SUBST(WSDL2H_EXTRA_FLAGS) +--- a/gsoap/Makefile.am ++++ b/gsoap/Makefile.am +@@ -34,20 +34,34 @@ stdsoap2_ssl_cpp.cpp: stdsoap2.cpp + dom_cpp.cpp: dom.cpp + $(LN_S) -f $(top_srcdir)/gsoap/dom.cpp dom_cpp.cpp + +-lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a ++lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la + +-libgsoap_a_SOURCES = stdsoap2.c dom.c +-libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) +-libgsoap___a_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp +-libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) +-libgsoapck_a_SOURCES = stdsoap2_ck.c dom.c +-libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) -DWITH_COOKIES +-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp +-libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) -DWITH_COOKIES +-libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c +-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES +-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp +-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES ++libgsoap_la_SOURCES = stdsoap2.c dom.c ++libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) ++libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp ++libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) ++libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c ++libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) -DWITH_COOKIES ++libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp ++libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) -DWITH_COOKIES ++libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c ++libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES ++libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp ++libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES ++libgsoap_la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoap.sym ++libgsoap___la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoap++.sym ++libgsoapck_la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapck.sym ++libgsoapck___la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapck++.sym ++libgsoapssl_la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapssl.sym ++libgsoapssl_la_LIBADD = ${SAMPLE_SSL_LIBS} ++libgsoapssl___la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapssl++.sym ++libgsoapssl___la_LIBADD = ${libgsoapssl_la_LIBADD} ++EXTRA_libgsoap_la_DEPENDENCIES = gsoap.sym ++EXTRA_libgsoap___la_DEPENDENCIES = gsoap++.sym ++EXTRA_libgsoapck_la_DEPENDENCIES = gsoapck.sym ++EXTRA_libgsoapck___la_DEPENDENCIES = gsoapck++.sym ++EXTRA_libgsoapssl_la_DEPENDENCIES = gsoapssl.sym ++EXTRA_libgsoapssl___la_DEPENDENCIES = gsoapssl++.sym + + BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp + +--- /dev/null ++++ b/gsoap/gsoap++.sym +@@ -0,0 +1 @@ ++GSOAPXX { global: *; }; +--- /dev/null ++++ b/gsoap/gsoap.sym +@@ -0,0 +1 @@ ++GSOAP { global: *; }; +--- /dev/null ++++ b/gsoap/gsoapck++.sym +@@ -0,0 +1 @@ ++GSOAPCKXX { global: *; }; +--- /dev/null ++++ b/gsoap/gsoapck.sym +@@ -0,0 +1 @@ ++GSOAPCK { global: *; }; +--- /dev/null ++++ b/gsoap/gsoapckssl++.sym +@@ -0,0 +1 @@ ++GSOAPCKSSLXX { global: *; }; +--- /dev/null ++++ b/gsoap/gsoapckssl.sym +@@ -0,0 +1 @@ ++GSOAPCKSSL { global: *; }; +--- /dev/null ++++ b/gsoap/gsoapssl++.sym +@@ -0,0 +1 @@ ++GSOAPSSLXX { global: *; }; +--- /dev/null ++++ b/gsoap/gsoapssl.sym +@@ -0,0 +1 @@ ++GSOAPSSL { global: *; }; diff --git a/net-libs/gsoap/gsoap-2.8.106.ebuild b/net-libs/gsoap/gsoap-2.8.114-r1.ebuild index 26277efaeaab..a6907fd3f297 100644 --- a/net-libs/gsoap/gsoap-2.8.106.ebuild +++ b/net-libs/gsoap/gsoap-2.8.114-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,9 +9,9 @@ MY_P="${PN}-2.8" DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services" HOMEPAGE="http://gsoap2.sourceforge.net" -SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip" +SRC_URI="https://downloads.sourceforge.net/gsoap2/gsoap_${PV}.zip" -LICENSE="|| ( gSOAP GPL-2+-with-openssl-exception ) GPL-2+" +LICENSE="|| ( gSOAP-1.3b GPL-2+-with-openssl-exception ) GPL-2+" SLOT="0" KEYWORDS="amd64 x86" IUSE="doc debug examples ipv6 gnutls +ssl" @@ -25,8 +25,8 @@ RDEPEND=" " DEPEND="${RDEPEND} app-arch/unzip - sys-devel/flex - sys-devel/bison + app-alternatives/lex + app-alternatives/yacc " PATCHES=( diff --git a/net-libs/gsoap/gsoap-2.8.130-r1.ebuild b/net-libs/gsoap/gsoap-2.8.130-r1.ebuild new file mode 100644 index 000000000000..65ddc1c93253 --- /dev/null +++ b/net-libs/gsoap/gsoap-2.8.130-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_P="${PN}-2.8" +DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services" +HOMEPAGE="http://gsoap2.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/gsoap2/gsoap_${PV}.zip" +S="${WORKDIR}/${MY_P}" + +LICENSE="|| ( gSOAP-1.3b GPL-2+-with-openssl-exception ) GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc debug examples ipv6 gnutls +ssl" + +RDEPEND=" + sys-libs/zlib + gnutls? ( net-libs/gnutls ) + ssl? ( + dev-libs/openssl:= + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + app-arch/unzip + sys-devel/bison + sys-devel/flex +" + +PATCHES=( + # Enable shared libs (bug #583398) + "${FILESDIR}/${PN}-2.8.130-shared_libs.patch" + # use XSI-compliant version of strerror_r() on musl + "${FILESDIR}/${PN}-2.8.130-musl-strerror_r.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + unset YACC LEX + + local myeconfargs=( + # Don't include xlocale.h as it got removed in >=glibc-2.26 + --disable-xlocale + $(use_enable debug) + $(use_enable gnutls) + $(usev ipv6 --enable-ipv6) + $(usev !ssl --disable-ssl) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + # Yes, we also install the license-file since + # it contains info about how to apply the licenses. + dodoc *.txt + + docinto html + dodoc changelog.md + + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die + + if use examples; then + insinto /usr/share/${PN}/examples + doins -r gsoap/samples/* + fi + + if use doc; then + docinto html + dodoc -r gsoap/doc/* + fi +} diff --git a/net-libs/gsoap/gsoap-2.8.114.ebuild b/net-libs/gsoap/gsoap-2.8.130.ebuild index 6beb07adfc27..1ed8d61a6669 100644 --- a/net-libs/gsoap/gsoap-2.8.114.ebuild +++ b/net-libs/gsoap/gsoap-2.8.130.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools MY_P="${PN}-2.8" - DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services" HOMEPAGE="http://gsoap2.sourceforge.net" -SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip" +SRC_URI="https://downloads.sourceforge.net/gsoap2/gsoap_${PV}.zip" +S="${WORKDIR}/${MY_P}" -LICENSE="|| ( gSOAP GPL-2+-with-openssl-exception ) GPL-2+" +LICENSE="|| ( gSOAP-1.3b GPL-2+-with-openssl-exception ) GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc debug examples ipv6 gnutls +ssl" @@ -20,47 +20,48 @@ RDEPEND=" sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( - dev-libs/openssl:0= + dev-libs/openssl:= ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} +" +BDEPEND=" app-arch/unzip - sys-devel/flex sys-devel/bison + sys-devel/flex " PATCHES=( - # Fix Pre-ISO headers - "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch" - - # enable shared libs https://bugs.gentoo.org/583398 - "${FILESDIR}/${PN}-2.8.91-shared_libs.patch" + # Enable shared libs (bug #583398) + "${FILESDIR}/${PN}-2.8.130-shared_libs.patch" ) -S="${WORKDIR}/${MY_P}" - src_prepare() { default eautoreconf } src_configure() { + unset YACC LEX + local myeconfargs=( # Don't include xlocale.h as it got removed in >=glibc-2.26 --disable-xlocale $(use_enable debug) $(use_enable gnutls) - $(usex ipv6 --enable-ipv6 '') - $(usex ssl '' --disable-ssl) + $(usev ipv6 --enable-ipv6) + $(usev !ssl --disable-ssl) ) + econf "${myeconfargs[@]}" } src_install() { emake DESTDIR="${D}" install - # yes, we also install the license-file since - # it contains info about how to apply the licenses + # Yes, we also install the license-file since + # it contains info about how to apply the licenses. dodoc *.txt docinto html diff --git a/net-libs/gsoap/metadata.xml b/net-libs/gsoap/metadata.xml index 99ade5f91e73..494cd044b980 100644 --- a/net-libs/gsoap/metadata.xml +++ b/net-libs/gsoap/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">gsoap2</remote-id> </upstream> diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest index 339a7f98ba4d..5353d0d5a0ea 100644 --- a/net-libs/gssdp/Manifest +++ b/net-libs/gssdp/Manifest @@ -1,3 +1,2 @@ -DIST gssdp-1.2.3.tar.xz 62032 BLAKE2B 761a9e0df8289a595d882497bdda6d180f19328d0e97076446286e34e7735d1b1d07fc0299618955f7d92732d11d533a59cf4012f5167c4610c9856583f06770 SHA512 abce2473995a996b0adc74ced77cb2158cc997ed70edb0c25fbddd85fe9e6afc6bf7f996bbba7a6ed5268dfbe9207ae12f2e6989efe2e8e10cc25293df347e82 -DIST gssdp-1.3.0.tar.xz 1202916 BLAKE2B af771b4163c8671d1496cedabe5845eed0b12a8dd23aa226c61ca19ad1d83bca7d504ea36f9e8b09b5079373261043c121a8ac09a909f4430be0d5a5eaa995f1 SHA512 6004ee73898e5effb98dd78af116bf4b92735712f0237c57302ebbda82d77c1cfe182e0e6ef7a8c6defd7a66ac76531d0bff740d2a41cfba8ed365b88a539c85 -DIST gssdp-1.3.1.tar.xz 1141580 BLAKE2B 3d43c1cf9bb9e418ac831b09579e6940540e0ab2124d1f75989648e39b03aec612898340511b2c965573973531adbe8f489d33447a85aac761dcbe8906325abb SHA512 b253c5bd38956a02fe1f4cd77d7c868a573c1a7e25115137ae0753c7dfdebc38cd7a3c3fee1520c1c091c60283d556f646b5c715e56f013b2fe209c63a994b56 +DIST gssdp-1.4.0.1.tar.xz 1229264 BLAKE2B b94e46c79ad0615f976bad4b8efe9dbcaa27105b3189ee23ff349002d175ff83b0a9507846a23f0d8b5ed1e98381658f863a77bec6beff83933ebae5458a6b0e SHA512 c2132b27f49071941be1ad9bd1e642b8b82341aac7e10b87d8a9a0ed3d88759ab6730a4a05ddb904af5e0799602c470b9e83a987c72ec3c1444b7aaef0e36ad8 +DIST gssdp-1.6.3.tar.xz 108080 BLAKE2B f9deddf2b221eda9c3d7a6e6fa78cfb6388d3f3549caf166ebf7ac41f6edf39b8bc2521838ae5d954c743f844d5e7ba28b50f5a7beb6b2d70241782275c50fe4 SHA512 e5c9851032538cf093ed8c34a71c5d171eafb2edc5d3f3f5f0284005d4b1cca29ffca34b7f7d38b4a68a86c9bd888dd7a5a8e758dbd926bc4b4c995ea0b1110b diff --git a/net-libs/gssdp/gssdp-1.2.3.ebuild b/net-libs/gssdp/gssdp-1.2.3.ebuild deleted file mode 100644 index 689c160c9ce0..000000000000 --- a/net-libs/gssdp/gssdp-1.2.3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -VALA_USE_DEPEND="vapigen" - -inherit gnome.org meson-multilib vala xdg - -DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP" -HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP" - -LICENSE="LGPL-2+" -SLOT="0/1.2-0" # <API version>-<soname> -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86" -IUSE="gtk-doc +introspection gtk vala" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=" - >=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}] - >=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?] - gtk? ( >=x11-libs/gtk+-3.12:3 ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - gtk-doc? ( >=dev-util/gtk-doc-1.14 - app-text/docbook-xml-dtd:4.1.2 ) - virtual/pkgconfig - vala? ( - $(vala_depend) - net-libs/libsoup:2.4[vala] - ) -" - -src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare -} - -multilib_src_configure() { - local emesonargs=( - $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_native_use_bool gtk sniffer) - $(meson_native_use_bool introspection) - $(meson_native_use_bool vala vapi) - -Dexamples=false - ) - meson_src_configure -} diff --git a/net-libs/gssdp/gssdp-1.3.1.ebuild b/net-libs/gssdp/gssdp-1.4.0.1.ebuild index c76385775f89..bc61bc667050 100644 --- a/net-libs/gssdp/gssdp-1.3.1.ebuild +++ b/net-libs/gssdp/gssdp-1.4.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g LICENSE="LGPL-2+" SLOT="0/1.2-0" # <API version>-<soname> -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" IUSE="gtk-doc +introspection gtk vala" REQUIRED_USE="vala? ( introspection )" @@ -55,7 +55,8 @@ multilib_src_configure() { multilib_src_install_all() { if use gtk-doc ; then - mv "${ED}"/usr/share/doc/{gssdp-1.2/reference,${PF}/html} || die + mv "${ED}"/usr/share/doc/{gssdp-1.2,${PF}} || die + mv "${ED}"/usr/share/doc/${PF}/{reference,html} || die rmdir "${ED}"/usr/share/doc/gssdp-1.2 fi } diff --git a/net-libs/gssdp/gssdp-1.3.0.ebuild b/net-libs/gssdp/gssdp-1.6.3.ebuild index a71c9b505b29..d13e4d81a9ab 100644 --- a/net-libs/gssdp/gssdp-1.3.0.ebuild +++ b/net-libs/gssdp/gssdp-1.6.3.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -VALA_USE_DEPEND="vapigen" +EAPI=8 inherit gnome.org meson-multilib vala xdg @@ -10,16 +9,23 @@ DESCRIPTION="GObject-based API for handling resource discovery and announcement HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gssdp" LICENSE="LGPL-2+" -SLOT="0/1.2-0" # <API version>-<soname> -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="gtk-doc +introspection gtk vala" -REQUIRED_USE="vala? ( introspection )" +SLOT="1.6/1.6-0" # <API version>-<soname> +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" +IUSE="gtk gtk-doc +introspection man +vala" +REQUIRED_USE=" + gtk-doc? ( introspection ) + vala? ( introspection ) +" +# has file collision with Slot 0 (/usr/bin/gssdp-device-sniffer), so we remove that from this build +# and depend on the other slot that has the file as well RDEPEND=" - >=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}] - >=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?] + >=dev-libs/glib-2.70:2[${MULTILIB_USEDEP}] + >=net-libs/libsoup-2.99.0:3.0[${MULTILIB_USEDEP},introspection?] gtk? ( gui-libs/gtk:4 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + man? ( virtual/pandoc ) + >=net-libs/gssdp-1.4:0 " DEPEND="${RDEPEND}" BDEPEND=" @@ -30,13 +36,13 @@ BDEPEND=" virtual/pkgconfig vala? ( $(vala_depend) - net-libs/libsoup:2.4[vala] + net-libs/libsoup:3.0[vala] ) " src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare + default + use vala && vala_setup } multilib_src_configure() { @@ -47,6 +53,7 @@ multilib_src_configure() { $(meson_native_use_bool gtk-doc gtk_doc) $(meson_native_use_bool gtk sniffer) $(meson_native_use_bool introspection) + $(meson_native_use_bool man manpages) $(meson_native_use_bool vala vapi) -Dexamples=false ) @@ -55,7 +62,11 @@ multilib_src_configure() { multilib_src_install_all() { if use gtk-doc ; then - mv "${ED}"/usr/share/doc/{gssdp-1.2/reference,${PF}/html} || die - rmdir "${ED}"/usr/share/doc/gssdp-1.2 + mkdir "${ED}"/usr/share/gtk-doc || die + mv "${ED}"/usr/share/{doc,gtk-doc}/gssdp-1.6 || die + fi + + if use gtk; then + rm "${ED}"/usr/bin/gssdp-device-sniffer || die # because of file collision with slot 0 fi } diff --git a/net-libs/gssdp/metadata.xml b/net-libs/gssdp/metadata.xml index 7b343b06be8a..1ae928e5f9fe 100644 --- a/net-libs/gssdp/metadata.xml +++ b/net-libs/gssdp/metadata.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="man">Generate man page for tools</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gssdp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest index df8b90de30b9..5605c12aac8b 100644 --- a/net-libs/gtk-vnc/Manifest +++ b/net-libs/gtk-vnc/Manifest @@ -1 +1 @@ -DIST gtk-vnc-1.2.0.tar.xz 218024 BLAKE2B 8e13886826eebc3261271b94e15c504f82b15681417e70cc6b54b824ceff4de20a470460c5176abb2df04f325389a08032f40b49cfc3429c290d6d7255fc56d2 SHA512 830c614afa6540397352da864ad32a5687ccce5dc1e2150220c9a7fc3c7b0fbcbb3770e06b5fed75602d830bc9a9d40855fa8b6d8b65f740fc7a53bbdfce6edb +DIST gtk-vnc-1.3.1.tar.xz 222204 BLAKE2B 03e51700ae0a477a2762a67ed5906ce5205025b2fb30df5fa75deb99315d2164f22ee0b97d3fc8c23648921cdba4b4a3e22045b2cb8226360ff9f468bef2162f SHA512 01c9af407f913b214814252d7b204822372293ffc5f658aa646936f9f8cdcd77589c127e4d0e893e914c61470d4616e32f7b1fa9bd3739b2a22caef6710953b9 diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch deleted file mode 100644 index eba775dd3a52..000000000000 --- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch +++ /dev/null @@ -1,59 +0,0 @@ -From e540fbc34d6bbfe3e84f1d9c33deaacc2326c7c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jakub=20Jank=C5=AF?= <jjanku@redhat.com> -Date: Mon, 26 Apr 2021 17:38:13 +0200 -Subject: [PATCH 1/3] build: improve --with-coroutine=auto choice -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When the required ucontext functions aren't found, switch to gthread -coroutines instead of failing during the build. - -These functions are absent from the POSIX.1-2008. - -Fixes: https://gitlab.gnome.org/GNOME/gtk-vnc/-/issues/11 - -Signed-off-by: Jakub Janků <jjanku@redhat.com> ---- - meson.build | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 8052d43..e9829e6 100644 ---- a/meson.build -+++ b/meson.build -@@ -43,8 +43,20 @@ cc = meson.get_compiler('c') - - coroutine = get_option('with-coroutine') - -+uctx_args = [] -+if host_machine.system() == 'darwin' -+ uctx_args += ['-D_XOPEN_SOURCE=600'] -+endif -+has_ucontext = true -+foreach uctx_func : ['makecontext', 'swapcontext', 'getcontext'] -+ if not cc.has_function(uctx_func, prefix: '#include <ucontext.h>', args: uctx_args) -+ has_ucontext = false -+ break -+ endif -+endforeach -+ - if coroutine == 'auto' -- if host_machine.system() == 'windows' -+ if host_machine.system() == 'windows' or not has_ucontext - coroutine = 'gthread' - else - coroutine = 'ucontext' -@@ -52,6 +64,9 @@ if coroutine == 'auto' - endif - - if coroutine == 'ucontext' -+ if not has_ucontext -+ error('ucontext requested, but not available') -+ endif - conf_data.set('WITH_UCONTEXT', true) - elif coroutine != 'gthread' - error('Unknown coroutine backend') --- -2.26.3 - diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch deleted file mode 100644 index bd72b5727927..000000000000 --- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/15 - -From 4609ad35b6dc11f016ac3a50158eeef7f19d9889 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sun, 5 Apr 2020 00:05:49 +0300 -Subject: [PATCH 3/3] meson: Find python explicitly to honor downstream python - choice - ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 5306fb9..247c597 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -319,7 +319,7 @@ gtk_vnc_sources = gtk_vnc_gir_sources + gvnc_marshal + [ - 'vncdisplaykeymap.c', - ] - --python = import('python').find_installation() -+python = import('python').find_installation('python3') - keymaps = [ - 'xorgevdev', - 'xorgkbd', --- -2.26.3 - diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch deleted file mode 100644 index fd305f777c5d..000000000000 --- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/14 - -From bdab05584bab5c2ecdd508df49b03e80aedd19fc Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Wed, 28 Apr 2021 17:16:54 -0400 -Subject: [PATCH 2/3] meson: Fix configuration failure with - -Dwith-vala=disabled - -Otherwise with_vala is not defined, and meson setup results in - - src/meson.build:169:5: ERROR: Unknown variable "with_vala". ---- - meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index e9829e6..777876c 100644 ---- a/meson.build -+++ b/meson.build -@@ -318,12 +318,11 @@ gir = find_program('g-ir-scanner', required: get_option('introspection')) - with_gir = gir.found() - - vala_opt = get_option('with-vala') -+with_vala = false - if not vala_opt.disabled() - if not with_gir - if vala_opt.enabled() - error('Vala API requires GObject introspection (-Dintrospection=true)') -- else -- with_vala = false - endif - else - with_vala = add_languages('vala', required: vala_opt) --- -2.26.3 - diff --git a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.3.1.ebuild index e879d2277a27..041330b2029c 100644 --- a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild +++ b/net-libs/gtk-vnc/gtk-vnc-1.3.1.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) inherit gnome.org vala meson python-any-r1 xdg DESCRIPTION="VNC viewer widget for GTK" -HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc" +HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc https://gitlab.gnome.org/GNOME/gtk-vnc" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" IUSE="+introspection pulseaudio sasl +vala" REQUIRED_USE="vala? ( introspection )" @@ -21,7 +22,7 @@ RDEPEND=" >=dev-libs/libgcrypt-1.8.0:0= >=net-libs/gnutls-3.6.0:0= >=sys-libs/zlib-1.2.11 - sasl? ( >=dev-libs/cyrus-sasl-2.1.27 ) + sasl? ( >=dev-libs/cyrus-sasl-2.1.27:2 ) >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-libs/cairo-1.15.0 >=x11-libs/libX11-1.6.5 @@ -40,15 +41,10 @@ BDEPEND=" vala? ( $(vala_depend) ) " -PATCHES=( - "${FILESDIR}"/${P}-build-improve-with-coroutine-auto-choice.patch - "${FILESDIR}"/${P}-meson-Find-python-explicitly-to-honor-downstream-pyt.patch - "${FILESDIR}"/${P}-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch -) - src_prepare() { - vala_src_prepare - xdg_src_prepare + default + + use vala & vala_setup } src_configure() { diff --git a/net-libs/gtk-vnc/metadata.xml b/net-libs/gtk-vnc/metadata.xml index 8c0e0f0565ab..d9af2955c077 100644 --- a/net-libs/gtk-vnc/metadata.xml +++ b/net-libs/gtk-vnc/metadata.xml @@ -9,4 +9,7 @@ <email>virtualization@gentoo.org</email> <name>Gentoo Virtualization Project</name> </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gtk-vnc</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest index 5a13aeb07950..3da7d24d6f55 100644 --- a/net-libs/gupnp-av/Manifest +++ b/net-libs/gupnp-av/Manifest @@ -1,3 +1 @@ -DIST gupnp-av-0.12.11.tar.xz 373052 BLAKE2B 3c324f790f0ffbcbd6cbf3b95dfdaf9dce51c6bf7bea3051fd5ded31b930dd6ff7b77b16a297cf54a49e738c195fd208dd4e83961f5ee3d302dc84f37b36924c SHA512 f6fb8897ccdb589446d8c83c5fe66918f0f569a624287881aaf41d928e429e41f3306443e24ef4d43d3ddffb24da2ad2c058cd39211176558c9cd7acd7af0ff7 -DIST gupnp-av-0.13.0.tar.xz 91584 BLAKE2B 96f4a452f199d48c72cf65a7fa0ef6eb59488862f87a7bf7d1eaaa79289e89bab43718c4a4e94f1d6a71ddf65071c1c1b3aa49c180ba068928b1740bb7a3c8d1 SHA512 8ff5dcacaa5893290c263ba8be2613da6853e074e2afcbc3e111dbff8c9b9d7edbd3772341bc370a1db06b4ba815fd6071158f61a832e2e8f2a51d66d5d8f230 -DIST gupnp-av-0.13.1.tar.xz 93040 BLAKE2B 31901d8e15afdb789aa71cdc114e3472870526dd221ed18d503f43a9590235e5f2af896d87ac2747f8d9dac8b7f27f8b055bd0d5d18838add87162ae9c6289df SHA512 e99485d5d232227f57156cafdfb8a30dab135a0d88eb7d041e475d45e1ab4329d25c50f5528a4ba33e0ceb792fd1de3ec2b8ead597d5720fd0827bce42dcd312 +DIST gupnp-av-0.14.1.tar.xz 93484 BLAKE2B 5e4c070bc7f0dd1a1b67f58fb178ee575df5f9f3920c8c40f8975ac79c61f707df39a243d4783ff79f691dd42553c3a6eb89715be79bb7683910785afdd83b19 SHA512 b17b38c32fe068b0b74a7ee357be5f3a0df3320fd04338b5f6b04231c601d6cc57d2770c6e6ca42ded5e1be28a6b2746d16417eb322889ffe6a975ec58205655 diff --git a/net-libs/gupnp-av/files/gupnp-av-0.14.1-libxml2-2.12.patch b/net-libs/gupnp-av/files/gupnp-av-0.14.1-libxml2-2.12.patch new file mode 100644 index 000000000000..c62ed29fe577 --- /dev/null +++ b/net-libs/gupnp-av/files/gupnp-av-0.14.1-libxml2-2.12.patch @@ -0,0 +1,75 @@ +https://bugs.gentoo.org/917532 +https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/9557768121d54fdcedabe7544863515d6a813354 +https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/1e10a41fcef6ae0d3e89958db89bc22398f3b4f1 + +From 9557768121d54fdcedabe7544863515d6a813354 Mon Sep 17 00:00:00 2001 +From: Jens Georg <mail@jensge.org> +Date: Thu, 3 Aug 2023 23:52:43 +0200 +Subject: [PATCH] Remove deprecates xmlRecoverMemory + +Cannot currently remove xmlSchemaValidateStream as validateDoc fails to +accept the XSD +--- a/libgupnp-av/gupnp-didl-lite-parser.c ++++ b/libgupnp-av/gupnp-didl-lite-parser.c +@@ -230,12 +230,17 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser, + GUPnPAVXMLDoc *xml_doc = NULL; + gboolean result; + +- doc = xmlRecoverMemory (didl, strlen (didl)); ++ doc = xmlReadMemory (didl, ++ strlen (didl), ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + g_set_error (error, + G_MARKUP_ERROR, + G_MARKUP_ERROR_PARSE, +- "Could not parse DIDL-Lite XML:\n%s", didl); ++ "Could not parse DIDL-Lite XML:\n%s", ++ didl); + + return FALSE; + } +--- a/libgupnp-av/gupnp-feature-list-parser.c ++++ b/libgupnp-av/gupnp-feature-list-parser.c +@@ -114,12 +114,17 @@ gupnp_feature_list_parser_parse_text + xmlNode *element; + GList *feature_list = NULL; + +- doc = xmlRecoverMemory (text, strlen (text)); ++ doc = xmlReadMemory (text, ++ strlen (text), ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + g_set_error (error, + G_MARKUP_ERROR, + G_MARKUP_ERROR_PARSE, +- "Could not parse FeatureList XML:\n%s", text); ++ "Could not parse FeatureList XML:\n%s", ++ text); + + return NULL; + } +-- +GitLab + +From 1e10a41fcef6ae0d3e89958db89bc22398f3b4f1 Mon Sep 17 00:00:00 2001 +From: Jens Georg <mail@jensge.org> +Date: Sat, 25 Nov 2023 17:58:49 +0100 +Subject: [PATCH] xml: Fix compatibility with libxml2 2.12.x + +--- a/libgupnp-av/xml-util.h ++++ b/libgupnp-av/xml-util.h +@@ -16,6 +16,7 @@ + + #include <glib.h> + #include <libxml/tree.h> ++#include <libxml/parser.h> + #include <stdarg.h> + #include <glib-object.h> + +-- +GitLab diff --git a/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild deleted file mode 100644 index 5711803797ed..000000000000 --- a/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VALA_USE_DEPEND="vapigen" - -inherit gnome2 vala - -DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles" -HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP" - -LICENSE="LGPL-2" -SLOT="0/2" # subslot: soname version -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="+introspection" - -RDEPEND=" - >=dev-libs/glib-2.38:2 - >=net-libs/libsoup-2.28.2:2.4[introspection?] - dev-libs/libxml2 - introspection? ( >=dev-libs/gobject-introspection-1.36:= ) - !net-libs/gupnp-vala -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.10 - virtual/pkgconfig - introspection? ( $(vala_depend) ) -" - -src_prepare() { - use introspection && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_enable introspection) \ - --disable-static -} diff --git a/net-libs/gupnp-av/gupnp-av-0.13.1.ebuild b/net-libs/gupnp-av/gupnp-av-0.14.1-r1.ebuild index 2d691e8af565..54d286d8375a 100644 --- a/net-libs/gupnp-av/gupnp-av-0.13.1.ebuild +++ b/net-libs/gupnp-av/gupnp-av-0.14.1-r1.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VALA_USE_DEPEND="vapigen" +EAPI=8 inherit gnome.org meson vala @@ -11,31 +10,37 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g LICENSE="LGPL-2" SLOT="0/3" # subslot: soname version -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="gtk-doc +introspection" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" +IUSE="gtk-doc +introspection vala" +REQUIRED_USE="vala? ( introspection )" RDEPEND=" >=dev-libs/glib-2.58:2 - >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-1.36:= ) " DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( $(vala_depend) ) + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.1.2 + ) + vala? ( $(vala_depend) ) " src_prepare() { - use introspection && vala_src_prepare + use vala && vala_setup default + + # This makes sense for upstream but not for us downstream, bug #906641. + sed -i -e '/-Werror=deprecated-declarations/d' meson.build || die } src_configure() { local emesonargs=( $(meson_use introspection) - $(meson_use introspection vapi) + $(meson_use vala vapi) $(meson_use gtk-doc gtk_doc) ) meson_src_configure diff --git a/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild b/net-libs/gupnp-av/gupnp-av-0.14.1-r2.ebuild index d8baf6de158b..5c10aa0c8c13 100644 --- a/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild +++ b/net-libs/gupnp-av/gupnp-av-0.14.1-r2.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VALA_USE_DEPEND="vapigen" +EAPI=8 inherit gnome.org meson vala @@ -11,31 +10,41 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g LICENSE="LGPL-2" SLOT="0/3" # subslot: soname version -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="gtk-doc +introspection" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" +IUSE="gtk-doc +introspection vala" +REQUIRED_USE="vala? ( introspection )" RDEPEND=" >=dev-libs/glib-2.58:2 - >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-1.36:= ) " DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( $(vala_depend) ) + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.1.2 + ) + vala? ( $(vala_depend) ) " +PATCHES=( + "${FILESDIR}"/${PN}-0.14.1-libxml2-2.12.patch +) + src_prepare() { - use introspection && vala_src_prepare + use vala && vala_setup default + + # This makes sense for upstream but not for us downstream, bug #906641. + sed -i -e '/-Werror=deprecated-declarations/d' meson.build || die } src_configure() { local emesonargs=( $(meson_use introspection) - $(meson_use introspection vapi) + $(meson_use vala vapi) $(meson_use gtk-doc gtk_doc) ) meson_src_configure diff --git a/net-libs/gupnp-av/metadata.xml b/net-libs/gupnp-av/metadata.xml index 7b343b06be8a..d965b7e00519 100644 --- a/net-libs/gupnp-av/metadata.xml +++ b/net-libs/gupnp-av/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gupnp-av</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest index 180253c4d69b..cce463807274 100644 --- a/net-libs/gupnp-igd/Manifest +++ b/net-libs/gupnp-igd/Manifest @@ -1,2 +1,2 @@ -DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8 DIST gupnp-igd-1.2.0.tar.xz 26100 BLAKE2B a72117b1c3ac3cd95d797b5d7a21b333a46d161bf22bc9649c1649fee6301f16824b0068ee094cfeb31ea283ca0aae8c2369c331fe956f59586ae00fd48c5825 SHA512 0129e743b09cc773b997e0f09d7ab84481d114d52ab273b1e9957960e6a47d686d600492b916970f3b2d3d30c36b68e1e4d049eb7be5d44101a56b90dd5f0af9 +DIST gupnp-igd-1.6.0.tar.xz 29220 BLAKE2B ef90ea50c9bb7fb567d0654626f179012a95cbdbbd233637661f4952e1b0c3493a70b14940a2d7ef598b94c1895e40710d475f79b812f96cfdc1a4e570d5782d SHA512 ebec5f9d7fafc3614dc1c503aa86c7675aedfa05325554576160eaa83386b3da1fef72ef3c79a6fe7213fe64efcb24296ef99da87e90073813af3306df89a7bd diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch deleted file mode 100644 index c70bf6fea489..000000000000 --- a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001 -From: Jens Georg <mail@jensge.org> -Date: Sat, 1 Dec 2018 21:33:21 +0100 -Subject: [PATCH] Swtich to new GUPnP API - ---- - configure.ac | 2 +- - gupnp-igd-1.0-uninstalled.pc.in | 2 +- - gupnp-igd-1.0.pc.in | 2 +- - libgupnp-igd/Makefile.am | 2 +- - tests/gtest/gupnp-simple-igd.c | 6 ++++-- - 5 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f03921f..aa7f0ca 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11,7 +11,7 @@ AC_STDC_HEADERS - AC_PROG_LIBTOOL - AC_FUNC_MMAP - --PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0) -+PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0) - - # glib-genmarshal - GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` -diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in -index 483956f..6db3bee 100644 ---- a/gupnp-igd-1.0-uninstalled.pc.in -+++ b/gupnp-igd-1.0-uninstalled.pc.in -@@ -5,7 +5,7 @@ includedir=${pcfiledir}/ - - Name: gupnp-igd-1.0 - Description: GUPnP Simple IGD library --Requires: gupnp-1.0 -+Requires: gupnp-1.2 - Version: @VERSION@ - Libs: ${libdir}/libgupnp-av-1.0.la - Cflags: -I${includedir} -diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in -index 6660d63..aa74ed3 100644 ---- a/gupnp-igd-1.0.pc.in -+++ b/gupnp-igd-1.0.pc.in -@@ -5,7 +5,7 @@ includedir=@includedir@ - - Name: gupnp-igd-1.0 - Description: GUPnP Simple IGD library --Requires: gupnp-1.0 -+Requires: gupnp-1.2 - Version: @VERSION@ - Libs: -L${libdir} -lgupnp-igd-1.0 - Cflags: -I${includedir}/gupnp-igd-1.0 -diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am -index fe020b5..e10d857 100644 ---- a/libgupnp-igd/Makefile.am -+++ b/libgupnp-igd/Makefile.am -@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0 - GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES) - GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS) - GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0 --GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0 -+GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2 - GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir) - - if HAVE_INTROSPECTION -diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c -index 9b32b2a..d051d13 100644 ---- a/tests/gtest/gupnp-simple-igd.c -+++ b/tests/gtest/gupnp-simple-igd.c -@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, - GUPnPDeviceInfo *subdev1; - GUPnPDeviceInfo *subdev2; - const gchar *xml_path = "."; -+ GError *error = NULL; - - g_signal_connect (igd, "context-available", - G_CALLBACK (ignore_non_localhost), NULL); - - if (mainctx) - g_main_context_push_thread_default (mainctx); -- context = gupnp_context_new (NULL, "lo", 0, NULL); -+ context = gupnp_context_new ("lo", 0, NULL); - g_assert (context); - - if (g_getenv ("XML_PATH")) -@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, - gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml"); - */ - -- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path); -+ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error); - g_assert (dev); -+ g_assert (error == NULL); - - subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev), - "urn:schemas-upnp-org:device:WANDevice:1"); --- -2.24.1 - diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild deleted file mode 100644 index 664a38dca04f..000000000000 --- a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools gnome.org multilib-minimal xdg - -DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP" -HOMEPAGE="http://gupnp.org" - -LICENSE="LGPL-2.1+" -SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86" -IUSE="+introspection" - -RDEPEND=" - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=net-libs/gssdp-1.2:0=[${MULTILIB_USEDEP}] - >=net-libs/gupnp-1.2:0=[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.10 ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.10 - sys-devel/gettext - virtual/pkgconfig -" - -# The only existing test is broken -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PV}-gupnp-1.2.patch # needs eautoreconf, https://gitlab.gnome.org/GNOME/gupnp-igd/merge_requests/1 -) - -src_prepare() { - xdg_src_prepare - eautoreconf -} - -multilib_src_configure() { - # python is old-style bindings; use introspection and pygobject instead - ECONF_SOURCE=${S} \ - econf \ - --disable-static \ - --disable-gtk-doc \ - --disable-python \ - $(multilib_native_use_enable introspection) - - if multilib_is_native_abi; then - ln -s "${S}"/doc/html doc/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name "*.la" -delete || die -} diff --git a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild index 64f21fc9312b..7bce90687b9a 100644 --- a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild +++ b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org https://gitlab.gnome.org/GNOME/gupnp-igd" LICENSE="LGPL-2.1+" SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" IUSE="gtk-doc +introspection" RDEPEND=" diff --git a/net-libs/gupnp-igd/gupnp-igd-1.6.0.ebuild b/net-libs/gupnp-igd/gupnp-igd-1.6.0.ebuild new file mode 100644 index 000000000000..92269ee78201 --- /dev/null +++ b/net-libs/gupnp-igd/gupnp-igd-1.6.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson-multilib xdg + +DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP" +HOMEPAGE="http://gupnp.org https://gitlab.gnome.org/GNOME/gupnp-igd" + +LICENSE="LGPL-2.1+" +SLOT="1.6/1.6-0" # <API version>-<soname> +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" +IUSE="gtk-doc +introspection" + +# The only existing test is broken +RESTRICT="test" + +RDEPEND=" + >=dev-libs/glib-2.70.0:2[${MULTILIB_USEDEP}] + >=net-libs/gssdp-1.6:1.6=[${MULTILIB_USEDEP}] + >=net-libs/gupnp-1.6:1.6=[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.10 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc + app-text/docbook-xml-dtd:4.1.2 ) +" + +src_prepare() { + default + xdg_environment_reset +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool introspection) + $(meson_native_use_bool gtk-doc gtk_doc) + ) + meson_src_configure +} diff --git a/net-libs/gupnp-igd/metadata.xml b/net-libs/gupnp-igd/metadata.xml index 7b343b06be8a..25b797864341 100644 --- a/net-libs/gupnp-igd/metadata.xml +++ b/net-libs/gupnp-igd/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gupnp-igd</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest index 8d1d26d7127e..7c2fc4908208 100644 --- a/net-libs/gupnp/Manifest +++ b/net-libs/gupnp/Manifest @@ -1,2 +1,2 @@ -DIST gupnp-1.2.7.tar.xz 142928 BLAKE2B 094e9569c501ae32def1335c8129d5585a2bec37d86c2317a2c9b2d965db5ce0ae6c19017bd44fb718709cf068f93ed75d08ab7e30c5f265e1ce45a9a9352897 SHA512 83d012989f9aab578c9bdb4dd95d316003938a39cc997949622b56523dd7081e09093c48c0016d738ca0040a00b3e6218ba59cad9e49e05f4106213160e7c409 -DIST gupnp-1.3.1.tar.xz 152484 BLAKE2B bfed35567da37f420568ae90acb8c33674f5ef754d00722ce11ec381c602f7aee86502276a3e6bb04abd98d49826ff11518bf6283d2c4be9c4ddf48fb880627f SHA512 ee632d42803cb689926839336c2427c9622c40d1a43e69ef4c48dd26714649d544772697b4a440861dc896a13faba6793b02b7b9ab7c5288b6cf125abbb2d477 +DIST gupnp-1.4.3.tar.xz 154812 BLAKE2B b41a8805853061399412f5eb7267e9913adb3054ebf8a3bd78f6df4c1607d4a944654f3bc6e154fefa98f1289a80055d0feb0168801d83a1ad59c25f5fcac784 SHA512 1963ce917458168c8bc5d669ee30a4071d83d3768ce1be8cbbd81c767853ca01950623a88628a0b1e403d1cce1f0bbc9df80acf4b75f91bfc0403e0d0e6bcedb +DIST gupnp-1.6.6.tar.xz 245860 BLAKE2B 9cf9bb4a61e224f74aff18fb4d4491f7e9cb36cf812709b74a8c08581954d82c3c6e59d2b46cac517685a0d191846fbdb6690ac79cebc77a26b6a7d1347f3ae0 SHA512 6721f7dfda273074255e1b418d244eba72a24976e1407fdbaf24fd15a8c15a7a6d389690131563aa1f3b15fdeefb2e100da494c04c6c8e29201d402f072fcbe6 diff --git a/net-libs/gupnp/files/gupnp-1.4.3-libxml2-2.12.patch b/net-libs/gupnp/files/gupnp-1.4.3-libxml2-2.12.patch new file mode 100644 index 000000000000..1572c97bf2cd --- /dev/null +++ b/net-libs/gupnp/files/gupnp-1.4.3-libxml2-2.12.patch @@ -0,0 +1,63 @@ +https://bugs.gentoo.org/917555 +https://gitlab.gnome.org/GNOME/gupnp/-/commit/387ca6714bcef64399e1bfdd599612cf3f9e75db + +From 387ca6714bcef64399e1bfdd599612cf3f9e75db Mon Sep 17 00:00:00 2001 +From: Jens Georg <mail@jensge.org> +Date: Sat, 25 Nov 2023 17:56:02 +0100 +Subject: [PATCH] all: Fix compatibility with libxml2 2.12.x + +Cherry-picked from 00514fb62ebd341803fa44e26a6482a8c25dbd34 +--- a/libgupnp/gupnp-control-point.c ++++ b/libgupnp/gupnp-control-point.c +@@ -22,6 +22,8 @@ + #include <config.h> + #include <string.h> + ++#include <libxml/parser.h> ++ + #include "gupnp-control-point.h" + #include "gupnp-context-private.h" + #include "gupnp-resource-factory-private.h" +--- a/libgupnp/gupnp-service-proxy-action.c ++++ b/libgupnp/gupnp-service-proxy-action.c +@@ -9,6 +9,8 @@ + + #include <config.h> + ++#include <libxml/parser.h> ++ + #include "gupnp-error-private.h" + #include "gupnp-service-proxy.h" + #include "gupnp-service-proxy-private.h" +--- a/libgupnp/gupnp-service-proxy.c ++++ b/libgupnp/gupnp-service-proxy.c +@@ -18,6 +18,7 @@ + + #include <config.h> + #include <libsoup/soup.h> ++#include <libxml/parser.h> + #include <gobject/gvaluecollector.h> + #include <string.h> + #include <locale.h> +--- a/libgupnp/gupnp-xml-doc.c ++++ b/libgupnp/gupnp-xml-doc.c +@@ -22,6 +22,7 @@ + + #include <config.h> + #include <string.h> ++#include <libxml/parser.h> + #include "gupnp-xml-doc.h" + #include "gupnp-error.h" + +--- a/libgupnp/xml-util.h ++++ b/libgupnp/xml-util.h +@@ -10,6 +10,7 @@ + #define GUPNP_XML_UTIL_H + + #include <libxml/tree.h> ++#include <libxml/parser.h> + #include <libsoup/soup-uri.h> + #include <stdarg.h> + #include <glib-object.h> +-- +GitLab diff --git a/net-libs/gupnp/files/gupnp-1.4.3-meson-1.2.0-fix.patch b/net-libs/gupnp/files/gupnp-1.4.3-meson-1.2.0-fix.patch new file mode 100644 index 000000000000..e41830fce4c2 --- /dev/null +++ b/net-libs/gupnp/files/gupnp-1.4.3-meson-1.2.0-fix.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/910492 +--- a/subprojects/gssdp-1.2.wrap ++++ b/subprojects/gssdp-1.2.wrap +@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git + revision = gssdp-1.4 + depth = 1 + +-[provides] +-dependency_name = gssdp-1.2 ++[provide] ++dependency_names = gssdp-1.2 + diff --git a/net-libs/gupnp/files/gupnp-1.6.6-libxml2-2.12.patch b/net-libs/gupnp/files/gupnp-1.6.6-libxml2-2.12.patch new file mode 100644 index 000000000000..75099d26d1eb --- /dev/null +++ b/net-libs/gupnp/files/gupnp-1.6.6-libxml2-2.12.patch @@ -0,0 +1,66 @@ +https://bugs.gentoo.org/917555 +https://gitlab.gnome.org/GNOME/gupnp/-/commit/00514fb62ebd341803fa44e26a6482a8c25dbd34 + +From 00514fb62ebd341803fa44e26a6482a8c25dbd34 Mon Sep 17 00:00:00 2001 +From: Jens Georg <mail@jensge.org> +Date: Sat, 25 Nov 2023 17:56:02 +0100 +Subject: [PATCH] all: Fix compatibility with libxml2 2.12.x + +--- a/libgupnp/gupnp-control-point.c ++++ b/libgupnp/gupnp-control-point.c +@@ -27,6 +27,8 @@ + #include <config.h> + #include <string.h> + ++#include <libxml/parser.h> ++ + #include "gupnp-control-point.h" + #include "gupnp-context-private.h" + #include "gupnp-resource-factory-private.h" +--- a/libgupnp/gupnp-service-proxy-action.c ++++ b/libgupnp/gupnp-service-proxy-action.c +@@ -9,6 +9,8 @@ + + #include <config.h> + ++#include <libxml/parser.h> ++ + #include "gupnp-error.h" + #include "gupnp-service-proxy.h" + #include "gvalue-util.h" +--- a/libgupnp/gupnp-service-proxy.c ++++ b/libgupnp/gupnp-service-proxy.c +@@ -16,6 +16,8 @@ + #include <locale.h> + #include <errno.h> + ++#include <libxml/globals.h> ++ + #include "gena-protocol.h" + #include "gupnp-context-private.h" + #include "gupnp-error-private.h" +--- a/libgupnp/gupnp-xml-doc.c ++++ b/libgupnp/gupnp-xml-doc.c +@@ -15,6 +15,9 @@ + #include <config.h> + #include <string.h> + #include <gio/gio.h> ++ ++#include <libxml/parser.h> ++ + #include "gupnp-xml-doc.h" + #include "gupnp-error.h" + +--- a/libgupnp/xml-util.h ++++ b/libgupnp/xml-util.h +@@ -10,6 +10,8 @@ + #define GUPNP_XML_UTIL_H + + #include <libxml/tree.h> ++#include <libxml/parser.h> ++ + #include <stdarg.h> + #include <glib-object.h> + +-- +GitLab diff --git a/net-libs/gupnp/gupnp-1.3.1.ebuild b/net-libs/gupnp/gupnp-1.4.3.ebuild index a221091df021..c6094ee62d46 100644 --- a/net-libs/gupnp/gupnp-1.3.1.ebuild +++ b/net-libs/gupnp/gupnp-1.4.3.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7..10} ) -PYTHON_REQ_USE="xml" +EAPI=7 +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" inherit gnome.org meson-multilib python-single-r1 vala xdg @@ -13,9 +12,9 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+ SLOT="0/1.2-0" # <API version>-<soname> -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" -IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala" +IUSE="connman gtk-doc +introspection networkmanager vala" REQUIRED_USE="${PYTHON_REQUIRED_USE} ?? ( connman networkmanager ) " @@ -45,9 +44,17 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.4.3-meson-1.2.0-fix.patch + "${FILESDIR}"/${PN}-1.4.3-libxml2-2.12.patch +) + src_prepare() { use introspection && vala_src_prepare xdg_src_prepare + + # This makes sense for upstream but not for us downstream, bug #906124. + sed -i -e '/-Werror=deprecated-declarations/d' meson.build || die } multilib_src_configure() { diff --git a/net-libs/gupnp/gupnp-1.2.7.ebuild b/net-libs/gupnp/gupnp-1.6.6.ebuild index 1bc7fdb240a0..17ee0dd39514 100644 --- a/net-libs/gupnp/gupnp-1.2.7.ebuild +++ b/net-libs/gupnp/gupnp-1.6.6.ebuild @@ -1,53 +1,59 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="xml" +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" inherit gnome.org meson-multilib python-single-r1 vala xdg DESCRIPTION="An object-oriented framework for creating UPnP devs and control points" -HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP" +HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp" LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+ -SLOT="0/1.2-0" # <API version>-<soname> -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86" +SLOT="1.6/1.6-0" # <API version>-<soname> +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" -IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala" +IUSE="connman gtk-doc +introspection networkmanager +vala" REQUIRED_USE="${PYTHON_REQUIRED_USE} ?? ( connman networkmanager ) + gtk-doc? ( introspection ) " # prefix: uuid dependency can be adapted to non-linux platforms RDEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.66:2[${MULTILIB_USEDEP}] - >=net-libs/gssdp-1.2.3:0=[introspection?,${MULTILIB_USEDEP}] - >=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/glib-2.70:2[${MULTILIB_USEDEP}] + >=net-libs/gssdp-1.6.2:1.6=[introspection?,${MULTILIB_USEDEP}] >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] + >=net-libs/libsoup-2.99.0:3.0[introspection?,${MULTILIB_USEDEP}] >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) " DEPEND="${RDEPEND}" BDEPEND=" dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.14 - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xml-dtd:4.2 ) + gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) dev-libs/libxslt app-text/docbook-xsl-stylesheets virtual/pkgconfig !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) ) vala? ( $(vala_depend) - >=net-libs/gssdp-1.2.3:0[vala] - net-libs/libsoup:2.4[vala] + >=net-libs/gssdp-1.5.2:1.6[vala] + net-libs/libsoup:3.0[vala] ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.6.6-libxml2-2.12.patch +) + src_prepare() { - use introspection && vala_src_prepare - xdg_src_prepare + default + use vala && vala_setup + + # This makes sense for upstream but not for us downstream, bug #906124. + sed -i -e '/-Werror=deprecated-declarations/d' meson.build || die } multilib_src_configure() { @@ -67,5 +73,9 @@ multilib_src_configure() { } multilib_src_install_all() { - python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2 + python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.6 + if use gtk-doc ; then + mkdir "${ED}"/usr/share/gtk-doc || die + mv "${ED}"/usr/share/{doc,gtk-doc}/gupnp-1.6 || die + fi } diff --git a/net-libs/gupnp/metadata.xml b/net-libs/gupnp/metadata.xml index 7b343b06be8a..a3501e0f00c7 100644 --- a/net-libs/gupnp/metadata.xml +++ b/net-libs/gupnp/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gupnp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/http-parser/http-parser-2.9.4-r1.ebuild b/net-libs/http-parser/http-parser-2.9.4-r2.ebuild index 8ceeb33fae6e..d979a9c69415 100644 --- a/net-libs/http-parser/http-parser-2.9.4-r1.ebuild +++ b/net-libs/http-parser/http-parser-2.9.4-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit toolchain-funcs multilib-minimal +EAPI=8 + +inherit toolchain-funcs DESCRIPTION="HTTP request/response parser for C" HOMEPAGE="https://github.com/nodejs/http-parser" @@ -12,26 +13,26 @@ LICENSE="MIT" # 2.9.4 restored ABI compatibility with 2.9.0 but since we failed # to set subslot in 2.9.3, we want to provoke another rebuild SLOT="0/2.9.4" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris" PATCHES=( "${FILESDIR}"/${P}-non-x86-test.patch ) -src_prepare() { - default +src_configure() { tc-export CC AR - multilib_copy_sources } -multilib_src_compile() { +src_compile() { emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library } -multilib_src_test() { +src_test() { emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test } -multilib_src_install() { +src_install() { emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + + einstalldocs } diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest index 0385a95e1727..f718b83b59ea 100644 --- a/net-libs/ignition-msgs/Manifest +++ b/net-libs/ignition-msgs/Manifest @@ -1 +1 @@ -DIST ignition-msgs5_5.7.0.tar.gz 395078 BLAKE2B d9ea12d56a852bb36ebf659b96a2a601c1df9c5b48158dabbe848bfd70bde94087bf3fc0d118b587aa962296d46667c69d678b750ecf04754e8f4133b50f25b4 SHA512 cb33c81fc2cb52d38b6f1bc34088c2f74a4a86f4171cbc26cfe40a30ccf6d597a9f4344a823e4c76e474edf6f4db5930d44a7933bc9996433fca23e12a4bc51d +DIST ignition-msgs5_5.11.0.tar.gz 346560 BLAKE2B 87dd9c99f9d8bf8719f2968a89fbe9fd276d4b35f5a870eee0ab7476affdbca565fbdc7c3e5e94a29a21df6e7b6ace138a8db00ba838de6d8ba07478dd6a3456 SHA512 bbd71339c816947cbf91778303c4370e3d03b068421f0a043de3462d5eb691b16cbc3d19804cb353ad03f78f3e187af366e9d950fa05ebf22d0d08c565748bc4 diff --git a/net-libs/ignition-msgs/files/protobuf.patch b/net-libs/ignition-msgs/files/protobuf.patch new file mode 100644 index 000000000000..5a441ae4d2a9 --- /dev/null +++ b/net-libs/ignition-msgs/files/protobuf.patch @@ -0,0 +1,13 @@ +Index: gz-msgs-ignition-msgs5_5.11.0/CMakeLists.txt +=================================================================== +--- gz-msgs-ignition-msgs5_5.11.0.orig/CMakeLists.txt ++++ gz-msgs-ignition-msgs5_5.11.0/CMakeLists.txt +@@ -62,7 +62,7 @@ message(STATUS "\n\n-- ====== Finding De + + #-------------------------------------- + # Find Protobuf +-set(REQ_PROTOBUF_VER 3) ++set(REQ_PROTOBUF_VER 4) + ign_find_package(IgnProtobuf + VERSION ${REQ_PROTOBUF_VER} + REQUIRED diff --git a/net-libs/ignition-msgs/ignition-msgs-5.7.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild index 869cd5bb9323..a6f0814b017d 100644 --- a/net-libs/ignition-msgs/ignition-msgs-5.7.0.ebuild +++ b/net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,8 @@ RDEPEND="dev-libs/protobuf:= dev-libs/tinyxml2:= " DEPEND="${RDEPEND} - dev-util/ignition-cmake:2" -BDEPEND="dev-util/ignition-cmake:2" + dev-build/ignition-cmake:2" +BDEPEND="dev-build/ignition-cmake:2" CMAKE_BUILD_TYPE=RelWithDebInfo -S="${WORKDIR}/ign-msgs-${PN}5_${PV}" +S="${WORKDIR}/gz-msgs-ignition-msgs5_${PV}" +PATCHES=( "${FILESDIR}/protobuf.patch" ) diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest index bd26b45c87ee..bb415bd6bc13 100644 --- a/net-libs/ignition-transport/Manifest +++ b/net-libs/ignition-transport/Manifest @@ -1 +1 @@ -DIST ignition-transport8_8.1.0.tar.gz 663459 BLAKE2B aa3acbf280b6ebdfc7a734521df4edf8724fe24cf92de81e4dd5bf33d65257c929417af205a44b731a878111a3586fef1e9d5b27df0b7343e402424108a22598 SHA512 eb64f18721190fcb79a5b45746fd44fa24274c6fe6c5021dd9306c15a327873377d07d4aa770633982038b84da650d3d0c8a56169222c0c88fa1318314fc4529 +DIST ignition-transport8_8.4.0.tar.gz 610048 BLAKE2B 82ece18d0777d8ca4f64d3b5c37a8532f3a1d067772303f4373e663a99e95573f8991db465a2d6d86606c8565d2af667c96f2ecf7a8dca032c5ab2d7888e7ea4 SHA512 7ed3d59b707f2d1b26bf80dfa7cc9633d4ce5a39b97c5396012e73bd949859ad3b71f79b8aa025ca78f5c1796bfdc9006c1c704f1b6b75e854ffcfc4c3ab53f8 diff --git a/net-libs/ignition-transport/files/protobuf.patch b/net-libs/ignition-transport/files/protobuf.patch new file mode 100644 index 000000000000..497da899db7a --- /dev/null +++ b/net-libs/ignition-transport/files/protobuf.patch @@ -0,0 +1,76 @@ +From e35a697b619dbcecec0ae0c8b8f0a644d368abf3 Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro <silvio@traversaro.it> +Date: Tue, 6 Jun 2023 17:19:49 +0200 +Subject: [PATCH] Fix compatibility with protobuf 22 + +Signed-off-by: Silvio Traversaro <silvio@traversaro.it> +--- + CMakeLists.txt | 2 -- + include/gz/transport/RepHandler.hh | 8 ++++++-- + include/gz/transport/SubscriptionHandler.hh | 6 ++++-- + 3 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5e3aab859..843fb17cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,9 +38,7 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======") + + #-------------------------------------- + # Find Protobuf +-set(REQ_PROTOBUF_VER 3) + ign_find_package(IgnProtobuf +- VERSION ${REQ_PROTOBUF_VER} + REQUIRED + PRETTY Protobuf) + +diff --git a/include/gz/transport/RepHandler.hh b/include/gz/transport/RepHandler.hh +index 5d27f98c1..a5675fca7 100644 +--- a/include/gz/transport/RepHandler.hh ++++ b/include/gz/transport/RepHandler.hh +@@ -26,7 +26,7 @@ + #pragma warning(pop) + #endif + +-#if GOOGLE_PROTOBUF_VERSION > 2999999 ++#if GOOGLE_PROTOBUF_VERSION > 2999999 && GOOGLE_PROTOBUF_VERSION < 4022000 + #include <google/protobuf/stubs/casts.h> + #endif + +@@ -140,7 +140,11 @@ namespace ignition + return false; + } + +-#if GOOGLE_PROTOBUF_VERSION > 2999999 ++#if GOOGLE_PROTOBUF_VERSION >= 4022000 ++ auto msgReq = ++ google::protobuf::internal::DownCast<const Req*>(&_msgReq); ++ auto msgRep = google::protobuf::internal::DownCast<Rep*>(&_msgRep); ++#elif GOOGLE_PROTOBUF_VERSION > 2999999 + auto msgReq = google::protobuf::down_cast<const Req*>(&_msgReq); + auto msgRep = google::protobuf::down_cast<Rep*>(&_msgRep); + #else +diff --git a/include/gz/transport/SubscriptionHandler.hh b/include/gz/transport/SubscriptionHandler.hh +index 78477add0..d69c83ddb 100644 +--- a/include/gz/transport/SubscriptionHandler.hh ++++ b/include/gz/transport/SubscriptionHandler.hh +@@ -28,7 +28,7 @@ + + #include <google/protobuf/stubs/common.h> + +-#if GOOGLE_PROTOBUF_VERSION >= 3000000 ++#if GOOGLE_PROTOBUF_VERSION >= 3000000 && GOOGLE_PROTOBUF_VERSION < 4022000 + #include <google/protobuf/stubs/casts.h> + #endif + +@@ -211,7 +211,9 @@ namespace ignition + if (!this->UpdateThrottling()) + return true; + +-#if GOOGLE_PROTOBUF_VERSION >= 3000000 ++#if GOOGLE_PROTOBUF_VERSION >= 4022000 ++ auto msgPtr = google::protobuf::internal::DownCast<const T*>(&_msg); ++#elif GOOGLE_PROTOBUF_VERSION >= 3000000 + auto msgPtr = google::protobuf::down_cast<const T*>(&_msg); + #else + auto msgPtr = google::protobuf::internal::down_cast<const T*>(&_msg); diff --git a/net-libs/ignition-transport/ignition-transport-8.1.0.ebuild b/net-libs/ignition-transport/ignition-transport-8.4.0.ebuild index 7adee87f2cc8..92b792f8bcdc 100644 --- a/net-libs/ignition-transport/ignition-transport-8.1.0.ebuild +++ b/net-libs/ignition-transport/ignition-transport-8.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,9 +24,10 @@ DEPEND=" " RDEPEND="${DEPEND}" DEPEND="${DEPEND} - dev-util/ignition-cmake:2" + dev-build/ignition-cmake:2" BDEPEND=" - dev-util/ignition-cmake:2 + dev-build/ignition-cmake:2 virtual/pkgconfig" CMAKE_BUILD_TYPE=RelWithDebInfo -S="${WORKDIR}/ign-transport-${PN}8_${PV}" +S="${WORKDIR}/gz-transport-ignition-transport8_${PV}" +PATCHES=( "${FILESDIR}/protobuf.patch" ) diff --git a/net-libs/jreen/Manifest b/net-libs/jreen/Manifest deleted file mode 100644 index e2a20d6a22d0..000000000000 --- a/net-libs/jreen/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jreen-1.3.0.tar.gz 287827 BLAKE2B 93204ed95d93377be6515ef2f1cf5eaba7194d168a3dda3ceee036693fead1db36c2e34c94aca7ba46dd859f6a29646719f867582a381b730c527cfc7e877474 SHA512 7b8267aa7d0e18c28dfeb6a1c7c0495d87bd2712fe10a0c6283f0cf89b72d2c67f98f97a812c9f34496af43eb00ddd94b7e60e942634fb03d0119f94a3d08464 diff --git a/net-libs/jreen/jreen-1.3.0-r1.ebuild b/net-libs/jreen/jreen-1.3.0-r1.ebuild deleted file mode 100644 index ebb04f64dd7d..000000000000 --- a/net-libs/jreen/jreen-1.3.0-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} != *9999* ]]; then - SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~x86" -else - GIT_ECLASS="git-r3" - EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git" -fi - -inherit cmake ${GIT_ECLASS} - -DESCRIPTION="Qt XMPP library" -HOMEPAGE="https://github.com/euroelessar/jreen" - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - media-libs/speex - net-libs/libgsasl - sys-libs/zlib -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DJREEN_FORCE_QT4=OFF - ) - cmake_src_configure -} diff --git a/net-libs/kdav2/Manifest b/net-libs/kdav2/Manifest deleted file mode 100644 index 42a884aa53ef..000000000000 --- a/net-libs/kdav2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kdav2-0.3.0.tar.xz 48764 BLAKE2B 0e904f41cbe7b88667ed2dee5e23815fc9cf5fddf77493bb6c947703e001a215b2b47c302cf1570002d273ca06d9dd219a3c488c85609e4f7a3da7aa4f57412f SHA512 19060bdd28720b5477ced627d441411b7f594a025bb574196d011b946074ac472819b1673028e082f76f01d3038d3ee4acb438223a3aa6a657a5b8cddd1026d6 diff --git a/net-libs/kdav2/kdav2-0.3.0.ebuild b/net-libs/kdav2/kdav2-0.3.0.ebuild deleted file mode 100644 index 3d3b2cb1a8d5..000000000000 --- a/net-libs/kdav2/kdav2-0.3.0.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 - -ECM_TEST="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="KJob based DAV protocol implementation" -SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64" - -# bug 803524 -RESTRICT+=" test" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 -" -RDEPEND="${DEPEND}" - -src_test() { - # disable tests requiring net access, bug #680952 - local myctestargs=( - -E "(kdav2-davcollectionfetchjob|kdav2-davcollectioncreatejob)" - ) - - ecm_src_test -} diff --git a/net-libs/kdsoap-ws-discovery-client/Manifest b/net-libs/kdsoap-ws-discovery-client/Manifest index d9b499b3b6ec..593862c76c66 100644 --- a/net-libs/kdsoap-ws-discovery-client/Manifest +++ b/net-libs/kdsoap-ws-discovery-client/Manifest @@ -1 +1,2 @@ DIST kdsoap-ws-discovery-client-0.2_pre20200927.tar.gz 37493 BLAKE2B c0dff21554bc56c4055c74a166a85186d67b0378f7bfbfcd3582ae7b992aaa71cefb6b794258fa07b37fcdd1d42ac2bf9fbfd7cd8142f8f77b1ba9791d683dae SHA512 86f8c4eee3fd484253ee91190092a9ae0dbd3d0c536ec25a6e3ec35be45d4a3d320cffbfc0ed2024d447788b43c9df88ca81181157720ce8942c9034d4eea49f +DIST kdsoap-ws-discovery-client-0.4.0.tar.xz 30692 BLAKE2B f8d65a23731c9f56c75bdf678842b815512d5e15a28b3e37acc4d02cf0b10ec2d11876ff751dfd93321c7d3af3e422bec563ed6abd33c514f5537dbec9e39b46 SHA512 485e0319d986743183e82dd3a7576f0fc473122867e5e820a57f63b2fa2fde0721d8a7ee30d4399c01b11b51634db452174841a887b6685db9ab33e310866dda diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild index 08b8afcc785b..2edc08a9eea2 100644 --- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild +++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927-r1.ebuild @@ -1,42 +1,36 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +COMMIT=dcefb65c88e76f1f9eda8b0318006e93d15a0e1e ECM_QTHELP="false" ECM_TEST="true" inherit ecm -if [[ ${PV} != *9999* ]]; then - COMMIT=dcefb65c88e76f1f9eda8b0318006e93d15a0e1e - SRC_URI="https://gitlab.com/caspermeijn/${PN}/repository/${COMMIT}/archive.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" - S="${WORKDIR}/${PN}-${COMMIT}-${COMMIT}" -else - EGIT_REPO_URI="https://gitlab.com/caspermeijn/${PN}.git" - inherit git-r3 -fi - DESCRIPTION="WS-Discovery client library based on KDSoap" -HOMEPAGE="https://gitlab.com/caspermeijn/kdsoap-ws-discovery-client +HOMEPAGE="https://invent.kde.org/libraries/kdsoap-ws-discovery-client +https://gitlab.com/caspermeijn/kdsoap-ws-discovery-client https://caspermeijn.gitlab.io/kdsoap-ws-discovery-client" +SRC_URI="https://gitlab.com/caspermeijn/${PN}/repository/${COMMIT}/archive.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}-${COMMIT}" LICENSE="CC0-1.0 GPL-3+" SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="doc" -BDEPEND=" - doc? ( app-doc/doxygen[dot] ) -" +RESTRICT="test" + RDEPEND=" dev-qt/qtcore:5 dev-qt/qtnetwork:5 - >=net-libs/kdsoap-1.9.0:=" + >=net-libs/kdsoap-1.9.0:=[qt5(+)] +" DEPEND="${RDEPEND} test? ( dev-qt/qtxml:5 ) " - -RESTRICT+=" test" +BDEPEND="doc? ( app-text/doxygen[dot] )" PATCHES=( "${FILESDIR}"/${PN}-0.2_pre20200317-no-install-docs.patch ) diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.4.0.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.4.0.ebuild new file mode 100644 index 000000000000..804f3c13a690 --- /dev/null +++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.4.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="false" +ECM_TEST="forceoptional" +KFMIN=5.248.0 +inherit ecm kde.org + +DESCRIPTION="WS-Discovery client library based on KDSoap" +HOMEPAGE="https://invent.kde.org/libraries/kdsoap-ws-discovery-client" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +LICENSE="CC0-1.0 GPL-3+" +SLOT="0" +IUSE="doc" + +RESTRICT="test" + +RDEPEND=" + dev-qt/qtbase:6[network] + >=net-libs/kdsoap-2.2.0[qt6] +" +DEPEND="${RDEPEND} + test? ( dev-qt/qtbase:6[xml] ) +" +BDEPEND="doc? ( app-text/doxygen[dot] )" + +PATCHES=( "${FILESDIR}"/${PN}-0.2_pre20200317-no-install-docs.patch ) + +src_prepare() { + ecm_src_prepare + use test || ecm_punt_qt_module Xml +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package doc Doxygen) + -DBUILD_QCH=OFF # does not use ecm_add_qch from ECMAddQch + ) + ecm_src_configure +} + +src_install() { + use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. ) + ecm_src_install +} diff --git a/net-libs/kdsoap-ws-discovery-client/metadata.xml b/net-libs/kdsoap-ws-discovery-client/metadata.xml index 8641e5bdd399..d37afc46e13b 100644 --- a/net-libs/kdsoap-ws-discovery-client/metadata.xml +++ b/net-libs/kdsoap-ws-discovery-client/metadata.xml @@ -5,4 +5,7 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="kde-invent">libraries/kdsoap-ws-discovery-client</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/kdsoap/Manifest b/net-libs/kdsoap/Manifest index f5adb9ed402d..43281d3308a9 100644 --- a/net-libs/kdsoap/Manifest +++ b/net-libs/kdsoap/Manifest @@ -1 +1,2 @@ -DIST kdsoap-2.0.0.tar.gz 2916527 BLAKE2B 7b9cf71b181b88180fb00cb2f0c2b84b5fd7d997531aa68957a84811959befd9c8909c8892d3b60d47a654916fa5b8841fa7b389a006a8ca6a2cdce98a433cfb SHA512 50305866595048e0ec6cd6dabba9e63a948f1e1263e7f03e9e3bc56f09a843bade944df95b5ff57d4fc3a62896e72f02b0d7b3d5cc2be2823da67001ca459428 +DIST kdsoap-2.1.1.tar.gz 948277 BLAKE2B 6daec26426bb6becc78400877ad221b929f0c30e45755644258eca864617d20b9d1269d8a964d38d40e9f5eb93ae213a95e05deb0a34dd3817261096178815a2 SHA512 12224f664dcae7ceb7395a7c3de48a208ae81c10f6fba4d0db233613472c6b9cdbea6375297c27b58fe7338d7db27a4447844f4e8f40a24ec1b4dd3fa38d20bb +DIST kdsoap-2.2.0.tar.gz 11918875 BLAKE2B 0cce6af5ee08948d8029a2302174e0faa9cc06a7c813cb914a5395078a27b23d3c10ccc63f50831ecbd8f8958cb2eb5620b460d78cd6e63480e17580a331a8f9 SHA512 6ed5cd6a0d02a9faf6881facbd28391c553b3671512153ecd058ab53bfbe9d3f0afa3704d580e66010ddf6a3de7e578a632339f8c1ae7529c28f9d5fd7d1eb5f diff --git a/net-libs/kdsoap/kdsoap-2.0.0.ebuild b/net-libs/kdsoap/kdsoap-2.1.1.ebuild index 951fd52d0a65..a21356f730ef 100644 --- a/net-libs/kdsoap/kdsoap-2.0.0.ebuild +++ b/net-libs/kdsoap/kdsoap-2.1.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" else EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git" EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen ) diff --git a/net-libs/kdsoap/kdsoap-2.2.0.ebuild b/net-libs/kdsoap/kdsoap-2.2.0.ebuild new file mode 100644 index 000000000000..64e1ce941828 --- /dev/null +++ b/net-libs/kdsoap/kdsoap-2.2.0.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +else + EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git" + EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen ) + inherit git-r3 +fi +inherit cmake multibuild + +DESCRIPTION="Qt-based client-side and server-side SOAP component" +HOMEPAGE="https://www.kdab.com/development-resources/qt-tools/kd-soap/" + +LICENSE="GPL-3 AGPL-3" +SLOT="0/2" +IUSE="+qt5 qt6" +REQUIRED_USE="|| ( qt5 qt6 )" + +RDEPEND=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtxml:5 + ) + qt6? ( dev-qt/qtbase:6[network,xml] )" +DEPEND="${RDEPEND} + dev-libs/boost +" + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_prepare() { + cmake_src_prepare + sed -e "/install.*INSTALL_DOC_DIR/d" -i CMakeLists.txt || die +} + +src_configure() { + my_src_configure() { + local mycmakeargs=( + -DKDSoap_DOCS=OFF + -DKDSoap_EXAMPLES=OFF # no install targets + -DKDSoap_STATIC=OFF + ) + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + mycmakeargs+=( -DKDSoap_QT6=ON ) + else + mycmakeargs+=( -DKDSoap_QT6=OFF ) + fi + cmake_src_configure + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_install() { + multibuild_foreach_variant cmake_src_install +} diff --git a/net-libs/kdsoap/metadata.xml b/net-libs/kdsoap/metadata.xml index 8641e5bdd399..77493fa9cc4b 100644 --- a/net-libs/kdsoap/metadata.xml +++ b/net-libs/kdsoap/metadata.xml @@ -5,4 +5,7 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="github">KDAB/KDSoap</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/kimap2/Manifest b/net-libs/kimap2/Manifest deleted file mode 100644 index 81b3b7cd45ee..000000000000 --- a/net-libs/kimap2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kimap2-0.3.0.tar.xz 91948 BLAKE2B 95bc03eb7a5d99525a897327e6e12d46bc5fecbcfb521ad91645db8b531a1cd3f7e3125b6ceee412f6e2a53bed9b75e4993f6267722d23976f50fd711481b631 SHA512 a351fbd8a2c532a963d488c64fc497d05be3521fb2ddf2d942a9c2ebc6a76068f509c283c6335dee03c9ff1a6df294fa69b2033874d33dc6a860b70e1d4e973a diff --git a/net-libs/kimap2/kimap2-0.3.0.ebuild b/net-libs/kimap2/kimap2-0.3.0.ebuild deleted file mode 100644 index 77a3df3a9035..000000000000 --- a/net-libs/kimap2/kimap2-0.3.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Library for interacting with IMAP servers - successor of kimap" -SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz" - -LICENSE="LGPL-2+" -SLOT="5" -KEYWORDS="~amd64" - -DEPEND=" - dev-libs/cyrus-sasl:2 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=kde-apps/kmime-19.04.3:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 -" -RDEPEND="${DEPEND}" - -RESTRICT+=" test" diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest index a296b9b972ad..ad02f5a73769 100644 --- a/net-libs/ldns/Manifest +++ b/net-libs/ldns/Manifest @@ -1,2 +1 @@ -DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7 -DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1 SHA512 54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6 +DIST ldns-1.8.3.tar.gz 1299856 BLAKE2B 2250445da3beec76c96fbb5cbc00f8d6a5bb6ed5867da7f23511d46ac73d6101303eb6ad85def426b7f9287f6a629a95117bcfa6eb46b775d07ed84048162c7f SHA512 c318747bd975ade389d048680b80495fb083b46507d8dcea7d4d42c75823f56a35b438dcc5320803d39583e5a1e515a51686f7f9010c061a6e8199e1a5505ae9 diff --git a/net-libs/ldns/files/ldns-1.7.1-Makefile.patch b/net-libs/ldns/files/ldns-1.7.1-Makefile.patch deleted file mode 100644 index d654bbda6131..000000000000 --- a/net-libs/ldns/files/ldns-1.7.1-Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2019-09-29 15:17:24.728446345 +0200 -+++ Makefile.in 2019-09-29 15:18:09.544008785 +0200 -@@ -301,7 +301,7 @@ - $(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@ - - _ldns.la: ldns_wrapper.lo libldns.la -- $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS) -+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LDFLAGS) $(PYTHON_LDFLAGS) $(LIBS) - - $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL - BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR" diff --git a/net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch b/net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch new file mode 100644 index 000000000000..7731ff6af7a2 --- /dev/null +++ b/net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch @@ -0,0 +1,10 @@ +--- a/packaging/libldns.pc.in ++++ b/packaging/libldns.pc.in +@@ -8,6 +8,6 @@ + URL: http://www.nlnetlabs.nl/projects/ldns + Version: @PACKAGE_VERSION@ + Requires: ++Requires.private: libcrypto libssl + Libs: -L${libdir} -lldns +-Libs.private: @LDFLAGS@ + Cflags: -I${includedir} diff --git a/net-libs/ldns/files/ldns-1.8.3-configure-strict.patch b/net-libs/ldns/files/ldns-1.8.3-configure-strict.patch new file mode 100644 index 000000000000..37b809585a9b --- /dev/null +++ b/net-libs/ldns/files/ldns-1.8.3-configure-strict.patch @@ -0,0 +1,139 @@ +https://github.com/NLnetLabs/ldns/commit/59af7359ed744327aaf0deb2e6ac90fe9e191ba6 + +From 59af7359ed744327aaf0deb2e6ac90fe9e191ba6 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 19 Nov 2022 01:31:57 +0000 +Subject: [PATCH] acx_nlnetlabs.m4: fix -Wstrict-prototypes + +Fix -Wstrict-prototypes as it's easy to do and avoids future warnings. Noticed +when doing Clang 16 / GCC 14 / C23 work. + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], +or the (new) c-std-porting mailing list [3]. + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/acx_nlnetlabs.m4 ++++ b/acx_nlnetlabs.m4 +@@ -183,7 +183,7 @@ dnl cache=`echo $1 | sed 'y%.=/+- %___p__%'` + AC_CACHE_VAL(cv_prog_cc_flag_needed_$cache, + [ + echo '$2' > conftest.c +-echo 'void f(){}' >>conftest.c ++echo 'void f(void){}' >>conftest.c + if test -z "`$CC $CPPFLAGS $CFLAGS $ERRFLAG -c conftest.c 2>&1`"; then + eval "cv_prog_cc_flag_needed_$cache=no" + else +@@ -229,7 +229,7 @@ dnl DEPFLAG: set to flag that generates dependencies. + AC_DEFUN([ACX_DEPFLAG], + [ + AC_MSG_CHECKING([$CC dependency flag]) +-echo 'void f(){}' >conftest.c ++echo 'void f(void){}' >conftest.c + if test "`$CC -MM conftest.c 2>&1`" = "conftest.o: conftest.c"; then + DEPFLAG="-MM" + else +@@ -268,7 +268,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG -D__EXTENSIONS__ -D_BSD_SOURCE -D_DEFAUL + #include <getopt.h> + #endif + +-int test() { ++int test(void) { + int a; + char **opts = NULL; + struct timeval tv; +@@ -305,7 +305,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG -D__EXTENSIONS__ -D_BSD_SOURCE -D_DEFAUL + #include <getopt.h> + #endif + +-int test() { ++int test(void) { + int a; + char **opts = NULL; + struct timeval tv; +@@ -331,7 +331,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG, + [ + #include <stdbool.h> + #include <ctype.h> +-int test() { ++int test(void) { + int a = 0; + return a; + } +@@ -341,7 +341,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_BSD_SOURCE -D_DEFAULT_SOURCE, + [ + #include <ctype.h> + +-int test() { ++int test(void) { + int a; + a = isascii(32); + return a; +@@ -352,7 +352,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_GNU_SOURCE, + [ + #include <netinet/in.h> + +-int test() { ++int test(void) { + struct in6_pktinfo inf; + int a = (int)sizeof(inf); + return a; +@@ -366,7 +366,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_GNU_SOURCE -D_FRSRESGID, + [ + #include <unistd.h> + +-int test() { ++int test(void) { + int a = setresgid(0,0,0); + a = setresuid(0,0,0); + return a; +@@ -381,7 +381,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_POSIX_C_SOURCE=200112, + #endif + #include <netdb.h> + +-int test() { ++int test(void) { + int a = 0; + char *t; + time_t time = 0; +@@ -409,7 +409,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D__EXTENSIONS__, + #include <getopt.h> + #endif + +-int test() { ++int test(void) { + int a; + char **opts = NULL; + struct timeval tv; +@@ -809,7 +809,7 @@ dnl try to see if an additional _LARGEFILE_SOURCE 1 is needed to get fseeko + ACX_CHECK_COMPILER_FLAG_NEEDED(-D_LARGEFILE_SOURCE=1, + [ + #include <stdio.h> +-int test() { ++int test(void) { + int a = fseeko(stdin, 0, 0); + return a; + } +@@ -834,7 +834,7 @@ char* (*f) () = getaddrinfo; + #ifdef __cplusplus + } + #endif +-int main() { ++int main(void) { + ; + return 0; + } +@@ -898,7 +898,7 @@ cache=`echo $1 | sed 'y%.=/+-%___p_%'` + AC_CACHE_VAL(cv_cc_deprecated_$cache, + [ + echo '$3' >conftest.c +-echo 'void f(){ $2 }' >>conftest.c ++echo 'void f(void){ $2 }' >>conftest.c + if test -z "`$CC $CPPFLAGS $CFLAGS -c conftest.c 2>&1 | grep -e deprecated -e unavailable`"; then + eval "cv_cc_deprecated_$cache=no" + else + diff --git a/net-libs/ldns/files/ldns-1.8.3-docs.patch b/net-libs/ldns/files/ldns-1.8.3-docs.patch new file mode 100644 index 000000000000..6b4e7582a441 --- /dev/null +++ b/net-libs/ldns/files/ldns-1.8.3-docs.patch @@ -0,0 +1,95 @@ +https://bugs.gentoo.org/892065 +https://github.com/NLnetLabs/ldns/commit/5d5c95a947d98dd292ba81e95ca90ba6aeccb1d0 + +From 5d5c95a947d98dd292ba81e95ca90ba6aeccb1d0 Mon Sep 17 00:00:00 2001 +From: Willem Toorop <willem@nlnetlabs.nl> +Date: Mon, 5 Sep 2022 10:01:18 +0200 +Subject: [PATCH] Fix building documentation in build directory. + +Thanks Michael Tokarev +--- a/Makefile.in ++++ b/Makefile.in +@@ -270,7 +270,7 @@ doxygen: + @if test ! -e doc/header.html ; then \ + $(INSTALL) -c -m 644 $(srcdir)/doc/header.html doc/ ; \ + fi ; +- $(doxygen) $(srcdir)/libdns.doxygen ++ $(doxygen) libdns.doxygen + + doc: manpages $(doxygen) + @$(INSTALL) -d doc +--- a/ldns/net.h.in ++++ b/ldns/net.h.in +@@ -91,13 +91,12 @@ int ldns_tcp_bgsend(ldns_buffer *qbin, const struct sockaddr_storage *to, sockle + + /** + * Sends a buffer to an ip using tcp and return the response as a ldns_pkt +- * \param[in] qbin the ldns_buffer to be send ++ * \param[out] result packet with the answer + * \param[in] qbin the ldns_buffer to be send + * \param[in] to the ip addr to send to + * \param[in] tolen length of the ip addr + * \param[in] timeout the timeout value for the network + * \param[out] answersize size of the packet +- * \param[out] result packet with the answer + * \return status + */ + ldns_status ldns_tcp_send(uint8_t **result, ldns_buffer *qbin, const struct sockaddr_storage *to, socklen_t tolen, struct timeval timeout, size_t *answersize); +--- a/libdns.doxygen.in ++++ b/libdns.doxygen.in +@@ -51,7 +51,7 @@ PROJECT_BRIEF = + # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy + # the logo to the output directory. + +-PROJECT_LOGO = doc/images/LogoInGradientBar2-y100.png ++PROJECT_LOGO = @srcdir@/doc/images/LogoInGradientBar2-y100.png + + # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path + # into which the generated documentation will be written. If a relative path is +@@ -854,12 +854,12 @@ WARN_LOGFILE = + # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING + # Note: If this tag is empty the current directory is searched. + +-INPUT = . \ +- ldns/ \ +- doc/ \ +- examples/ldns-mx.c \ +- examples/ldns-read-zone.c \ +- examples/ldns-signzone.c ++INPUT = ldns/ \ ++ @srcdir@/doc/ \ ++ @srcdir@/examples/ldns-mx.c \ ++ @srcdir@/examples/ldns-read-zone.c \ ++ @srcdir@/examples/ldns-signzone.c \ ++ @srcdir@ + + # This tag can be used to specify the character encoding of the source files + # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +@@ -936,7 +936,7 @@ EXCLUDE_SYMBOLS = + # that contain example code fragments that are included (see the \include + # command). + +-EXAMPLE_PATH = examples ++EXAMPLE_PATH = @srcdir@/examples + + # If the value of the EXAMPLE_PATH tag contains directories, you can use the + # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +@@ -956,7 +956,7 @@ EXAMPLE_RECURSIVE = NO + # that contain images that are to be included in the documentation (see the + # \image command). + +-IMAGE_PATH = doc/images ++IMAGE_PATH = @srcdir@/doc/images + + # The INPUT_FILTER tag can be used to specify a program that doxygen should + # invoke to filter for each input file. Doxygen will invoke the filter program +@@ -1798,7 +1798,7 @@ COMPACT_LATEX = NO + # The default value is: a4. + # This tag requires that the tag GENERATE_LATEX is set to YES. + +-PAPER_TYPE = a4wide ++PAPER_TYPE = a4 + + # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names + # that should be included in the LaTeX output. The package can be specified just + diff --git a/net-libs/ldns/files/ldns-1.8.3-swig-4.2.0.patch b/net-libs/ldns/files/ldns-1.8.3-swig-4.2.0.patch new file mode 100644 index 000000000000..8165371d53bb --- /dev/null +++ b/net-libs/ldns/files/ldns-1.8.3-swig-4.2.0.patch @@ -0,0 +1,101 @@ +https://bugs.gentoo.org/921302 +https://github.com/NLnetLabs/ldns/pull/232 +https://github.com/NLnetLabs/ldns/pull/233 + +From daf38095763f758c77be538da25c267dc5cb73c8 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Fri, 26 Jan 2024 11:30:39 +0100 +Subject: [PATCH] SWIG_Python_str_AsChar removal in SWIG 4.2.0 + +The replacement, SWIG_PyUnicode_AsUTF8AndSize, has different +memory management requirements. +--- + contrib/python/ldns_rdf.i | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) + +diff --git a/contrib/python/ldns_rdf.i b/contrib/python/ldns_rdf.i +index 5d7448fd..60daf1a7 100644 +--- a/contrib/python/ldns_rdf.i ++++ b/contrib/python/ldns_rdf.i +@@ -56,7 +56,11 @@ + */ + %typemap(arginit, noblock=1) const ldns_rdf * + { ++#if SWIG_VERSION >= 0x040200 ++ PyObject *$1_bytes = NULL; ++#else + char *$1_str = NULL; ++#endif + } + + /* +@@ -66,11 +70,17 @@ + %typemap(in, noblock=1) const ldns_rdf * (void* argp, $1_ltype tmp = 0, int res) + { + if (Python_str_Check($input)) { ++ const char *argstr; ++#if SWIG_VERSION >= 0x040200 ++ argstr = SWIG_PyUnicode_AsUTF8AndSize($input, NULL, &$1_bytes); ++#else + $1_str = SWIG_Python_str_AsChar($input); +- if ($1_str == NULL) { ++ argstr = $1_str; ++#endif ++ if (argstr == NULL) { + %argument_fail(SWIG_TypeError, "char *", $symname, $argnum); + } +- tmp = ldns_dname_new_frm_str($1_str); ++ tmp = ldns_dname_new_frm_str(argstr); + if (tmp == NULL) { + %argument_fail(SWIG_TypeError, "char *", $symname, $argnum); + } +@@ -90,10 +100,17 @@ + */ + %typemap(freearg, noblock=1) const ldns_rdf * + { ++#if SWIG_VERSION >= 0x040200 ++ if ($1_bytes != NULL) { ++ /* Is not NULL only when a conversion form string occurred. */ ++ Py_XDECREF($1_bytes); ++ } ++#else + if ($1_str != NULL) { + /* Is not NULL only when a conversion form string occurred. */ + SWIG_Python_str_DelForPy3($1_str); /* Is a empty macro for Python < 3. */ + } ++#endif + } + + %nodefaultctor ldns_struct_rdf; /* No default constructor. */ + +From f91f61e10be595a6a46845112aaed7da24551bf9 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Fri, 26 Jan 2024 11:57:03 +0100 +Subject: [PATCH] 32-bit compatibility for Python SWIG bindings + +The ssize_t type can be int instead of long, and the pointer +types are incompatible. +--- + contrib/python/ldns.i | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/contrib/python/ldns.i b/contrib/python/ldns.i +index 881ba5e85..b4a740820 100644 +--- a/contrib/python/ldns.i ++++ b/contrib/python/ldns.i +@@ -99,12 +99,14 @@ + %typemap(in, noblock=1) (ssize_t) + { + int $1_res = 0; +- $1_res = SWIG_AsVal_long($input, &$1); ++ long val; ++ $1_res = SWIG_AsVal_long($input, &val); + if (!SWIG_IsOK($1_res)) { + SWIG_exception_fail(SWIG_ArgError($1_res), "in method '" + "$symname" "', argument " "$argnum" " of type '" + "$type""'"); + } ++ $1 = val; + } + + diff --git a/net-libs/ldns/ldns-1.7.1-r5.ebuild b/net-libs/ldns/ldns-1.7.1-r5.ebuild deleted file mode 100644 index 66e436d22ec3..000000000000 --- a/net-libs/ldns/ldns-1.7.1-r5.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) -inherit multilib-minimal python-single-r1 - -DESCRIPTION="a library with the aim to simplify DNS programming in C" -HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/3" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax" - -# configure will die if ecdsa is enabled and ssl is not -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - python? ( ${PYTHON_DEPS} ) - ecdsa? ( - >=dev-libs/openssl-1.0.1e:0=[-bindist(-),${MULTILIB_USEDEP}] - ) - ed25519? ( - >=dev-libs/openssl-1.1.0:0=[-bindist(-),${MULTILIB_USEDEP}] - ) - ed448? ( - >=dev-libs/openssl-1.1.1:0=[-bindist(-),${MULTILIB_USEDEP}] - ) - >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - doc? ( app-doc/doxygen ) -" - -RESTRICT="test" # 1.6.9 has no test directory - -MULTILIB_CHOST_TOOLS=( - /usr/bin/ldns-config -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -multilib_src_configure() { - # >=openssl-1.1.0 required for dane-ta - if has_version "<dev-libs/openssl-1.1.0"; then - local dane_ta_usage="--disable-dane-ta-usage" - else - local dane_ta_usage="" - fi - - ECONF_SOURCE=${S} \ - econf \ - $(use_enable static-libs static) \ - $(use_enable gost) \ - $(use_enable ecdsa) \ - $(use_enable ed25519) \ - $(use_enable ed448) \ - $(use_enable dane) \ - $(multilib_native_use_with python pyldns) \ - $(multilib_native_use_with python pyldnsx) \ - --with-ssl="${EPREFIX}"/usr \ - --enable-sha2 \ - --without-drill \ - --without-examples \ - ${dane_ta_usage} \ - --disable-rpath -} - -src_prepare() { - default - eapply -p0 "${FILESDIR}/${P}-Makefile.patch" - # remove non-existing dependency for target packaging/libldns.pc - sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in' -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc ; then - emake doxygen - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc ; then - dodoc -r doc/html - fi -} - -multilib_src_install_all() { - dodoc Changelog README* - - find "${D}" -name '*.la' -delete || die - use python && python_optimize - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect - doins libdns.vim - fi - - einfo - elog "Install net-dns/ldns-utils if you want drill and examples" - einfo -} diff --git a/net-libs/ldns/ldns-1.7.1-r6.ebuild b/net-libs/ldns/ldns-1.7.1-r6.ebuild deleted file mode 100644 index a0986afdac4b..000000000000 --- a/net-libs/ldns/ldns-1.7.1-r6.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) -inherit multilib-minimal python-single-r1 - -DESCRIPTION="a library with the aim to simplify DNS programming in C" -HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - python? ( ${PYTHON_DEPS} ) - >=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - doc? ( app-doc/doxygen ) -" - -RESTRICT="test" # 1.6.9 has no test directory - -MULTILIB_CHOST_TOOLS=( - /usr/bin/ldns-config -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -multilib_src_configure() { - # >=openssl-1.1.0 required for dane-ta - if has_version "<dev-libs/openssl-1.1.0"; then - local dane_ta_usage="--disable-dane-ta-usage" - else - local dane_ta_usage="" - fi - - ECONF_SOURCE=${S} \ - econf \ - $(use_enable static-libs static) \ - $(use_enable gost) \ - $(use_enable ecdsa) \ - $(use_enable ed25519) \ - $(use_enable ed448) \ - $(use_enable dane) \ - $(multilib_native_use_with python pyldns) \ - $(multilib_native_use_with python pyldnsx) \ - --with-ssl="${EPREFIX}"/usr \ - --enable-sha2 \ - --without-drill \ - --without-examples \ - ${dane_ta_usage} \ - --disable-rpath -} - -src_prepare() { - default - eapply -p0 "${FILESDIR}/${P}-Makefile.patch" - # remove non-existing dependency for target packaging/libldns.pc - sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in' -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc ; then - emake doxygen - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc ; then - dodoc -r doc/html - fi -} - -multilib_src_install_all() { - dodoc Changelog README* - - find "${D}" -name '*.la' -delete || die - use python && python_optimize - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect - doins libdns.vim - fi - - einfo - elog "Install net-dns/ldns-utils if you want drill and examples" - einfo -} diff --git a/net-libs/ldns/ldns-1.8.0-r1.ebuild b/net-libs/ldns/ldns-1.8.0-r1.ebuild deleted file mode 100644 index 5bf3f018928a..000000000000 --- a/net-libs/ldns/ldns-1.8.0-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) -inherit python-single-r1 autotools multilib-minimal - -DESCRIPTION="a library with the aim to simplify DNS programming in C" -HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/3" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax" - -# configure will die if ecdsa is enabled and ssl is not -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - python? ( ${PYTHON_DEPS} ) - ecdsa? ( - >=dev-libs/openssl-1.0.1e:0=[-bindist(-),${MULTILIB_USEDEP}] - ) - ed25519? ( - >=dev-libs/openssl-1.1.0:0=[-bindist(-),${MULTILIB_USEDEP}] - ) - ed448? ( - >=dev-libs/openssl-1.1.1:0=[-bindist(-),${MULTILIB_USEDEP}] - ) - >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - doc? ( app-doc/doxygen ) -" - -RESTRICT="test" # 1.6.9 has no test directory - -MULTILIB_CHOST_TOOLS=( - /usr/bin/ldns-config -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -multilib_src_configure() { - # >=openssl-1.1.0 required for dane-ta - if has_version "<dev-libs/openssl-1.1.0"; then - local dane_ta_usage="--disable-dane-ta-usage" - else - local dane_ta_usage="" - fi - - ECONF_SOURCE=${S} \ - econf \ - $(use_enable static-libs static) \ - $(use_enable gost) \ - $(use_enable ecdsa) \ - $(use_enable ed25519) \ - $(use_enable ed448) \ - $(use_enable dane) \ - $(multilib_native_use_with python pyldns) \ - $(multilib_native_use_with python pyldnsx) \ - --with-ssl="${EPREFIX}"/usr \ - --enable-sha2 \ - --without-drill \ - --without-examples \ - ${dane_ta_usage} \ - --disable-rpath -} - -src_prepare() { - default - # remove non-existing dependency for target packaging/libldns.pc - sed -i 's,$(srcdir)/packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in' - - # remove $(srcdir) from path for multilib build - sed -i 's,$(srcdir)/packaging/libldns.pc,packaging/libldns.pc,' "${S}"/Makefile.in || die 'could not patch Makefile.in' - - # remove Libs.private, see bug #695672 - sed -i '/^Libs.private:/d' "${S}"/packaging/libldns.pc.in || die 'could not patch libldns.pc.in' - - # backport https://github.com/NLnetLabs/ldns/commit/bc9d017f6fd8b6b5d2ff6e4489a2931d0aab8184 - sed -i 's/AC_SUBST(VERSION_INFO.*/AC_SUBST(VERSION_INFO, [5:0:2])/' "${S}"/configure.ac || die 'could not patch configure.ac' - - eautoreconf -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc ; then - emake doxygen - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc ; then - dodoc -r doc/html - fi -} - -multilib_src_install_all() { - dodoc Changelog README* - - find "${D}" -name '*.la' -delete || die - use python && python_optimize - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect - doins libdns.vim - fi - - einfo - elog "Install net-dns/ldns-utils if you want drill and examples" - einfo -} diff --git a/net-libs/ldns/ldns-1.8.0-r2.ebuild b/net-libs/ldns/ldns-1.8.0-r2.ebuild deleted file mode 100644 index 88e154dc8a7f..000000000000 --- a/net-libs/ldns/ldns-1.8.0-r2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) -inherit python-single-r1 autotools multilib-minimal - -DESCRIPTION="a library with the aim to simplify DNS programming in C" -HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax" - -# configure will die if ecdsa is enabled and ssl is not -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - python? ( ${PYTHON_DEPS} ) - >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - doc? ( app-doc/doxygen ) -" - -RESTRICT="test" # 1.6.9 has no test directory - -MULTILIB_CHOST_TOOLS=( - /usr/bin/ldns-config -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -multilib_src_configure() { - # >=openssl-1.1.0 required for dane-ta - if has_version "<dev-libs/openssl-1.1.0"; then - local dane_ta_usage="--disable-dane-ta-usage" - else - local dane_ta_usage="" - fi - - ECONF_SOURCE=${S} \ - econf \ - $(use_enable static-libs static) \ - $(use_enable gost) \ - $(use_enable ecdsa) \ - $(use_enable ed25519) \ - $(use_enable ed448) \ - $(use_enable dane) \ - $(multilib_native_use_with python pyldns) \ - $(multilib_native_use_with python pyldnsx) \ - --with-ssl="${EPREFIX}"/usr \ - --enable-sha2 \ - --without-drill \ - --without-examples \ - ${dane_ta_usage} \ - --disable-rpath -} - -src_prepare() { - default - # remove non-existing dependency for target packaging/libldns.pc - sed -i 's,$(srcdir)/packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in' - - # remove $(srcdir) from path for multilib build - sed -i 's,$(srcdir)/packaging/libldns.pc,packaging/libldns.pc,' "${S}"/Makefile.in || die 'could not patch Makefile.in' - - # remove Libs.private, see bug #695672 - sed -i '/^Libs.private:/d' "${S}"/packaging/libldns.pc.in || die 'could not patch libldns.pc.in' - - # backport https://github.com/NLnetLabs/ldns/commit/bc9d017f6fd8b6b5d2ff6e4489a2931d0aab8184 - sed -i 's/AC_SUBST(VERSION_INFO.*/AC_SUBST(VERSION_INFO, [5:0:2])/' "${S}"/configure.ac || die 'could not patch configure.ac' - - eautoreconf -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc ; then - emake doxygen - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc ; then - dodoc -r doc/html - fi -} - -multilib_src_install_all() { - dodoc Changelog README* - - find "${D}" -name '*.la' -delete || die - use python && python_optimize - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect - doins libdns.vim - fi - - einfo - elog "Install net-dns/ldns-utils if you want drill and examples" - einfo -} diff --git a/net-libs/ldns/ldns-1.8.3-r1.ebuild b/net-libs/ldns/ldns-1.8.3-r1.ebuild new file mode 100644 index 000000000000..332c7eb493fb --- /dev/null +++ b/net-libs/ldns/ldns-1.8.3-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit autotools python-single-r1 multilib-minimal + +DESCRIPTION="A library with the aim to simplify DNS programming in C" +HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/" +SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/3" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="test" # missing test directory + +BDEPEND=" + python? ( dev-lang/swig ) + doc? ( app-text/doxygen ) +" +DEPEND=" + python? ( ${PYTHON_DEPS} ) + >=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP},static-libs?] + examples? ( net-libs/libpcap ) +" +RDEPEND=" + ${DEPEND} + !<net-dns/ldns-utils-1.8.0-r2 +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/ldns-config +) + +PATCHES=( + "${FILESDIR}/ldns-1.8.1-pkgconfig.patch" + "${FILESDIR}/${P}-docs.patch" + "${FILESDIR}/${P}-configure-strict.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Drop after 1.8.3 + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable static-libs static) \ + $(multilib_native_use_with python pyldns) \ + $(multilib_native_use_with python pyldnsx) \ + --with-ssl="${EPREFIX}"/usr \ + $(multilib_native_with drill) \ + $(multilib_native_use_with examples) \ + --disable-rpath +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use doc ; then + emake doxygen + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use doc ; then + dodoc -r doc/html + fi +} + +multilib_src_install_all() { + dodoc Changelog README* + + find "${D}" -name '*.la' -delete || die + use python && python_optimize + + insinto /usr/share/vim/vimfiles/ftdetect + doins libdns.vim +} diff --git a/net-libs/ldns/ldns-1.8.3-r2.ebuild b/net-libs/ldns/ldns-1.8.3-r2.ebuild new file mode 100644 index 000000000000..15f1bf29756a --- /dev/null +++ b/net-libs/ldns/ldns-1.8.3-r2.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit autotools python-single-r1 multilib-minimal + +DESCRIPTION="A library with the aim to simplify DNS programming in C" +HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/" +SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="test" # missing test directory + +BDEPEND=" + python? ( dev-lang/swig ) + doc? ( app-text/doxygen ) +" +DEPEND=" + python? ( ${PYTHON_DEPS} ) + >=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP},static-libs?] + examples? ( net-libs/libpcap ) +" +RDEPEND=" + ${DEPEND} + !<net-dns/ldns-utils-1.8.0-r2 +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/ldns-config +) + +PATCHES=( + "${FILESDIR}/ldns-1.8.1-pkgconfig.patch" + "${FILESDIR}/${P}-docs.patch" + "${FILESDIR}/${P}-configure-strict.patch" + "${FILESDIR}/${PN}-1.8.3-swig-4.2.0.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Drop after 1.8.3 + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable static-libs static) \ + $(multilib_native_use_with python pyldns) \ + $(multilib_native_use_with python pyldnsx) \ + --with-ssl="${EPREFIX}"/usr \ + $(multilib_native_with drill) \ + $(multilib_native_use_with examples) \ + --disable-rpath +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use doc ; then + emake doxygen + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use doc ; then + dodoc -r doc/html + fi +} + +multilib_src_install_all() { + dodoc Changelog README* + + find "${D}" -name '*.la' -delete || die + use python && python_optimize + + insinto /usr/share/vim/vimfiles/ftdetect + doins libdns.vim +} diff --git a/net-libs/ldns/ldns-1.8.3-r3.ebuild b/net-libs/ldns/ldns-1.8.3-r3.ebuild new file mode 100644 index 000000000000..8b6b4d2afbe2 --- /dev/null +++ b/net-libs/ldns/ldns-1.8.3-r3.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools python-single-r1 multilib-minimal + +DESCRIPTION="A library with the aim to simplify DNS programming in C" +HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/" +SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="test" # missing test directory + +BDEPEND=" + python? ( dev-lang/swig ) + doc? ( app-text/doxygen ) +" +DEPEND=" + python? ( ${PYTHON_DEPS} ) + >=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP},static-libs?] + examples? ( net-libs/libpcap ) +" +RDEPEND=" + ${DEPEND} +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/ldns-config +) + +PATCHES=( + "${FILESDIR}/ldns-1.8.1-pkgconfig.patch" + "${FILESDIR}/${P}-docs.patch" + "${FILESDIR}/${P}-configure-strict.patch" + "${FILESDIR}/${PN}-1.8.3-swig-4.2.0.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Drop after 1.8.3 + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable static-libs static) \ + $(multilib_native_use_with python pyldns) \ + $(multilib_native_use_with python pyldnsx) \ + --with-ssl="${EPREFIX}"/usr \ + $(multilib_native_with drill) \ + $(multilib_native_use_with examples) \ + --disable-rpath +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use doc ; then + emake doxygen + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use doc ; then + dodoc -r doc/html + fi +} + +multilib_src_install_all() { + dodoc Changelog README* + + find "${D}" -name '*.la' -delete || die + use python && python_optimize + + insinto /usr/share/vim/vimfiles/ftdetect + doins libdns.vim +} diff --git a/net-libs/ldns/metadata.xml b/net-libs/ldns/metadata.xml index bea05fd65881..8fe7da48f6ca 100644 --- a/net-libs/ldns/metadata.xml +++ b/net-libs/ldns/metadata.xml @@ -11,13 +11,6 @@ level API which allows a programmer to (for instance) create or sign packets. </longdescription> - <use> - <flag name="dane">Enable DNS-based Authentication of Named Entities (DANE) support</flag> - <flag name="ecdsa">Enable ECDSA support</flag> - <flag name="ed25519">Enable ED25519 support</flag> - <flag name="ed448">Enable ED448 support</flag> - <flag name="gost">Enable GOST support</flag> - </use> <upstream> <remote-id type="github">NLnetLabs/ldns</remote-id> </upstream> diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest index 78431778763f..37eb55a5088b 100644 --- a/net-libs/libaccounts-glib/Manifest +++ b/net-libs/libaccounts-glib/Manifest @@ -1 +1,2 @@ -DIST libaccounts-glib-1.25.tar.gz 117337 BLAKE2B 72e6e15b63eea4d5b2a3e994779a4636bee859c6d395c8c9f65120cfee1c25a5708971b438010f668eefee20735b01e9f9f4e1ac4cb55495a06143d20198e422 SHA512 cc8b493d246f99300ee614fed93258378ecdbe9c518a958a59827ee8f74559b1ee3683acfb85f59aa91390275497fb35041da2be47f27f24f96e1efd5d6d2e20 +DIST libaccounts-glib-1.26.tar.gz 117365 BLAKE2B a3c7bf4058372001079c9c153b30f947882521f1f9680a63db2883307e998335a1e646112dc8a51640824f238d871d96da2c18b4ef175c837cebfe056ded2cbb SHA512 c08a11087745ba771e539b61de57693390960ad6b4e8217c159be49d31bd7f8856fffa835e7a230f352049bbf7cec9184ff225e74bbc195964221d3d9d49743b +DIST libaccounts-glib-1.27.tar.bz2 88050 BLAKE2B 12d4ded072584150d9011e7c684301cf407d822e42ef131cf5b2d1c370cb5f59f00991a52c27d444dfe654f743984a9b5e9983f204a1a4172e8730f8020a7662 SHA512 3a4ccc9193e69dcab1b6618da0dc628f5a2a7c57174f99adf690bef71bbcec0bde3957077411d0528e85447e9f0d037e3ee93c2a3d3b2e6404b257de34a6493c diff --git a/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch b/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch new file mode 100644 index 000000000000..0a6f1120882a --- /dev/null +++ b/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch @@ -0,0 +1,30 @@ +From 270a66d5efe1453a2be4bad10894b947fdd2923e Mon Sep 17 00:00:00 2001 +From: Alberto Mardegan <mardy@users.sourceforge.net> +Date: Tue, 4 Oct 2022 20:58:27 +0300 +Subject: [PATCH] ag-account: fix incorrect cleanup in ag_account_finalize + +The wrong variable was passed to _ag_account_changes_free(); as a matter +of facts, this code was always a NOP, since prig->services had already +been nullified before, but it was a memory leak. + +Fixes: https://gitlab.com/accounts-sso/libaccounts-glib/-/issues/13 +--- + libaccounts-glib/ag-account.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libaccounts-glib/ag-account.c b/libaccounts-glib/ag-account.c +index 8d6995b..7e67ba7 100644 +--- a/libaccounts-glib/ag-account.c ++++ b/libaccounts-glib/ag-account.c +@@ -994,7 +994,7 @@ ag_account_finalize (GObject *object) + if (priv->changes) + { + DEBUG_INFO ("Finalizing account with uncommitted changes!"); +- g_clear_pointer (&priv->services, _ag_account_changes_free); ++ g_clear_pointer (&priv->changes, _ag_account_changes_free); + } + + G_OBJECT_CLASS (ag_account_parent_class)->finalize (object); +-- +GitLab + diff --git a/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-project-version.patch b/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-project-version.patch new file mode 100644 index 000000000000..82e8c6bbcbd4 --- /dev/null +++ b/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-project-version.patch @@ -0,0 +1,8 @@ +--- a/meson.build ++++ b/meson.build +@@ -1,4 +1,4 @@ +-project('libaccounts-glib', 'c', version: '1.25', license: 'LGPL2.1', meson_version: '>=0.48.0') ++project('libaccounts-glib', 'c', version: '1.26', license: 'LGPL2.1', meson_version: '>=0.48.0') + + version_parts = meson.project_version().split('.') + api_version = '@0@.0'.format(version_parts[0]) diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.26-r1.ebuild index 4f6b141b2508..c67040512394 100644 --- a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild +++ b/net-libs/libaccounts-glib/libaccounts-glib-1.26-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit meson python-r1 vala DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications" @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-VERSION_${PV}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="doc" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -30,17 +30,21 @@ RDEPEND="${PYTHON_DEPS} DEPEND="${RDEPEND}" BDEPEND=" $(vala_depend) + dev-libs/check dev-util/gdbus-codegen dev-util/glib-utils - dev-libs/check doc? ( dev-util/gtk-doc ) " -PATCHES=( "${FILESDIR}/${P}-assert-failure.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.25-assert-failure.patch" + "${FILESDIR}/${P}-project-version.patch" + "${FILESDIR}/${P}-fix-incorrect-cleanup-in-ag_account_finalize.patch" +) src_prepare() { default - vala_src_prepare --ignore-use + vala_setup --ignore-use use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die } diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.27.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.27.ebuild new file mode 100644 index 000000000000..64657ad3f041 --- /dev/null +++ b/net-libs/libaccounts-glib/libaccounts-glib-1.27.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit meson python-r1 vala + +DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications" +HOMEPAGE="https://gitlab.com/accounts-sso/libaccounts-glib" +SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2" +S="${WORKDIR}/${PN}-VERSION_${PV}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="doc test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/gobject-introspection:= + dev-libs/libxml2 + dev-python/pygobject:3[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(vala_depend) + dev-util/gdbus-codegen + dev-util/glib-utils + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + test? ( + dev-libs/check + dev-util/dbus-test-runner + ) +" + +src_prepare() { + default + vala_setup --ignore-use + + use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die + use test || sed -e "/^subdir('tests')$/d" -i meson.build || die + + # /tmp isn't accessible from sandbox + sed -i -e "s|/tmp/\(.*\)|${T}/\1|" tests/check_ag.c || die + sed -i -e "s|/tmp|${T}|" tests/meson.build || die +} + +src_configure() { + my_configure() { + local emesonargs=( + -Dinstall-py-overrides=true + ) + meson_src_configure + } + python_foreach_impl run_in_build_dir my_configure +} + +src_compile() { + python_foreach_impl run_in_build_dir meson_src_compile +} + +src_test() { + python_foreach_impl run_in_build_dir meson_src_test +} + +src_install() { + einstalldocs + python_foreach_impl run_in_build_dir meson_src_install + python_foreach_impl python_optimize +} diff --git a/net-libs/libaccounts-glib/metadata.xml b/net-libs/libaccounts-glib/metadata.xml index 8641e5bdd399..19b6674bc803 100644 --- a/net-libs/libaccounts-glib/metadata.xml +++ b/net-libs/libaccounts-glib/metadata.xml @@ -5,4 +5,7 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="gitlab">accounts-sso/libaccounts-glib</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest index 79e531fd068d..2d201a923391 100644 --- a/net-libs/libad9361-iio/Manifest +++ b/net-libs/libad9361-iio/Manifest @@ -1 +1,2 @@ DIST libad9361-iio-0.2.tar.gz 167678 BLAKE2B 9880114bc53f3d4975dbe0773f8d112e40b0df47e34985bdc68c5b6740aee2c140ced39353929a793c2b327b5811461436ceb2934c2a71fc7b92b218092d468d SHA512 f95fa955531198ab33c16d41685d23140e875b2eafa1da10cdf60a7bf1ae760e86e2d3d28c9ab36a3a7b7a90e36bb53456dec1d6e537a1574a5505b7595e764c +DIST libad9361-iio-0.3.tar.gz 188475 BLAKE2B bdd3733ece66f1b34075821316ce054537059297964cc4bd92bc4c768d1253a2b6d1822bf6cce20082395b0f7d72ccc63a5002608f8042494a6a543a3e0369a4 SHA512 904f81fead71a9c93ccdcdb8822247fc8c496920abb9b13ea4b2b0465d50f5c0115ffc8d226496e76f7bb23b466031556129b18a1f35c65c30dcb3b0c1aeeff9 diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch new file mode 100644 index 000000000000..5a69010eb184 --- /dev/null +++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch @@ -0,0 +1,50 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,6 +13,8 @@ + cmake_minimum_required(VERSION 2.8.7) + project(ad9361 C) + ++include(GNUInstallDirs) ++ + set(LIBAD9361_VERSION_MAJOR 0) + set(LIBAD9361_VERSION_MINOR 2) + set(VERSION ${LIBAD9361_VERSION_MAJOR}.${LIBAD9361_VERSION_MINOR}) +@@ -59,10 +61,6 @@ endif() + + add_definitions(-D_POSIX_C_SOURCE=199309L -DLIBAD9361_EXPORTS=1) + +-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" +- CACHE PATH "Installation directory for libraries") +-mark_as_advanced(INSTALL_LIB_DIR) +- + find_library(LIBIIO_LIBRARIES iio) + find_path(LIBIIO_INCLUDEDIR iio.h) + +@@ -98,21 +96,17 @@ configure_file(libad9361-iio.iss.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libad9361-i + + set(LIBAD9361_PC ${CMAKE_CURRENT_BINARY_DIR}/libad9361.pc) + configure_file(libad9361.pc.cmakein ${LIBAD9361_PC} @ONLY) +-install(FILES ${LIBAD9361_PC} DESTINATION ${INSTALL_LIB_DIR}/pkgconfig) ++install(FILES ${LIBAD9361_PC} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + if(NOT SKIP_INSTALL_ALL) + install(TARGETS ad9361 +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION "${INSTALL_LIB_DIR}" +- RUNTIME DESTINATION bin +- FRAMEWORK DESTINATION lib +- PUBLIC_HEADER DESTINATION include) ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ FRAMEWORK DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + endif() + +-set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc)") +-include(GNUInstallDirs) +-set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc") +- + find_package(Doxygen) + if(DOXYGEN_FOUND) + option(WITH_DOC "Generate documentation with Doxygen" ON) diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch new file mode 100644 index 000000000000..00ef9e0a6869 --- /dev/null +++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch @@ -0,0 +1,49 @@ +https://bugs.gentoo.org/831322 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,17 +1,29 @@ + add_executable(FilterDesignerTest filter_designer_test.c) +-target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++if(WIN32) ++ target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++else() ++ target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m) ++endif() + add_test(NAME FilterDesignerTest + COMMAND FilterDesignerTest + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + + add_executable(GenerateRatesTest gen_rates_test.c) +-target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++if(WIN32) ++ target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++else() ++ target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m) ++endif() + add_test(NAME GenerateRatesTest + COMMAND GenerateRatesTest + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + + add_executable(FilterDesignerHardwareTest filter_designer_hw.c) +-target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++if(WIN32) ++ target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++else() ++ target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m) ++endif() + add_test(NAME FilterDesignerHardwareTest + COMMAND FilterDesignerHardwareTest + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +@@ -27,7 +39,11 @@ add_test(NAME FMComms5SyncTest + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + + add_executable(AutoRateTest auto_rate_test_hw.c) +-target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++if(WIN32) ++ target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++else() ++ target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m) ++endif() + add_test(NAME AutoRateTest + COMMAND AutoRateTest + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch new file mode 100644 index 000000000000..a23205e44da9 --- /dev/null +++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch @@ -0,0 +1,14 @@ +--- a/libad9361.pc.cmakein ++++ b/libad9361.pc.cmakein +@@ -1,8 +1,8 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_PREFIX@/lib +-sharedlibdir=@CMAKE_INSTALL_PREFIX@/lib +-includedir=@CMAKE_INSTALL_PREFIX@/include ++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++sharedlibdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ + + Name: libad9361 + Description: Device specific library for AD936X transceivers diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.3-cmake-gnuinstalldirs.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.3-cmake-gnuinstalldirs.patch new file mode 100644 index 000000000000..9df6ed6dede2 --- /dev/null +++ b/net-libs/libad9361-iio/files/libad9361-iio-0.3-cmake-gnuinstalldirs.patch @@ -0,0 +1,57 @@ +From ef3d58506132072834637f887bc47eb4d0c52a73 Mon Sep 17 00:00:00 2001 +From: Julien Malik <julien.malik@unseenlabs.fr> +Date: Mon, 29 Nov 2021 17:52:13 +0100 +Subject: [PATCH] cmake: Honor GNUInstallDirs for installation + +Library installation dir can be lib, lib64 or lib/<multiarch-tuple>. +Use the installation paths given by GNUInstallDirs by default, as done in libiio + +Signed-off-by: Julien Malik <julien.malik@unseenlabs.fr> +--- + CMakeLists.txt | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04d5c45..475a448 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,10 +70,6 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|DragonFly|OpenBSD|NetBSD") + endif() + add_definitions(-D_POSIX_C_SOURCE=200809L -D__XSI_VISIBLE=500 -DLIBAD9361_EXPORTS=1) + +-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" +- CACHE PATH "Installation directory for libraries") +-mark_as_advanced(INSTALL_LIB_DIR) +- + find_library(LIBIIO_LIBRARIES iio) + find_path(LIBIIO_INCLUDEDIR iio.h) + +@@ -109,19 +105,21 @@ configure_file(libad9361-iio.iss.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libad9361-i + + set(LIBAD9361_PC ${CMAKE_CURRENT_BINARY_DIR}/libad9361.pc) + configure_file(libad9361.pc.cmakein ${LIBAD9361_PC} @ONLY) +-install(FILES ${LIBAD9361_PC} DESTINATION ${INSTALL_LIB_DIR}/pkgconfig) + ++include(GNUInstallDirs) + if(NOT SKIP_INSTALL_ALL) + install(TARGETS ad9361 +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION "${INSTALL_LIB_DIR}" +- RUNTIME DESTINATION bin +- FRAMEWORK DESTINATION lib +- PUBLIC_HEADER DESTINATION include) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ FRAMEWORK DESTINATION ${OSX_INSTALL_FRAMEWORKSDIR} ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++ ++ install(FILES ${LIBAD9361_PC} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + + set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc)") +-include(GNUInstallDirs) ++ + set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc") + + find_package(Doxygen) diff --git a/net-libs/libad9361-iio/libad9361-iio-0.2.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild index 630cb27fb6e9..830e26abd214 100644 --- a/net-libs/libad9361-iio/libad9361-iio-0.2.ebuild +++ b/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit cmake -DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc." +DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc" HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio" -if [ "${PV}" = "9999" ]; then +if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio" inherit git-r3 else SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="LGPL-2.1" @@ -20,9 +21,8 @@ SLOT="0/${PV}" RDEPEND="net-libs/libiio:=" DEPEND="${RDEPEND}" -src_prepare() { - sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" \ - -e "s:\${PROJECT_NAME}\${LIBAD9361_VERSION_MAJOR}-doc:${P}:" CMakeLists.txt || die - cmake_src_prepare - eapply_user -} +PATCHES=( + "${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch + "${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch + "${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch +) diff --git a/net-libs/libad9361-iio/libad9361-iio-0.3.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.3.ebuild new file mode 100644 index 000000000000..27c4c9cac2bb --- /dev/null +++ b/net-libs/libad9361-iio/libad9361-iio-0.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc" +HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio" + inherit git-r3 +else + SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" +fi +IUSE="doc" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" + +RDEPEND="net-libs/libiio:=" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-text/doxygen )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch + "${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch + "${FILESDIR}"/${PN}-0.3-cmake-gnuinstalldirs.patch +) + +src_configure() { + local mycmakeargs=( + -DWITH_DOC="$(usex doc)" + -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${P}" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + if use doc; then + mv "${ED}/usr/share/doc/ad93610-doc" "${ED}/usr/share/doc/${P}" || die + fi +} diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild index 630cb27fb6e9..d0bab6787776 100644 --- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild +++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild @@ -1,28 +1,44 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit cmake -DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc." +DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc" HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio" -if [ "${PV}" = "9999" ]; then +if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio" inherit git-r3 else SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi +IUSE="doc" LICENSE="LGPL-2.1" SLOT="0/${PV}" RDEPEND="net-libs/libiio:=" DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-text/doxygen )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch + "${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch +) + +src_configure() { + local mycmakeargs=( + -DWITH_DOC="$(usex doc)" + -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${P}" + ) + cmake_src_configure +} -src_prepare() { - sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" \ - -e "s:\${PROJECT_NAME}\${LIBAD9361_VERSION_MAJOR}-doc:${P}:" CMakeLists.txt || die - cmake_src_prepare - eapply_user +src_install() { + cmake_src_install + if use doc; then + mv "${ED}/usr/share/doc/ad93610-doc" "${ED}/usr/share/doc/${P}" || die + fi } diff --git a/net-libs/libasr/libasr-1.0.4.ebuild b/net-libs/libasr/libasr-1.0.4.ebuild index f85a8c9d0ad5..fbe6a2cb48b3 100644 --- a/net-libs/libasr/libasr-1.0.4.ebuild +++ b/net-libs/libasr/libasr-1.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz" LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" src_configure() { econf --disable-static diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild index c77f4ac25de3..a5d84490fcbe 100644 --- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild +++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,11 +11,11 @@ SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz" SLOT="0" LICENSE="LGPL-2.1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc debug" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" PATCHES=( # fix libdir in pkgconfig file diff --git a/net-libs/libaxc/Manifest b/net-libs/libaxc/Manifest index 248c57f93c76..4ecd71f036be 100644 --- a/net-libs/libaxc/Manifest +++ b/net-libs/libaxc/Manifest @@ -1,3 +1,4 @@ DIST libaxc-0.3.4.tar.gz 40198 BLAKE2B 78fc122eefbc5c6173bdad5cf31734cf95b750c09bddede5b2656a88bede3d6c25fb22af5447681c58eb1f296ee326480e22aacb843d951f1bd7a6933155432a SHA512 7b6b5466ee89d78d3c3a2e7cf961dfb3310bff01947e69e906c83ff97e89d1bdc0e2e92f7bd0d4b48a97af91409f435a4fd869229af5b67b2f66ba464bbfd7b8 DIST libaxc-0.3.5.tar.gz 40418 BLAKE2B bcafe30c295fb6c5bd075cc7ecb9b81dcb094301a65d51ec7bcff82159c4fecdc6a4a64530e81c429803c8e267c3d6f6ccede8b5fda7d920af1c10c3806d66f0 SHA512 7708c136dfd57cc799ac467bea010ddbdcfe78a4cdae3c5882f97de7674e38e5f183f94fd42dd2df74dfec451f1822ef43122321aca46c042d5355b74e128694 DIST libaxc-0.3.6.tar.gz 40488 BLAKE2B e59d73e0011b11c0e594297d15353f0e7c378c5ce29c2f747f0a10f7ac302abbe8a0e6f3cad37a652a5a4763d15f393e2cbd7272c4249883c0c99640d18ab518 SHA512 0e02282e42597eaf641fcd620c103c4892b26120f9aec442ce61b99e2a5042d62213bed7786aede296e1024fea26ef9a21950d96a9a520ca6a5d5c524620f42d +DIST libaxc-0.3.7.tar.gz 41742 BLAKE2B e43220745cbf1e3f375c69218cc0c5bc944e2fbfd1ca2a79be38d8cac9206609f757b8afbf5d5a1411ad29cddbb8edf9cf67b570fe152d91e77e070ddbf4666f SHA512 e9982a54307ebc4fbecdd6482e0ccc9b1d5539047f455f66a4f25c067e2da8eba782163ccf0ad8aac8b11867da5d7efb309c403cdfed464e6865d3e03e09ea11 diff --git a/net-libs/libaxc/libaxc-0.3.7-r1.ebuild b/net-libs/libaxc/libaxc-0.3.7-r1.ebuild new file mode 100644 index 000000000000..e217a88d83cf --- /dev/null +++ b/net-libs/libaxc/libaxc-0.3.7-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_P="axc-${PV}" +DESCRIPTION="Client library for libsignal-protocol-c" +HOMEPAGE="https://github.com/gkdr/axc" +SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" # not GPL-3+ +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="static-libs test" + +RDEPEND=" + dev-db/sqlite + dev-libs/glib + dev-libs/libgcrypt + net-libs/libsignal-protocol-c + " +DEPEND=" + ${RDEPEND} + test? ( dev-util/cmocka ) + " +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}"/${MY_P} +RESTRICT="!test? ( test )" + +DOCS=( CHANGELOG.md README.md ) + +src_prepare() { + rm -R lib || die # unbundle libsignal-protocol-c + default +} + +src_compile() { + local make_args=( + PREFIX=/usr + + AR="$(tc-getAR)" + CC="$(tc-getCC)" + PKG_CONFIG="$(tc-getPKG_CONFIG)" + + ARCH= + ) + emake "${make_args[@]}" +} + +src_test() { + # TODO: Test failures seem to be ignored in the upstream Makefile? + # e.g. https://github.com/gkdr/axc/blob/master/Makefile#L153 + emake CC="$(tc-getCC)" test +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr ARCH= install + + # Respect libdir other than /usr/lib, e.g. /usr/lib64 + local libdir="$(get_libdir)" + if [[ ${libdir} != lib ]]; then + mv "${ED}"/usr/{lib,${libdir}} || die + sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \ + -i "${ED}/usr/${libdir}/pkgconfig/libaxc.pc" || die + fi + + einstalldocs + + if ! use static-libs ; then + rm "${ED}/usr/${libdir}/libaxc.a" || die + fi +} diff --git a/net-libs/libaxc/libaxc-0.3.7.ebuild b/net-libs/libaxc/libaxc-0.3.7.ebuild new file mode 100644 index 000000000000..564171853f90 --- /dev/null +++ b/net-libs/libaxc/libaxc-0.3.7.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_P="axc-${PV}" +DESCRIPTION="Client library for libsignal-protocol-c" +HOMEPAGE="https://github.com/gkdr/axc" +SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" # not GPL-3+ +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="static-libs test" + +RDEPEND=" + dev-db/sqlite + dev-libs/glib + dev-libs/libgcrypt + net-libs/libsignal-protocol-c + " +DEPEND=" + ${RDEPEND} + test? ( dev-util/cmocka ) + " +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}"/${MY_P} +RESTRICT="!test? ( test )" + +DOCS=( CHANGELOG.md README.md ) + +src_prepare() { + rm -R lib || die # unbundle libsignal-protocol-c + default +} + +src_compile() { + local make_args=( + PREFIX=/usr + + AR="$(tc-getAR)" + CC="$(tc-getCC)" + PKG_CONFIG="$(tc-getPKG_CONFIG)" + ) + emake "${make_args[@]}" +} + +src_test() { + # TODO: Test failures seem to be ignored in the upstream Makefile? + # e.g. https://github.com/gkdr/axc/blob/master/Makefile#L153 + emake CC="$(tc-getCC)" test +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr install + + # Respect libdir other than /usr/lib, e.g. /usr/lib64 + local libdir="$(get_libdir)" + if [[ ${libdir} != lib ]]; then + mv "${ED}"/usr/{lib,${libdir}} || die + sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \ + -i "${ED}/usr/${libdir}/pkgconfig/libaxc.pc" || die + fi + + einstalldocs + + if ! use static-libs ; then + rm "${ED}/usr/${libdir}/libaxc.a" || die + fi +} diff --git a/net-libs/libaxc/metadata.xml b/net-libs/libaxc/metadata.xml index 6a22e9e318bb..98894c7cad99 100644 --- a/net-libs/libaxc/metadata.xml +++ b/net-libs/libaxc/metadata.xml @@ -5,4 +5,7 @@ <email>sping@gentoo.org</email> <name>Sebastian Pipping</name> </maintainer> + <upstream> + <remote-id type="github">gkdr/axc</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest deleted file mode 100644 index 01ce4fdf2a1a..000000000000 --- a/net-libs/libbitcoinconsensus/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58 -DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871 -DIST bitcoin-0.21.1.knots20210629.patches.tar.xz 623916 BLAKE2B c6b669270b7f9718c8452a1c28280b6005edee299a3ab8d754dbf722d021576871ddce200342bf157dd5158c058686aa3dde913970779d8c2e560b8df772821c SHA512 ba058554453efc7ad036b8cc945ba403a6bd4e30dae0fbcee7fbe2f0ce90854a867fe49b0522595c081930d406bdf56987982f403fc8299b3c776eea4672abae -DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e -DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f -DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46 diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild deleted file mode 100644 index 7a0ea42117b5..000000000000 --- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -BITCOINCORE_COMMITHASH="bf0dc356ac4a2bdeda1908af021dea2de0dfb35a" -KNOTS_PV="${PV}.knots20200815" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Bitcoin Core consensus library" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz - https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+asm knots" - -DEPEND=" - >dev-libs/libsecp256k1-0.1_pre20170321:=[recovery] -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=sys-devel/autoconf-2.69 - >=sys-devel/automake-1.13 -" - -DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md ) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - elog "You are building ${PN} from Bitcoin Knots." - elog "For more information, see:" - elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - else - elog "You are building ${PN} from Bitcoin Core." - elog "For more information, see:" - elog "https://bitcoincore.org/en/2020/08/01/release-${PV}/" - fi -} - -src_prepare() { - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch" - - if use knots; then - eapply "${knots_patchdir}/${KNOTS_P}.f.patch" - eapply "${knots_patchdir}/${KNOTS_P}.branding.patch" - eapply "${knots_patchdir}/${KNOTS_P}.ts.patch" - fi - - eapply_user - - echo '#!/bin/true' >share/genbuild.sh || die - mkdir -p src/obj || die - echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - $(use_enable asm) - --without-qtdbus - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --with-libs - --disable-util-cli - --disable-util-tx - --disable-util-wallet - --disable-bench - --without-daemon - --without-gui - --disable-fuzz - --disable-ccache - --disable-static - --with-system-libsecp256k1 - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild deleted file mode 100644 index 7f080957ecf4..000000000000 --- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -BITCOINCORE_COMMITHASH="95ea54ba089610019a74c1176a2c7c0dba144b1c" -KNOTS_PV="${PV}.knots20210130" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Bitcoin Core consensus library" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz - https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+asm knots" - -DEPEND=" - >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr] -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=sys-devel/autoconf-2.69 - >=sys-devel/automake-1.13 -" - -DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md ) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - elog "You are building ${PN} from Bitcoin Knots." - elog "For more information, see:" - elog "https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - else - elog "You are building ${PN} from Bitcoin Core." - elog "For more information, see:" - elog "https://bitcoincore.org/en/2021/01/14/release-${PV}/" - fi -} - -src_prepare() { - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch" - - if use knots; then - eapply "${knots_patchdir}/${KNOTS_P}.f.patch" - eapply "${knots_patchdir}/${KNOTS_P}.branding.patch" - eapply "${knots_patchdir}/${KNOTS_P}.ts.patch" - fi - - eapply_user - - echo '#!/bin/true' >share/genbuild.sh || die - mkdir -p src/obj || die - echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - $(use_enable asm) - --without-qtdbus - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --with-libs - --disable-util-cli - --disable-util-tx - --disable-util-wallet - --disable-bench - --without-daemon - --without-gui - --disable-fuzz - --disable-ccache - --disable-static - --with-system-libsecp256k1 - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild deleted file mode 100644 index e88ab219ffae..000000000000 --- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -BITCOINCORE_COMMITHASH="194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf" -KNOTS_PV="${PV}.knots20210629" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Bitcoin Core consensus library" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz - https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+asm knots" - -DEPEND=" - >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr] -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=sys-devel/autoconf-2.69 - >=sys-devel/automake-1.13 -" - -DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md ) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - elog "You are building ${PN} from Bitcoin Knots." - elog "For more information, see:" - elog "https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - else - elog "You are building ${PN} from Bitcoin Core." - elog "For more information, see:" - elog "https://bitcoincore.org/en/2021/05/01/release-${PV}/" - fi - if has_version "<${CATEGORY}/${PN}-0.21.1" ; then - ewarn "CAUTION: BITCOIN PROTOCOL CHANGE INCLUDED" - ewarn "This release adds enforcement of the Taproot protocol change to the Bitcoin" - ewarn "rules, beginning in November. Protocol changes require user consent to be" - ewarn "effective, and if enforced inconsistently within the community may compromise" - ewarn "your security or others! If you do not know what you are doing, learn more" - ewarn "before November. (You must make a decision either way - simply not upgrading" - ewarn "is insecure in all scenarios.)" - ewarn "To learn more, see https://bitcointaproot.cc" - fi -} - -src_prepare() { - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch" - - if use knots; then - eapply "${knots_patchdir}/${KNOTS_P}.f.patch" - eapply "${knots_patchdir}/${KNOTS_P}.branding.patch" - eapply "${knots_patchdir}/${KNOTS_P}.ts.patch" - fi - - eapply_user - - echo '#!/bin/true' >share/genbuild.sh || die - mkdir -p src/obj || die - echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - $(use_enable asm) - --without-qtdbus - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --with-libs - --disable-util-cli - --disable-util-tx - --disable-util-wallet - --disable-bench - --without-daemon - --without-gui - --disable-fuzz - --disable-ccache - --disable-static - --with-system-libsecp256k1 - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-25.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-25.1.ebuild new file mode 100644 index 000000000000..38624555c2e0 --- /dev/null +++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-25.1.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Transitional package for net-p2p/bitcoin-core[libs]" +HOMEPAGE="https://bitcoincore.org/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" +IUSE="+asm" + +RDEPEND="~net-p2p/bitcoin-core-${PV}[libs,asm=]" diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml index 9bfa2e353aff..9eab793a582a 100644 --- a/net-libs/libbitcoinconsensus/metadata.xml +++ b/net-libs/libbitcoinconsensus/metadata.xml @@ -9,10 +9,6 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="asm">Enable assembly for optimization</flag> - <flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag> - </use> <upstream> <remote-id type="github">bitcoin/bitcoin</remote-id> <remote-id type="github">bitcoinknots/bitcoin</remote-id> diff --git a/net-libs/libblkmaker/libblkmaker-0.6.0-r1.ebuild b/net-libs/libblkmaker/libblkmaker-0.6.0-r2.ebuild index 96ad5efcab6b..b5558db1cedf 100644 --- a/net-libs/libblkmaker/libblkmaker-0.6.0-r1.ebuild +++ b/net-libs/libblkmaker/libblkmaker-0.6.0-r2.ebuild @@ -1,30 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools multilib-minimal +inherit autotools DESCRIPTION="C implementation of Bitcoin's getblocktemplate interface" HOMEPAGE="https://github.com/bitcoin/libblkmaker" -LICENSE="MIT" - SRC_URI="https://github.com/bitcoin/${PN}/archive/v${PV}.tar.gz -> ${P}-github.tgz" + +LICENSE="MIT" SLOT="0/7" KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-libs/jansson-2.0.0:=[${MULTILIB_USEDEP}] - dev-libs/libbase58[${MULTILIB_USEDEP}] + >=dev-libs/jansson-2.0.0:= + dev-libs/libbase58 " DEPEND="${RDEPEND} - test? ( dev-libs/libgcrypt[${MULTILIB_USEDEP}] ) + test? ( dev-libs/libgcrypt ) " -ECONF_SOURCE="${S}" - src_prepare() { default eautoreconf diff --git a/net-libs/libbloom/libbloom-1.5-r2.ebuild b/net-libs/libbloom/libbloom-1.5-r2.ebuild index 9be6bd8a03a9..17be8bdca711 100644 --- a/net-libs/libbloom/libbloom-1.5-r2.ebuild +++ b/net-libs/libbloom/libbloom-1.5-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit toolchain-funcs -DESCRIPTION="A simple and small bloom filter implementation in plain C." +DESCRIPTION="A simple and small bloom filter implementation in plain C" HOMEPAGE="https://github.com/jvirkki/libbloom" SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" diff --git a/net-libs/libbloom/libbloom-1.6.ebuild b/net-libs/libbloom/libbloom-1.6.ebuild index 4ba1dfabf23f..a792f191fa46 100644 --- a/net-libs/libbloom/libbloom-1.6.ebuild +++ b/net-libs/libbloom/libbloom-1.6.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit toolchain-funcs -DESCRIPTION="A simple and small bloom filter implementation in plain C." +DESCRIPTION="A simple and small bloom filter implementation in plain C" HOMEPAGE="https://github.com/jvirkki/libbloom" SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest index db5113ea61af..512e1bc72a5e 100644 --- a/net-libs/libbtbb/Manifest +++ b/net-libs/libbtbb/Manifest @@ -1,3 +1 @@ -DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e -DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b SHA512 a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6 diff --git a/net-libs/libbtbb/files/libbtbb-2020.12.1-musl-u-char.patch b/net-libs/libbtbb/files/libbtbb-2020.12.1-musl-u-char.patch new file mode 100644 index 000000000000..7065e000477d --- /dev/null +++ b/net-libs/libbtbb/files/libbtbb-2020.12.1-musl-u-char.patch @@ -0,0 +1,14 @@ +# Fix unknown type name 'u_char' on musl +# Closes: https://bugs.gentoo.org/829245 +# Closes: https://bugs.gentoo.org/715758 +# Upstream PR: https://github.com/greatscottgadgets/libbtbb/pull/64 +--- a/lib/src/pcap.c ++++ b/lib/src/pcap.c +@@ -27,6 +27,7 @@ + #include <stdlib.h> + #include <string.h> + #include <assert.h> ++#include <sys/types.h> + + typedef enum { + PCAP_OK = 0, diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild deleted file mode 100644 index 23524a6f4e36..000000000000 --- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="A library to decode Bluetooth baseband packets" -HOMEPAGE="http://libbtbb.sourceforge.net/" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git" - inherit git-r3 -else - MY_PV=${PV/\./-} - MY_PV=${MY_PV/./-R} - S=${WORKDIR}/${PN}-${MY_PV} - SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="GPL-2" -SLOT="0/${PV}" -IUSE="static-libs wireshark-plugins" - -RDEPEND=" - wireshark-plugins? ( - >=net-analyzer/wireshark-1.8.3-r1:= - ) -" -DEPEND="${RDEPEND} - wireshark-plugins? ( dev-libs/glib - virtual/pkgconfig )" - -get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; } - -which_plugins() { - if has_version '>=net-analyzer/wireshark-2.2.0'; then - plugins="" - elif has_version '>=net-analyzer/wireshark-1.12.0'; then - plugins="btbb btbredr" - elif has_version '<net-analyzer/wireshark-1.12.0'; then - plugins="btbb btle btsm" - fi -} - -src_prepare() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake-utils_src_prepare - - if use wireshark-plugins; then - which_plugins - for i in ${plugins} - do - sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_prepare - done - fi -} - -src_configure() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - local mycmakeargs=( - -DENABLE_PYTHON=OFF - -DBUILD_STATIC_LIB=$(usex static-libs) - -DBUILD_ROOT="${ED}" - ) - cmake-utils_src_configure - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - local mycmakeargs=( - -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" - ) - cmake-utils_src_configure - done - fi -} - -src_compile() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake-utils_src_compile - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_compile - done - fi -} - -src_test() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake-utils_src_test - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_test - done - fi -} - -src_install() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake-utils_src_install - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_install - done - fi -} diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild deleted file mode 100644 index f4a117ca3006..000000000000 --- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="A library to decode Bluetooth baseband packets" -HOMEPAGE="http://libbtbb.sourceforge.net/" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git" - inherit git-r3 -else - MY_PV=${PV/\./-} - MY_PV=${MY_PV/./-R} - S=${WORKDIR}/${PN}-${MY_PV} - SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz" - KEYWORDS="amd64 arm x86" -fi - -LICENSE="GPL-2" -SLOT="0/${PV}" -IUSE="static-libs wireshark-plugins" - -RDEPEND=" - wireshark-plugins? ( - >=net-analyzer/wireshark-1.8.3-r1:= - ) -" -DEPEND="${RDEPEND} - wireshark-plugins? ( dev-libs/glib - virtual/pkgconfig )" - -get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; } - -which_plugins() { - if has_version '>=net-analyzer/wireshark-2.2.0'; then - plugins="" - elif has_version '>=net-analyzer/wireshark-1.12.0'; then - plugins="btbb btbredr" - elif has_version '<net-analyzer/wireshark-1.12.0'; then - plugins="btbb btle btsm" - fi -} - -src_prepare() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake-utils_src_prepare - - if use wireshark-plugins; then - which_plugins - for i in ${plugins} - do - sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_prepare - done - fi -} - -src_configure() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - local mycmakeargs=( - -DENABLE_PYTHON=OFF - -DBUILD_STATIC_LIB=$(usex static-libs) - -DBUILD_ROOT="${ED}" - ) - cmake-utils_src_configure - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - local mycmakeargs=( - -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" - ) - cmake-utils_src_configure - done - fi -} - -src_compile() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake-utils_src_compile - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_compile - done - fi -} - -src_test() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake-utils_src_test - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_test - done - fi -} - -src_install() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake-utils_src_install - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake-utils_src_install - done - fi -} diff --git a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild new file mode 100644 index 000000000000..ccc78dfda1b0 --- /dev/null +++ b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Library to decode Bluetooth baseband packets" +HOMEPAGE="https://github.com/greatscottgadgets/libbtbb" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git" + inherit git-r3 +else + MY_PV=${PV/\./-} + MY_PV=${MY_PV/./-R} + SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz" + S="${WORKDIR}"/${PN}-${MY_PV} + KEYWORDS="amd64 arm x86" +fi + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="static-libs" + +PATCHES=( + "${FILESDIR}"/${PN}-2020.12.1-musl-u-char.patch +) + +src_configure() { + local mycmakeargs=( + -DENABLE_PYTHON=OFF + -DBUILD_STATIC_LIB=$(usex static-libs) + ) + cmake_src_configure +} diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild deleted file mode 100644 index edbf18eed8ff..000000000000 --- a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A library to decode Bluetooth baseband packets" -HOMEPAGE="http://libbtbb.sourceforge.net/" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git" - inherit git-r3 -else - MY_PV=${PV/\./-} - MY_PV=${MY_PV/./-R} - S=${WORKDIR}/${PN}-${MY_PV} - SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="GPL-2" -SLOT="0/${PV}" -IUSE="static-libs wireshark-plugins" - -RDEPEND=" - wireshark-plugins? ( - >=net-analyzer/wireshark-1.8.3-r1:= - ) -" -DEPEND="${RDEPEND} - wireshark-plugins? ( dev-libs/glib - virtual/pkgconfig )" - -get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; } - -which_plugins() { - if has_version '>=net-analyzer/wireshark-2.2.0'; then - plugins="" - elif has_version '>=net-analyzer/wireshark-1.12.0'; then - plugins="btbb btbredr" - elif has_version '<net-analyzer/wireshark-1.12.0'; then - plugins="btbb btle btsm" - fi -} - -src_prepare() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake_src_prepare - - if use wireshark-plugins; then - which_plugins - for i in ${plugins} - do - sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_prepare - done - fi -} - -src_configure() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - local mycmakeargs=( - -DENABLE_PYTHON=OFF - -DBUILD_STATIC_LIB=$(usex static-libs) - -DBUILD_ROOT="${ED}" - ) - cmake_src_configure - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - local mycmakeargs=( - -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" - ) - cmake_src_configure - done - fi -} - -src_compile() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake_src_compile - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_compile - done - fi -} - -src_test() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake_src_test - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_test - done - fi -} - -src_install() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake_src_install - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_install - done - fi -} diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild index edbf18eed8ff..9085d00e99ef 100644 --- a/net-libs/libbtbb/libbtbb-9999.ebuild +++ b/net-libs/libbtbb/libbtbb-9999.ebuild @@ -1,150 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake -DESCRIPTION="A library to decode Bluetooth baseband packets" -HOMEPAGE="http://libbtbb.sourceforge.net/" +DESCRIPTION="Library to decode Bluetooth baseband packets" +HOMEPAGE="https://github.com/greatscottgadgets/libbtbb" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git" inherit git-r3 else MY_PV=${PV/\./-} MY_PV=${MY_PV/./-R} - S=${WORKDIR}/${PN}-${MY_PV} SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz" + S="${WORKDIR}"/${PN}-${MY_PV} KEYWORDS="~amd64 ~arm ~x86" fi LICENSE="GPL-2" SLOT="0/${PV}" -IUSE="static-libs wireshark-plugins" - -RDEPEND=" - wireshark-plugins? ( - >=net-analyzer/wireshark-1.8.3-r1:= - ) -" -DEPEND="${RDEPEND} - wireshark-plugins? ( dev-libs/glib - virtual/pkgconfig )" - -get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; } - -which_plugins() { - if has_version '>=net-analyzer/wireshark-2.2.0'; then - plugins="" - elif has_version '>=net-analyzer/wireshark-1.12.0'; then - plugins="btbb btbredr" - elif has_version '<net-analyzer/wireshark-1.12.0'; then - plugins="btbb btle btsm" - fi -} - -src_prepare() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake_src_prepare - - if use wireshark-plugins; then - which_plugins - for i in ${plugins} - do - sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_prepare - done - fi -} +IUSE="static-libs" src_configure() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build local mycmakeargs=( -DENABLE_PYTHON=OFF -DBUILD_STATIC_LIB=$(usex static-libs) - -DBUILD_ROOT="${ED}" ) cmake_src_configure - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - local mycmakeargs=( - -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" - ) - cmake_src_configure - done - fi -} - -src_compile() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake_src_compile - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_compile - done - fi -} - -src_test() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake_src_test - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_test - done - fi -} - -src_install() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake_src_install - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_install - done - fi } diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml index d7061daf597c..ec9f500bb2e8 100644 --- a/net-libs/libbtbb/metadata.xml +++ b/net-libs/libbtbb/metadata.xml @@ -5,11 +5,7 @@ <email>zerochaos@gentoo.org</email> <name>Rick Farina</name> </maintainer> - <use> - <flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag> - </use> <upstream> <remote-id type="github">greatscottgadgets/libbtbb</remote-id> - <remote-id type="sourceforge">libbtbb</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/libcapi/Manifest b/net-libs/libcapi/Manifest index b8f8736bb282..40e7bb679fc8 100644 --- a/net-libs/libcapi/Manifest +++ b/net-libs/libcapi/Manifest @@ -1 +1 @@ -DIST libcapi20-3.0.7.tar.bz2 474174 BLAKE2B f1d1838882aafa48c76b9843c0c1cb8fb8774bab3a6ae79825c12ed5558f09257d8229266fd1729e77fdda575b30c729613521520acd1dbf636891fcf7d33b18 SHA512 c14e493f34fbd8477aed8efc0e6ee8dc07c6007be75610d59a15ce23f48cd5cd53da1b1ac64c11e7516df5aff40877c76ce7a6d72b5c7b1d24beee7592a51bbe +DIST libcapi-3.2.3.tar.bz2 40037 BLAKE2B 465061d2a61926e9998e4e618efc8f0b27287b4792a88409bf23796886b4062829ce65ec437880bc7f0b52da16df9bb4d21488ca92d63c741f28cdc5bab4aec5 SHA512 1621ba13475526390b5401326cc64679c468c2a7b238494132732c9ca9b8f005db5343890e972df9c11668c7af59beb0d17c7082a39af6f405526622d82f1433 diff --git a/net-libs/libcapi/files/libcapi-3.0.7-remove-libcapi20dyn.patch b/net-libs/libcapi/files/libcapi-3.0.7-remove-libcapi20dyn.patch deleted file mode 100644 index 1e8d9a88afac..000000000000 --- a/net-libs/libcapi/files/libcapi-3.0.7-remove-libcapi20dyn.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 46f308c..df8ea69 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,7 +7,6 @@ MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in - stamp-h.in - include_HEADERS = capi20.h capiutils.h capicmd.h capi_mod.h capi_debug.h - lib_LTLIBRARIES = libcapi20.la --lib_LIBRARIES = libcapi20dyn.a - - libcapi20_la_SOURCES = capi20.c capifunc.c convert.c capi_defs.h compat/byteswap.h - libcapi20_la_LDFLAGS = -version-info ${LIBCAPI_VERSION}:${LIBCAPI_VERSION_RELEASE}:${LIBCAPI_VERSION_AGE} -lc -rdynamic -@@ -35,8 +34,6 @@ lib_capi_mod_rcapi_la_CFLAGS = -fno-strict-aliasing - lib_capi_mod_rcapi_la_LDFLAGS = -shared -version-info @CAPI_MODULE_LOADER_VERSION@:0:0 -no-undefined - lib_capi_mod_rcapi_la_LIBADD = libcapi20.la - --libcapi20dyn_a_SOURCES = capidyn.c --libcapi20dyn_a_CFLAGS = -fPIC - libcapi20_la_LIBADD = $(LIBADD_DL) - - if WIN32 diff --git a/net-libs/libcapi/libcapi-3.0.7-r1.ebuild b/net-libs/libcapi/libcapi-3.0.7-r1.ebuild deleted file mode 100644 index 581f0ffff130..000000000000 --- a/net-libs/libcapi/libcapi-3.0.7-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -DESCRIPTION="CAPI library used by AVM products" -HOMEPAGE="http://www.tabos.org/ffgtk" -SRC_URI="http://www.tabos.org/ffgtk/download/libcapi20-${PV}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -RDEPEND="!net-dialup/capi4k-utils" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/capi20" -PATCHES=( "${FILESDIR}"/${P}-remove-libcapi20dyn.patch ) - -src_prepare() { - default - eautoreconf - - multilib_copy_sources -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf --disable-static -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-libs/libcapi/libcapi-3.2.3.ebuild b/net-libs/libcapi/libcapi-3.2.3.ebuild new file mode 100644 index 000000000000..c2ac730c382f --- /dev/null +++ b/net-libs/libcapi/libcapi-3.2.3.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +EGIT_COMMIT="9e7eb7789fef8ce712aa64f290aacbbececf2dfe" + +inherit meson-multilib + +DESCRIPTION="CAPI library used by various AVM products" +HOMEPAGE="https://gitlab.com/tabos/libcapi/" +SRC_URI="https://gitlab.com/tabos/${PN}/-/archive/v${PV}/${P}.tar.bz2" +S="${WORKDIR}/${PN}-v${PV}-${EGIT_COMMIT}" + +LICENSE="GPL-2 GPL-2+ LGPL-2.1 GPL-3+" +SLOT="0/${PV}" +KEYWORDS="amd64 ppc x86" + +multilib_src_configure() { + meson_src_configure +} diff --git a/net-libs/libcapi/metadata.xml b/net-libs/libcapi/metadata.xml index 010fee091eaf..301df3e2166f 100644 --- a/net-libs/libcapi/metadata.xml +++ b/net-libs/libcapi/metadata.xml @@ -2,7 +2,15 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>np-hardass@gentoo.org</email> - <name>Adam Feldman</name> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> </maintainer> + <longdescription> + This package provides files needed for development of CAPI-aware software + and features autodetection of connected CAPI devices. + </longdescription> + <upstream> + <bugs-to>https://gitlab.com/tabos/libcapi/-/issues</bugs-to> + <remote-id type="gitlab">tabos/libcapi</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libcloudproviders/Manifest b/net-libs/libcloudproviders/Manifest new file mode 100644 index 000000000000..64807ebd7dea --- /dev/null +++ b/net-libs/libcloudproviders/Manifest @@ -0,0 +1 @@ +DIST libcloudproviders-0.3.6.tar.xz 23844 BLAKE2B af5864fa9f4de8842dce80efb53b7b6ff73a679589a49b4edf55c77e0e49114dd5da8dbdc6950574a758483b09168e90e27ded05b0ef501bf9b454341196f7ff SHA512 4ffd9c6202a608128dce2542a29910a87910d46df57dd19e6dfe70e80001b27d2bc5d90a37cb9036ac60a317edc5c1be9d5fd8adb215500c34a07e23064a293f diff --git a/net-libs/libcloudproviders/libcloudproviders-0.3.6.ebuild b/net-libs/libcloudproviders/libcloudproviders-0.3.6.ebuild new file mode 100644 index 000000000000..85942d3c00cc --- /dev/null +++ b/net-libs/libcloudproviders/libcloudproviders-0.3.6.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson-multilib vala + +DESCRIPTION="DBus API that allows cloud storage sync clients to expose their services" +HOMEPAGE="https://gitlab.gnome.org/World/libcloudproviders" + +LICENSE="LGPL-3" +SLOT="0" +IUSE="gtk-doc +introspection vala" +REQUIRED_USE="vala? ( introspection )" + +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +DEPEND=" + >=dev-libs/glib-2.56:2[${MULTILIB_USEDEP}] + introspection? ( dev-libs/gobject-introspection )" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + vala? ( $(vala_depend) ) +" + +src_prepare() { + default + use vala && vala_setup +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool gtk-doc enable-gtk-doc) + -Dinstalled-tests=false + $(meson_native_use_bool introspection) + $(meson_native_use_bool vala vapigen) + ) + meson_src_configure +} + +multilib_src_install() { + meson_src_install +} diff --git a/net-libs/libcloudproviders/metadata.xml b/net-libs/libcloudproviders/metadata.xml new file mode 100644 index 000000000000..3ba4f769bfb2 --- /dev/null +++ b/net-libs/libcloudproviders/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">World/libcloudproviders</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild index d6114f0e9bfb..0d69d8f7b40d 100644 --- a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild +++ b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit cmake-utils +EAPI=8 +inherit cmake DATE=20150311 MY_PV="${PV/.${DATE}_p/+${DATE}-}" @@ -22,19 +22,21 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-debian-${MY_PX}" +PATCHES=( "${S}"/debian/patches/ ) + src_prepare() { - rm -f "${S}"/debian/patches/0001*.patch || die - eapply "${S}"/debian/patches/*.patch + cmake_src_prepare + sed -i -e "/^version=/s/=.*$/=${MY_PX}/" version.sh || die sed -e 's%#include <ipset%#include <libcorkipset%' \ -e 's%#include "ipset%#include "libcorkipset%' \ -i include/ipset/*.h \ */*/*/*.c \ */*/*/*.c.in \ */*/*.c */*.c || die - sed -i -e "s/-Werror/-Wextra/" CMakeLists.txt || die + sed -e "s/-Werror/-Wextra/" \ + -e "/^add_subdirectory(docs)/d" \ + -i CMakeLists.txt || die mv include/{,libcork}ipset || die - - cmake-utils_src_prepare } diff --git a/net-libs/libcrafter/metadata.xml b/net-libs/libcrafter/metadata.xml index 9ca1b88ad3e0..c2c7d39d90bf 100644 --- a/net-libs/libcrafter/metadata.xml +++ b/net-libs/libcrafter/metadata.xml @@ -6,30 +6,30 @@ <name>Gentoo network monitoring and analysis project</name> </maintainer> <longdescription lang="en"> -Libcrafter is a high level library for C++ designed to facilitate the creation -and decoding of network packets. It is able to craft or decode packets of most -common networks protocols, send them on the wire, capture them and match -requests and replies. -It enables the creation of networking tools in a few lines with a interface -very similar to <pkg>net-analyzer/scapy</pkg>. -A packet is described as layers that you stack one upon the other. Fields of -each layer have useful default values that you can overload. + Libcrafter is a high level library for C++ designed to facilitate the creation + and decoding of network packets. It is able to craft or decode packets of most + common networks protocols, send them on the wire, capture them and match + requests and replies. + It enables the creation of networking tools in a few lines with a interface + very similar to <pkg>net-analyzer/scapy</pkg>. + A packet is described as layers that you stack one upon the other. Fields of + each layer have useful default values that you can overload. -The library is designed to be used in multithreaded programs where you can -combine several tasks simultaneously. For example, you can easily design -something that sniffs, mangles, and sends at the same time you are doing an -ARP-Spoofing attack. -It also contains a very naive implementation of the TCP/IP stack (fragmentation -is no handled yet) at user level that enables working with TCP streams. This -facilitates the creation of tools for data injection on arbitrary connections, -IP spoofing and TCP/IP session hijacking. + The library is designed to be used in multithreaded programs where you can + combine several tasks simultaneously. For example, you can easily design + something that sniffs, mangles, and sends at the same time you are doing an + ARP-Spoofing attack. + It also contains a very naive implementation of the TCP/IP stack (fragmentation + is no handled yet) at user level that enables working with TCP streams. This + facilitates the creation of tools for data injection on arbitrary connections, + IP spoofing and TCP/IP session hijacking. -Supported protocols are: + Supported protocols are: -Ethernet, SLL (Linux cooked-mode capture), ARP, DHCP, DHCP options, IP, IP -options, IPv6, ICMP, ICMPv6, ICMP extensions, ICMPv6 extensions, TCP, TCP -options, UDP and DNS -</longdescription> + Ethernet, SLL (Linux cooked-mode capture), ARP, DHCP, DHCP options, IP, IP + options, IPv6, ICMP, ICMPv6, ICMP extensions, ICMPv6 extensions, TCP, TCP + options, UDP and DNS + </longdescription> <upstream> <remote-id type="github">pellegre/libcrafter</remote-id> </upstream> diff --git a/net-libs/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest index 7ce3dc2b1cb0..81d29484598f 100644 --- a/net-libs/libdmapsharing/Manifest +++ b/net-libs/libdmapsharing/Manifest @@ -1 +1 @@ -DIST libdmapsharing-2.9.39.tar.gz 757492 BLAKE2B e9f47d793be05845d1afb6eb4a785cbd131ceac1e3146bdfb5c6914f584df2fb8db10b829447a6ac084e7a9e0576202485019b1e724cc033f11163fb1bb21b95 SHA512 7003b947e1982735b647c1fa8e7e80e05322acf4ed4b5c1c28708da00a0bfe3eecac01bc2ddf59966e7db045f14fc78e749a2859d7e909bcea41164939f15b4a +DIST libdmapsharing-3.9.13.tar.gz 804737 BLAKE2B 44afc87bff5a25e3aefa0a35a8dd92e104749e5aadbde380121fccbb58fc4982ee86ecaa457493b92c8c3cc7fb9c9109f57f406e55ff29da3b112cbaa96e4233 SHA512 6df67c58822f1293828620c6f1548f6a2a52b8ba472346f57e3abf07f9e19206415ba5737d34b89a2ae99af67c6186f99b8ce873333a5494d95ebd7a815fce5b diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.39.ebuild b/net-libs/libdmapsharing/libdmapsharing-3.9.13.ebuild index 6c84ebc4f021..a070bf5cf112 100644 --- a/net-libs/libdmapsharing/libdmapsharing-2.9.39.ebuild +++ b/net-libs/libdmapsharing/libdmapsharing-3.9.13.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit gnome2 DESCRIPTION="A library that implements the DMAP family of protocols" @@ -9,41 +10,36 @@ HOMEPAGE="https://www.flyn.org/projects/libdmapsharing/" SRC_URI="https://www.flyn.org/projects/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" -SLOT="3.0/2" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +SLOT="4.0/3" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="+introspection test" -RESTRICT="!test? ( test )" +RESTRICT="!test? ( test ) test" # TODO: Tests require Avahi mDNS to be running # Vala/libgee/gtk+:2 is only used when maintainer-mode is enabled # Doesn't seem to be used for anything... RDEPEND=" - >=dev-libs/glib-2.36:2 + >=dev-libs/glib-2.66:2 x11-libs/gdk-pixbuf:2 >=net-dns/avahi-0.6[dbus] - >=net-libs/libsoup-2.48.0:2.4 + net-libs/libsoup:3.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.30:= ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/glib-utils - dev-util/gtk-doc-am + dev-build/gtk-doc-am virtual/pkgconfig test? ( >=dev-libs/check-0.9.4 ) " -src_prepare() { - # Remove useless CFLAGS alteration in configure - sed -e 's/CFLAGS -O2/CFLAGS/' \ - -i configure.ac configure || die - gnome2_src_prepare -} - src_configure() { - gnome2_src_configure \ - --with-mdns=avahi \ - $(use_enable introspection) \ - $(use_enable test tests) \ - $(use_enable test check) + local myconf=( + --with-mdns=avahi + $(use_enable introspection) + $(use_enable test tests) + ) + gnome2_src_configure "${myconf[@]}" } diff --git a/net-libs/libdmapsharing/metadata.xml b/net-libs/libdmapsharing/metadata.xml index 7b343b06be8a..83eb1f48d79a 100644 --- a/net-libs/libdmapsharing/metadata.xml +++ b/net-libs/libdmapsharing/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/libdmapsharing</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest index a7fb9819ea48..060cb372dbd8 100644 --- a/net-libs/libdom/Manifest +++ b/net-libs/libdom/Manifest @@ -1 +1 @@ -DIST libdom-0.4.1-src.tar.gz 872954 BLAKE2B 7a6d15fbb4bb7046b8ee9670a14c89f5da2ea0eac10631274d9b47eb0ee1181a85eb62aea326d293c407a006091452fba174dddfbb8cd0297a224850159ff9b1 SHA512 8927b294c98dcb424a454036b20981963ba9982c1aad95b07fc0ca1efc58756b7d85373ed4cde0dcff6281b518a2b5993358494f432d85f7ac7ebd51230a6c22 +DIST libdom-0.4.2-src.tar.gz 878706 BLAKE2B 2a320452b50c3da719ef76683e133582bb0f657ceb8552a252204bbab89d85076af596cd615770dd357aaa9dbec31fabf39b2946019d004352b2273585134914 SHA512 85ce95a545c48af2cc082896d8153f016f7452315c67390884181cde19c999c7122c913846d404e40957d07abedc22c5ef8342d69eee139309e7c221d0580bb6 diff --git a/net-libs/libdom/files/libdom-0.4.2-musl.patch b/net-libs/libdom/files/libdom-0.4.2-musl.patch new file mode 100644 index 000000000000..61a84d3293b4 --- /dev/null +++ b/net-libs/libdom/files/libdom-0.4.2-musl.patch @@ -0,0 +1,29 @@ +From 15898de03539ad2376cca591c39c60134a7d4a12 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 3 Feb 2024 08:05:34 -0500 +Subject: [PATCH 1/1] bindings/xml/libxml_xmlparser.c: add stdlib.h include + +This file uses malloc() but does not include stdlib.h directly. With +glibc, that apparently works out just fine... but with musl, it leads +to implicit declaration warnings/errors, most likely because musl does +not include stdlib.h transitively via any of the other headers used by +this file. +--- + bindings/xml/libxml_xmlparser.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/bindings/xml/libxml_xmlparser.c b/bindings/xml/libxml_xmlparser.c +index e4a6d80..28aadf1 100644 +--- a/bindings/xml/libxml_xmlparser.c ++++ b/bindings/xml/libxml_xmlparser.c +@@ -6,6 +6,7 @@ + */ + + #include <stdbool.h> ++#include <stdlib.h> + #include <string.h> + #include <assert.h> + +-- +2.43.0 + diff --git a/net-libs/libdom/libdom-0.4.1-r1.ebuild b/net-libs/libdom/libdom-0.4.2.ebuild index 7cc2bb687a41..8ebbecdf46ff 100644 --- a/net-libs/libdom/libdom-0.4.1-r1.ebuild +++ b/net-libs/libdom/libdom-0.4.2.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit netsurf DESCRIPTION="implementation of the W3C DOM, written in C" -HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" +HOMEPAGE="https://www.netsurf-browser.org/projects/libdom/" SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="expat test xml" RESTRICT="!test? ( test )" @@ -21,8 +21,8 @@ RDEPEND=" dev-libs/libwapcaplet net-libs/libhubbub xml? ( - expat? ( >=dev-libs/expat-2.1.0-r3 ) - !expat? ( >=dev-libs/libxml2-2.9.1-r4 ) + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2 ) )" DEPEND="${RDEPEND} test? ( @@ -31,11 +31,13 @@ DEPEND="${RDEPEND} dev-perl/Switch )" BDEPEND=" - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem virtual/pkgconfig" REQUIRED_USE="test? ( xml )" +PATCHES=( "${FILESDIR}/libdom-0.4.2-musl.patch" ) + _emake() { netsurf_define_makeconf emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \ diff --git a/net-libs/libdom/libdom-9999.ebuild b/net-libs/libdom/libdom-9999.ebuild new file mode 100644 index 000000000000..6c4a93a0726b --- /dev/null +++ b/net-libs/libdom/libdom-9999.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit git-r3 netsurf + +DESCRIPTION="implementation of the W3C DOM, written in C" +HOMEPAGE="https://www.netsurf-browser.org/projects/libdom/" + +EGIT_REPO_URI="https://git.netsurf-browser.org/${PN}.git" +LICENSE="MIT" +SLOT="0/${PV}" +IUSE="expat test xml" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libparserutils + dev-libs/libwapcaplet + net-libs/libhubbub + xml? ( + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2 ) + )" +DEPEND="${RDEPEND} + test? ( + dev-perl/XML-XPath + dev-perl/libxml-perl + dev-perl/Switch + )" +BDEPEND=" + dev-build/netsurf-buildsystem + virtual/pkgconfig" + +REQUIRED_USE="test? ( xml )" + +_emake() { + netsurf_define_makeconf + emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \ + WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \ + WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no) \ + $@ +} + +src_compile() { + _emake +} + +src_test() { + _emake test +} + +src_install() { + _emake DESTDIR="${D}" install +} diff --git a/net-libs/libdom/metadata.xml b/net-libs/libdom/metadata.xml index 115e9d64a669..f2908ee10b59 100644 --- a/net-libs/libdom/metadata.xml +++ b/net-libs/libdom/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>mjo@gentoo.org</email> + <name>Michael Orlitzky</name> + </maintainer> </pkgmetadata> diff --git a/net-libs/libecap/libecap-1.0.1.ebuild b/net-libs/libecap/libecap-1.0.1.ebuild index bca73f55ae0e..a7c1ad4fa875 100644 --- a/net-libs/libecap/libecap-1.0.1.ebuild +++ b/net-libs/libecap/libecap-1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://www.e-cap.org/archive/${P}.tar.gz" LICENSE="BSD-2" SLOT="1" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" RDEPEND="!net-libs/libecap:0 !net-libs/libecap:0.2" diff --git a/net-libs/libesmtp/files/libesmtp-1.1.0-fix-build-with-clang16.patch b/net-libs/libesmtp/files/libesmtp-1.1.0-fix-build-with-clang16.patch new file mode 100644 index 000000000000..3211737e7be9 --- /dev/null +++ b/net-libs/libesmtp/files/libesmtp-1.1.0-fix-build-with-clang16.patch @@ -0,0 +1,21 @@ +Bug: https://bugs.gentoo.org/896056 +--- a/smtp-api.c ++++ b/smtp-api.c +@@ -22,6 +22,7 @@ + + #include <config.h> + ++#define _GNU_SOURCE + #include <stdarg.h> + #include <string.h> + #include <stdlib.h> +--- a/smtp-tls.c ++++ b/smtp-tls.c +@@ -47,6 +47,7 @@ + + /* This stuff doesn't belong here */ + /* vvvvvvvvvvv */ ++#define _GNU_SOURCE + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> diff --git a/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild index 1cbf381e2640..40987bc688d8 100644 --- a/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild +++ b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ else SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/libESMTP-${PV}" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2.1 GPL-2" diff --git a/net-libs/libesmtp/libesmtp-9999.ebuild b/net-libs/libesmtp/libesmtp-1.1.0-r2.ebuild index c117af101c94..35783f626e67 100644 --- a/net-libs/libesmtp/libesmtp-9999.ebuild +++ b/net-libs/libesmtp/libesmtp-1.1.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson @@ -14,11 +14,16 @@ else SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/libESMTP-${PV}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/7" +LICENSE="LGPL-2.1+ GPL-2+" +# 0/7 was a snapshot before 1.1.0 +# The SONAME was fixed just before the 1.1.0 release was made +# ... but a patch was needed to get it exactly right too +# so, we're on 0/8 now, even though ABI compatibility actually remained +# in terms of symbols with the original <1.1.0. +SLOT="0/8" IUSE="ssl static-libs threads" RDEPEND="ssl? ( >=dev-libs/openssl-1.1.0:0= )" @@ -26,6 +31,11 @@ DEPEND="${RDEPEND}" DOCS=( docs/{authors,bugreport,ChangeLog,faq,NEWS}.md README.md ) +PATCHES=( + "${FILESDIR}"/${P}-fix-soname.patch + "${FILESDIR}"/${P}-fix-build-with-clang16.patch +) + src_configure() { local emesonargs=( -Ddefault_library="$(usex static-libs both shared)" diff --git a/net-libs/libetpan/files/libetpan-1.9.4-CVE-2022-4121.patch b/net-libs/libetpan/files/libetpan-1.9.4-CVE-2022-4121.patch new file mode 100644 index 000000000000..2d97ac8e972e --- /dev/null +++ b/net-libs/libetpan/files/libetpan-1.9.4-CVE-2022-4121.patch @@ -0,0 +1,29 @@ +From 5c9eb6b6ba64c4eb927d7a902317410181aacbba Mon Sep 17 00:00:00 2001 +From: Hoa Dinh <hoa@dinhvh.me> +Date: Mon, 19 Dec 2022 08:16:32 -0800 +Subject: [PATCH] Fixed crash when st_info_list is NULL. Fixes #420. Fixes + CVE-2022-4121. + +--- + src/low-level/imap/mailimap_types.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/low-level/imap/mailimap_types.c b/src/low-level/imap/mailimap_types.c +index 9923125c..79a0cc23 100644 +--- a/src/low-level/imap/mailimap_types.c ++++ b/src/low-level/imap/mailimap_types.c +@@ -1389,9 +1389,11 @@ void + mailimap_mailbox_data_status_free(struct mailimap_mailbox_data_status * info) + { + mailimap_mailbox_free(info->st_mailbox); +- clist_foreach(info->st_info_list, (clist_func) mailimap_status_info_free, +- NULL); +- clist_free(info->st_info_list); ++ if (info->st_info_list != NULL) { ++ clist_foreach(info->st_info_list, (clist_func) mailimap_status_info_free, ++ NULL); ++ clist_free(info->st_info_list); ++ } + free(info); + } + diff --git a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild b/net-libs/libetpan/libetpan-1.9.4-r2.ebuild index 73e3f2ae838d..57d291f1fa06 100644 --- a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild +++ b/net-libs/libetpan/libetpan-1.9.4-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="A portable, efficient middleware for different kinds of mail access" -HOMEPAGE="http://libetpan.sourceforge.net/" +HOMEPAGE="https://libetpan.sourceforge.net/" SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.9.4-berkdb_lookup.patch #519846 "${FILESDIR}"/${PN}-1.9.4-pkgconfig_file_no_ldflags.patch "${FILESDIR}"/${P}-CVE-2020-15953.patch #734130 + "${FILESDIR}"/${P}-CVE-2022-4121.patch #891263 ) pkg_pretend() { diff --git a/net-libs/libetpan/metadata.xml b/net-libs/libetpan/metadata.xml index fdfd55893142..3bb8281ff4b6 100644 --- a/net-libs/libetpan/metadata.xml +++ b/net-libs/libetpan/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> </maintainer> <longdescription lang="en"> libEtPan ! is a mail purpose library. It will be used for low-level mail diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild index 7f3392a75a41..b04edf0fbaea 100644 --- a/net-libs/libgadu/libgadu-1.11.4.ebuild +++ b/net-libs/libgadu/libgadu-1.11.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ COMMON_DEPEND=" ssl? ( net-libs/gnutls:= ) " DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " RDEPEND="${COMMON_DEPEND}" diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild index 795093415aee..7a7597d44c42 100644 --- a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild +++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,13 +11,13 @@ SRC_URI="https://github.com/wojtekka/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc ssl test threads" RESTRICT="!test? ( test )" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) test? ( dev-libs/expat dev-libs/libxml2:2 diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest deleted file mode 100644 index d1d22499dfad..000000000000 --- a/net-libs/libgfbgraph/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gfbgraph-0.2.4.tar.xz 39520 BLAKE2B 71ce5a091b5ab7d27b7b5353ff76cb67c90a358371f1afe41a561bab195c7e01353854fbd28c3970c3179ded24daf41f7150f70b5efcb1c81aac89de9fed2c88 SHA512 e6d63e56f4d67b59b0abbfb9dfe3aad8b142023413246015a84078c76f631eaa6e9fa7eb5771f64156ea01e160eb07b17783059e449036b372b4bcb26751ff68 -DIST gfbgraph-0.2.5.tar.xz 283632 BLAKE2B 7a229e098623613c3c758dd7d9d4802cf82a6b8c7f6c81ad8de2392597d13b6db9978ef1794321aa6915f9065dca030e58ef1569d64f956a7048846e996cea23 SHA512 c3a1168935272377c211d95e4efcb8ed56d129589bcaa6e0d7b5dff7ca916f0c63dc30eb1a903aea3de51cb109ae787e985bdd9485fb97cd1b5b6971bea01a1e diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild deleted file mode 100644 index f3649d47e702..000000000000 --- a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME_ORG_MODULE="gfbgraph" -GNOME2_EAUTORECONF="yes" - -inherit gnome2 - -DESCRIPTION="A GObject library for Facebook Graph API" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph/" - -LICENSE="LGPL-2.1+" -SLOT="0.2" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" -IUSE="+introspection" - -DEPEND=" - dev-libs/glib:2 - dev-libs/json-glib[introspection?] - net-libs/libsoup:2.4[introspection?] - net-libs/gnome-online-accounts - net-libs/rest:0.7[introspection?] - introspection? ( >=dev-libs/gobject-introspection-1.30:= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-util/gtk-doc - >=dev-util/gtk-doc-am-1.14 - virtual/pkgconfig -" -# gtk-doc needed for autoreconf - -src_prepare() { - # Test requires a credentials.ini file. - # https://gitlab.gnome.org/GNOME/libgfbgraph/-/issues/7#note_802926 - sed -i -e 's:TESTS = gtestutils:TESTS =:' tests/Makefile.am || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - $(use_enable introspection) -} - -src_install() { - gnome2_src_install - # Remove files installed in the wrong place - # Also, already done by portage - # https://bugzilla.gnome.org/show_bug.cgi?id=752581 - rm -rf "${ED}"/usr/doc -} diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild deleted file mode 100644 index adc704afe62d..000000000000 --- a/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME_ORG_MODULE="gfbgraph" -GNOME2_EAUTORECONF="yes" - -inherit gnome2 - -DESCRIPTION="A GObject library for Facebook Graph API" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph/" - -LICENSE="LGPL-2.1+" -SLOT="0.2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+introspection" - -DEPEND=" - dev-libs/glib:2 - dev-libs/json-glib[introspection?] - net-libs/libsoup:2.4[introspection?] - net-libs/gnome-online-accounts - net-libs/rest:0.7[introspection?] - introspection? ( >=dev-libs/gobject-introspection-1.30:= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-util/gtk-doc - >=dev-util/gtk-doc-am-1.14 - virtual/pkgconfig -" -# gtk-doc needed for autoreconf - -src_prepare() { - # Test requires a credentials.ini file. - # https://gitlab.gnome.org/GNOME/libgfbgraph/-/issues/7#note_802926 - sed -i -e 's:TESTS = gtestutils:TESTS =:' tests/Makefile.am || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - $(use_enable introspection) -} - -src_install() { - gnome2_src_install - # Remove files installed in the wrong place - # https://gitlab.gnome.org/GNOME/libgfbgraph/-/issues/10 - rm -rf "${ED}"/usr/doc -} diff --git a/net-libs/libgfbgraph/metadata.xml b/net-libs/libgfbgraph/metadata.xml deleted file mode 100644 index 7b343b06be8a..000000000000 --- a/net-libs/libgfbgraph/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/net-libs/libgrss/libgrss-0.7.0.ebuild b/net-libs/libgrss/libgrss-0.7.0-r1.ebuild index 8fbea214a3dd..2720d499d99a 100644 --- a/net-libs/libgrss/libgrss-0.7.0.ebuild +++ b/net-libs/libgrss/libgrss-0.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,11 +16,15 @@ IUSE="+introspection" RDEPEND=" >=dev-libs/glib-2.42.1:2 >=dev-libs/libxml2-2.9.2:2 - >=net-libs/libsoup-2.48:2.4 + >=net-libs/libsoup-2.48:2.4[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42 ) " DEPEND="${RDEPEND}" BDEPEND=" - >=dev-util/gtk-doc-am-1.10 + >=dev-build/gtk-doc-am-1.10 virtual/pkgconfig " + +src_configure() { + gnome2_src_configure $(use_enable introspection) +} diff --git a/net-libs/libgrss/metadata.xml b/net-libs/libgrss/metadata.xml index 46a073fc40d3..e6787ed6b249 100644 --- a/net-libs/libgrss/metadata.xml +++ b/net-libs/libgrss/metadata.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<upstream> - <bugs-to>https://bugs.gnome.org</bugs-to> - <changelog>https://git.gnome.org/browse/libgrss</changelog> - </upstream> -<maintainer type="project"> + <maintainer type="project"> <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/libgrss</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libgsasl/libgsasl-1.10.0.ebuild b/net-libs/libgsasl/libgsasl-1.10.0.ebuild index c397cf421f6f..957217656098 100644 --- a/net-libs/libgsasl/libgsasl-1.10.0.ebuild +++ b/net-libs/libgsasl/libgsasl-1.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ LICENSE="GPL-3 LGPL-3" SLOT="0" # Before giving keywords, please check https://www.gnu.org/software/gsasl/ to see # if it's a stable release or not! -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="idn gcrypt kerberos nls ntlm static-libs" DEPEND=" diff --git a/net-libs/libgsasl/metadata.xml b/net-libs/libgsasl/metadata.xml index 393099923ac8..61f36c9df892 100644 --- a/net-libs/libgsasl/metadata.xml +++ b/net-libs/libgsasl/metadata.xml @@ -2,8 +2,11 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> -<use> - <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto</flag> - <flag name="ntlm">Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg></flag> -</use> + <use> + <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto</flag> + <flag name="ntlm">Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg></flag> + </use> + <upstream> + <remote-id type="gitlab">gsasl/gsasl</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest index a6040be5b895..4cc0874ee420 100644 --- a/net-libs/libgssglue/Manifest +++ b/net-libs/libgssglue/Manifest @@ -1 +1,3 @@ DIST libgssglue-0.4.tar.gz 346984 BLAKE2B 5815db41ff3f65b014e713b68667bb49d3aecab943e891de881af2a2d157cceddc5173e7eff9ed2eac714b2e1341429694f1051ad98a3c4b728a61eaceeaddfb SHA512 25d514c08320e42851ff153d7691267a8454f205492faf942f566aa30c1ac1c83bd095732a1a0fcc010ba3a5d48b4c95a196ad05bc821598cc1fc3a2c4960d29 +DIST libgssglue-libgssglue-0.7.tar.bz2 31415 BLAKE2B 4017ff17b876b00d93d5120ca8fe2a1f472b61c7b73dec0194d0ebaa244176b5d6f85fbfe5ce52cd77bcce9e1718f979b36e8926577640bbad38208fcea78f5a SHA512 04ea9af9f56afeca40b1dd22708dfa2e844d587106f370820a8976a22e8b95c646cdc5c5ef4256e34780cdb34c5617c45187fe3866670662f15ac579ef22dcca +DIST libgssglue-libgssglue-0.8.tar.bz2 34586 BLAKE2B 4dcd39f53904c2d5e559b15329bd6c1b8931dda426ef156d65e21d68cce85bc12d20338254a0d9fffb6acc7cec074a56e355f4bc95c065e4dafe787d4b8c077b SHA512 7866875d7394fd8c6eeb9621a88ab0393c0d30606c407fa5d5b25a30579642d37bdafb81b748bb84cf026f47716e4c4f68da6e6eb2d5afeedfb37270f1749aa1 diff --git a/net-libs/libgssglue/files/libgssglue-0.3-protos.patch b/net-libs/libgssglue/files/libgssglue-0.3-protos.patch index 5aaf6d03aaac..8c15108d32e7 100644 --- a/net-libs/libgssglue/files/libgssglue-0.3-protos.patch +++ b/net-libs/libgssglue/files/libgssglue-0.3-protos.patch @@ -1,3 +1,5 @@ +https://gitlab.com/gsasl/libgssglue/-/merge_requests/1 + add missing prototype to header --- a/src/mglueP.h diff --git a/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch b/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch index 4a6d8a41a7e7..92a96305b406 100644 --- a/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch +++ b/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch @@ -1,3 +1,5 @@ +https://gitlab.com/gsasl/libgssglue/-/merge_requests/1 + * g_initialize.c:275:5: warning: implicit declaration of function 'getuid' [-Wimplicit-function-declaration] * g_initialize.c:275:5: warning: implicit declaration of function 'geteuid' [-Wimplicit-function-declaration] diff --git a/net-libs/libgssglue/libgssglue-0.7.ebuild b/net-libs/libgssglue/libgssglue-0.7.ebuild new file mode 100644 index 000000000000..d254154b3e92 --- /dev/null +++ b/net-libs/libgssglue/libgssglue-0.7.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools readme.gentoo-r1 + +DESCRIPTION="Exports a gssapi interface which calls other random gssapi libraries" +HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux https://gitlab.com/gsasl/libgssglue" +SRC_URI="https://gitlab.com/gsasl/libgssglue/-/archive/${P}/${PN}-${P}.tar.bz2" +S="${WORKDIR}"/${PN}-${P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" + +RDEPEND="virtual/krb5" + +DOC_CONTENTS=" +This package allows choosing a Kerberos or GSSAPI implementation +at runtime. + +See +https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/ +for more details. + +A system-wide implementation can be chosen by editing ${EROOT}/etc/gssapi_mech.conf, +or it can be set per-process via the GSSAPI_MECH_CONF environment variable. +" + +src_prepare() { + default + + eautoreconf +} + +src_install() { + default + + readme.gentoo_create_doc + + insinto /etc + doins doc/gssapi_mech.conf + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-libs/libgssglue/libgssglue-0.8.ebuild b/net-libs/libgssglue/libgssglue-0.8.ebuild new file mode 100644 index 000000000000..0cea0d079823 --- /dev/null +++ b/net-libs/libgssglue/libgssglue-0.8.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools readme.gentoo-r1 + +DESCRIPTION="Exports a gssapi interface which calls other random gssapi libraries" +HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux https://gitlab.com/gsasl/libgssglue" +SRC_URI="https://gitlab.com/gsasl/libgssglue/-/archive/${P}/${PN}-${P}.tar.bz2" +S="${WORKDIR}"/${PN}-${P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND="virtual/krb5" + +DOC_CONTENTS=" +This package allows choosing a Kerberos or GSSAPI implementation +at runtime. + +See +https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/ +for more details. + +A system-wide implementation can be chosen by editing ${EPREFIX}/etc/gssapi_mech.conf, +or it can be set per-process via the GSSAPI_MECH_CONF environment variable. +" + +src_prepare() { + default + + eautoreconf +} + +src_install() { + default + + readme.gentoo_create_doc + + insinto /etc + doins doc/gssapi_mech.conf + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-libs/libgssglue/metadata.xml b/net-libs/libgssglue/metadata.xml index 85e4ed814fa2..75de0e93ec82 100644 --- a/net-libs/libgssglue/metadata.xml +++ b/net-libs/libgssglue/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="gitlab">gsasl/libgssglue</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest index d7597c7d3297..872055496e53 100644 --- a/net-libs/libhackrf/Manifest +++ b/net-libs/libhackrf/Manifest @@ -1 +1,2 @@ -DIST hackrf-2021.03.1.tar.xz 13661964 BLAKE2B 0a00b2d24cc6ac7ca36f66e8f5b3029cfd446a6c5b5427f7d25db6dd191693c1e1c010abd85907813d55c6bd367780c70860b4f7e7f83fb9970d425311893780 SHA512 4a88b877a9f6fee0c8d9496eb265655af4baa678e862ca6147596cd3a1d85dd50315da6531efa54d050847ce5068c4726393b4897d40576888d10a898ad57139 +DIST hackrf-2023.01.1.tar.xz 23030956 BLAKE2B f0ea4f92208d1db5b4e1c11231e4420db757c08e28e7a80d79e70b02d868689ddf516bc6f003fc208f60c221c9153412a12fe3cbdf8f58001c1f7cdd26383ac0 SHA512 7c2ef9c5c050e258a0d1695240f9163955cb3ea9ab9163aad6bdbdebfdb82cde9925818ced3323342fe9c4ddb80dcedbc5a7986caaa4e0b7036e8e07bec0296e +DIST hackrf-2024.02.1.tar.xz 21734672 BLAKE2B 493a886719aa90e1b52229beaec45cb9db315dc91d001c275dd3989cde56fe6a312d4fca1c27b4c1366a4653880e74ab3d1e4363ee392d0f93deb631b7fddac4 SHA512 d057574f1e9b1bc2cebcd06773054b7fcba55d44e4c028f4f95e67874b71bd0a83906795a391e283c15d2b21ad7f3e8337be5aa0ee2f6a3c57632a70da10e2e4 diff --git a/net-libs/libhackrf/files/hackrf-disable-static-2022.09.1.patch b/net-libs/libhackrf/files/hackrf-disable-static-2022.09.1.patch new file mode 100644 index 000000000000..f7e9fa39cc5e --- /dev/null +++ b/net-libs/libhackrf/files/hackrf-disable-static-2022.09.1.patch @@ -0,0 +1,30 @@ +diff -Naur libhackrf-orig/src/CMakeLists.txt libhackrf/src/CMakeLists.txt +--- libhackrf-orig/src/CMakeLists.txt 2022-09-29 09:47:10.899630179 -0400 ++++ libhackrf/src/CMakeLists.txt 2022-09-29 09:47:30.835629516 -0400 +@@ -31,15 +31,11 @@ + set_target_properties(hackrf PROPERTIES VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.0 SOVERSION 0) + + # Static library +-add_library(hackrf-static STATIC ${c_sources}) + if(MSVC) + set_target_properties(hackrf-static PROPERTIES OUTPUT_NAME "hackrf_static") +-else() +- set_target_properties(hackrf-static PROPERTIES OUTPUT_NAME "hackrf") + endif() + + set_target_properties(hackrf PROPERTIES CLEAN_DIRECT_OUTPUT 1) +-set_target_properties(hackrf-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) + + # Dependencies + target_link_libraries(hackrf ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +@@ -55,10 +51,6 @@ + LIBRARY DESTINATION lib${LIB_SUFFIX} + COMPONENT sharedlibs + ) +- install(TARGETS hackrf-static +- ARCHIVE DESTINATION lib${LIB_SUFFIX} +- COMPONENT staticlibs +- ) + install(FILES ${c_headers} + DESTINATION include/${PROJECT_NAME} + COMPONENT headers diff --git a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild b/net-libs/libhackrf/libhackrf-2023.01.1.ebuild index 94e14cca15c5..3ddc3f0ba4d2 100644 --- a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild +++ b/net-libs/libhackrf/libhackrf-2023.01.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake udev @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then else S="${WORKDIR}/hackrf-${PV}/host/libhackrf" SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz" - KEYWORDS="amd64 ~arm ~ppc x86" + KEYWORDS="amd64 arm ppc ~riscv x86" fi LICENSE="BSD" @@ -26,6 +26,9 @@ IUSE="+udev" DEPEND="virtual/libusb:1" RDEPEND="${DEPEND}" +# https://github.com/greatscottgadgets/hackrf/issues/1193 +PATCHES=( "${FILESDIR}/hackrf-disable-static-2022.09.1.patch" ) + src_configure() { local mycmakeargs=( -DINSTALL_UDEV_RULES="$(usex udev)" @@ -39,6 +42,17 @@ src_configure() { cmake_src_configure } +src_compile() { + cmake_build hackrf +} + pkg_postinst() { - use udev && einfo "Users in the usb group can use hackrf." + if use udev; then + einfo "Users in the usb group can use hackrf." + udev_reload + fi +} + +pkg_postrm() { + udev_reload } diff --git a/net-libs/libhackrf/libhackrf-2024.02.1.ebuild b/net-libs/libhackrf/libhackrf-2024.02.1.ebuild new file mode 100644 index 000000000000..0f11732ed8a3 --- /dev/null +++ b/net-libs/libhackrf/libhackrf-2024.02.1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake udev + +DESCRIPTION="library for communicating with HackRF SDR platform" +HOMEPAGE="http://greatscottgadgets.com/hackrf/" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/greatscottgadgets/hackrf.git" + inherit git-r3 + EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf" + S="${WORKDIR}/hackrf/host/libhackrf" +else + S="${WORKDIR}/hackrf-${PV}/host/libhackrf" + SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz" + KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86" +fi + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="+udev" + +DEPEND="virtual/libusb:1" +RDEPEND="${DEPEND}" + +# https://github.com/greatscottgadgets/hackrf/issues/1193 +PATCHES=( "${FILESDIR}/hackrf-disable-static-2022.09.1.patch" ) + +src_configure() { + local mycmakeargs=( + -DINSTALL_UDEV_RULES="$(usex udev)" + ) + if use udev; then + mycmakeargs+=( + -DUDEV_RULES_GROUP=usb + -DUDEV_RULES_PATH="$(get_udevdir)/rules.d" + ) + fi + cmake_src_configure +} + +src_compile() { + cmake_build hackrf +} + +pkg_postinst() { + if use udev; then + einfo "Users in the usb group can use hackrf." + udev_reload + fi +} + +pkg_postrm() { + udev_reload +} diff --git a/net-libs/libhackrf/libhackrf-9999.ebuild b/net-libs/libhackrf/libhackrf-9999.ebuild index aacd79049ae5..34034a799963 100644 --- a/net-libs/libhackrf/libhackrf-9999.ebuild +++ b/net-libs/libhackrf/libhackrf-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake udev @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then else S="${WORKDIR}/hackrf-${PV}/host/libhackrf" SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" + KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86" fi LICENSE="BSD" @@ -26,6 +26,9 @@ IUSE="+udev" DEPEND="virtual/libusb:1" RDEPEND="${DEPEND}" +# https://github.com/greatscottgadgets/hackrf/issues/1193 +PATCHES=( "${FILESDIR}/hackrf-disable-static-2022.09.1.patch" ) + src_configure() { local mycmakeargs=( -DINSTALL_UDEV_RULES="$(usex udev)" @@ -39,6 +42,17 @@ src_configure() { cmake_src_configure } +src_compile() { + cmake_build hackrf +} + pkg_postinst() { - use udev && einfo "Users in the usb group can use hackrf." + if use udev; then + einfo "Users in the usb group can use hackrf." + udev_reload + fi +} + +pkg_postrm() { + udev_reload } diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest index 2748b0f23833..0cc887f16581 100644 --- a/net-libs/libhtp/Manifest +++ b/net-libs/libhtp/Manifest @@ -1 +1 @@ -DIST libhtp-0.5.39.tar.gz 499233 BLAKE2B fec9e2b0dd867becde972e9e2bf572a21d90acc747a8ee8338e2fe68240d690706db01b12c3cf8c6bf1b5d4415da4e4a5bf92a056e1dff96f54a9ac569906712 SHA512 2c62b0a9a2f69f999a58acade362e5fcd9d85da5c720a403b0b6e7352981a206781f123aaa2f730803f2ea6088b4491d58b3c2783f8b32e4cfe1517d812e66ff +DIST libhtp-0.5.48.tar.gz 503546 BLAKE2B 56eeef3524ffeac593c251846196d09e0ccfacd9aadd03b35061fd1fe6a245d1374c338581b4f7bee67255797740f4e282344fc10bf3d0c0fdf824f159380053 SHA512 1270d560bcb03493afebbb9198cef669d03d347f4878635119ee845dc734cec28789ea4385ca5903b2545e250152d0278ea077641702ae0973005593f241776b diff --git a/net-libs/libhtp/files/libhtp-0.5.48-configure_fortify_source.patch b/net-libs/libhtp/files/libhtp-0.5.48-configure_fortify_source.patch new file mode 100644 index 000000000000..7287e01ec81f --- /dev/null +++ b/net-libs/libhtp/files/libhtp-0.5.48-configure_fortify_source.patch @@ -0,0 +1,21 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -204,18 +204,6 @@ + fi + + dnl ----------------------------------------------- +-dnl Check for GCC -D_FORTIFY_SOURCE support +-dnl ----------------------------------------------- +-AC_MSG_CHECKING(for gcc support of FORTIFY_SOURCE) +-TMPCFLAGS="${CFLAGS}" +-CFLAGS="${CFLAGS} -D_FORTIFY_SOURCE=2" +-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[gcc_have_fortify_source=yes],[gcc_have_fortify_source=no]) +-AC_MSG_RESULT($gcc_have_fortify_source) +-if test "$gcc_have_fortify_source" != "yes"; then +- CFLAGS="${TMPCFLAGS}" +-fi +- +-dnl ----------------------------------------------- + dnl Check for GCC -Wformat-security support + dnl ----------------------------------------------- + AC_MSG_CHECKING(for gcc support of -Wformat -Wformat-security) diff --git a/net-libs/libhtp/libhtp-0.5.39.ebuild b/net-libs/libhtp/libhtp-0.5.48.ebuild index 4e39f91bf8c4..2bef77203967 100644 --- a/net-libs/libhtp/libhtp-0.5.39.ebuild +++ b/net-libs/libhtp/libhtp-0.5.48.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools multilib-minimal +inherit autotools -DESCRIPTION="security-aware parser for the HTTP protocol and the related bits and pieces" +DESCRIPTION="Security-aware parser for the HTTP protocol and the related bits and pieces" HOMEPAGE="https://github.com/OISF/libhtp" SRC_URI="https://github.com/OISF/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -17,19 +17,25 @@ IUSE="debug" RDEPEND="sys-libs/zlib" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-0.5.48-configure_fortify_source.patch +) + +# false positive -- function specific to dev-libs/libiconv, which is only used +# in Windows-based Prefix installations +QA_CONFIG_IMPL_DECL_SKIP=( iconvctl ) + src_prepare() { default eautoreconf } -multilib_src_configure() { +src_configure() { # The debug configure logic is broken. - ECONF_SOURCE=${S} \ - econf \ - $(usex debug '--enable-debug' '') \ - --disable-static + econf $(usev debug '--enable-debug') } -multilib_src_install_all() { +src_install() { + default find "${ED}" -name '*.la' -delete || die "Failed to remove .la files" } diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest index 5f3fae2b4fd5..d1e847f66388 100644 --- a/net-libs/libhubbub/Manifest +++ b/net-libs/libhubbub/Manifest @@ -1 +1 @@ -DIST libhubbub-0.3.7-src.tar.gz 784780 BLAKE2B dd7bd85d3401d87c7bc72dad5d6d0439ab826cf97e76a29367a045215621cb66ff6e97f4028f552b7f395691087f53df077075dc65115a41a59eca476f73305d SHA512 d8ae4a8c4ded2c0e73902bfcf4d5d353154e27f236be0f6ea878cc2daed8a399378a4a9c2021f96106e1c822585b1daa09c9bd49c1551d3e87f37348865cfce1 +DIST libhubbub-0.3.8-src.tar.gz 780549 BLAKE2B f3db98971246b08452df0383d960f528e4c0a0def4318bd074fbdb02a045691c6476a55b3b2a851a058785b358a839cb9a8e05abab091127f2affad04bd26936 SHA512 7f0e4a2494a73a1a84e6d41f18deb9aa8c2f16da7b39bdf9cb96110567b17f50b6c65e0d3a91d5393829ae1b8651d153fb678085747f59664cad4209b6a1a96b diff --git a/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch b/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch deleted file mode 100644 index 763693e21b8a..000000000000 --- a/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u -rb libhubbub-0.3.6/test.o/tokeniser2.c libhubbub-0.3.6/test/tokeniser2.c ---- libhubbub-0.3.6/test.o/tokeniser2.c 2019-06-26 22:39:57.000000000 +0200 -+++ libhubbub-0.3.6/test/tokeniser2.c 2019-11-06 13:09:02.321068038 +0200 -@@ -48,7 +48,7 @@ - } - - json = json_object_from_file(argv[1]); -- assert(!is_error(json)); -+ assert(json); - - assert(strcmp((char *) ((json_object_get_object(json)->head)->k), - "tests") == 0); -diff -u -rb libhubbub-0.3.6/test.o/tokeniser3.c libhubbub-0.3.6/test/tokeniser3.c ---- libhubbub-0.3.6/test.o/tokeniser3.c 2019-06-26 22:39:57.000000000 +0200 -+++ libhubbub-0.3.6/test/tokeniser3.c 2019-11-06 13:13:03.162538564 +0200 -@@ -46,7 +46,7 @@ - } - - json = json_object_from_file(argv[1]); -- assert(!is_error(json)); -+ assert(json); - - assert(strcmp((char *) ((json_object_get_object(json)->head)->k), - "tests") == 0); diff --git a/net-libs/libhubbub/libhubbub-0.3.7.ebuild b/net-libs/libhubbub/libhubbub-0.3.8.ebuild index f5f01b8ad5f4..8da5b0f9922a 100644 --- a/net-libs/libhubbub/libhubbub-0.3.7.ebuild +++ b/net-libs/libhubbub/libhubbub-0.3.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit netsurf flag-o-matic @@ -11,13 +11,13 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86" IUSE="doc test" BDEPEND=" - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) test? ( dev-lang/perl ) " RDEPEND="dev-libs/libparserutils:=" @@ -26,7 +26,6 @@ DEPEND="${RDEPEND} RESTRICT="!test? ( test )" DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} ) -PATCHES=( "${FILESDIR}/libhubbub-0.3.6-json-c.patch" ) src_prepare() { default diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml index 6aebbc46f559..6be52da7d29e 100644 --- a/net-libs/libhubbub/metadata.xml +++ b/net-libs/libhubbub/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>mjo@gentoo.org</email> + <name>Michael Orlitzky</name> + </maintainer> <maintainer type="person" proxied="yes"> <email>jaco@uls.co.za</email> <name>Jaco Kroon</name> diff --git a/net-libs/libident/libident-0.32-r1.ebuild b/net-libs/libident/libident-0.32-r1.ebuild index 6f49ea50ba4d..5faec7595bc3 100644 --- a/net-libs/libident/libident-0.32-r1.ebuild +++ b/net-libs/libident/libident-0.32-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,10 @@ SRC_URI="http://people.via.ecp.fr/~rem/libident/${P}.tar.bz2" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" +IUSE="test" +# Interactive tests only. +RESTRICT="!test? ( test ) test" src_prepare() { default @@ -19,7 +22,9 @@ src_prepare() { } src_configure() { - econf --disable-static + econf \ + --disable-static \ + $(use_enable test testers) } src_install() { diff --git a/net-libs/libiio/Manifest b/net-libs/libiio/Manifest index a47f63770209..e73e7fc217d0 100644 --- a/net-libs/libiio/Manifest +++ b/net-libs/libiio/Manifest @@ -1 +1 @@ -DIST libiio-0.21.tar.gz 446893 BLAKE2B 02b6af8e78ab95fa68b146808c58dd012846837646bb0e7e60af890c0e867ed9bb798596e6ff773d6da9efa2750859d23a0f83d874510273ef1d1db8f9424bcb SHA512 5bbacd6a1141654f4825f00c1c2b27223e6cc324c80d7bcbb49e29997a83d585e45c0c52331ca10ee881c2f340b535984c3d667b61d8377a77e5c0f5cb1d2dc0 +DIST libiio-0.25.tar.gz 518247 BLAKE2B 9b3190b5c69fc9fc624f4b0c686cace828fc34219a986a306ffba6b4c2a4f3b8c60cd8d5c67c350033d83ecdaeb010559318bbf76f0b0565bdbcbe119d85e097 SHA512 e0f2f5545b4c78d1f0f56b037db6e363aab01aad69af3a095b3546af74dab6effe0b00f5c336ef799a739f76c5f16ab76a6b8e823508861edd2745a9d3fd2599 diff --git a/net-libs/libiio/libiio-0.21.ebuild b/net-libs/libiio/libiio-0.21.ebuild deleted file mode 100644 index 66f1603cbe68..000000000000 --- a/net-libs/libiio/libiio-0.21.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Library for interfacing with IIO devices" -HOMEPAGE="https://github.com/analogdevicesinc/libiio" -if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="https://github.com/analogdevicesinc/libiio" - inherit git-r3 -else - SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -IUSE="+aio +zeroconf" - -RDEPEND="dev-libs/libxml2:= - virtual/libusb:1= - aio? ( dev-libs/libaio ) - zeroconf? ( net-dns/avahi )" -DEPEND="${RDEPEND}" diff --git a/net-libs/libiio/libiio-0.25.ebuild b/net-libs/libiio/libiio-0.25.ebuild new file mode 100644 index 000000000000..c752d70a4699 --- /dev/null +++ b/net-libs/libiio/libiio-0.25.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake udev python-single-r1 + +DESCRIPTION="Library for interfacing with IIO devices" +HOMEPAGE="https://github.com/analogdevicesinc/libiio" +if [ "${PV}" = "9999" ]; then + EGIT_REPO_URI="https://github.com/analogdevicesinc/libiio" + inherit git-r3 +else + SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +IUSE="+aio python +zeroconf" + +BDEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="python? ( ${PYTHON_DEPS} ) + dev-libs/libxml2 + virtual/libusb:1 + aio? ( dev-libs/libaio ) + zeroconf? ( net-dns/avahi[dbus] )" +DEPEND="${RDEPEND}" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +src_configure() { + local mycmakeargs=( + -DHAVE_DNS_SD="$(usex zeroconf)" + -DWITH_AIO="$(usex aio)" + -DPYTHON_BINDINGS="$(usex python)" + ) + use python && mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}") + cmake_src_configure +} + +src_install() { + cmake_src_install + if use python; then + python_fix_shebang "${ED}" + python_optimize + fi +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-libs/libiio/libiio-9999.ebuild b/net-libs/libiio/libiio-9999.ebuild index 66f1603cbe68..c752d70a4699 100644 --- a/net-libs/libiio/libiio-9999.ebuild +++ b/net-libs/libiio/libiio-9999.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake +inherit cmake udev python-single-r1 DESCRIPTION="Library for interfacing with IIO devices" HOMEPAGE="https://github.com/analogdevicesinc/libiio" @@ -12,15 +13,44 @@ if [ "${PV}" = "9999" ]; then inherit git-r3 else SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="LGPL-2.1" SLOT="0/${PV}" -IUSE="+aio +zeroconf" +IUSE="+aio python +zeroconf" -RDEPEND="dev-libs/libxml2:= - virtual/libusb:1= +BDEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="python? ( ${PYTHON_DEPS} ) + dev-libs/libxml2 + virtual/libusb:1 aio? ( dev-libs/libaio ) - zeroconf? ( net-dns/avahi )" + zeroconf? ( net-dns/avahi[dbus] )" DEPEND="${RDEPEND}" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +src_configure() { + local mycmakeargs=( + -DHAVE_DNS_SD="$(usex zeroconf)" + -DWITH_AIO="$(usex aio)" + -DPYTHON_BINDINGS="$(usex python)" + ) + use python && mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}") + cmake_src_configure +} + +src_install() { + cmake_src_install + if use python; then + python_fix_shebang "${ED}" + python_optimize + fi +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-libs/libircclient/libircclient-1.10.ebuild b/net-libs/libircclient/libircclient-1.10.ebuild index 974269933386..e4af438f3b8c 100644 --- a/net-libs/libircclient/libircclient-1.10.ebuild +++ b/net-libs/libircclient/libircclient-1.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,11 +6,11 @@ inherit autotools DESCRIPTION="Small but powerful library implementing the client-server IRC protocol" HOMEPAGE="http://www.ulduzsoft.com/libircclient/" -SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/libircclient/${P}.tar.gz" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86" +KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv sparc x86" IUSE="doc ipv6 ssl static-libs threads" DEPEND="ssl? ( diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest index 62c299d99f66..4973396f00fe 100644 --- a/net-libs/libiscsi/Manifest +++ b/net-libs/libiscsi/Manifest @@ -1,3 +1,4 @@ DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e DIST libiscsi-1.19.0-remove-ld-iscsi.patch.bz2 6104 BLAKE2B 611202ca0ec046caf5cbd1adaeafb42a7d7d00fcea51e61df6c251576ea276cfe9a2168a9c3f1d4c7aa585d7ff9e90a95d8da03d86ceee2971a84c2bce8d7a5c SHA512 e826883b50e04c6dc3340b51d7b3d3f3fc2bb91cf4e5c13367341449d5a57618d5918946416994f6acbf3e13ab38bafe435fb9ad4542d5e3bb1dfb08f202adf4 DIST libiscsi-1.19.0.tar.gz 284969 BLAKE2B 4e5dc37ba3393076dfc0ed8df0cf969771b16deeeffaf0b65741d1466103bf32b45c22566a6ccb43a5f8740a7681b78f8374ef041a96a59ac1b67ee7fc781cf3 SHA512 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53 +DIST libiscsi-1.19.0_p20230208.tar.gz 293283 BLAKE2B 8dafcdd87d66c8addea8734af264b1ce70ec7cbb7925becf1946b616821a94a0d22ed9a903f5f24c03d9b647353fc76a708cafed0f6482199a45cb628c143fff SHA512 d6416833b4e1352e91d869ae753fdc01968e303d5ce7de52f27692ce7f8d7ca4f648931d54f0ebfa1323f8b43531bfc81771ea0468af4dc9ad53df02c8bad55f diff --git a/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch new file mode 100644 index 000000000000..987544ffca68 --- /dev/null +++ b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch @@ -0,0 +1,26 @@ +diff --git a/configure.ac b/configure.ac +index 5fe1deb..9efe153 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -140,6 +140,8 @@ if test x"$libiscsi_cv_HAVE_SG_IO" = x"yes"; then + AC_DEFINE(HAVE_SG_IO,1,[Whether we have SG_IO support]) + fi + ++AC_ARG_WITH([rdma], AS_HELP_STRING([--with-rdma], [Build with rdma support])) ++ + AC_CACHE_CHECK([for iSER support],libiscsi_cv_HAVE_LINUX_ISER,[ + AC_TRY_COMPILE([ + #include <infiniband/verbs.h> +@@ -147,10 +149,10 @@ AC_TRY_COMPILE([ + #include <rdma/rdma_verbs.h>], + [int ibv = IBV_WC_SEND;], + libiscsi_cv_HAVE_LINUX_ISER=yes,libiscsi_cv_HAVE_LINUX_ISER=no)]) +-if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then ++if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes" && test "x$with_rdma" = "xyes"; then + AC_DEFINE(HAVE_LINUX_ISER,1,[Whether we have iSER support]) + fi +-AM_CONDITIONAL([HAVE_LINUX_ISER], [test $libiscsi_cv_HAVE_LINUX_ISER = yes]) ++AM_CONDITIONAL([HAVE_LINUX_ISER], [test "x$with_rdma" = "xyes"]) + + AC_CACHE_CHECK([whether libcunit is available], + [ac_cv_have_cunit], diff --git a/net-libs/libiscsi/files/libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch b/net-libs/libiscsi/files/libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch new file mode 100644 index 000000000000..89d91c5c5ebf --- /dev/null +++ b/net-libs/libiscsi/files/libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch @@ -0,0 +1,24 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -166,6 +166,8 @@ if test x"$libiscsi_cv_HAVE_SG_IO" = x"yes"; then + AC_DEFINE(HAVE_SG_IO,1,[Whether we have SG_IO support]) + fi + ++AC_ARG_WITH([rdma], AS_HELP_STRING([--with-rdma], [Build with rdma support])) ++ + AC_CACHE_CHECK([for iSER support],libiscsi_cv_HAVE_LINUX_ISER,[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <infiniband/verbs.h> +@@ -173,10 +175,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <rdma/rdma_verbs.h>]], + [[int ibv = IBV_WC_SEND;]])], + [libiscsi_cv_HAVE_LINUX_ISER=yes],[libiscsi_cv_HAVE_LINUX_ISER=no])]) +-if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then ++if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes" && test "x$with_rdma" = "xyes"; then + AC_DEFINE(HAVE_LINUX_ISER,1,[Whether we have iSER support]) + fi +-AM_CONDITIONAL([HAVE_LINUX_ISER], [test $libiscsi_cv_HAVE_LINUX_ISER = yes]) ++AM_CONDITIONAL([HAVE_LINUX_ISER], [test "x$with_rdma" = "xyes"]) + + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <rdma/rdma_cma.h>]], [[return RDMA_OPTION_ID_ACK_TIMEOUT;]])],[AC_DEFINE([HAVE_RDMA_ACK_TIMEOUT],[1],[Define to 1 if you have RDMA ack timeout support])],[]) diff --git a/net-libs/libiscsi/libiscsi-1.19.0.ebuild b/net-libs/libiscsi/libiscsi-1.19.0-r2.ebuild index bbf7c504a2ce..f0879dde5e86 100644 --- a/net-libs/libiscsi/libiscsi-1.19.0.ebuild +++ b/net-libs/libiscsi/libiscsi-1.19.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then else SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-remove-ld-iscsi.patch.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="iscsi client library and utilities" @@ -19,14 +19,24 @@ HOMEPAGE="https://github.com/sahlberg/libiscsi" LICENSE="GPL-2 LGPL-2" SLOT="0" - -RDEPEND="dev-libs/libgcrypt:0=" -DEPEND="${RDEPEND}" +IUSE="rdma test" +# test_9000_compareandwrite.sh failure needs investigation +RESTRICT="!test? ( test ) test" + +RDEPEND=" + dev-libs/libgcrypt:= + rdma? ( sys-cluster/rdma-core ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cunit ) +" PATCHES=( "${FILESDIR}"/${PN}-1.18.0-fno-common.patch "${FILESDIR}"/${PN}-1.18.0-fno-common-2.patch "${FILESDIR}"/${PN}-1.18.0-fno-common-3.patch + "${FILESDIR}"/${PN}-1.19.0-fix-rdma-automagic.patch "${WORKDIR}"/${P}-remove-ld-iscsi.patch ) @@ -38,8 +48,13 @@ src_prepare() { src_configure() { econf \ --enable-manpages \ - --disable-static \ - --disable-werror + $(use_with rdma) \ + --disable-werror \ + $(use_enable test tests) +} + +src_test() { + emake -C tests test } src_install() { diff --git a/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild b/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild new file mode 100644 index 000000000000..a1c692020820 --- /dev/null +++ b/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" + inherit git-r3 +else + if [[ ${PV} == *_p* ]] ; then + # The S path is too long for the test suite otherwise. + inherit vcs-snapshot + + MY_COMMIT="22f7b26567760921fa1aad77cca642153123ea8c" + SRC_URI="https://github.com/sahlberg/libiscsi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + else + SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + fi + + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" +fi + +DESCRIPTION="iscsi client library and utilities" +HOMEPAGE="https://github.com/sahlberg/libiscsi" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +IUSE="rdma test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libgcrypt:= + rdma? ( sys-cluster/rdma-core ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cunit ) +" +BDEPEND=" + test? ( >=sys-block/tgt-1.0.58 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.19.0_p20230208-fix-rdma-automagic.patch +) + +src_prepare() { + default + + # bug #906063 + rm tests/test_0600_ipv6.sh || die + + eautoreconf +} + +src_configure() { + econf \ + --enable-manpages \ + $(use_with rdma) \ + --disable-werror \ + $(use_enable test tests) +} + +src_test() { + emake -C tests test +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libiscsi/libiscsi-9999.ebuild b/net-libs/libiscsi/libiscsi-9999.ebuild index 9d1977923e12..b1a76b05442c 100644 --- a/net-libs/libiscsi/libiscsi-9999.ebuild +++ b/net-libs/libiscsi/libiscsi-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -9,29 +9,62 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" inherit git-r3 else - SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86" + if [[ ${PV} == *_p* ]] ; then + # The S path is too long for the test suite otherwise. + inherit vcs-snapshot + + MY_COMMIT="22f7b26567760921fa1aad77cca642153123ea8c" + SRC_URI="https://github.com/sahlberg/libiscsi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + else + SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + fi + + KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="iscsi client library and utilities" HOMEPAGE="https://github.com/sahlberg/libiscsi" -SLOT="0" LICENSE="GPL-2 LGPL-2" +SLOT="0" +IUSE="rdma test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libgcrypt:= + rdma? ( sys-cluster/rdma-core ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cunit ) +" +BDEPEND=" + test? ( >=sys-block/tgt-1.0.58 ) +" -RDEPEND="dev-libs/libgcrypt:0=" -DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-1.19.0_p20230208-fix-rdma-automagic.patch +) src_prepare() { default + + # bug #906063 + rm tests/test_0600_ipv6.sh || die + eautoreconf } src_configure() { econf \ --enable-manpages \ - --disable-static \ - --disable-werror + $(use_with rdma) \ + --disable-werror \ + $(use_enable test tests) +} + +src_test() { + emake -C tests test } src_install() { diff --git a/net-libs/libiscsi/metadata.xml b/net-libs/libiscsi/metadata.xml index fae5428e41b5..509c77fde33e 100644 --- a/net-libs/libiscsi/metadata.xml +++ b/net-libs/libiscsi/metadata.xml @@ -5,4 +5,7 @@ <upstream> <remote-id type="github">sahlberg/libiscsi</remote-id> </upstream> + <use> + <flag name="rdma">Enable infiniband support via <pkg>sys-cluster/rdma-core</pkg></flag> + </use> </pkgmetadata> diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest index 3314dc794a8b..4e6dad3848ab 100644 --- a/net-libs/libisds/Manifest +++ b/net-libs/libisds/Manifest @@ -1 +1,2 @@ DIST libisds-0.11.1.tar.xz 741992 BLAKE2B e1895450b1148c63a365a569fcdfa0d3cf3f2cdd011da6dbe92ea876aa1a9082470f3c7efc5757766df7e870559dd4ba62b59973e22d47401ef575e0fd412ec1 SHA512 8baf126ebf49c5eae6aa7b8f872ad90882a9a5088c8a33ffb415983eaf1ffc1df489f44ae6ba14a69a94bc4f79f455c7937276885afaa29e61c5c67408f7080a +DIST libisds-0.11.2.tar.xz 746388 BLAKE2B 08e5e1ba5c100faf18e4fa3d89b66486b773be4cf9097f9b237c8f407a98ac2cac0337bcb2665072f65414c06ee26f5670ee2604c8420eb12990b51534eaa062 SHA512 edaa591eda18dc0b8cc7c6e29a36610845cc293f1665a2e9744ec904aaa1c561caa41ada2e87de9428bb0397772c0c2884412fd0474daf28528d7ef2a7f28426 diff --git a/net-libs/libisds/files/libisds-0.11.1-Fix-building-with-libxml2-2.12.0.patch b/net-libs/libisds/files/libisds-0.11.1-Fix-building-with-libxml2-2.12.0.patch new file mode 100644 index 000000000000..7fc65894b156 --- /dev/null +++ b/net-libs/libisds/files/libisds-0.11.1-Fix-building-with-libxml2-2.12.0.patch @@ -0,0 +1,37 @@ +From 0539e12b3de14a77481bd3f87b301b7e7550172c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz> +Date: Thu, 23 Nov 2023 21:10:05 +0100 +Subject: [PATCH] Fix building with libxml2-2.12.0 + +libxml-2.12.0 shuffled included header files. +--- + test/offline/isds_message_free.c | 1 + + test/simline/service.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/test/offline/isds_message_free.c b/test/offline/isds_message_free.c +index 3c2096e..f819d19 100644 +--- a/test/offline/isds_message_free.c ++++ b/test/offline/isds_message_free.c +@@ -1,5 +1,6 @@ + #include "../test.h" + #include "isds.h" ++#include <libxml/parser.h> + + static int test_isds_message_free(struct isds_message **message) { + isds_message_free(message); +diff --git a/test/simline/service.c b/test/simline/service.c +index 533bed5..fea6e87 100644 +--- a/test/simline/service.c ++++ b/test/simline/service.c +@@ -6,6 +6,7 @@ + #include "system.h" + #include <string.h> + #include <stdint.h> /* For intmax_t */ ++#include <stdlib.h> /* For free() */ + #include <inttypes.h> /* For PRIdMAX */ + #include <ctype.h> /* for isdigit() */ + #include <libxml/parser.h> +-- +2.43.0 + diff --git a/net-libs/libisds/libisds-0.11.1.ebuild b/net-libs/libisds/libisds-0.11.1-r1.ebuild index adb792d36841..d555e6ef693a 100644 --- a/net-libs/libisds/libisds-0.11.1.ebuild +++ b/net-libs/libisds/libisds-0.11.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ RDEPEND=" openssl? ( dev-libs/openssl:= ) !openssl? ( app-crypt/gnupg - app-crypt/gpgme + app-crypt/gpgme:= dev-libs/libgcrypt:= )" DEPEND="${RDEPEND} diff --git a/net-libs/libisds/libisds-0.11.1-r2.ebuild b/net-libs/libisds/libisds-0.11.1-r2.ebuild new file mode 100644 index 000000000000..9d5f28e184ff --- /dev/null +++ b/net-libs/libisds/libisds-0.11.1-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Client library for accessing ISDS Soap services" +HOMEPAGE="http://xpisar.wz.cz/libisds/" +SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz" +KEYWORDS="~amd64 ~mips ~x86" + +LICENSE="LGPL-3" +SLOT="0" +IUSE="+curl debug doc nls openssl test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/expat + dev-libs/libxml2 + curl? ( net-misc/curl[ssl] ) + doc? ( + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + ) + openssl? ( dev-libs/openssl:= ) + !openssl? ( + app-crypt/gnupg + app-crypt/gpgme:= + dev-libs/libgcrypt:= + )" +DEPEND="${RDEPEND} + test? ( net-libs/gnutls )" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}/${PN}-0.11.1-Fix-building-with-libxml2-2.12.0.patch" +) + +src_configure() { + local myeconfargs=( + --disable-fatalwarnings + --disable-static + $(use_with curl libcurl) + $(use_enable curl curlreauthorizationbug) + $(use_enable doc) + $(use_enable debug) + $(use_enable nls) + $(use_enable openssl openssl-backend) + $(use_enable test) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libisds/libisds-0.11.2.ebuild b/net-libs/libisds/libisds-0.11.2.ebuild new file mode 100644 index 000000000000..9d5f28e184ff --- /dev/null +++ b/net-libs/libisds/libisds-0.11.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Client library for accessing ISDS Soap services" +HOMEPAGE="http://xpisar.wz.cz/libisds/" +SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz" +KEYWORDS="~amd64 ~mips ~x86" + +LICENSE="LGPL-3" +SLOT="0" +IUSE="+curl debug doc nls openssl test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/expat + dev-libs/libxml2 + curl? ( net-misc/curl[ssl] ) + doc? ( + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + ) + openssl? ( dev-libs/openssl:= ) + !openssl? ( + app-crypt/gnupg + app-crypt/gpgme:= + dev-libs/libgcrypt:= + )" +DEPEND="${RDEPEND} + test? ( net-libs/gnutls )" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}/${PN}-0.11.1-Fix-building-with-libxml2-2.12.0.patch" +) + +src_configure() { + local myeconfargs=( + --disable-fatalwarnings + --disable-static + $(use_with curl libcurl) + $(use_enable curl curlreauthorizationbug) + $(use_enable doc) + $(use_enable debug) + $(use_enable nls) + $(use_enable openssl openssl-backend) + $(use_enable test) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libisds/libisds-9999.ebuild b/net-libs/libisds/libisds-9999.ebuild index 05e9b62f8308..6056df0b3591 100644 --- a/net-libs/libisds/libisds-9999.ebuild +++ b/net-libs/libisds/libisds-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ RDEPEND=" openssl? ( dev-libs/openssl:= ) !openssl? ( app-crypt/gnupg - app-crypt/gpgme + app-crypt/gpgme:= dev-libs/libgcrypt:= )" DEPEND="${RDEPEND} diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest index 3c247844239f..12e76352468a 100644 --- a/net-libs/libktorrent/Manifest +++ b/net-libs/libktorrent/Manifest @@ -1,2 +1,2 @@ -DIST libktorrent-21.08.3.tar.xz 607028 BLAKE2B 1d0a1c2ddb406e709669bc0adb9812c510d8e02c9b325a9ad41d8523cf29bedbbf6d8209151fbc119412b239cf9a8b2907e34faf4c992f5f2f0bd10235f7cf2f SHA512 7c07b470b447497adf8faf0f17004d88130fb243682e28a34b6b86c1520e3cf09044401707f0014a229e589a93caf67efdc83f711580979e6e9603fa3892c5ec -DIST libktorrent-21.11.90.tar.xz 605964 BLAKE2B c19b7f5d4ef19a60421cec17ed6eecbff3ec31a1b7b21f2732f1055289719460aed603fac05af901c76a32a5499917524307a60545026f2cab505998ca08c23f SHA512 28e4fc098baed6b9f7f07befa8a10cfa4d6ce30b55b5c09aa3bedc40089efd7bc02b69a53adc84c3c7404dd788dec6c86271edafaa6e8e1076998191072f9a49 +DIST libktorrent-23.08.5.tar.xz 604184 BLAKE2B e4fc72be9fe20b06220b25fa558a1f86dd029e4eec15da2c8f26ed4acc69e1c06db3fea6ed8dfdb643a01beaf2146c7c0939e8a0da05920712e7f5614e4b4a47 SHA512 c38f944167436a7190e46093cbc928d3db375f7414fa5acdf5b3fd9e77007435259740027941daed422c784d691532f3c9a6c824ce9ac23c091edbedc563aa11 +DIST libktorrent-24.02.2.tar.xz 603264 BLAKE2B 0d95544fcd86b6859ddde320daf5a5a4767e72984f851cf6df538e294ebb2412451699410fb78578800eab1ca65afeea46649f200d609fb08d7e209da9ee71ba SHA512 bda6c2a25cedc89b95a0aab4443a4609b02d4ba60088634a4d5cf07a613dba8e498755c60210859429949576ec0383d94521f3859abfe55698a55940b5b9b996 diff --git a/net-libs/libktorrent/libktorrent-21.08.3.ebuild b/net-libs/libktorrent/libktorrent-23.08.5.ebuild index 8d194a8f2fca..a7f8aee65872 100644 --- a/net-libs/libktorrent/libktorrent-21.08.3.ebuild +++ b/net-libs/libktorrent/libktorrent-23.08.5.ebuild @@ -1,15 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -KDE_GEAR="true" KDE_ORG_CATEGORY="network" -KFMIN=5.84.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org DESCRIPTION="BitTorrent library based on KDE Frameworks" HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent" @@ -20,7 +18,7 @@ KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" IUSE="" COMMON_DEPEND=" - >=app-crypt/qca-2.3.0:2 + >=app-crypt/qca-2.3.0:2[qt5(+)] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= >=dev-qt/qtnetwork-${QTMIN}:5 diff --git a/net-libs/libktorrent/libktorrent-21.11.90.ebuild b/net-libs/libktorrent/libktorrent-24.02.2.ebuild index 580da05f4f09..f3994065f73e 100644 --- a/net-libs/libktorrent/libktorrent-21.11.90.ebuild +++ b/net-libs/libktorrent/libktorrent-24.02.2.ebuild @@ -1,37 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -KDE_GEAR="true" KDE_ORG_CATEGORY="network" -KFMIN=5.88.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org DESCRIPTION="BitTorrent library based on KDE Frameworks" HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent" LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" COMMON_DEPEND=" - >=app-crypt/qca-2.3.0:2 + >=app-crypt/qca-2.3.7:2[qt6] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[network,xml] + >=dev-qt/qt5compat-${QTMIN}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 " DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.71 @@ -48,7 +46,7 @@ src_prepare() { sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \ CMakeLists.txt || die sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \ - KF5TorrentConfig.cmake.in || die + KTorrent6Config.cmake.in || die } src_test() { diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest index 6246723ee124..f7a54766367e 100644 --- a/net-libs/liblockfile/Manifest +++ b/net-libs/liblockfile/Manifest @@ -1,2 +1 @@ -DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d DIST liblockfile-1.17.tar.gz 69834 BLAKE2B a3c88174d96fb84dc1226102a1678aecec35945b89adb6e143f32674188ff7406f89b05f7219748bf0e9c6207ff3b28b5b800706ffc11b733c294e1e1c232784 SHA512 2169ac2219950d6ec7def6b5cc712cc04d1a185dc9c09b364c8d47b7b3d15c3482a2200b591872da87eb784717b2ba3537fbc39d7075c329cc8ba48039473a83 diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild deleted file mode 100644 index 3140e575a8bc..000000000000 --- a/net-libs/liblockfile/liblockfile-1.16.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="Implements functions designed to lock the standard mailboxes" -HOMEPAGE="https://github.com/miquels/liblockfile" -SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND="acct-group/mail" -DEPEND="${RDEPEND}" - -DOCS=( Changelog README ) - -PATCHES=( - "${FILESDIR}/${PN}-1.16-makefile.patch" -) - -src_prepare() { - default - - # I don't feel like making the Makefile portable - [[ ${CHOST} == *-darwin* ]] \ - && cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in - - eautoreconf -} - -src_configure() { - local grp=mail - if use prefix ; then - # we never want to use LDCONFIG - export LDCONFIG=${EPREFIX}/bin/true - # in unprivileged installs this is "mail" - grp=$(id -g) - fi - local myeconfargs=( - --with-mailgroup=${grp} - --enable-shared - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - default - if ! use static-libs ; then - find "${ED}" -type f -name "*.a" -delete || die - fi -} diff --git a/net-libs/liblockfile/liblockfile-1.17.ebuild b/net-libs/liblockfile/liblockfile-1.17.ebuild index 82d39902f7c3..652cf4a77324 100644 --- a/net-libs/liblockfile/liblockfile-1.17.ebuild +++ b/net-libs/liblockfile/liblockfile-1.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,11 +11,11 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="static-libs" RDEPEND="acct-group/mail" -DEPEND="${RDEPEND}" +BDEPEND="${RDEPEND}" DOCS=( Changelog README ) diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest index 9fca404f8e11..b5babf8997f7 100644 --- a/net-libs/libmbim/Manifest +++ b/net-libs/libmbim/Manifest @@ -1,2 +1,2 @@ -DIST libmbim-1.24.8.tar.xz 517872 BLAKE2B ba4d44ea18ecb412d046b1c1cbd1167bd1cf0a1430486dbf760731950b088e66b25c5c870f2e1a49ea78e43bc15fdbac9efed56afa35127d33f6377325677386 SHA512 32a1ed379fb2799c8490058a16f819620290c2a08d0dacacdc7db4a31fb66a4d9c449b4b2d8fd6de898da28815a6c32e3d97a802970115ac2869e7fec0d841af -DIST libmbim-1.26.0.tar.xz 554672 BLAKE2B b020ea81d6f06bad4c655b285423075873ea01ad253c8eb79fe6e0ce8511d6a8c684c4d8541a64dcc23b46211de117f867d5b405f08942e904156304ce746779 SHA512 b987b3271166eabda7d6767b4b3cd8f34b07ea6a43d5ed1d7cf083561b0e57affeec175a155e5bf8b998dd60f49a303cf54ad6eda146df7483cabe099c401c27 +DIST libmbim-1.26.4.tar.xz 566188 BLAKE2B 96fb932e89455364eec39d879256eb10efd4fafc18c0dc69619b3a73cea1e62e3ea50b828c2785082e6422c39d8775c9bc1c084db3aaafdf054b1e7aa7d6929f SHA512 a530a3611aa353d7b7a4a3d845a8a8b08e508004f44e9bc63a4c04729589397e264a5dca499ebb7c57f135e6848909d78124c4799bd932c24271c57824c3b5d8 +DIST libmbim-1.28.4.tar.bz2 213993 BLAKE2B 86418182fea2ed50d6b606b898e58f0511ecc5ed4be36748678befa3c005d37a2364db6f4f5537f6a616015f635bb77cfcae282b328b1dd3f5807eae360e93a7 SHA512 f6ac196106e70c790727438a4f42c14b3f8e82dc96b9ac244fbe44b9173132d9562dd6250a51bbf21fc3b84a2a059ae9d7d02d08cac5ba5775715507a64d66d2 diff --git a/net-libs/libmbim/libmbim-1.24.8.ebuild b/net-libs/libmbim/libmbim-1.24.8.ebuild deleted file mode 100644 index 141c3f44d2fc..000000000000 --- a/net-libs/libmbim/libmbim-1.24.8.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit python-any-r1 - -DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim" -SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 x86" -IUSE="udev" - -RDEPEND=">=dev-libs/glib-2.48:2 - udev? ( dev-libs/libgudev:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/glib-utils - dev-util/gtk-doc-am - virtual/pkgconfig -" - -src_configure() { - econf \ - --disable-Werror \ - --disable-static \ - --disable-gtk-doc \ - $(use_with udev) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-libs/libmbim/libmbim-1.26.0.ebuild b/net-libs/libmbim/libmbim-1.26.4.ebuild index 1ff3ec9dae7a..948543fd51fc 100644 --- a/net-libs/libmbim/libmbim-1.26.0.ebuild +++ b/net-libs/libmbim/libmbim-1.26.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-any-r1 DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library" @@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86" RDEPEND=">=dev-libs/glib-2.56:2" DEPEND="${RDEPEND}" diff --git a/net-libs/libmbim/libmbim-1.28.4.ebuild b/net-libs/libmbim/libmbim-1.28.4.ebuild new file mode 100644 index 000000000000..c66c9a6a7cab --- /dev/null +++ b/net-libs/libmbim/libmbim-1.28.4.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..11} ) +inherit bash-completion-r1 meson python-any-r1 + +DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim" +SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" +IUSE="gtk-doc" + +RDEPEND=" + >=dev-libs/glib-2.56:2 + >=dev-libs/gobject-introspection-0.9.6:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + gtk-doc? ( dev-util/gtk-doc ) + dev-util/glib-utils + sys-apps/help2man + virtual/pkgconfig +" + +src_configure() { + # Let's avoid BuildRequiring bash-completion, install it manually + local emesonargs=( + -Dintrospection=true + -Dman=true + -Dbash_completion=false + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} + +src_install() { + meson_src_install + dobashcomp src/mbimcli/mbimcli +} diff --git a/net-libs/libmbim/metadata.xml b/net-libs/libmbim/metadata.xml index 7b343b06be8a..bb3a90035797 100644 --- a/net-libs/libmbim/metadata.xml +++ b/net-libs/libmbim/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>freedesktop-bugs@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">mobile-broadband/libmbim</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libmediawiki/Manifest b/net-libs/libmediawiki/Manifest index 405050055c7a..1a4c8459ac39 100644 --- a/net-libs/libmediawiki/Manifest +++ b/net-libs/libmediawiki/Manifest @@ -1 +1 @@ -DIST libmediawiki-5.37.0.tar.xz 55188 BLAKE2B d04ea7dc346792c49009b382fd774ad9573e70cb52599caa57ac3f0dcfac93c0569a42cc54e11ba185e80fc2a5847d6a6f6c81adda9907c87dd3f7459771da3c SHA512 5efcd30782c8d54cddad51c6a96065f2942529e89facfd1c3a71af343a898858db02fa95dd0af0161b3e13aee6a9a373a0a641ce64e128c7282cbf3770db6993 +DIST libmediawiki-5.38.0.tar.xz 55264 BLAKE2B 74753a20ab84f1badcf7368be5617648e296f66832feafb26ea2122818921a924a7278ccfbe4779535365c679ef574139dc3214812a87b72cd90f6766671928a SHA512 4e8a3a656d324006a85cd6b2eeeaafd67a80806368125a9f0ce46984b58cfeed5ad8ac34c6cc305d00b3bd92bf5e1f8e60b41313ac6a86970c47572654784114 diff --git a/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch deleted file mode 100644 index c57041dca7c9..000000000000 --- a/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 8c11aeabf34985421cd229240a6fad3db8023156 Mon Sep 17 00:00:00 2001 -From: Pino Toscano <pino@kde.org> -Date: Sat, 9 Sep 2017 15:33:24 +0200 -Subject: use Q_DECL_OVERRIDE - ---- - src/edit.h | 2 +- - src/job.h | 2 +- - src/login.h | 2 +- - src/logout.h | 2 +- - src/parse.h | 2 +- - src/queryimageinfo.h | 2 +- - src/queryimages.h | 2 +- - src/queryinfo.h | 2 +- - src/queryrevision.h | 2 +- - src/querysiteinfogeneral.h | 2 +- - src/querysiteinfousergroups.h | 2 +- - src/upload.h | 2 +- - tests/libmediawikitest/fakeserver.h | 2 +- - 13 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/src/edit.h b/src/edit.h -index 85bd590..a3944c8 100644 ---- a/src/edit.h -+++ b/src/edit.h -@@ -178,7 +178,7 @@ public: - /** - * @brief Starts the job asynchronously. - */ -- virtual void start(); -+ void start() Q_DECL_OVERRIDE; - - /** - * @brief Specify how the watchlist is affected by this edit. -diff --git a/src/job.h b/src/job.h -index 180822b..feda262 100644 ---- a/src/job.h -+++ b/src/job.h -@@ -73,7 +73,7 @@ public: - /** - * @brief Aborts this job quietly. - */ -- virtual bool doKill(); -+ bool doKill() Q_DECL_OVERRIDE; - - protected: - -diff --git a/src/login.h b/src/login.h -index 196710a..4ea71f1 100644 ---- a/src/login.h -+++ b/src/login.h -@@ -130,7 +130,7 @@ public: - /** - * @brief Starts the job asynchronously. - */ -- virtual void start(); -+ void start() Q_DECL_OVERRIDE; - - private Q_SLOTS: - -diff --git a/src/logout.h b/src/logout.h -index 03fb1f7..1b05323 100644 ---- a/src/logout.h -+++ b/src/logout.h -@@ -65,7 +65,7 @@ public: - /** - * @brief Starts the job asynchronously. - */ -- virtual void start(); -+ void start() Q_DECL_OVERRIDE; - - private Q_SLOTS: - -diff --git a/src/parse.h b/src/parse.h -index 5732f69..e72f59f 100644 ---- a/src/parse.h -+++ b/src/parse.h -@@ -85,7 +85,7 @@ public: - - void setUseLang(const QString& param); - -- virtual void start(); -+ void start() Q_DECL_OVERRIDE; - - Q_SIGNALS: - -diff --git a/src/queryimageinfo.h b/src/queryimageinfo.h -index f8c21a6..039c4a5 100644 ---- a/src/queryimageinfo.h -+++ b/src/queryimageinfo.h -@@ -148,7 +148,7 @@ public: - /** - * @brief Starts the job asynchronously. - */ -- virtual void start(); -+ void start() Q_DECL_OVERRIDE; - - Q_SIGNALS: - -diff --git a/src/queryimages.h b/src/queryimages.h -index 3211880..c8de5a0 100644 ---- a/src/queryimages.h -+++ b/src/queryimages.h -@@ -103,7 +103,7 @@ public: - /** - * @brief Starts the job asynchronously. - */ -- virtual void start(); -+ void start() Q_DECL_OVERRIDE; - - Q_SIGNALS: - -diff --git a/src/queryinfo.h b/src/queryinfo.h -index e2ff3e6..e23f50e 100644 ---- a/src/queryinfo.h -+++ b/src/queryinfo.h -@@ -75,7 +75,7 @@ public: - /** - * @brief Starts the job asynchronously. - */ -- virtual void start(); -+ void start() Q_DECL_OVERRIDE; - - /** - * @brief Set the page name. -diff --git a/src/queryrevision.h b/src/queryrevision.h -index b1decfb..190d026 100644 ---- a/src/queryrevision.h -+++ b/src/queryrevision.h -@@ -150,7 +150,7 @@ public: - /** - * @brief Starts the job asynchronously. - */ -- virtual void start(); -+ void start() Q_DECL_OVERRIDE; - - /** - * @brief Set the page id. -diff --git a/src/querysiteinfogeneral.h b/src/querysiteinfogeneral.h -index 516f7ed..1b31f15 100644 ---- a/src/querysiteinfogeneral.h -+++ b/src/querysiteinfogeneral.h -@@ -81,7 +81,7 @@ public: - /** - * @brief Starts the job asynchronously. - */ -- virtual void start(); -+ void start() Q_DECL_OVERRIDE; - - Q_SIGNALS: - -diff --git a/src/querysiteinfousergroups.h b/src/querysiteinfousergroups.h -index 74bc653..d6fb089 100644 ---- a/src/querysiteinfousergroups.h -+++ b/src/querysiteinfousergroups.h -@@ -73,7 +73,7 @@ public: - /** - * @brief Starts the job asynchronously. - */ -- virtual void start(); -+ void start() Q_DECL_OVERRIDE; - - Q_SIGNALS: - -diff --git a/src/upload.h b/src/upload.h -index 817eb5b..7f745f4 100644 ---- a/src/upload.h -+++ b/src/upload.h -@@ -143,7 +143,7 @@ public: - /** - * @brief Starts the job asynchronously. - */ -- virtual void start(); -+ void start() Q_DECL_OVERRIDE; - - /** - * @brief Set the target filename. -diff --git a/tests/libmediawikitest/fakeserver.h b/tests/libmediawikitest/fakeserver.h -index e847ac6..c6bb78c 100644 ---- a/tests/libmediawikitest/fakeserver.h -+++ b/tests/libmediawikitest/fakeserver.h -@@ -61,7 +61,7 @@ public: - ~FakeServer(); - - void startAndWait(); -- virtual void run(); -+ void run() Q_DECL_OVERRIDE; - - void setScenario( const QString& scenario, const QString& cookie = QStringLiteral("empty")); - void addScenario( const QString& scenario, const QString& cookie = QStringLiteral("empty")); --- -cgit v1.1 diff --git a/net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch deleted file mode 100644 index 5e7f9d49ce50..000000000000 --- a/net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7c79dae079d20b46d05462ed9f5b3cfae78f420a Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 2 May 2021 12:39:39 +0200 -Subject: [PATCH] Fix compilation error with Qt 5.15 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -error: use of deleted function ‘QCharRef& QCharRef::operator=(char)’ ---- - src/queryrevision.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/queryrevision.cpp b/src/queryrevision.cpp -index 59aac03..6ebfbc8 100644 ---- a/src/queryrevision.cpp -+++ b/src/queryrevision.cpp -@@ -307,8 +307,8 @@ void QueryRevision::doWorkProcessReply() - while (count < 2) - { - if (replytmp[i] == QLatin1Char('"') && replytmp[i-1] != QLatin1Char('\\')) count++; -- if (replytmp[i] == QLatin1Char('<')) replytmp[i] = char(255); -- if (replytmp[i] == QLatin1Char('>')) replytmp[i] = char(254); -+ if (replytmp[i] == QLatin1Char('<')) replytmp[i] = QChar(255); -+ if (replytmp[i] == QLatin1Char('>')) replytmp[i] = QChar(254); - ++i; - } - } --- -GitLab - diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild b/net-libs/libmediawiki/libmediawiki-5.38.0.ebuild index 88b2d5e06537..3b678f01f6f3 100644 --- a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild +++ b/net-libs/libmediawiki/libmediawiki-5.38.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="true" -KFMIN=5.60.0 -QTMIN=5.12.3 +KFMIN=5.96.0 +QTMIN=5.15.5 inherit ecm kde.org DESCRIPTION="C++ interface for MediaWiki based web service as wikipedia.org" @@ -16,17 +16,15 @@ LICENSE="GPL-2+" SLOT="5" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +RESTRICT="test" + DEPEND=" >=dev-qt/qtnetwork-${QTMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/${P}-tests-optional.patch" - "${FILESDIR}/${P}-fix-warnings.patch" - "${FILESDIR}/${P}-qt-5.15.patch" -) +PATCHES=( "${FILESDIR}/${PN}-5.37.0-tests-optional.patch" ) src_test() { # bug 646808, 662592 diff --git a/net-libs/libmediawiki/metadata.xml b/net-libs/libmediawiki/metadata.xml index d925f2439758..94506f58964f 100644 --- a/net-libs/libmediawiki/metadata.xml +++ b/net-libs/libmediawiki/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">libraries/libmediawiki</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild b/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild index ad225d598c00..f49bd4643610 100644 --- a/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild +++ b/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/videolabs/${PN}" else SRC_URI="https://github.com/videolabs/${PN}/releases/download/${PV}/${P/lib/}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}/${P/lib/}" fi @@ -22,10 +22,6 @@ SLOT="0" IUSE="examples test" RESTRICT="!test? ( test )" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" - src_configure() { local emesonargs=( $(meson_feature examples) diff --git a/net-libs/libmicrodns/libmicrodns-9999.ebuild b/net-libs/libmicrodns/libmicrodns-9999.ebuild index 0e1d2c1f619f..a32f68efe0d1 100644 --- a/net-libs/libmicrodns/libmicrodns-9999.ebuild +++ b/net-libs/libmicrodns/libmicrodns-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/videolabs/${PN}" else SRC_URI="https://github.com/videolabs/${PN}/releases/download/${PV}/${P/lib/}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}/${P/lib/}" fi @@ -22,10 +22,6 @@ SLOT="0" IUSE="examples test" RESTRICT="!test? ( test )" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" - src_configure() { local emesonargs=( $(meson_feature examples) diff --git a/net-libs/libmicrodns/metadata.xml b/net-libs/libmicrodns/metadata.xml index b9102aac401d..2f732bc33f7e 100644 --- a/net-libs/libmicrodns/metadata.xml +++ b/net-libs/libmicrodns/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>np-hardass@gentoo.org</email> - <name>Adam Feldman</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">videolabs/libmicrodns</remote-id> </upstream> diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest index 5fdb923bbc79..287f05186784 100644 --- a/net-libs/libmicrohttpd/Manifest +++ b/net-libs/libmicrohttpd/Manifest @@ -1,3 +1,3 @@ -DIST libmicrohttpd-0.9.68.tar.gz 1884342 BLAKE2B 3f74c48917fa19753a617242fa07b99a69510a14a802609d038964d927516f8f52b4330d0eee2c7b98096b2d840158e4945310edef290224ea256d9616fb4d94 SHA512 9daaab5fb35fef6f2a19b7e08eeb8473aeb0a67631808a8d7a7f78a09cb621ca5d32dbbbca616865a40afb92f8c6495f9e2ba1674880af8011a2bc798c070a13 -DIST libmicrohttpd-0.9.72.tar.gz 1693553 BLAKE2B 24d9284d8cab65d4a5b6b7f3a5b860dfd8cf69b21e44ee05ae2f7561b766a72d2dbb7f57849a31c22454e211befa74e058f78814b79e7876b3d14c7252ab5800 SHA512 9695e2fb08785e4b60342226ef3a0af22da4d80f127e7db9ec80ce844f70d0d781b30af207d58d8eb691b85a5fe4691cb9ecf887ca86f5e059a05259ae041316 -DIST libmicrohttpd-0.9.73.tar.gz 1738675 BLAKE2B 63845b1b7fa0aa8ce29e9917521e10bd59fa0d27658e87ef3273d5014adf5cd9514a2d84465a573df03b44dcd50da7d157ef9c4952107ebba49efdfb398476c2 SHA512 473996b087ac6734ab577a1c7681c6c0b0136e04e34e13c3b50fd758358c1516017ad79097e0c57792786f6dd0208834374c09238113efed13bb4be11ef649d3 +DIST libmicrohttpd-0.9.76.tar.gz 2199858 BLAKE2B 2c2de77d731ff130bb1491733b91e9e0b0c68bc30ea1a826f7f1d97aaf83fa7f6bec3c219f81c5293de72595b26d1e6eb66cdd4bfe3b16bd37a10e3acd3c6446 SHA512 9ff8a837892142376eaeaf50c0b0dba76697d0ff44b908434cba8db4324c57dfb8bbcc1a922b97d825891ac10f50693dee9388531856e0fa81fa2cfeac538581 +DIST libmicrohttpd-0.9.77.tar.gz 1896679 BLAKE2B 09a07c7da77d6072e5aa0fb121aedffb66b6cfdb2da30d1809583469282365832beb935417e779ddb31876949358d25c10bf79616079393503ca5860d88ac052 SHA512 001025c023dd94c4a0cf017ed575e65a577b5ce595e7e450346bfb75def77eaa8a4cfbeffb9f4b912e34165c2cfca147c02c895e067a4f6c5a321a12035758a5 +DIST libmicrohttpd-1.0.1.tar.gz 2239593 BLAKE2B a29e49c719fc544ae72224d81cba7b7ef914f2641efe4b90d580d2212f2c3357a6d70499c43a6f50d14f4ec9d3102da8de899fe0420bf6660eb413080d89b7f7 SHA512 c99b8b93cae5feee8debcc5667ee3ff043412a84b30696fe852e6c138f3c890bb43c8fcd7199f1d2f809d522fef159e83b607c743d6cf3401a57050fbdf9b5c1 diff --git a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.73-test-ssl3.patch b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.73-test-ssl3.patch deleted file mode 100644 index e8d5dce0edcb..000000000000 --- a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.73-test-ssl3.patch +++ /dev/null @@ -1,35 +0,0 @@ - Disable usage of SSLv3 in testing - - Integrated uptream version 0.9.74 - - -diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c - ---- a/src/testcurl/https/test_tls_options.c -+++ b/src/testcurl/https/test_tls_options.c -@@ -119,11 +119,6 @@ main (int argc, char *const *argv) - fprintf (stderr, "Curl does not support SSL. Cannot run the test.\n"); - return 77; - } -- if (0 != strncmp (ssl_version, "GnuTLS", 6)) -- { -- fprintf (stderr, "This test can be run only with libcurl-gnutls.\n"); -- return 77; -- } - - if (! testsuite_curl_global_init ()) - return 99; -@@ -152,10 +147,10 @@ main (int argc, char *const *argv) - fprintf (stderr, - "The following handshake should fail (and print an error message)...\n"); - if (0 != -- test_wrap ("TLS1.0 vs SSL3", -+ test_wrap ("TLS1.1 vs TLS1.0", - &test_unmatching_ssl_version, NULL, port, daemon_flags, - aes256_sha, -- CURL_SSLVERSION_SSLv3, -+ CURL_SSLVERSION_TLSv1_1, - MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, - MHD_OPTION_HTTPS_PRIORITIES, - diff --git a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch new file mode 100644 index 000000000000..b87bdb64579f --- /dev/null +++ b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch @@ -0,0 +1,60 @@ +Fixed incorrect function redeclaration in the testsuite. +This fixes 'make check' with LTO. + +Author: Karlson2k (Evgeny Grin) +Gentoo bug: https://bugs.gentoo.org/877447 + + +diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c +index 47f644d2..786918f2 100644 +--- a/src/testcurl/https/test_https_get_parallel.c ++++ b/src/testcurl/https/test_https_get_parallel.c +@@ -46,7 +46,7 @@ + extern const char srv_key_pem[]; + extern const char srv_self_signed_cert_pem[]; + +-int curl_check_version (const char *req_version, ...); ++int curl_check_version (const char *req_version); + + + /** +diff --git a/src/testcurl/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c +index 4853e7eb..5f4d0486 100644 +--- a/src/testcurl/https/test_https_get_parallel_threads.c ++++ b/src/testcurl/https/test_https_get_parallel_threads.c +@@ -48,7 +48,7 @@ + extern const char srv_key_pem[]; + extern const char srv_self_signed_cert_pem[]; + +-int curl_check_version (const char *req_version, ...); ++int curl_check_version (const char *req_version); + + /** + * used when spawning multiple threads executing curl server requests +diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c +index d5aa8310..8fbc540a 100644 +--- a/src/testcurl/https/test_tls_options.c ++++ b/src/testcurl/https/test_tls_options.c +@@ -36,7 +36,7 @@ + extern const char srv_key_pem[]; + extern const char srv_self_signed_cert_pem[]; + +-int curl_check_version (const char *req_version, ...); ++int curl_check_version (const char *req_version); + + /** + * test server refuses to negotiate connections with unsupported protocol versions +diff --git a/src/testcurl/https/tls_test_common.h b/src/testcurl/https/tls_test_common.h +index a9af504d..e3f552a8 100644 +--- a/src/testcurl/https/tls_test_common.h ++++ b/src/testcurl/https/tls_test_common.h +@@ -72,7 +72,7 @@ struct CipherDef + + + int +-curl_check_version (const char *req_version, ...); ++curl_check_version (const char *req_version); + + int + curl_tls_is_gnutls (void); + diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild deleted file mode 100644 index da4a05bb2914..000000000000 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit multilib-minimal - -MY_P="${P/_/}" - -DESCRIPTION="Small C library to run an HTTP server as part of another application" -HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" -SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" - -PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch ) - -LICENSE="LGPL-2.1" -SLOT="0/12" -KEYWORDS="amd64 x86" -IUSE="+epoll ssl static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )" - -# We disable tests below because they're broken, -# but if enabled, we'll need this. -DEPEND="${RDEPEND} - test? ( net-misc/curl[ssl?] )" - -S=${WORKDIR}/${MY_P} - -DOCS="AUTHORS NEWS README ChangeLog" - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - --enable-bauth \ - --enable-dauth \ - --disable-examples \ - --enable-messages \ - --enable-postprocessor \ - --disable-thread-names \ - $(use_enable epoll) \ - $(use_enable test curl) \ - $(use_enable ssl https) \ - $(use_with ssl gnutls) \ - $(use_enable static-libs static) -} - -# tests are broken in the portage environment. -src_test() { - : -} - -multilib_src_install_all() { - default - - use static-libs || find "${ED}" -name '*.la' -delete -} diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild deleted file mode 100644 index 52e14e5dad16..000000000000 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit multilib-minimal - -MY_P="${P/_/}" - -DESCRIPTION="Small C library to run an HTTP server as part of another application" -HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" -SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/12" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" -IUSE="+epoll ssl static-libs test thread-names" -RESTRICT="!test? ( test )" - -RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )" - -DEPEND="${RDEPEND} - test? ( net-misc/curl[ssl?] ) - virtual/pkgconfig - " - -PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch ) - -S=${WORKDIR}/${MY_P} - -DOCS="AUTHORS NEWS README ChangeLog" - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - --disable-nls \ - --enable-bauth \ - --enable-dauth \ - --disable-examples \ - --enable-messages \ - --enable-postprocessor \ - --enable-httpupgrade \ - --disable-experimental \ - $(use_enable thread-names) \ - $(use_enable epoll) \ - $(use_enable test curl) \ - $(use_enable ssl https) \ - $(use_with ssl gnutls) -} - -multilib_src_install_all() { - default - - use static-libs || find "${ED}" -name '*.la' -delete -} diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild index 689aaa6c4df6..03bfe985f82f 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit multilib-minimal @@ -12,21 +12,59 @@ HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} -PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch ) - -LICENSE="LGPL-2.1+" +LICENSE="|| ( LGPL-2.1+ !ssl? ( GPL-2+-with-eCos-exception-2 ) )" SLOT="0/12" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" -IUSE="+epoll ssl static-libs test thread-names" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="+epoll ssl static-libs test +thread-names" RESTRICT="!test? ( test )" -RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )" +RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:=[${MULTILIB_USEDEP}] )" # libcurl and the curl binary are used during tests on CHOST DEPEND="${RDEPEND} test? ( net-misc/curl[ssl?] )" BDEPEND="ssl? ( virtual/pkgconfig )" -DOCS=( AUTHORS NEWS README ChangeLog ) +DOCS=( AUTHORS NEWS COPYING README ChangeLog ) + +PATCHES=( "${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch ) + +# All checks in libmicrohttpd's configure are correct +# Gentoo Bug #898662 +QA_CONFIG_IMPL_DECL_SKIP=( + 'pthread_sigmask' + 'CreateThread' + 'pthread_attr_init' + 'pthread_attr_setname_np' + 'pthread_setname_np' + '__builtin_bswap32' + '__builtin_bswap64' + 'WSAPoll' + 'epoll_create1' + 'eventfd' + 'pipe' + 'pipe2' + 'socketpair' + 'gmtime_s' + 'host_get_clock_service' + 'clock_get_time' + 'mach_port_deallocate' + 'gethrtime' + 'timespec_get' + 'gettimeofday' + 'sendfile' + 'gnutls_privkey_import_x509_raw' + 'calloc' + 'fork' + 'waitpid' + 'random' + 'rand' + 'getsockname' + 'sysconf' + 'sysctl' + 'sysctlbyname' + 'usleep' + 'nanosleep' +) multilib_src_configure() { ECONF_SOURCE="${S}" \ diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild new file mode 100644 index 000000000000..d0eed498d5a5 --- /dev/null +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit linux-info multilib-minimal + +MY_P="${P/_/}" + +DESCRIPTION="Small C library to run an HTTP server as part of another application" +HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" +SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="|| ( LGPL-2.1+ !ssl? ( GPL-2+-with-eCos-exception-2 ) )" +SLOT="0/12" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="+epoll +eventfd ssl static-libs test +thread-names" +REQUIRED_USE="epoll? ( kernel_linux )" +RESTRICT="!test? ( test )" + +RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:=[${MULTILIB_USEDEP}] )" +# libcurl and the curl binary are used during tests on CHOST +DEPEND="${RDEPEND} + test? ( net-misc/curl[ssl?] )" +BDEPEND="ssl? ( virtual/pkgconfig )" + +DOCS=( AUTHORS NEWS COPYING README ChangeLog ) + +pkg_pretend() { + if use kernel_linux ; then + CONFIG_CHECK="" + use epoll && CONFIG_CHECK+=" ~EPOLL" + ERROR_EPOLL="EPOLL is not enabled in kernel, but enabled in libmicrohttpd." + ERROR_EPOLL+=" libmicrohttpd will fail to start with 'automatic' configuration." + use eventfd && CONFIG_CHECK+=" ~EVENTFD" + ERROR_EVENTFD="EVENTFD is not enabled in kernel, but enabled in libmicrohttpd." + ERROR_EVENTFD+=" libmicrohttpd will not work." + check_extra_config + fi +} + +multilib_src_configure() { + local itc_type + if use eventfd ; then + itc_type="eventfd" + else + itc_type="pipe" + fi + ECONF_SOURCE="${S}" \ + econf \ + --enable-shared \ + $(use_enable static-libs static) \ + --disable-nls \ + --enable-bauth \ + --enable-dauth \ + --disable-examples \ + --enable-messages \ + --enable-postprocessor \ + --enable-httpupgrade \ + --disable-experimental \ + --disable-heavy-tests \ + --enable-itc=${itc_type} \ + $(use_enable thread-names) \ + $(use_enable epoll) \ + $(use_enable test curl) \ + $(use_enable ssl https) +} + +multilib_src_install_all() { + default + + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi +} diff --git a/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild new file mode 100644 index 000000000000..bf51ab887652 --- /dev/null +++ b/net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit linux-info multilib-minimal + +MY_P="${P/_/}" + +DESCRIPTION="Small C library to run an HTTP server as part of another application" +HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" +SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="|| ( LGPL-2.1+ !ssl? ( GPL-2+-with-eCos-exception-2 ) )" +SLOT="0/12" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="debug +epoll +eventfd ssl static-libs test +thread-names verify-sig" +REQUIRED_USE="epoll? ( kernel_linux )" +RESTRICT="!test? ( test )" + +RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:=[${MULTILIB_USEDEP}] )" +# libcurl and the curl binary are used during tests on CHOST +DEPEND="${RDEPEND} + test? ( net-misc/curl[ssl?] )" +BDEPEND="ssl? ( virtual/pkgconfig )" + +DOCS=( AUTHORS NEWS COPYING README ChangeLog ) + +pkg_pretend() { + if use kernel_linux ; then + CONFIG_CHECK="" + use epoll && CONFIG_CHECK+=" ~EPOLL" + ERROR_EPOLL="EPOLL is not enabled in kernel, but enabled in libmicrohttpd." + ERROR_EPOLL+=" libmicrohttpd will fail to start with 'automatic' configuration." + use eventfd && CONFIG_CHECK+=" ~EVENTFD" + ERROR_EVENTFD="EVENTFD is not enabled in kernel, but enabled in libmicrohttpd." + ERROR_EVENTFD+=" libmicrohttpd will not work." + check_extra_config + fi +} + +multilib_src_configure() { + local itc_type + if use eventfd; then + itc_type="eventfd" + else + itc_type="pipe" + fi + ECONF_SOURCE="${S}" \ + econf \ + --enable-shared \ + $(use_enable static-libs static) \ + --enable-bauth \ + --enable-dauth \ + --enable-messages \ + --enable-postprocessor \ + --enable-httpupgrade \ + --disable-examples \ + --disable-tools \ + --disable-experimental \ + --disable-heavy-tests \ + --enable-itc=${itc_type} \ + $(use_enable debug asserts) \ + $(use_enable thread-names) \ + $(use_enable epoll) \ + $(use_enable test curl) \ + $(use_enable ssl https) +} + +multilib_src_install_all() { + default + + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi +} diff --git a/net-libs/libmicrohttpd/metadata.xml b/net-libs/libmicrohttpd/metadata.xml index 010230ec117c..f11e30233688 100644 --- a/net-libs/libmicrohttpd/metadata.xml +++ b/net-libs/libmicrohttpd/metadata.xml @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> <maintainer type="person" proxied="yes"> <email>k2k@narod.ru</email> <name>Evgeny Grin</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> - <flag name="epoll">Use epoll() system call</flag> + <flag name="epoll">Support epoll() system call</flag> + <flag name="eventfd">Use EventFD for efficient inter-thread communication</flag> <flag name="thread-names">Assign thread names to internal threads, useful for dependent apps debugging</flag> </use> <upstream> diff --git a/net-libs/libmirisdr/libmirisdr-9999.ebuild b/net-libs/libmirisdr/libmirisdr-9999.ebuild deleted file mode 100644 index 8d31071e499d..000000000000 --- a/net-libs/libmirisdr/libmirisdr-9999.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -EGIT_REPO_URI="git://git.osmocom.org/libmirisdr" -inherit cmake git-r3 - -DESCRIPTION="Software for the Mirics MSi2500 + MSi001 SDR platform" -HOMEPAGE="http://cgit.osmocom.org/libmirisdr/" - -LICENSE="GPL-2" -SLOT="0/${PV}" -IUSE="doc static-libs" - -RDEPEND="virtual/libusb:1" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_install() { - cmake_src_install - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libmirisdr.a -} diff --git a/net-libs/libmirisdr/metadata.xml b/net-libs/libmirisdr/metadata.xml deleted file mode 100644 index a8b192c43911..000000000000 --- a/net-libs/libmirisdr/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> -<email>zerochaos@gentoo.org</email> -<name>Rick Farina</name> -</maintainer> -<maintainer type="project"> -<email>radio@gentoo.org</email> -<name>Radio</name> -</maintainer> -</pkgmetadata> diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest index 683230c1cd31..99abf096c9a9 100644 --- a/net-libs/libmnl/Manifest +++ b/net-libs/libmnl/Manifest @@ -1 +1,2 @@ -DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9 +DIST libmnl-1.0.5.tar.bz2 314791 BLAKE2B 760ec6f7eaf3f2c6be6edf848551e4c7d16ae7cbe49f9cde297f5df06174fb7f9f490118942225558f0a89dabe9a4901c1b3b23fa1203132e36b86e6332564d6 SHA512 16fa48e74c9da7724a85c655dfb0abd8369392627934639d65de951543e1447ac3e048d231248f1ce8861443c2ef62654a85a81feeedbbffaf2e5744f6cf4c9f +DIST libmnl-1.0.5.tar.bz2.sig 566 BLAKE2B 4454f969cbc21f86c12905eb80dd7237f368bbb30e38202ef114edf77806091cda164870e825aca4305a925077d181662724412f8475866c7fbe2572b0b1da50 SHA512 bb75ae3b5520d8b9372d70da7c1a27fa3d8e50a26a05fe56397dead4d7d5ad4003e6e576becd1200a5c9ed42fe5a97273acc8c50f1fd3181688f0d0b8c607dfc diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild deleted file mode 100644 index 0e9c2adbd8c3..000000000000 --- a/net-libs/libmnl/libmnl-1.0.4.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit usr-ldscript - -DESCRIPTION="Minimalistic netlink library" -HOMEPAGE="https://netfilter.org/projects/libmnl/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0/0.2.0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux" -IUSE="examples static-libs" - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - - gen_usr_ldscript -a mnl - - find "${D}" -name '*.la' -delete || die - - if use examples; then - find examples/ -name 'Makefile*' -delete || die - dodoc -r examples/ - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/net-libs/libmnl/libmnl-1.0.5.ebuild b/net-libs/libmnl/libmnl-1.0.5.ebuild new file mode 100644 index 000000000000..d8a02c3a2bd2 --- /dev/null +++ b/net-libs/libmnl/libmnl-1.0.5.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc +inherit verify-sig + +DESCRIPTION="Minimalistic netlink library" +HOMEPAGE="https://netfilter.org/projects/libmnl/" +SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2 + verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" + +LICENSE="LGPL-2.1" +SLOT="0/0.2.0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux" +IUSE="examples" + +DEPEND="elibc_musl? ( sys-libs/queue-standalone )" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )" + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die + + if use examples; then + find examples/ -name 'Makefile*' -delete || die + dodoc -r examples/ + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild index c36887130680..2b5d9fbaedea 100644 --- a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild +++ b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~mips ppc x86" +KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86" IUSE="doc examples" RDEPEND=" @@ -18,7 +18,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen )" + doc? ( app-text/doxygen )" # TODO: php-bindings diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest index 3e9e60233fc8..4bb2fd37431d 100644 --- a/net-libs/libnatpmp/Manifest +++ b/net-libs/libnatpmp/Manifest @@ -1 +1,2 @@ DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42bcda58cada97d37a2cf74f6f6b5e27189753590552187ed7afce66d34d204b9d18ecd38ac0bcbadf8c8129a3b44ad SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09 +DIST libnatpmp-20230423.tar.gz 26506 BLAKE2B 01386509e410312d5063038a4a929e2c838d8e6061f693cd43144f98dc4725deff459cb476842e6fab78323fb87ac0ce0f74efe3837031d89ea846932dc4fdcf SHA512 1697a414f0ff73876c177d8e09242c8da6fd4bc9b1c3a893bfb082420bfdac30f455507b81937042caaf6b30756d2055c073ee1de1ac73f7ef31e4c68e5c4ed7 diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild index 4c214c0cc10d..e52252b93031 100644 --- a/net-libs/libnatpmp/libnatpmp-20150609.ebuild +++ b/net-libs/libnatpmp/libnatpmp-20150609.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,12 +6,16 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="An alternative protocol to UPnP IGD specification" -HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html" -SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz" +HOMEPAGE=" + http://miniupnp.free.fr/libnatpmp.html + https://miniupnp.tuxfamily.org/libnatpmp.html + https://github.com/miniupnp/libnatpmp/ +" +SRC_URI="https://miniupnp.tuxfamily.org/files/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" PATCHES=( "${FILESDIR}"/${PN}-20150609-gentoo.patch ) diff --git a/net-libs/libnatpmp/libnatpmp-20230423-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20230423-r1.ebuild new file mode 100644 index 000000000000..303b7e4c34bc --- /dev/null +++ b/net-libs/libnatpmp/libnatpmp-20230423-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="An alternative protocol to UPnP IGD specification" +HOMEPAGE=" + http://miniupnp.free.fr/libnatpmp.html + https://miniupnp.tuxfamily.org/libnatpmp.html + https://github.com/miniupnp/libnatpmp/ +" +SRC_URI="https://miniupnp.tuxfamily.org/files/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" + +PATCHES=( "${FILESDIR}"/${PN}-20150609-gentoo.patch ) + +src_configure() { + tc-export CC +} + +src_install() { + # Override HEADERS for missing declspec.h wrt #506832 + emake HEADERS="natpmp.h natpmp_declspec.h" PREFIX="${ED}" GENTOO_LIBDIR="$(get_libdir)" install + + dodoc Changelog.txt README + doman natpmpc.1 +} diff --git a/net-libs/libnatpmp/metadata.xml b/net-libs/libnatpmp/metadata.xml index 489e730c1c90..363bcd1cdf13 100644 --- a/net-libs/libnatpmp/metadata.xml +++ b/net-libs/libnatpmp/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">miniupnp/libnatpmp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libndp/libndp-1.8.ebuild b/net-libs/libndp/libndp-1.8.ebuild index 332edd106a89..3cb65ea54823 100644 --- a/net-libs/libndp/libndp-1.8.ebuild +++ b/net-libs/libndp/libndp-1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://libndp.org/files/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" multilib_src_configure() { ECONF_SOURCE="${S}" \ diff --git a/net-libs/libndp/metadata.xml b/net-libs/libndp/metadata.xml index 8d9090cf8d25..b44ad47293e9 100644 --- a/net-libs/libndp/metadata.xml +++ b/net-libs/libndp/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<upstream> - <remote-id type="cpe">cpe:/a:libndp:libndp</remote-id> -</upstream> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:libndp:libndp</remote-id> + <remote-id type="github">jpirko/libndp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest index b64b987126b2..a82807e0e478 100644 --- a/net-libs/libnet/Manifest +++ b/net-libs/libnet/Manifest @@ -1,2 +1,3 @@ -DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95 DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6 +DIST libnet-1.3-docs.tar.xz 21264 BLAKE2B a2c837cde6966a580b5b0cae12bfd8bb33793a5835c3c1ff1ecc273055f56d0f0084b48d7ebe768c1326ed54b67bed5dd23bb9f7524590a2095283950036e848 SHA512 b36bdd7cf9b7acca261004d2308ea6bcf11a67efe581f15ac77548dd02ed1f3e86f1daeb00cef4e774db983e13a95d7f79062258229909cb41886a45f8fd974a +DIST libnet-1.3.tar.gz 595500 BLAKE2B b43f15143e6a1de3350b814d7acd4a41d61eb08e6dfeb729868e55f65c445942ae52905953f3a4fad00402b47fc5119634233ea3ae28806c1869bb34ef6fba9b SHA512 c434327108b61e73b61acc5f2b346d049ab5d58e494db21971368eac733a9a0a3e9d95e0b4523c20629b02ed0feef086c50c582719635f21e980c440d55dd462 diff --git a/net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch b/net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch deleted file mode 100644 index 5c81dbfe9485..000000000000 --- a/net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -143,7 +143,7 @@ - AC_DEFINE(_BSD_SOURCE) - AC_DEFINE(__BSD_SOURCE) - AC_DEFINE(__FAVOR_BSD) -- LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD" -+ LIBNET_CONFIG_DEFINES="-D_DEFAULT_SOURCE -D__FAVOR_BSD" - AC_CHECK_HEADERS(net/ethernet.h, \ - LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H") - MAN_PREFIX="$prefix/man/man3/" diff --git a/net-libs/libnet/files/libnet-1.0.2a-endian.patch b/net-libs/libnet/files/libnet-1.0.2a-endian.patch deleted file mode 100644 index aad0bacb2f2e..000000000000 --- a/net-libs/libnet/files/libnet-1.0.2a-endian.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/include/libnet.h -+++ b/include/libnet.h -@@ -32,6 +32,17 @@ - #ifndef __LIBNET_H - #define __LIBNET_H - -+#include <endian.h> -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+# define LIBNET_LIL_ENDIAN 1 -+#else -+# if __BYTE_ORDER == __BIG_ENDIAN -+# define LIBNET_BIG_ENDIAN 1 -+# else -+# error unrecognized __BYTE_ORDER -+# endif -+#endif -+ - #include <stdio.h> - #include <string.h> - #include <unistd.h> diff --git a/net-libs/libnet/files/libnet-1.0.2a-funroll.patch b/net-libs/libnet/files/libnet-1.0.2a-funroll.patch deleted file mode 100644 index dd77d05dff2a..000000000000 --- a/net-libs/libnet/files/libnet-1.0.2a-funroll.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/configure.in.JeR -+++ b/configure.in -@@ -51,8 +51,7 @@ - dnl - if test $ac_cv_prog_gcc = yes; then - dnl if test -z $CFLAGS; then -- CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall' -- CFLAGS="$CCOPTS" -+: - dnl fi - fi - diff --git a/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch b/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch deleted file mode 100644 index c4f3ae925705..000000000000 --- a/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/include/libnet.h -+++ b/include/libnet.h -@@ -84,8 +84,8 @@ - #define LIBNET_VERSION "1.0.2a" - - #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN) --#error "byte order has not been specified, you'll --need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the -+#error "byte order has not been specified, you'll \ -+need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the \ - documentation regarding the libnet-config script." - #endif - diff --git a/net-libs/libnet/files/libnet-1.0.2a-slot.patch b/net-libs/libnet/files/libnet-1.0.2a-slot.patch deleted file mode 100644 index bcc0d56113f5..000000000000 --- a/net-libs/libnet/files/libnet-1.0.2a-slot.patch +++ /dev/null @@ -1,189 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -18,17 +18,17 @@ - LIB_PREFIX = @libdir@/ - MAN_PREFIX = @MAN_PREFIX@ - --LIBNET = libnet --LIBPWRITE = libpwrite -+LIBNET = libnet-1.0 -+LIBPWRITE = libpwrite-1.0 - LIB = lib/$(LIBNET).a - MAN = doc/$(LIBNET).3 - INCLUDE = include/$(LIBNET).h --INCLUDE-H = include/$(LIBNET)/$(LIBNET)-headers.h --INCLUDE-F = include/$(LIBNET)/$(LIBNET)-functions.h --INCLUDE-S = include/$(LIBNET)/$(LIBNET)-structures.h --INCLUDE-M = include/$(LIBNET)/$(LIBNET)-macros.h --INCLUDE-A = include/$(LIBNET)/$(LIBNET)-asn1.h --INCLUDE-O = include/$(LIBNET)/$(LIBNET)-ospf.h -+INCLUDE-H = include/libnet/$(LIBNET)-headers.h -+INCLUDE-F = include/libnet/$(LIBNET)-functions.h -+INCLUDE-S = include/libnet/$(LIBNET)-structures.h -+INCLUDE-M = include/libnet/$(LIBNET)-macros.h -+INCLUDE-A = include/libnet/$(LIBNET)-asn1.h -+INCLUDE-O = include/libnet/$(LIBNET)-ospf.h - CONFIG = $(LIBNET)-config - DEFINES += @DEFS@ - RANLIB = @RANLIB@ -@@ -94,7 +94,7 @@ - install: libnet - $(ENSUREDIR) $(DESTDIR)$(prefix) 755 - $(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755 -- $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755 -+ $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)/libnet/ 755 - $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755 - $(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755 - $(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755 -@@ -102,12 +102,12 @@ - rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a - cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a - $(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX) -- $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -- $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -- $(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -- $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -- $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -- $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -+ $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)/libnet/ -+ $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)/libnet/ -+ $(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)/libnet/ -+ $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)/libnet/ -+ $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)/libnet/ -+ $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)/libnet/ - $(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX) - $(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX) - -@@ -142,6 +142,6 @@ - cd support/bpf-lkm/etherspoof && rm -rf Makefile; \ - fi - rm -f config.log config.cache config.status Makefile include/config.h \ -- version.h support/bpf-lkm/etherspoof conftest* libnet-config -+ version.h support/bpf-lkm/etherspoof conftest* libnet-1.0-config - - # EOF ---- a/configure.in -+++ b/configure.in -@@ -261,6 +261,6 @@ - AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \ - test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \ - test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \ -- libnet-config, chmod +x libnet-config) -+ libnet-1.0-config, chmod +x libnet-1.0-config) - - dnl EOF ---- a/include/libnet.h -+++ b/include/libnet.h -@@ -74,12 +74,12 @@ - #include <errno.h> - #include <assert.h> - --#include "./libnet/libnet-headers.h" --#include "./libnet/libnet-structures.h" --#include "./libnet/libnet-macros.h" --#include "./libnet/libnet-asn1.h" --#include "./libnet/libnet-functions.h" --#include "./libnet/libnet-ospf.h" -+#include "./libnet/libnet-1.0-headers.h" -+#include "./libnet/libnet-1.0-structures.h" -+#include "./libnet/libnet-1.0-macros.h" -+#include "./libnet/libnet-1.0-asn1.h" -+#include "./libnet/libnet-1.0-functions.h" -+#include "./libnet/libnet-1.0-ospf.h" - - #define LIBNET_VERSION "1.0.2a" - ---- a/libnet-config.in -+++ b/libnet-config.in -@@ -9,12 +9,12 @@ - - libnet_defines="@LIBNET_CONFIG_DEFINES@" - libnet_cflags="@LIBNET_CONFIG_CFLAGS@" --libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet" -+libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet-1.0" - - usage() - { - cat <<EOF --Usage: libnet-config [OPTIONS] -+Usage: libnet-1.0-config [OPTIONS] - Options: - [--libs] - [--cflags] ---- a/test/Ethernet/Makefile.in -+++ b/test/Ethernet/Makefile.in -@@ -10,7 +10,7 @@ - CFLAGS = @CFLAGS@ - OBJECTS = arp.o tcp.o icmp_mask.o get_address.o poink.o - DEFINES += @DEFS@ --LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@ -+LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@ - - .c.o: - $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@ ---- a/test/ICMP/Makefile.in -+++ b/test/ICMP/Makefile.in -@@ -15,7 +15,7 @@ - ping_of_death.o - - DEFINES += @DEFS@ --LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@ -+LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@ - - .c.o: - $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@ ---- a/test/IP/Makefile.in -+++ b/test/IP/Makefile.in -@@ -10,7 +10,7 @@ - OBJECTS = - - DEFINES += @DEFS@ --LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@ -+LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@ - - .c.o: - $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@ ---- a/test/OSPF/Makefile.in -+++ b/test/OSPF/Makefile.in -@@ -12,7 +12,7 @@ - ospf_request.o \ - - DEFINES += @DEFS@ --LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@ -+LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@ - - .c.o: - $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@ ---- a/test/Random/Makefile.in -+++ b/test/Random/Makefile.in -@@ -9,7 +9,7 @@ - CFLAGS = @CFLAGS@ - OBJECTS = prand_trials.o - DEFINES += @DEFS@ --LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@ -+LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@ - - .c.o: - $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@ ---- a/test/TCP/Makefile.in -+++ b/test/TCP/Makefile.in -@@ -13,7 +13,7 @@ - tcp+data+ipopt.o - - DEFINES += @DEFS@ --LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@ -+LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@ - - .c.o: - $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@ ---- a/test/UDP/Makefile.in -+++ b/test/UDP/Makefile.in -@@ -11,7 +11,7 @@ - udp+data.o - - DEFINES += @DEFS@ --LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@ -+LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@ - - .c.o: - $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@ diff --git a/net-libs/libnet/files/libnet-1.0.2a-test.patch b/net-libs/libnet/files/libnet-1.0.2a-test.patch deleted file mode 100644 index 8bbb2ac45d19..000000000000 --- a/net-libs/libnet/files/libnet-1.0.2a-test.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/test/Makefile.in -+++ b/test/Makefile.in -@@ -9,31 +9,31 @@ - all: test - - test: -- if ! test -e ../lib/libnet.a; then \ -- cd .. && make; \ -+ if ! test -e ../lib/libnet-1.0.a; then \ -+ cd .. && $(MAKE); \ - fi -- cd Random; make all -- cd ICMP; make all -- cd UDP; make all -- cd TCP; make all -- cd Ethernet; make all -- cd OSPF; make all -+ cd Random; $(MAKE) all -+ cd ICMP; $(MAKE) all -+ cd UDP; $(MAKE) all -+ cd TCP; $(MAKE) all -+ cd Ethernet; $(MAKE) all -+ cd OSPF; $(MAKE) all - - clean: -- cd Random; make clean -- cd ICMP; make clean -- cd UDP; make clean -- cd TCP; make clean -- cd Ethernet; make clean -- cd OSPF; make clean -+ cd Random; $(MAKE) clean -+ cd ICMP; $(MAKE) clean -+ cd UDP; $(MAKE) clean -+ cd TCP; $(MAKE) clean -+ cd Ethernet; $(MAKE) clean -+ cd OSPF; $(MAKE) clean - - distclean: clean -- cd TCP; make distclean -- cd UDP; make distclean -- cd ICMP; make distclean -- cd Random; make distclean -- cd Ethernet; make distclean -- cd OSPF; make distclean -+ cd TCP; $(MAKE) distclean -+ cd UDP; $(MAKE) distclean -+ cd ICMP; $(MAKE) distclean -+ cd Random; $(MAKE) distclean -+ cd Ethernet; $(MAKE) distclean -+ cd OSPF; $(MAKE) distclean - rm -f Makefile - - # EOF diff --git a/net-libs/libnet/libnet-1.0.2a-r7.ebuild b/net-libs/libnet/libnet-1.0.2a-r7.ebuild deleted file mode 100644 index c07ef94b90a0..000000000000 --- a/net-libs/libnet/libnet-1.0.2a-r7.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="library providing an API for commonly used low-level network functions" -HOMEPAGE="http://www.packetfactory.net/libnet/" -SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz" -S="${WORKDIR}"/Libnet-${PV} - -LICENSE="BSD BSD-2 HPND" -SLOT="1.0" -KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch - "${FILESDIR}"/${PN}-1.0.2a-slot.patch - "${FILESDIR}"/${PN}-1.0.2a-endian.patch - "${FILESDIR}"/${PN}-1.0.2a-_SOURCE.patch - "${FILESDIR}"/${PN}-1.0.2a-funroll.patch - "${FILESDIR}"/${PN}-1.0.2a-test.patch - -) - -src_prepare() { - default - - cd "${S}" || die - mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config" - - cd "${S}"/include || die - ln -s libnet.h libnet-${SLOT}.h || die - - cd libnet || die - for f in *.h ; do - ln -s ${f} ${f/-/-${SLOT}-} || die - done - - cd "${S}"/doc || die - ln -s libnet.3 libnet-${SLOT}.3 || die - - cd "${S}" || die - - eautoreconf - tc-export AR RANLIB -} - -src_test() { - emake -C test -} - -src_install() { - default - doman "${ED}"/usr/man/man3/libnet-1.0.3 - rm -r "${ED}"/usr/man || die - - dodoc VERSION doc/{README,TODO*,CHANGELOG*} - newdoc README README.1st - - docinto example - dodoc example/libnet* - - docinto Ancillary - dodoc doc/Ancillary/* -} diff --git a/net-libs/libnet/libnet-1.2.9999.ebuild b/net-libs/libnet/libnet-1.2.9999.ebuild deleted file mode 100644 index d2ccab097069..000000000000 --- a/net-libs/libnet/libnet-1.2.9999.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="library providing an API for commonly used low-level network functions" -HOMEPAGE="http://libnet-dev.sourceforge.net/ https://github.com/libnet/libnet" -EGIT_REPO_URI="https://github.com/libnet/libnet" - -LICENSE="BSD BSD-2 HPND" -SLOT="1.1" -KEYWORDS="" -IUSE="static-libs" - -DOCS=( - ChangeLog.md README.md doc/{MIGRATION,RAWSOCKET,TODO}.md -) -S=${WORKDIR}/${P/_/-} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libnet/libnet-1.2.ebuild b/net-libs/libnet/libnet-1.2.ebuild index 4071d7c28158..084d3b784384 100644 --- a/net-libs/libnet/libnet-1.2.ebuild +++ b/net-libs/libnet/libnet-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="BSD BSD-2 HPND" SLOT="1.1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="static-libs" DOCS=( diff --git a/net-libs/libnet/libnet-1.3-r1.ebuild b/net-libs/libnet/libnet-1.3-r1.ebuild new file mode 100644 index 000000000000..edd23888d1d4 --- /dev/null +++ b/net-libs/libnet/libnet-1.3-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit libtool + +# TODO: Fix upstream dist tarballs to include man pages! +# https://github.com/libnet/libnet/issues/169 +# +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-libnet-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +: ${LIBNET_DOCS_PREBUILT:=1} + +LIBNET_DOCS_PREBUILT_DEV=sam +LIBNET_DOCS_VERSION="${PV}" +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# bug #830088 +LIBNET_DOCS_USEFLAG="+man" + +DESCRIPTION="Library for commonly used low-level network functions" +HOMEPAGE="http://libnet-dev.sourceforge.net/ https://github.com/libnet/libnet" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" +if [[ ${LIBNET_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !man? ( https://dev.gentoo.org/~${LIBNET_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${LIBNET_DOCS_VERSION}-docs.tar.xz )" + LIBNET_DOCS_USEFLAG="man" +fi + +LICENSE="BSD BSD-2" +SLOT="1.1" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="${LIBNET_DOCS_USEFLAG} static-libs test" +# Fails in sandbox, tries to access /proc/self/uid_map. +RESTRICT="!test? ( test ) test" + +BDEPEND=" + man? ( app-text/doxygen ) + test? ( dev-util/cmocka ) +" + +DOCS=( ChangeLog.md README.md doc/MIGRATION.md ) + +src_prepare() { + default + elibtoolize +} + +src_configure() { + local myeconfargs=( + $(use_enable man doxygen-doc) + $(use_enable man doxygen-man) + $(use_enable static-libs static) + $(use_enable test tests) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if ! use man && [[ ${LIBNET_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${LIBNET_DOCS_VERSION}-docs/man/*/*.[0-8] + fi + + find "${D}" -name '*.la' -delete || die +} diff --git a/net-libs/libnet/libnet-1.3.ebuild b/net-libs/libnet/libnet-1.3.ebuild new file mode 100644 index 000000000000..6abdb12e4e75 --- /dev/null +++ b/net-libs/libnet/libnet-1.3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Library for commonly used low-level network functions" +HOMEPAGE="http://libnet-dev.sourceforge.net/ https://github.com/libnet/libnet" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="BSD BSD-2" +SLOT="1.1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="static-libs test" +# Fails in sandbox, tries to access /proc/self/uid_map. +RESTRICT="!test? ( test ) test" + +# doxygen needed for man pages +BDEPEND=" + app-text/doxygen + test? ( dev-util/cmocka ) +" + +DOCS=( ChangeLog.md README.md doc/MIGRATION.md ) + +src_configure() { + local myeconfargs=( + --enable-doxygen-man + + $(use_enable static-libs static) + $(use_enable test tests) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${D}" -name '*.la' -delete || die +} diff --git a/net-libs/libnet/metadata.xml b/net-libs/libnet/metadata.xml index 1a870bc24ace..4f1b7787f29f 100644 --- a/net-libs/libnet/metadata.xml +++ b/net-libs/libnet/metadata.xml @@ -6,22 +6,24 @@ <name>Gentoo network monitoring and analysis project</name> </maintainer> <longdescription> -Libnet is a high-level API (toolkit) allowing the application -programmer to construct and inject network packets. It provides a -portable and simplified interface for low-level network packet -shaping, handling and injection. Libnet hides much of the tedium -of packet creation from the application programmer such as -multiplexing, buffer management, arcane packet header -information, byte-ordering, OS-dependent issues, and much more. -Libnet features portable packet creation interfaces at the IP -layer and link layer, as well as a host of supplementary and -complementary functionality. Using libnet, quick and simple -packet assembly applications can be whipped up with little -effort. With a bit more time, more complex programs can be -written (Traceroute and ping were easily rewritten using libnet -and libpcap). -</longdescription> + Libnet is a high-level API (toolkit) allowing the application + programmer to construct and inject network packets. It provides a + portable and simplified interface for low-level network packet + shaping, handling and injection. Libnet hides much of the tedium + of packet creation from the application programmer such as + multiplexing, buffer management, arcane packet header + information, byte-ordering, OS-dependent issues, and much more. + Libnet features portable packet creation interfaces at the IP + layer and link layer, as well as a host of supplementary and + complementary functionality. Using libnet, quick and simple + packet assembly applications can be whipped up with little + effort. With a bit more time, more complex programs can be + written (Traceroute and ping were easily rewritten using libnet + and libpcap). + </longdescription> <upstream> <remote-id type="sourceforge">libnet-dev</remote-id> + <remote-id type="github">libnet/libnet</remote-id> + <remote-id type="cpe">cpe:/a:libnet_project:libnet</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest index 3b2bbaf918f4..a62e46dfc71e 100644 --- a/net-libs/libnetconf2/Manifest +++ b/net-libs/libnetconf2/Manifest @@ -1,2 +1 @@ -DIST libnetconf2-2.0.19.tar.gz 300454 BLAKE2B 7ff97dcc964124f93631b2fe08f9f713deb698e7d591ca245f9638f32a19915ce6e8cf9e7170bcd6059369926044a705fc03ef18e28baba8eef1c8296bb52d8e SHA512 0e53d4803b8a5d3ff041b393487c71ca09878fa47cbe3ac4d1f26cf45f2ede80992964e339747435003c3bc61053f4b6297a29d6e2a5511ba6b4e93edb3ce136 -DIST libnetconf2-2.0.24.tar.gz 301111 BLAKE2B ffc4dffd797e4589a5892f3cf80d6a373808ee48c00e46a37ff02082c721c49b27aa06962e962698d3b443e08e9cba55b4205cc6e76958df325c6fc5a38fed22 SHA512 05cba691bc47e49abf747a36a6dcc978a4163fd155a90609315585201e4e4d20c9a30b683180f5cf03aac5b6a37933917e61a895067dd172b8de2142ec542dfc +DIST libnetconf2-2.1.31.tar.gz 323423 BLAKE2B 8a6a3e4e7eaf94ce2afba688555956159fb48ad83e802f187acc222dc3e3c62ab718758dfaa39abc81417895098c75cb0ee490ac64412634e88cef7389556ecb SHA512 f174aee332aa775308d8fbd7aff450af9531c94dfe76279a87acd3554f07957c468a1ef2d2c2c6a63748f87920790616426839cb9c3e0c50ec2c88c98273d8aa diff --git a/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild b/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild deleted file mode 100644 index 831ee0c2cca4..000000000000 --- a/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="C library for building NETCONF servers and clients" -HOMEPAGE="https://github.com/CESNET/libnetconf2" -SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/openssl:0= - >=net-libs/libyang-2.0.112:= - net-libs/libssh:0=[server] - virtual/libcrypt:=" -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" -BDEPEND=" - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" - -src_configure() { - local mycmakeargs=( - -DENABLE_TESTS=$(usex test) - -DENABLE_VALGRIND_TESTS=OFF - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use doc && cmake_src_compile doc -} - -src_install() { - cmake_src_install - - use doc && dodoc -r doc/. -} diff --git a/net-libs/libnetconf2/libnetconf2-2.0.19.ebuild b/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild index d5a64fa35f35..14144aaf22aa 100644 --- a/net-libs/libnetconf2/libnetconf2-2.0.19.ebuild +++ b/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild @@ -1,9 +1,9 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="C library for building NETCONF servers and clients" HOMEPAGE="https://github.com/CESNET/libnetconf2" @@ -11,22 +11,31 @@ SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" IUSE="doc test" RESTRICT="!test? ( test )" RDEPEND=" dev-libs/openssl:0= - >=net-libs/libyang-2.0.97:= + >=net-libs/libyang-2.0.194 net-libs/libssh:0=[server] virtual/libcrypt:=" DEPEND="${RDEPEND} test? ( dev-util/cmocka )" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" + doc? ( app-text/doxygen[dot] )" src_configure() { + # fails tests, but only with LTO. + # [ ERROR ] --- 0 != 0xffffffffffffffff + # [ LINE ] --- /var/tmp/portage/net-libs/libnetconf2-2.1.31/work/libnetconf2-2.1.31/tests/client/test_client_ssh.c:716: error: Failure! + # [ FAILED ] test_nc_client_ssh_ch_add_bind_listen + # + # https://bugs.gentoo.org/877449 + # https://github.com/CESNET/libnetconf2/issues/471 + filter-lto + local mycmakeargs=( -DENABLE_TESTS=$(usex test) -DENABLE_VALGRIND_TESTS=OFF diff --git a/net-libs/libnetfilter_acct/Manifest b/net-libs/libnetfilter_acct/Manifest index 00a0ca995aac..a432148991f0 100644 --- a/net-libs/libnetfilter_acct/Manifest +++ b/net-libs/libnetfilter_acct/Manifest @@ -1 +1,2 @@ DIST libnetfilter_acct-1.0.3.tar.bz2 296999 BLAKE2B c696a5830c2445fd8369182c413a8144f4b0d669dd8ef57e59d54bd8ad406e15bec72ede8d2ee0d7bbb61fbc2218380168e03ed62daaef9e026cbe83e79982c2 SHA512 5ca332840663941182343fdc0d5e45116bba71a97a913db0b385ea37ef31a04f8267a2279b7a2862ce338c6eeb093bb3ef9908f57770e64acf5d2b2266d3bfe5 +DIST libnetfilter_acct-1.0.3.tar.bz2.sig 543 BLAKE2B 1f219bacf8a65777ddeb2888591694925c77cc6270b9e943161acc2265eec16a43c2228bd1889194f35f3ebd1a493dce9f9ce1ddd397d1fe2f5bb18095296ed0 SHA512 61f55142ff52101d838d99f6a48f525c1189d7249e781f81a809f8df17c909567ceeed0d51d01ea743ecad127327d7cf5fdbb42560d3e7eb5c075376b69f4b06 diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild index f29d830b8c16..cb0ae142208f 100644 --- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild +++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild @@ -1,24 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit linux-info +inherit linux-info verify-sig DESCRIPTION="Library providing interface to extended accounting infrastructure" HOMEPAGE="https://netfilter.org/projects/libnetfilter_acct/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" +SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2 + verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 x86 ~amd64-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv x86 ~amd64-linux" IUSE="examples" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc RDEPEND=" net-libs/libmnl " DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" +BDEPEND="virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-netfilter )" DOCS=( README ) diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest index a13a4b376356..b0f443c532cf 100644 --- a/net-libs/libnetfilter_conntrack/Manifest +++ b/net-libs/libnetfilter_conntrack/Manifest @@ -1,3 +1,2 @@ -DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579948b0d28e9ab88d39ebe08e97fe8be0eb3f10f64b36d0f85e9e35408019ab22404b3452e4c6d7b2812ea316031f3e0c4367c23019 SHA512 05b3b63928d46ed114048848c48094a762c6a7acc93fcdbe9473e82cc67851ef1a0d33b68b8fd388271b76b519c4d2ac93fd802043fa9a9da46cda5b262a1fc7 -DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b07675cfbd84836873a9d09092b16bba318e93da56085ea5a4726a908ed5d1974aa524bee0f912e2be23f6a4c9e9e46641baf0c6a18 SHA512 5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b -DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82 +DIST libnetfilter_conntrack-1.0.9.tar.bz2 373177 BLAKE2B 701393338a0bf852b97d80a1e4ab078dea741f7181246b3dafcbe8cff287b5b9fae72c1c50867ea71baab83fa842471b2c7054fb4702bf35900a352078de8f3a SHA512 e8b03425aaba3b72e6034c215656c34176d0550c08e0455aaeb1365d9141505d0c4feaa8978c8ccf2b7af9db6c9e874ceb866347e533b41cb03a189884f4004c +DIST libnetfilter_conntrack-1.0.9.tar.bz2.sig 566 BLAKE2B 0f80f00858093ed5e9aac190fbb1ac5ac1dde60e6767b65adda49ed79fb7fb6cc7caea51793d8930a927d9b7a75d263851dd5741d6d408a8b56d3ea5b73da20e SHA512 83ed38f68bd38cf70d9c245a7f17373751ff9099ceff3066812b282b7426edf2eee79da8f5aea896b119327059008ff4a531b3dfdcd79d49944bea4079e67e1f diff --git a/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-configure-clang16.patch b/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-configure-clang16.patch new file mode 100644 index 000000000000..7bb4a34765ae --- /dev/null +++ b/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-configure-clang16.patch @@ -0,0 +1,16 @@ +https://bugzilla.netfilter.org/show_bug.cgi?id=1654 +--- a/configure.ac ++++ b/configure.ac +@@ -55,9 +55,9 @@ int main() + struct in6_addr addr6; + char buf[128]; + if (inet_ntop(AF_INET6, &addr6, buf, 128) == 0 && errno == EAFNOSUPPORT) +- exit(1); ++ return 1; + else +- exit(0); ++ return 0; + } + ]])],[ AC_MSG_RESULT(yes) + AC_DEFINE_UNQUOTED(HAVE_INET_NTOP_IPV6, 1, [Define to 1 if inet_ntop supports IPv6.]) + diff --git a/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch b/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch new file mode 100644 index 000000000000..e1ce87df4e89 --- /dev/null +++ b/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch @@ -0,0 +1,46 @@ +https://git.netfilter.org/libnetfilter_conntrack/patch/?id=21ee35dde73aec5eba35290587d479218c6dd824 + +From: Robert Marko <robimarko@gmail.com> +Date: Thu, 24 Feb 2022 15:01:11 +0100 +Subject: conntrack: fix build with kernel 5.15 and musl + +Currently, with kernel 5.15 headers and musl building is failing with +redefinition errors due to a conflict between the kernel and musl headers. + +Musl is able to suppres the conflicting kernel header definitions if they +are included after the standard libc ones, however since ICMP definitions +were moved into a separate internal header to avoid duplication this has +stopped working and is breaking the builds. + +It seems that the issue is that <netinet/in.h> which contains the UAPI +suppression defines is included in the internal.h header and not in the +proto.h which actually includes the kernel ICMP headers and thus UAPI +supression defines are not present. + +Solve this by moving the <netinet/in.h> include before the ICMP kernel +includes in the proto.h + +Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") +Signed-off-by: Robert Marko <robimarko@gmail.com> +Signed-off-by: Florian Westphal <fw@strlen.de> +--- a/include/internal/internal.h ++++ b/include/internal/internal.h +@@ -14,7 +14,6 @@ + #include <arpa/inet.h> + #include <time.h> + #include <errno.h> +-#include <netinet/in.h> + + #include <libnfnetlink/libnfnetlink.h> + #include <libnetfilter_conntrack/libnetfilter_conntrack.h> +--- a/include/internal/proto.h ++++ b/include/internal/proto.h +@@ -2,6 +2,7 @@ + #define _NFCT_PROTO_H_ + + #include <stdint.h> ++#include <netinet/in.h> + #include <linux/icmp.h> + #include <linux/icmpv6.h> + +cgit v1.2.3 diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild deleted file mode 100644 index 62ad204c78dc..000000000000 --- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info - -DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table" -HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="static-libs" - -RDEPEND=" - >=net-libs/libmnl-1.0.3 - >=net-libs/libnfnetlink-1.0.0 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( README ) - -pkg_setup() { - linux-info_pkg_setup - - if kernel_is lt 2 6 18 ; then - die "${PN} requires at least 2.6.18 kernel version" - fi - - # netfilter core team has changed some option names with kernel 2.6.20 - if kernel_is lt 2 6 20 ; then - CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK" - else - CONFIG_CHECK="~NF_CT_NETLINK" - fi - - check_extra_config -} diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild deleted file mode 100644 index 3ef261d55d21..000000000000 --- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info - -DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table" -HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="static-libs" - -RDEPEND=" - >=net-libs/libmnl-1.0.3 - >=net-libs/libnfnetlink-1.0.0 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( README ) - -pkg_setup() { - linux-info_pkg_setup - - if kernel_is lt 2 6 18 ; then - die "${PN} requires at least 2.6.18 kernel version" - fi - - # netfilter core team has changed some option names with kernel 2.6.20 - if kernel_is lt 2 6 20 ; then - CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK" - else - CONFIG_CHECK="~NF_CT_NETLINK" - fi - - check_extra_config -} diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild deleted file mode 100644 index 3ef261d55d21..000000000000 --- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info - -DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table" -HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="static-libs" - -RDEPEND=" - >=net-libs/libmnl-1.0.3 - >=net-libs/libnfnetlink-1.0.0 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( README ) - -pkg_setup() { - linux-info_pkg_setup - - if kernel_is lt 2 6 18 ; then - die "${PN} requires at least 2.6.18 kernel version" - fi - - # netfilter core team has changed some option names with kernel 2.6.20 - if kernel_is lt 2 6 20 ; then - CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK" - else - CONFIG_CHECK="~NF_CT_NETLINK" - fi - - check_extra_config -} diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9-r1.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9-r1.ebuild new file mode 100644 index 000000000000..66654f89a3fe --- /dev/null +++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info verify-sig + +DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table" +HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/" +SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2 + verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc + +RDEPEND=">=net-libs/libmnl-1.0.3 + >=net-libs/libnfnetlink-1.0.0" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-netfilter )" + +DOCS=( README ) + +PATCHES=( + "${FILESDIR}"/${P}-musl.patch + "${FILESDIR}"/${PN}-1.0.9-configure-clang16.patch +) + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is lt 2 6 18 ; then + die "${PN} requires at least 2.6.18 kernel version" + fi + + # netfilter core team has changed some option names with kernel 2.6.20 + if kernel_is lt 2 6 20 ; then + CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK" + else + CONFIG_CHECK="~NF_CT_NETLINK" + fi + + check_extra_config +} + +src_prepare() { + default + + # autoreconf only for clang 16 configure patch + eautoreconf +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest index 7a341812b1a0..41edd0e55942 100644 --- a/net-libs/libnetfilter_cthelper/Manifest +++ b/net-libs/libnetfilter_cthelper/Manifest @@ -1 +1,2 @@ -DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 BLAKE2B 622a4e27629d97a0ab2b5032e972914f2ab8764ab60ab7090b173ceabfe9648e09452e931dacb822090c5f816b553b8e73b8f8a4ee431db9f6dd092d9d4283ee SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45 +DIST libnetfilter_cthelper-1.0.1.tar.bz2 291739 BLAKE2B cc5ae85dca896c0b8b1b704e0c5cc201677f48c2765520dc992a1b218d1334e04c592ba48cf06efe32a5089c7ad70fa44cbb2b40f2e8400d7ef9d2976a6425ee SHA512 f0591edd579aee92b62446e2b8fef6af9c404848c42c8da76850bb01aec3567442612f53cf8d3af6ba4d6d920487bff310a4e547bccf595478b1f96b4280eada +DIST libnetfilter_cthelper-1.0.1.tar.bz2.sig 566 BLAKE2B 2904ddbe9bea0ea4a126bdd286a0d3eaf8e850e49cb3cb0ec196d424bbf91b89abe8ada8c1c5db29b5764c2d003de1212885a9f6676fee454237801ba02bc5a4 SHA512 991f1e20673eb290fc9b4b35c5dd0c27223398e560f4807b5497fc6b69780594cbae026481dbdf1862a25da7537f60b7d938038a8310cf3b0cd207ca1d3672e6 diff --git a/net-libs/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0-clang-export.patch b/net-libs/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0-clang-export.patch deleted file mode 100644 index 4958bcd6ac39..000000000000 --- a/net-libs/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0-clang-export.patch +++ /dev/null @@ -1,387 +0,0 @@ -fix from upstream - -From f58c5b09fb59baf07c942d373fc4d522b27e73c6 Mon Sep 17 00:00:00 2001 -From: Kevin Cernekee <cernekee@chromium.org> -Date: Wed, 4 Jan 2017 14:30:26 -0800 -Subject: [PATCH] Use __EXPORTED rather than EXPORT_SYMBOL - -clang is sensitive to the ordering of -__attribute__((visibility("default"))) relative to the function -body. gcc is not. So if we try to re-declare an existing function -with default visibility, clang prints a warning and generates -a broken .so file in which nfct_helper_* are not exported to library -callers. - -Move the attribute up into the function definition to make clang happy. - -Signed-off-by: Kevin Cernekee <cernekee@chromium.org> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - doxygen.cfg.in | 2 +- - src/internal.h | 5 ++- - src/libnetfilter_cthelper.c | 83 ++++++++++++++++++--------------------------- - 3 files changed, 36 insertions(+), 54 deletions(-) - -diff --git a/doxygen.cfg.in b/doxygen.cfg.in -index cac9b0510b4d..190b7cd6e716 100644 ---- a/doxygen.cfg.in -+++ b/doxygen.cfg.in -@@ -72,7 +72,7 @@ RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO - EXCLUDE_PATTERNS = */.git/* .*.d --EXCLUDE_SYMBOLS = EXPORT_SYMBOL -+EXCLUDE_SYMBOLS = - EXAMPLE_PATH = - EXAMPLE_PATTERNS = - EXAMPLE_RECURSIVE = NO -diff --git a/src/internal.h b/src/internal.h -index 3a88d1a1f7d8..5d781718ddad 100644 ---- a/src/internal.h -+++ b/src/internal.h -@@ -3,10 +3,9 @@ - - #include "config.h" - #ifdef HAVE_VISIBILITY_HIDDEN --# define __visible __attribute__((visibility("default"))) --# define EXPORT_SYMBOL(x) typeof(x) (x) __visible -+# define __EXPORTED __attribute__((visibility("default"))) - #else --# define EXPORT_SYMBOL -+# define __EXPORTED - #endif - - #endif -diff --git a/src/libnetfilter_cthelper.c b/src/libnetfilter_cthelper.c -index f8f58e6c9c5e..af543a17fafa 100644 ---- a/src/libnetfilter_cthelper.c -+++ b/src/libnetfilter_cthelper.c -@@ -99,17 +99,16 @@ struct nfct_helper { - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_helper *nfct_helper_alloc(void) -+struct nfct_helper __EXPORTED *nfct_helper_alloc(void) - { - return calloc(1, sizeof(struct nfct_helper)); - } --EXPORT_SYMBOL(nfct_helper_alloc); - - /** - * nfct_helper_free - release one helper object - * \param nfct_helper pointer to the helper object - */ --void nfct_helper_free(struct nfct_helper *h) -+void __EXPORTED nfct_helper_free(struct nfct_helper *h) - { - int i; - -@@ -119,7 +118,6 @@ void nfct_helper_free(struct nfct_helper *h) - } - free(h); - } --EXPORT_SYMBOL(nfct_helper_free); - - /** - * nfct_helper_policy_alloc - allocate a new helper policy object -@@ -127,21 +125,19 @@ EXPORT_SYMBOL(nfct_helper_free); - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_helper_policy *nfct_helper_policy_alloc(void) -+struct nfct_helper_policy __EXPORTED *nfct_helper_policy_alloc(void) - { - return calloc(1, sizeof(struct nfct_helper_policy)); - } --EXPORT_SYMBOL(nfct_helper_policy_alloc); - - /** - * nfct_helper_free - release one helper policy object - * \param nfct_helper pointer to the helper object - */ --void nfct_helper_policy_free(struct nfct_helper_policy *p) -+void __EXPORTED nfct_helper_policy_free(struct nfct_helper_policy *p) - { - free(p); - } --EXPORT_SYMBOL(nfct_helper_policy_free); - - /** - * nfct_helper_policy_attr_set - set one attribute of the helper object -@@ -149,7 +145,7 @@ EXPORT_SYMBOL(nfct_helper_policy_free); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_policy_attr_set(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - const void *data) -@@ -170,7 +166,6 @@ nfct_helper_policy_attr_set(struct nfct_helper_policy *p, - break; - } - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set); - - /** - * nfct_helper_attr_set_str - set one attribute the helper object -@@ -178,23 +173,21 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_set); - * \param type attribute type you want to set - * \param name string that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_policy_attr_set_str(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - const char *name) - { - nfct_helper_policy_attr_set(p, type, name); - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set_str); - --void -+void __EXPORTED - nfct_helper_policy_attr_set_u32(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - uint32_t value) - { - nfct_helper_policy_attr_set(p, type, &value); - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set_u32); - - /** - * nfct_helper_attr_set - set one attribute of the helper object -@@ -202,7 +195,7 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_set_u32); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_attr_set(struct nfct_helper *h, - enum nfct_helper_attr_type type, const void *data) - { -@@ -250,7 +243,6 @@ nfct_helper_attr_set(struct nfct_helper *h, - break; - } - } --EXPORT_SYMBOL(nfct_helper_attr_set); - - /** - * nfct_helper_attr_set_str - set one attribute the helper object -@@ -258,44 +250,40 @@ EXPORT_SYMBOL(nfct_helper_attr_set); - * \param type attribute type you want to set - * \param name string that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_attr_set_str(struct nfct_helper *nfct_helper, enum nfct_helper_attr_type type, - const char *name) - { - nfct_helper_attr_set(nfct_helper, type, name); - } --EXPORT_SYMBOL(nfct_helper_attr_set_str); - --void -+void __EXPORTED - nfct_helper_attr_set_u8(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint8_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u8); - --void -+void __EXPORTED - nfct_helper_attr_set_u16(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint16_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u16); - --void -+void __EXPORTED - nfct_helper_attr_set_u32(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint32_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u32); - - /** - * nfct_helper_attr_unset - unset one attribute the helper object - * \param nfct_helper pointer to the helper object - * \param type attribute type you want to set - */ --void -+void __EXPORTED - nfct_helper_attr_unset(struct nfct_helper *nfct_helper, enum nfct_helper_attr_type type) - { - switch(type) { -@@ -307,7 +295,6 @@ nfct_helper_attr_unset(struct nfct_helper *nfct_helper, enum nfct_helper_attr_ty - break; - } - } --EXPORT_SYMBOL(nfct_helper_attr_unset); - - /** - * nfct_helper_attr_get - get one attribute the helper object -@@ -317,8 +304,9 @@ EXPORT_SYMBOL(nfct_helper_attr_unset); - * This function returns a valid pointer to the attribute data. If a - * unsupported attribute is used, this returns NULL. - */ --const void *nfct_helper_attr_get(struct nfct_helper *helper, -- enum nfct_helper_attr_type type) -+const void __EXPORTED * -+nfct_helper_attr_get(struct nfct_helper *helper, -+ enum nfct_helper_attr_type type) - { - const void *ret = NULL; - -@@ -358,7 +346,6 @@ const void *nfct_helper_attr_get(struct nfct_helper *helper, - } - return ret; - } --EXPORT_SYMBOL(nfct_helper_attr_get); - - /** - * nfct_helper_attr_get_str - get one attribute the helper object -@@ -368,13 +355,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get); - * This function returns a valid pointer to the beginning of the string. - * If the attribute is unsupported, this returns NULL. - */ --const char * -+const char __EXPORTED * - nfct_helper_attr_get_str(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type) - { - return (const char *)nfct_helper_attr_get(nfct_helper, type); - } --EXPORT_SYMBOL(nfct_helper_attr_get_str); - - /** - * nfct_helper_attr_get_u8 - get one attribute the helper object -@@ -384,12 +370,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_str); - * This function returns a unsigned 8-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint8_t nfct_helper_attr_get_u8(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint8_t __EXPORTED -+nfct_helper_attr_get_u8(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint8_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u8); - - /** - * nfct_helper_attr_get_u16 - get one attribute the helper object -@@ -399,12 +385,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u8); - * This function returns a unsigned 16-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint16_t nfct_helper_attr_get_u16(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint16_t __EXPORTED -+nfct_helper_attr_get_u16(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint16_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u16); - - /** - * nfct_helper_attr_get_u32 - get one attribute the helper object -@@ -414,12 +400,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u16); - * This function returns a unsigned 32-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint32_t nfct_helper_attr_get_u32(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint32_t __EXPORTED -+nfct_helper_attr_get_u32(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint32_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u32); - - /** - * nfct_helper_snprintf - print helper object into one buffer -@@ -431,9 +417,10 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u32); - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int nfct_helper_snprintf(char *buf, size_t size, -- struct nfct_helper *helper, -- unsigned int type, unsigned int flags) -+int __EXPORTED -+nfct_helper_snprintf(char *buf, size_t size, -+ struct nfct_helper *helper, -+ unsigned int type, unsigned int flags) - { - int ret; - -@@ -454,7 +441,6 @@ int nfct_helper_snprintf(char *buf, size_t size, - - return ret; - } --EXPORT_SYMBOL(nfct_helper_snprintf); - - /** - * @} -@@ -490,7 +476,7 @@ EXPORT_SYMBOL(nfct_helper_snprintf); - * - Command NFNL_MSG_ACCT_DEL, to delete one specific nfct_helper object (if - * unused, otherwise you hit EBUSY). - */ --struct nlmsghdr * -+struct nlmsghdr __EXPORTED * - nfct_helper_nlmsg_build_hdr(char *buf, uint8_t cmd, - uint16_t flags, uint32_t seq) - { -@@ -509,7 +495,6 @@ nfct_helper_nlmsg_build_hdr(char *buf, uint8_t cmd, - - return nlh; - } --EXPORT_SYMBOL(nfct_helper_nlmsg_build_hdr); - - static void - nfct_helper_nlmsg_build_policy(struct nlmsghdr *nlh, -@@ -530,7 +515,7 @@ nfct_helper_nlmsg_build_policy(struct nlmsghdr *nlh, - * \param nlh: netlink message that you want to use to add the payload. - * \param nfct_helper: pointer to a helper object - */ --void -+void __EXPORTED - nfct_helper_nlmsg_build_payload(struct nlmsghdr *nlh, struct nfct_helper *h) - { - struct nlattr *nest; -@@ -593,7 +578,6 @@ nfct_helper_nlmsg_build_payload(struct nlmsghdr *nlh, struct nfct_helper *h) - if (h->bitset & (1 << NFCTH_ATTR_STATUS)) - mnl_attr_put_u32(nlh, NFCTH_STATUS, ntohl(h->status)); - } --EXPORT_SYMBOL(nfct_helper_nlmsg_build_payload); - - static int - nfct_helper_nlmsg_parse_tuple_cb(const struct nlattr *attr, void *data) -@@ -795,7 +779,7 @@ nfct_helper_nlmsg_parse_attr_cb(const struct nlattr *attr, void *data) - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int -+int __EXPORTED - nfct_helper_nlmsg_parse_payload(const struct nlmsghdr *nlh, - struct nfct_helper *h) - { -@@ -832,7 +816,6 @@ nfct_helper_nlmsg_parse_payload(const struct nlmsghdr *nlh, - } - return 0; - } --EXPORT_SYMBOL(nfct_helper_nlmsg_parse_payload); - - /** - * @} --- -2.11.0 - diff --git a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.1-r1.ebuild index 6d07d30b2777..4e85a1dea58a 100644 --- a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild +++ b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.1-r1.ebuild @@ -1,29 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit linux-info +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc +inherit linux-info verify-sig DESCRIPTION="Userspace library for interface to user-space helper for conntrack" HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cthelper/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" +SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2 + verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86" -BDEPEND="virtual/pkgconfig" RDEPEND="net-libs/libmnl:=" DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-clang-export.patch -) +BDEPEND="virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-netfilter )" CONFIG_CHECK="~NF_CT_NETLINK_HELPER" pkg_setup() { linux-info_pkg_setup + kernel_is lt 3 6 0 && ewarn "requires at least 3.6.0 kernel version" } + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest index 0a61fe593651..af275469a63c 100644 --- a/net-libs/libnetfilter_cttimeout/Manifest +++ b/net-libs/libnetfilter_cttimeout/Manifest @@ -1 +1,2 @@ -DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 BLAKE2B 8b0f952bcd4184141a434abe25f807ad07bb74713a3506d335c5368ddce2809596c77e5e534337d897fb6268afa137f6d98cfd314b0b33b4996e4a0df4d8eba6 SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85 +DIST libnetfilter_cttimeout-1.0.1.tar.bz2 292649 BLAKE2B b51d631ee6b4c3bb34cf1394e2a3216a6ac4d89773bafecd058b31bdf78bf5eb255d3cb2539ca591f64c95cdf7f0db720a5b78e90009e0c7c208219ed454686f SHA512 3f7886b2b8c67fb45d9f6d03f8a327d0f04072abf75ec0fa310f4a321a1749607e79b48f47c8b8488f9833734689419264afada0cbc1f0360a5ae9e17d4a1100 +DIST libnetfilter_cttimeout-1.0.1.tar.bz2.sig 566 BLAKE2B eecbb2c7453ab1db598c4e02e7a0d5c29d68cb2788537ce22783bc0856ed6f6c64d66cdd9e2438fa901ebaf1c5dcad6b3a816678de2410cd414a5bf387f8ced0 SHA512 da491294392d94ddf7f1267607bc631ffc564a9e21b439b60a13b7d1259b7a80bc0d4f70208a79f0b674c26ac434c924216775bbe968d56bce5f3fa587eef3fb diff --git a/net-libs/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0-clang-export.patch b/net-libs/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0-clang-export.patch deleted file mode 100644 index ba706d3807df..000000000000 --- a/net-libs/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0-clang-export.patch +++ /dev/null @@ -1,266 +0,0 @@ -fix from upstream - -From d0c4e39d12f903e06db262656cff2e24d267bed7 Mon Sep 17 00:00:00 2001 -From: Kevin Cernekee <cernekee@chromium.org> -Date: Wed, 4 Jan 2017 14:30:25 -0800 -Subject: [PATCH] Use __EXPORTED rather than EXPORT_SYMBOL - -clang is sensitive to the ordering of -__attribute__((visibility("default"))) relative to the function -body. gcc is not. So if we try to re-declare an existing function -with default visibility, clang prints a warning and generates -a broken .so file in which nfct_timeout_* are not exported to library -callers. - -Move the attribute up into the function definition to make clang happy. - -Signed-off-by: Kevin Cernekee <cernekee@chromium.org> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - doxygen.cfg.in | 2 +- - src/internal.h | 5 ++--- - src/libnetfilter_cttimeout.c | 44 +++++++++++++++++--------------------------- - 3 files changed, 20 insertions(+), 31 deletions(-) - -diff --git a/doxygen.cfg.in b/doxygen.cfg.in -index 8e5d4495eb41..09c3ce00e422 100644 ---- a/doxygen.cfg.in -+++ b/doxygen.cfg.in -@@ -72,7 +72,7 @@ RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO - EXCLUDE_PATTERNS = */.git/* .*.d --EXCLUDE_SYMBOLS = EXPORT_SYMBOL nfct_timeout _container_policy_cb -+EXCLUDE_SYMBOLS = nfct_timeout _container_policy_cb - EXAMPLE_PATH = - EXAMPLE_PATTERNS = - EXAMPLE_RECURSIVE = NO -diff --git a/src/internal.h b/src/internal.h -index 3a88d1a1f7d8..5d781718ddad 100644 ---- a/src/internal.h -+++ b/src/internal.h -@@ -3,10 +3,9 @@ - - #include "config.h" - #ifdef HAVE_VISIBILITY_HIDDEN --# define __visible __attribute__((visibility("default"))) --# define EXPORT_SYMBOL(x) typeof(x) (x) __visible -+# define __EXPORTED __attribute__((visibility("default"))) - #else --# define EXPORT_SYMBOL -+# define __EXPORTED - #endif - - #endif -diff --git a/src/libnetfilter_cttimeout.c b/src/libnetfilter_cttimeout.c -index 7844a1f9c19a..a0a71851b0eb 100644 ---- a/src/libnetfilter_cttimeout.c -+++ b/src/libnetfilter_cttimeout.c -@@ -187,7 +187,7 @@ struct nfct_timeout { - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_timeout *nfct_timeout_alloc(void) -+struct nfct_timeout __EXPORTED *nfct_timeout_alloc(void) - { - struct nfct_timeout *t; - -@@ -197,19 +197,17 @@ struct nfct_timeout *nfct_timeout_alloc(void) - - return t; - } --EXPORT_SYMBOL(nfct_timeout_alloc); - - /** - * nfct_timeout_free - release one conntrack timeout object - * \param t pointer to the conntrack timeout object - */ --void nfct_timeout_free(struct nfct_timeout *t) -+void __EXPORTED nfct_timeout_free(struct nfct_timeout *t) - { - if (t->timeout) - free(t->timeout); - free(t); - } --EXPORT_SYMBOL(nfct_timeout_free); - - /** - * nfct_timeout_attr_set - set one attribute of the conntrack timeout object -@@ -217,7 +215,7 @@ EXPORT_SYMBOL(nfct_timeout_free); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set(struct nfct_timeout *t, uint32_t type, const void *data) - { - switch(type) { -@@ -236,7 +234,6 @@ nfct_timeout_attr_set(struct nfct_timeout *t, uint32_t type, const void *data) - t->attrset |= (1 << type); - return 0; - } --EXPORT_SYMBOL(nfct_timeout_attr_set); - - /** - * nfct_timeout_attr_set_u8 - set one attribute of the conntrack timeout object -@@ -244,12 +241,11 @@ EXPORT_SYMBOL(nfct_timeout_attr_set); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set_u8(struct nfct_timeout *t, uint32_t type, uint8_t data) - { - return nfct_timeout_attr_set(t, type, &data); - } --EXPORT_SYMBOL(nfct_timeout_attr_set_u8); - - /** - * nfct_timeout_attr_set_u16 - set one attribute of the conntrack timeout object -@@ -257,23 +253,21 @@ EXPORT_SYMBOL(nfct_timeout_attr_set_u8); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set_u16(struct nfct_timeout *t, uint32_t type, uint16_t data) - { - return nfct_timeout_attr_set(t, type, &data); - } --EXPORT_SYMBOL(nfct_timeout_attr_set_u16); - - /** - * nfct_timeout_attr_unset - unset one attribute of the conntrack timeout object - * \param t pointer to the conntrack timeout object - * \param type attribute type you want to set - */ --void nfct_timeout_attr_unset(struct nfct_timeout *t, uint32_t type) -+void __EXPORTED nfct_timeout_attr_unset(struct nfct_timeout *t, uint32_t type) - { - t->attrset &= ~(1 << type); - } --EXPORT_SYMBOL(nfct_timeout_attr_unset); - - /** - * nfct_timeout_policy_attr_set_u32 - set one attribute of the policy -@@ -281,7 +275,7 @@ EXPORT_SYMBOL(nfct_timeout_attr_unset); - * \param type attribute type you want to set - * \param data data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_policy_attr_set_u32(struct nfct_timeout *t, - uint32_t type, uint32_t data) - { -@@ -319,18 +313,17 @@ nfct_timeout_policy_attr_set_u32(struct nfct_timeout *t, - - return 0; - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_set_u32); - - /** - * nfct_timeout_policy_attr_unset - unset one attribute of the policy - * \param t pointer to the conntrack timeout object - * \param type attribute type you want to set - */ --void nfct_timeout_policy_attr_unset(struct nfct_timeout *t, uint32_t type) -+void __EXPORTED -+nfct_timeout_policy_attr_unset(struct nfct_timeout *t, uint32_t type) - { - t->attrset &= ~(1 << type); - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_unset); - - /** - * nfct_timeout_policy_attr_to_name - get state name from protocol state number -@@ -340,7 +333,8 @@ EXPORT_SYMBOL(nfct_timeout_policy_attr_unset); - * This function returns NULL if unsupported protocol or state number is passed. - * Otherwise, a pointer to valid string is returned. - */ --const char *nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) -+const char __EXPORTED * -+nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) - { - if (timeout_protocol[l4proto].state_to_name == NULL) { - printf("no array state name\n"); -@@ -354,7 +348,6 @@ const char *nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) - - return timeout_protocol[l4proto].state_to_name[state]; - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_to_name); - - /** - * @} -@@ -438,8 +431,9 @@ nfct_timeout_snprintf_default(char *buf, size_t size, - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, -- unsigned int type, unsigned int flags) -+int __EXPORTED -+nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, -+ unsigned int type, unsigned int flags) - { - int ret = 0; - -@@ -454,7 +448,6 @@ int nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, - - return ret; - } --EXPORT_SYMBOL(nfct_timeout_snprintf); - - /** - * @} -@@ -477,7 +470,7 @@ EXPORT_SYMBOL(nfct_timeout_snprintf); - * - CTNL_MSG_TIMEOUT_GET: get conntrack timeout object. - * - CTNL_MSG_TIMEOUT_DEL: delete conntrack timeout object. - */ --struct nlmsghdr * -+struct nlmsghdr __EXPORTED * - nfct_timeout_nlmsg_build_hdr(char *buf, uint8_t cmd, - uint16_t flags, uint32_t seq) - { -@@ -496,14 +489,13 @@ nfct_timeout_nlmsg_build_hdr(char *buf, uint8_t cmd, - - return nlh; - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_build_hdr); - - /** - * nfct_timeout_nlmsg_build_payload - build payload from ct timeout object - * \param nlh: netlink message that you want to use to add the payload. - * \param t: pointer to a conntrack timeout object - */ --void -+void __EXPORTED - nfct_timeout_nlmsg_build_payload(struct nlmsghdr *nlh, - const struct nfct_timeout *t) - { -@@ -532,7 +524,6 @@ nfct_timeout_nlmsg_build_payload(struct nlmsghdr *nlh, - } - - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_build_payload); - - static int - timeout_nlmsg_parse_attr_cb(const struct nlattr *attr, void *data) -@@ -629,7 +620,7 @@ timeout_parse_attr_data(struct nfct_timeout *t, const struct nlattr *nest) - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int -+int __EXPORTED - nfct_timeout_nlmsg_parse_payload(const struct nlmsghdr *nlh, - struct nfct_timeout *t) - { -@@ -654,7 +645,6 @@ nfct_timeout_nlmsg_parse_payload(const struct nlmsghdr *nlh, - } - return 0; - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_parse_payload); - - /** - * @} --- -2.11.0 - diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.1.ebuild index 85aa46b43ebc..3cdacc6e9832 100644 --- a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild +++ b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.1.ebuild @@ -1,25 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit linux-info +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc +inherit linux-info verify-sig DESCRIPTION="netlink interface for conntrack timeout infrastructure in kernel's packet filter" HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cttimeout/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" +SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2 + verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86" -BDEPEND="virtual/pkgconfig" RDEPEND="net-libs/libmnl:=" DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-clang-export.patch -) +BDEPEND="virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-netfilter )" CONFIG_CHECK="~NF_CT_NETLINK_TIMEOUT" @@ -27,3 +26,9 @@ pkg_setup() { linux-info_pkg_setup kernel_is lt 3 4 0 && ewarn "requires at least 3.4.0 kernel version" } + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libnetfilter_log/Manifest b/net-libs/libnetfilter_log/Manifest index 7172f0532436..68aec70f2220 100644 --- a/net-libs/libnetfilter_log/Manifest +++ b/net-libs/libnetfilter_log/Manifest @@ -1 +1,2 @@ -DIST libnetfilter_log-1.0.1.tar.bz2 262545 BLAKE2B 4dcc7ff5deef95fc657a956556a1ff389cddaae3eaabed9c77cb7028793d5a0e377d2d02d55000ec853300b94164943436d658f42344a6314432b2f8f965fb8e SHA512 4088b9bf055fb4cd5f2e201a46a00def7642116b5d1695a371936b7b45eb93877944456506b45761bf2f3f81b40c161c1ecdcfb90532009f073dac3cedc6f436 +DIST libnetfilter_log-1.0.2.tar.bz2 304022 BLAKE2B 5976dc484f8a5dc7b5484f12c9913acd9cf7600844f321da6105805b05ad7176d88185c4770bf9ac167c8525b01f1cd8cbc560f77a7cb8b1f129f9f6983b5bb1 SHA512 6b33718b1dd7f4504bceae14001da3a652cec46a6725a5dee83a7b55028cfa8e768cba917f968a5d5b60fd9ff04edf6040ef271a68e5fb65858bf73f4f9ccf23 +DIST libnetfilter_log-1.0.2.tar.bz2.sig 566 BLAKE2B f4e3de583d9e0612bfc5932654d287154117fe720c28eb220fbc19c4e6cd8d57c66b92159d13949b035a2479a466110e38b0334f49dcf9b9fc0cb4c41ed79aa1 SHA512 b9a40fa08fa5d29a907522add329ea5268f2ef09274b5be3d30ab7e6a0c6aad915d8e8d7c5d708947a86c4a7fe950439ab536ec5ed78198f5b6b839de2f0ab35 diff --git a/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild b/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild index 6c560507f949..aa614851bace 100644 --- a/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild +++ b/net-libs/libnetfilter_log/libnetfilter_log-1.0.2.ebuild @@ -1,29 +1,37 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit linux-info +inherit linux-info verify-sig DESCRIPTION="Interface to packets that have been logged by the kernel packet filter" HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_log/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" +SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2 + verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ia64 ppc ~riscv ~sparc x86" +IUSE="doc" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc -BDEPEND="virtual/pkgconfig" -RDEPEND=">=net-libs/libnfnetlink-1.0.0" +RDEPEND=">=net-libs/libnfnetlink-1.0.0 + >=net-libs/libmnl-1.0.3" DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + doc? ( app-text/doxygen ) + verify-sig? ( sec-keys/openpgp-keys-netfilter )" CONFIG_CHECK="~NETFILTER_NETLINK_LOG" -src_configure() { - econf --disable-static -} - pkg_setup() { linux-info_pkg_setup kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version" } + +src_configure() { + econf \ + $(use_enable doc html-doc) \ + $(use_enable doc man-pages) +} diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest index e5407949ebec..1c5eeed058b9 100644 --- a/net-libs/libnetfilter_queue/Manifest +++ b/net-libs/libnetfilter_queue/Manifest @@ -1,3 +1,2 @@ -DIST libnetfilter_queue-1.0.3.tar.bz2 314857 BLAKE2B c25b0395b13af3cecb960c39bcbc4f10a3f203aad7acaeb277346423310700d9abb5b8a65f27b008e5f45194aa6e0fd6a99c8ad25a1e3200904be70c5c6ddaa4 SHA512 1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e -DIST libnetfilter_queue-1.0.4.tar.bz2 312699 BLAKE2B 29d553c36af551cbaa3b1b4382ad38d6ea7402efafa5ff4ae99c6f05d0ddd15d24b007a4ccdcbc21b8bd9cea28859668a27a6fae4e6534f68dea79d6d0a02789 SHA512 5d81d8e8190a80c9b42bc851a87cc4f749709803b8c9964508013bafb033f1b51b65222a244885f321a2be90517c6a636533ff72b653935a2b8d819560a51187 DIST libnetfilter_queue-1.0.5.tar.bz2 313856 BLAKE2B 0d7806fd23961f6b80f6ef63faf0fe10307a34495337a7f6dd4f0eb76b5ba8a96292b86285e0740f83414417810e47f47b1400c7d83fb4d8fc6f58954f4bd9df SHA512 732a44b602e5efaa4f5582ea25ff8f5ec8f4dca5c0e725cd93fe2d441db80416b25c6018147be90acb262d7428eb5b21b3f7b5920e612d115061ec6a19d67f85 +DIST libnetfilter_queue-1.0.5.tar.bz2.sig 590 BLAKE2B d8b5b3ae82fe2722db8a0c200a75146b70f79b7eafb34ddba8349f7f38f02eb5546eee9ae31920f5b7301787a2866a908199b69f8465fe1b6e45ebdc5fb7ae13 SHA512 65558652c7d54087eb1b5a37f7574bcca3495e5ee6587c7b555a7fe6e118007cf9431a66ed5280ce272890c659eb171570e0d0cbb733cf969ae8b44a1d541687 diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild deleted file mode 100644 index 5e97c76a1ada..000000000000 --- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit linux-info - -DESCRIPTION="API to packets that have been queued by the kernel packet filter" -HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_queue/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86" -IUSE="static-libs" - -RDEPEND=" - >=net-libs/libmnl-1.0.3 - >=net-libs/libnfnetlink-0.0.41 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -CONFIG_CHECK="~NETFILTER_NETLINK_QUEUE" - -pkg_setup() { - linux-info_pkg_setup - kernel_is lt 2 6 14 && ewarn "requires at least 2.6.14 kernel version" -} diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.4.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.4.ebuild deleted file mode 100644 index 288764d2e4b6..000000000000 --- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit linux-info - -DESCRIPTION="API to packets that have been queued by the kernel packet filter" -HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_queue/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="static-libs" - -RDEPEND=" - >=net-libs/libmnl-1.0.3 - >=net-libs/libnfnetlink-0.0.41 -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - app-doc/doxygen - virtual/pkgconfig -" -CONFIG_CHECK="~NETFILTER_NETLINK_QUEUE" - -pkg_setup() { - linux-info_pkg_setup - kernel_is lt 2 6 14 && ewarn "requires at least 2.6.14 kernel version" -} - -src_prepare() { - default - - # hack for script that was not distributed - [[ -x fixmanpages.sh ]] || ln -s $(type -P true) fixmanpages.sh -} diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild index 149830904d0d..3ac276b1b9f7 100644 --- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild +++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit linux-info +inherit linux-info verify-sig DESCRIPTION="API to packets that have been queued by the kernel packet filter" HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_queue/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" +SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2 + verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="doc static-libs" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc RDEPEND=" >=net-libs/libmnl-1.0.3 @@ -21,8 +23,9 @@ DEPEND=" ${RDEPEND} " BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-netfilter ) " CONFIG_CHECK="~NETFILTER_NETLINK_QUEUE" diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest index 2f7130224cfb..7cf5a4a7ea4e 100644 --- a/net-libs/libnfnetlink/Manifest +++ b/net-libs/libnfnetlink/Manifest @@ -1,2 +1,2 @@ -DIST 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch 677 BLAKE2B 189c57ffc8eeb6a83e46fd1d53390e977294f7d3a269d3ffab07e1fce04083a7b4b956e93e02f4f81ce6db4ec5be785b16d1c75ed7e0b4fef9883154d9407e18 SHA512 fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41 -DIST libnfnetlink-1.0.1.tar.bz2 320641 BLAKE2B 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3 SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104 +DIST libnfnetlink-1.0.2.tar.bz2 298844 BLAKE2B 81c954f6ca2738b321e9319d20741aa15376e88e5f7a0ce1cfa2b02cd104f98d020ab6206bfbc79fc66655f8e40a17bfb65cbce0b1684d9373b809de5a433fc4 SHA512 a5e9ae22831f1d17703f83953f3b0ef898e8b3fa7f0f771b038db51816ddae3158574380ac4d45c09fb8fbb8677e2ccdcc5c4736e3b09de06eac99f899130854 +DIST libnfnetlink-1.0.2.tar.bz2.sig 566 BLAKE2B 9e87fc7917dd2f8b29de642ef819bca957bd6223417e167e21770450ce2eeff717ab06079ac75c689184f9188e785b663fca81cdda30b87310bfb1b456b03dd2 SHA512 3dcb980fb209c9faa9774f0393bc3b4b5fa6e899330f0d0dcb92307984f696b869de27c22dd54d7f181bddd72e104b38e8617af6bb3d6fe992a96da172b10457 diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.2.ebuild index 53e90911786d..3b5c6b46d54e 100644 --- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild +++ b/net-libs/libnfnetlink/libnfnetlink-1.0.2.ebuild @@ -1,24 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit linux-info +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc +inherit linux-info verify-sig -PATCH_BLOB=04aef8a4dedf267dd5744afb134ef8046e77f613 -PATCH_FN=${PATCH_BLOB}-musl-fix-includes.patch - -DESCRIPTION="the low-level library for netfilter related kernel/userspace communication" +DESCRIPTION="The low-level library for netfilter related kernel/userspace communication" HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/" SRC_URI=" - http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2 - https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> ${PATCH_FN}" + https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2 + verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -PATCHES=( "${DISTDIR}/${PATCH_FN}" ) +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )" pkg_setup() { linux-info_pkg_setup @@ -40,13 +38,15 @@ pkg_setup() { check_extra_config } -src_configure() { - econf --disable-static +src_unpack() { + default + + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig} } src_install() { default - # no static archives - find "${D}" -name '*.la' -delete || die + # No static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest deleted file mode 100644 index 5c73486bf1a9..000000000000 --- a/net-libs/libnfsidmap/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch deleted file mode 100644 index 6ef12d44e44f..000000000000 --- a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch +++ /dev/null @@ -1,22 +0,0 @@ -for toupper and such - ---- a/nss.c -+++ b/nss.c -@@ -34,6 +34,7 @@ - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include <ctype.h> - #include <sys/types.h> - #include <errno.h> - #include <unistd.h> ---- a/libnfsidmap.c -+++ b/libnfsidmap.c -@@ -37,6 +37,7 @@ - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include <ctype.h> - #include <sys/types.h> - #include <errno.h> - #include <unistd.h> diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch deleted file mode 100644 index 9a8f0a487ae3..000000000000 --- a/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch +++ /dev/null @@ -1,115 +0,0 @@ -http://bugs.gentoo.org/169909 - ---- libnfsidmap-0.27/configure.ac -+++ libnfsidmap-0.27/configure.ac -@@ -63,7 +63,7 @@ - - # Checks for library functions. - AC_FUNC_MALLOC --AC_CHECK_FUNCS([strchr strdup]) -+AC_CHECK_FUNCS([strchr strdup getgrouplist]) - - AC_CONFIG_FILES([Makefile]) - AC_CONFIG_FILES([libnfsidmap.pc]) ---- libnfsidmap-0.27/getgrouplist.c -+++ libnfsidmap-0.27/getgrouplist.c -@@ -0,0 +1,88 @@ -+/* -+ * getgrouplist.c -+ * -+ * if system does not provide the non-standard getgrouplist, we will emulate -+ * it via POSIX standard functions -+ * -+ * Copyright (c) 1991, 1993 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+#include <sys/types.h> -+#include <grp.h> -+#include <string.h> -+#include <unistd.h> -+ -+#ifndef HAVE_GETGROUPLIST -+static -+int -+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) -+{ -+ const struct group *grp; -+ int i, maxgroups, ngroups, ret; -+ -+ ret = 0; -+ ngroups = 0; -+ maxgroups = *grpcnt; -+ /* -+ * When installing primary group, duplicate it; -+ * the first element of groups is the effective gid -+ * and will be overwritten when a setgid file is executed. -+ */ -+ groups[ngroups++] = agroup; -+ if (maxgroups > 1) -+ groups[ngroups++] = agroup; -+ /* -+ * Scan the group file to find additional groups. -+ */ -+ setgrent(); -+ while ((grp = getgrent()) != NULL) { -+ for (i = 0; i < ngroups; i++) { -+ if (grp->gr_gid == groups[i]) -+ goto skip; -+ } -+ for (i = 0; grp->gr_mem[i]; i++) { -+ if (!strcmp(grp->gr_mem[i], uname)) { -+ if (ngroups >= maxgroups) { -+ ret = -1; -+ break; -+ } -+ groups[ngroups++] = grp->gr_gid; -+ break; -+ } -+ } -+skip: -+ ; -+ } -+ endgrent(); -+ *grpcnt = ngroups; -+ return (ret); -+} -+#endif ---- libnfsidmap-0.27/nss.c -+++ libnfsidmap-0.27/nss.c -@@ -51,6 +51,8 @@ - #include "cfg.h" - #include <syslog.h> - -+#include "getgrouplist.c" -+ - /* - * NSS Translation Methods - * diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild deleted file mode 100644 index e93e96fb27fb..000000000000 --- a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="NFSv4 ID <-> name mapping library" -HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/" -#SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz" -SRC_URI="https://fedorapeople.org/~steved/${PN}/${PV}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="ldap static-libs" - -DEPEND="ldap? ( net-nds/openldap )" -RDEPEND=" - ${DEPEND} - !<net-fs/nfs-utils-1.2.2 - !net-fs/idmapd -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.27-getgrouplist.patch #169909 - "${FILESDIR}"/${PN}-0.21-headers.patch -) - -src_prepare() { - default - # Ideally the build would use -DLIBDIR=$(libdir) at build time. - sed -i \ - -e "/PATH_PLUGINS/s:/usr/lib/libnfsidmap:${EPREFIX}/usr/$(get_libdir)/libnfsidmap:" \ - libnfsidmap.c || die #504666 - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable ldap) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - insinto /etc - doins idmapd.conf - - # remove useless files - rm -f "${ED%/}"/usr/$(get_libdir)/libnfsidmap/*.{a,la} - use static-libs || find "${ED%/}"/usr -name '*.la' -delete || die -} diff --git a/net-libs/libnfsidmap/metadata.xml b/net-libs/libnfsidmap/metadata.xml deleted file mode 100644 index 73dda144f9ac..000000000000 --- a/net-libs/libnfsidmap/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -</pkgmetadata> diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest index 492e21041f0b..b0ce8a8619b7 100644 --- a/net-libs/libnftnl/Manifest +++ b/net-libs/libnftnl/Manifest @@ -1,2 +1,2 @@ -DIST libnftnl-1.2.0.tar.bz2 388751 BLAKE2B 6f61e7af8e50577029b1cf5ba7260f3803a64c410c7d35be8bbf3b6f9445d9db3be367442f56fb81f3ed49bc3efeab8dd2ed51bab4a1e4427f552d48e4bb559a SHA512 2a068e7eab308442bbfba5325f3aebeb874c142b029ff5906cadf63a1f879b20930bc55cd9554c5d256a0642f0f5a6d36177d9ae88cf507ab5dfc7fabffbb380 -DIST libnftnl-1.2.1.tar.bz2 395299 BLAKE2B 9f525eb540ed959075199aab4b4217bdcf0f67d6744e58d7eab9f7a50aca2d22c6d65419b15c98d24772ef020c3ed2662eba7a0812a5919a840cee5aa589b056 SHA512 cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a +DIST libnftnl-1.2.6.tar.xz 336684 BLAKE2B a08010b26db0c7a5429f33a92ca4f17e8e158005befa5f7e3f37d60456d1b481a3f95f46c0bcec74e98ab040940f533acc279672226f0abc6ce73a26ff56718a SHA512 0c8c369eec84b0c568f0067598bece6e3be9a0fbd977e443ae3b14a5a6d842a6086ceb5426a65f8c77204709655f148c1241193f1a928f8c12154a57e3548b34 +DIST libnftnl-1.2.6.tar.xz.sig 566 BLAKE2B 8ad336d0d8c693beb6335e874ad62040257e0c4527f8acb32fcc8b4889eea88ba3a42c9b2b795db6f6e3d148066ee0a9217b1e30c7e784c793458dd480ee624a SHA512 61288aa03fb80d43d09866ce549815202f682b30b283cf3119ced0fe59536d10f1c029e433651d1cb31115e977b660886a153f3361f5cafdbb0ed6da602e5b2f diff --git a/net-libs/libnftnl/libnftnl-1.2.0-r1.ebuild b/net-libs/libnftnl/libnftnl-1.2.6-r1.ebuild index 412e1e9f3a44..52f59946dea1 100644 --- a/net-libs/libnftnl/libnftnl-1.2.0-r1.ebuild +++ b/net-libs/libnftnl/libnftnl-1.2.6-r1.ebuild @@ -1,29 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools linux-info usr-ldscript +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc +inherit linux-info verify-sig DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem" HOMEPAGE="https://netfilter.org/projects/nftables/" if [[ ${PV} =~ ^[9]{4,}$ ]]; then - inherit git-r3 + inherit autotools git-r3 EGIT_REPO_URI="https://git.netfilter.org/${PN}" else - SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" + SRC_URI=" + https://netfilter.org/projects/${PN}/files/${P}.tar.xz + verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.xz.sig ) + " + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" + + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi LICENSE="GPL-2" SLOT="0/11" # libnftnl.so version IUSE="examples static-libs test" - RESTRICT="!test? ( test )" -RDEPEND=">=net-libs/libmnl-1.0.4:=" -BDEPEND="virtual/pkgconfig" +RDEPEND=" + >=net-libs/libmnl-1.0.4:= +" +BDEPEND+=" + virtual/pkgconfig +" DEPEND="${RDEPEND}" pkg_setup() { @@ -37,6 +46,7 @@ pkg_setup() { src_prepare() { default + [[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf } @@ -44,12 +54,13 @@ src_configure() { local myeconfargs=( $(use_enable static-libs static) ) + econf "${myeconfargs[@]}" } src_install() { default - gen_usr_ldscript -a nftnl + find "${ED}" -type f -name '*.la' -delete || die if use examples; then diff --git a/net-libs/libnftnl/libnftnl-1.2.1.ebuild b/net-libs/libnftnl/libnftnl-1.2.6.ebuild index 75e1ab39a6c8..98614e4afbc3 100644 --- a/net-libs/libnftnl/libnftnl-1.2.1.ebuild +++ b/net-libs/libnftnl/libnftnl-1.2.6.ebuild @@ -1,29 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools linux-info usr-ldscript +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc +inherit linux-info usr-ldscript verify-sig DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem" HOMEPAGE="https://netfilter.org/projects/nftables/" if [[ ${PV} =~ ^[9]{4,}$ ]]; then - inherit git-r3 + inherit autotools git-r3 EGIT_REPO_URI="https://git.netfilter.org/${PN}" else - SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI=" + https://netfilter.org/projects/${PN}/files/${P}.tar.xz + verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.xz.sig ) + " + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" + + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi LICENSE="GPL-2" SLOT="0/11" # libnftnl.so version IUSE="examples static-libs test" - RESTRICT="!test? ( test )" -RDEPEND=">=net-libs/libmnl-1.0.4:=" -BDEPEND="virtual/pkgconfig" +RDEPEND=" + >=net-libs/libmnl-1.0.4:= +" +BDEPEND+=" + virtual/pkgconfig +" DEPEND="${RDEPEND}" pkg_setup() { @@ -37,6 +46,7 @@ pkg_setup() { src_prepare() { default + [[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf } @@ -44,12 +54,15 @@ src_configure() { local myeconfargs=( $(use_enable static-libs static) ) + econf "${myeconfargs[@]}" } src_install() { default + gen_usr_ldscript -a nftnl + find "${ED}" -type f -name '*.la' -delete || die if use examples; then diff --git a/net-libs/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-9999.ebuild index 75e1ab39a6c8..3559fe7f2439 100644 --- a/net-libs/libnftnl/libnftnl-9999.ebuild +++ b/net-libs/libnftnl/libnftnl-9999.ebuild @@ -1,29 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools linux-info usr-ldscript +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc +inherit linux-info verify-sig DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem" HOMEPAGE="https://netfilter.org/projects/nftables/" if [[ ${PV} =~ ^[9]{4,}$ ]]; then - inherit git-r3 + inherit autotools git-r3 EGIT_REPO_URI="https://git.netfilter.org/${PN}" else - SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI=" + https://netfilter.org/projects/${PN}/files/${P}.tar.xz + verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.xz.sig ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi LICENSE="GPL-2" SLOT="0/11" # libnftnl.so version IUSE="examples static-libs test" - RESTRICT="!test? ( test )" -RDEPEND=">=net-libs/libmnl-1.0.4:=" -BDEPEND="virtual/pkgconfig" +RDEPEND=" + >=net-libs/libmnl-1.0.4:= +" +BDEPEND+=" + virtual/pkgconfig +" DEPEND="${RDEPEND}" pkg_setup() { @@ -37,6 +46,7 @@ pkg_setup() { src_prepare() { default + [[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf } @@ -44,12 +54,13 @@ src_configure() { local myeconfargs=( $(use_enable static-libs static) ) + econf "${myeconfargs[@]}" } src_install() { default - gen_usr_ldscript -a nftnl + find "${ED}" -type f -name '*.la' -delete || die if use examples; then diff --git a/net-libs/libnftnl/metadata.xml b/net-libs/libnftnl/metadata.xml index 73dda144f9ac..49fe3135400c 100644 --- a/net-libs/libnftnl/metadata.xml +++ b/net-libs/libnftnl/metadata.xml @@ -5,4 +5,7 @@ <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> </maintainer> +<upstream> + <remote-id type="cpe">cpe:/a:netfilter:libnftnl</remote-id> +</upstream> </pkgmetadata> diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest index dc6cbc3cb4de..c97d1852cce6 100644 --- a/net-libs/libnice/Manifest +++ b/net-libs/libnice/Manifest @@ -1 +1,2 @@ -DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c +DIST libnice-0.1.19.tar.gz 453407 BLAKE2B 7bffde82a3e55d9aeeaadd159d944346a5192871e7f574e278dc43e8171e5fde472cd28186777a0b6cddd8bde34e035794b1c6b8f152c7fb4fae5202025bfdac SHA512 1c63cc0b7655186fd6f83da4dd607183d6ccfab9b7ad7189c1bea2ba7413183f24076aba5d6c7231d2ab3fbd471827256729a8a0c0d1bda48803586e68b3778b +DIST libnice-0.1.21.tar.gz 460086 BLAKE2B 61f0807ad0d959ffbaf8dce7b0321a19ae42e4c57cc6ac9b8f39bd27645ef60bb342f4105b6ce4c4c82573592a52388888d72031033e9e7368f8b5d53afa37d6 SHA512 acbd1e0e8aacb0a65cad5b70b470a74a7c4a4f1306bc4e17cd4fd899f2fae2bb538bd099e6c0f9cba6bb9a38e95bc14087aa4f77f6aa5b70d6398179783c6e26 diff --git a/net-libs/libnice/files/libnice-0.1.19-remove-graphviz-dependency.patch b/net-libs/libnice/files/libnice-0.1.19-remove-graphviz-dependency.patch new file mode 100644 index 000000000000..29cd023761e4 --- /dev/null +++ b/net-libs/libnice/files/libnice-0.1.19-remove-graphviz-dependency.patch @@ -0,0 +1,30 @@ +From 42b2ca76d0b3b044ca3ada05f5200becc61aeedd Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Wed, 2 Aug 2023 00:16:29 +0300 +Subject: [PATCH] Remove unnecessary target with unecessary dependency + +* The generated file is included in the repository and the source files + hasn't been modified since it was added. + +https://bugs.gentoo.org/877451 +https://bugs.gentoo.org/889820 +--- a/docs/reference/libnice/meson.build ++++ b/docs/reference/libnice/meson.build +@@ -63,14 +63,3 @@ gnome.gtkdoc('libnice', + ], + install: true, + check: true) +- +-# If we ever need to regenerate this diagram. +-# Since it’s not expected to change much, let’s not depend on GraphViz to +-# build the docs (that's also why we don't use find_program('dot') here) +-run_target('update-states.png', +- command: ['dot', +- '-Tpng', +- '-o', join_paths(meson.current_source_dir(), 'states.png'), +- '-Gsize=9.6,2.9!', +- '-Gdpi=200', +- files('states.gv')]) +-- +2.41.0 + diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild deleted file mode 100644 index c56824219a0d..000000000000 --- a/net-libs/libnice/libnice-0.1.15.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib-minimal xdg - -DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)" -HOMEPAGE="https://nice.freedesktop.org/wiki/" -SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz" - -LICENSE="|| ( MPL-1.1 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+gnutls +introspection +upnp" - -RDEPEND=" - >=dev-libs/glib-2.48:2[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) - gnutls? ( >=net-libs/gnutls-2.12.0:0=[${MULTILIB_USEDEP}] ) - !gnutls? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.10 - virtual/pkgconfig -" - -multilib_src_configure() { - # gstreamer plugin split off into media-plugins/gst-plugins-libnice - ECONF_SOURCE=${S} \ - econf \ - --enable-compile-warnings=yes \ - --disable-static \ - --disable-static-plugins \ - --without-gstreamer \ - --without-gstreamer-0.10 \ - --with-crypto-library=$(usex gnutls gnutls openssl) \ - $(multilib_native_use_enable introspection) \ - $(use_enable upnp gupnp) - - if multilib_is_native_abi; then - ln -s {"${S}"/,}docs/reference/libnice/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} - -multilib_src_test() { - emake -j1 check -} diff --git a/net-libs/libnice/libnice-0.1.19-r1.ebuild b/net-libs/libnice/libnice-0.1.19-r1.ebuild new file mode 100644 index 000000000000..69ede6628795 --- /dev/null +++ b/net-libs/libnice/libnice-0.1.19-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit meson-multilib xdg + +DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)" +HOMEPAGE="https://libnice.freedesktop.org/" +SRC_URI="https://libnice.freedesktop.org/releases/${P}.tar.gz" + +LICENSE="|| ( MPL-1.1 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+gnutls gtk-doc +introspection test +upnp" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) + gnutls? ( >=net-libs/gnutls-2.12.0:0=[${MULTILIB_USEDEP}] ) + !gnutls? ( + dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + upnp? ( >=net-libs/gupnp-igd-0.2.4:0=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc + app-text/docbook-xml-dtd:4.1.2 ) +" + +PATCHES=( + # bugs 877451, 889820 + "${FILESDIR}/libnice-0.1.19-remove-graphviz-dependency.patch" +) + +src_prepare() { + default + + # Broken w/ network-sandbox on (bug #847844) + sed -i -e '/test-set-port-range/d' tests/meson.build || die +} + +multilib_src_configure() { + # gstreamer plugin split off into media-plugins/gst-plugins-libnice + local emesonargs=( + -Dgstreamer=disabled + -Dcrypto-library=$(usex gnutls gnutls openssl) + $(meson_native_use_feature introspection) + $(meson_feature test tests) + $(meson_feature upnp gupnp) + $(meson_native_use_feature gtk-doc gtk_doc) + ) + + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs +} diff --git a/net-libs/libnice/libnice-0.1.21.ebuild b/net-libs/libnice/libnice-0.1.21.ebuild new file mode 100644 index 000000000000..69ede6628795 --- /dev/null +++ b/net-libs/libnice/libnice-0.1.21.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit meson-multilib xdg + +DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)" +HOMEPAGE="https://libnice.freedesktop.org/" +SRC_URI="https://libnice.freedesktop.org/releases/${P}.tar.gz" + +LICENSE="|| ( MPL-1.1 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+gnutls gtk-doc +introspection test +upnp" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) + gnutls? ( >=net-libs/gnutls-2.12.0:0=[${MULTILIB_USEDEP}] ) + !gnutls? ( + dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + upnp? ( >=net-libs/gupnp-igd-0.2.4:0=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc + app-text/docbook-xml-dtd:4.1.2 ) +" + +PATCHES=( + # bugs 877451, 889820 + "${FILESDIR}/libnice-0.1.19-remove-graphviz-dependency.patch" +) + +src_prepare() { + default + + # Broken w/ network-sandbox on (bug #847844) + sed -i -e '/test-set-port-range/d' tests/meson.build || die +} + +multilib_src_configure() { + # gstreamer plugin split off into media-plugins/gst-plugins-libnice + local emesonargs=( + -Dgstreamer=disabled + -Dcrypto-library=$(usex gnutls gnutls openssl) + $(meson_native_use_feature introspection) + $(meson_feature test tests) + $(meson_feature upnp gupnp) + $(meson_native_use_feature gtk-doc gtk_doc) + ) + + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs +} diff --git a/net-libs/libnice/metadata.xml b/net-libs/libnice/metadata.xml index 7b343b06be8a..2a7fbb78e1dc 100644 --- a/net-libs/libnice/metadata.xml +++ b/net-libs/libnice/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="freedesktop-gitlab">libnice/libnice</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest index a12c6bfcb8d3..29a086e8b3a3 100644 --- a/net-libs/libnids/Manifest +++ b/net-libs/libnids/Manifest @@ -1 +1 @@ -DIST libnids-1.24.tar.gz 151021 BLAKE2B ce545a8e3f4b61284ef7f2e6d1ce37aa537adef2686281468b4aaa509479d58073b9f6a5fbb7f03e33fa28ec18c01c8af49e0ce8a2d314ba5da5cbbba0fd7dcc SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53 +DIST libnids-1.26.tar.gz 146172 BLAKE2B c84329a8da493f49d340d263835070c948a00d8400cd3e7a2a727b567f672b7af8017446281879ec19cb6d9e89eb07564c463fdf0521aa441ad5dc6ac2b97c73 SHA512 d582287f2c64241895ae437e501e92ef68adc8eac1a3df597d089634b994faee35d8b1cc018bbf20ced440bcd286af28f48c6f88da740a7c3de935ce3723561d diff --git a/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch b/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch new file mode 100644 index 000000000000..dc6abccd8c83 --- /dev/null +++ b/net-libs/libnids/files/libnids-1.26-revert-SONAME-bump.patch @@ -0,0 +1,26 @@ +From 0f07fe39585971b4c59f3a9b235e68d9c68184e3 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 14 Dec 2021 01:30:00 +0000 +Subject: [PATCH] Revert SONAME bump + +Bug: https://github.com/MITRECND/libnids/issues/9 +--- + src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index e7b6dd8..e72a5da 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -13,7 +13,7 @@ includedir = @includedir@ + libdir = @libdir@ + mandir = @mandir@ + LIBSTATIC = libnids.a +-LIBSHARED = libnids.so.1.26 ++LIBSHARED = libnids.so.1.24 + + CC = @CC@ + CFLAGS = @CFLAGS@ -DLIBNET_VER=@LIBNET_VER@ -DHAVE_ICMPHDR=@ICMPHEADER@ -DHAVE_TCP_STATES=@TCPSTATES@ -DHAVE_BSD_UDPHDR=@HAVE_BSD_UDPHDR@ +-- +2.34.1 + diff --git a/net-libs/libnids/libnids-1.24-r8.ebuild b/net-libs/libnids/libnids-1.26-r1.ebuild index a993c8d91295..5939d88fed6a 100644 --- a/net-libs/libnids/libnids-1.24-r8.ebuild +++ b/net-libs/libnids/libnids-1.26-r1.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit autotools flag-o-matic toolchain-funcs -DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System" -HOMEPAGE="http://libnids.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +DESCRIPTION="An implementation of an E-component of Network Intrusion Detection System" +HOMEPAGE="https://github.com/MITRECND/libnids http://libnids.sourceforge.net/" +SRC_URI="https://github.com/MITRECND/libnids/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="1.2" @@ -22,10 +23,11 @@ DEPEND="${RDEPEND}" BDEPEND="glib? ( virtual/pkgconfig )" PATCHES=( - "${FILESDIR}"/${P}-ldflags.patch - "${FILESDIR}"/${P}-libdir.patch - "${FILESDIR}"/${P}-static-libs.patch - "${FILESDIR}"/${P}-no-inline.patch + "${FILESDIR}"/${PN}-1.24-ldflags.patch + "${FILESDIR}"/${PN}-1.24-libdir.patch + "${FILESDIR}"/${PN}-1.24-static-libs.patch + "${FILESDIR}"/${PN}-1.24-no-inline.patch + "${FILESDIR}"/${PN}-1.26-revert-SONAME-bump.patch ) src_prepare() { diff --git a/net-libs/libnids/metadata.xml b/net-libs/libnids/metadata.xml index 7e2868ad9d1e..5468909d526b 100644 --- a/net-libs/libnids/metadata.xml +++ b/net-libs/libnids/metadata.xml @@ -12,5 +12,6 @@ </use> <upstream> <remote-id type="sourceforge">libnids</remote-id> + <remote-id type="github">MITRECND/libnids</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/libnipper/files/libnipper-0.12.6-gcc12-time.patch b/net-libs/libnipper/files/libnipper-0.12.6-gcc12-time.patch new file mode 100644 index 000000000000..b07c640a37d1 --- /dev/null +++ b/net-libs/libnipper/files/libnipper-0.12.6-gcc12-time.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/851666 +--- a/report/report-text.cpp ++++ b/report/report-text.cpp +@@ -34,6 +34,7 @@ + #include "../device/general/general.h" + #include "report.h" + ++#include <ctime> + + int Report::writeText(const char *theText, Device::paragraphStruct *paragraph, bool expandAbbreviations, bool hideMarkup) + { diff --git a/net-libs/libnipper/files/libnipper-0.12.6-wformat-security.patch b/net-libs/libnipper/files/libnipper-0.12.6-wformat-security.patch new file mode 100644 index 000000000000..d2bf917a9c59 --- /dev/null +++ b/net-libs/libnipper/files/libnipper-0.12.6-wformat-security.patch @@ -0,0 +1,11 @@ +--- a/report/report-table.cpp ++++ b/report/report-table.cpp +@@ -359,7 +359,7 @@ int Report::writeTable(Device::paragraphStruct *paragraph) + else if (config->reportFormat == Config::XML) + fprintf(outFile, ">"); + if (cellPointer->cellData.empty()) +- fprintf(outFile, config->emptyTableCell); ++ fprintf(outFile, "%s", config->emptyTableCell); + else + errorCode = writeText(cellPointer->cellData.c_str(), paragraph); + if (errorCode != 0) diff --git a/net-libs/libnipper/libnipper-0.12.6-r1.ebuild b/net-libs/libnipper/libnipper-0.12.6-r2.ebuild index 9a29393477d6..fa255e96a8f0 100644 --- a/net-libs/libnipper/libnipper-0.12.6-r1.ebuild +++ b/net-libs/libnipper/libnipper-0.12.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit cmake DESCRIPTION="A router configuration security analysis library" HOMEPAGE="http://nipper.titania.co.uk/" -SRC_URI="mirror://sourceforge/nipper/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/nipper/${P}.tgz" LICENSE="GPL-3" SLOT="0" @@ -17,4 +17,6 @@ PATCHES=( "${FILESDIR}/${P}-glibc-2.10.patch" "${FILESDIR}/${P}-gcc47.patch" "${FILESDIR}/${P}-multilib-strict.patch" + "${FILESDIR}/${P}-gcc12-time.patch" + "${FILESDIR}/${P}-wformat-security.patch" ) diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest index 0e9bf5597823..bab5b79bb500 100644 --- a/net-libs/libnma/Manifest +++ b/net-libs/libnma/Manifest @@ -1,2 +1 @@ -DIST libnma-1.8.30.tar.xz 1386248 BLAKE2B 7021e85595819b0cbd44b8c62087f49a5ecccc4bb230820d9a0159bf33b904df4f5c8021a79822c37d0933bdcde790a44f6d960b7f5f504e7506849aed35d54c SHA512 4d8f93d035fca4252e5c5dafc756ee6bc8f1d302aaeca77c5c0acb5d7f6cd4214224fb48e2706e69084c5a714aafa7837769be17d0642cc29eded9eb175a1107 -DIST libnma-1.8.32.tar.xz 1368492 BLAKE2B e91317259f79140803d5b99b23bafddebcb46a72b80c1fec912341aee377920ada3688864ede2aa3d492ef994de9b8f02e391fef98e0bbb61f296541338ad0cd SHA512 65244a8901322bc17d48c9cb809080790d5af0195b79becf0317da77b6c6a0fde3f8d3b752f5d7e59a5dba0970f4499077c5d9d6776912a72748290b8ac98e11 +DIST libnma-1.10.6.tar.xz 702820 BLAKE2B 8f5b62f9522c8e7f16d6847d0e297d32fa8f62c9be2db68af596765dcfaa93c4eb9c3d3e03098ebd024d7f6ad788dd82eedc7b4841738d4278f64e3a1053d2d6 SHA512 4801db35a8d510c651fc91da4f394a665a4ba5c35fbefe0496363c404b49d5f4e103f49084220ee58b995684d2ac93643320b7d1777ebeea555e7657768a1f6a diff --git a/net-libs/libnma/libnma-1.8.32.ebuild b/net-libs/libnma/libnma-1.10.6-r1.ebuild index 833172369816..255251d04f80 100644 --- a/net-libs/libnma/libnma-1.8.32.ebuild +++ b/net-libs/libnma/libnma-1.10.6-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit gnome.org gnome2-utils meson xdg vala @@ -13,15 +13,16 @@ SLOT="0" # pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before IUSE="gtk-doc +introspection +pkcs11 vala" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" DEPEND=" + >=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 - >=x11-libs/gtk+-3.10:3[introspection?] + >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] - pkcs11? ( >=app-crypt/gcr-3.14:= ) + pkcs11? ( >=app-crypt/gcr-4.0.0:4= ) introspection? ( >=dev-libs/gobject-introspection-1.56:= ) " RDEPEND="${DEPEND} @@ -38,13 +39,14 @@ BDEPEND=" " src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare + default + use vala && vala_setup + xdg_environment_reset } src_configure() { local emesonargs=( - -Dlibnma_gtk4=false + -Dlibnma_gtk4=true $(meson_use pkcs11 gcr) -Dmore_asserts=0 -Diso_codes=true @@ -57,6 +59,11 @@ src_configure() { meson_src_configure } +src_install() { + meson_src_install + rm "${D}/usr/share/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml" || die +} + pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update diff --git a/net-libs/libnma/libnma-1.8.30.ebuild b/net-libs/libnma/libnma-1.8.30.ebuild deleted file mode 100644 index 98ccac03799a..000000000000 --- a/net-libs/libnma/libnma-1.8.30.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson xdg vala - -DESCRIPTION="NetworkManager GUI library" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" -# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before -IUSE="gtk-doc +introspection +pkcs11 vala" -REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86" - -DEPEND=" - app-text/iso-codes - net-misc/mobile-broadband-provider-info - >=dev-libs/glib-2.38:2 - >=x11-libs/gtk+-3.10:3[introspection?] - >=net-misc/networkmanager-1.7[introspection?] - pkcs11? ( >=app-crypt/gcr-3.14:= ) - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) -" -RDEPEND="${DEPEND} - !<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0 -BDEPEND=" - dev-libs/libxml2 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 ) - vala? ( $(vala_depend) - net-misc/networkmanager[vala] - ) -" - -src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - -Dlibnma_gtk4=false - $(meson_use pkcs11 gcr) - -Dmore_asserts=0 - -Diso_codes=true - -Dmobile_broadband_provider_info=true - -Dld_gc=false - $(meson_use gtk-doc gtk_doc) - $(meson_use introspection) - $(meson_use vala vapi) - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/net-libs/libnma/metadata.xml b/net-libs/libnma/metadata.xml index 0956f5e7ec30..0c3e85e3c881 100644 --- a/net-libs/libnma/metadata.xml +++ b/net-libs/libnma/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="pkcs11">Enable PKCS#11 support in certificate chooser via <pkg>app-crypt/gcr</pkg></flag> - </use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="pkcs11">Enable PKCS#11 support in certificate chooser via <pkg>app-crypt/gcr</pkg></flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/libnma</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest index c5effee74846..ddd695b9305f 100644 --- a/net-libs/libnpupnp/Manifest +++ b/net-libs/libnpupnp/Manifest @@ -1 +1,2 @@ -DIST libnpupnp-4.1.5.tar.gz 545672 BLAKE2B 75f3236cd18324ffa35215f152ef2b84d81b4bc81b9c73488e7274ecb5d76918f0ef328edcf089d81202e92f4fa3922bfe46d6eb3e9a1bbd065858bf6e5cff60 SHA512 a7b2f620c846f2127220a062eab76f2c06b3eee4503d9f4922d7d6342feea19381be1486bf1cb033c44275f83ab90be3f8f2c09f0ec6f0af7367c314023c889e +DIST libnpupnp-5.0.2.tar.gz 553436 BLAKE2B d285bf2b58c74f2aefd98ffb4a0021d82ac508cf91be0dd02db9125fb2966358ce8e5969f540de8c4e6c4930b5f55e1a55588fcd65010b9e0181aa01d70f0b72 SHA512 6beab39649acd9ad3ac71420455bf4449f3c8223abcd84578c0a4a0ec52e5fa8df2c07cfda439ce91bc8c83b3a43b74c36de8765adf4feb11b61ee72936ede4e +DIST libnpupnp-6.1.1.tar.gz 549925 BLAKE2B b7d8db7ddf58f77ee855dd6e82567a8e0edf1cbad468e2f4fa9a813908ec3c25a304fd3f41c592f5dfda46831998bf74a39a1be4cb3cd63cdac55f5aa2bc08a0 SHA512 905c0dfc7f018a80380406682550271893d795a1964bb5e7c4a56c6934ce06b9b6e29a2c5a7a9c4bf1a5a2348637ad6af3fd99cd38d7bba9d935fdbec6a6dce5 diff --git a/net-libs/libnpupnp/libnpupnp-4.1.5.ebuild b/net-libs/libnpupnp/libnpupnp-5.0.2-r1.ebuild index 12dfef202a9e..47edf9c364e2 100644 --- a/net-libs/libnpupnp/libnpupnp-4.1.5.ebuild +++ b/net-libs/libnpupnp/libnpupnp-5.0.2-r1.ebuild @@ -1,24 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools + DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp" HOMEPAGE="https://framagit.org/medoc92/npupnp" SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz" + LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" RDEPEND=" dev-libs/expat - net-libs/libmicrohttpd + net-libs/libmicrohttpd:= net-misc/curl " +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default - ./autogen.sh || die + eautoreconf } src_configure() { @@ -35,3 +40,9 @@ src_configure() { --enable-tools \ --enable-webserver } + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libnpupnp/libnpupnp-6.1.1.ebuild b/net-libs/libnpupnp/libnpupnp-6.1.1.ebuild new file mode 100644 index 000000000000..fb767483046f --- /dev/null +++ b/net-libs/libnpupnp/libnpupnp-6.1.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp" +HOMEPAGE="https://framagit.org/medoc92/npupnp" +SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/expat + net-libs/libmicrohttpd:= + net-misc/curl +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --enable-client \ + --enable-debug \ + --enable-device \ + --enable-gena \ + --enable-ipv6 \ + --enable-optssdp \ + --enable-reuseaddr \ + --enable-soap \ + --enable-ssdp \ + --enable-tools \ + --enable-webserver +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest index 1b1355f34238..f977a140c71e 100644 --- a/net-libs/libnsl/Manifest +++ b/net-libs/libnsl/Manifest @@ -1,2 +1,3 @@ DIST libnsl-1.3.0.tar.xz 321488 BLAKE2B 25cb4fa2b3f161ce4cd06ca5cc0a716bf981620de4eb102f464bc1919b8f6d82f7b02a6108260122000bbac0307d9db05d406183dc533dd1b97683d08a7fc5f5 SHA512 a5a6c3ccb2d1e724c8c1f65e55dcd09383eb1ae019c55f4c09441eadf23ffbc2196cfad259805b0ac40ddf3a10af0da453e4d739d67d46829c64d0995dab4e55 DIST libnsl-2.0.0.tar.xz 284408 BLAKE2B 843cd0346b45a688c59b88caebd9c5c938b0ef4b5e751b27599ae725a19f0ba2b88bc23b861edc75d79ae6c6bb829e4f82e9e3cd994d25d3385b1a75b9b58b8e SHA512 02ff41d335b7e965182c1f47a6448c1a71ae991a4d5a86ae5472cea7b38633a36b736469cc0d9fc407c706f3f144f90e4b7c9653643976805aa96fc319a69784 +DIST libnsl-2.0.1.tar.xz 281892 BLAKE2B 91ad7558127a675bc861dee11d00d82a999462d34753f579a77c1579a7f8be1ded2eff11ecfde9dc81e2466118c288ee18a8b280453f6548cc2b4528021e1503 SHA512 0ffdf15b4380fc89bf11f4f64b74ed999099c0ab3ee39cafd52f933a5000f9b1ed3987c8c13533a7cd92474aadd4cc9909a2e1eabc9143f0cb11746385e5fc57 diff --git a/net-libs/libnsl/libnsl-0-r1.ebuild b/net-libs/libnsl/libnsl-0-r2.ebuild index f523651c7a2a..d2660a9b9cf3 100644 --- a/net-libs/libnsl/libnsl-0-r1.ebuild +++ b/net-libs/libnsl/libnsl-0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 # Used only to populate IUSE, bug 643058 inherit multilib-build @@ -11,11 +11,9 @@ HOMEPAGE="https://github.com/thkukuk/libnsl" # Fake version to help portage upgrading. -SLOT="0/1" LICENSE="LGPL-2.1+" +SLOT="0/1" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - DEPEND="elibc_glibc? ( <sys-libs/glibc-2.26 )" RDEPEND="${DEPEND}" diff --git a/net-libs/libnsl/libnsl-1.3.0-r2.ebuild b/net-libs/libnsl/libnsl-1.3.0-r2.ebuild index cdf792d83342..45c7eb9eb842 100644 --- a/net-libs/libnsl/libnsl-1.3.0-r2.ebuild +++ b/net-libs/libnsl/libnsl-1.3.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/thkukuk/libnsl" SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz" SLOT="0/2" -LICENSE="LGPL-2.1+" +LICENSE="LGPL-2.1+ BSD" # Stabilize together with glibc-2.26! KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" diff --git a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild index 99b3fb7a8a12..1c3bde051d1e 100644 --- a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild +++ b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,8 +14,8 @@ SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz" # with FEATURES="-preserved-libs" or another package manager if SONAME # changes. SLOT="0/3" -LICENSE="LGPL-2.1+" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +LICENSE="LGPL-2.1+ BSD" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" DEPEND=">=net-libs/libtirpc-1.2.0:=[${MULTILIB_USEDEP}]" diff --git a/net-libs/libnsl/libnsl-2.0.1.ebuild b/net-libs/libnsl/libnsl-2.0.1.ebuild new file mode 100644 index 000000000000..36213be24a36 --- /dev/null +++ b/net-libs/libnsl/libnsl-2.0.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal preserve-libs + +DESCRIPTION="Public client interface for NIS(YP) in a IPv6 ready version" +HOMEPAGE="https://github.com/thkukuk/libnsl" +SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz" + +# This is a core package which is depended on by e.g. PAM in some cases. +# 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/3" +LICENSE="LGPL-2.1+ BSD" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="static-libs" + +DEPEND=">=net-libs/libtirpc-1.2.0:=[${MULTILIB_USEDEP}]" +RDEPEND=" + ${DEPEND} + !<sys-libs/glibc-2.26 +" + +multilib_src_configure() { + local myconf=( + --enable-shared + $(use_enable static-libs static) + ) + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/libnsl.so.2 +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/libnsl.so.2 +} diff --git a/net-libs/libnsl/metadata.xml b/net-libs/libnsl/metadata.xml index 2d4f8ac9895a..654bb3920311 100644 --- a/net-libs/libnsl/metadata.xml +++ b/net-libs/libnsl/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>toolchain@gentoo.org</email> - <name>Gentoo Toolchain Project</name> -</maintainer> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System Project</name> -</maintainer> + <maintainer type="project"> + <email>toolchain@gentoo.org</email> + <name>Gentoo Toolchain Project</name> + </maintainer> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System Project</name> + </maintainer> + <upstream> + <remote-id type="github">thkukuk/libnsl</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libntlm/libntlm-1.6.ebuild b/net-libs/libntlm/libntlm-1.6.ebuild index 9bb9c39d844f..97b84d0fde39 100644 --- a/net-libs/libntlm/libntlm-1.6.ebuild +++ b/net-libs/libntlm/libntlm-1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://www.nongnu.org/${PN}/releases/${P}.tar.gz" SLOT="0" LICENSE="LGPL-2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux" IUSE="static-libs" src_configure() { diff --git a/net-libs/libntlm/metadata.xml b/net-libs/libntlm/metadata.xml index 267630277384..055fabccb709 100644 --- a/net-libs/libntlm/metadata.xml +++ b/net-libs/libntlm/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<longdescription> -libntlm is a library that implement Microsoft's NTLM authentication. However, -the packaging of libntlm lacked certain things, such as having build problems, -lacking shared library support, lacking autoconf macro for use in other -applications, lacking pkg-config support, and more. So this page distributes an -improved version of the library; called Libntlm. -</longdescription> + <!-- maintainer-needed --> + <longdescription> + libntlm is a library that implement Microsoft's NTLM authentication. However, + the packaging of libntlm lacked certain things, such as having build problems, + lacking shared library support, lacking autoconf macro for use in other + applications, lacking pkg-config support, and more. So this page distributes an + improved version of the library; called Libntlm. + </longdescription> + <upstream> + <remote-id type="gitlab">gsasl/libntlm</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild index 0d411264df2f..68da49679aab 100644 --- a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild +++ b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,12 +9,12 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~sparc x86" IUSE="doc examples" RDEPEND="net-misc/curl" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" src_prepare() { default diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r2.ebuild index db045636e130..5766095b8baa 100644 --- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild +++ b/net-libs/liboauth/liboauth-1.0.3-r2.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="C library implementing the OAuth secure authentication protocol" -HOMEPAGE="http://liboauth.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz" +HOMEPAGE="https://liboauth.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${P}.tar.gz" LICENSE="|| ( GPL-2 MIT )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos" +# Upstream recommend NSS by default for licencing reasons (may change w/ openssl 3?) IUSE="bindist curl doc +nss" - REQUIRED_USE="bindist? ( nss )" PATCHES=( @@ -20,36 +20,34 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0.3-openssl-1.1_2.patch ) -CDEPEND=" +RDEPEND=" curl? ( net-misc/curl ) - nss? ( dev-libs/nss + nss? ( + dev-libs/nss curl? ( || ( - net-misc/curl[ssl,curl_ssl_nss] + net-misc/curl[ssl,curl_ssl_nss(-)] net-misc/curl[-ssl] ) ) ) !nss? ( - dev-libs/openssl:0= + dev-libs/openssl:= curl? ( || ( net-misc/curl[ssl,curl_ssl_openssl] net-misc/curl[-ssl] ) ) ) " - -RDEPEND="${CDEPEND}" - -DEPEND=" - ${CDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig doc? ( - app-doc/doxygen + app-text/doxygen media-gfx/graphviz media-fonts/freefont ) " -BDEPEND=" - virtual/pkgconfig -" + +DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README ) src_configure() { local myeconfargs=( @@ -71,8 +69,6 @@ src_compile() { fi } -DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README ) - src_install() { use doc && HTML_DOCS=( doc/html/. ) default diff --git a/net-libs/liboauth/liboauth-1.0.3-r3.ebuild b/net-libs/liboauth/liboauth-1.0.3-r3.ebuild new file mode 100644 index 000000000000..8022dbff7b2e --- /dev/null +++ b/net-libs/liboauth/liboauth-1.0.3-r3.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="C library implementing the OAuth secure authentication protocol" +HOMEPAGE="https://liboauth.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${P}.tar.gz" + +LICENSE="|| ( GPL-2 MIT )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" +# Upstream recommended NSS in the past for licencing reasons but w/ OpenSSL 3 that's +# no longer a problem, plus curl >= 8.3 doesn't support NSS anymore. +IUSE="bindist curl doc nss" +REQUIRED_USE="bindist? ( nss )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.1-doxygen-out-of-tree.patch + "${FILESDIR}"/${PN}-1.0.3-openssl-1.1.patch + "${FILESDIR}"/${PN}-1.0.3-openssl-1.1_2.patch +) + +# TODO: Drop curl + nss support entirely given it doesn't make sense anymore +RDEPEND=" + curl? ( net-misc/curl ) + nss? ( + dev-libs/nss + curl? ( || ( + net-misc/curl[ssl,curl_ssl_nss(-)] + net-misc/curl[-ssl] + ) ) + ) + !nss? ( + >=dev-libs/openssl-3:= + curl? ( || ( + net-misc/curl[ssl,curl_ssl_openssl] + net-misc/curl[-ssl] + ) ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-text/doxygen + media-gfx/graphviz + media-fonts/freefont + ) +" + +DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README ) + +src_configure() { + local myeconfargs=( + --disable-static + $(use_enable !curl curl) + $(use_enable curl libcurl) + $(use_enable nss) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + if use doc ; then + # make sure fonts are found + export DOTFONTPATH="${EPREFIX}"/usr/share/fonts/freefont-ttf + emake dox + fi +} + +src_install() { + use doc && HTML_DOCS=( doc/html/. ) + default + find "${ED}" -name "*.la" -delete || die +} diff --git a/net-libs/liboauth/liboauth-1.0.3-r4.ebuild b/net-libs/liboauth/liboauth-1.0.3-r4.ebuild new file mode 100644 index 000000000000..5577f3ed7abb --- /dev/null +++ b/net-libs/liboauth/liboauth-1.0.3-r4.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="C library implementing the OAuth secure authentication protocol" +HOMEPAGE="https://liboauth.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${P}.tar.gz" + +LICENSE="|| ( GPL-2 MIT )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos" +IUSE="curl doc" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.1-doxygen-out-of-tree.patch + "${FILESDIR}"/${PN}-1.0.3-openssl-1.1.patch + "${FILESDIR}"/${PN}-1.0.3-openssl-1.1_2.patch +) + +RDEPEND=" + >=dev-libs/openssl-3:= + curl? ( + net-misc/curl + || ( + net-misc/curl[ssl,curl_ssl_openssl] + net-misc/curl[-ssl] + ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-text/doxygen + media-gfx/graphviz + media-fonts/freefont + ) +" + +DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README ) + +src_configure() { + local myeconfargs=( + # Upstream recommended NSS in the past for licencing reasons but w/ OpenSSL 3 that's + # no longer a problem, plus curl >= 8.3 doesn't support NSS anymore. + --disable-nss + $(use_enable !curl curl) + $(use_enable curl libcurl) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + if use doc ; then + # make sure fonts are found + export DOTFONTPATH="${EPREFIX}"/usr/share/fonts/freefont-ttf + emake dox + fi +} + +src_install() { + use doc && HTML_DOCS=( doc/html/. ) + default + find "${ED}" -name "*.la" -delete || die +} diff --git a/net-libs/libomemo-c/Manifest b/net-libs/libomemo-c/Manifest new file mode 100644 index 000000000000..be5fb92e252f --- /dev/null +++ b/net-libs/libomemo-c/Manifest @@ -0,0 +1 @@ +DIST libomemo-c-0.5.0.tar.gz 260987 BLAKE2B 68a2e7488e1f079e32ed16124fc73e84f28e1140c96e19e60accde3e1434e4bfea0d3323c7550b2dc4bf55ad493d9353e284486920375c2efc32a1b51f0965bf SHA512 2661ba0dea3eea308b1b71f1b46d7b8445fbe940bf52cc35f22eed110acdb8ee457841c1978e0fe9a53b9d9856c60d70c7f8f98ac182214c0ffb9ec3983240f0 diff --git a/net-libs/libomemo-c/libomemo-c-0.5.0.ebuild b/net-libs/libomemo-c/libomemo-c-0.5.0.ebuild new file mode 100644 index 000000000000..45fbfda26fe7 --- /dev/null +++ b/net-libs/libomemo-c/libomemo-c-0.5.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="XMPP fork of Signal Protocol C Library supporting XEP-0384 OMEMO" +HOMEPAGE="https://github.com/dino/libomemo-c/" +SRC_URI="https://github.com/dino/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD BSD-1 GPL-3 ISC" +KEYWORDS="amd64" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-libs/protobuf-c:=" +DEPEND="${RDEPEND} + test? ( + dev-libs/check + dev-libs/openssl + ) +" + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +} diff --git a/net-libs/libomemo-c/metadata.xml b/net-libs/libomemo-c/metadata.xml new file mode 100644 index 000000000000..9177bf353669 --- /dev/null +++ b/net-libs/libomemo-c/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">dino/libomemo-c</remote-id> + <bugs-to>https://github.com/dino/libomemo-c/issues</bugs-to> + <doc>https://github.com/dino/libomemo-c/blob/master/README.md</doc> + </upstream> +</pkgmetadata> diff --git a/net-libs/libomemo/Manifest b/net-libs/libomemo/Manifest index 910b73b72493..b39ff0896a86 100644 --- a/net-libs/libomemo/Manifest +++ b/net-libs/libomemo/Manifest @@ -1 +1 @@ -DIST libomemo-0.7.1.tar.gz 23770 BLAKE2B a3909650e399075f62026bd048a667a276a6cd7197ac18ddf9e3c12f57e5fd9cb2f5532ba69d0836af87e1415a5ffdc1746cf90a596dcf255265a64e921f039d SHA512 e5769dee4db7be246853e47e29ded9eefad2f62422951ce5dd0c1acee3bb92131c0423f09bc716be0f55fb02c747f07a6d5b2c656bdfeee0ee148252c51a1050 +DIST libomemo-0.8.1.tar.gz 28648 BLAKE2B b75ad298946dff680705ba0927293ea30cb8bf616a417c6584cef9f84e0894c5581462782a4b1003bf9e530695eea10bba9f37ae94e957a0008a35c862f17f62 SHA512 452c7ff9eb809de37df24bd0857c30c1e1ed1d4638c8338bb101f6d5a31be700f174f4fe65fb8ccd5358a674f8397a0eb54d8e03abfdce57cea60bcd4959f40a diff --git a/net-libs/libomemo/files/libomemo-0.7.1-so-symlinks.patch b/net-libs/libomemo/files/libomemo-0.7.1-so-symlinks.patch deleted file mode 100644 index 69f174a75ecf..000000000000 --- a/net-libs/libomemo/files/libomemo-0.7.1-so-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3911dc9d496f61b774d091bd1f2394d458abe8d7 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 21 Feb 2021 20:51:01 +0100 -Subject: [PATCH] Add missing symlinks libomemo.so.$(VER_MAJ) and libomemo.so - ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile b/Makefile -index e7b9ea6..289d2ec 100644 ---- a/Makefile -+++ b/Makefile -@@ -108,6 +108,8 @@ install: $(BDIR) - install -d $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/pkgconfig/ - install -m 644 $(BDIR)/libomemo-conversations.a $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libomemo.a - install -m 644 $(BDIR)/libomemo.so $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libomemo.so.$(VERSION) -+ ln -s libomemo.so.$(VERSION) $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libomemo.so.$(VER_MAJ) -+ ln -s libomemo.so.$(VERSION) $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libomemo.so - install -m 644 $(BDIR)/libomemo.pc $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/pkgconfig/ - install -d $(DESTDIR)/$(PREFIX)/include/libomemo/ - install -m 644 $(SDIR)/libomemo_crypto.h $(DESTDIR)/$(PREFIX)/include/libomemo/ --- -2.30.1 - diff --git a/net-libs/libomemo/libomemo-0.7.1-r2.ebuild b/net-libs/libomemo/libomemo-0.7.1-r2.ebuild deleted file mode 100644 index 38d49c0e3988..000000000000 --- a/net-libs/libomemo/libomemo-0.7.1-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Implementation of OMEMO (XEP-0384) in C" -HOMEPAGE="https://github.com/gkdr/libomemo" -SRC_URI="https://github.com/gkdr/libomemo/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static-libs test" - -RDEPEND=" - dev-db/sqlite - dev-libs/glib - dev-libs/libgcrypt - dev-libs/mxml - " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - test? ( dev-util/cmocka ) - " - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${P}-so-symlinks.patch -) - -DOCS=( CHANGELOG.md README.md ) - -src_compile() { - emake PREFIX=/usr -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - # Respect libdir other than /usr/lib, e.g. /usr/lib64 - local libdir="$(get_libdir)" - if [[ ${libdir} != lib ]]; then - mv "${D}"/usr/{lib,${libdir}} || die - sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \ - -i "${D}/usr/${libdir}/pkgconfig/libomemo.pc" || die - fi - - einstalldocs - - if ! use static-libs ; then - rm "${D}/usr/${libdir}/libomemo.a" || die - fi -} diff --git a/net-libs/libomemo/libomemo-0.8.1-r1.ebuild b/net-libs/libomemo/libomemo-0.8.1-r1.ebuild new file mode 100644 index 000000000000..e53dabe9e607 --- /dev/null +++ b/net-libs/libomemo/libomemo-0.8.1-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Implementation of OMEMO (XEP-0384) in C" +HOMEPAGE="https://github.com/gkdr/libomemo" +SRC_URI="https://github.com/gkdr/libomemo/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="test" + +RDEPEND=" + dev-db/sqlite + dev-libs/glib + dev-libs/libgcrypt + dev-libs/mxml:0 + " +DEPEND=" + ${RDEPEND} + virtual/pkgconfig + test? ( dev-util/cmocka ) + " + +RESTRICT="!test? ( test )" + +DOCS=( CHANGELOG.md README.md ) + +src_configure() { + local mycmakeargs=( + -DOMEMO_WITH_TESTS=$(usex test) + ) + cmake_src_configure +} diff --git a/net-libs/libomemo/metadata.xml b/net-libs/libomemo/metadata.xml index 6a22e9e318bb..5b29f2b47b16 100644 --- a/net-libs/libomemo/metadata.xml +++ b/net-libs/libomemo/metadata.xml @@ -5,4 +5,7 @@ <email>sping@gentoo.org</email> <name>Sebastian Pipping</name> </maintainer> + <upstream> + <remote-id type="github">gkdr/libomemo</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/liboping/liboping-1.10.0-r2.ebuild b/net-libs/liboping/liboping-1.10.0-r3.ebuild index dfa32d0b9ef4..c5a472cf1653 100644 --- a/net-libs/liboping/liboping-1.10.0-r2.ebuild +++ b/net-libs/liboping/liboping-1.10.0-r3.ebuild @@ -1,63 +1,69 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit autotools fcaps perl-module DESCRIPTION="Protocol independent ANSI-C ping library and command line utility" -HOMEPAGE="https://noping.cc/" +HOMEPAGE=" + https://noping.cc/ + https://github.com/octo/liboping +" SRC_URI="https://noping.cc/files/${P}.tar.bz2" -LICENSE="LGPL-2.1 GPL-2" +LICENSE="GPL-2 LGPL-2.1" SLOT="0/0.3" -KEYWORDS="~alpha amd64 arm x86" +KEYWORDS="~alpha amd64 arm ~arm64 x86" IUSE="+filecaps ncurses perl" DEPEND="ncurses? ( sys-libs/ncurses:0= )" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-1.10.0-no-werror.patch + "${FILESDIR}/${PN}-1.10.0-no-werror.patch" "${FILESDIR}/${PN}-1.6.2-nouidmagic.patch" - "${FILESDIR}"/${P}-gcc8-fix.patch - "${FILESDIR}"/${P}-do-not-quit-when-ping_send-fail.patch - "${FILESDIR}"/${P}-report-right-error-msg-when-select-fails.patch + "${FILESDIR}/${PN}-1.10.0-gcc8-fix.patch" + "${FILESDIR}/${PN}-1.10.0-do-not-quit-when-ping_send-fail.patch" + "${FILESDIR}/${PN}-1.10.0-report-right-error-msg-when-select-fails.patch" ) src_prepare() { default - eautoreconf } src_configure() { - econf \ - $(use_with perl perl-bindings INSTALLDIRS=vendor) \ + myeconfargs=( $(use_with ncurses) + $(use_with perl perl-bindings INSTALLDIRS=vendor) + ) + + econf "${myeconfargs[@]}" } src_test() { if use perl; then - pushd bindings/perl >/dev/null || die + pushd bindings/perl || die + local LD_PRELOAD="../../src/.libs/liboping.so" perl-module_src_test - popd >/dev/null || die + popd || die fi } src_install() { default - - find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die + find "${ED}" -type f -name '*.la' -delete || die } pkg_postinst() { if use filecaps; then local _caps_str="CAP_NET_RAW" - _files=( "${EROOT%/}/usr/bin/oping") + _files=( "${EROOT}/usr/bin/oping") if use ncurses; then - _files+=( "${EROOT%/}/usr/bin/noping") + _files+=( "${EROOT}/usr/bin/noping") fi fcaps "${_caps_str}" "${_files[@]}" diff --git a/net-libs/liboping/metadata.xml b/net-libs/liboping/metadata.xml index 2a895499c86d..2b599b99ab89 100644 --- a/net-libs/liboping/metadata.xml +++ b/net-libs/liboping/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> </maintainer> <slots> <subslots>Reflect major ABI version (=upstream's LIBOPING_CURRENT value) of liboping.so.</subslots> diff --git a/net-libs/libosmo-dsp/files/libosmo-dsp-0.4.0-version.patch b/net-libs/libosmo-dsp/files/libosmo-dsp-0.4.0-version.patch new file mode 100644 index 000000000000..f52ced266959 --- /dev/null +++ b/net-libs/libosmo-dsp/files/libosmo-dsp-0.4.0-version.patch @@ -0,0 +1,11 @@ +diff --git a/configure.ac b/configure.ac +index 964ef03..35fde74 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_INIT([libosmodsp], +- m4_esyscmd([./git-version-gen .tarball-version]), ++ [0.4.0], + [gmr@lists.osmocom.org]) + + AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6]) diff --git a/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild index 78a00cfa66f7..c7cc5eaddb37 100644 --- a/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild +++ b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="git://git.osmocom.org/${PN}" else SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="GPL-2" @@ -23,10 +23,17 @@ IUSE="doc static-libs" RDEPEND="sci-libs/fftw:3.0" DEPEND="${RDEPEND}" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( + app-text/doxygen + dev-texlive/texlive-latexextra + ) virtual/pkgconfig " +# Adapt version for libosmodsp.pc to 0.4.0 snapshot (bug #857678) +# Needs to be adapted on version bump. +PATCHES=( "${FILESDIR}/${P}-version.patch" ) + src_prepare() { default eautoreconf @@ -40,4 +47,5 @@ src_configure() { src_install() { default_src_install use static-libs || rm "${ED}"/usr/$(get_libdir)/libosmodsp.a + use static-libs || rm "${ED}"/usr/$(get_libdir)/libosmodsp.la } diff --git a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild index 0fc0e3c4f071..5793baf98d52 100644 --- a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild +++ b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,7 @@ IUSE="doc static-libs" RDEPEND="sci-libs/fftw:3.0" DEPEND="${RDEPEND}" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) virtual/pkgconfig " @@ -40,4 +40,5 @@ src_configure() { src_install() { default_src_install use static-libs || rm "${ED}"/usr/$(get_libdir)/libosmodsp.a + use static-libs || rm "${ED}"/usr/$(get_libdir)/libosmodsp.la } diff --git a/net-libs/libosmocore/Manifest b/net-libs/libosmocore/Manifest deleted file mode 100644 index 4f227d410617..000000000000 --- a/net-libs/libosmocore/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libosmocore-0.10.2.tar.bz2 646555 BLAKE2B 62dbabdbb8a397662b618863aade394ef4638dd266e059ef4c6fa54364aba60db29cce1fc6c2692af095f32b3ce186ee5b788598595fe2128f0d04caad9d83d2 SHA512 a42db3467faec9c814efe40ae8cf4a41e610b97cac04c1da30c211f116e1f7907117aaab89aca8af3dcd8aedc2be73c9e1c194b9062d33856de02feddf4bda22 diff --git a/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch b/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch deleted file mode 100644 index c61ecac1f336..000000000000 --- a/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libosmocore-0.6.0/configure.ac -+++ libosmocore-0.6.0/configure.ac -@@ -77,7 +77,7 @@ - CHECK_TM_INCLUDES_TM_GMTOFF - - dnl Generate the output --AC_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_ARG_ENABLE(talloc, - [AS_HELP_STRING( diff --git a/net-libs/libosmocore/libosmocore-0.10.2.ebuild b/net-libs/libosmocore/libosmocore-0.10.2.ebuild deleted file mode 100644 index 3ac080827d7c..000000000000 --- a/net-libs/libosmocore/libosmocore-0.10.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic - -DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects" -HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" -else - SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="GPL-2 LGPL-3" -SLOT="0" -IUSE="pcsc-lite" - -RDEPEND=" - sys-libs/talloc - pcsc-lite? ( sys-apps/pcsc-lite ) -" - -DEPEND="${RDEPEND} - app-doc/doxygen -" - -PATCHES=( "${FILESDIR}/${PN}-0.6.0-automake-1.13.patch" ) - -src_prepare() { - default_src_prepare - # set correct version in pkgconfig files - sed -i "s/UNKNOWN/${PV}/" git-version-gen || die - - eautoreconf -} - -src_configure() { - append-flags -fcommon - econf \ - $(use_enable pcsc-lite pcsc) -} diff --git a/net-libs/libosmocore/libosmocore-9999.ebuild b/net-libs/libosmocore/libosmocore-9999.ebuild deleted file mode 100644 index 3ac080827d7c..000000000000 --- a/net-libs/libosmocore/libosmocore-9999.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic - -DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects" -HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" -else - SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="GPL-2 LGPL-3" -SLOT="0" -IUSE="pcsc-lite" - -RDEPEND=" - sys-libs/talloc - pcsc-lite? ( sys-apps/pcsc-lite ) -" - -DEPEND="${RDEPEND} - app-doc/doxygen -" - -PATCHES=( "${FILESDIR}/${PN}-0.6.0-automake-1.13.patch" ) - -src_prepare() { - default_src_prepare - # set correct version in pkgconfig files - sed -i "s/UNKNOWN/${PV}/" git-version-gen || die - - eautoreconf -} - -src_configure() { - append-flags -fcommon - econf \ - $(use_enable pcsc-lite pcsc) -} diff --git a/net-libs/libosmocore/metadata.xml b/net-libs/libosmocore/metadata.xml deleted file mode 100644 index 0329d3de81a5..000000000000 --- a/net-libs/libosmocore/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> - </maintainer> - <use> - <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag> - </use> -</pkgmetadata> diff --git a/net-libs/libotr/files/libotr-4.1.1-dont-clobber-fortify-source.patch b/net-libs/libotr/files/libotr-4.1.1-dont-clobber-fortify-source.patch new file mode 100644 index 000000000000..af9330b97d3a --- /dev/null +++ b/net-libs/libotr/files/libotr-4.1.1-dont-clobber-fortify-source.patch @@ -0,0 +1,23 @@ +Don't clobber our toolchain defaults. + +https://bugs.gentoo.org/895680 +--- a/configure.ac ++++ b/configure.ac +@@ -151,7 +151,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ + ])], have_clang=yes, have_clang=no) + + if test x$enable_gcc_hardening != xno; then +- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ++ CFLAGS="$CFLAGS" + if test x$have_clang = xyes; then + OTR_CHECK_CFLAGS(-Qunused-arguments) + fi +@@ -181,6 +181,8 @@ if test x$enable_linker_hardening != xno; then + OTR_CHECK_LDFLAGS(-z relro -z now, "$all_ldflags_for_check", "$all_libs_for_check") + fi + ++AX_ADD_FORTIFY_SOURCE ++ + AC_OUTPUT([Makefile src/Makefile toolkit/Makefile tests/Makefile tests/utils/Makefile libotr.pc + tests/utils/tap/Makefile + tests/unit/Makefile diff --git a/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch b/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch new file mode 100644 index 000000000000..1aa60f478b88 --- /dev/null +++ b/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/836572 +--- a/tests/regression/client/client.c ++++ b/tests/regression/client/client.c +@@ -26,6 +26,7 @@ + #include <stdlib.h> + #include <syscall.h> + #include <sys/epoll.h> ++#include <sys/socket.h> + #include <sys/types.h> + #include <sys/un.h> + #include <unistd.h> diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1-r1.ebuild index c4976292c2ca..9dae661b4ebb 100644 --- a/net-libs/libotr/libotr-4.1.1.ebuild +++ b/net-libs/libotr/libotr-4.1.1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging" HOMEPAGE="https://otr.cypherpunks.ca" @@ -9,16 +11,20 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" dev-libs/libgcrypt:0= dev-libs/libgpg-error:0=" DEPEND="${RDEPEND}" -src_configure() { - econf --disable-static +PATCHES=( + "${FILESDIR}/${PN}-4.1.1-fix-build-with-libgcrypt-1.10.patch" +) + +src_prepare() { + default + eautoreconf } src_install() { @@ -26,5 +32,5 @@ src_install() { dodoc UPGRADING # no static archives, #465686 - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/net-libs/libotr/libotr-4.1.1-r2.ebuild b/net-libs/libotr/libotr-4.1.1-r2.ebuild new file mode 100644 index 000000000000..83a6ffaf1255 --- /dev/null +++ b/net-libs/libotr/libotr-4.1.1-r2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging" +HOMEPAGE="https://otr.cypherpunks.ca" +SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND=" + dev-libs/libgcrypt:= + dev-libs/libgpg-error:= +" +DEPEND="${RDEPEND}" +# autoconf-archive for F_S patch +BDEPEND="dev-build/autoconf-archive" + +PATCHES=( + "${FILESDIR}/${PN}-4.1.1-fix-build-with-libgcrypt-1.10.patch" + "${FILESDIR}/${PN}-4.1.1-dont-clobber-fortify-source.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + dodoc UPGRADING + + # no static archives, #465686 + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest index e973952f7f27..4f89b6eceec0 100644 --- a/net-libs/libpcap/Manifest +++ b/net-libs/libpcap/Manifest @@ -1,4 +1,2 @@ -DIST libpcap-1.10.0-upstream.tar.gz 934559 BLAKE2B 54e809af242b18d600b88f29bbe31b01784b5160366242f313908b58dfb1e6ee2ceae8d359f730881e15c1b26ed90c553869dffb25a74eb3cea9f597dd490b1d SHA512 007710386ff3435ef97fc99293076eae3c39b424e986141184c712b0285f8589357a1b25085f7eba28730de04312042c724d193934a399797e95a56f5301da7f -DIST libpcap-1.10.0-upstream.tar.gz.sig 442 BLAKE2B f19ca45bbeee39ef1b3f8a8e8d8d9f24ad43e503430a3fa969a8ce668cb7926e1d19adb7e7cf11fff9dafa09b04507052ccc98f7b2a81f053ff01ec6c7ec8f87 SHA512 8a13aef00120080793da800f038d13124d412dfcfae6c0a952bcab544b50c8b69f6a672438bbe5bcdbfeda2e0d541bccefefbfc69f94e1635c0e9eaf77f19902 -DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171 -DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d +DIST libpcap-1.10.4.tar.gz 952153 BLAKE2B 05a7eafc1e1817f7844008db89d8fb10cd2525c22f7ee6c9e3d582b14229412f38ccced5e9d80a96dd459ef9eab12eccb5c1dd4978ddc9f66267469212005e4c SHA512 1f6d6ddd07dae7c557054cb246437ecdaf39d579592a5a6bdf1144eea6cb5a779ac4ca647cfed11ec1b0bb18efc63b845444e497070bacefaaed19a5787ae5e1 +DIST libpcap-1.10.4.tar.gz.sig 442 BLAKE2B d0eb5da9a57003848b24d458e50a201d0bb8876a12e63f6627bf9dc1a784e780610cd0c858243cc75a63999b40bc64507b078777ae844ede7c07eef9f4f9e0d5 SHA512 34aa401c2e162d708c61b78b445af2fe4ddc0e57de9124b5cc3a05679ffbc3834088160f83892d827e25c65b33313fe71aa73c2de09935d387252ab315ca5ee1 diff --git a/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch b/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch deleted file mode 100644 index e5524ac3baee..000000000000 --- a/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -2225,10 +2225,7 @@ - AC_DEFINE(PCAP_SUPPORT_LINUX_USBMON, 1, [target host supports Linux usbmon for USB sniffing]) - MODULE_C_SRC="$MODULE_C_SRC pcap-usb-linux.c" - AC_MSG_RESULT(yes) -- ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null` -- if test $? -ne 0 ; then -- ac_usb_dev_name="usbmon" -- fi -+ ac_usb_dev_name="usbmon" - AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing]) - AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name) - # diff --git a/net-libs/libpcap/files/libpcap-1.9.1-pcap-config.patch b/net-libs/libpcap/files/libpcap-1.9.1-pcap-config.patch deleted file mode 100644 index 937273c43ff0..000000000000 --- a/net-libs/libpcap/files/libpcap-1.9.1-pcap-config.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/pcap-config.in -+++ b/pcap-config.in -@@ -59,16 +59,16 @@ - # - if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] - then -- echo "-I$includedir -L$libdir -lpcap $LIBS" -+ echo "-lpcap $LIBS" - elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] - then -- echo "-I$includedir -L$libdir $LIBS" -+ echo "$LIBS" - elif [ "$show_cflags" = 1 ] - then -- echo "-I$includedir" -+ echo "" - elif [ "$show_libs" = 1 ] - then -- echo "-L$libdir -lpcap $LIBS" -+ echo "-lpcap $LIBS" - elif [ "$show_additional_libs" = 1 ] - then - echo "$LIBS" -@@ -80,15 +80,15 @@ - # - if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] - then -- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME" -+ echo " $RPATH -l$PACKAGE_NAME" - elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] - then -- echo "-I$includedir" -+ echo "" - elif [ "$show_cflags" = 1 ] - then -- echo "-I$includedir" -+ echo "" - elif [ "$show_libs" = 1 ] - then -- echo "-L$libdir $RPATH -l$PACKAGE_NAME" -+ echo "$RPATH -l$PACKAGE_NAME" - fi - fi diff --git a/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch b/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch deleted file mode 100644 index 5ac34fd46485..000000000000 --- a/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup - ---- a/configure.ac -+++ b/configure.ac -@@ -1860,7 +1860,7 @@ - if test "$enable_universal" != "no"; then - case "$host_os" in - -- darwin[[0-7]].*) -+ darwin**) - # - # Pre-Tiger. Build only for 32-bit PowerPC; no - # need for any special compiler or linker flags. diff --git a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild deleted file mode 100644 index c275946be987..000000000000 --- a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -DESCRIPTION="A system-independent library for user-level network packet capture" -HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap" - -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc - inherit verify-sig - - # Note: drop -upstream on bump, this is just because we switched to the official - # distfiles for verify-sig - SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz" - SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )" - - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug" - -RDEPEND=" - bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] ) - remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] ) - rdma? ( sys-cluster/rdma-core ) - usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/flex - virtual/yacc - dbus? ( virtual/pkgconfig ) -" - -if [[ ${PV} != *9999* ]] ; then - BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.1-pcap-config.patch - "${FILESDIR}"/${PN}-1.10.0-usbmon.patch -) - -src_prepare() { - default - - if ! [[ -f VERSION ]]; then - echo ${PV} > VERSION || die - fi - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - $(use_enable bluetooth) \ - $(use_enable dbus) \ - $(use_enable rdma) \ - $(use_enable remote) \ - $(use_enable usb) \ - $(use_enable yydebug) \ - $(use_with netlink libnl) \ - --enable-ipv6 -} - -multilib_src_compile() { - emake all shared -} - -multilib_src_install_all() { - dodoc CREDITS CHANGES VERSION TODO README.* doc/README.* - - # remove static libraries (--disable-static does not work) - if ! use static-libs; then - find "${ED}" -name '*.a' -exec rm {} + || die - fi - - find "${ED}" -name '*.la' -delete || die - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h portability.h - fi -} diff --git a/net-libs/libpcap/libpcap-1.10.0-r1.ebuild b/net-libs/libpcap/libpcap-1.10.4.ebuild index 13d40b16ff92..5d183cff7e97 100644 --- a/net-libs/libpcap/libpcap-1.10.0-r1.ebuild +++ b/net-libs/libpcap/libpcap-1.10.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools multilib-minimal @@ -12,20 +12,19 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap" inherit git-r3 else - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc inherit verify-sig - # Note: drop -upstream on bump, this is just because we switched to the official - # distfiles for verify-sig - SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz" - SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )" + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="BSD" SLOT="0" -IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug" +IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug" +RESTRICT="!test? ( test )" RDEPEND=" bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) @@ -37,20 +36,15 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" + app-alternatives/yacc sys-devel/flex - virtual/yacc dbus? ( virtual/pkgconfig ) " if [[ ${PV} != *9999* ]] ; then - BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )" + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" fi -PATCHES=( - "${FILESDIR}"/${PN}-1.9.1-pcap-config.patch - "${FILESDIR}"/${PN}-1.10.0-usbmon.patch -) - src_prepare() { default @@ -62,8 +56,10 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ + # bug #884275 + export LEX=flex + + ECONF_SOURCE="${S}" econf \ $(use_enable bluetooth) \ $(use_enable dbus) \ $(use_enable rdma) \ @@ -76,6 +72,11 @@ multilib_src_configure() { multilib_src_compile() { emake all shared + use test && emake testprogs +} + +multilib_src_test() { + testprogs/findalldevstest || die } multilib_src_install_all() { @@ -87,10 +88,4 @@ multilib_src_install_all() { fi find "${ED}" -name '*.la' -delete || die - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h portability.h - fi } diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild index 02b3408cddff..770877d74270 100644 --- a/net-libs/libpcap/libpcap-9999.ebuild +++ b/net-libs/libpcap/libpcap-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools multilib-minimal @@ -12,18 +12,19 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap" inherit git-r3 else - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc inherit verify-sig SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="BSD" SLOT="0" -IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug" +IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug" +RESTRICT="!test? ( test )" RDEPEND=" bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) @@ -35,21 +36,15 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" + app-alternatives/yacc sys-devel/flex - virtual/yacc dbus? ( virtual/pkgconfig ) " if [[ ${PV} != *9999* ]] ; then - BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )" + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" fi -PATCHES=( - "${FILESDIR}"/${PN}-1.9.1-pcap-config.patch - "${FILESDIR}"/${PN}-1.10.0-usbmon.patch - "${FILESDIR}"/${PN}-9999-prefix-darwin.patch -) - src_prepare() { default @@ -61,8 +56,10 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ + # bug #884275 + export LEX=flex + + ECONF_SOURCE="${S}" econf \ $(use_enable bluetooth) \ $(use_enable dbus) \ $(use_enable rdma) \ @@ -75,6 +72,11 @@ multilib_src_configure() { multilib_src_compile() { emake all shared + use test && emake testprogs +} + +multilib_src_test() { + testprogs/findalldevstest || die } multilib_src_install_all() { @@ -86,10 +88,4 @@ multilib_src_install_all() { fi find "${ED}" -name '*.la' -delete || die - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h portability.h - fi } diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml index 011e819baba7..a3e378e23edd 100644 --- a/net-libs/libpcap/metadata.xml +++ b/net-libs/libpcap/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> - <maintainer type="person"> <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> diff --git a/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild index bfa3f2123330..2cfe5de3d43c 100644 --- a/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild +++ b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ inherit autotools DESCRIPTION="Libpcap wrapper library to navigate to arbitrary packets in a tcpdump trace file" HOMEPAGE="http://netdude.sourceforge.net/" -SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/netdude/${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest deleted file mode 100644 index 40c6ba6c7b40..000000000000 --- a/net-libs/libpri/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libpri-1.6.0.tar.gz 340578 BLAKE2B abef8004601ea6f2c48c23b7b9e5fe3b231e6b00b0389d0baa8cd8bd2b772bcece52b1e3cc98acb44f47fb4dabfaac30d59a638bf021c5fe66bc49209d942cfe SHA512 3eb876477cdd27c88f274e4a2e35a67f660b8d8eed140e56c40769982a58f1cdd4e5be352f8f220dc100eedf1ad09286c578430a52d9abe326440c8cbf517fa5 diff --git a/net-libs/libpri/files/libpri-1.4.13-multilib.patch b/net-libs/libpri/files/libpri-1.4.13-multilib.patch deleted file mode 100644 index 22eec7e50059..000000000000 --- a/net-libs/libpri/files/libpri-1.4.13-multilib.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- libpri-1.4.13/Makefile.orig 2012-09-26 17:46:23.000000000 +0200 -+++ libpri-1.4.13/Makefile 2012-10-10 08:04:44.000000000 +0200 -@@ -71,7 +71,7 @@ - CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) - INSTALL_PREFIX=$(DESTDIR) - INSTALL_BASE=/usr --libdir?=$(INSTALL_BASE)/lib -+LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib - ifneq ($(findstring Darwin,$(OSARCH)),) - SOFLAGS=$(LDFLAGS) -dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace - ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6) -@@ -145,27 +145,27 @@ - fi - - install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) -- mkdir -p $(INSTALL_PREFIX)$(libdir) -+ mkdir -p $(LIBDIR) - mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include - ifneq (${OSARCH},SunOS) - install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include -- install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) -- #if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi -- ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf $(DYNAMIC_LIBRARY) libpri.so) -- install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) -- if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi -+ install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR) -+ if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi -+ ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so) -+ install -m 644 $(STATIC_LIBRARY) $(LIBDIR) -+ if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi - else - install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h -- install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY) -- ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf $(DYNAMIC_LIBRARY) libpri.so) -- install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY) -+ install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY) -+ ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so) -+ install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY) - endif - - uninstall: - @echo "Removing Libpri" -- rm -f $(INSTALL_PREFIX)$(libdir)/$(STATIC_LIBRARY) -- rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so -- rm -f $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY) -+ rm -f $(LIBDIR)/libpri.so.$(SONAME) -+ rm -f $(LIBDIR)/libpri.so -+ rm -f $(LIBDIR)/libpri.a - rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h - - pritest: pritest.o $(STATIC_LIBRARY) diff --git a/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch b/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch deleted file mode 100644 index 963e730c6fda..000000000000 --- a/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -uNr libpri-1.4.13.ORIG/Makefile libpri-1.4.13/Makefile ---- libpri-1.4.13.ORIG/Makefile 2012-10-27 13:22:57.902838938 +0100 -+++ libpri-1.4.13/Makefile 2012-10-27 13:23:36.746837229 +0100 -@@ -120,7 +120,7 @@ - SOFLAGS += -m32 - endif - --all: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) $(UTILITIES) -+all: $(DYNAMIC_LIBRARY) - - update: - @if [ -d .svn ]; then \ -@@ -139,7 +139,7 @@ - echo "Not under version control"; \ - fi - --install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) -+install: $(DYNAMIC_LIBRARY) - mkdir -p $(LIBDIR) - mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include - ifneq (${OSARCH},SunOS) -@@ -147,13 +147,11 @@ - install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR) - if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi - ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so) -- install -m 644 $(STATIC_LIBRARY) $(LIBDIR) - if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi - else - install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h - install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY) - ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so) -- install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY) - endif - - uninstall: diff --git a/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch deleted file mode 100644 index 1928e5d871fb..000000000000 --- a/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -uNr libpri-1.6.0.ORIG/Makefile libpri-1.6.0/Makefile ---- libpri-1.6.0.ORIG/Makefile 2017-09-19 10:37:05.176546588 +0100 -+++ libpri-1.6.0/Makefile 2017-09-19 10:37:41.029544605 +0100 -@@ -24,10 +24,6 @@ - # Uncomment if you want libpri not send PROGRESS_INDICATOR w/ALERTING - #ALERTING=-DALERTING_NO_PROGRESS - --CC=gcc --GREP=grep --AWK=awk -- - OSARCH=$(shell uname -s) - PROC?=$(shell uname -m) - -@@ -68,7 +64,7 @@ - $(STATIC_OBJS) - CFLAGS ?= -g - CFLAGS += $(CPPFLAGS) --CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -+CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes - CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) - INSTALL_PREFIX=$(DESTDIR) - INSTALL_BASE=/usr -@@ -108,17 +104,12 @@ - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. - #This works for even old (2.96) versions of gcc and provides a small boost either way. - #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it. --ifeq ($(PROC),sparc64) --PROC=ultrasparc --LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8 --else -- ifneq ($(CODE_COVERAGE),) -+ifneq ($(CODE_COVERAGE),) - LIBPRI_OPT= - COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs - COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs -- else -- LIBPRI_OPT=-O2 -- endif -+else -+ LIBPRI_OPT= - endif - - ifeq ($(CPUARCH),i686) -@@ -197,7 +188,7 @@ - ranlib $(STATIC_LIBRARY) - - $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) -- $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) -+ $(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS) - $(LDCONFIG) $(LDCONFIG_FLAGS) . - ln -sf $(DYNAMIC_LIBRARY) libpri.so - diff --git a/net-libs/libpri/libpri-1.6.0.ebuild b/net-libs/libpri/libpri-1.6.0.ebuild deleted file mode 100644 index aff3b4dccc25..000000000000 --- a/net-libs/libpri/libpri-1.6.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -MY_P="${P/_/-}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Primary Rate ISDN (PRI) library" -HOMEPAGE="http://www.asterisk.org/" -SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" -IUSE="" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.13-multilib.patch" - "${FILESDIR}/${PN}-1.6.0-respect-user-flags.patch" - "${FILESDIR}/${PN}-1.4.13-no-static-lib.patch" -) - -src_compile() { - tc-export CC - default -} -src_install() { - emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install - dodoc ChangeLog README TODO -} diff --git a/net-libs/libpri/metadata.xml b/net-libs/libpri/metadata.xml deleted file mode 100644 index 6aebbc46f559..000000000000 --- a/net-libs/libpri/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>jaco@uls.co.za</email> - <name>Jaco Kroon</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> -</pkgmetadata> diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index 58615016c9cb..c3d88e10923c 100644 --- a/net-libs/libproxy/Manifest +++ b/net-libs/libproxy/Manifest @@ -1 +1,3 @@ -DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126 +DIST libproxy-0.5.3.tar.gz 60069 BLAKE2B adfa982344470251667b113f12f77722f6793ceeec902ccf82e32e80e15836384fbe1ccbec8865fc877fa04b25e6985847eef75b4ce437dbf0410d16e2bd5f36 SHA512 0fa4c677372afa76a9f143abb1472af1df85e1190425ec4168b98e575a9b9c9fe3dcc56062609da8ef266d56dfb153e7f7a1c15aed2d385003d9f3f421d08590 +DIST libproxy-0.5.4.tar.gz 60605 BLAKE2B b603781d454ae9d177522d85027f763275e6f243579e8dd808fc5f740438105ac9f782bd35c39cb0007f42279d8d4f724a81dd06fc79709af227064a477cd70e SHA512 4372570322682369f65317cbeb4e9b9dbcff3d8e5089a3bb3b8efa6cd461468a313793435fd5815fe18360984c44e6895c3c2a62e5e0b07eb0c3bf3532dbb1b2 +DIST libproxy-0.5.5.tar.gz 60880 BLAKE2B fedf06db2e39ca1cacf489542597ab002a8c943234fda2f9e5482d43d3b3b0a5af2c4d270eb678e24bb3c4c9ac8e37e65d609af84d02be9541555e953be6a0f5 SHA512 101139fe6972c9b8b46a8bc5f5cea807649ad21e201a9cd7d532d2145c34eadc861d8039fc8a2bf129f364ddc99ffb1324ab8f19bb0b4b9e52eb0f6bd703c8a8 diff --git a/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch b/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch deleted file mode 100644 index 91658574134e..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5a1a8d2b920006e54d9de971999b443073f50843 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Tue, 16 Oct 2012 03:30:50 -0400 -Subject: [PATCH] Disable PAC test - -get-pac-test freezes when run from the ebuild, but succeeds when -building manually. Using Xemake/virtualx.eclass doesn't seem to help. ---- - libproxy/test/CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/libproxy/test/CMakeLists.txt b/libproxy/test/CMakeLists.txt -index 8894425..69543a4 100644 ---- a/libproxy/test/CMakeLists.txt -+++ b/libproxy/test/CMakeLists.txt -@@ -17,10 +17,3 @@ if(WIN32) - target_link_libraries(url-encode ws2_32) - endif() - add_test(NAME url-encode COMMAND ${CMAKE_CURRENT_BINARY_DIR}/url-encode) -- --# Get PAC --if (NOT WIN32) --add_executable(get-pac-test ${CMAKE_CURRENT_SOURCE_DIR}/get-pac-test.cpp ${PROJECT_SOURCE_DIR}/url.cpp) --target_link_libraries(get-pac-test pthread) --add_test(NAME get-pac-test COMMAND ${CMAKE_CURRENT_BINARY_DIR}/get-pac-test) --endif() --- -1.7.12.3 - diff --git a/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch b/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch deleted file mode 100644 index 052e6b0a7fe8..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch +++ /dev/null @@ -1,70 +0,0 @@ -https://trac.macports.org/browser/trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff - -diff -ur libproxy/cmake.orig/libproxy.cmk libproxy/cmake/libproxy.cmk ---- a/libproxy/cmake/libproxy.cmk 2012-10-02 07:20:40.000000000 -0700 -+++ b/libproxy/cmake/libproxy.cmk 2012-10-19 13:47:50.000000000 -0700 -@@ -18,7 +18,7 @@ - set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp - PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES}) - # When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings. --set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) -+set_target_properties(libproxy PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" PREFIX "" VERSION 1.0.0 SOVERSION 1) - set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") - set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") - install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) -diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk ---- libproxy/cmake.orig/modules/config_envvar.cmk 2010-06-14 10:40:47.000000000 -0700 -+++ b/libproxy/cmake/modules/config_envvar.cmk 2012-10-19 13:45:42.000000000 -0700 -@@ -1,3 +1,3 @@ --if (NOT WIN32 AND NOT APPLE) -+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) - set(ENVVAR_FOUND 1) --endif() -\ No newline at end of file -+endif() -diff -ur libproxy/cmake.orig/modules/config_gnome.cmk libproxy/cmake/modules/config_gnome.cmk ---- libproxy/cmake.orig/modules/config_gnome.cmk 2012-10-02 07:20:40.000000000 -0700 -+++ b/libproxy/cmake/modules/config_gnome.cmk 2012-10-19 13:45:42.000000000 -0700 -@@ -1,4 +1,4 @@ --if (NOT WIN32 AND NOT APPLE) -+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) - option(WITH_GNOME2 "Target a GNOME 2 system (gconf)" OFF) - option(WITH_GNOME3 "Target a GNOME 3 system (gsettings)" ON) - if(WITH_GNOME3) -diff -ur libproxy/cmake.orig/modules/config_macosx.cmk libproxy/cmake/modules/config_macosx.cmk ---- libproxy/cmake.orig/modules/config_macosx.cmk 2010-06-14 10:40:47.000000000 -0700 -+++ b/libproxy/cmake/modules/config_macosx.cmk 2012-10-19 13:45:42.000000000 -0700 -@@ -1,4 +1,4 @@ --if(APPLE) -+if(APPLE AND MP_MACOSX) - find_library(SC_LIBRARIES SystemConfiguration) - find_library(CF_LIBRARIES CoreFoundation) - if(SC_LIBRARIES) -@@ -7,4 +7,4 @@ - if(CF_LIBRARIES) - set(CF_FOUND 1) - endif() --endif() -\ No newline at end of file -+endif() -diff -ur libproxy/cmake.orig/modules/pacrunner_webkit.cmk libproxy/cmake/modules/pacrunner_webkit.cmk ---- libproxy/cmake.orig/modules/pacrunner_webkit.cmk 2012-10-02 07:20:40.000000000 -0700 -+++ b/libproxy/cmake/modules/pacrunner_webkit.cmk 2012-10-19 13:45:42.000000000 -0700 -@@ -6,7 +6,7 @@ - link_directories(WEBKIT_LIBRARIES) - include_directories("${WEBKIT_INCLUDE_DIR}") - endif() --elseif(APPLE) -+elseif(APPLE AND MP_MACOSX) - find_library(WEBKIT_LIBRARIES JavaScriptCore) - if(WEBKIT_LIBRARIES) - set(WEBKIT_FOUND 1) -diff -ur libproxy/cmake.orig/pkgconfig.cmk libproxy/cmake/pkgconfig.cmk ---- libproxy/cmake.orig/pkgconfig.cmk 2012-10-02 07:20:40.000000000 -0700 -+++ b/libproxy/cmake/pkgconfig.cmk 2012-10-19 13:45:42.000000000 -0700 -@@ -1,4 +1,4 @@ --if(NOT WIN32 AND NOT APPLE) -+if(NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) - find_package(PkgConfig) - - # Define our magical px_check_modules function diff --git a/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch deleted file mode 100644 index a50bcc130cc7..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch +++ /dev/null @@ -1,87 +0,0 @@ -https://github.com/libproxy/libproxy/issues/28 - -From 703ac16ea2b508dc16d433b3fd597fcd496d05c1 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Mon, 29 Apr 2013 23:02:25 -0400 -Subject: [PATCH] Avoid build-time dependency on NetworkManager - -Needed to prevent a dependency loop: -nm -> libsoup -> glib-networking -> libproxy -> nm - -https://bugs.gentoo.org/467696 - -* asturm@gentoo.org: Rebased on top of 0.4.15 - also revert 423801295921ab1ec0d98565fcbc2635088d45da -* sam@gentoo.org: Rebased on top of 0.4.16 - (same revert included) ---- - libproxy/cmake/modules.cmk | 6 ++--- - .../cmake/modules/network_networkmanager.cmk | 5 +--- - libproxy/modules/network_networkmanager.cpp | 23 ++++++++++++++----- - 3 files changed, 21 insertions(+), 13 deletions(-) - -diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk -index 11d2d43..cc2b58f 100644 ---- a/libproxy/cmake/modules.cmk -+++ b/libproxy/cmake/modules.cmk -@@ -40,10 +40,10 @@ px_module(config_w32reg "${WIN32}" 1) - px_module(ignore_domain 1 1) - px_module(ignore_hostname 1 1) - px_module(ignore_ip 1 1) --if(NM_FOUND OR NMold_FOUND) -+if(NM_FOUND) - set(NM_BUILD 1) --endif(NM_FOUND OR NMold_FOUND) --px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}${NMold_LIBRARIES}) -+endif(NM_FOUND) -+px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}) - px_module(pacrunner_mozjs 0 ${BIPR} ${MOZJS_LIBRARIES}) - px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES}) - px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES}) -diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk -index 6ef6ead..2586bbd 100644 ---- a/libproxy/cmake/modules/network_networkmanager.cmk -+++ b/libproxy/cmake/modules/network_networkmanager.cmk -@@ -1,6 +1,3 @@ - if (NOT WIN32 AND NOT APPLE) -- px_check_modules(NM libnm dbus-1) -- if (NOT NM_FOUND) -- px_check_modules(NMold NetworkManager dbus-1) -- endif (NOT NM_FOUND) -+ px_check_modules(NM dbus-1) - endif() -diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp -index 546a8ee..317f1ab 100644 ---- a/libproxy/modules/network_networkmanager.cpp -+++ b/libproxy/modules/network_networkmanager.cpp -@@ -23,13 +23,24 @@ - using namespace libproxy; - - #include <dbus/dbus.h> --#include <NetworkManager.h> - --// Backwards compatibility: with the switch to libnm, NM_STATE_CONNECTED is no --// longer defined. NM_STATE_CONNECTED_GLOBAL appeared with NM 0.9 and was aliased --#ifndef NM_STATE_CONNECTED -- #define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL --#endif -+/* -+ * copy-pasted from NetworkManager-1.26.0's NetworkManager.h to prevent -+ * a circular dependency; https://bugs.gentoo.org/467696 -+ */ -+#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" -+#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" -+typedef enum { -+ NM_STATE_UNKNOWN = 0, -+ NM_STATE_ASLEEP = 10, -+ NM_STATE_DISCONNECTED = 20, -+ NM_STATE_DISCONNECTING = 30, -+ NM_STATE_CONNECTING = 40, -+ NM_STATE_CONNECTED_LOCAL = 50, -+ NM_STATE_CONNECTED_SITE = 60, -+ NM_STATE_CONNECTED_GLOBAL = 70, -+} NMState; -+#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL - - class networkmanager_network_extension : public network_extension { - public: diff --git a/net-libs/libproxy/files/proxy.1 b/net-libs/libproxy/files/proxy.1 deleted file mode 100644 index 7111db864943..000000000000 --- a/net-libs/libproxy/files/proxy.1 +++ /dev/null @@ -1,23 +0,0 @@ -.TH PROXY "1" "April 2016" "libproxy" "User Commands" -.SH NAME -proxy \- Display the proxy server that should be used to reach a given a network resource -.SH SYNOPSIS -proxy -.SH DESCRIPTION -Display the proxy server that should be used to reach a given a network resource. -.PP -libproxy is a library that provides automatic proxy configuration management -using different backends. -.SH EXAMPLE -.B echo http://www.example.com/ | proxy - http://webcache:3128 direct:// -.SH AUTHOR -This manual page was written by -.MT bigon@debian.org -Laurent Bigonville -.ME , -for the Debian GNU/Linux system (but may be used by others). -.SH SEE ALSO -.UR https://libproxy.github.io/libproxy/ -libproxy -.UE . diff --git a/net-libs/libproxy/libproxy-0.4.17.ebuild b/net-libs/libproxy/libproxy-0.4.17.ebuild deleted file mode 100644 index 4777e3c49fcd..000000000000 --- a/net-libs/libproxy/libproxy-0.4.17.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib flag-o-matic mono-env - -DESCRIPTION="Library for automatic proxy configuration management" -HOMEPAGE="https://github.com/libproxy/libproxy" -SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" -IUSE="gnome kde mono networkmanager spidermonkey test webkit" - -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - mono? ( dev-lang/mono ) - networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] ) - spidermonkey? ( dev-lang/spidermonkey:68 ) - webkit? ( net-libs/webkit-gtk:4 ) -" -RDEPEND="${DEPEND} - kde? ( kde-frameworks/kconfig:5 ) -" -# avoid dependency loop, bug #467696 -PDEPEND="networkmanager? ( net-misc/networkmanager )" - -PATCHES=( - # get-pac-test freezes when run by the ebuild, succeeds when building - # manually; virtualx.eclass doesn't help :( - "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch" - - # https://github.com/libproxy/libproxy/issues/27 - "${FILESDIR}/${PN}-0.4.12-macosx.patch" - - # prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696 - # https://github.com/libproxy/libproxy/issues/28 - "${FILESDIR}/${PN}-0.4.16-avoid-nm-build-dep.patch" -) - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_C_FLAGS="${CFLAGS}" - -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DWITH_NATUS=OFF - -DWITH_PYTHON2=OFF - # WITH_VALA just copies the .vapi file over and needs no deps, - # hence always enable it unconditionally - -DWITH_VALA=ON - -DWITH_WEBKIT=OFF - $(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}"/usr/bin/mcs) - -DWITH_GNOME3=$(usex gnome) - -DWITH_KDE=$(usex kde) - -DWITH_DOTNET=$(multilib_is_native_abi && usex mono || echo OFF) - -DWITH_NM=$(usex networkmanager) - -DWITH_PERL=OFF # bug 705410, uses reserved target name "test" - -DWITH_PYTHON3=OFF # Major issue: https://github.com/libproxy/libproxy/issues/65 - -DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo OFF) - -DBUILD_TESTING=$(usex test) - -DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo OFF) - ) - cmake_src_configure -} - -src_configure() { - [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl - - multilib-minimal_src_configure -} - -multilib_src_install_all() { - doman "${FILESDIR}"/proxy.1 -} diff --git a/net-libs/libproxy/libproxy-0.5.3.ebuild b/net-libs/libproxy/libproxy-0.5.3.ebuild new file mode 100644 index 000000000000..448f904ff3aa --- /dev/null +++ b/net-libs/libproxy/libproxy-0.5.3.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib vala + +DESCRIPTION="Library for automatic proxy configuration management" +HOMEPAGE="https://github.com/libproxy/libproxy" +SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="duktape gnome gtk-doc +introspection kde test vala" +REQUIRED_USE=" + gtk-doc? ( introspection ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + >=dev-libs/glib-2.71.3:2[${MULTILIB_USEDEP}] + gnome? ( gnome-base/gsettings-desktop-schemas ) + duktape? ( + dev-lang/duktape:= + net-misc/curl + ) + introspection? ( dev-libs/gobject-introspection ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND} + kde? ( kde-frameworks/kconfig:5 ) +" +BDEPEND=" + virtual/pkgconfig + gtk-doc? ( dev-util/gi-docgen ) + vala? ( $(vala_depend) ) +" + +src_prepare() { + use vala && vala_setup + default +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool gtk-doc docs) + $(meson_use test tests) + -Dconfig-env=true + $(meson_use gnome config-gnome) + -Dconfig-windows=false + -Dconfig-sysconfig=true + -Dconfig-osx=false + $(meson_use kde config-kde) + $(meson_native_use_bool duktape pacrunner-duktape) + $(meson_native_use_bool vala vapi) + $(meson_use duktape curl) + $(meson_native_use_bool introspection) + ) + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/${PN}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die + fi +} diff --git a/net-libs/libproxy/libproxy-0.5.4-r1.ebuild b/net-libs/libproxy/libproxy-0.5.4-r1.ebuild new file mode 100644 index 000000000000..b0c3841f68a2 --- /dev/null +++ b/net-libs/libproxy/libproxy-0.5.4-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib vala + +DESCRIPTION="Library for automatic proxy configuration management" +HOMEPAGE="https://github.com/libproxy/libproxy" +SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="duktape gnome gtk-doc +introspection test vala" +REQUIRED_USE=" + gtk-doc? ( introspection ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.71.3:2[${MULTILIB_USEDEP}] + gnome? ( gnome-base/gsettings-desktop-schemas ) + duktape? ( + dev-lang/duktape:= + net-misc/curl + ) + introspection? ( dev-libs/gobject-introspection ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + gtk-doc? ( dev-util/gi-docgen ) + vala? ( $(vala_depend) ) +" + +src_prepare() { + use vala && vala_setup + default +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool gtk-doc docs) + $(meson_use test tests) + -Dconfig-env=true + $(meson_use gnome config-gnome) + -Dconfig-windows=false + -Dconfig-sysconfig=true + -Dconfig-osx=false + -Dconfig-kde=true + $(meson_native_use_bool duktape pacrunner-duktape) + $(meson_native_use_bool vala vapi) + $(meson_use duktape curl) + $(meson_native_use_bool introspection) + ) + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/${PN}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die + fi +} diff --git a/net-libs/libproxy/libproxy-0.5.5.ebuild b/net-libs/libproxy/libproxy-0.5.5.ebuild new file mode 100644 index 000000000000..e95dde2fceb2 --- /dev/null +++ b/net-libs/libproxy/libproxy-0.5.5.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib vala + +DESCRIPTION="Library for automatic proxy configuration management" +HOMEPAGE="https://github.com/libproxy/libproxy" +SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="duktape gnome gtk-doc +introspection test vala" +REQUIRED_USE=" + gtk-doc? ( introspection ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.71.3:2[${MULTILIB_USEDEP}] + gnome? ( gnome-base/gsettings-desktop-schemas ) + duktape? ( + dev-lang/duktape:= + net-misc/curl + ) + introspection? ( dev-libs/gobject-introspection ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + gtk-doc? ( dev-util/gi-docgen ) + vala? ( $(vala_depend) ) +" + +src_prepare() { + use vala && vala_setup + default +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool gtk-doc docs) + $(meson_use test tests) + -Dconfig-env=true + $(meson_use gnome config-gnome) + -Dconfig-windows=false + -Dconfig-sysconfig=true + -Dconfig-osx=false + -Dconfig-kde=true + $(meson_native_use_bool duktape pacrunner-duktape) + $(meson_native_use_bool vala vapi) + $(meson_use duktape curl) + $(meson_native_use_bool introspection) + ) + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/${PN}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die + fi +} diff --git a/net-libs/libproxy/metadata.xml b/net-libs/libproxy/metadata.xml index d443844f9a64..020f23f2a1d7 100644 --- a/net-libs/libproxy/metadata.xml +++ b/net-libs/libproxy/metadata.xml @@ -5,10 +5,9 @@ <email>freedesktop-bugs@gentoo.org</email> </maintainer> <use> + <flag name="duktape">Use <pkg>dev-lang/duktape</pkg> for PAC parsing</flag> <flag name="gnome">Enable support for reading proxy settings from GNOME</flag> <flag name="kde">Enable support for reading proxy settings from KDE</flag> - <flag name="spidermonkey">Use libmozjs from <pkg>dev-lang/spidermonkey</pkg> for PAC parsing</flag> - <flag name="webkit">Use libjavascriptcoregtk from <pkg>net-libs/webkit-gtk</pkg> for PAC parsing</flag> </use> <upstream> <remote-id type="github">libproxy/libproxy</remote-id> diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest index 1542bbed954b..400b330da1df 100644 --- a/net-libs/libpsl/Manifest +++ b/net-libs/libpsl/Manifest @@ -1,2 +1,2 @@ -DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d -DIST libpsl-0.21.1.tar.gz 9199351 BLAKE2B 87c72651303a7870fd3f742e9ce8028e0dd48d3ded78ae7dea317ce54b98975f372429399b6a2d6746fd8e074d6a3ed13772b6c173f96c3a86aa7d726fd75586 SHA512 a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5 +DIST libpsl-0.21.2.tar.gz 7617025 BLAKE2B b50f805bb467dc3284bc91645a37a2208098ad809d3771c74ef13c3b8f6029a07ad80a56702c7e3d1a1125d272403c85dd97b64a28465b9ff2d095eaf94b9a4d SHA512 f1df72220bf4391d4701007100b0df66c833a2cbcb7481c9d13f0b9e0cad3b66d2d15d4b976e5bad60d2ad1540355112fa1acb07aa925c241d2d7cd20681c71d +DIST libpsl-0.21.5.tar.gz 7624251 BLAKE2B a0076f622b85df99f866de6707850ac216b764bdb68c6d516f4603da42dac8eae3ee4c53d68dbb6af6f779c2c7f1b9caab74c8b558209b1f6823f95c13fc3ceb SHA512 c14d575cecc0f1693894dd79565b6b9220084ddfa43b908a1cefe16d147cdd5ec47796eb0c2135e2f829a951abaf39d8a371ab5c1352f57b36e610e25adf91f5 diff --git a/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch b/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch new file mode 100644 index 000000000000..0f5773d75739 --- /dev/null +++ b/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch @@ -0,0 +1,39 @@ +https://github.com/rockdaboot/libpsl/commit/fb6b75317ab669c255906fa4db256837332eb1ed + +From fb6b75317ab669c255906fa4db256837332eb1ed Mon Sep 17 00:00:00 2001 +From: Vincent Torri <vtorri@outlook.fr> +Date: Sat, 14 Jan 2023 17:25:31 +0100 +Subject: [PATCH] add 'tests' option to disable tests and fuzzers + +--- + meson.build | 6 ++++-- + meson_options.txt | 3 +++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index d96748d..4492354 100644 +--- a/meson.build ++++ b/meson.build +@@ -132,6 +132,8 @@ endif + subdir('include') + subdir('src') + subdir('tools') +-subdir('tests') +-subdir('fuzz') ++if get_option('tests') ++ subdir('tests') ++ subdir('fuzz') ++endif + subdir(join_paths('docs', 'libpsl')) +diff --git a/meson_options.txt b/meson_options.txt +index e9d6a23..d66f256 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -17,3 +17,6 @@ option('psl_testfile', type : 'string', value : '', + + option('docs', type: 'boolean', value: false, + description: 'Build the API reference (requires gtk-doc)') ++ ++option('tests', type: 'boolean', value: true, ++ description: 'Build the tests and fuzzers') + diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild deleted file mode 100644 index d07938849562..000000000000 --- a/net-libs/libpsl/libpsl-0.21.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=(python3_{7,8,9}) -inherit multilib-minimal python-any-r1 - -DESCRIPTION="C library for the Public Suffix List" -HOMEPAGE="https://github.com/rockdaboot/libpsl" -SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="icu +idn +man" - -RDEPEND=" - icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) ) - idn? ( - dev-libs/libunistring:=[${MULTILIB_USEDEP}] - net-dns/libidn2:=[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - dev-util/gtk-doc-am - sys-devel/gettext - virtual/pkgconfig - man? ( dev-libs/libxslt ) -" - -pkg_pretend() { - if use icu && use idn ; then - ewarn "\"icu\" and \"idn\" USE flags are enabled." - ewarn "Using \"idn\"." - fi -} - -multilib_src_configure() { - local myeconfargs=( - --disable-asan - --disable-cfi - --disable-ubsan - --disable-static - $(use_enable man) - ) - - # Prefer idn even if icu is in USE as well - if use idn ; then - myeconfargs+=( - --enable-builtin=libidn2 - --enable-runtime=libidn2 - ) - elif use icu ; then - myeconfargs+=( - --enable-builtin=libicu - --enable-runtime=libicu - ) - else - myeconfargs+=( --disable-runtime ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - default - - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/net-libs/libpsl/libpsl-0.21.1.ebuild b/net-libs/libpsl/libpsl-0.21.1.ebuild deleted file mode 100644 index 379fbf8773d1..000000000000 --- a/net-libs/libpsl/libpsl-0.21.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=(python3_{7,8,9}) -inherit multilib-minimal python-any-r1 - -DESCRIPTION="C library for the Public Suffix List" -HOMEPAGE="https://github.com/rockdaboot/libpsl" -SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="icu +idn +man" - -RDEPEND=" - icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) ) - idn? ( - dev-libs/libunistring:=[${MULTILIB_USEDEP}] - net-dns/libidn2:=[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - dev-util/gtk-doc-am - sys-devel/gettext - virtual/pkgconfig - man? ( dev-libs/libxslt ) -" - -pkg_pretend() { - if use icu && use idn ; then - ewarn "\"icu\" and \"idn\" USE flags are enabled." - ewarn "Using \"idn\"." - fi -} - -multilib_src_configure() { - local myeconfargs=( - --disable-asan - --disable-cfi - --disable-ubsan - --disable-static - $(use_enable man) - ) - - # Prefer idn even if icu is in USE as well - if use idn ; then - myeconfargs+=( - --enable-builtin=libidn2 - --enable-runtime=libidn2 - ) - elif use icu ; then - myeconfargs+=( - --enable-builtin=libicu - --enable-runtime=libicu - ) - else - myeconfargs+=( --disable-runtime ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - default - - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/net-libs/libpsl/libpsl-0.21.2.ebuild b/net-libs/libpsl/libpsl-0.21.2.ebuild new file mode 100644 index 000000000000..8dba8ae8ee92 --- /dev/null +++ b/net-libs/libpsl/libpsl-0.21.2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit meson-multilib python-any-r1 + +DESCRIPTION="C library for the Public Suffix List" +HOMEPAGE="https://github.com/rockdaboot/libpsl" +SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="icu +idn test" +RESTRICT="!test? ( test )" + +RDEPEND=" + icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) ) + idn? ( + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + net-dns/libidn2:=[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-tests-optional.patch +) + +pkg_pretend() { + if use icu && use idn ; then + ewarn "\"icu\" and \"idn\" USE flags are enabled. Using \"idn\"." + fi +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use test tests) + ) + + # Prefer idn even if icu is in USE as well + if use idn ; then + emesonargs+=( + -Druntime=libidn2 + -Dbuiltin=true + ) + elif use icu ; then + emesonargs+=( + -Druntime=libicu + -Dbuiltin=true + ) + else + emesonargs+=( + -Druntime=no + ) + fi + + meson_src_configure +} diff --git a/net-libs/libpsl/libpsl-0.21.5.ebuild b/net-libs/libpsl/libpsl-0.21.5.ebuild new file mode 100644 index 000000000000..be2905fef976 --- /dev/null +++ b/net-libs/libpsl/libpsl-0.21.5.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit meson-multilib python-any-r1 + +DESCRIPTION="C library for the Public Suffix List" +HOMEPAGE="https://github.com/rockdaboot/libpsl" +SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="icu +idn test" +RESTRICT="!test? ( test )" + +RDEPEND=" + icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) ) + idn? ( + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + net-dns/libidn2:=[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + sys-devel/gettext + virtual/pkgconfig +" + +pkg_pretend() { + if use icu && use idn ; then + ewarn "\"icu\" and \"idn\" USE flags are enabled. Using \"idn\"." + fi +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use test tests) + ) + + # Prefer idn even if icu is in USE as well + if use idn ; then + emesonargs+=( + -Druntime=libidn2 + -Dbuiltin=true + ) + elif use icu ; then + emesonargs+=( + -Druntime=libicu + -Dbuiltin=true + ) + else + emesonargs+=( + -Druntime=no + ) + fi + + meson_src_configure +} diff --git a/net-libs/libpsl/metadata.xml b/net-libs/libpsl/metadata.xml index 25a0031c8911..1a69cf250389 100644 --- a/net-libs/libpsl/metadata.xml +++ b/net-libs/libpsl/metadata.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <maintainer type="person" proxied="yes"> + <email>eschwartz93@gmail.com</email> + <name>Eli Schwartz</name> + </maintainer> + <maintainer type="person" proxied="proxy"> + <email>kangie@gentoo.org</email> + <name>Matt Jolly</name> </maintainer> <upstream> <remote-id type="github">rockdaboot/libpsl</remote-id> diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest index 3b55b67f92db..40d11f0b3f56 100644 --- a/net-libs/libqmi/Manifest +++ b/net-libs/libqmi/Manifest @@ -1,3 +1,2 @@ -DIST libqmi-1.28.6.tar.xz 1192736 BLAKE2B 30330a8d085b26fc461c6fec2cfa58757e91093243aed8a4ac6df53a7656881f295a800979ff8fd42b815f96fafd128848765ecfb163e8101ac9c9a52eaaf507 SHA512 f4f7022e8c9b60618062548ec97450d98a5125dbd0e26df3dfb8bda5ab19a1f4c7864d35f7bd77217a4fe5562ce665fa613902b1d2185680bfa5d0c1e229e6dd -DIST libqmi-1.30.0.tar.xz 1237944 BLAKE2B 862a7f12d458d7fce53596ec12e6e20d41a8378e6d9fd44535ea54b409f7020d33f5b3bab08ce583452e11abcbf5af48cc3a24a5fd382c7a833c435327c91614 SHA512 e0cf97f1ebc27feb68033d19b8bc146c41d134782c3eeefb1dd3502b08e493d8c484835235a7877854c1a9c2524ed6cc31aa1b897b873d0662f494a771b2c98f -DIST libqmi-1.30.2.tar.xz 1239408 BLAKE2B be762988dcb40cdc29a9024989de0da42d3246c970ee63caba4f3a722b52e478879c177097165e880a48a7151d01f8f30e82d5a769258bd7c9cba9a24b0157a2 SHA512 e34e9cb4b49df6eac555e6493cfc89aaf6f9be3fbfb0b19a5fb6b69c81768fda499a6438b1a4f39b84a350899721c6a04c4195985077ac35da0036794bc59367 +DIST libqmi-1.30.8.tar.xz 1244844 BLAKE2B c8d98106783eb22571ee82c0012e1ce7ed79e94818350134b80853e16fa287c77bafb34d2913690ae593d02112dc5d2b0ff77606a24c4ce63733fd64245961a1 SHA512 60567e82eb35ed7ab3d65f1073e19ca8faa68e909f96e498b8f9d8ce2a987156e0a580f9c212416c4e0740d2ad05cb93f4dfeae9b2d048f0eb53ab6a83f6d024 +DIST libqmi-1.32.4.tar.bz2 3710575 BLAKE2B 728cc821208432ec69d21d6b1b16e82f982e27ba899e0a2426b6e1ae6ce8cc800f15417e4d5ff6fd9a60ad2a0e7c3f3ddc77caee9115431d174e29bd40a8398b SHA512 6f68e2dd4bf5493de0c9298d88e477f9477b367f887bf5321a1faab7e8217fd10e761748326deb37ca26659bef70d5c8464bcb964d0ed0ba1f44c423785ebb0f diff --git a/net-libs/libqmi/libqmi-1.28.6.ebuild b/net-libs/libqmi/libqmi-1.28.6.ebuild deleted file mode 100644 index c62b2a064ccf..000000000000 --- a/net-libs/libqmi/libqmi-1.28.6.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git" -else - KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" - SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz" -fi - -DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi" - -LICENSE="LGPL-2" -SLOT="0/5.7" # soname of libqmi-glib.so -IUSE="gtk-doc +mbim" - -RDEPEND=">=dev-libs/glib-2.48 - dev-libs/libgudev - mbim? ( >=net-libs/libmbim-1.18.0 )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc )" -[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214 - -src_prepare() { - default - [[ ${PV} == "9999" ]] && eautoreconf -} - -src_configure() { - local myconf=( - --disable-Werror - --disable-static - --disable-qrtr # libqrtr-glib not packaged - $(use_enable mbim mbim-qmux) - $(use_enable gtk-doc) - ) - econf "${myconf[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-libs/libqmi/libqmi-1.30.2.ebuild b/net-libs/libqmi/libqmi-1.30.2.ebuild deleted file mode 100644 index 4a0b1ecaf100..000000000000 --- a/net-libs/libqmi/libqmi-1.30.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git" -else - KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86" - SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz" -fi - -DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi" - -LICENSE="LGPL-2" -SLOT="0/5.8" # soname of libqmi-glib.so -IUSE="gtk-doc +mbim" - -RDEPEND=">=dev-libs/glib-2.56 - >=dev-libs/libgudev-232 - mbim? ( >=net-libs/libmbim-1.18.0 )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc )" -[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214 - -src_prepare() { - default - [[ ${PV} == "9999" ]] && eautoreconf -} - -src_configure() { - local myconf=( - --disable-Werror - --disable-static - --disable-qrtr # libqrtr-glib not packaged - $(use_enable mbim mbim-qmux) - $(use_enable gtk-doc) - ) - econf "${myconf[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-libs/libqmi/libqmi-1.30.0.ebuild b/net-libs/libqmi/libqmi-1.30.8.ebuild index c48a2bddbb43..3e6713f5d6a7 100644 --- a/net-libs/libqmi/libqmi-1.30.0.ebuild +++ b/net-libs/libqmi/libqmi-1.30.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 autotools EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git" else - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86" SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz" fi @@ -16,11 +16,13 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freed LICENSE="LGPL-2" SLOT="0/5.8" # soname of libqmi-glib.so -IUSE="gtk-doc +mbim" +IUSE="gtk-doc +mbim +qrtr" RDEPEND=">=dev-libs/glib-2.56 >=dev-libs/libgudev-232 - mbim? ( >=net-libs/libmbim-1.18.0 )" + mbim? ( >=net-libs/libmbim-1.18.0 ) + qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) +" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig @@ -36,7 +38,7 @@ src_configure() { local myconf=( --disable-Werror --disable-static - --disable-qrtr # libqrtr-glib not packaged + $(use_enable qrtr) $(use_enable mbim mbim-qmux) $(use_enable gtk-doc) ) diff --git a/net-libs/libqmi/libqmi-1.32.4.ebuild b/net-libs/libqmi/libqmi-1.32.4.ebuild new file mode 100644 index 000000000000..5336e7de9c06 --- /dev/null +++ b/net-libs/libqmi/libqmi-1.32.4.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git" +else + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" + SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/${PV}/${P}.tar.bz2" +fi + +inherit bash-completion-r1 meson udev + +DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi" + +LICENSE="LGPL-2" +IUSE="gtk-doc +mbim +qrtr" + +SLOT="0/5.9" # soname of libqmi-glib.so + +RDEPEND=" + >=dev-libs/glib-2.56 + >=dev-libs/libgudev-232 + mbim? ( >=net-libs/libmbim-1.18.0 ) + qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) + + dev-libs/gobject-introspection:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-apps/help2man + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) +" + +src_configure() { + # Let's avoid BuildRequiring bash-completion, install it manually + local emesonargs=( + $(meson_use mbim mbim_qmux) + $(meson_use qrtr) + -Drmnet=true + + -Dudev=true + -Dudevdir="$(get_udevdir)" + + -Dintrospection=true + $(meson_use gtk-doc gtk_doc) + -Dman=true + + -Dbash_completion=false + ) + meson_src_configure +} + +src_install() { + meson_src_install + dobashcomp src/qmicli/qmicli +} diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild index 299b20265bf5..5336e7de9c06 100644 --- a/net-libs/libqmi/libqmi-9999.ebuild +++ b/net-libs/libqmi/libqmi-9999.ebuild @@ -1,49 +1,61 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 if [[ ${PV} == "9999" ]] ; then - inherit git-r3 autotools + inherit git-r3 EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git" else - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" - SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" + SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/${PV}/${P}.tar.bz2" fi +inherit bash-completion-r1 meson udev + DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library" HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi" LICENSE="LGPL-2" -SLOT="0/5.8" # soname of libqmi-glib.so -IUSE="gtk-doc +mbim" +IUSE="gtk-doc +mbim +qrtr" + +SLOT="0/5.9" # soname of libqmi-glib.so -RDEPEND=">=dev-libs/glib-2.56 +RDEPEND=" + >=dev-libs/glib-2.56 >=dev-libs/libgudev-232 - mbim? ( >=net-libs/libmbim-1.18.0 )" + mbim? ( >=net-libs/libmbim-1.18.0 ) + qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) + + dev-libs/gobject-introspection:= +" DEPEND="${RDEPEND}" BDEPEND=" + sys-apps/help2man virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc )" -[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214 - -src_prepare() { - default - [[ ${PV} == "9999" ]] && eautoreconf -} + gtk-doc? ( dev-util/gtk-doc ) +" src_configure() { - local myconf=( - --disable-Werror - --disable-static - --disable-qrtr # libqrtr-glib not packaged - $(use_enable mbim mbim-qmux) - $(use_enable gtk-doc) + # Let's avoid BuildRequiring bash-completion, install it manually + local emesonargs=( + $(meson_use mbim mbim_qmux) + $(meson_use qrtr) + -Drmnet=true + + -Dudev=true + -Dudevdir="$(get_udevdir)" + + -Dintrospection=true + $(meson_use gtk-doc gtk_doc) + -Dman=true + + -Dbash_completion=false ) - econf "${myconf[@]}" + meson_src_configure } src_install() { - default - find "${ED}" -name '*.la' -delete || die + meson_src_install + dobashcomp src/qmicli/qmicli } diff --git a/net-libs/libqmi/metadata.xml b/net-libs/libqmi/metadata.xml index ada015f36a2b..6ef8fe82d4c9 100644 --- a/net-libs/libqmi/metadata.xml +++ b/net-libs/libqmi/metadata.xml @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <slots> - <subslots>libqmi-glib.so soname version</subslots> - </slots> - <use> - <flag name="mbim">Support QMI over Mobile Broadband Interface Model (MBIM)</flag> - </use> + <maintainer type="project"> + <email>freedesktop-bugs@gentoo.org</email> + </maintainer> + <slots> + <subslots>libqmi-glib.so soname version</subslots> + </slots> + <use> + <flag name="mbim">Support QMI over Mobile Broadband Interface Model (MBIM)</flag> + <flag name="qrtr">Support QMI over IPC Router bus (QRTR)</flag> + </use> + <upstream> + <remote-id type="freedesktop-gitlab">mobile-broadband/libqmi</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libqrtr-glib/Manifest b/net-libs/libqrtr-glib/Manifest new file mode 100644 index 000000000000..951eeec6a630 --- /dev/null +++ b/net-libs/libqrtr-glib/Manifest @@ -0,0 +1 @@ +DIST libqrtr-glib-1.2.2.tar.bz2 26398 BLAKE2B e52cab3e4ac85c53a51782d7d6b3658060282f2e75e1ce2ff2e0c52dfb3343f5ba43c03f58c25eed73c2bc16254672a828318daae00bd2900ffda9ff23b38d27 SHA512 b21df1685c2474c1124e6f6bf12c552a06a28986284fde876210a3a6db8c19872a5458cae622bb22020ffd278167f52eba38d763ba633e783fa708863832bade diff --git a/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild b/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild new file mode 100644 index 000000000000..daf05b3f4f47 --- /dev/null +++ b/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git" +else + KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86" + SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/${PN}/-/archive/${PV}/${P}.tar.bz2" +fi + +DESCRIPTION="Qualcomm IPC Router protocol helper library" +HOMEPAGE="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib" + +LICENSE="LGPL-2" +SLOT="0/0" # soname of libqrtr-glib.so +IUSE="gtk-doc" + +RDEPEND=" + >=dev-libs/glib-2.56:2 + dev-libs/gobject-introspection +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) +" + +src_configure() { + local emesonargs=( + -Dintrospection=true + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} diff --git a/net-libs/libqrtr-glib/metadata.xml b/net-libs/libqrtr-glib/metadata.xml new file mode 100644 index 000000000000..26aedb1e65f2 --- /dev/null +++ b/net-libs/libqrtr-glib/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>freedesktop-bugs@gentoo.org</email> + </maintainer> + <slots> + <subslots>libqrtr-glib.so soname version</subslots> + </slots> + <upstream> + <remote-id type="freedesktop-gitlab">mobile-broadband/libqrtr-glib</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest index 95feba5e741b..47ece71d2f16 100644 --- a/net-libs/libquotient/Manifest +++ b/net-libs/libquotient/Manifest @@ -1 +1,2 @@ -DIST libquotient-0.6.11.tar.gz 562144 BLAKE2B 75be68371ac1873e38f9ff81273419ed1eb773d02408137a7dafc9a60f520a2ba0b5556783272f8902dd98f7f5dac3a92ab393da5dd48acfffeba8b1631a84dd SHA512 76a11c80822ae3279d643559b481a09fe45b1f8effb7b0efeeb7ab54f13dd06997d9220dcb36c13d270f5641f496dba350f528c49e239757f4546de9fbe940fa +DIST libquotient-0.8.1.2.tar.gz 730435 BLAKE2B 7c43bc394d46ddb600c683d771add48f9a20d205ce61796b27a34933521e38be2b3b331263ffc6bb00fd1197a195b295e3311d52d8d74cdfe51453954cb79ae1 SHA512 ff11f1e9093004461425179fcab630237bf1d28f6e5abe6486d657b455b560884047715fccff5b31f26275ffd423df787014aaac35c556eddb1842e8e68841ce +DIST libquotient-0.8.2.tar.gz 744095 BLAKE2B c33016e4eda22e0a363f06ab4545d17010519b8d778566c1bae29e4c7d6563280f4ce3c1235f7d75f55ce4a8971ef5ce23e45f1d3a0edc043e23857d805a824f SHA512 3d971439f8a89609930ca1648f6cf1bdb59f3ad492af1a15a7f8a13d06c81bd5bfffa1dd732ef5156fab8a9ea2ba3e98376bf76511db17bdeee17641a772b762 diff --git a/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch b/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch deleted file mode 100644 index 5541f4d7133b..000000000000 --- a/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d82cb1f43cab7976e25c6e9ff3e4ae17789ee11c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 3 Jan 2021 15:18:01 +0100 -Subject: [PATCH] Install EXPORT_ANDROID_MK only if(ANDROID) - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2ee1cb4..eec27c8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -321,7 +321,10 @@ install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" - DESTINATION ${ConfigFilesLocation} - ) --install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION share/ndk-modules) -+ -+if (ANDROID) -+ install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION share/ndk-modules) -+endif () - - if (WIN32) - install(FILES mime/packages/freedesktop.org.xml DESTINATION mime/packages) --- -2.30.0 - diff --git a/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch b/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch deleted file mode 100644 index fb884e10ac76..000000000000 --- a/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ff972d181f0f9e7bfa327c71450d55f951de27c1 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 3 Jan 2021 15:05:59 +0100 -Subject: [PATCH] Put Qt5Test dependency behind -DQuotient_INSTALL_TESTS - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2ee1cb4..2a0908d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,7 +58,7 @@ else() - endforeach () - endif() - --find_package(Qt5 5.9 REQUIRED Network Gui Multimedia Test) -+find_package(Qt5 5.9 REQUIRED Network Gui Multimedia) - get_filename_component(Qt5_Prefix "${Qt5_DIR}/../../../.." ABSOLUTE) - - if (${PROJECT_NAME}_ENABLE_E2EE) -@@ -280,9 +280,12 @@ if (${PROJECT_NAME}_ENABLE_E2EE) - endif() - target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Network Qt5::Gui Qt5::Multimedia) - --set(TEST_BINARY quotest) --add_executable(${TEST_BINARY} ${tests_SRCS}) --target_link_libraries(${TEST_BINARY} Qt5::Core Qt5::Test ${PROJECT_NAME}) -+if(${PROJECT_NAME}_INSTALL_TESTS) -+ find_package(Qt5Test) -+ set(TEST_BINARY quotest) -+ add_executable(${TEST_BINARY} ${tests_SRCS}) -+ target_link_libraries(${TEST_BINARY} Qt5::Core Qt5::Test ${PROJECT_NAME}) -+endif() - - configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY NEWLINE_STYLE UNIX) - --- -2.30.0 - diff --git a/net-libs/libquotient/files/libquotient-0.8.0-no-android.patch b/net-libs/libquotient/files/libquotient-0.8.0-no-android.patch new file mode 100644 index 000000000000..5b2e34123226 --- /dev/null +++ b/net-libs/libquotient/files/libquotient-0.8.0-no-android.patch @@ -0,0 +1,29 @@ +From ad928b9f34f5e6f42c8555a0a502c35de6cb86b5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 3 Jan 2021 15:18:01 +0100 +Subject: [PATCH 1/2] Install EXPORT_ANDROID_MK only if(ANDROID) + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0a32ee4e..7e03085f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -387,7 +387,10 @@ install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${QUOTIENT_LIB_NAME}/${QUOTIENT_LIB_NAME}ConfigVersion.cmake" + DESTINATION ${CMakeFilesLocation} + ) +-install(EXPORT_ANDROID_MK ${QUOTIENT_LIB_NAME}Targets DESTINATION ${CMAKE_INSTALL_DATADIR}/ndk-modules) ++ ++if (ANDROID) ++ install(EXPORT_ANDROID_MK ${QUOTIENT_LIB_NAME}Targets DESTINATION ${CMAKE_INSTALL_DATADIR}/ndk-modules) ++endif () + + if (WIN32) + install(FILES mime/packages/freedesktop.org.xml DESTINATION mime/packages) +-- +2.41.0 + diff --git a/net-libs/libquotient/files/libquotient-0.8.0-no-tests.patch b/net-libs/libquotient/files/libquotient-0.8.0-no-tests.patch new file mode 100644 index 000000000000..96fe1029c826 --- /dev/null +++ b/net-libs/libquotient/files/libquotient-0.8.0-no-tests.patch @@ -0,0 +1,34 @@ +From c35f062d1c9975ec0bdfdcbcdeb6b9973b73f86b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 24 Dec 2022 22:51:12 +0100 +Subject: [PATCH 2/2] Put Qt5Test dependency behind -DBUILD_TESTING + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7e03085f..f2ab0ae7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,7 +92,7 @@ else() + set(QtExtraModules "Multimedia") # See #483 + endif() + string(REGEX REPLACE "^(.).*" "Qt\\1" Qt ${QtMinVersion}) # makes "Qt5" or "Qt6" +-find_package(${Qt} ${QtMinVersion} REQUIRED Core Network Gui Test ${QtExtraModules}) ++find_package(${Qt} ${QtMinVersion} REQUIRED Core Network Gui ${QtExtraModules}) + get_filename_component(Qt_Prefix "${${Qt}_DIR}/../../../.." ABSOLUTE) + + find_package(${Qt}Keychain REQUIRED) +@@ -344,6 +344,7 @@ configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${QUOTIENT_LIB_ + # Configure testing + + if (BUILD_TESTING) ++ find_package(${Qt}Test ${QtMinVersion} REQUIRED) + enable_testing() + add_subdirectory(quotest) + add_subdirectory(autotests) +-- +2.41.0 + diff --git a/net-libs/libquotient/libquotient-0.6.11.ebuild b/net-libs/libquotient/libquotient-0.6.11.ebuild deleted file mode 100644 index f18a7ff72943..000000000000 --- a/net-libs/libquotient/libquotient-0.6.11.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Qt5-based SDK to develop applications for Matrix" -HOMEPAGE="https://github.com/quotient-im/libQuotient" -SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/libQuotient-${PV}" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc64" -IUSE="" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 -" -RDEPEND="${DEPEND}" - -PATCHES=( - # downstream patches - "${FILESDIR}"/${PN}-0.6.3-no-android.patch - "${FILESDIR}"/${PN}-0.6.3-no-tests.patch -) - -src_configure() { - local mycmakeargs=( - -DQuotient_INSTALL_TESTS=OFF - -DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged - -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks. - ) - cmake_src_configure -} diff --git a/net-libs/libquotient/libquotient-0.8.1.2-r1.ebuild b/net-libs/libquotient/libquotient-0.8.1.2-r1.ebuild new file mode 100644 index 000000000000..f66415455e7e --- /dev/null +++ b/net-libs/libquotient/libquotient-0.8.1.2-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake multibuild + +DESCRIPTION="Qt-based SDK to develop applications for Matrix" +HOMEPAGE="https://github.com/quotient-im/libQuotient" +SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/libQuotient-${PV}" + +LICENSE="LGPL-2+" +SLOT="0/${PV}" # FIXME: check soname on next version bump +KEYWORDS="amd64 arm64 ~ppc64 x86" +IUSE="+qt5 qt6 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/olm + dev-libs/openssl:= + qt5? ( + dev-libs/qtkeychain:=[qt5(+)] + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5 + ) + qt6? ( + >=dev-libs/qtkeychain-0.14.1-r1:=[qt6] + dev-qt/qtbase:6[gui,network,sql,ssl] + dev-qt/qtmultimedia:6 + ) +" +DEPEND="${RDEPEND} + test? ( + qt5? ( + dev-qt/qtconcurrent:5 + dev-qt/qttest:5 + ) + qt6? ( dev-qt/qtbase:6[concurrent] ) + ) +" + +PATCHES=( + # downstream patches + "${FILESDIR}"/${PN}-0.8.0-no-android.patch + "${FILESDIR}"/${PN}-0.8.0-no-tests.patch +) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_configure() { + my_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DQuotient_ENABLE_E2EE=ON + ) + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + mycmakeargs+=( -DBUILD_WITH_QT6=ON ) + else + mycmakeargs+=( -DBUILD_WITH_QT6=OFF ) + fi + + use test && mycmakeargs+=( + -DQuotient_INSTALL_TESTS=OFF + ) + cmake_src_configure + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_install() { + multibuild_foreach_variant cmake_src_install +} + +src_test() { + # https://github.com/quotient-im/libQuotient/issues/435 + # testolmaccount requires network connection/server set up + local myctestargs=( + -j1 + -E "(testolmaccount)" + ) + multibuild_foreach_variant cmake_src_test +} diff --git a/net-libs/libquotient/libquotient-0.8.2.ebuild b/net-libs/libquotient/libquotient-0.8.2.ebuild new file mode 100644 index 000000000000..7ff01c1da407 --- /dev/null +++ b/net-libs/libquotient/libquotient-0.8.2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake multibuild + +DESCRIPTION="Qt-based SDK to develop applications for Matrix" +HOMEPAGE="https://github.com/quotient-im/libQuotient" +SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/libQuotient-${PV}" + +LICENSE="LGPL-2+" +SLOT="0/${PV}" # FIXME: check soname on next version bump +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="+qt5 qt6 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/olm + dev-libs/openssl:= + qt5? ( + dev-libs/qtkeychain:=[qt5(+)] + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5 + ) + qt6? ( + >=dev-libs/qtkeychain-0.14.1-r1:=[qt6] + dev-qt/qtbase:6[gui,network,sql,ssl] + dev-qt/qtmultimedia:6 + ) +" +DEPEND="${RDEPEND} + test? ( + qt5? ( + dev-qt/qtconcurrent:5 + dev-qt/qttest:5 + ) + qt6? ( dev-qt/qtbase:6[concurrent] ) + ) +" + +PATCHES=( + # downstream patches + "${FILESDIR}"/${PN}-0.8.0-no-android.patch + "${FILESDIR}"/${PN}-0.8.0-no-tests.patch +) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_configure() { + my_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DQuotient_ENABLE_E2EE=ON + ) + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + mycmakeargs+=( -DBUILD_WITH_QT6=ON ) + else + mycmakeargs+=( -DBUILD_WITH_QT6=OFF ) + fi + + use test && mycmakeargs+=( + -DQuotient_INSTALL_TESTS=OFF + ) + cmake_src_configure + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_install() { + multibuild_foreach_variant cmake_src_install +} + +src_test() { + # https://github.com/quotient-im/libQuotient/issues/435 + # testolmaccount requires network connection/server set up + local myctestargs=( + -j1 + -E "(testolmaccount)" + ) + multibuild_foreach_variant cmake_src_test +} diff --git a/net-libs/libquotient/metadata.xml b/net-libs/libquotient/metadata.xml index 8641e5bdd399..046004b2670c 100644 --- a/net-libs/libquotient/metadata.xml +++ b/net-libs/libquotient/metadata.xml @@ -5,4 +5,7 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="github">quotient-im/libQuotient</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libre-graph-api-cpp-qt-client/Manifest b/net-libs/libre-graph-api-cpp-qt-client/Manifest new file mode 100644 index 000000000000..044c42418915 --- /dev/null +++ b/net-libs/libre-graph-api-cpp-qt-client/Manifest @@ -0,0 +1 @@ +DIST libre-graph-api-cpp-qt-client-1.0.4.tar.gz 118205 BLAKE2B d48eee996a3fb5160dfbca799122d50a0b6e43ad1a121fcbf8bd9a2543b5364878055b5d5d0f230ca5c69ff8cf94986f3b1fc216211458210ede1c444423edea SHA512 1e7a190abb92c9f3a5d4de8f6c1c3b8c2f8bd2c037e104fc869db8c6eab40eb878e51a627946cdf944ad768db31969e9776d14df3590e30ca3a2be5de0c722b5 diff --git a/net-libs/libre-graph-api-cpp-qt-client/libre-graph-api-cpp-qt-client-1.0.4.ebuild b/net-libs/libre-graph-api-cpp-qt-client/libre-graph-api-cpp-qt-client-1.0.4.ebuild new file mode 100644 index 000000000000..22f737562833 --- /dev/null +++ b/net-libs/libre-graph-api-cpp-qt-client/libre-graph-api-cpp-qt-client-1.0.4.ebuild @@ -0,0 +1,25 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="API for cloud collaboration inspired by the MS Graph API" +HOMEPAGE="https://github.com/owncloud/libre-graph-api-cpp-qt-client/" +SRC_URI="https://github.com/owncloud/libre-graph-api-cpp-qt-client/archive/refs/tags/v${PV}.tar.gz -> libre-graph-api-cpp-qt-client-${PV}.tar.gz" + +S=${WORKDIR}/${P}/client +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +DEPEND="dev-qt/qtbase:6[gui,ssl]" +RDEPEND="${DEPEND}" + +src_prepare() { + # Do not look for Qt5 + sed -e "s/Qt5//" -i CMakeLists.txt || die + + cmake_src_prepare +} diff --git a/net-libs/jreen/metadata.xml b/net-libs/libre-graph-api-cpp-qt-client/metadata.xml index 50d1e852742e..71c9310e4e84 100644 --- a/net-libs/jreen/metadata.xml +++ b/net-libs/libre-graph-api-cpp-qt-client/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> </maintainer> <upstream> - <remote-id type="github">euroelessar/jreen</remote-id> + <remote-id type="github">owncloud/libre-graph-api-cpp-qt-client</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/librist/Manifest b/net-libs/librist/Manifest new file mode 100644 index 000000000000..486fb4a90694 --- /dev/null +++ b/net-libs/librist/Manifest @@ -0,0 +1 @@ +DIST librist-v0.2.8.tar.bz2 2580630 BLAKE2B 665b8111dceb12d86a51739c1e3205f4cf1059fbb14909db3988ad0529c9a11bd25b73b82d4f3e4e85fef1036d3d25d390b3eeac82ed15bab4145e52c46e8ee8 SHA512 05fe5eec411a53c9cf3f55a60b8aed1881f9ebe2960b3ac5f157a1c5c9f42865da58bb90a2f891450f1ae9178b949cdad282dfa3f216599a50b87da92b8a7449 diff --git a/net-libs/librist/librist-0.2.8.ebuild b/net-libs/librist/librist-0.2.8.ebuild new file mode 100644 index 000000000000..d5c984d28111 --- /dev/null +++ b/net-libs/librist/librist-0.2.8.ebuild @@ -0,0 +1,48 @@ +# Copyright 2018-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Library for Reliable Internet Stream Transport (RIST) protocol" +HOMEPAGE="https://code.videolan.org/rist/librist" + +SRC_URI="https://code.videolan.org/rist/librist/-/archive/v${PV}/librist-v${PV}.tar.bz2" +KEYWORDS="~arm64" + +LICENSE="BSD-2" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/cJSON + net-libs/mbedtls:= +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/librist-v${PV}" + +src_configure() { + local emesonargs=( + -Dstatic_analyze=false + $(meson_use test) + -Dbuiltin_cjson=false + -Dbuiltin_mbedtls=false + # Tools have automagic libmicrohttpd dep for prometheus; + # needs solved before exposing; look into use_tun once enabled + -Dbuilt_tools=false + -Dfallback_builtin=false + -Duse_mbedtls=true + -Duse_nettle=false + -Duse_tun=false # Used only by tools + ) + meson_src_configure +} + +src_test() { + # multicast tests fails with FEATURES=network-sandbox + meson_src_test --no-suite multicast +} diff --git a/net-libs/dleyna-renderer/metadata.xml b/net-libs/librist/metadata.xml index f453528b934f..f3a2d1816285 100644 --- a/net-libs/dleyna-renderer/metadata.xml +++ b/net-libs/librist/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> + <maintainer type="person"> + <email>leio@gentoo.org</email> + <name>Mart Raudsepp</name> </maintainer> </pkgmetadata> diff --git a/net-libs/librouteros/Manifest b/net-libs/librouteros/Manifest index 0a034dd5d20f..a10ac5e5f8b4 100644 --- a/net-libs/librouteros/Manifest +++ b/net-libs/librouteros/Manifest @@ -1 +1 @@ -DIST librouteros-1.1.2.tar.bz2 234942 BLAKE2B e5fbb28957280798539d81fd908d9198084dbc3f15e403c7d21a3be7b0211bb2e0cc387b3e237c530454396df430dd2781d2c8184609cebd9cde906eac1288fd SHA512 b4974f84f23544276e426b94410107d24565060034423dabb49157ed2cbee8042d4d415f716fae50a757f24c87c0deab51435236a5bc1bcffe5fc888b7047fc3 +DIST librouteros-1.1.3.tar.gz 20319 BLAKE2B d7527508e671c38ba12edd924300d53b10763bf3769378df3f988a4242ab8c4604d71d6afa55e963477a04b18a6e2afdae0123072d0876b793b022857bfacf30 SHA512 ff477efdf206a7c6f062af8b8d5636b16fa9a9c5a73e49fb78df9de38346063af5bf43a2057bc0b910350c1554e9a4915c6ee5b91b3822ee5e664db8754a8126 diff --git a/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch b/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch deleted file mode 100644 index b3f005a4be3a..000000000000 --- a/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,7 +1,7 @@ - AUTOMAKE_OPTIONS = foreign no-dependencies - - if COMPILER_IS_GCC --AM_CFLAGS = -Wall -Werror -+AM_CFLAGS = -Wall - if BUILD_WITH_DEBUG - AM_CFLAGS += -Wextra -g -O0 - endif diff --git a/net-libs/librouteros/librouteros-1.1.2.ebuild b/net-libs/librouteros/librouteros-1.1.2.ebuild deleted file mode 100644 index a6be5fce2804..000000000000 --- a/net-libs/librouteros/librouteros-1.1.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Library for accessing MikroTik's RouterOS via its API" -HOMEPAGE="http://verplant.org/librouteros/" -SRC_URI="http://verplant.org/librouteros/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug" - -RDEPEND="dev-libs/libgcrypt:0=" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-remove-Werror.patch ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - - # no static archives - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/librouteros/librouteros-1.1.3.ebuild b/net-libs/librouteros/librouteros-1.1.3.ebuild new file mode 100644 index 000000000000..0f22275c4bcb --- /dev/null +++ b/net-libs/librouteros/librouteros-1.1.3.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Library for accessing MikroTik's RouterOS via its API" +HOMEPAGE="https://octo.github.io/librouteros/" +SRC_URI="https://github.com/octo/${PN}/archive/refs/tags/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" + +RDEPEND="dev-libs/libgcrypt:0=" +DEPEND="${RDEPEND}" + +src_prepare() { + default + sed -e 's/-Werror//g' -i src/Makefile.am || die + eautoreconf +} + +src_install() { + default + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/net-libs/librouteros/metadata.xml b/net-libs/librouteros/metadata.xml index 85e4ed814fa2..a3b996f6ac77 100644 --- a/net-libs/librouteros/metadata.xml +++ b/net-libs/librouteros/metadata.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/octo/librouteros/issues</bugs-to> + <remote-id type="github">octo/librouteros</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest index efe932cfa246..90a4cb68b6c3 100644 --- a/net-libs/librsync/Manifest +++ b/net-libs/librsync/Manifest @@ -1 +1,2 @@ DIST librsync-2.3.2.tar.gz 194461 BLAKE2B 72f55c3809c35ee4eff4af03776aed6acfc33cf6109ea8e7fc5cdb4c3919e8f69f156d17ace4443bbb520cbdbe5220df7b5059f00173298839cbb86e0df491c7 SHA512 77d826dbaf02061b759d876a6b537238bad40379a08e4494ebfd3e380b2eb921b7b060bc570330aeac9424ef1a9d521f449d559c9ffa3be24acdef4ad530fe90 +DIST librsync-2.3.4.tar.gz 201307 BLAKE2B eb1f2cde347a6314f1dbcc72f326cd542005458294413bf473478c5665b4090b5ee133ab1059dcea932e41d57202795a057f52206ec3363b5d611ea1792079a8 SHA512 ac01413b875e774db9fec3888210a4b9a5f3d32c081f1ed5f2cf9dc29cfae6ecedf6eac42062631e6dcf188853313fce4520430549768a0f68993419b07e58d9 diff --git a/net-libs/librsync/librsync-2.3.2.ebuild b/net-libs/librsync/librsync-2.3.2.ebuild index d8676d8ba1a5..bfc2141823e4 100644 --- a/net-libs/librsync/librsync-2.3.2.ebuild +++ b/net-libs/librsync/librsync-2.3.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="LGPL-2.1" SLOT="0/2.2" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" RDEPEND="dev-libs/popt" DEPEND="${RDEPEND}" diff --git a/net-libs/librsync/librsync-2.3.4.ebuild b/net-libs/librsync/librsync-2.3.4.ebuild new file mode 100644 index 000000000000..94cc93a72091 --- /dev/null +++ b/net-libs/librsync/librsync-2.3.4.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Remote delta-compression library" +HOMEPAGE="https://librsync.github.io/" +SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/2.2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DUSE_LIBB2=OFF + ) + + cmake_src_configure +} diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest index 7198ca76ba6d..864895d38003 100644 --- a/net-libs/libsearpc/Manifest +++ b/net-libs/libsearpc/Manifest @@ -1 +1,3 @@ DIST libsearpc-3.2.0.tar.gz 52303 BLAKE2B 34707b504b4e63017549e5ed04e8e1e8d1e98b873aebe2ad3f675fe88e209bb73d8b56d1aef137bc4bead2a2fbcf7410dfdf1d02a92a8f37efbaaf0d56d79a4c SHA512 071784b6d34f6ddf947748474c210f0f803e3451373e351b6a768b0cf4a17ddcdaf415ff4ce5f020f1a68df3f6f0a0e53a78ad9e2df286fafea870e303c8f6dd +DIST libsearpc-3.2.0_p1.tar.gz 54011 BLAKE2B 9bdfa72b207eb57d1242384e5581eea9083f4f30616a9bc8da1255b281c0a847ec1fc6d23db7510dc7988a67d7c836762b8343ac4fdffe07ce6296b65d9cf8c8 SHA512 2e1580ffa54e233b078385a94d2d9a7e080bfb2f8ccbaf96645c94f86d0eda686bd84277341cff39840afa03fc67abd05cb2f57a81d117fff4773280f9da265a +DIST libsearpc-3.3.0.tar.gz 54140 BLAKE2B 6645a7e4c14c9d50b59ce8ebaecd13bb247d16d66449b0d251d27d12d46507cc2e4b8468e87f6f1b222da2243b59fc01b69349eb06e96b5cd0d6aabd1aeff72b SHA512 0fd07dcd417b540cb8ed53f1103a03bc6b1a2b9bbb8ca0858aef44a352e3d5d2b6ad51901a29ac6be27acfe25f93233530003982315d0f6e268fa43992f04240 diff --git a/net-libs/libsearpc/files/libsearpc-3.3.0-clang16.patch b/net-libs/libsearpc/files/libsearpc-3.3.0-clang16.patch new file mode 100644 index 000000000000..3bdc191b1b1d --- /dev/null +++ b/net-libs/libsearpc/files/libsearpc-3.3.0-clang16.patch @@ -0,0 +1,164 @@ +https://bugs.gentoo.org/870544 +https://github.com/haiwen/libsearpc/pull/63 + +From ae466d2b3b503f4831bc701e97d0a600e23fed60 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sat, 8 Apr 2023 16:53:07 -0700 +Subject: [PATCH 1/2] Fix -Werror=strict-prototypes + +--- + lib/searpc-client.c | 2 +- + lib/searpc-client.h | 2 +- + lib/searpc-codegen.py | 4 ++-- + lib/searpc-server.c | 2 +- + lib/searpc-server.h | 2 +- + tests/clar.c | 4 ++-- + tests/searpc.c | 2 +- + 7 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/lib/searpc-client.c b/lib/searpc-client.c +index 050a524..916241a 100644 +--- a/lib/searpc-client.c ++++ b/lib/searpc-client.c +@@ -36,7 +36,7 @@ static void clean_objlist(GList *list) + + + SearpcClient * +-searpc_client_new () ++searpc_client_new (void) + { + return g_new0 (SearpcClient, 1); + } +diff --git a/lib/searpc-client.h b/lib/searpc-client.h +index 725fadd..157a407 100644 +--- a/lib/searpc-client.h ++++ b/lib/searpc-client.h +@@ -44,7 +44,7 @@ struct _SearpcClient { + typedef struct _SearpcClient LIBSEARPC_API SearpcClient; + + LIBSEARPC_API +-SearpcClient *searpc_client_new (); ++SearpcClient *searpc_client_new (void); + + LIBSEARPC_API void + searpc_client_free (SearpcClient *client); +diff --git a/lib/searpc-codegen.py b/lib/searpc-codegen.py +index dbbf8c9..acee024 100644 +--- a/lib/searpc-codegen.py ++++ b/lib/searpc-codegen.py +@@ -139,7 +139,7 @@ def generate_marshal_register_item(ret_type, arg_types): + signature_name=signature_name) + + def gen_marshal_register_function(f): +- write_file(f, "static void register_marshals()""") ++ write_file(f, "static void register_marshals(void)""") + write_file(f, "{") + for item in func_table: + write_file(f, generate_marshal_register_item(item[0], item[1])) +@@ -147,7 +147,7 @@ def gen_marshal_register_function(f): + + signature_template = r""" + inline static gchar * +-${signature_name}() ++${signature_name}(void) + { + return searpc_compute_signature (${args}); + } +diff --git a/lib/searpc-server.c b/lib/searpc-server.c +index 3d6dc09..a82fbe4 100644 +--- a/lib/searpc-server.c ++++ b/lib/searpc-server.c +@@ -248,7 +248,7 @@ searpc_server_reopen_slow_log (const char *slow_log_path) + #endif + + void +-searpc_server_final() ++searpc_server_final(void) + { + g_hash_table_destroy (service_table); + g_hash_table_destroy (marshal_table); +diff --git a/lib/searpc-server.h b/lib/searpc-server.h +index 02722a4..aa1a9fe 100644 +--- a/lib/searpc-server.h ++++ b/lib/searpc-server.h +@@ -67,7 +67,7 @@ searpc_server_reopen_slow_log (const char *slow_log_path); + * Free the server structure. + */ + LIBSEARPC_API +-void searpc_server_final (); ++void searpc_server_final (void); + + /** + * searpc_create_service: +diff --git a/tests/clar.c b/tests/clar.c +index 1546447..81da15a 100644 +--- a/tests/clar.c ++++ b/tests/clar.c +@@ -371,7 +371,7 @@ clar_test_init(int argc, char **argv) + } + + int +-clar_test_run() ++clar_test_run(void) + { + if (_clar.argc > 1) + clar_parse_args(_clar.argc, _clar.argv); +@@ -386,7 +386,7 @@ clar_test_run() + } + + void +-clar_test_shutdown() ++clar_test_shutdown(void) + { + clar_print_shutdown( + _clar.tests_ran, +diff --git a/tests/searpc.c b/tests/searpc.c +index 4c7edb7..7a2d5a5 100644 +--- a/tests/searpc.c ++++ b/tests/searpc.c +@@ -204,7 +204,7 @@ get_substring (const gchar *orig_str, int sub_len, GError **error) + } + + static SearpcClient * +-do_create_client_with_pipe_transport() ++do_create_client_with_pipe_transport(void) + { + SearpcNamedPipeClient *pipe_client = searpc_create_named_pipe_client(pipe_path); + cl_must_pass_(searpc_named_pipe_client_connect(pipe_client), "named pipe client failed to connect"); + +From d78aede0e4c559fa3dbce0e64ffc943da47fe76c Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sat, 8 Apr 2023 17:13:55 -0700 +Subject: [PATCH 2/2] Fix -Werror=implicit-function-declaration + +unistd.h is needed for write, close and read +--- + demo/searpc-demo-packet.h | 1 + + demo/test-object.h | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/demo/searpc-demo-packet.h b/demo/searpc-demo-packet.h +index 926f36b..6552396 100644 +--- a/demo/searpc-demo-packet.h ++++ b/demo/searpc-demo-packet.h +@@ -4,6 +4,7 @@ + + #include <stdint.h> + #include <stdio.h> ++#include <unistd.h> + #include <errno.h> + + #ifdef WIN32 +diff --git a/demo/test-object.h b/demo/test-object.h +index f3f7589..a6d8b5d 100644 +--- a/demo/test-object.h ++++ b/demo/test-object.h +@@ -4,6 +4,8 @@ + #include <glib.h> + #include <glib-object.h> + ++GType test_object_get_type (void); ++ + #define TEST_OBJECT_TYPE (test_object_get_type()) + #define TEST_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_OBJECT_TYPE, TestObject)) + #define IS_TEST_OBJCET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_OBJCET_TYPE)) diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild index 14a1c15737b8..fc6391668460 100644 --- a/net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild +++ b/net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit autotools python-single-r1 -DESCRIPTION="A simple C language RPC framework" -HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/" +DESCRIPTION="Simple C language RPC framework" +HOMEPAGE="https://github.com/haiwen/libsearpc/ https://seafile.com/" SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} diff --git a/net-libs/libsearpc/libsearpc-3.2.0_p1.ebuild b/net-libs/libsearpc/libsearpc-3.2.0_p1.ebuild new file mode 100644 index 000000000000..2df7833d444e --- /dev/null +++ b/net-libs/libsearpc/libsearpc-3.2.0_p1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..10} ) + +# Upstream is moving tags repeatedly, then we use commit hash. +RELEASE_COMMIT="54145b03f4240222e336a9a2f402e93facefde65" #tag v3.2_latest + +inherit autotools python-single-r1 + +DESCRIPTION="Simple C language RPC framework" +HOMEPAGE="https://github.com/haiwen/libsearpc/ https://seafile.com/" +SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + >=dev-libs/glib-2.26.0 + >=dev-libs/jansson-2.2.1:=" +RDEPEND="${DEPEND} + $(python_gen_cond_dep ' + dev-python/simplejson[${PYTHON_USEDEP}] + ')" + +src_prepare() { + default + sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die + eautoreconf +} + +src_install() { + default + # Remove unnecessary .la files + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libsearpc/libsearpc-3.3.0-r2.ebuild b/net-libs/libsearpc/libsearpc-3.3.0-r2.ebuild new file mode 100644 index 000000000000..4b9a30057f37 --- /dev/null +++ b/net-libs/libsearpc/libsearpc-3.3.0-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +# Upstream is moving tags repeatedly, then we use commit hash. +RELEASE_COMMIT="15f6f0b9f451b9ecf99dedab72e9242e54e124eb" #tag v3.3-latest + +inherit autotools python-single-r1 + +DESCRIPTION="Simple C language RPC framework" +HOMEPAGE="https://github.com/haiwen/libsearpc/ https://seafile.com/" +SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + >=dev-libs/glib-2.26.0 + >=dev-libs/jansson-2.2.1:=" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch #870544 +) + +src_prepare() { + default + sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die + eautoreconf +} + +src_install() { + default + # Remove unnecessary .la files + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libsearpc/metadata.xml b/net-libs/libsearpc/metadata.xml index 73920536d741..e0ab66212753 100644 --- a/net-libs/libsearpc/metadata.xml +++ b/net-libs/libsearpc/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@retornaz.com</email> - <name>Quentin Retornaz</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">haiwen/libsearpc</remote-id> </upstream> diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest index 4529e1d958bd..4d11dc622921 100644 --- a/net-libs/libsignal-protocol-c/Manifest +++ b/net-libs/libsignal-protocol-c/Manifest @@ -1,2 +1 @@ -DIST libsignal-protocol-c-2.3.2.tar.gz 271930 BLAKE2B 43e1e384f9f3a81f582445e5f1f10875948b33607aa7feaf98f4b6cc41f5fd30ca9fb7c8426ef66f93cd46a662eb4a57002f5937d68f6fd2fcf0b30b33c60997 SHA512 7c63c42b9a590ed1a60a6f0094668d9948aa04e5965d052c22ae22b176df7c5582b8ec5c0e6c01ad582dfe2b04067380b9734ad08c64785242e90abcdabdfb8d DIST libsignal-protocol-c-2.3.3.tar.gz 272073 BLAKE2B 86f31ed8a18bfc1ea80c45ffaf983611d353616d418f308711665aae287ff86697f7586f20f2c52ac028f9e5ad8b6d39c80876b263654c620a541812917b4f44 SHA512 19d892e13fac32022658de5eaf1db8cec3226f5f3f37a4c1c33bfa9653126ecbc6350a1ab5624025f909803c2277b86321dbea7f64e9932883cae57b65f58112 diff --git a/net-libs/libsignal-protocol-c/files/libsignal-protocol-c-2.3.3-CVE-2022-48468.patch b/net-libs/libsignal-protocol-c/files/libsignal-protocol-c-2.3.3-CVE-2022-48468.patch new file mode 100644 index 000000000000..8b3706dd8829 --- /dev/null +++ b/net-libs/libsignal-protocol-c/files/libsignal-protocol-c-2.3.3-CVE-2022-48468.patch @@ -0,0 +1,53 @@ +From 478dfe51552243b367cf2e9c5d047cbbd3c21635 Mon Sep 17 00:00:00 2001 +From: Randy Barlow <randy@electronsweatshop.com> +Date: Fri, 18 Mar 2022 12:42:57 -0400 +Subject: [PATCH] CVE-2022-48468: unsigned integer overflow + +This commit combines two upstream commits from protobuf-c[0][1]. +The first fixes an unsigned integer overflow, and the second fixes a +regression introduced by the first. I originally decided to amend the +commit message of the first to mention that it fixes a CVE, but then I +realized it would be better to bring the fix for the regression together +with it. + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-48468 +https://bugzilla.redhat.com/show_bug.cgi?id=2186673 + +[0] +https://github.com/protobuf-c/protobuf-c/pull/513/commits/289f5c18b195aa43d46a619d1188709abbfa9c82 +[1] +https://github.com/protobuf-c/protobuf-c/pull/513/commits/0d1fd124a4e0a07b524989f6e64410ff648fba61 + +Co-authored-by: 10054172 <hui.zhang@thalesgroup.com> +Co-authored-by: "Todd C. Miller" <Todd.Miller@sudo.ws> +Signed-off-by: 10054172 <hui.zhang@thalesgroup.com> +Signed-off-by: Randy Barlow <randy@electronsweatshop.com> +--- + src/protobuf-c/protobuf-c.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/protobuf-c/protobuf-c.c b/src/protobuf-c/protobuf-c.c +index 4f2f5bc..6ae5287 100644 +--- a/src/protobuf-c/protobuf-c.c ++++ b/src/protobuf-c/protobuf-c.c +@@ -2456,10 +2456,13 @@ parse_required_member(ScannedMember *scanned_member, + return FALSE; + + def_mess = scanned_member->field->default_value; +- subm = protobuf_c_message_unpack(scanned_member->field->descriptor, +- allocator, +- len - pref_len, +- data + pref_len); ++ if (len >= pref_len) ++ subm = protobuf_c_message_unpack(scanned_member->field->descriptor, ++ allocator, ++ len - pref_len, ++ data + pref_len); ++ else ++ subm = NULL; + + if (maybe_clear && + *pmessage != NULL && +-- +2.39.2 + diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild deleted file mode 100644 index 9c40ea1f66c9..000000000000 --- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Signal Protocol C Library" -HOMEPAGE="https://www.whispersystems.org/" -SRC_URI="https://github.com/signalapp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm64" - -LICENSE="GPL-3" -SLOT="0" diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3-r1.ebuild index 152bed279253..2fe08277a30e 100644 --- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild +++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3-r1.ebuild @@ -1,14 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake DESCRIPTION="Signal Protocol C Library" -HOMEPAGE="https://www.whispersystems.org/" +HOMEPAGE="https://signal.org/ https://github.com/signalapp/libsignal-protocol-c" SRC_URI="https://github.com/signalapp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64 x86" LICENSE="GPL-3" SLOT="0" + +PATCHES=( + "${FILESDIR}"/${PN}-2.3.3-CVE-2022-48468.patch +) diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild deleted file mode 100644 index 07a69138ceed..000000000000 --- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit git-r3 cmake - -DESCRIPTION="Signal Protocol C Library" -HOMEPAGE="https://www.whispersystems.org/" - -EGIT_REPO_URI="https://github.com/signalapp/libsignal-protocol-c" - -LICENSE="GPL-3" -SLOT="0" diff --git a/net-libs/libsignal-protocol-c/metadata.xml b/net-libs/libsignal-protocol-c/metadata.xml index 1c2c8657b8d0..e70405d84107 100644 --- a/net-libs/libsignal-protocol-c/metadata.xml +++ b/net-libs/libsignal-protocol-c/metadata.xml @@ -1,18 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>andrey_utkin@gentoo.org</email> - <name>Andrey Utkin</name> + <maintainer type="person" proxied="yes"> + <email>william@wstrm.dev</email> + <name>William Wennerström</name> </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <maintainer type="person" proxied="yes"> - <email>william@wstrm.dev</email> - <name>William Wennerström</name> - </maintainer> <upstream> <remote-id type="github">signalapp/libsignal-protocol-c</remote-id> <bugs-to>https://github.com/signalapp/libsignal-protocol-c/issues</bugs-to> diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch new file mode 100644 index 000000000000..b31bd46a825e --- /dev/null +++ b/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch @@ -0,0 +1,28 @@ +From fc1098b3a376a04020c9e733eafda9fa0ac51723 Mon Sep 17 00:00:00 2001 +From: Pino Toscano <toscano.pino@tiscali.it> +Date: Sat, 2 Jan 2021 14:19:18 +0100 +Subject: [PATCH] build: make documentation really optional + +Build of the documentation only if the meson option for it is enabled. +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 5d0de55..b10f80d 100644 +--- a/meson.build ++++ b/meson.build +@@ -23,7 +23,9 @@ endif + root_dir = include_directories ('.') + + subdir('libsignon-glib') +-subdir('docs') ++if get_option('documentation') ++ subdir('docs') ++endif + + if get_option('python') + subdir('pygobject') +-- +GitLab + diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch new file mode 100644 index 000000000000..66254e398029 --- /dev/null +++ b/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch @@ -0,0 +1,31 @@ +From 4fae9155a19aca601072f361768e0bf8ed556b1e Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Tue, 11 Jan 2022 22:05:11 +0100 +Subject: [PATCH] Fix build with meson >= 0.61.0 + +Otherwise it fails with "docs/reference/meson.build:21:6: ERROR: +gnome.gtkdoc keyword argument 'expand_content_files' was of type +array[File] but should have been array[str]". +--- + docs/reference/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/reference/meson.build b/docs/reference/meson.build +index 654404b..3927109 100644 +--- a/docs/reference/meson.build ++++ b/docs/reference/meson.build +@@ -47,9 +47,9 @@ gnome.gtkdoc( + 'libsignon-glib.types', + ], + content_files: doc_content_files, +- expand_content_files: files( ++ expand_content_files: [ + 'migrating-1to2.xml' +- ), ++ ], + fixxref_args: [ + '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')), + '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')), +-- +GitLab + diff --git a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild b/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild index 67df5bba992c..84711961b404 100644 --- a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild +++ b/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit meson python-r1 vala DESCRIPTION="GLib binding for the D-Bus API provided by signond" @@ -38,6 +38,11 @@ BDEPEND="$(python_gen_any_dep) test? ( dev-libs/check ) " +PATCHES=( + "${FILESDIR}/${P}-docs-optional.patch" + "${FILESDIR}/${P}-meson-0.61.patch" +) + python_check_deps() { return 0; } pkg_setup() { @@ -46,9 +51,7 @@ pkg_setup() { src_prepare() { default - vala_src_prepare - - use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die + vala_setup cp libsignon-glib/*.xml libsignon-glib/interfaces || die } @@ -57,6 +60,7 @@ src_configure() { myconfigure() { local emesonargs=( -Ddebugging=$(usex debug true false) + -Ddocumentation=$(usex doc true false) -Dintrospection=$(usex introspection true false) -Dpython=$(usex python true false) -Dtests=$(usex test true false) @@ -80,7 +84,7 @@ src_compile() { fi } -src_compile() { +src_test() { if use python; then python_foreach_impl run_in_build_dir meson_src_test else diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest index b2523bed1ccb..7deab5160a6e 100644 --- a/net-libs/libslirp/Manifest +++ b/net-libs/libslirp/Manifest @@ -1 +1,2 @@ DIST libslirp-4.6.1.tar.gz 135569 BLAKE2B 7a890912f2a8ce9d6820870e2d29b9c7a2253c403c2bcb127a38e02b2b81d1e262f34571c8a4c05fbf46874b9b2967cb5597cabe169ad54f12702fdd8b90bb3c SHA512 04a9dd88cd58c849a24b9cff405d951952760d99ea2bef0b070463dff088d79f44557a13c9427ba0043f58d4b9e06b68ff64a4f23a7b0d66df594e32e1521cae +DIST libslirp-4.7.0.tar.gz 143251 BLAKE2B f3e1c3a31f09462d79ca6c663a05bde02b075090f3a5f7bc69fef3c72b8517c11a123ad7b46f4b2855cbc9a7a5dbde8d1cb2d5e3e2a9d7eedbe570c200f8bcc6 SHA512 387f4a6dad240ce633df2640bb49c6cb0041c8b3afc8d0ef38186d385f00dd9e4ef4443e93e1b71dbf05e22892b6f2771a87a202e815d8ec899ab5c147a1f09f diff --git a/net-libs/libslirp/libslirp-4.6.1.ebuild b/net-libs/libslirp/libslirp-4.6.1.ebuild index 66229c715845..272a78bb0d4d 100644 --- a/net-libs/libslirp/libslirp-4.6.1.ebuild +++ b/net-libs/libslirp/libslirp-4.6.1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit meson -KEYWORDS="amd64 arm64 ~ppc ppc64 x86" +KEYWORDS="amd64 arm64 ~m68k ~ppc ppc64 ~riscv x86" MY_P="${PN}-v${PV}" SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz" -DESCRIPTION="A TCP-IP emulator used to provide virtual networking services." +DESCRIPTION="A TCP-IP emulator used to provide virtual networking services" HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp" LICENSE="BSD" diff --git a/net-libs/libslirp/libslirp-4.7.0.ebuild b/net-libs/libslirp/libslirp-4.7.0.ebuild new file mode 100644 index 000000000000..d17d7b4770e0 --- /dev/null +++ b/net-libs/libslirp/libslirp-4.7.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +KEYWORDS="amd64 arm64 ~loong ~m68k ~ppc ppc64 ~riscv x86" +MY_P="${PN}-v${PV}" +SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz" +DESCRIPTION="A TCP-IP emulator used to provide virtual networking services" +HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp" + +LICENSE="BSD" +SLOT="0" +IUSE="static-libs valgrind" + +RDEPEND="dev-libs/glib:=" +# Valgrind usage is automagic but it's not so bad given it's a header-only dep. +DEPEND=" + ${RDEPEND} + valgrind? ( dev-debug/valgrind ) +" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + echo "${PV}" > .tarball-version || die + echo -e "#!${BASH}\necho -n \$(cat '${S}/.tarball-version')" > build-aux/git-version-gen || die + default +} + +src_configure() { + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + ) + meson_src_configure +} diff --git a/net-libs/libslirp/metadata.xml b/net-libs/libslirp/metadata.xml index 608b5343e9ef..0fd9fbd9d206 100644 --- a/net-libs/libslirp/metadata.xml +++ b/net-libs/libslirp/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="gitlab">gitlab.freedesktop.org/slirp/libslirp</remote-id> + <remote-id type="cpe">cpe:/a:libslirp_project:libslirp</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/libsmi/files/libsmi-0.5.0-clang-15-configure.patch b/net-libs/libsmi/files/libsmi-0.5.0-clang-15-configure.patch new file mode 100644 index 000000000000..7955c4a36f6a --- /dev/null +++ b/net-libs/libsmi/files/libsmi-0.5.0-clang-15-configure.patch @@ -0,0 +1,42 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -43,7 +43,8 @@ CC="$withval") + + AC_MSG_CHECKING([for additional required compiler flags]) + AC_TRY_RUN([#include <stdio.h> +- main() { ++ #include <stdlib.h> ++ int main() { + #ifdef __SUNPRO_C + exit(0); + #else +@@ -105,7 +106,8 @@ dirseparator="$withval", dirseparator="") + AC_MSG_CHECKING([for path separator character]) + if test "$pathseparator" = "" ; then + AC_TRY_RUN([#include <stdio.h> +- main() { ++ #include <stdlib.h> ++ int main() { + #ifdef _WIN32 + exit(0); + #else +@@ -119,7 +121,8 @@ echo $pathseparator + AC_MSG_CHECKING([for dir separator character]) + if test "$dirseparator" = "" ; then + AC_TRY_RUN([#include <stdio.h> +- main() { ++ #include <stdlib.h> ++ int main() { + #ifdef _WIN32 + exit(0); + #else +@@ -145,7 +148,8 @@ AC_MSG_CHECKING([for 64 bit types]) + # if used with the (correct) value -9223372036854775808LL. + # + AC_TRY_RUN([#include <stdio.h> +- main() { ++ #include <stdlib.h> ++ int main() { + long long ll; + unsigned long long ull; + exit(0); diff --git a/net-libs/libsmi/files/libsmi-0.5.0-fix-macro-clang16.patch b/net-libs/libsmi/files/libsmi-0.5.0-fix-macro-clang16.patch new file mode 100644 index 000000000000..0ffe6dd92606 --- /dev/null +++ b/net-libs/libsmi/files/libsmi-0.5.0-fix-macro-clang16.patch @@ -0,0 +1,16 @@ +stdio needed for sscanf(), stdlib is included by smi.h but let's include it +anyway for exit(). +--- a/libsmi.m4 ++++ b/libsmi.m4 +@@ -12,7 +12,10 @@ AC_DEFUN([AM_PATH_LIBSMI], + AC_MSG_CHECKING([whether to enable libsmi]) + AC_TRY_RUN([ /* libsmi available check */ + #include <smi.h> +-main() ++#include <stdlib.h> ++#include <stdio.h> ++#include <string.h> ++int main(void) + { + int current, revision, age, n; + const int required = 2; diff --git a/net-libs/libsmi/files/libsmi-0.5.0-implicit-function-declarations.patch b/net-libs/libsmi/files/libsmi-0.5.0-implicit-function-declarations.patch new file mode 100644 index 000000000000..f0d52e4ae000 --- /dev/null +++ b/net-libs/libsmi/files/libsmi-0.5.0-implicit-function-declarations.patch @@ -0,0 +1,74 @@ +From: Nicholas Vinson <nvinson234@gmail.com> +To: libsmi@ibr.cs.tu-bs.de +Cc: Nicholas Vinson <nvinson234@gmail.com> +Subject: Implicit function declaration patch + +When building libsmi with clang 15.0.0, clang fails to build due to +errors similar to: + +call to undeclared function 'smiyyerror'; ISO C99 and later do not support +implicit function declarations + +This patch corrects those issues by introducing the needed +declarations defore the function call. + +Thanks, +Nicholas Vinson + +--- a/lib/yang-data.h ++++ b/lib/yang-data.h +@@ -158,10 +158,12 @@ _YangIdentifierRef *listIdentifierRef(Y + /* + * Node and Module functions + */ + _YangNode *addYangNode(const char *value, YangDecl nodeKind, _YangNode *parentPtr); + ++void createIdentifierRef(_YangNode *node, char* prefix, char* ident); ++ + int removeYangNode(_YangNode* target, _YangNode* child); + + _YangModuleInfo *createModuleInfo(_YangNode *modulePtr); + + void createTypeInfo(_YangNode *node); +--- a/lib/parser-yang.y ++++ b/lib/parser-yang.y +@@ -19,10 +19,15 @@ + #include <config.h> + + #ifdef BACKEND_YANG + + #define _ISOC99_SOURCE ++/* define _DEFAULT_SOURCE to get timegm() */ ++#define _DEFAULT_SOURCE 1 ++/* define _BSD_SOURCE & _SVID_SOURCE for backwards compatibility */ ++#define _BSD_SOURCE 1 ++#define _SVID_SOURCE 1 + #include <stdio.h> + #include <errno.h> + #include <stdlib.h> + #include <string.h> + #include <ctype.h> +@@ -44,10 +44,11 @@ + #include "parser-yang.h" + #include "scanner-yang.h" + #include "yang-complex-types.h" + #include "util.h" + #include "error.h" ++#include "yang-check.h" + + #ifdef HAVE_DMALLOC_H + #include <dmalloc.h> + #endif + +--- a/lib/error.h ++++ b/lib/error.h +@@ -40,6 +40,8 @@ extern char* smiGetErrorMsg(int id); + + extern void smiPrintError(Parser *parser, int id, ...); + + extern void smiPrintErrorAtLine(Parser *parser, int id, int line, ...); + ++#include "smi-check.h" ++ + #endif /* _ERROR_H */ + diff --git a/net-libs/libsmi/libsmi-0.5.0-r5.ebuild b/net-libs/libsmi/libsmi-0.5.0-r5.ebuild new file mode 100644 index 000000000000..2e679a11472d --- /dev/null +++ b/net-libs/libsmi/libsmi-0.5.0-r5.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A Library to Access SMI MIB Information" +HOMEPAGE="https://www.ibr.cs.tu-bs.de/projects/libsmi/ https://gitlab.ibr.cs.tu-bs.de/nm/libsmi" +SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86" +RESTRICT="test" + +# libsmi-0.5.0-implicit-function-declarations.patch touches parser +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.5.0-implicit-function-declarations.patch + "${FILESDIR}"/${PN}-0.5.0-clang-15-configure.patch + "${FILESDIR}"/${PN}-0.5.0-fix-macro-clang16.patch +) + +src_prepare() { + default + eautoreconf +} + +src_test() { + # sming test is known to fail and some other fail if LC_ALL!=C: + # https://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html + sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile + LC_ALL=C emake -j1 check +} + +src_install() { + default + + dodoc ANNOUNCE ChangeLog README THANKS TODO \ + doc/{*.txt,smi.dia,smi.dtd,smi.xsd} smi.conf-example + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest index eeda67948b94..1cc9e8931857 100644 --- a/net-libs/libsoup/Manifest +++ b/net-libs/libsoup/Manifest @@ -1,4 +1,2 @@ -DIST libsoup-2.72.0.tar.xz 1477940 BLAKE2B e63a26aa29a4a34c4e4b0a2713818db52b206b04b56d99391648351f87a62dc3455020e8eb0312ef17b2b7d047a7d5731905ecc214085afd4eff25fefa30782b SHA512 ca16772d0d318c4be0c4859db1e32baffa2231b4732f3bf9814aa405febde86395a0fb8bfa1635d70a7b5853d2567403920b9b0d0f5c3c179294352af27e91de -DIST libsoup-2.74.0.tar.xz 1498224 BLAKE2B c03b817a7a7f708480581aad258e5e24c541c6c2f39e48c51597d67c729b3a0722ef094916ad841904a0cafc67f12ad20d05b74ac41aeb174cb79b49fdd0977e SHA512 d78374c31631d7d1fb30ceb7c6016ab970cb321b06191d3463f178ceea9dacd08c828b8f16f5a30c185489ebfbc93ff9da09ae4978be3e3ff11bf7ee95a2a9a6 -DIST libsoup-2.74.1.tar.xz 1496188 BLAKE2B 6f15415d5d4d68fa1f7167363cbed77dee9d4feea226357389209c96367c27c554fdc81fa25bcc8ce02290d6781dc2cc99298342349aada9ad9e32a10727c641 SHA512 107726e069becc0a79904905a10a0ceb0c010fcae57ee86fbb838e6edf58abfc464c8e6c3afb610e495d9c2a24ec6b4ba4c023921611642a9d3c89627daa154b -DIST libsoup-3.0.2.tar.xz 1518728 BLAKE2B 17a476b08a78c06885de5bb63650b7232541bbb70aaa00a9ae67641b0a2d83fc726d8ef24c0c1cc1ca010b645e184bf7f17ced459d41e01a031712bf21108833 SHA512 0853d094555b3cff2a48f16ea1058ba55f9475ac1e0c1515792101e387596cdd8e3d69947eb4056b69b3cbee5d09111e99c3e684d207180d8e64b23a238f181f +DIST libsoup-2.74.3.tar.xz 1504804 BLAKE2B 91f441197414314bb78cf15e7c13b54714e669145784812fb7a68cc41c8965ea29c53dc686d690e00f28f711be9f767038e5cc43b11aa0136f190dd2d41ec2a0 SHA512 72f8a055df984cb35105fe67f4ca67d3fb110d40a9cacb660fccd89f93b06bc32e25d94375dcc76608a245f7c5e081d968d7aaf5952eb16013d81c741247cb4c +DIST libsoup-3.4.4.tar.xz 1536268 BLAKE2B 6818ea74fab3531bb0a8e60df9885c5c6729780446f37cff73eb9fdf9d75fb00357dbdc3ae8d8c6e0ff105cb8df42eacf2e1e8865db4cb07871bacf3c62139b7 SHA512 dc16b5ea7d4c25b14f674abd2ccc563d1389ed677fab49cbd556935319bdc6c245acd4a912dc5225ad2e268e5bfbf8956b8cb2f9a585cc4770c2be33c0adac28 diff --git a/net-libs/libsoup/files/3.0.2-fix-leak.patch b/net-libs/libsoup/files/3.0.2-fix-leak.patch deleted file mode 100644 index cad804a7a038..000000000000 --- a/net-libs/libsoup/files/3.0.2-fix-leak.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c7e251644c618ce5193881b2a16374ababc2ccf8 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Thu, 11 Nov 2021 16:47:34 +0200 -Subject: [PATCH] connection: Fix memory leak in new_tls_connection - ---- - libsoup/soup-connection.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c -index f2e35f47..38a91e46 100644 ---- a/libsoup/soup-connection.c -+++ b/libsoup/soup-connection.c -@@ -585,6 +585,7 @@ new_tls_connection (SoupConnection *conn, - "advertised-protocols", advertised_protocols->pdata, - NULL); - -+ g_object_unref (tls_interaction); - g_ptr_array_unref (advertised_protocols); - - if (!tls_connection) --- -2.32.0 - diff --git a/net-libs/libsoup/files/disable-apache-tests.patch b/net-libs/libsoup/files/disable-apache-tests.patch index e7d306bde971..e5e2c9c7618b 100644 --- a/net-libs/libsoup/files/disable-apache-tests.patch +++ b/net-libs/libsoup/files/disable-apache-tests.patch @@ -1,3 +1,5 @@ +See also: https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/119 + From 6c9bbf0d91688e831f8f19232e18619bfc57e12e Mon Sep 17 00:00:00 2001 From: Mart Raudsepp <leio@gentoo.org> Date: Fri, 23 Aug 2019 21:11:57 +0300 diff --git a/net-libs/libsoup/files/libxml2-2.12.patch b/net-libs/libsoup/files/libxml2-2.12.patch new file mode 100644 index 000000000000..3190eeb6301c --- /dev/null +++ b/net-libs/libsoup/files/libxml2-2.12.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/917556 +https://gitlab.gnome.org/GNOME/libsoup/-/commit/ced3c5d8cad0177b297666343f1561799dfefb0d + +From ced3c5d8cad0177b297666343f1561799dfefb0d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 22 Nov 2023 18:49:10 -0800 +Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17 + +Fixes build errors about missing function prototypes with clang-17 + +Fixes +| ../libsoup-2.74.3/libsoup/soup-xmlrpc-old.c:512:8: error: call to undeclared function 'xmlParseMemory'; ISO C99 and later do not support implicit function declarations + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/libsoup/soup-xmlrpc-old.c ++++ b/libsoup/soup-xmlrpc-old.c +@@ -11,6 +11,7 @@ + + #include <string.h> + ++#include <libxml/parser.h> + #include <libxml/tree.h> + + #include "soup-xmlrpc-old.h" +--- a/libsoup/soup-xmlrpc.c ++++ b/libsoup/soup-xmlrpc.c +@@ -17,6 +17,7 @@ + + #include <string.h> + #include <errno.h> ++#include <libxml/parser.h> + #include <libxml/tree.h> + #include "soup-xmlrpc.h" + #include "soup.h" +-- +GitLab diff --git a/net-libs/libsoup/libsoup-2.72.0-r1.ebuild b/net-libs/libsoup/libsoup-2.72.0-r1.ebuild deleted file mode 100644 index af1cd5f7bfd1..000000000000 --- a/net-libs/libsoup/libsoup-2.72.0-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit gnome.org meson-multilib vala xdg - -DESCRIPTION="HTTP client/server library for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/libsoup" - -LICENSE="LGPL-2.1+" -SLOT="2.4" - -# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146 -IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala" -RESTRICT="!test? ( test )" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -DEPEND=" - >=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}] - >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] ) - >=net-libs/libpsl-0.20[${MULTILIB_USEDEP}] - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) - sys-libs/zlib - gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - samba? ( net-fs/samba ) -" -RDEPEND="${DEPEND} - >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}] -" -BDEPEND=" - dev-libs/glib - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.1.2 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic, -# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir, -# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect] -# dev-lang/php[apache2,xmlrpc] -# net-misc/curl -# net-libs/glib-networking[ssl])" - -PATCHES=( - # Disable apache tests until they are usable on Gentoo, bug #326957 - "${FILESDIR}"/disable-apache-tests.patch -) - -src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare - # https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname - sed -e '/hsts/d' -i tests/meson.build || die -} - -src_configure() { - # FIXME: we need addpredict to workaround bug #324779 until - # root cause (bug #249496) is solved - # But necessary while apache tests are disabled - #addpredict /usr/share/snmp/mibs/.index - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local emesonargs=( - $(meson_feature gssapi) - -Dkrb5_config="${CHOST}-krb5-config" - $(meson_feature samba ntlm) - $(meson_feature brotli) - -Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth" - -Dtls_check=false # disables check, we still rdep on glib-networking - -Dgnome=false - $(meson_native_use_feature introspection) - $(meson_native_use_feature vala vapi) - $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_use test tests) - -Dinstalled_tests=false - $(meson_feature sysprof) - ) - meson_src_configure -} diff --git a/net-libs/libsoup/libsoup-2.74.0.ebuild b/net-libs/libsoup/libsoup-2.74.0.ebuild deleted file mode 100644 index 5bf1131885f8..000000000000 --- a/net-libs/libsoup/libsoup-2.74.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit gnome.org meson-multilib vala xdg - -DESCRIPTION="HTTP client/server library for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/libsoup" - -LICENSE="LGPL-2.1+" -SLOT="2.4" - -# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146 -IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala" -RESTRICT="!test? ( test )" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -DEPEND=" - >=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}] - >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] ) - >=net-libs/libpsl-0.20[${MULTILIB_USEDEP}] - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) - sys-libs/zlib - gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - samba? ( net-fs/samba ) -" -RDEPEND="${DEPEND} - >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}] -" -BDEPEND=" - dev-libs/glib - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.1.2 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic, -# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir, -# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect] -# dev-lang/php[apache2,xmlrpc] -# net-misc/curl -# net-libs/glib-networking[ssl])" - -PATCHES=( - # Disable apache tests until they are usable on Gentoo, bug #326957 - "${FILESDIR}"/disable-apache-tests.patch -) - -src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare - # https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname - sed -e '/hsts/d' -i tests/meson.build || die -} - -src_configure() { - # FIXME: we need addpredict to workaround bug #324779 until - # root cause (bug #249496) is solved - # But necessary while apache tests are disabled - #addpredict /usr/share/snmp/mibs/.index - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local emesonargs=( - $(meson_feature gssapi) - -Dkrb5_config="${CHOST}-krb5-config" - $(meson_feature samba ntlm) - $(meson_feature brotli) - -Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth" - -Dtls_check=false # disables check, we still rdep on glib-networking - -Dgnome=false - $(meson_native_use_feature introspection) - $(meson_native_use_feature vala vapi) - $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_use test tests) - -Dinstalled_tests=false - $(meson_feature sysprof) - ) - meson_src_configure -} diff --git a/net-libs/libsoup/libsoup-2.74.1.ebuild b/net-libs/libsoup/libsoup-2.74.3.ebuild index 5bf1131885f8..4287161e6fb3 100644 --- a/net-libs/libsoup/libsoup-2.74.1.ebuild +++ b/net-libs/libsoup/libsoup-2.74.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala" RESTRICT="!test? ( test )" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" DEPEND=" >=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}] @@ -53,6 +53,8 @@ BDEPEND=" PATCHES=( # Disable apache tests until they are usable on Gentoo, bug #326957 "${FILESDIR}"/disable-apache-tests.patch + # libxml2-2.12 fix, bug #917556 + "${FILESDIR}"/libxml2-2.12.patch ) src_prepare() { @@ -73,6 +75,9 @@ src_configure() { multilib_src_configure() { local emesonargs=( + # Avoid automagic, built-in feature of meson + -Dauto_features=enabled + $(meson_feature gssapi) -Dkrb5_config="${CHOST}-krb5-config" $(meson_feature samba ntlm) diff --git a/net-libs/libsoup/libsoup-3.0.2.ebuild b/net-libs/libsoup/libsoup-3.4.4.ebuild index 42bc6d7a2963..2b31933cd239 100644 --- a/net-libs/libsoup/libsoup-3.0.2.ebuild +++ b/net-libs/libsoup/libsoup-3.4.4.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+ +EAPI=8 inherit gnome.org meson-multilib vala xdg @@ -16,7 +15,7 @@ IUSE="+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala" RESTRICT="!test? ( test )" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" DEPEND=" >=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}] @@ -36,8 +35,10 @@ RDEPEND="${DEPEND} BDEPEND=" dev-libs/glib dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.1.2 ) + gtk-doc? ( + >=dev-util/gi-docgen-2021.1 + app-text/docbook-xml-dtd:4.1.2 + ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( $(vala_depend) ) @@ -51,14 +52,14 @@ BDEPEND=" # net-libs/glib-networking[ssl])" PATCHES=( - "${FILESDIR}"/${PV}-fix-leak.patch # Disable apache tests until they are usable on Gentoo, bug #326957 "${FILESDIR}"/disable-apache-tests.patch ) src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare + default + use vala && vala_setup + xdg_environment_reset # https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname sed -e '/hsts/d' -i tests/meson.build || die } @@ -74,6 +75,9 @@ src_configure() { multilib_src_configure() { local emesonargs=( + # Avoid auto-magic, built-in feature of meson + -Dauto_features=enabled + $(meson_feature gssapi) -Dkrb5_config="${CHOST}-krb5-config" $(meson_feature samba ntlm) @@ -82,12 +86,20 @@ multilib_src_configure() { -Dtls_check=false # disables check, we still rdep on glib-networking $(meson_native_use_feature introspection) $(meson_native_use_feature vala vapi) - $(meson_native_use_bool gtk-doc gtk_doc) - # TODO: Tests fail with network-sandbox or 32bit (upstream issue #236) for 2.99.9 + $(meson_native_use_feature gtk-doc docs) + -Ddoc_tests=false $(meson_use test tests) + -Dautobahn=disabled -Dinstalled_tests=false $(meson_feature sysprof) $(meson_feature test pkcs11_tests) ) meson_src_configure } + +multilib_src_install_all() { + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/libsoup-3.0 "${ED}"/usr/share/gtk-doc/html/ || die + fi +} diff --git a/net-libs/libsoup/metadata.xml b/net-libs/libsoup/metadata.xml index e0b51e4d0694..94fcf2a908b8 100644 --- a/net-libs/libsoup/metadata.xml +++ b/net-libs/libsoup/metadata.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="brotli">Enable brotli decompression support</flag> - <flag name="gssapi">Enable GSSAPI support</flag> - <flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single - Sign-On</flag> - <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag> - </use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="gssapi">Enable GSSAPI support</flag> + <flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single Sign-On</flag> + <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/libsoup</remote-id> + <remote-id type="cpe">cpe:/a:gnome:libsoup</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libsrsirc/libsrsirc-0.0.14-r1.ebuild b/net-libs/libsrsirc/libsrsirc-0.0.14-r2.ebuild index 09def5b449ae..f60c232b65ca 100644 --- a/net-libs/libsrsirc/libsrsirc-0.0.14-r1.ebuild +++ b/net-libs/libsrsirc/libsrsirc-0.0.14-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="A lightweight, cross-platform IRC library" +DESCRIPTION="Lightweight, cross-platform IRC library" HOMEPAGE="https://github.com/fstd/libsrsirc" SRC_URI="http://penenen.de/${P}.tar.gz" LICENSE="BSD" @@ -12,8 +12,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="static-libs ssl" -DEPEND=" - ssl? ( dev-libs/openssl:0= )" +DEPEND="ssl? ( dev-libs/openssl:0= )" RDEPEND="${DEPEND}" src_configure() { diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest index 4cdfe368ac83..8871ec939c3a 100644 --- a/net-libs/libsrtp/Manifest +++ b/net-libs/libsrtp/Manifest @@ -1,3 +1,2 @@ DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887 -DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c -DIST libsrtp-2.3.0.tar.gz 633819 BLAKE2B 9ea40e9689fabc29b7a2c637bd4e4a2c44eec79205a6e5c5e5abf1069dfec7ba28d868ba620462205d61fdb28d0ca3b8532c1f59db704edd508e01afb551d255 SHA512 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461 +DIST libsrtp-2.4.2.tar.gz 631393 BLAKE2B a062fb7a92294c66f1876c66bf05d9b11412a170c5f7221089680770ab85a62eabb68f781e487981b28602b1f4f7dbba07ebd44ed0248deaf6b9b56061227534 SHA512 6e4805e6d34b2050a6f68f629b0b42356b1d27f2cbaa6cc6166e56957609c3d9aa6b723dcc674e5c74180d122d27badd2f9496639ccb1e0c210b9e1f7949d0e2 diff --git a/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch index 5d17cb426e88..9ca172688b5b 100644 --- a/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch +++ b/net-libs/libsrtp/files/libsrtp-1.6.0-openssl-1.1.patch @@ -217,7 +217,7 @@ Backport of https://github.com/cisco/libsrtp/commit/0b45423678ddc46d702f3a51614f - if (pointer == NULL) { +/* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated + using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + { + /* allocate memory for auth and HMAC_CTX structures */ + uint8_t* pointer; @@ -263,7 +263,7 @@ Backport of https://github.com/cisco/libsrtp/commit/0b45423678ddc46d702f3a51614f hmac_ctx = (HMAC_CTX*)a->state; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L HMAC_CTX_cleanup(hmac_ctx); /* zeroize entire state*/ @@ -318,7 +318,7 @@ Backport of https://github.com/cisco/libsrtp/commit/0b45423678ddc46d702f3a51614f +/* OpenSSL 1.1.0 made EVP_MD_CTX an opaque structure, which must be allocated + using EVP_MD_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + +typedef EVP_MD_CTX sha1_ctx_t; + diff --git a/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch b/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch deleted file mode 100644 index 771ae0f51448..000000000000 --- a/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c -index c0dfece..ec2fe6d 100644 ---- a/crypto/math/datatypes.c -+++ b/crypto/math/datatypes.c -@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet) - - /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */ - --char bit_string[MAX_PRINT_STRING_LEN]; -+static char bit_string[MAX_PRINT_STRING_LEN]; - - uint8_t srtp_nibble_to_hex_char(uint8_t nibble) - { -diff --git a/test/util.c b/test/util.c -index eb203f4..04e149c 100644 ---- a/test/util.c -+++ b/test/util.c -@@ -47,7 +47,7 @@ - #include <string.h> - #include <stdint.h> - --char bit_string[MAX_PRINT_STRING_LEN]; -+static char bit_string[MAX_PRINT_STRING_LEN]; - - static inline int hex_char_to_nibble(uint8_t c) - { diff --git a/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch b/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch deleted file mode 100644 index 1075825945cb..000000000000 --- a/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -uNr libsrtp-2.2.0.ORIG/configure.ac libsrtp-2.2.0/configure.ac ---- libsrtp-2.2.0.ORIG/configure.ac 2018-06-18 13:28:52.385014993 +0100 -+++ libsrtp-2.2.0/configure.ac 2018-06-18 13:31:09.217020686 +0100 -@@ -273,6 +273,8 @@ - - dnl Checking for PCAP - -+AC_ARG_ENABLE([pcap], AS_HELP_STRING([--disable-pcap], [Build without `pcap' library (-lpcap)])) -+AS_IF([test "x$enable_pcap" != "xno"], [ - PCAP_LIB="" - AC_CHECK_LIB([pcap], [pcap_create], - [PCAP_LIB="-lpcap" -@@ -284,6 +286,7 @@ - AC_DEFINE([HAVE_PCAP], [1], [Define to 1 if you have the `winpcap' library (-lwpcap)]) - AC_SUBST([HAVE_PCAP], [1])]) - AC_SUBST([PCAP_LIB]) -+]) - - AC_MSG_CHECKING([whether to redirect logging to stdout]) - AC_ARG_ENABLE([log-stdout], diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch deleted file mode 100644 index 67d4ad86d516..000000000000 --- a/net-libs/libsrtp/files/libsrtp-2.3.0-gcc-10.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c -index 001584c..4fcb396 100644 ---- a/crypto/math/datatypes.c -+++ b/crypto/math/datatypes.c -@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet) - - /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */ - --char bit_string[MAX_PRINT_STRING_LEN]; -+static char bit_string[MAX_PRINT_STRING_LEN]; - - uint8_t srtp_nibble_to_hex_char(uint8_t nibble) - { -diff --git a/test/util.c b/test/util.c -index 2abc28e..c0f7614 100644 ---- a/test/util.c -+++ b/test/util.c -@@ -49,7 +49,7 @@ - #include <stdint.h> - - /* include space for null terminator */ --char bit_string[MAX_PRINT_STRING_LEN + 1]; -+static char bit_string[MAX_PRINT_STRING_LEN + 1]; - - static inline int hex_char_to_nibble(uint8_t c) - { diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch deleted file mode 100644 index 6f71839e69da..000000000000 --- a/net-libs/libsrtp/files/libsrtp-2.3.0-nss.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/crypto/cipher/aes_gcm_nss.c b/crypto/cipher/aes_gcm_nss.c -index 54547cd..ecbba64 100644 ---- a/crypto/cipher/aes_gcm_nss.c -+++ b/crypto/cipher/aes_gcm_nss.c -@@ -284,6 +284,7 @@ static srtp_err_status_t srtp_aes_gcm_nss_do_crypto(void *cv, - - c->params.pIv = c->iv; - c->params.ulIvLen = GCM_IV_LEN; -+ c->params.ulIvBits = 8 * GCM_IV_LEN; - c->params.pAAD = c->aad; - c->params.ulAADLen = c->aad_size; - diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch deleted file mode 100644 index 096b19e8f344..000000000000 --- a/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 55299517f39e2e1a34df05c27cbc9898071ac9db Mon Sep 17 00:00:00 2001 -From: Lennart Grahl <lennart.grahl@gmail.com> -Date: Mon, 18 May 2020 18:01:08 +0200 -Subject: [PATCH] Fix two-byte RTP header extension encryption - -Also ignores the application bits as required by RFC 8285, sec 4.3 -Fixes #490 ---- - srtp/srtp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/srtp/srtp.c b/srtp/srtp.c -index b45cee0f..176b01f0 100644 ---- a/srtp/srtp.c -+++ b/srtp/srtp.c -@@ -1423,7 +1423,7 @@ static srtp_err_status_t srtp_process_header_encryption( - xtn_hdr_data++; - } - } -- } else if ((ntohs(xtn_hdr->profile_specific) & 0x1fff) == 0x100) { -+ } else if ((ntohs(xtn_hdr->profile_specific) & 0xfff0) == 0x1000) { - /* RFC 5285, section 4.3. Two-Byte Header */ - while (xtn_hdr_data + 1 < xtn_hdr_end) { - uint8_t xid = *xtn_hdr_data; diff --git a/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch b/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch new file mode 100644 index 000000000000..571c3f3c5d44 --- /dev/null +++ b/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch @@ -0,0 +1,42 @@ +--- a/doc/Doxyfile.in ++++ b/doc/Doxyfile.in +@@ -771,13 +771,13 @@ WARN_LOGFILE = + # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING + # Note: If this tag is empty the current directory is searched. + +-INPUT = ../README.md \ +- ../include/srtp.h \ +- ../crypto/include/auth.h \ +- ../crypto/include/cipher.h \ +- ../crypto/include/crypto_types.h \ +- ../crypto/include/err.h \ +- crypto_kernel.txt ++INPUT = @TOP_SRCDIR@/README.md \ ++ @TOP_SRCDIR@/include/srtp.h \ ++ @TOP_SRCDIR@/crypto/include/auth.h \ ++ @TOP_SRCDIR@/crypto/include/cipher.h \ ++ @TOP_SRCDIR@/crypto/include/crypto_types.h \ ++ @TOP_SRCDIR@/crypto/include/err.h \ ++ @TOP_SRCDIR@/doc/crypto_kernel.txt + + # This tag can be used to specify the character encoding of the source files + # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +@@ -1104,7 +1104,7 @@ HTML_FOOTER = + # obsolete. + # This tag requires that the tag GENERATE_HTML is set to YES. + +-HTML_STYLESHEET = docs.css ++HTML_STYLESHEET = @TOP_SRCDIR@/doc/docs.css + + # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined + # cascading style sheets that are included after the standard style sheets +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -8,6 +8,7 @@ endif + + doc_config = configuration_data() + doc_config.set('LIBSRTPVERSIONNUMBER', meson.project_version()) ++doc_config.set('TOP_SRCDIR', meson.source_root()) + + doxyfile = configure_file(input: 'Doxyfile.in', + output: 'Doxyfile', diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild deleted file mode 100644 index f25da2660cd5..000000000000 --- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools multilib-minimal - -DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" -HOMEPAGE="https://github.com/cisco/libsrtp" -SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="2/1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos" -IUSE="aesicm console debug doc openssl static-libs syslog test" -RESTRICT="!test? ( test )" - -RDEPEND=" - openssl? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" - -DOCS=( CHANGES ) - -PATCHES=( - "${FILESDIR}/${P}-pcap-automagic-r0.patch" - "${FILESDIR}/${P}-gcc-10.patch" -) - -src_prepare() { - default - - # test/rtpw.c is using /usr/share/dict/words assuming it exists - # using test/rtpw.c guaratees the file exists in any case - sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c || die - - eautoreconf - - # sadly, tests are too broken to even consider using work-arounds - multilib_copy_sources -} - -multilib_src_configure() { - # stdout: default error output for messages in debug - # pcap: seems to be test-only - # openssl-kdf: OpenSSL 1.1.0+ - econf \ - --enable-log-stdout \ - --disable-pcap \ - --disable-openssl-kdf \ - $(use_enable debug debug-logging) \ - $(use_enable openssl) -} - -multilib_src_compile() { - use static-libs && emake ${PN}2.a - emake shared_library - use test && emake test -} - -multilib_src_test() { - LD_LIBRARY_PATH="${BUILD_DIR}" emake -j1 runtest - - # Makefile.in has '$(testapp): libsrtp2.a' - if use !static-libs; then - rm libsrtp2.a || die - fi -} - -multilib_src_install_all() { - # libsrtp.pdf can be generated with doxygen, but it seems to be broken. - use doc && DOCS+=( doc/*.txt ) - einstalldocs -} diff --git a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild deleted file mode 100644 index 47b538b3851e..000000000000 --- a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" -HOMEPAGE="https://github.com/cisco/libsrtp" -SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="2/1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv -sparc x86 ~ppc-macos ~x64-macos" -IUSE="debug doc nss openssl static-libs test" -RESTRICT="!test? ( test )" - -REQUIRED_USE="?? ( nss openssl )" - -RDEPEND=" - openssl? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) - nss? ( >=dev-libs/nss-3.52[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -BDEPEND=" - doc? ( app-doc/doxygen ) - virtual/pkgconfig -" - -DOCS=( CHANGES ) - -PATCHES=( - "${FILESDIR}/${P}-gcc-10.patch" - "${FILESDIR}/${P}-nss.patch" - "${FILESDIR}/${P}-rtp-header.patch" -) - -src_prepare() { - default - - # autoconf-2.7x fix - touch ar-lib || die - - eautoreconf - - if use doc; then - echo "${PV}" > "${S}/VERSION" - fi - - # sadly, tests are too broken to even consider using work-arounds - multilib_copy_sources -} - -multilib_src_configure() { - # stdout: default error output for messages in debug - # pcap: seems to be test-only - # openssl-kdf: OpenSSL 1.1.0+ - econf \ - --enable-log-stdout \ - --disable-pcap \ - --disable-openssl-kdf \ - $(use_enable debug debug-logging) \ - $(use_enable openssl) \ - $(use_enable nss) -} - -multilib_src_compile() { - use static-libs && emake ${PN}2.a - emake shared_library - use test && emake test - if multilib_is_native_abi && use doc; then - emake libsrtp2doc - fi -} - -multilib_src_test() { - LD_LIBRARY_PATH="${BUILD_DIR}" emake -j1 runtest - - # Makefile.in has '$(testapp): libsrtp2.a' - if ! use static-libs; then - rm libsrtp2.a || die - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc; then - dodoc -r doc/html - fi -} - -multilib_src_install_all() { - einstalldocs -} diff --git a/net-libs/libsrtp/libsrtp-2.4.2.ebuild b/net-libs/libsrtp/libsrtp-2.4.2.ebuild new file mode 100644 index 000000000000..96e02837fcf2 --- /dev/null +++ b/net-libs/libsrtp/libsrtp-2.4.2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib + +DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" +HOMEPAGE="https://github.com/cisco/libsrtp" +SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="2/1" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv -sparc x86 ~ppc-macos ~x64-macos" +IUSE="debug doc nss openssl static-libs test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="?? ( nss openssl )" + +RDEPEND=" + openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + nss? ( >=dev-libs/nss-3.52[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +BDEPEND=" + doc? ( app-text/doxygen ) + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}"/libsrtp-2.4.2-doc.patch ) + +multilib_src_configure() { + local crypto_lib="none" + use openssl && crypto_lib="openssl" + use nss && crypto_lib="nss" + + # stdout: default error output for messages in debug + # openssl-kdf: OpenSSL 1.1.0+ + local emesonargs=( + -Dcrypto-library=${crypto_lib} + -Dcrypto-library-kdf=disabled + -Dfuzzer=disabled + -Dlog-stdout=true + -Dpcap-tests=disabled + -Ddefault_library=$(usex static-libs both shared) + + $(meson_feature test tests) + $(meson_native_use_feature doc) + $(meson_use debug debug-logging) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile + if multilib_is_native_abi && use doc; then + meson_src_compile doc + fi +} + +multilib_src_install() { + if multilib_is_native_abi && use doc; then + dodoc -r html + fi + meson_src_install +} + +multilib_src_install_all() { + local DOCS=( CHANGES ) + einstalldocs +} diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index 5e3e1048991f..0524c3caf805 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1 +1 @@ -DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1 +DIST libssh-0.10.6.tar.xz 561036 BLAKE2B 6ae1c611b685fa8ec5e5fb159f93493edf4d8ae8536300cd9a357daadc28ca2fbd8a64a22157744bc97e2e672b0b84b58e1167d7369fe88306b3581098af9f57 SHA512 40c62d63c44e882999b71552c237d73fc7364313bd00b15a211a34aeff1b73693da441d2c8d4e40108d00fb7480ec7c5b6d472f9c0784b2359a179632ab0d6c1 diff --git a/net-libs/libssh/files/libssh-0.8.0-tests.patch b/net-libs/libssh/files/libssh-0.8.0-tests.patch deleted file mode 100644 index 7ce84f89983b..000000000000 --- a/net-libs/libssh/files/libssh-0.8.0-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libssh-0.8.0/tests/unittests/torture_misc.c -+++ libssh-0.8.0/tests/unittests/torture_misc.c -@@ -361,7 +361,7 @@ - #ifdef _WIN32 - cmocka_unit_test(torture_path_expand_tilde_win), - #else -- cmocka_unit_test(torture_path_expand_tilde_unix), -+ //cmocka_unit_test(torture_path_expand_tilde_unix), - #endif - cmocka_unit_test_setup_teardown(torture_path_expand_escape, setup, teardown), - cmocka_unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown), diff --git a/net-libs/libssh/libssh-0.9.6.ebuild b/net-libs/libssh/libssh-0.10.6.ebuild index 627887023589..b3297f65056b 100644 --- a/net-libs/libssh/libssh-0.9.6.ebuild +++ b/net-libs/libssh/libssh-0.10.6.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib DESCRIPTION="Access a working SSH implementation by means of a library" HOMEPAGE="https://www.libssh.org/" -if [[ "${PV}" == *9999 ]] ; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" else SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2.1" @@ -23,10 +22,8 @@ IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs tes # Maintainer: check IUSE-defaults at DefineOptions.cmake REQUIRED_USE="?? ( gcrypt mbedtls )" +RESTRICT="!test? ( test )" -BDEPEND=" - doc? ( app-doc/doxygen[dot] ) -" RDEPEND=" !gcrypt? ( !mbedtls? ( @@ -39,14 +36,14 @@ RDEPEND=" zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} - test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) + test? ( + >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] + elibc_musl? ( sys-libs/argp-standalone ) + ) " +BDEPEND="doc? ( app-text/doxygen[dot] )" -DOCS=( AUTHORS README ChangeLog ) - -PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) - -RESTRICT+=" !test? ( test )" +DOCS=( AUTHORS CHANGELOG README ) src_prepare() { cmake_src_prepare @@ -54,18 +51,37 @@ src_prepare() { # just install the examples, do not compile them cmake_comment_add_subdirectory examples - # keyfile torture test is currently broken - sed -e "/torture_keyfiles/d" \ - -i tests/unittests/CMakeLists.txt || die - - # disable tests that take too long (bug #677006) - if use sparc; then - sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ - -i tests/unittests/CMakeLists.txt || die - fi - sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ -i ConfigureChecks.cmake || die + + if use test; then + local skip_tests=( + # keyfile torture test is currently broken + -e "/torture_keyfiles/d" + + # Tries to expand ~ which fails w/ portage homedir + # (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir) + -e "/torture_misc/d" + -e "/torture_config/d" + ) + + # Disable tests that take too long (bug #677006) + if use sparc; then + skip_tests+=( + -e "/torture_threads_pki_rsa/d" + -e "/torture_pki_dsa/d" + ) + fi + + if (( ${#skip_tests[@]} )) ; then + sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die + fi + + if use elibc_musl; then + sed -e "/SOLARIS/d" \ + -i tests/CMakeLists.txt || die + fi + fi } multilib_src_configure() { @@ -73,17 +89,18 @@ multilib_src_configure() { -DWITH_NACL=OFF -DWITH_STACK_PROTECTOR=OFF -DWITH_STACK_PROTECTOR_STRONG=OFF - -DWITH_DEBUG_CALLTRACE="$(usex debug)" - -DWITH_DEBUG_CRYPTO="$(usex debug)" - -DWITH_GCRYPT="$(usex gcrypt)" - -DWITH_GSSAPI="$(usex gssapi)" - -DWITH_MBEDTLS="$(usex mbedtls)" - -DWITH_PCAP="$(usex pcap)" - -DWITH_SERVER="$(usex server)" - -DWITH_SFTP="$(usex sftp)" - -DBUILD_STATIC_LIB="$(usex static-libs)" - -DUNIT_TESTING="$(usex test)" - -DWITH_ZLIB="$(usex zlib)" + -DWITH_DEBUG_CALLTRACE=$(usex debug) + -DWITH_DEBUG_CRYPTO=$(usex debug) + -DWITH_GCRYPT=$(usex gcrypt) + -DWITH_GSSAPI=$(usex gssapi) + -DWITH_MBEDTLS=$(usex mbedtls) + -DWITH_PCAP=$(usex pcap) + -DWITH_SERVER=$(usex server) + -DWITH_SFTP=$(usex sftp) + -DBUILD_STATIC_LIB=$(usex static-libs) + # TODO: try enabling {CLIENT,SERVER}_TESTING + -DUNIT_TESTING=$(usex test) + -DWITH_ZLIB=$(usex zlib) ) multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) @@ -98,7 +115,7 @@ multilib_src_compile() { multilib_src_install() { cmake_src_install - multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) use static-libs && dolib.a src/libssh.a diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index ba3c105ee10e..b15c073dad2e 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib DESCRIPTION="Access a working SSH implementation by means of a library" HOMEPAGE="https://www.libssh.org/" -if [[ "${PV}" == *9999 ]] ; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" else SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2.1" @@ -23,10 +22,8 @@ IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs tes # Maintainer: check IUSE-defaults at DefineOptions.cmake REQUIRED_USE="?? ( gcrypt mbedtls )" +RESTRICT="!test? ( test )" -BDEPEND=" - doc? ( app-doc/doxygen[dot] ) -" RDEPEND=" !gcrypt? ( !mbedtls? ( @@ -39,14 +36,14 @@ RDEPEND=" zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} - test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) + test? ( + >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] + elibc_musl? ( sys-libs/argp-standalone ) + ) " +BDEPEND="doc? ( app-text/doxygen[dot] )" -DOCS=( AUTHORS README ChangeLog ) - -PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) - -RESTRICT+=" !test? ( test )" +DOCS=( AUTHORS CHANGELOG README ) src_prepare() { cmake_src_prepare @@ -54,18 +51,37 @@ src_prepare() { # just install the examples, do not compile them cmake_comment_add_subdirectory examples - # keyfile torture test is currently broken - sed -e "/torture_keyfiles/d" \ - -i tests/unittests/CMakeLists.txt || die - - # disable tests that take too long (bug #677006) - if use sparc; then - sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ - -i tests/unittests/CMakeLists.txt || die - fi - sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ -i ConfigureChecks.cmake || die + + if use test; then + local skip_tests=( + # keyfile torture test is currently broken + -e "/torture_keyfiles/d" + + # Tries to expand ~ which fails w/ portage homedir + # (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir) + -e "/torture_misc/d" + -e "/torture_config/d" + ) + + # Disable tests that take too long (bug #677006) + if use sparc; then + skip_tests+=( + -e "/torture_threads_pki_rsa/d" + -e "/torture_pki_dsa/d" + ) + fi + + if (( ${#skip_tests[@]} )) ; then + sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die + fi + + if use elibc_musl; then + sed -e "/SOLARIS/d" \ + -i tests/CMakeLists.txt || die + fi + fi } multilib_src_configure() { @@ -73,17 +89,18 @@ multilib_src_configure() { -DWITH_NACL=OFF -DWITH_STACK_PROTECTOR=OFF -DWITH_STACK_PROTECTOR_STRONG=OFF - -DWITH_DEBUG_CALLTRACE="$(usex debug)" - -DWITH_DEBUG_CRYPTO="$(usex debug)" - -DWITH_GCRYPT="$(usex gcrypt)" - -DWITH_GSSAPI="$(usex gssapi)" - -DWITH_MBEDTLS="$(usex mbedtls)" - -DWITH_PCAP="$(usex pcap)" - -DWITH_SERVER="$(usex server)" - -DWITH_SFTP="$(usex sftp)" - -DBUILD_STATIC_LIB="$(usex static-libs)" - -DUNIT_TESTING="$(usex test)" - -DWITH_ZLIB="$(usex zlib)" + -DWITH_DEBUG_CALLTRACE=$(usex debug) + -DWITH_DEBUG_CRYPTO=$(usex debug) + -DWITH_GCRYPT=$(usex gcrypt) + -DWITH_GSSAPI=$(usex gssapi) + -DWITH_MBEDTLS=$(usex mbedtls) + -DWITH_PCAP=$(usex pcap) + -DWITH_SERVER=$(usex server) + -DWITH_SFTP=$(usex sftp) + -DBUILD_STATIC_LIB=$(usex static-libs) + # TODO: try enabling {CLIENT,SERVER}_TESTING + -DUNIT_TESTING=$(usex test) + -DWITH_ZLIB=$(usex zlib) ) multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) @@ -98,7 +115,7 @@ multilib_src_compile() { multilib_src_install() { cmake_src_install - multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) use static-libs && dolib.a src/libssh.a diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml index 2f3dde22b5cf..ef1bf6cb8f62 100644 --- a/net-libs/libssh/metadata.xml +++ b/net-libs/libssh/metadata.xml @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> -</maintainer> -<use> - <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as TLS provider</flag> - <flag name="gssapi">Enable gssapi support</flag> - <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag> - <flag name="pcap">Build with PCAP output support</flag> - <flag name="server">Build with SSH server support</flag> - <flag name="sftp">Build with SFTP support</flag> -</use> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <use> + <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as TLS provider</flag> + <flag name="gssapi">Enable gssapi support</flag> + <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag> + <flag name="pcap">Build with PCAP output support</flag> + <flag name="server">Build with SSH server support</flag> + <flag name="sftp">Build with SFTP support</flag> + </use> + <upstream> + <remote-id type="gitlab">libssh/libssh-mirror</remote-id> + <remote-id type="cpe">cpe:/a:libssh:libssh</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest index 95b30d057e33..d161b27f79f4 100644 --- a/net-libs/libssh2/Manifest +++ b/net-libs/libssh2/Manifest @@ -1 +1 @@ -DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415 SHA512 e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30 +DIST libssh2-1.11.0.tar.xz 686796 BLAKE2B 36903798c72f7261d9e997254169c10a4e69166017445276de8b0066fff15cd4dae4119a8d6cbbab8859d765b2d7f34f2911bbaf83c8d6ac5d1feead6b5de64e SHA512 6d50c71b778ca0f769fcc9d2cc257ab669cd0b6c35e8b0e047b6b38aea10638974cc591ba27c25bb7dd523020b4a8a62e2c1ae368287d9dc254d5e24d4a7cee7 diff --git a/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch b/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch new file mode 100644 index 000000000000..8d8e93cda47e --- /dev/null +++ b/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch @@ -0,0 +1,10 @@ +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -63,7 +63,6 @@ if(SH_EXECUTABLE) + mark_as_advanced(SSHD_EXECUTABLE) + endif() + +- add_test(NAME mansyntax COMMAND ${SH_EXECUTABLE} -c "${CMAKE_CURRENT_SOURCE_DIR}/mansyntax.sh") + endif() + + add_library(runner STATIC ${librunner_la_SOURCES}) diff --git a/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch b/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch new file mode 100644 index 000000000000..ade3cdee8a49 --- /dev/null +++ b/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch @@ -0,0 +1,95 @@ +https://bugs.gentoo.org/911279 +Upstream: https://github.com/libssh2/libssh2/issues/1053 +Commit: https://github.com/libssh2/libssh2/commit/1153ebdeba563ac657b525edd6bf6da68b1fe5e2 +From: Viktor Szakats <commit@vsz.me> +Date: Tue, 30 May 2023 17:28:03 +0000 +Subject: [PATCH] mbedtls: use more `size_t` to sync up with `crypto.h` + +Ref: 5a96f494ee0b00282afb2db2e091246fc5e1774a #846 #879 + +Fixes #1053 +Closes #1054 +--- a/src/mbedtls.c ++++ b/src/mbedtls.c +@@ -186,7 +186,7 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx) + int + _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx, + mbedtls_md_type_t mdtype, +- const unsigned char *key, unsigned long keylen) ++ const unsigned char *key, size_t keylen) + { + const mbedtls_md_info_t *md_info; + int ret, hmac; +@@ -221,7 +221,7 @@ _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, unsigned char *hash) + } + + int +-_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen, ++_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen, + mbedtls_md_type_t mdtype, unsigned char *hash) + { + const mbedtls_md_info_t *md_info; +@@ -497,8 +497,9 @@ int + _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, + size_t hash_len, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, unsigned long m_len) ++ size_t sig_len, ++ const unsigned char *m, ++ size_t m_len) + { + int ret; + int md_type; +@@ -548,8 +549,9 @@ _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, + int + _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx * rsactx, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, unsigned long m_len) ++ size_t sig_len, ++ const unsigned char *m, ++ size_t m_len) + { + return _libssh2_mbedtls_rsa_sha2_verify(rsactx, SHA_DIGEST_LENGTH, + sig, sig_len, m, m_len); +--- a/src/mbedtls.h ++++ b/src/mbedtls.h +@@ -478,12 +478,12 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx); + int + _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx, + mbedtls_md_type_t mdtype, +- const unsigned char *key, unsigned long keylen); ++ const unsigned char *key, size_t keylen); + + int + _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, unsigned char *hash); + int +-_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen, ++_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen, + mbedtls_md_type_t mdtype, unsigned char *hash); + + _libssh2_bn * +@@ -526,9 +526,8 @@ _libssh2_mbedtls_rsa_new_private_frommemory(libssh2_rsa_ctx **rsa, + int + _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx *rsa, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, +- unsigned long m_len); ++ size_t sig_len, ++ const unsigned char *m, size_t m_len); + int + _libssh2_mbedtls_rsa_sha1_sign(LIBSSH2_SESSION *session, + libssh2_rsa_ctx *rsa, +@@ -540,8 +539,8 @@ int + _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, + size_t hash_len, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, unsigned long m_len); ++ size_t sig_len, ++ const unsigned char *m, size_t m_len); + int + _libssh2_mbedtls_rsa_sha2_sign(LIBSSH2_SESSION *session, + libssh2_rsa_ctx *rsa, diff --git a/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch b/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch deleted file mode 100644 index 3a33bf744167..000000000000 --- a/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/tests/mansyntax.sh -+++ b/tests/mansyntax.sh -@@ -1,37 +1,2 @@ - #!/bin/sh --set -e -- --# Written by Mikhail Gusarov --# --# Run syntax checks for all manpages in the documentation tree. --# -- --srcdir=${srcdir:-$PWD} --dstdir=${builddir:-$PWD} --mandir=${srcdir}/../docs -- --# --# Only test if suitable man is available --# --if ! man --help | grep -q warnings; then -- echo "man version not suitable, skipping tests" -- exit 0 --fi -- --ec=0 -- --trap "rm -f $dstdir/man3" EXIT -- --ln -sf "$mandir" "$dstdir/man3" -- --for manpage in $mandir/libssh2_*.*; do -- echo "$manpage" -- warnings=$(LANG=en_US.UTF-8 MANWIDTH=80 man -M "$dstdir" --warnings \ -- -E UTF-8 -l "$manpage" 2>&1 >/dev/null) -- if [ -n "$warnings" ]; then -- echo "$warnings" -- ec=1 -- fi --done -- --exit $ec -+: diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild index ff53c9234667..eb37955cf515 100644 --- a/net-libs/libssh2/libssh2-1.10.0.ebuild +++ b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -CMAKE_ECLASS=cmake +EAPI=8 + inherit cmake-multilib DESCRIPTION="Library implementing the SSH2 protocol" HOMEPAGE="https://www.libssh2.org" -SRC_URI="https://www.libssh2.org/download/${P}.tar.gz" +SRC_URI="https://www.libssh2.org/download/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="gcrypt mbedtls zlib" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="gcrypt mbedtls test zlib" REQUIRED_USE="?? ( gcrypt mbedtls )" -# Tests try to set containers up using docker (and fail for some reason). -RESTRICT="test" +RESTRICT="!test? ( test )" RDEPEND=" gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) @@ -31,6 +30,11 @@ DEPEND=" ${RDEPEND} " +PATCHES=( + "${FILESDIR}"/${PN}-1.11.0-mansyntax_sh.patch + "${FILESDIR}"/${PN}-1.11.0-size_t.patch +) + multilib_src_configure() { local crypto_backend=OpenSSL if use gcrypt; then @@ -41,13 +45,22 @@ multilib_src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=ON + -DBUILD_TESTING=$(usex test) -DCRYPTO_BACKEND=${crypto_backend} -DENABLE_ZLIB_COMPRESSION=$(usex zlib) ) + + if use test ; then + # Pass separately to avoid unused var warnings w/ USE=-test + mycmakeargs+=( + -DRUN_SSHD_TESTS=OFF + -DRUN_DOCKER_TESTS=OFF + ) + fi + cmake_src_configure } multilib_src_install_all() { einstalldocs - find "${ED}" -name '*.la' -delete || die } diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild index 275a78e9da52..70a9e03a7d0b 100644 --- a/net-libs/libssh2/libssh2-9999.ebuild +++ b/net-libs/libssh2/libssh2-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -CMAKE_ECLASS=cmake -inherit git-r3 cmake-multilib +EAPI=8 + +inherit cmake-multilib git-r3 DESCRIPTION="Library implementing the SSH2 protocol" HOMEPAGE="https://www.libssh2.org" @@ -12,9 +12,9 @@ EGIT_REPO_URI="https://github.com/libssh2/libssh2" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="gcrypt mbedtls zlib" +IUSE="gcrypt mbedtls test zlib" REQUIRED_USE="?? ( gcrypt mbedtls )" -RESTRICT="test" +RESTRICT="!test? ( test )" RDEPEND=" gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) @@ -26,12 +26,10 @@ RDEPEND=" ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch + "${FILESDIR}"/${PN}-1.11.0-mansyntax_sh.patch ) multilib_src_configure() { @@ -44,13 +42,24 @@ multilib_src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=ON + -DBUILD_TESTING=$(usex test) -DCRYPTO_BACKEND=${crypto_backend} -DENABLE_ZLIB_COMPRESSION=$(usex zlib) + -DRUN_SSHD_TESTS=OFF + -DRUN_DOCKER_TESTS=OFF ) + + if use test ; then + # Pass separately to avoid unused var warnings w/ USE=-test + mycmakeargs+=( + -DRUN_SSHD_TESTS=OFF + -DRUN_DOCKER_TESTS=OFF + ) + fi + cmake_src_configure } multilib_src_install_all() { einstalldocs - find "${ED}" -name '*.la' -delete || die } diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml index f072d7197066..72168fb36454 100644 --- a/net-libs/libssh2/metadata.xml +++ b/net-libs/libssh2/metadata.xml @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -</maintainer> -<maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> -</maintainer> -<use> - <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag> - <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> instead of <pkg>dev-libs/openssl</pkg></flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> + <use> + <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag> + <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> instead of <pkg>dev-libs/openssl</pkg></flag> + </use> + <upstream> + <remote-id type="github">libssh2/libssh2</remote-id> + <remote-id type="cpe">cpe:/a:libssh2:libssh2</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/libtelnet/files/libtelnet-9999-doc.patch b/net-libs/libtelnet/files/libtelnet-9999-doc.patch deleted file mode 100644 index c88f6cc3977b..000000000000 --- a/net-libs/libtelnet/files/libtelnet-9999-doc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4691956375fae84dcfaeb96c1a204a113d8e5a99 Mon Sep 17 00:00:00 2001 -From: Jakov Smolic <jakov.smolic@sartura.hr> -Date: Tue, 18 Aug 2020 13:22:52 +0200 -Subject: [PATCH] doc: install manpages in standard directory - -Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr> ---- - doc/man/man1/CMakeLists.txt | 4 ++-- - doc/man/man3/CMakeLists.txt | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/doc/man/man1/CMakeLists.txt b/doc/man/man1/CMakeLists.txt -index 053dc42..0da441c 100644 ---- a/doc/man/man1/CMakeLists.txt -+++ b/doc/man/man1/CMakeLists.txt -@@ -1,4 +1,4 @@ - install( - FILES telnet-chatd.1 telnet-client.1 telnet-proxy.1 -- DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1 --) -\ No newline at end of file -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 -+) -diff --git a/doc/man/man3/CMakeLists.txt b/doc/man/man3/CMakeLists.txt -index b126fea..af40a92 100644 ---- a/doc/man/man3/CMakeLists.txt -+++ b/doc/man/man3/CMakeLists.txt -@@ -14,5 +14,5 @@ install( - ${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_zmp_t.3 - ${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_mssp_t.3 - ${CMAKE_CURRENT_BINARY_DIR}/telnet_telopt_t.3 -- DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man3 --) -\ No newline at end of file -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man3 -+) --- -2.26.2 - diff --git a/net-libs/libtelnet/libtelnet-0.23-r1.ebuild b/net-libs/libtelnet/libtelnet-0.23-r1.ebuild deleted file mode 100644 index bf00b8db2d1e..000000000000 --- a/net-libs/libtelnet/libtelnet-0.23-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/seanmiddleditch/libtelnet.git" - inherit git-r3 cmake -else - inherit autotools - SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library" -HOMEPAGE="https://github.com/seanmiddleditch/libtelnet" - -LICENSE="public-domain" -SLOT="0" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" -BDEPEND=" - app-doc/doxygen - virtual/pkgconfig -" - -src_prepare() { - default - if [[ ${PV} = *9999 ]]; then - eapply "${FILESDIR}"/${P}-doc.patch - cmake_src_prepare - else - eautoreconf - fi -} diff --git a/net-libs/libtelnet/libtelnet-0.23-r2.ebuild b/net-libs/libtelnet/libtelnet-0.23-r2.ebuild new file mode 100644 index 000000000000..6ecf8c0bd972 --- /dev/null +++ b/net-libs/libtelnet/libtelnet-0.23-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library" +HOMEPAGE="https://github.com/seanmiddleditch/libtelnet" +SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/doxygen + virtual/pkgconfig +" + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild deleted file mode 100644 index bf00b8db2d1e..000000000000 --- a/net-libs/libtelnet/libtelnet-9999.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/seanmiddleditch/libtelnet.git" - inherit git-r3 cmake -else - inherit autotools - SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library" -HOMEPAGE="https://github.com/seanmiddleditch/libtelnet" - -LICENSE="public-domain" -SLOT="0" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" -BDEPEND=" - app-doc/doxygen - virtual/pkgconfig -" - -src_prepare() { - default - if [[ ${PV} = *9999 ]]; then - eapply "${FILESDIR}"/${P}-doc.patch - cmake_src_prepare - else - eautoreconf - fi -} diff --git a/net-libs/libtelnet/metadata.xml b/net-libs/libtelnet/metadata.xml index 4ad42fec77ea..d618b4c14a8e 100644 --- a/net-libs/libtelnet/metadata.xml +++ b/net-libs/libtelnet/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>nativemad@gentoo.org</email> - <name>Andreas Schuerch</name> - </maintainer> - <maintainer type="person"> <email>jsmolic@gentoo.org</email> <name>Jakov Smolić</name> </maintainer> diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest index 7f745c7d4b75..959e80b1c14f 100644 --- a/net-libs/libtirpc/Manifest +++ b/net-libs/libtirpc/Manifest @@ -1,2 +1,2 @@ -DIST libtirpc-1.3.2.tar.bz2 513151 BLAKE2B 375b7bb046244f4666522c4f148428349fe1867b095dc5e268d037ba26982f88df70b0ad21fbe2b99150f644806a46651b524c3b9f7fe2499469806ea50b0331 SHA512 8664d5c4f842ee5acf83b9c1cadb7871f17b8157a7c4500e2236dcfb3a25768cab39f7c5123758dcd7381e30eb028ddfa26a28f458283f2dcea3426c9878c255 +DIST libtirpc-1.3.4.tar.bz2 563292 BLAKE2B 33371e83e9f54e9d6d434b75d3a95bedefce63050846483471e302b1fbb3b63a18db90b652050c43e1c6e42b03e34bafb2fb6ae89787f05af0cf747319825424 SHA512 004e61b5853717324790c46cda5ff227d525909f189194ae72a1ec8f476ca35d7f4c1f03c0fbc690c1696d60a212675b09246dbe627fdbf1a9a47f5664e82b00 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba diff --git a/net-libs/libtirpc/libtirpc-1.3.2.ebuild b/net-libs/libtirpc/libtirpc-1.3.4-r1.ebuild index ec87a4616753..b0434d769aba 100644 --- a/net-libs/libtirpc/libtirpc-1.3.2.ebuild +++ b/net-libs/libtirpc/libtirpc-1.3.4-r1.ebuild @@ -1,38 +1,47 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit multilib-minimal usr-ldscript +inherit flag-o-matic libtool multilib-minimal usr-ldscript DESCRIPTION="Transport Independent RPC library (SunRPC replacement)" -HOMEPAGE="https://sourceforge.net/projects/libtirpc/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 - mirror://gentoo/${PN}-glibc-nfs.tar.xz" +HOMEPAGE="https://sourceforge.net/projects/libtirpc/ https://git.linux-nfs.org/?p=steved/libtirpc.git" +SRC_URI=" + https://downloads.sourceforge.net/${PN}/${P}.tar.bz2 + mirror://gentoo/${PN}-glibc-nfs.tar.xz +" -LICENSE="GPL-2" +LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+" SLOT="0/3" # subslot matches SONAME major -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="ipv6 kerberos static-libs" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="kerberos static-libs" RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - elibc_musl? ( sys-libs/queue-standalone )" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" BDEPEND=" app-arch/xz-utils - virtual/pkgconfig" + virtual/pkgconfig +" src_prepare() { - cp -r "${WORKDIR}"/tirpc "${S}"/ || die + cp -ra "${WORKDIR}"/tirpc "${S}"/ || die + default + elibtoolize } multilib_src_configure() { + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + local myeconfargs=( - $(use_enable ipv6) $(use_enable kerberos gssapi) $(use_enable static-libs static) ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } diff --git a/net-libs/libtirpc/libtirpc-1.3.4-r2.ebuild b/net-libs/libtirpc/libtirpc-1.3.4-r2.ebuild new file mode 100644 index 000000000000..2ed0383779bc --- /dev/null +++ b/net-libs/libtirpc/libtirpc-1.3.4-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic libtool multilib-minimal + +DESCRIPTION="Transport Independent RPC library (SunRPC replacement)" +HOMEPAGE="https://sourceforge.net/projects/libtirpc/ https://git.linux-nfs.org/?p=steved/libtirpc.git" +SRC_URI=" + https://downloads.sourceforge.net/${PN}/${P}.tar.bz2 + mirror://gentoo/${PN}-glibc-nfs.tar.xz +" + +LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+" +SLOT="0/3" # subslot matches SONAME major +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="kerberos static-libs" + +RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig +" + +src_prepare() { + cp -ra "${WORKDIR}"/tirpc "${S}"/ || die + + default + elibtoolize +} + +multilib_src_configure() { + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + local myeconfargs=( + $(use_enable kerberos gssapi) + $(use_enable static-libs static) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + + insinto /etc + doins doc/netconfig + + insinto /usr/include/tirpc + doins -r "${WORKDIR}"/tirpc/* + + # makes sure that the linking order for nfs-utils is proper, as + # libtool would inject a libgssglue dependency in the list. + if ! use static-libs ; then + find "${ED}" -name "*.la" -delete || die + fi +} diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest index 5a73b3576281..d3e85d139068 100644 --- a/net-libs/libtorrent-rasterbar/Manifest +++ b/net-libs/libtorrent-rasterbar/Manifest @@ -1,8 +1,5 @@ -DIST libtorrent-1.2.10.tar.gz 3586008 BLAKE2B 71971124930462feb5f5083fed38ccadcfd1a2aed0d000a06cd7e0898b40a1451722cd79fdf0b1da3477047b26c7f7e3c1f74086a141770a7d143c916e96b6bb SHA512 e6de939fb6527783695e0b6623ddbe27f85842a36c0899b93ea0284cb3c6f3d14b8c39e29316adb3bf9acac7804f38385cc06854a32df28e7f4f6839af9f382d -DIST libtorrent-1.2.11.tar.gz 3591610 BLAKE2B fab5d780dc5e1a855b60326cefdca6bcfb7459d4d37429e1c475434ca6ca2f465ffb6188ff519f49f2612941fe4806152511400a1c6fe121ade3ed35c6f40a79 SHA512 d502286f67bf462f14169daafe12b94ca723598530c85360c3a4b3c73535202b63632036248fdecc942cb559e66e6a5cb5afa830dc78bbff72a6c9a330710b62 -DIST libtorrent-1.2.12.tar.gz 3604064 BLAKE2B e0eb00aba90e3d5e3ba1bf3984e2eb606583007137288ccf93961185744ccc2a69922063a9004a2ebe627d7657c582eaee9f7ad2971de0dc41351bd59ed23953 SHA512 78be4c12e12f593154eda0960aaf9583fe27310e0223dbb21220400c5339744c9b2b11afa880fea30f77b4c0d07345937ff8a20d58d2d4ed7dcda84601380e20 -DIST libtorrent-1.2.14.tar.gz 3614077 BLAKE2B 423cd0c467510e3b4d33485ea108912a90ef0d66746e6f912eeb07930e7091d1ce8e28953a48dab3bb03c6232a9e958be423d4563bd63c083ec1423c4753b3df SHA512 9ba7d8a271ecc7330ae9c794f3966a6d1677b9d2a02a24df8b6e63daa4d5c0a7ef88607a73b417247b4afc5195e46cd0ca75859358f9e50915af56b3ed19f322 -DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8 -DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc -DIST libtorrent-rasterbar-2.0.4-ssl-tests-certs.patch.bz2 26530 BLAKE2B 0958f11be84860cfb0e9224901a6052d9acb80edbd9f9e6eeb2e621e30e75fac4c4db64c71573b7c7f91761e74b9c5781ef8d1a202aef06cd92e3edb15d9f810 SHA512 f3afc4e0857838a44fa3671d657b5f669194c504d07d8f72ca5ddc060786127e3d6ad4ae9efa39e9f02fbe396f4785a1755dd1fd9607c1cef31aa60574b3511e -DIST libtorrent-rasterbar-2.0.4.tar.gz 4311319 BLAKE2B fee8255d46d5ca019cd487b57fc6003744c208ea5e78873b925f53881667c55c506d302fc7ae6cd5b5d5e776cfe059b714db94d16dd28cfc7939ec6f4fa4e5fa SHA512 66ce3c3369b1d2a83654727c23022d38b070b8bc3ad83b1001e2cfad945acbaa4d61990094bc758886967cd305ca2213b60b1b0523b5106c42d4701d8cff8db1 +DIST libtorrent-rasterbar-1.2.18.tar.gz 4178407 BLAKE2B ccf8d891e4c34d101a8d822149d14b46cebf57dd893c00e2481e55c0cb35f6931b02e4b6f8877140316bb3bf1840a54eb04943aa1fd190d29708ae64a5c93604 SHA512 4ac7ad6357a612bdc537d4dbce40935a43c32295773870e490d1acffab9841b2bb3052e476a91f702b7b5eb2ab3e6282792f53593cdcb06ddbd6f1d5a3097ee7 +DIST libtorrent-rasterbar-1.2.19.tar.gz 4244826 BLAKE2B 9983cc59d0a1ebfc92b9c1cdc992bd27cb2ae2cb39a71d9dac3ae20e66474b0ef1ad1b79bc8a1e4123a42215d148d8810c60dbf09a61ab786a89738392af492c SHA512 b427c03efc9601f57bcd0473064191f77fb73a25abcb006e332c7b4b9140158a2f866418363fc13f594d6bd836d1c8b3902e2bef60fc5579f2d0d0c267a18ecd +DIST libtorrent-rasterbar-2.0.10.tar.gz 4686014 BLAKE2B 8d1021cef16d338e10113ff8c514e5e2e5bc2ae0ec38da9448de16415c021623882ec09b005c1c86d73f13bd5d642f0cd08dd2ff9ea403a2fd633f7b5b808109 SHA512 a6406ccdd1d0c8d42543419a3b9edca880ab85e0849bfba29e3b1bd98f9630244aa3e88110cdf95e476792c9ea87a141fcb16a8c3b3e0c44c0076ebf6f9adbee +DIST libtorrent-rasterbar-2.0.8.tar.gz 4562750 BLAKE2B 6ea5855bd2e2d2ef56191ffea7bfc08a88ef43ffee177c1de12dbb62dc9167789abc5fcf2608856d5b23d5dc461fdc8d3f30c01286ce2ba9a11cb4d24fed477c SHA512 697988feae149876745097bedfbfb4cceae00ffe1cd4ba2063dcb93a8eee9e99344f772b8364e3df1986a50105e386e56b75fe362707d58ba3272139d9beb98f +DIST libtorrent-rasterbar-2.0.9.tar.gz 4720611 BLAKE2B 54de2dfba2bdc6c4341fddc54ce16d267b8aafde0218b262bfaa8d4c49dd28ef608a2500a572ee04c82a3e89b6322b0019405f8d9e03e8b31c6de9914f6d43a8 SHA512 c252dbe1e2a246769017b8a622bb3418527e2bc2615115ac2bff9662afb53759bc7b2cbf6657438c515ba6de0140fc1c388b340c48b3dd9f7e6202ec0df1aec7 diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-asio-ssl-error.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-asio-ssl-error.patch deleted file mode 100644 index 5c4e90ff852d..000000000000 --- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-asio-ssl-error.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/arvidn/libtorrent/pull/6547 - -From 61ebb3317b1f8a63fcf4d018a21dac6818ea21cf Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 31 Oct 2021 09:16:46 +0000 -Subject: [PATCH] Add missing include for get_ssl_category - -error::get_ssl_category is defined in boost/asio/ssl/error.hpp, so -include it when we're building with SSL support. - -Bug: https://bugs.gentoo.org/820836 - ---- - bindings/python/src/error_code.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/bindings/python/src/error_code.cpp b/bindings/python/src/error_code.cpp -index 2fc5f42..b947119 100644 ---- a/bindings/python/src/error_code.cpp -+++ b/bindings/python/src/error_code.cpp -@@ -49,6 +49,7 @@ namespace boost - - #include <boost/asio/error.hpp> - #if TORRENT_USE_SSL -+#include <boost/asio/ssl/error.hpp> - #include <libtorrent/ssl.hpp> - #endif - #if TORRENT_USE_I2P --- -2.33.1 - diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch deleted file mode 100644 index a3cdd811e2a3..000000000000 --- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://github.com/paullouisageneau/boost-asio-gnutls/commit/895105972e5a9318d572b147c1872f64d23e2a8e -https://bugs.gentoo.org/820836 -https://github.com/arvidn/libtorrent/pull/6546 - -From 895105972e5a9318d572b147c1872f64d23e2a8e Mon Sep 17 00:00:00 2001 -From: Shantanu Singh <shsi@microsoft.com> -Date: Fri, 18 Sep 2020 14:01:39 -0700 -Subject: [PATCH] Use fully qualified std::placeholders to prevent conflicts - with boost::placeholders - ---- a/deps/asio-gnutls/include/boost/asio/gnutls/stream.hpp -+++ b/deps/asio-gnutls/include/boost/asio/gnutls/stream.hpp -@@ -244,8 +244,7 @@ template <typename NextLayer> class stream : public stream_base - return; - } - -- using namespace std::placeholders; -- m_impl->read_handler = std::bind(callable, _1, _2); -+ m_impl->read_handler = std::bind(callable, std::placeholders::_1, std::placeholders::_2); - m_impl->bytes_read = 0; - m_impl->async_schedule(); - return callable.get_completion_result(); -@@ -293,8 +292,7 @@ template <typename NextLayer> class stream : public stream_base - return; - } - -- using namespace std::placeholders; -- m_impl->write_handler = std::bind(callable, _1, _2); -+ m_impl->write_handler = std::bind(callable, std::placeholders::_1, std::placeholders::_2); - m_impl->bytes_written = 0; - m_impl->async_schedule(); - return callable.get_completion_result(); -@@ -568,8 +566,6 @@ template <typename NextLayer> class stream : public stream_base - - void async_schedule() - { -- using namespace std::placeholders; -- - if (!parent) return; - auto& next_layer = parent->m_next_layer; - -@@ -581,14 +577,14 @@ template <typename NextLayer> class stream : public stream_base - else - next_layer.async_wait( - next_layer_type::wait_read, -- std::bind(&impl::handle_read, this->shared_from_this(), _1)); -+ std::bind(&impl::handle_read, this->shared_from_this(), std::placeholders::_1)); - } - - // Start a write operation if GnuTLS wants one - if (want_write() && !std::exchange(is_writing, true)) - { - next_layer.async_wait(next_layer_type::wait_write, -- std::bind(&impl::handle_write, this->shared_from_this(), _1)); -+ std::bind(&impl::handle_write, this->shared_from_this(), std::placeholders::_1)); - } - } - - diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch deleted file mode 100644 index b39f62614b2a..000000000000 --- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/arvidn/libtorrent/pull/6412 -https://github.com/arvidn/libtorrent/issues/6405 -https://bugs.gentoo.org/808084 - -From 906cedddedbdf9d98ecf2bd19340f7f17869b968 Mon Sep 17 00:00:00 2001 -From: arvidn <arvid@libtorrent.org> -Date: Thu, 19 Aug 2021 11:54:13 +0200 -Subject: [PATCH] bump handler allocation sizes for boost-1.77 (linux) - ---- - include/libtorrent/aux_/allocating_handler.hpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp -index 9d826d11a1..b24349850e 100644 ---- a/include/libtorrent/aux_/allocating_handler.hpp -+++ b/include/libtorrent/aux_/allocating_handler.hpp -@@ -122,14 +122,14 @@ namespace libtorrent { namespace aux { - constexpr std::size_t fuzzer_write_cost = 0; - constexpr std::size_t fuzzer_read_cost = 0; - #endif -- constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 152; -- constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 152; -- constexpr std::size_t udp_handler_max_size = tracking + 144; -- constexpr std::size_t utp_handler_max_size = tracking + 168; -+ constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168; -+ constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168; -+ constexpr std::size_t udp_handler_max_size = tracking + 160; -+ constexpr std::size_t utp_handler_max_size = tracking + 184; - constexpr std::size_t abort_handler_max_size = tracking + 72; - constexpr std::size_t submit_handler_max_size = tracking + 72; - constexpr std::size_t deferred_handler_max_size = tracking + 80; -- constexpr std::size_t tick_handler_max_size = tracking + 112; -+ constexpr std::size_t tick_handler_max_size = tracking + 128; - #endif - - enum HandlerName diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch deleted file mode 100644 index 109a6490af23..000000000000 --- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/arvidn/libtorrent/commit/f2eefd327f1ca89b053eb1e5f4ed229efe52e47f -https://bugs.gentoo.org/820518 - -From: Nick Korotysh <kolchaprogrammer@list.ru> -Date: Fri, 25 Jun 2021 22:08:00 +0300 -Subject: [PATCH] added missed sources to Python bindings CMakeLists.txt - -fixes libtorrent loading module issues: -libtorrent.cpython-39-x86_64-linux-gnu.so: undefined symbol: _Z16bind_sha256_hashv ---- a/bindings/python/CMakeLists.txt -+++ b/bindings/python/CMakeLists.txt -@@ -49,6 +49,7 @@ Python3_add_library(python-libtorrent MODULE WITH_SOABI - src/entry.cpp - src/error_code.cpp - src/fingerprint.cpp -+ src/info_hash.cpp - src/ip_filter.cpp - src/magnet_uri.cpp - src/module.cpp -@@ -56,6 +57,7 @@ Python3_add_library(python-libtorrent MODULE WITH_SOABI - src/session.cpp - src/session_settings.cpp - src/sha1_hash.cpp -+ src/sha256_hash.cpp - src/string.cpp - src/torrent_handle.cpp - src/torrent_info.cpp - diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild deleted file mode 100644 index 982c7a1fdd1a..000000000000 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -PYTHON_REQ_USE="threads(+)" -DISTUTILS_OPTIONAL=true -DISTUTILS_IN_SOURCE_BUILD=true - -inherit autotools flag-o-matic distutils-r1 - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent" -SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/10" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug +dht doc examples python +ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/libtorrent-libtorrent-${PV}" - -RDEPEND=" - dev-libs/boost:=[threads(+)] - virtual/libiconv - examples? ( !net-p2p/mldonkey ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND} - sys-devel/libtool -" - -src_prepare() { - mkdir -p "${S}"/build-aux || die - touch "${S}"/build-aux/config.rpath || die - append-cxxflags -std=c++14 - eautoreconf - - default - - # bug 578026 - # prepend -L${S}/... to ensure bindings link against the lib we just built - sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die - - # prepend -I${S}/... to ensure bindings use the right headers - sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die - - use python && distutils-r1_src_prepare -} - -src_configure() { - - local myeconfargs=( - $(use_enable debug) - $(use_enable debug export-all) - $(use_enable debug logging) - $(use_enable dht) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable static-libs static) - $(use_enable test tests) - --with-boost - --with-libiconv - --enable-logging - ) - econf "${myeconfargs[@]}" - - if use python; then - python_configure() { - econf "${myeconfargs[@]}" \ - --enable-python-binding \ - --with-boost-python="boost_${EPYTHON/./}" - # git rid of c++11 - sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die - mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die - } - distutils-r1_src_configure - fi -} - -src_compile() { - default - - python_compile() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_compile - } - use python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS+=( "${S}"/docs ) - - default - - python_install() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_install - } - use python && distutils-r1_src_install - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild deleted file mode 100644 index 6f2a72939805..000000000000 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="threads(+)" -DISTUTILS_OPTIONAL=true -DISTUTILS_IN_SOURCE_BUILD=true - -inherit autotools flag-o-matic distutils-r1 - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent" -SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/10" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86" -IUSE="debug +dht doc examples python +ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/libtorrent-${PV}" - -RDEPEND=" - dev-libs/boost:=[threads(+)] - virtual/libiconv - examples? ( !net-p2p/mldonkey ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND} - sys-devel/libtool -" - -src_prepare() { - mkdir -p "${S}"/build-aux || die - touch "${S}"/build-aux/config.rpath || die - append-cxxflags -std=c++14 - eautoreconf - - default - - # bug 578026 - # prepend -L${S}/... to ensure bindings link against the lib we just built - sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die - - # prepend -I${S}/... to ensure bindings use the right headers - sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die - - use python && distutils-r1_src_prepare -} - -src_configure() { - - local myeconfargs=( - $(use_enable debug) - $(use_enable debug export-all) - $(use_enable debug logging) - $(use_enable dht) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable static-libs static) - $(use_enable test tests) - --with-boost="${ESYSROOT}/usr" - --with-libiconv - --enable-logging - ) - econf "${myeconfargs[@]}" - - if use python; then - python_configure() { - econf "${myeconfargs[@]}" \ - --enable-python-binding \ - --with-boost-python="boost_${EPYTHON/./}" - # git rid of c++11 - sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die - mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die - } - distutils-r1_src_configure - fi -} - -src_compile() { - default - - python_compile() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_compile - } - use python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS+=( "${S}"/docs ) - - default - - python_install() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_install - } - use python && distutils-r1_src_install - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild deleted file mode 100644 index 9a57948f7177..000000000000 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="threads(+)" -DISTUTILS_OPTIONAL=true -DISTUTILS_IN_SOURCE_BUILD=true - -inherit autotools flag-o-matic distutils-r1 - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent" -SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/10" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug +dht doc examples python +ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/libtorrent-${PV}" - -RDEPEND=" - dev-libs/boost:=[threads(+)] - virtual/libiconv - examples? ( !net-p2p/mldonkey ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND} - sys-devel/libtool -" - -src_prepare() { - mkdir -p "${S}"/build-aux || die - touch "${S}"/build-aux/config.rpath || die - append-cxxflags -std=c++14 - eautoreconf - - default - - # bug 578026 - # prepend -L${S}/... to ensure bindings link against the lib we just built - sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die - - # prepend -I${S}/... to ensure bindings use the right headers - sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die - - use python && distutils-r1_src_prepare -} - -src_configure() { - - local myeconfargs=( - $(use_enable debug) - $(use_enable debug export-all) - $(use_enable debug logging) - $(use_enable dht) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable static-libs static) - $(use_enable test tests) - --with-boost="${ESYSROOT}/usr" - --with-libiconv - --enable-logging - ) - econf "${myeconfargs[@]}" - - if use python; then - python_configure() { - econf "${myeconfargs[@]}" \ - --enable-python-binding \ - --with-boost-python="boost_${EPYTHON/./}" - # git rid of c++11 - sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die - mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die - } - distutils-r1_src_configure - fi -} - -src_compile() { - default - - python_compile() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_compile - } - use python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS+=( "${S}"/docs ) - - default - - python_install() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_install - } - use python && distutils-r1_src_install - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14-r1.ebuild deleted file mode 100644 index 2ee9d2642511..000000000000 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="threads(+)" -DISTUTILS_OPTIONAL=true -DISTUTILS_IN_SOURCE_BUILD=true - -inherit autotools distutils-r1 - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent" -SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/10" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86" -IUSE="debug +dht doc examples python +ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/libtorrent-${PV}" - -RDEPEND=" - dev-libs/boost:=[threads(+)] - virtual/libiconv - examples? ( !net-p2p/mldonkey ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/libtool - python? ( dev-python/setuptools[${PYTHON_USEDEP}] )" - -src_prepare() { - mkdir -p "${S}"/build-aux || die - touch "${S}"/build-aux/config.rpath || die - eautoreconf - - default - - # bug 578026 - # prepend -L${S}/... to ensure bindings link against the lib we just built - sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die - - # prepend -I${S}/... to ensure bindings use the right headers - sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die - - use python && distutils-r1_src_prepare -} - -src_configure() { - - local myeconfargs=( - $(use_enable debug) - $(use_enable debug export-all) - $(use_enable debug logging) - $(use_enable dht) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable static-libs static) - $(use_enable test tests) - --with-boost="${ESYSROOT}/usr" - # Needed because of bug #767835 - --with-boost-libdir="${ESYSROOT}/usr/$(get_libdir)" - --with-libiconv - --enable-logging - ) - econf "${myeconfargs[@]}" - - if use python; then - python_configure() { - econf "${myeconfargs[@]}" \ - --enable-python-binding \ - --with-boost-python="boost_${EPYTHON/./}" - } - distutils-r1_src_configure - fi -} - -src_compile() { - default - - python_compile() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_compile - } - use python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS+=( "${S}"/docs ) - - default - - python_install() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_install - } - use python && distutils-r1_src_install - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.18-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.18-r1.ebuild new file mode 100644 index 000000000000..fbfe9496c6ca --- /dev/null +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.18-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake python-single-r1 + +DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" +HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent" +SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/10" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86" +IUSE="+dht debug python ssl test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/boost:= + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost[python,${PYTHON_USEDEP}] + ') + ) + ssl? ( dev-libs/openssl:= ) +" +RDEPEND="${DEPEND}" +BDEPEND="python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + )" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -Dbuild_examples=OFF + -Ddht=$(usex dht ON OFF) + -Dencryption=$(usex ssl ON OFF) + -Dlogging=$(usex debug ON OFF) + -Dpython-bindings=$(usex python ON OFF) + -Dbuild_tests=$(usex test ON OFF) + ) + + # We need to drop the . from the Python version to satisfy Boost's + # FindBoost.cmake module, bug #793038. + use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" ) + + cmake_src_configure +} + +src_test() { + local myctestargs=( + # test_upnp: needs running UPnP server + -E "test_upnp" + ) + + # Checked out Fedora's test workarounds for inspiration + # https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120 + # -j1 for https://bugs.gentoo.org/854603#c1 + LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test -j1 +} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.19.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.19.ebuild new file mode 100644 index 000000000000..0da40a43037d --- /dev/null +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.19.ebuild @@ -0,0 +1,70 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake python-single-r1 + +DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" +HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent" +SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/10" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+dht debug python ssl test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/boost:= + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost[python,${PYTHON_USEDEP}] + ') + ) + ssl? ( dev-libs/openssl:= ) +" +RDEPEND="${DEPEND}" +BDEPEND="python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + )" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -Dbuild_examples=OFF + -Ddht=$(usex dht ON OFF) + -Dencryption=$(usex ssl ON OFF) + -Dlogging=$(usex debug ON OFF) + -Dpython-bindings=$(usex python ON OFF) + -Dbuild_tests=$(usex test ON OFF) + ) + + # We need to drop the . from the Python version to satisfy Boost's + # FindBoost.cmake module, bug #793038. + use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" ) + + cmake_src_configure +} + +src_test() { + local myctestargs=( + # test_upnp: needs running UPnP server + -E "test_upnp" + ) + + # Checked out Fedora's test workarounds for inspiration + # https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120 + # -j1 for https://bugs.gentoo.org/854603#c1 + LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test -j1 +} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild deleted file mode 100644 index 185c08bbf394..000000000000 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -PYTHON_REQ_USE="threads(+)" -DISTUTILS_OPTIONAL=true -DISTUTILS_IN_SOURCE_BUILD=true - -inherit autotools distutils-r1 - -MY_PV=$(ver_rs 1-2 '_') -MY_P=${PN/-rasterbar}-${MY_PV} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent" -SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/10" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86" -IUSE="debug +dht doc examples python +ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/boost:=[threads(+)] - virtual/libiconv - examples? ( !net-p2p/mldonkey ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND} - sys-devel/libtool -" - -S="${WORKDIR}/${PN/-rasterbar}-${MY_P}" - -src_prepare() { - mkdir "${S}"/build-aux/ || die - touch "${S}"/build-aux/config.rpath || die - eautoreconf - - default - - # bug 578026 - # prepend -L${S}/... to ensure bindings link against the lib we just built - sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die - - # prepend -I${S}/... to ensure bindings use the right headers - sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die - - use python && distutils-r1_src_prepare -} - -src_configure() { - - local myeconfargs=( - $(use_enable debug) - $(use_enable debug export-all) - $(use_enable dht) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable static-libs static) - $(use_enable test tests) - --with-boost - --with-libiconv - --enable-logging - ) - econf "${myeconfargs[@]}" - - if use python; then - python_configure() { - econf "${myeconfargs[@]}" \ - --enable-python-binding \ - --with-boost-python="boost_${EPYTHON/./}" - } - distutils-r1_src_configure - fi -} - -src_compile() { - default - - python_compile() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_compile - } - use python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS+=( "${S}"/docs ) - - default - - python_install() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_install - } - use python && distutils-r1_src_install - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild deleted file mode 100644 index 982c7a1fdd1a..000000000000 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -PYTHON_REQ_USE="threads(+)" -DISTUTILS_OPTIONAL=true -DISTUTILS_IN_SOURCE_BUILD=true - -inherit autotools flag-o-matic distutils-r1 - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent" -SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/10" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug +dht doc examples python +ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/libtorrent-libtorrent-${PV}" - -RDEPEND=" - dev-libs/boost:=[threads(+)] - virtual/libiconv - examples? ( !net-p2p/mldonkey ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND} - sys-devel/libtool -" - -src_prepare() { - mkdir -p "${S}"/build-aux || die - touch "${S}"/build-aux/config.rpath || die - append-cxxflags -std=c++14 - eautoreconf - - default - - # bug 578026 - # prepend -L${S}/... to ensure bindings link against the lib we just built - sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die - - # prepend -I${S}/... to ensure bindings use the right headers - sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die - - use python && distutils-r1_src_prepare -} - -src_configure() { - - local myeconfargs=( - $(use_enable debug) - $(use_enable debug export-all) - $(use_enable debug logging) - $(use_enable dht) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable static-libs static) - $(use_enable test tests) - --with-boost - --with-libiconv - --enable-logging - ) - econf "${myeconfargs[@]}" - - if use python; then - python_configure() { - econf "${myeconfargs[@]}" \ - --enable-python-binding \ - --with-boost-python="boost_${EPYTHON/./}" - # git rid of c++11 - sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die - mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die - } - distutils-r1_src_configure - fi -} - -src_compile() { - default - - python_compile() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_compile - } - use python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS+=( "${S}"/docs ) - - default - - python_install() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_install - } - use python && distutils-r1_src_install - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.10.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.10.ebuild new file mode 100644 index 000000000000..cfa59c2a9b68 --- /dev/null +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.10.ebuild @@ -0,0 +1,103 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-single-r1 + +DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" +HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent" +SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+dht debug examples gnutls python ssl test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/boost:= + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:= ) + ) +" +RDEPEND=" + ${DEPEND} + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost[python,${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + dev-util/patchelf + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + test? ( + ${PYTHON_DEPS} + ) +" + +pkg_setup() { + # python required for tests due to webserver.py + if use python || use test; then + python-single-r1_pkg_setup + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_CXX_STANDARD=17 + -DBUILD_SHARED_LIBS=ON + -Dbuild_examples=$(usex examples) + -Ddht=$(usex dht) + -Dencryption=$(usex ssl) + -Dgnutls=$(usex gnutls) + -Dlogging=$(usex debug) + -Dpython-bindings=$(usex python) + -Dbuild_tests=$(usex test) + ) + + # We need to drop the . from the Python version to satisfy Boost's + # FindBoost.cmake module, bug #793038. + use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" ) + + cmake_src_configure +} + +src_test() { + CMAKE_SKIP_TESTS=( + # Needs running UPnP server + "test_upnp" + # Fragile to parallelization + # https://bugs.gentoo.org/854603#c1 + "test_utp" + # Flaky test, fails randomly + "test_remove_torrent" + ) + + LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test +} + +src_install() { + cmake_src_install + einstalldocs + + if use examples; then + pushd "${BUILD_DIR}"/examples >/dev/null || die + for binary in {client_test,connection_tester,custom_storage,dump_bdecode,dump_torrent,make_torrent,simple_client,stats_counters,upnp_test}; do + patchelf --remove-rpath ${binary} || die + dobin ${binary} + done + popd >/dev/null || die + fi +} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.8.ebuild index 4d585c2e540c..b20882528b68 100644 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.8.ebuild @@ -1,27 +1,25 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python{3_8,3_9} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent" SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz" -# Should be able to drop on next bump! -SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ssl-tests-certs.patch.bz2 )" LICENSE="BSD" SLOT="0/2.0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="+dht debug gnutls python ssl test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" DEPEND=" - dev-libs/boost:=[threads(+)] + dev-libs/boost:= python? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' @@ -40,26 +38,13 @@ BDEPEND="python? ( ') )" -PATCHES=( - "${FILESDIR}"/${PN}-2.0.4-boost-1.76.patch - "${FILESDIR}"/${P}-boost-1.77.patch - "${FILESDIR}"/${P}-python-symbols.patch - "${FILESDIR}"/${PN}-2.0.4-asio-ssl-error.patch -) - pkg_setup() { use python && python-single-r1_pkg_setup } -src_prepare() { - use test && eapply "${WORKDIR}"/${P}-ssl-tests-certs.patch - - cmake_src_prepare -} - src_configure() { local mycmakeargs=( - -DCMAKE_CXX_STANDARD=14 + -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -Dbuild_examples=OFF -Ddht=$(usex dht ON OFF) @@ -85,5 +70,6 @@ src_test() { # Checked out Fedora's test workarounds for inspiration # https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120 - LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test + # -j1 for https://bugs.gentoo.org/854603#c1 + LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test -j1 } diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.9-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.9-r1.ebuild new file mode 100644 index 000000000000..a2451165ead0 --- /dev/null +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.9-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# no 3.12 for now +# https://github.com/arvidn/libtorrent/commit/785969574cfe925098f50b7e5d9ae2a9f2a9d0cf +PYTHON_COMPAT=( python3_{10..11} ) + +inherit cmake python-single-r1 + +DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" +HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent" +SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+dht debug examples gnutls python ssl test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/boost:= + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:= ) + ) +" +RDEPEND=" + ${DEPEND} + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost[python,${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + dev-util/patchelf + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + test? ( + ${PYTHON_DEPS} + ) +" + +pkg_setup() { + # python required for tests due to webserver.py + if use python || use test; then + python-single-r1_pkg_setup + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_CXX_STANDARD=17 + -DBUILD_SHARED_LIBS=ON + -Dbuild_examples=$(usex examples) + -Ddht=$(usex dht) + -Dencryption=$(usex ssl) + -Dgnutls=$(usex gnutls) + -Dlogging=$(usex debug) + -Dpython-bindings=$(usex python) + -Dbuild_tests=$(usex test) + ) + + # We need to drop the . from the Python version to satisfy Boost's + # FindBoost.cmake module, bug #793038. + use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" ) + + cmake_src_configure +} + +src_test() { + CMAKE_SKIP_TESTS=( + # Needs running UPnP server + "test_upnp" + # Missing files in 2.0.9 release archive + # https://github.com/arvidn/libtorrent/issues/7567 + "test_create_torrent" + # Certificates outdated + # https://github.com/arvidn/libtorrent/issues/7565 + "test_ssl" + # Fragile to parallelization + # https://bugs.gentoo.org/854603#c1 + "test_utp" + # Fails in tmpfs + # https://github.com/arvidn/libtorrent/issues/7566 + "test_copy_file" + ) + + LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test +} + +src_install() { + cmake_src_install + einstalldocs + + if use examples; then + pushd "${BUILD_DIR}"/examples >/dev/null || die + for binary in {client_test,connection_tester,custom_storage,dump_bdecode,dump_torrent,make_torrent,simple_client,stats_counters,upnp_test}; do + patchelf --remove-rpath ${binary} || die + dobin ${binary} + done + popd >/dev/null || die + fi +} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.9.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.9.ebuild new file mode 100644 index 000000000000..b20882528b68 --- /dev/null +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.9.ebuild @@ -0,0 +1,75 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake python-single-r1 + +DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" +HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent" +SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/2.0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86" +IUSE="+dht debug gnutls python ssl test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/boost:= + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost[python,${PYTHON_USEDEP}] + ') + ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:= ) + ) +" +RDEPEND="${DEPEND}" +BDEPEND="python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + )" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_CXX_STANDARD=17 + -DBUILD_SHARED_LIBS=ON + -Dbuild_examples=OFF + -Ddht=$(usex dht ON OFF) + -Dencryption=$(usex ssl ON OFF) + -Dgnutls=$(usex gnutls ON OFF) + -Dlogging=$(usex debug ON OFF) + -Dpython-bindings=$(usex python ON OFF) + -Dbuild_tests=$(usex test ON OFF) + ) + + # We need to drop the . from the Python version to satisfy Boost's + # FindBoost.cmake module, bug #793038. + use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" ) + + cmake_src_configure +} + +src_test() { + local myctestargs=( + # Needs running UPnP server + -E "test_upnp" + ) + + # Checked out Fedora's test workarounds for inspiration + # https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120 + # -j1 for https://bugs.gentoo.org/854603#c1 + LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test -j1 +} diff --git a/net-libs/libtorrent-rasterbar/metadata.xml b/net-libs/libtorrent-rasterbar/metadata.xml index 23442540f7ab..530c90675b75 100644 --- a/net-libs/libtorrent-rasterbar/metadata.xml +++ b/net-libs/libtorrent-rasterbar/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="google-code">libtorrent</remote-id> <remote-id type="sourceforge">libtorrent</remote-id> diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest index c8b8a25f9e6b..b7cba0b5c684 100644 --- a/net-libs/libtorrent/Manifest +++ b/net-libs/libtorrent/Manifest @@ -1,2 +1 @@ -DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a40070da7e2fd3279b1aa6acd169ca2783e7a2040efc472285f918c434e74380ec40fcddb823871ecf441c85670b9f273 SHA512 7bf3e87dbd19eb4e6806dff8a01c3ec61ea960bbd809d4bcbee96a46e169f97d0baf0fc85ab4a1efbbab07850e9b1060bae46c453ea6c42f5c23f8d921295efb DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4 diff --git a/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch b/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch deleted file mode 100644 index 1865e48992c4..000000000000 --- a/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f4dadb3850ef15dd7898d07fca72d2fa7e32ca6f Mon Sep 17 00:00:00 2001 -From: Stephen Shkardoon <ss23@ss23.geek.nz> -Date: Mon, 25 Jun 2018 20:05:18 +1200 -Subject: [PATCH] Use AC_COMPILE instead of AC_RUN to check for execinfo.h - -This way enables cross compiling, since we don't need to run anything -during the configure script. ---- - scripts/common.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/common.m4 b/scripts/common.m4 -index ff023928..b6d051f5 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses the stuff defined by the system. - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include <execinfo.h> - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], diff --git a/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch b/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch deleted file mode 100644 index af8e53ddd233..000000000000 --- a/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 755daf78769b048c868e6b62c68b4e545494c181 Mon Sep 17 00:00:00 2001 -From: Stephen Shkardoon <ss23@ss23.geek.nz> -Date: Thu, 21 Jun 2018 14:38:30 +1200 -Subject: [PATCH] Modify configure to prevent unnecessary kqueue checks - -By only running the TORRENT_CHECK_KQUEUE_SOCKET_ONLY check if kqueue support -is already detected, we increase the number of platforms that we can -cross compile on. -Otherwise, the cross compilation fails due to TORRENT_CHECK_KQUEUE_SOCKET_ONLY -using AC_RUN_IFELSE, which fails during cross compilation. ---- - scripts/checks.m4 | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/scripts/checks.m4 b/scripts/checks.m4 -index 8d77fc5e..c9333561 100644 ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -88,6 +88,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - [ - AC_DEFINE(USE_KQUEUE, 1, Use kqueue.) - AC_MSG_RESULT(yes) -+ TORRENT_CHECK_KQUEUE_SOCKET_ONLY - ], [ - AC_MSG_RESULT(no) - ]) -@@ -137,7 +138,6 @@ AC_DEFUN([TORRENT_WITH_KQUEUE], [ - [ - if test "$withval" = "yes"; then - TORRENT_CHECK_KQUEUE -- TORRENT_CHECK_KQUEUE_SOCKET_ONLY - fi - ]) - ]) -@@ -149,11 +149,9 @@ AC_DEFUN([TORRENT_WITHOUT_KQUEUE], [ - [ - if test "$withval" = "yes"; then - TORRENT_CHECK_KQUEUE -- TORRENT_CHECK_KQUEUE_SOCKET_ONLY - fi - ], [ - TORRENT_CHECK_KQUEUE -- TORRENT_CHECK_KQUEUE_SOCKET_ONLY - ]) - ]) - diff --git a/net-libs/libtorrent/files/libtorrent-0.13.8-configure-clang-16.patch b/net-libs/libtorrent/files/libtorrent-0.13.8-configure-clang-16.patch new file mode 100644 index 000000000000..0a23141a7e58 --- /dev/null +++ b/net-libs/libtorrent/files/libtorrent-0.13.8-configure-clang-16.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/899566 +https://github.com/rakshasa/libtorrent/pull/237 + +From e851a8657d2ef5c332260f1e3a3896f438dba255 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Tue, 3 Jan 2023 14:41:11 +0100 +Subject: [PATCH] configure: Define _GNU_SOURCE when checking for + pthread_setname_np + +Previously, the test would always fail with compilers that do not +support implicit function declarations because the pthread_setname_np +function was not declared. +--- a/scripts/checks.m4 ++++ b/scripts/checks.m4 +@@ -469,6 +469,7 @@ AC_DEFUN([TORRENT_CHECK_PTHREAD_SETNAME_NP], [ + AC_MSG_CHECKING(for pthread_setname_np type) + + AC_TRY_LINK([ ++ #define _GNU_SOURCE + #include <pthread.h> + #include <sys/types.h> + ],[ diff --git a/net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch b/net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch new file mode 100644 index 000000000000..9f696c01ef61 --- /dev/null +++ b/net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch @@ -0,0 +1,33 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -43,7 +43,6 @@ + TORRENT_ENABLE_INTERRUPT_SOCKET + + TORRENT_ENABLE_ARCH +-TORRENT_WITH_SYSROOT + + dnl TORRENT_WITH_XFS + TORRENT_WITHOUT_KQUEUE +@@ -59,8 +58,7 @@ + CC_ATTRIBUTE_VISIBILITY + + AX_PTHREAD +-AX_CHECK_ZLIB +- ++PKG_CHECK_MODULES([ZLIB], [zlib]) + PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"]) + + CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS" +--- a/src/torrent/utils/Makefile.am ++++ b/src/torrent/utils/Makefile.am +@@ -23,8 +23,9 @@ + thread_interrupt.h \ + uri_parser.cc \ + uri_parser.h ++libsub_torrentutils_la_LIBADD = $(ZLIB_LIBS) + +-AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(top_srcdir) ++AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(top_srcdir) $(ZLIB_CFLAGS) + + libtorrentincludedir = $(includedir)/torrent/utils + libtorrentinclude_HEADERS = \ diff --git a/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch b/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch deleted file mode 100644 index 55d0cb901b71..000000000000 --- a/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 4607bbf78040789dee29266878ce109136b984ef Mon Sep 17 00:00:00 2001 -From: rakshasa <sundell.software@gmail.com> -Date: Tue, 20 Dec 2016 19:51:02 +0900 -Subject: [PATCH] Added support for openssl 1.1. - ---- - configure.ac | 4 ++++ - src/utils/diffie_hellman.cc | 36 ++++++++++++++++++++++++++++++++++-- - 2 files changed, 38 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 65e34872..27e33570 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -69,12 +69,15 @@ AC_ARG_ENABLE(openssl, - [ --disable-openssl Don't use OpenSSL's SHA1 implementation.], - [ - if test "$enableval" = "yes"; then -+dnl move to scripts. - PKG_CHECK_MODULES(OPENSSL, libcrypto, - CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS"; - LIBS="$LIBS $OPENSSL_LIBS") - - AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) - AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -+ AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) -+ - else - AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.) - fi -@@ -85,6 +88,7 @@ AC_ARG_ENABLE(openssl, - - AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) - AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -+ AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) - ] - ) - -diff --git a/src/utils/diffie_hellman.cc b/src/utils/diffie_hellman.cc -index aa653d45..7ec13165 100644 ---- a/src/utils/diffie_hellman.cc -+++ b/src/utils/diffie_hellman.cc -@@ -54,11 +54,23 @@ DiffieHellman::DiffieHellman(const unsigned char *prime, int primeLength, - m_secret(NULL), m_size(0) { - - #ifdef USE_OPENSSL -+ - m_dh = DH_new(); -+ -+#ifdef USE_OPENSSL_1_1 -+ BIGNUM * const dh_p = BN_bin2bn(prime, primeLength, NULL); -+ BIGNUM * const dh_g = BN_bin2bn(generator, generatorLength, NULL); -+ -+ if (dh_p == NULL || dh_g == NULL || -+ !DH_set0_pqg(m_dh, dh_p, NULL, dh_g)) -+ throw internal_error("Could not generate Diffie-Hellman parameters"); -+#else - m_dh->p = BN_bin2bn(prime, primeLength, NULL); - m_dh->g = BN_bin2bn(generator, generatorLength, NULL); -+#endif - - DH_generate_key(m_dh); -+ - #else - throw internal_error("Compiled without encryption support."); - #endif -@@ -74,7 +86,19 @@ DiffieHellman::~DiffieHellman() { - bool - DiffieHellman::is_valid() const { - #ifdef USE_OPENSSL -+ if (m_dh == NULL) -+ return false; -+ -+#ifdef USE_OPENSSL_1_1 -+ const BIGNUM *pub_key; -+ -+ DH_get0_key(m_dh, &pub_key, NULL); -+ -+ return pub_key != NULL; -+#else - return m_dh != NULL && m_dh->pub_key != NULL; -+#endif -+ - #else - return false; - #endif -@@ -103,8 +127,16 @@ DiffieHellman::store_pub_key(unsigned char* dest, unsigned int length) { - #ifdef USE_OPENSSL - std::memset(dest, 0, length); - -- if ((int)length >= BN_num_bytes(m_dh->pub_key)) -- BN_bn2bin(m_dh->pub_key, dest + length - BN_num_bytes(m_dh->pub_key)); -+ const BIGNUM *pub_key; -+ -+#ifdef USE_OPENSSL_1_1 -+ DH_get0_key(m_dh, &pub_key, NULL); -+#else -+ pub_key = m_dh->pub_key; -+#endif -+ -+ if ((int)length >= BN_num_bytes(pub_key)) -+ BN_bn2bin(pub_key, dest + length - BN_num_bytes(pub_key)); - #endif - } - diff --git a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch b/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch deleted file mode 100644 index 60542e4b4464..000000000000 --- a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 43213fecfad863e2c9e47accde9b76496ff6d1e5 Mon Sep 17 00:00:00 2001 -From: rakshasa <sundell.software@gmail.com> -Date: Sun, 25 Dec 2016 11:58:04 +0900 -Subject: [PATCH] Cleaned up openssl automake script. - ---- - configure.ac | 37 ++----------------------------------- - 1 file changed, 2 insertions(+), 35 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 27e33570..33f755c9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,41 +65,8 @@ CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS" - CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS" - LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS" - --AC_ARG_ENABLE(openssl, -- [ --disable-openssl Don't use OpenSSL's SHA1 implementation.], -- [ -- if test "$enableval" = "yes"; then --dnl move to scripts. -- PKG_CHECK_MODULES(OPENSSL, libcrypto, -- CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS"; -- LIBS="$LIBS $OPENSSL_LIBS") -- -- AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) -- AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -- AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) -- -- else -- AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.) -- fi -- ],[ -- PKG_CHECK_MODULES(OPENSSL, libcrypto, -- CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS"; -- LIBS="$LIBS $OPENSSL_LIBS") -- -- AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) -- AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -- AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) -- ] --) -- --AC_ARG_ENABLE(cyrus-rc4, -- [ --enable-cyrus-rc4=PFX Use Cyrus RC4 implementation.], -- [ -- CXXFLAGS="$CXXFLAGS -I${enableval}/include"; -- LIBS="$LIBS -lrc4 -L${enableval}/lib" -- AC_DEFINE(USE_CYRUS_RC4, 1, Using Cyrus RC4 implementation.) -- ] --) -+TORRENT_ARG_OPENSSL -+TORRENT_ARG_CYRUS_RC4 - - AC_CHECK_FUNCS(posix_memalign) - diff --git a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch b/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch deleted file mode 100644 index 3fc338d8b088..000000000000 --- a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch +++ /dev/null @@ -1,68 +0,0 @@ -From d36561c8cc91698f3075c264af6d7d99e13cbff0 Mon Sep 17 00:00:00 2001 -From: rakshasa <sundell.software@gmail.com> -Date: Sun, 25 Dec 2016 12:09:35 +0900 -Subject: [PATCH] More stuff. - ---- - Makefile.am | 1 + - scripts/ssl.m4 | 39 +++++++++++++++++++++++++++++++++++++++ - 2 files changed, 40 insertions(+) - create mode 100644 scripts/ssl.m4 - -diff --git a/Makefile.am b/Makefile.am -index f175e634..9507b9ea 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,6 +8,7 @@ EXTRA_DIST= \ - scripts/checks.m4 \ - scripts/common.m4 \ - scripts/attributes.m4 \ -+ scripts/ssl.m4 \ - doc/main.xml \ - doc/http.xml \ - doc/torrent.xml \ -diff --git a/scripts/ssl.m4 b/scripts/ssl.m4 -new file mode 100644 -index 00000000..e9cf6303 ---- /dev/null -+++ b/scripts/ssl.m4 -@@ -0,0 +1,39 @@ -+AC_DEFUN([TORRENT_CHECK_OPENSSL], -+ [ -+ PKG_CHECK_MODULES(OPENSSL, libcrypto, -+ CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS"; -+ LIBS="$LIBS $OPENSSL_LIBS") -+ -+ AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) -+ AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -+ AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) -+ ] -+) -+ -+AC_DEFUN([TORRENT_ARG_OPENSSL], -+ [ -+ AC_ARG_ENABLE(openssl, -+ [ --disable-openssl Don't use OpenSSL's SHA1 implementation.], -+ [ -+ if test "$enableval" = "yes"; then -+ TORRENT_CHECK_OPENSSL -+ else -+ AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.) -+ fi -+ ],[ -+ TORRENT_CHECK_OPENSSL -+ ]) -+ ] -+) -+ -+AC_DEFUN([TORRENT_ARG_CYRUS_RC4], -+ [ -+ AC_ARG_ENABLE(cyrus-rc4, -+ [ --enable-cyrus-rc4=PFX Use Cyrus RC4 implementation.], -+ [ -+ CXXFLAGS="$CXXFLAGS -I${enableval}/include"; -+ LIBS="$LIBS -lrc4 -L${enableval}/lib" -+ AC_DEFINE(USE_CYRUS_RC4, 1, Using Cyrus RC4 implementation.) -+ ]) -+ ] -+) diff --git a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild deleted file mode 100644 index d1d53acab68d..000000000000 --- a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools toolchain-funcs - -DESCRIPTION="BitTorrent library written in C++ for *nix" -HOMEPAGE="https://rakshasa.github.io/rtorrent/" -SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz" - -LICENSE="GPL-2" - -# The README says that the library ABI is not yet stable and dependencies on -# the library should be an explicit, syncronized version until the library -# has had more time to mature. Until it matures we should not include a soname -# subslot. -SLOT="0" - -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="debug ssl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-libs/zlib - >=dev-libs/libsigc++-2.2.2:2 - ssl? ( - dev-libs/openssl:0= - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/cppunit" - -PATCHES=( - "${FILESDIR}/${PN}-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch" - "${FILESDIR}/${PN}-openssl-1.1-part2.patch" - "${FILESDIR}/${PN}-openssl-1.1-part3.patch" - "${FILESDIR}/${PN}-0.13.7-kqueue-configure.patch" - "${FILESDIR}/${PN}-0.13.7-execinfo-configure.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # bug 518582 - local disable_instrumentation - echo -e "#include <inttypes.h>\nint main(){ int64_t var = 7; __sync_add_and_fetch(&var, 1); return 0;}" > "${T}/sync_add_and_fetch.c" || die - $(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1 - if [[ $? -ne 0 ]]; then - disable_instrumentation="--disable-instrumentation" - fi - - # configure needs bash or script bombs out on some null shift, bug #291229 - CONFIG_SHELL=${BASH} econf \ - --enable-aligned \ - $(use_enable debug) \ - $(use_enable ssl openssl) \ - ${disable_instrumentation} \ - --with-posix-fallocate \ - --with-zlib="${EROOT%/}/usr/" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete -} diff --git a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild deleted file mode 100644 index fe37a9e10546..000000000000 --- a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="BitTorrent library written in C++ for *nix" -HOMEPAGE="https://rakshasa.github.io/rtorrent/" -SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz" - -LICENSE="GPL-2" - -# The README says that the library ABI is not yet stable and dependencies on -# the library should be an explicit, syncronized version until the library -# has had more time to mature. Until it matures we should not include a soname -# subslot. -SLOT="0" - -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="debug ssl test" -RESTRICT="!test? ( test )" - -# cppunit dependency - https://github.com/rakshasa/libtorrent/issues/182 -RDEPEND=" - dev-util/cppunit:= - sys-libs/zlib - ssl? ( - dev-libs/openssl:0= - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - # bug 518582 - local disable_instrumentation - echo -e "#include <inttypes.h>\nint main(){ int64_t var = 7; __sync_add_and_fetch(&var, 1); return 0;}" > "${T}/sync_add_and_fetch.c" || die - $(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1 - if [[ $? -ne 0 ]]; then - disable_instrumentation="--disable-instrumentation" - fi - - # configure needs bash or script bombs out on some null shift, bug #291229 - CONFIG_SHELL=${BASH} econf \ - --enable-aligned \ - $(use_enable debug) \ - $(use_enable ssl openssl) \ - ${disable_instrumentation} \ - --with-posix-fallocate \ - --with-zlib="${EROOT%/}/usr/" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete -} diff --git a/net-libs/libtorrent/libtorrent-0.13.7.ebuild b/net-libs/libtorrent/libtorrent-0.13.8-r3.ebuild index 73c2cd137518..86056a1f8024 100644 --- a/net-libs/libtorrent/libtorrent-0.13.7.ebuild +++ b/net-libs/libtorrent/libtorrent-0.13.8-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools toolchain-funcs @@ -10,31 +10,25 @@ HOMEPAGE="https://rakshasa.github.io/rtorrent/" SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz" LICENSE="GPL-2" - # The README says that the library ABI is not yet stable and dependencies on # the library should be an explicit, syncronized version until the library # has had more time to mature. Until it matures we should not include a soname # subslot. SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="debug ssl" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="debug ssl test" -RESTRICT="!test? ( test )" - +# cppunit dependency - https://github.com/rakshasa/libtorrent/issues/182 RDEPEND=" + dev-util/cppunit:= sys-libs/zlib - >=dev-libs/libsigc++-2.2.2:2 - ssl? ( - dev-libs/openssl:0= - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/cppunit" + ssl? ( dev-libs/openssl:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${PN}-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch" - "${FILESDIR}/${PN}-openssl-1.1-part2.patch" - "${FILESDIR}/${PN}-openssl-1.1-part3.patch" + "${FILESDIR}"/${PN}-0.13.8-sysroot.patch + "${FILESDIR}"/${PN}-0.13.8-configure-clang-16.patch ) src_prepare() { @@ -48,6 +42,7 @@ src_configure() { echo -e "#include <inttypes.h>\nint main(){ int64_t var = 7; __sync_add_and_fetch(&var, 1); return 0;}" > "${T}/sync_add_and_fetch.c" || die $(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1 if [[ $? -ne 0 ]]; then + einfo "Disabling instrumentation" disable_instrumentation="--disable-instrumentation" fi @@ -63,5 +58,5 @@ src_configure() { src_install() { default - find "${D}" -name '*.la' -delete + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml index a6f8bb76cf75..3e85eb36e275 100644 --- a/net-libs/libtorrent/metadata.xml +++ b/net-libs/libtorrent/metadata.xml @@ -1,15 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>ss23@ss23.geek.nz</email> - <name>Stephen Shkardoon</name> - </maintainer> <maintainer type="person"> <email>perfinion@gentoo.org</email> <name>Jason Zaman</name> </maintainer> - <upstream> <remote-id type="github">rakshasa/libtorrent</remote-id> </upstream> diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest index 53a961ba3b97..8c71405cbb5c 100644 --- a/net-libs/libtrace/Manifest +++ b/net-libs/libtrace/Manifest @@ -1,2 +1,5 @@ -DIST libtrace-4.0.15_p1.tar.gz 1891845 BLAKE2B 08faf395f5fdda21829b89a9276649b297d2266ef10d2162b588b39d4d8d2da1306c74bb180d63b92f4422bb157fb451d34cd8167f0bff42322776e3b1ee0e7c SHA512 82f18b03e824f3ac89330854c3659244106ab5323f5e7a43ec7d2280f6ad3d427a906708688469b3f5aa479d11fef99a4bbecea585b81c916029132375582a4e -DIST libtrace-4.0.17_p1.tar.gz 1961123 BLAKE2B be961bc58496414415b9affb0a6b77e5f234b92196fb719f3a2e8058ae80ade90977c44d57c75d37cbf26ff2e0c8816a4b376b77b6e44d13833960c6095b7e2c SHA512 85280edd515acf52361c34ebe5324fd95f4fafc72aa22c2c8bd43a6bca9a6b5fc9a046480fc760bb39d8b577532ed416caf10a630cea9465d305f2ed4dcb318e +DIST libtrace-4.0.18_p1.tar.gz 1963425 BLAKE2B fdacd4a44f899dc49fe9571d8e695cd726ea07d1c0595bd7c1f59d53721bd5610126924323c9c7098caf65276219e61265e5e05f23b4a92ae6377268c618202f SHA512 fc2979fa56b0eee25149a3571d0a06e2a46ab6d6fa419b2fc37635ebcf4a8814250005c4dfc5dddb5fb6aa9c74161ab4f475a037e021388054bb62f414b9c5d2 +DIST libtrace-4.0.19.tar.bz2 844871 BLAKE2B ff55935b46fb2193ae2e4ab10971d0983da18be20a52a18664f0e72cb829ab444a22e00aeedbd2df85aebbcd6b8352636c559e55d05466a599cc332f018f14ad SHA512 f2744337b4dcff8fc782cd90e44ea6f21cfe120840f626dfac365d3ffaecb82bfdd04a35458b67f663addc1f7ae792c5b0ec7538ed90a2deb386586bc55e1c54 +DIST libtrace-4.0.20.tar.gz 3722006 BLAKE2B f68ededebef71673d6e3a655cb116a5a6d4cdee05ba5150edd85abd45863460208715ebb5eab3ee29254864f0130a594649db0baed99f7ced5d1d968472a595b SHA512 b4d00f0d6f8286eff9bac5408bd10244922f4ab262e3dec5dd6f0984ec9f538ab5ac6e554686e33f92168d687275629ec1725d4ebb7c491fe4bdaffd57058fc0 +DIST libtrace-4.0.21.tar.gz 3741856 BLAKE2B c7178cdf9721dbbce423d38236ee1fe470f32b86af393c10600a326dfbd2e84f28df27584d4ed99590c00cb8042d4472782712024c4398b95e954565d50c33fc SHA512 0215488a36c6bcb5619d01f6f73f42c14d63b291233c3cf2668434f78e0d60c1faac6bb1f7927cdd6448771e5c0de8e1012dcc954c8815763079f5ebd0abe601 +DIST libtrace-4.0.22.tar.gz 3742482 BLAKE2B bdba49d04b354ea075fbd21933b8ad5ecb187836cb13cf95ac8a4c89abbf0c90741696b41dc91924f52a6443e5dee34075b3200cbaf99acacfd43834887df655 SHA512 ecb2a275419e659d05149c64cad2e27caba5b3920188a3eef2df6323785eeaa11677c206ce7d9bcea593d970be95ad9e2019b37642c08d7fec9e0daac9d8681f diff --git a/net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch b/net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch deleted file mode 100644 index ed51ecb82868..000000000000 --- a/net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -61,7 +61,7 @@ - ]) - - # Put all our automake definitions in config.h --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - - # Checks for C and C++ compilers - AC_PROG_CC diff --git a/net-libs/libtrace/files/libtrace-4.0.0-no-examples.patch b/net-libs/libtrace/files/libtrace-4.0.0-no-examples.patch deleted file mode 100644 index 8467ffda24b0..000000000000 --- a/net-libs/libtrace/files/libtrace-4.0.0-no-examples.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - LIBPACKETDUMP_DIR = libpacketdump - TOOLS_DIR = tools --SUBDIRS = lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs examples -+SUBDIRS = lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs - - ACLOCAL_AMFLAGS = -I m4 - AUTOMAKE_OPTIONS = 1.9 foreign diff --git a/net-libs/libtrace/files/libtrace-4.0.0-with-numa.patch b/net-libs/libtrace/files/libtrace-4.0.0-with-numa.patch deleted file mode 100644 index 54e9f54f8dc1..000000000000 --- a/net-libs/libtrace/files/libtrace-4.0.0-with-numa.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -431,7 +431,23 @@ - [[#include <linux/if_packet.h>]]) - - # If we use DPDK we might be able to use libnuma --AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0) -+AC_ARG_WITH(numa, -+ AS_HELP_STRING(--with-numa,include NUMA support), -+[ -+ if test "$withval" = no -+ then -+ want_numa=no -+ else -+ want_numa=yes -+ fi -+],[ -+ # Default to building without NUMA -+ want_numa=yes -+]) -+ -+if test "$want_numa" != no; then -+ AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0) -+fi - - # Checks for various "optional" libraries - AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0) diff --git a/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch b/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch new file mode 100644 index 000000000000..b536302c30b9 --- /dev/null +++ b/net-libs/libtrace/files/libtrace-4.0.18_p1-build-system.patch @@ -0,0 +1,133 @@ +https://github.com/LibtraceTeam/libtrace/pull/201 + +From dde6c39e5808f06f1450b03e7c682edb0f1290cf Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 8 Feb 2022 05:30:32 +0000 +Subject: [PATCH 1/3] build: fix bashism in configure + +configures have a shebang of #!/bin/sh so need to work with a POSIX-compliant +shell; let's use = instead of == which will have the same effect on both Bash +and said shells (like dash). + +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 95d63fdc..dbbaabb7 100644 +--- a/configure.in ++++ b/configure.in +@@ -305,7 +305,7 @@ AC_ARG_WITH(xdp, AS_HELP_STRING(--with-xdp, include XDP capture support), + + if test "$want_xdp" != no; then + AC_CHECK_LIB(elf, elf_begin, elffound=1, elffound=0) +- if test "$elffound" == 1; then ++ if test "$elffound" = 1; then + # check for libbpf + AC_CHECK_LIB(bpf, xsk_socket__create, bpffound=1, bpffound=0, -lelf) + + +From 1525a42b386da02bda3982cf6e8b472f57f8ac34 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 8 Feb 2022 05:32:59 +0000 +Subject: [PATCH 2/3] build: make NUMA support optional + +This avoids an 'automagic dependency' [0] on NUMA. This is helpful for +downstreams to ensure we don't miss dependencies or when we may not +want to enable support for a feature even though a dependency is enabled. + +Gentoo has shipped this patch for quite some time. + +[0] https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies + +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.in | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index dbbaabb7..6fbff150 100644 +--- a/configure.in ++++ b/configure.in +@@ -518,7 +518,23 @@ AC_CHECK_DECL([PACKET_FANOUT], + [[#include <linux/if_packet.h>]]) + + # If we use DPDK we might be able to use libnuma +-AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0) ++AC_ARG_WITH(numa, ++ AS_HELP_STRING(--with-numa,include NUMA support), ++[ ++ if test "$withval" = no ++ then ++ want_numa=no ++ else ++ want_numa=yes ++ fi ++],[ ++ # Default to building without NUMA ++ want_numa=yes ++]) ++ ++if test "$want_numa" != no; then ++ AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0) ++fi + + # Need libwandder for ETSI live decoding + AC_CHECK_LIB(wandder, init_wandder_decoder, have_wandder=1, have_wandder=0) + +From 153254413ae3cd6a62ee7d8b5eae189e84ebc066 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 8 Feb 2022 05:34:05 +0000 +Subject: [PATCH 3/3] build: use pkg-config to find ncurses + +ncurses can be built in a variety of configurations, but the motivating case +for Gentoo was "split tinfo" where libtinfo is no longer included within +libncurses. + +Use pkg-config to find where ncurses is installed and the required libraries +needed to link against it (which will include -ltinfo if required). + +We've been shipping this patch in Gentoo for quite some time. + +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.in | 4 ++++ + tools/tracetop/Makefile.am | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 6fbff150..cbb94d55 100644 +--- a/configure.in ++++ b/configure.in +@@ -79,6 +79,8 @@ AC_PROG_INSTALL + AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc) + AM_PROG_LEX + ++PKG_PROG_PKG_CONFIG ++ + # All our source files for function replacements are in lib/ + AC_CONFIG_LIBOBJ_DIR(lib) + +@@ -916,6 +918,8 @@ if (test "$use_llvm" != "no"); then + fi + fi + ++PKG_CHECK_MODULES(ncurses,ncurses,have_ncurses=yes,have_ncurses=no) ++ + AC_ARG_WITH([ncurses], + AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)])) + +diff --git a/tools/tracetop/Makefile.am b/tools/tracetop/Makefile.am +index 2ebbc3a7..a2eb2797 100644 +--- a/tools/tracetop/Makefile.am ++++ b/tools/tracetop/Makefile.am +@@ -6,6 +6,6 @@ bin_PROGRAMS = tracetop + include ../Makefile.tools + + tracetop_SOURCES = tracetop.cc +-tracetop_LDADD = -lncurses ++tracetop_LDADD = @ncurses_LIBS@ + tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS) + endif + diff --git a/net-libs/libtrace/files/libtrace-4.0.9_p1-tinfo.patch b/net-libs/libtrace/files/libtrace-4.0.9_p1-tinfo.patch deleted file mode 100644 index e79f7cf82f9f..000000000000 --- a/net-libs/libtrace/files/libtrace-4.0.9_p1-tinfo.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/tools/tracetop/Makefile.am -+++ b/tools/tracetop/Makefile.am -@@ -6,6 +6,6 @@ - include ../Makefile.tools - - tracetop_SOURCES = tracetop.cc --tracetop_LDADD = -lncurses -+tracetop_LDADD = @ncurses_LIBS@ - tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS) - endif ---- a/configure.in -+++ b/configure.in -@@ -79,6 +79,8 @@ - AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc) - AM_PROG_LEX - -+PKG_PROG_PKG_CONFIG -+ - # All our source files for function replacements are in lib/ - AC_CONFIG_LIBOBJ_DIR(lib) - -@@ -645,6 +663,8 @@ - fi - fi - -+PKG_CHECK_MODULES(ncurses,ncurses,have_ncurses=yes,have_ncurses=no) -+ - AC_ARG_WITH([ncurses], - AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)])) - diff --git a/net-libs/libtrace/libtrace-4.0.17_p1.ebuild b/net-libs/libtrace/libtrace-4.0.18_p1.ebuild index fedc23bfe00e..404ec0be0516 100644 --- a/net-libs/libtrace/libtrace-4.0.17_p1.ebuild +++ b/net-libs/libtrace/libtrace-4.0.18_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,30 +13,25 @@ S="${WORKDIR}/${P/_p/-}" LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" +# doxygen is always needed for man pages, but USE=doc controls installing docs themselves +# (not man pages) IUSE="doc ncurses numa" -BDEPEND=" - app-doc/doxygen[dot] - sys-devel/flex - virtual/os-headers - virtual/pkgconfig - virtual/yacc -" -RDEPEND=" - >=net-libs/libpcap-0.8 +RDEPEND=">=net-libs/libpcap-0.8 dev-libs/libyaml - dev-libs/openssl:0= + dev-libs/openssl:= net-libs/wandio - ncurses? ( sys-libs/ncurses:0= ) - numa? ( sys-process/numactl ) -" + ncurses? ( sys-libs/ncurses:= ) + numa? ( sys-process/numactl )" DEPEND="${RDEPEND}" +BDEPEND="app-text/doxygen[dot] + app-alternatives/lex + virtual/os-headers + virtual/pkgconfig + app-alternatives/yacc" PATCHES=( - "${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch - "${FILESDIR}"/${PN}-4.0.0-no-examples.patch - "${FILESDIR}"/${PN}-4.0.0-with-numa.patch - "${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch + "${FILESDIR}"/${PN}-4.0.18_p1-build-system.patch ) src_prepare() { @@ -47,7 +42,7 @@ src_prepare() { eautoreconf # Comment out FILE_PATTERNS definition (bug #706230) - if has_version ~app-doc/doxygen-1.8.16; then + if has_version ~app-text/doxygen-1.8.16; then sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die fi diff --git a/net-libs/libtrace/libtrace-9999.ebuild b/net-libs/libtrace/libtrace-4.0.19_p1.ebuild index f8ed9c02d13b..da401f1ea38b 100644 --- a/net-libs/libtrace/libtrace-9999.ebuild +++ b/net-libs/libtrace/libtrace-4.0.19_p1.ebuild @@ -1,51 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools git-r3 - DESCRIPTION="A library and tools for trace processing" HOMEPAGE="https://research.wand.net.nz/software/libtrace.php" -S="${WORKDIR}/${P/_beta/}" -EGIT_REPO_URI="https://github.com/LibtraceTeam/libtrace" -EGIT_SUBMODULES=() +SRC_URI="https://research.wand.net.nz/software/libtrace/${PN}-$(ver_cut 1-3).tar.bz2" +S="${WORKDIR}"/${PN}-$(ver_cut 1-3) LICENSE="LGPL-3" SLOT="0" +KEYWORDS="~amd64 ~x86" +# doxygen is always needed for man pages, but USE=doc controls installing docs themselves +# (not man pages) IUSE="doc ncurses numa" -BDEPEND=" - app-doc/doxygen[dot] - sys-devel/flex - virtual/os-headers - virtual/pkgconfig - virtual/yacc -" -RDEPEND=" - >=net-libs/libpcap-0.8 +RDEPEND=">=net-libs/libpcap-0.8 dev-libs/libyaml - dev-libs/openssl:0= + dev-libs/openssl:= net-libs/wandio - ncurses? ( sys-libs/ncurses:0= ) - numa? ( sys-process/numactl ) -" + ncurses? ( sys-libs/ncurses:= ) + numa? ( sys-process/numactl )" DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch - "${FILESDIR}"/${PN}-4.0.0-no-examples.patch - "${FILESDIR}"/${PN}-4.0.0-with-numa.patch - "${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch -) +BDEPEND="app-text/doxygen[dot] + app-alternatives/lex + virtual/os-headers + virtual/pkgconfig + app-alternatives/yacc" src_prepare() { default - eautoreconf - # Comment out FILE_PATTERNS definition (bug #706230) - if has_version ~app-doc/doxygen-1.8.16; then + if has_version ~app-text/doxygen-1.8.16; then sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die fi @@ -57,7 +44,8 @@ src_configure() { econf \ $(use_with ncurses) \ $(use_with numa) \ - --with-man + --with-man \ + --without-dpdk } src_install() { diff --git a/net-libs/libtrace/libtrace-4.0.15_p1.ebuild b/net-libs/libtrace/libtrace-4.0.20.ebuild index 4f14188b0ead..0c4bf1d66107 100644 --- a/net-libs/libtrace/libtrace-4.0.15_p1.ebuild +++ b/net-libs/libtrace/libtrace-4.0.20.ebuild @@ -1,53 +1,45 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="A library and tools for trace processing" -HOMEPAGE="https://research.wand.net.nz/software/libtrace.php" -SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P/_p/-}" +HOMEPAGE="https://github.com/LibtraceTeam/libtrace" +SRC_URI="https://github.com/LibtraceTeam/libtrace/archive/refs/tags/${PV}-1.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${P}-1 LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" +# doxygen is always needed for man pages, but USE=doc controls installing docs themselves +# (not man pages) IUSE="doc ncurses numa" +RDEPEND=" + dev-libs/libyaml + dev-libs/openssl:= + >=net-libs/libpcap-0.8 + net-libs/wandio + ncurses? ( sys-libs/ncurses:= ) + numa? ( sys-process/numactl )" +DEPEND="${RDEPEND}" BDEPEND=" - app-doc/doxygen[dot] + app-text/doxygen[dot] sys-devel/flex virtual/os-headers virtual/pkgconfig - virtual/yacc -" -RDEPEND=" - >=net-libs/libpcap-0.8 - dev-libs/libyaml - dev-libs/openssl:0= - net-libs/wandio - ncurses? ( sys-libs/ncurses:0= ) - numa? ( sys-process/numactl ) + app-alternatives/yacc " -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch - "${FILESDIR}"/${PN}-4.0.0-no-examples.patch - "${FILESDIR}"/${PN}-4.0.0-with-numa.patch - "${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch -) src_prepare() { default - mv configure.{in,ac} || die - eautoreconf # Comment out FILE_PATTERNS definition (bug #706230) - if has_version ~app-doc/doxygen-1.8.16; then + if has_version ~app-text/doxygen-1.8.16; then sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die fi @@ -56,10 +48,11 @@ src_prepare() { } src_configure() { + export LEX=flex + econf \ $(use_with ncurses) \ $(use_with numa) \ - --disable-static \ --with-man \ --without-dpdk } diff --git a/net-libs/libtrace/libtrace-4.0.21.ebuild b/net-libs/libtrace/libtrace-4.0.21.ebuild new file mode 100644 index 000000000000..8e5ea4214918 --- /dev/null +++ b/net-libs/libtrace/libtrace-4.0.21.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A library and tools for trace processing" +HOMEPAGE="https://github.com/LibtraceTeam/libtrace" +SRC_URI="https://github.com/LibtraceTeam/libtrace/archive/refs/tags/${PV}-1.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${P}-1 + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# doxygen is always needed for man pages, but USE=doc controls installing docs themselves +# (not man pages) +IUSE="doc ncurses numa" + +RDEPEND=" + dev-libs/libyaml + dev-libs/openssl:= + >=net-libs/libpcap-0.8 + >=net-libs/wandio-4.0.0 + ncurses? ( sys-libs/ncurses:= ) + numa? ( sys-process/numactl )" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/doxygen[dot] + sys-devel/flex + virtual/os-headers + virtual/pkgconfig + app-alternatives/yacc +" + +src_prepare() { + default + + eautoreconf + + # Comment out FILE_PATTERNS definition (bug #706230) + if has_version ~app-text/doxygen-1.8.16; then + sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die + fi + + # Update doxygen configuration + doxygen -u docs/libtrace.doxygen.in || die +} + +src_configure() { + export LEX=flex + + econf \ + $(use_with ncurses) \ + $(use_with numa) \ + --with-man \ + --without-dpdk +} + +src_install() { + default + + if use doc ; then + docinto html + dodoc -r docs/doxygen/html + fi + + find "${ED}" -name "*.la" -delete || die +} diff --git a/net-libs/libtrace/libtrace-4.0.22.ebuild b/net-libs/libtrace/libtrace-4.0.22.ebuild new file mode 100644 index 000000000000..8e5ea4214918 --- /dev/null +++ b/net-libs/libtrace/libtrace-4.0.22.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A library and tools for trace processing" +HOMEPAGE="https://github.com/LibtraceTeam/libtrace" +SRC_URI="https://github.com/LibtraceTeam/libtrace/archive/refs/tags/${PV}-1.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${P}-1 + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# doxygen is always needed for man pages, but USE=doc controls installing docs themselves +# (not man pages) +IUSE="doc ncurses numa" + +RDEPEND=" + dev-libs/libyaml + dev-libs/openssl:= + >=net-libs/libpcap-0.8 + >=net-libs/wandio-4.0.0 + ncurses? ( sys-libs/ncurses:= ) + numa? ( sys-process/numactl )" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/doxygen[dot] + sys-devel/flex + virtual/os-headers + virtual/pkgconfig + app-alternatives/yacc +" + +src_prepare() { + default + + eautoreconf + + # Comment out FILE_PATTERNS definition (bug #706230) + if has_version ~app-text/doxygen-1.8.16; then + sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die + fi + + # Update doxygen configuration + doxygen -u docs/libtrace.doxygen.in || die +} + +src_configure() { + export LEX=flex + + econf \ + $(use_with ncurses) \ + $(use_with numa) \ + --with-man \ + --without-dpdk +} + +src_install() { + default + + if use doc ; then + docinto html + dodoc -r docs/doxygen/html + fi + + find "${ED}" -name "*.la" -delete || die +} diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest index a4442cccbb0a..ab31533830c5 100644 --- a/net-libs/libupnp/Manifest +++ b/net-libs/libupnp/Manifest @@ -1,2 +1,2 @@ -DIST libupnp-1.14.12.tar.gz 788299 BLAKE2B 721c10f9fa4ffc60743b4ebf8be566ea595931cb1f2a2448d8e3cecfc787abfb855cb16256eaaa10ce6a901cd5e5b3d14672610841b2a718d5dd003ccfd3c2f0 SHA512 aab17aa12f15d110bfab20cbcbae5f54926b6ca7a30bce10b9287cd39919a06a5e9f1493405e1d561c0d58ba46926f87009df891e4e4f37097df1c3c67635ca9 -DIST libupnp-1.14.7.tar.gz 785084 BLAKE2B 539388737dda0dd037cb50fbc1cca8bcdc43d1d706bdb7da19d1a184cfd61f3d585d9beef2a9c8c33f2cb2640a8479210ad6c358abd7193f304509df574e912c SHA512 92dd80d1bbaa64e6d3909c5bce73d0340fcd3a3c1d247a634bd48ec077ba0ce0b8224d1a670a66f6a8c591e31a54f15526071d62ae5460e85d582d7b6b67c674 +DIST libupnp-1.14.18.tar.gz 811092 BLAKE2B ee95cafc10838817900f82b83d15cf5d925e36a4321c7000b963e9e986ca9165af55c4c90c6fdf5d9bfaf72695711337986d25498cb838d513470f20decf10cc SHA512 68973e0e5a8f9e64b2311246b7924b0837fd2c7ef30483d3d93ebfeee62bc2293760209d8a5213c0456ce5c37f9f32a6038c9e5d8b461670ba6073db8c2f1394 +DIST libupnp-1.14.19.tar.gz 814300 BLAKE2B 119281a2e220b3b9398566b649d76fc047741a251097059920e84ef9376db03ee953ebf10934423a56613ad85aa9f77b777e33d92095b1468dfffb12e37e86bd SHA512 76ae3bf8b69fd649ede0b92e03b36a6cbc7a9df9fa7828386c97761df12f2ae6346dec9ab45f78e17eb793d4d225707ecb3a7628d7678287979115cd4ba65c49 diff --git a/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch b/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch deleted file mode 100644 index dbcfd5e2cc20..000000000000 --- a/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/upnp/inc/ithread.h -+++ b/upnp/inc/ithread.h -@@ -304,12 +304,8 @@ - * Returns EINVAL if the kind is not supported. - * See man page for pthread_mutexattr_setkind_np - *****************************************************************************/ --#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) -- #define ithread_mutexattr_setkind_np pthread_mutexattr_settype --#else -- #define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np --#endif /* UPNP_USE_RWLOCK */ -- -+#define ithread_mutexattr_setkind_np pthread_mutexattr_settype -+#define ithread_mutexattr_settype pthread_mutexattr_settype - /**************************************************************************** - * Function: ithread_mutexattr_getkind_np - * -@@ -329,12 +325,8 @@ - * Always returns 0. - * See man page for pthread_mutexattr_getkind_np - *****************************************************************************/ --#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) -- #define ithread_mutexattr_getkind_np pthread_mutexattr_gettype --#else -- #define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np --#endif /* UPNP_USE_RWLOCK */ -- -+#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype -+#define ithread_mutexattr_gettype pthread_mutexattr_gettype - /**************************************************************************** - * Function: ithread_mutex_init - * diff --git a/net-libs/libupnp/libupnp-1.14.12-r1.ebuild b/net-libs/libupnp/libupnp-1.14.18.ebuild index fc9560d1abf1..88582b0261e3 100644 --- a/net-libs/libupnp/libupnp-1.14.12-r1.ebuild +++ b/net-libs/libupnp/libupnp-1.14.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,8 +14,8 @@ S="${WORKDIR}/${MY_PN}-release-${PV}" LICENSE="BSD" SLOT="0/17" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux" -IUSE="blocking-tcp debug doc +ipv6 +reuseaddr samples +ssl static-libs" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux" +IUSE="blocking-tcp debug doc +reuseaddr samples +ssl static-libs" RDEPEND="ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND}" @@ -32,7 +32,7 @@ src_configure() { local myeconfargs=( $(use_enable blocking-tcp blocking-tcp-connections) $(use_enable debug) - $(use_enable ipv6) + --enable-ipv6 $(use_enable reuseaddr) $(use_enable samples) $(use_enable ssl open_ssl) diff --git a/net-libs/libupnp/libupnp-1.14.19.ebuild b/net-libs/libupnp/libupnp-1.14.19.ebuild new file mode 100644 index 000000000000..13ae128fe931 --- /dev/null +++ b/net-libs/libupnp/libupnp-1.14.19.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_PN="pupnp" + +DESCRIPTION="An Portable Open Source UPnP Development Kit" +HOMEPAGE="http://pupnp.sourceforge.net/" +SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-release-${PV}" + +LICENSE="BSD" +SLOT="0/17" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux" +IUSE="blocking-tcp debug doc +reuseaddr samples +ssl static-libs" + +RDEPEND="ssl? ( dev-libs/openssl:0= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/${PN}-1.14.12-disable-network-tests.patch" ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable blocking-tcp blocking-tcp-connections) + $(use_enable debug) + --enable-ipv6 + $(use_enable reuseaddr) + $(use_enable samples) + $(use_enable ssl open_ssl) + $(use_enable static-libs static) + ) + + econf ${myeconfargs[@]} +} + +src_install() { + default + + find "${D}" -name '*.la' -delete || die +} diff --git a/net-libs/libupnp/libupnp-1.14.7.ebuild b/net-libs/libupnp/libupnp-1.14.7.ebuild deleted file mode 100644 index 4dcf90126cfd..000000000000 --- a/net-libs/libupnp/libupnp-1.14.7.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic - -MY_PN="pupnp" - -DESCRIPTION="An Portable Open Source UPnP Development Kit" -HOMEPAGE="http://pupnp.sourceforge.net/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_PN}-release-${PV}" - -LICENSE="BSD" -SLOT="0/17" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux" -IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs" - -# bug 733750 -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${PN}-1.14.7-glibc-2.34.patch" ) - -src_prepare() { - default - - # fix tests - chmod +x ixml/test/test_document.sh || die - - eautoreconf -} - -src_configure() { - use x86-fbsd && append-flags -O1 - # w/o docdir to avoid sandbox violations - econf $(use_enable debug) \ - $(use_enable blocking-tcp blocking-tcp-connections) \ - $(use_enable ipv6) \ - $(use_enable reuseaddr) \ - $(use_enable static-libs static) \ - $(use_enable samples) -} - -src_install() { - default - - if ! use static-libs ; then - find "${D}" -name '*.la' -delete || die - fi -} diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest index 45e69d6e3458..f77bed7e5c92 100644 --- a/net-libs/libupnpp/Manifest +++ b/net-libs/libupnpp/Manifest @@ -1 +1,2 @@ -DIST libupnpp-0.21.0.tar.gz 478894 BLAKE2B 093803ff0a4a0b76272f44e470df69169053c66ae27a42b483623b50d0c2bffa61f51e0ca9a82b4fc759492640c68d0eae90cdc46a1e6e6f38f7655190e4101b SHA512 1032ef83e6880c1e4ae4903f6e175640b1d3da7090bfb04bf480f70d58436ef89e6a43886c86dcda2c4aab8370cbd0d5260601ac359a3dded0688ac2748d30fd +DIST libupnpp-0.23.0.tar.gz 482952 BLAKE2B 1e4615367f311c47ac99e70d926086585e4e06c7c245cf4e2b463a5c47ca71286c287829f46305202cb24ba4add138aa5fd2864387253e478defa2d083e5526a SHA512 56a90635144a074680b20b28bc55d2258e25730d72fc99cab849e6f343f62ba2646c1510ad3dbfc2733895eba5ae9dd0ade8478f2debe4425781557ecd515b0e +DIST libupnpp-0.26.3.tar.gz 485173 BLAKE2B 9afc516118410bd5ddffe8f59848f25f5fc1da3247127b0fee2d1d6cb18c21247c14628e0e82d1d5ecc640d217a5b463bb692e39864740966a83025801173f9b SHA512 78f9f3fabfbe3f79dc75153e95dc12e6a45064ee853ba19d8e0354baa37e7a2f673d4bc27b73196d91053f976fca7d5837b60de485a48150f6d20217ecedfc78 diff --git a/net-libs/libupnpp/libupnpp-0.21.0.ebuild b/net-libs/libupnpp/libupnpp-0.23.0.ebuild index 14aa6943cc85..ec0227f9ec2d 100644 --- a/net-libs/libupnpp/libupnpp-0.21.0.ebuild +++ b/net-libs/libupnpp/libupnpp-0.23.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,3 +16,8 @@ DEPEND=" net-misc/curl " RDEPEND="${DEPEND}" + +src_install() { + default_src_install + find "${ED}" -name '*.la' -delete || die "Couldn't delete .la files" +} diff --git a/net-libs/libupnpp/libupnpp-0.26.3.ebuild b/net-libs/libupnpp/libupnpp-0.26.3.ebuild new file mode 100644 index 000000000000..a49d443e93fb --- /dev/null +++ b/net-libs/libupnpp/libupnpp-0.26.3.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay" +HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli" +SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + dev-libs/expat + net-libs/libnpupnp + net-misc/curl +" +RDEPEND="${DEPEND}" + +src_install() { + default_src_install + find "${ED}" -name '*.la' -delete || die "Couldn't delete .la files" +} diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest index c7569e5d4778..779ce1c48b7d 100644 --- a/net-libs/libvncserver/Manifest +++ b/net-libs/libvncserver/Manifest @@ -1 +1 @@ -DIST LibVNCServer-0.9.13.tar.gz 567491 BLAKE2B 138c7ca63f8cd30a21dc1b58aafa744e12a1a9eca503ffec18a63d18791d7a5df4eef176d7e4e797a2aadda1dd04d1b051abfd76bf5c6806d558c09ffee78cce SHA512 18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643 +DIST LibVNCServer-0.9.14.tar.gz 593516 BLAKE2B 6585e15e2ade08211ace0ae40deb07eca04b96dcfe38fb4d2e7d7a7192ca22dda546cb69fc4be6c6b7eb83c8afb0ea14d7cee3779a9e64c138ec861efeb540b8 SHA512 8a0a58e355154cbe1e5807864dc874b063c5e5f5e20d64ae541d49d51b654a35ca9c625adc5c303b6570fa79c19f82d87a37612f9801b453ccf862bd77c06fcc diff --git a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch deleted file mode 100644 index 767708288830..000000000000 --- a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 39cff3dd6b5d9ebcf86f01e2c7e0bef62abd9d6f Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> -Date: Thu, 25 Jun 2020 11:35:04 +0300 -Subject: [PATCH 1/2] test: fix includetest to use CMAKE_MAKE_PROGRAM (#431) - -includetest currently fais if, for example, ninja is used as a CMake -generator. Fix it by using CMAKE_MAKE_PROGRAM in the test. ---- - CMakeLists.txt | 2 +- - test/includetest.sh | 7 ++++--- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b6228a2..290deb38 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -680,7 +680,7 @@ endif(LIBVNCSERVER_WITH_WEBSOCKETS) - - add_test(NAME cargs COMMAND test_cargstest) - if(UNIX) -- add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) -+ add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_MAKE_PROGRAM}) - endif(UNIX) - if(FOUND_LIBJPEG_TURBO) - add_test(NAME turbojpeg COMMAND test_tjunittest) -diff --git a/test/includetest.sh b/test/includetest.sh -index 23d602e6..6b064208 100755 ---- a/test/includetest.sh -+++ b/test/includetest.sh -@@ -5,10 +5,11 @@ - - # expects install prefix like /usr as an argument - PREFIX=$1 -+CMAKE_MAKE_PROGRAM=$2 - - TMPDIR=$(mktemp -d) - --make install DESTDIR=$TMPDIR -+DESTDIR="$TMPDIR" $CMAKE_MAKE_PROGRAM install - - echo \ - " -@@ -19,6 +20,6 @@ int main() - { - return 0; - } --" > $TMPDIR/includetest.c -+" > "$TMPDIR"/includetest.c - --cc -I $TMPDIR/$PREFIX $TMPDIR/includetest.c -+cc -I "$TMPDIR/$PREFIX" "$TMPDIR"/includetest.c --- -2.26.2 - diff --git a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch deleted file mode 100644 index 98e3a654b471..000000000000 --- a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8244fab5421fd14d4c75ce488ad18d38b7a6edb4 Mon Sep 17 00:00:00 2001 -From: Christian Beier <info@christianbeier.net> -Date: Thu, 25 Jun 2020 12:21:50 +0200 -Subject: [PATCH 2/2] CMake: only add turbojpeg test if configured WITH_JPEG - -Closes #430 ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 290deb38..fdca4d81 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -682,9 +682,9 @@ add_test(NAME cargs COMMAND test_cargstest) - if(UNIX) - add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_MAKE_PROGRAM}) - endif(UNIX) --if(FOUND_LIBJPEG_TURBO) -+if(WITH_JPEG AND FOUND_LIBJPEG_TURBO) - add_test(NAME turbojpeg COMMAND test_tjunittest) --endif(FOUND_LIBJPEG_TURBO) -+endif(WITH_JPEG AND FOUND_LIBJPEG_TURBO) - if(LIBVNCSERVER_WITH_WEBSOCKETS) - add_test(NAME wstest COMMAND test_wstest) - endif(LIBVNCSERVER_WITH_WEBSOCKETS) --- -2.26.2 - diff --git a/net-libs/libvncserver/files/libvncserver-0.9.14-crypto-openssl-fix.patch b/net-libs/libvncserver/files/libvncserver-0.9.14-crypto-openssl-fix.patch new file mode 100644 index 000000000000..85179ee5ae61 --- /dev/null +++ b/net-libs/libvncserver/files/libvncserver-0.9.14-crypto-openssl-fix.patch @@ -0,0 +1,56 @@ +https://github.com/LibVNC/libvncserver/commit/b686f379c34114cf938fe88291f58014337558f6 +https://bugs.gentoo.org/893608 + +From b686f379c34114cf938fe88291f58014337558f6 Mon Sep 17 00:00:00 2001 +From: Gaurav Ujjwal <gujjwal00@gmail.com> +Date: Mon, 23 Jan 2023 00:03:03 +0530 +Subject: [PATCH] common/crypto_openssl: pad DH key buffers with leading zeros + for smaller keys + +Re: https://github.com/LibVNC/libvncserver/issues/493 +Re: https://github.com/bk138/multivnc/issues/202 +--- a/common/crypto_openssl.c ++++ b/common/crypto_openssl.c +@@ -156,6 +156,15 @@ int encrypt_aes128ecb(void *out, int *out_len, const unsigned char key[16], cons + return result; + } + ++static void pad_leading_zeros(uint8_t *out, const size_t current_len, const size_t expected_len) { ++ if (current_len >= expected_len || expected_len < 1) ++ return; ++ ++ size_t diff = expected_len - current_len; ++ memmove(out + diff, out, current_len); ++ memset(out, 0, diff); ++} ++ + int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen, const size_t gen_len, const uint8_t *prime, const size_t keylen) + { + int result = 0; +@@ -184,6 +193,9 @@ int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen, + goto out; + if(BN_bn2bin(dh->pub_key, pub_out) == 0) + goto out; ++ ++ pad_leading_zeros(priv_out, BN_num_bytes(dh->priv_key), keylen); ++ pad_leading_zeros(pub_out, BN_num_bytes(dh->pub_key), keylen); + #else + DH_get0_key(dh, &pub_key, &priv_key); + if(BN_bn2binpad(priv_key, priv_out, keylen) == -1) +@@ -216,9 +228,11 @@ int dh_compute_shared_key(uint8_t *shared_out, const uint8_t *priv, const uint8_ + if(!DH_set0_key(dh, NULL, BN_bin2bn(priv, keylen, NULL))) + goto out; + #endif +- if(DH_compute_key(shared_out, BN_bin2bn(pub, keylen, NULL), dh) == -1) +- goto out; ++ int shared_len = DH_compute_key(shared_out, BN_bin2bn(pub, keylen, NULL), dh); ++ if(shared_len == -1) ++ goto out; + ++ pad_leading_zeros(shared_out, shared_len, keylen); + result = 1; + + out: +-- +2.39.2 + diff --git a/net-libs/libvncserver/libvncserver-0.9.13.ebuild b/net-libs/libvncserver/libvncserver-0.9.14-r2.ebuild index c046ad17bcf2..02c596ac0d4b 100644 --- a/net-libs/libvncserver/libvncserver-0.9.13.ebuild +++ b/net-libs/libvncserver/libvncserver-0.9.14-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -16,8 +16,8 @@ S="${WORKDIR}/${PN}-${MY_P}" LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT" # no sub slot wanted (yet), see #578958 SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="+24bpp +filetransfer gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib" # https://bugs.gentoo.org/690202 # https://bugs.gentoo.org/435326 # https://bugs.gentoo.org/550916 @@ -29,14 +29,12 @@ REQUIRED_USE=" " DEPEND=" - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= ) + >=dev-libs/libgcrypt-1.5.3:0= ssl? ( - !gnutls? ( - >=dev-libs/openssl-1.0.2:0= - ) + !gnutls? ( >=dev-libs/openssl-1.0.2:0= ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= ) ) - jpeg? ( >=virtual/jpeg-0-r2:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo ) png? ( >=media-libs/libpng-1.6.10:0= ) sasl? ( dev-libs/cyrus-sasl ) @@ -45,21 +43,21 @@ DEPEND=" " RDEPEND="${DEPEND}" -DOCS=( AUTHORS ChangeLog NEWS.md README.md TODO.md ) +DOCS=( AUTHORS ChangeLog NEWS.md README.md ) PATCHES=( - "${FILESDIR}"/${P}-test-fix-includetest.patch - "${FILESDIR}"/${P}-test-fix-tjunittest.patch + "${FILESDIR}"/${P}-crypto-openssl-fix.patch ) src_configure() { local mycmakeargs=( + -DWITH_EXAMPLES=OFF -DWITH_FFMPEG=OFF -DWITH_GTK=OFF -DWITH_SDL=OFF + -DWITH_GCRYPT=ON -DWITH_24BPP=$(usex 24bpp ON OFF) -DWITH_TIGHTVNC_FILETRANSFER=$(usex filetransfer ON OFF) - -DWITH_GCRYPT=$(usex gcrypt ON OFF) -DWITH_GNUTLS=$(usex gnutls $(usex ssl ON OFF) OFF) -DWITH_IPv6=$(usex ipv6 ON OFF) -DWITH_JPEG=$(usex jpeg ON OFF) diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml index 09a7b348775b..74e3157eae46 100644 --- a/net-libs/libvncserver/metadata.xml +++ b/net-libs/libvncserver/metadata.xml @@ -16,11 +16,11 @@ <use> <flag name="24bpp">Enable 24bpp support</flag> <flag name="filetransfer">Enable support for TightVNC's file transfer protocol</flag> - <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as crypto backend</flag> <flag name="lzo">Enable LZO support via <pkg>dev-libs/lzo</pkg> instead of using internal miniLZO implementation</flag> </use> <upstream> <remote-id type="github">LibVNC/libvncserver</remote-id> <remote-id type="sourceforge">libvncserver</remote-id> + <remote-id type="cpe">cpe:/a:libvnc_project:libvncserver</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest index 58a721aea77a..e8421661db3c 100644 --- a/net-libs/libwebsockets/Manifest +++ b/net-libs/libwebsockets/Manifest @@ -1 +1,2 @@ -DIST libwebsockets-4.3.0.tar.gz 15605272 BLAKE2B 6ea48fedf3755f55885f32bc289513182cf735472c161f15d720a76ddfa54e5e2c2d93a343f98d941d14b88f8ca8a13039922f8669b85562c5c0c4312f878b98 SHA512 7f183cb0417a902cb18e76431a8580d87db09c973483f3a129e138e4644b9d0e78e0539e985dc6286d9fe429edea7f63147864dc0413cf8e40fca3d67f9c3c42 +DIST libwebsockets-4.3.2.tar.gz 15616264 BLAKE2B 3b8657b79828102cbfba71ea789acd3b7aec7faaa6317974d182b3cb4b5091d8efcf1f184278f71674624a0f1968450ab056e1d91f9faf2c35c67c6c6f4cb695 SHA512 68d18574dea0563fa4f080c5d0d1cfe21a115bffdb17c6190f6741998f1e5db0739e252ef344ffe6fa4bd6781372456b240539471dd2aa900e43759e0f2d42ad +DIST libwebsockets-4.3.3.tar.gz 15618186 BLAKE2B 24393e0238160767e77a428b1db8430ae5c6efa715e9d917a3fc64c8272e92c8617031c50a75adea4199d678f5ba752f49c24a5d9214aaf43d4e2349c03494ca SHA512 2ffd248ddf283369725097ca7410f947fe0389c360b329c76f0754afab4ba87c20a0687c5e7b8bd991b157f9d20c6faa3049757b3398e66d08662c3aa7ff9658 diff --git a/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.2-r1.ebuild index 5c1d4449fa63..fef44cb5492c 100644 --- a/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild +++ b/net-libs/libwebsockets/libwebsockets-4.3.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -11,8 +11,8 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0/19" # libwebsockets.so.19 -KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" -IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 +KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86" +IUSE="access-log caps cgi client dbus extensions generic-sessions http-proxy http2 ipv6 +lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5 sqlite3 ssl threads zip" @@ -74,6 +74,7 @@ src_configure() { -DLWS_WITH_STRUCT_JSON=$(usex lejp) -DLWS_WITH_THREADPOOL=$(usex threads) -DLWS_WITH_ZIP_FOPS=$(usex zip) + -DLWS_WITHOUT_EXTENSIONS=$(usex !extensions) -DLWS_WITHOUT_TESTAPPS=ON ) diff --git a/net-libs/libwebsockets/libwebsockets-4.3.3.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.3.ebuild new file mode 100644 index 000000000000..172b26185c71 --- /dev/null +++ b/net-libs/libwebsockets/libwebsockets-4.3.3.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A flexible pure-C library for implementing network protocols" +HOMEPAGE="https://libwebsockets.org/" +SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/19" # libwebsockets.so.19 +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="access-log caps cgi client dbus extensions generic-sessions http-proxy http2 ipv6 + +lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5 + sqlite3 ssl threads zip" + +REQUIRED_USE=" + access-log? ( http2 ) + generic-sessions? ( smtp sqlite3 ) + http-proxy? ( client ) + mbedtls? ( ssl ) + smtp? ( libuv ) + socks5? ( client http-proxy ) + ?? ( libev libevent )" + +RDEPEND=" + sys-libs/zlib + caps? ( sys-libs/libcap ) + dbus? ( sys-apps/dbus ) + http-proxy? ( net-libs/libhubbub ) + libev? ( dev-libs/libev ) + libevent? ( dev-libs/libevent:= ) + libuv? ( dev-libs/libuv:= ) + sqlite3? ( dev-db/sqlite:= ) + ssl? ( + !mbedtls? ( dev-libs/openssl:0= ) + mbedtls? ( net-libs/mbedtls:= ) + )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl + virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DDISABLE_WERROR=ON + -DLWS_BUILD_HASH="unknown" + -DLWS_HAVE_LIBCAP=$(usex caps) + -DLWS_IPV6=$(usex ipv6) + -DLWS_ROLE_DBUS=$(usex dbus) + -DLWS_WITHOUT_CLIENT=$(usex !client) + -DLWS_WITHOUT_TEST_CLIENT=$(usex !client) + -DLWS_WITH_ACCESS_LOG=$(usex access-log) + -DLWS_WITH_CGI=$(usex cgi) + -DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions) + -DLWS_WITH_HTTP2=$(usex http2) + -DLWS_WITH_HTTP_PROXY=$(usex http-proxy) + -DLWS_WITH_HUBBUB=$(usex http-proxy) + -DLWS_WITH_LEJP=$(usex lejp) + -DLWS_WITH_LIBEV=$(usex libev) + -DLWS_WITH_LIBEVENT=$(usex libevent) + -DLWS_WITH_LIBUV=$(usex libuv) + -DLWS_WITH_MBEDTLS=$(usex mbedtls) + -DLWS_WITH_PEER_LIMITS=$(usex peer-limits) + -DLWS_WITH_SERVER_STATUS=$(usex server-status) + -DLWS_WITH_SMTP=$(usex smtp) + -DLWS_WITH_SOCKS5=$(usex socks5) + -DLWS_WITH_SQLITE3=$(usex sqlite3) + -DLWS_WITH_SSL=$(usex ssl) + -DLWS_WITH_STATIC=OFF + -DLWS_WITH_STRUCT_JSON=$(usex lejp) + -DLWS_WITH_THREADPOOL=$(usex threads) + -DLWS_WITH_ZIP_FOPS=$(usex zip) + -DLWS_WITHOUT_EXTENSIONS=$(usex !extensions) + -DLWS_WITHOUT_TESTAPPS=ON + ) + + cmake_src_configure +} diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml index a80aaee8a041..fd051da29eec 100644 --- a/net-libs/libwebsockets/metadata.xml +++ b/net-libs/libwebsockets/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>jaco@uls.co.za</email> - <name>Jaco Kroon</name> - </maintainer> <maintainer type="person"> <email>jsmolic@gentoo.org</email> <name>Jakov Smolić</name> @@ -20,13 +16,13 @@ <use> <flag name="access-log">Support generating Apache-compatible access logs</flag> <flag name="client">The client part of the library and libwebsockets-test-client</flag> + <flag name="extensions">Compile with extensions (permessage-deflate)</flag> <flag name="generic-sessions">With the Generic Sessions plugin</flag> - <flag name="http2">Support the HTTP/2 protocol</flag> <flag name="http-proxy">Support for rewriting HTTP proxying</flag> <flag name="lejp">With the Lightweight JSON Parser</flag> - <flag name="libev">Support event loops via dev-libs/libev</flag> - <flag name="libevent">Support event loops via dev-libs/libevent</flag> - <flag name="libuv">Support asynchronous I/O via dev-libs/libuv</flag> + <flag name="libev">Support event loops via <pkg>dev-libs/libev</pkg></flag> + <flag name="libevent">Support event loops via <pkg>dev-libs/libevent</pkg></flag> + <flag name="libuv">Support asynchronous I/O via <pkg>dev-libs/libuv</pkg></flag> <flag name="mbedtls">Use mbedTLS replacement for OpenSSL</flag> <flag name="peer-limits">Track peers and restrict resources a single peer can allocate</flag> <flag name="server-status">Support json + jscript server monitoring</flag> diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest index c269392d3dd0..53fbb61ffd82 100644 --- a/net-libs/libyang/Manifest +++ b/net-libs/libyang/Manifest @@ -1,2 +1,2 @@ -DIST libyang-2.0.112.tar.gz 1075308 BLAKE2B 13c5dee1817f93ec24580d24cfc5d1c066de54dec3d1de60e6f7d67caad527b13e40864301d5e5086b3d92b8769e200674168dd874bc2c786bd5101ec3aa958f SHA512 5da463b86656b9fc944925777a488b3306ef1a1e7efdaf4af677960a04b5544605126bb7e0441e55686b80f97fca70fe86605d0e7c64f634b4297dcc7bd779db -DIST libyang-2.0.97.tar.gz 1066042 BLAKE2B 24ad593b4d4db2c54bf083d3f3469b17de8734aded878d167e383a5e7edb964706a48707e2f0847c7cd4f613b6c1e298325710c4b074f4a3fa1102e22265d632 SHA512 f97f29703f49ef22d04ecf3071d4437417ca95fd0cc2a696269ff646076cca15236874c40ef6a891f1ed4a1173600ba4c6cdd5e0879356b53414c4f0c415c389 +DIST libyang-2.1.148.tar.gz 1266532 BLAKE2B e955958319a4ad8c241720c3a425ab2a298916b8ba34e91ff2b43bafaae65fb0d41c904af894d3c5025ab253a40cb6f4732137b195169785628f6cedeb054acb SHA512 548628e6879f37cd27b0b39197a389c140b4372d11309f588ab93a4d74889b59f891f5b6bc447b491e24544559a42e93a1dbfa49827506aed30b226cf61ca400 +DIST libyang-2.1.55.tar.gz 1201664 BLAKE2B b23d886163b1082c8895d1450113f364288eb6f77c4c73f7da1576877c35312b5558dbaf90e43268e18dd9348b024547c8cc4ee3a7ddabfb3762ffe67c47dc17 SHA512 dd0b58aec7e2d84f62636c62c9e7f67f0b4819e8d5ce9236874a3531607aa6fb58ccdcf537534eae8bfa700c37b8e3524be659929f4e7e03f8f67968bc352cb4 diff --git a/net-libs/libyang/libyang-2.0.112.ebuild b/net-libs/libyang/libyang-2.1.148.ebuild index f34f5a455181..3941774937b6 100644 --- a/net-libs/libyang/libyang-2.0.112.ebuild +++ b/net-libs/libyang/libyang-2.1.148.ebuild @@ -1,10 +1,9 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -CMAKE_ECLASS=cmake -inherit cmake-multilib +inherit cmake DESCRIPTION="YANG data modeling language library" HOMEPAGE="https://github.com/CESNET/libyang" @@ -16,17 +15,17 @@ KEYWORDS="~amd64 ~arm64 ~x86" IUSE="doc test" RESTRICT="!test? ( test )" -RDEPEND="dev-libs/libpcre2[${MULTILIB_USEDEP}]" +RDEPEND="dev-libs/libpcre2" DEPEND=" ${RDEPEND} test? ( dev-util/cmocka ) " BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) " -multilib_src_configure() { +src_configure() { local mycmakeargs=( -DENABLE_TESTS=$(usex test) -DENABLE_VALGRIND_TESTS=OFF @@ -34,12 +33,14 @@ multilib_src_configure() { cmake_src_configure } -multilib_src_compile() { +src_compile() { cmake_src_compile - multilib_is_native_abi && use doc && cmake_src_compile doc + use doc && cmake_src_compile doc } -multilib_src_install_all() { +src_install() { + cmake_src_install + use doc && dodoc -r doc/. } diff --git a/net-libs/libyang/libyang-2.0.97.ebuild b/net-libs/libyang/libyang-2.1.55.ebuild index 2b0dd6643d25..21f0ae31268c 100644 --- a/net-libs/libyang/libyang-2.0.97.ebuild +++ b/net-libs/libyang/libyang-2.1.55.ebuild @@ -1,10 +1,9 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -CMAKE_ECLASS=cmake -inherit cmake-multilib +inherit cmake DESCRIPTION="YANG data modeling language library" HOMEPAGE="https://github.com/CESNET/libyang" @@ -12,21 +11,21 @@ SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="doc test" RESTRICT="!test? ( test )" -RDEPEND="dev-libs/libpcre2[${MULTILIB_USEDEP}]" +RDEPEND="dev-libs/libpcre2" DEPEND=" ${RDEPEND} test? ( dev-util/cmocka ) " BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) " -multilib_src_configure() { +src_configure() { local mycmakeargs=( -DENABLE_TESTS=$(usex test) -DENABLE_VALGRIND_TESTS=OFF @@ -34,12 +33,14 @@ multilib_src_configure() { cmake_src_configure } -multilib_src_compile() { +src_compile() { cmake_src_compile - multilib_is_native_abi && use doc && cmake_src_compile doc + use doc && cmake_src_compile doc } -multilib_src_install_all() { +src_install() { + cmake_src_install + use doc && dodoc -r doc/. } diff --git a/net-libs/libyang/metadata.xml b/net-libs/libyang/metadata.xml index 4057b5d3b086..ef8ac4608f97 100644 --- a/net-libs/libyang/metadata.xml +++ b/net-libs/libyang/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> - <maintainer type="person"> <email>jsmolic@gentoo.org</email> <name>Jakov Smolić</name> </maintainer> diff --git a/net-libs/libzapojit/Manifest b/net-libs/libzapojit/Manifest deleted file mode 100644 index 5c9e51e5bcf6..000000000000 --- a/net-libs/libzapojit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libzapojit-0.0.3.tar.xz 272108 BLAKE2B 7bd606b01cb9b92c844a35d4229e52347c5193033c4fe483eb2fcf5bf76c9773cc26741d7eed8d52c1352767c65055088335ffb0779d390988292956b367584f SHA512 8dc1006db515a4b2971ebccdcf167930566a11bfe74f545e3a9647ff061be4ac2781faf1adbf6e6107b4ff2e08f16b9ad1f96f9b8e4f0eba87601fdc1c35eaa3 diff --git a/net-libs/libzapojit/libzapojit-0.0.3.ebuild b/net-libs/libzapojit/libzapojit-0.0.3.ebuild deleted file mode 100644 index c5f25a502ef2..000000000000 --- a/net-libs/libzapojit/libzapojit-0.0.3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libzapojit" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="+introspection" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86" - -RDEPEND=" - >=dev-libs/glib-2.28:2 - >=net-libs/libsoup-2.38:2.4 - dev-libs/json-glib - net-libs/rest - net-libs/gnome-online-accounts - - introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.11 - >=dev-util/intltool-0.35.0 - sys-devel/gettext - virtual/pkgconfig -" -# eautoreconf needs: -# gnome-base/gnome-common:3 - -src_configure() { - gnome2_src_configure \ - --disable-static \ - $(use_enable introspection) -} diff --git a/net-libs/libzapojit/metadata.xml b/net-libs/libzapojit/metadata.xml deleted file mode 100644 index 7b343b06be8a..000000000000 --- a/net-libs/libzapojit/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/net-libs/liquid-dsp/Manifest b/net-libs/liquid-dsp/Manifest index 7ba122c0f7a1..0f1ec7daae4d 100644 --- a/net-libs/liquid-dsp/Manifest +++ b/net-libs/liquid-dsp/Manifest @@ -1 +1,2 @@ DIST liquid-dsp-1.3.2.tar.gz 1119114 BLAKE2B 4530f3929b97f04cf2e02283af0b0482a7e19783f73cd60b02aeadb26df9f7d33a43847496858b6178526abef34fc5121e94bde38df3796bbdf7149251a29e25 SHA512 1af317512f56078a79396fd3c7a0135c97ef63fd187d52db1b62ddabca683a37fa6b358adafd76d81c3cb06c54f9c7c8fd66f8bb86c0bfebec9e9ef1441ca5d2 +DIST liquid-dsp-1.6.0.tar.gz 1243435 BLAKE2B 5bfb93e1b3396d654a78ab153d963df80ed7f23b5023c26302d229bd4109a54d7f72862d15f1fe8f2d27371509010c8571734e5e173efcb75a13923b00dbed40 SHA512 2567d03515e87ab0c047158aeaabb560be711ac54d0b8294b19782104089c4cc61e5b1ec6d3e9ab78162224d4a2d4623e3694e497572d573cb4ce6f451d0a078 diff --git a/net-libs/liquid-dsp/liquid-dsp-1.6.0.ebuild b/net-libs/liquid-dsp/liquid-dsp-1.6.0.ebuild new file mode 100644 index 000000000000..cda9d88582d0 --- /dev/null +++ b/net-libs/liquid-dsp/liquid-dsp-1.6.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="digital signal processing library for software-defined radios" +HOMEPAGE="https://liquidsdr.org" + +LICENSE="MIT" +SLOT="0" + +if [ "${PV}" = "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jgaeddert/liquid-dsp.git" +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/jgaeddert/liquid-dsp/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +IUSE="static-libs" + +DEPEND="sci-libs/fftw:3.0=" +RDEPEND="${DEPEND}" + +src_prepare() { + eapply_user + eautoreconf +} + +src_configure() { + #without this rather odd looking bit, it installs libraries into /usr/usr/$(get_libdir) + #what is super special is that if exec-prefix is unset, libdir is lib64... + #but if exec-prefix is default then libdir ends up as /usr/lib64 in makefile... + econf --exec-prefix="" --libdir="/usr/$(get_libdir)" +} + +src_install() { + default + ! use static-libs && rm "${ED}"/usr/"$(get_libdir)"/libliquid.a +} diff --git a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild index 342db248e427..cda9d88582d0 100644 --- a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild +++ b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest index e1ff682afffe..06f7a4db47cf 100644 --- a/net-libs/loudmouth/Manifest +++ b/net-libs/loudmouth/Manifest @@ -1 +1 @@ -DIST loudmouth-1.5.3.tar.bz2 375974 BLAKE2B c9707fe18560104456a624a61437240a16bb6bbaf544cdf775f6d6c64fdbeb6eb8f7042eb13fcdeb36c89bb8d9522c2eba02c24987757c0f0ac8748d92a2b166 SHA512 ab6b16b4e644b69cdb7d8df1753d1bb5b43c2f1e76944e639339169b332e1b5c6a4246053c5b8a579ee9b53c845cef610b0040dfdffeb857180b6bab71adfcce +DIST loudmouth-1.5.4.tar.bz2 361323 BLAKE2B 1d8453625262e4f9dc8d603619b71cac073831462164a10a92a5118c212293ae4ad9a0ca276b07b7919a0aebce633b4afaabb015ecf4b33e7c641a4273edc64a SHA512 49a08f0130b9ee56f07586d244504c81242723865a136b03e1049f32b1aa1e6c49e9b76b38f0cfb812ef4c66f73b7d83914a58e9a93e0496207e06c2b5efa9d8 diff --git a/net-libs/loudmouth/files/loudmouth-1.5.3-gcc7.patch b/net-libs/loudmouth/files/loudmouth-1.5.3-gcc7.patch deleted file mode 100644 index 83e0aea69d74..000000000000 --- a/net-libs/loudmouth/files/loudmouth-1.5.3-gcc7.patch +++ /dev/null @@ -1,25 +0,0 @@ -Bug: https://bugs.gentoo.org/618330 -Upstream commit: https://github.com/mcabber/loudmouth/commit/01fdfa0f5d1b8502b92d2e78d757e9b19661d054 - -From 01fdfa0f5d1b8502b92d2e78d757e9b19661d054 Mon Sep 17 00:00:00 2001 -From: tmp170422 <tmp131110@ya.ru> -Date: Sun, 14 May 2017 12:18:32 +0300 -Subject: [PATCH] An apparent typo - ---- - loudmouth/lm-sasl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/loudmouth/lm-sasl.c b/loudmouth/lm-sasl.c -index 00cf9b7..38cd88c 100644 ---- a/loudmouth/lm-sasl.c -+++ b/loudmouth/lm-sasl.c -@@ -529,7 +529,7 @@ sasl_md5_prepare_response (LmSASL *sasl, GHashTable *challenge) - } - - nonce = g_hash_table_lookup (challenge, "nonce"); -- if (nonce == NULL || nonce == '\0') { -+ if (nonce == NULL || nonce[0] == '\0') { - g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SASL, - "%s: server didn't provide a nonce in the challenge", - G_STRFUNC); diff --git a/net-libs/loudmouth/files/loudmouth-1.5.4-freeaddrinfo-musl.patch b/net-libs/loudmouth/files/loudmouth-1.5.4-freeaddrinfo-musl.patch new file mode 100644 index 000000000000..f75714a75058 --- /dev/null +++ b/net-libs/loudmouth/files/loudmouth-1.5.4-freeaddrinfo-musl.patch @@ -0,0 +1,40 @@ +https://github.com/mcabber/loudmouth/pull/46 + +From f32119e1408c742da9a1862805d76d222937756d Mon Sep 17 00:00:00 2001 +From: psykose <alice@ayaya.dev> +Date: Thu, 21 Apr 2022 18:23:32 +0000 +Subject: [PATCH] fix macro define for freeaddrinfo with asyncns + +previously, this define was only made in lm-asyncns-resolver.c, which +does not propagate it to lm-resolver.c, where freeaddrinfo() is used. +this means that when asyncns support is used, the standard libc +freeaddrinfo() is called on an addrinfo acquired from +asyncns_getaddrinfo, which is undefined behaviour, and leads to a +segfault on musl libc. +--- a/loudmouth/lm-asyncns-resolver.c ++++ b/loudmouth/lm-asyncns-resolver.c +@@ -21,7 +21,6 @@ + #include <string.h> + #ifdef HAVE_ASYNCNS + #include <asyncns.h> +-#define freeaddrinfo(x) asyncns_freeaddrinfo(x) + + /* Needed on Mac OS X */ + #if HAVE_ARPA_NAMESER_COMPAT_H +--- a/loudmouth/lm-asyncns-resolver.h ++++ b/loudmouth/lm-asyncns-resolver.h +@@ -19,8 +19,14 @@ + #ifndef __LM_ASYNCNS_RESOLVER_H__ + #define __LM_ASYNCNS_RESOLVER_H__ + ++#include <config.h> ++ + #include <glib-object.h> + ++#ifdef HAVE_ASYNCNS ++#define freeaddrinfo(x) asyncns_freeaddrinfo(x) ++#endif ++ + #include "lm-resolver.h" + + G_BEGIN_DECLS diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild b/net-libs/loudmouth/loudmouth-1.5.4.ebuild index 4a48f8ae0e73..c86e15a83384 100644 --- a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild +++ b/net-libs/loudmouth/loudmouth-1.5.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Lightweight C Jabber library" HOMEPAGE="https://mcabber.com" @@ -9,30 +9,25 @@ SRC_URI="https://mcabber.com/files/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos" - -IUSE="asyncns ssl openssl static-libs test" +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~ppc-macos" +IUSE="asyncns ssl openssl test" RESTRICT="!test? ( test )" # Automagic libidn dependency -RDEPEND=" - >=dev-libs/glib-2.16:2 +RDEPEND=">=dev-libs/glib-2.16:2 net-dns/libidn:= ssl? ( !openssl? ( >=net-libs/gnutls-1.4.0:0= ) openssl? ( dev-libs/openssl:0= ) ) - asyncns? ( >=net-libs/libasyncns-0.3 ) -" + asyncns? ( >=net-libs/libasyncns-0.3 )" DEPEND="${RDEPEND} - dev-util/glib-utils - dev-util/gtk-doc-am - test? ( dev-libs/check ) - virtual/pkgconfig -" + test? ( dev-libs/check )" +BDEPEND="dev-util/glib-utils + virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${P}-gcc7.patch + "${FILESDIR}"/${PN}-1.5.4-freeaddrinfo-musl.patch ) src_configure() { @@ -48,8 +43,15 @@ src_configure() { myconf="${myconf} --with-ssl=no" fi + # --with-compile-warnings=yes to avoid default =error econf \ - $(use_enable static-libs static) \ $(use_with asyncns) \ + --with-compile-warnings=yes \ ${myconf} } + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/loudmouth/metadata.xml b/net-libs/loudmouth/metadata.xml index b54ff2f9f0e4..88fdcd4e46d1 100644 --- a/net-libs/loudmouth/metadata.xml +++ b/net-libs/loudmouth/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>andrey_utkin@gentoo.org</email> - <name>Andrey Utkin</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="asyncns">Use <pkg>net-libs/libasyncns</pkg> for asynchronous name resolution.</flag> <flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> support instead of gnutls (which is the default).</flag> diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest index 1551b46251fb..b424ead33b61 100644 --- a/net-libs/mbedtls/Manifest +++ b/net-libs/mbedtls/Manifest @@ -1,3 +1,3 @@ -DIST mbedtls-2.16.11.tar.gz 2692209 BLAKE2B 9d7bccfc0d1bc5a038b6dcb866722a27362c229a5f1b515396aabbb53e77cfe36525446fb2557c817772810f24335a51c9a5c45bcfa866d8a07ff4e96498dbde SHA512 b35de49ce596b549b5e85b6affdf2cf1360fb8b0d4e551636a91a4923b1cb212dce7880d575d40c73d5682afe8bb893312d803798ce8f807842a2aab8e2ba2ee -DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994 -DIST mbedtls-3.0.0.tar.gz 4163127 BLAKE2B 5d94124a251dbcc38de614319f93c6f0346de516fd944c765ab3e60d46fba8fbbdba7a6f9e00f5f0550137301b4de98795851df788e367c4fcf03abb981d3c63 SHA512 be11878d82fc93d0847718514f4887c68d7b186c54682316c4a01082583a917b81f9760bb708aab72bf37148581a8dbc9f7048faf745cd2e1cd7e5bf8c48abad +DIST mbedtls-2.28.5.tar.gz 4005000 BLAKE2B 755287e1a1e0be5d193a8a184a9ae3ab2b6c216235657f7f2e422fe06226cd4c7d11811bcb53519018137e7ed838b241704c955872e28f133bb17a5f42222acb SHA512 339911d244b4e6e4d77b344c796f018d9ad4c56249530b8a56e0dc305ddf30bc709dca96a19c5a06710e92d167ef22893e9e17e20837e9daee0d0be00a8ccae9 +DIST mbedtls-2.28.7.tar.gz 3990571 BLAKE2B 91a11d9d56fc058c3aef797e644c2c141cd70dc96716e75d9074de89717298a10c93e403a2fed9ae6f34c7549753a70d61b6602fbc21bc568c2e260d4f369f65 SHA512 1cf6722d60a49375f857c8d84f06dbb50ea08accaa12b329d75a93b959aef382410e7b6e0a1511407402b3eec5e2208eaf5e9fc2c8574ed0f8f44234bc4401b3 +DIST mbedtls-3.5.2.tar.gz 5584711 BLAKE2B f1d0e7368ad156cc5cde4cd396ccaf3e1cacfda38f7d7ee89c908245944d22152d141928e8aeebd298437079e7fdb74207875e2f48ce3ef1a6f5fb8840b19df3 SHA512 99f4110d8410415982cb9b71994b069e4d2f89841decccc68b629250c7497c10d5e3ffe867c4ac1518ec7d6edd9703c38fd8afb6c238e9e0e7132def2b09b4e3 diff --git a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.28.5.ebuild index fc18e8b6b047..0ef263d1a1fe 100644 --- a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild +++ b/net-libs/mbedtls/mbedtls-2.28.5.ebuild @@ -1,29 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake multilib-minimal DESCRIPTION="Cryptographic library for embedded systems" -HOMEPAGE="https://tls.mbed.org/" -SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz" -S=${WORKDIR}/${PN}-${P} +HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/" +SRC_URI="https://github.com/Mbed-TLS/mbedtls/archive/${P}.tar.gz" +S="${WORKDIR}"/${PN}-${P} LICENSE="Apache-2.0" -SLOT="0/7.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so} -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib" +SLOT="0/7.14.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so} +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib" RESTRICT="!test? ( test )" RDEPEND=" programs? ( - dev-libs/openssl:0= + dev-libs/openssl:= ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen media-gfx/graphviz ) - test? ( dev-lang/perl )" + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-text/doxygen + media-gfx/graphviz + ) + test? ( dev-lang/perl ) +" enable_mbedtls_option() { local myopt="$@" @@ -34,6 +40,7 @@ enable_mbedtls_option() { } src_prepare() { + use cmac && enable_mbedtls_option MBEDTLS_CMAC_C use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2 use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C @@ -60,19 +67,14 @@ multilib_src_configure() { multilib_src_compile() { cmake_src_compile - use doc && multilib_is_native_abi && cd "${S}" && emake apidoc + use doc && multilib_is_native_abi && emake -C "${S}" apidoc } multilib_src_test() { - # psa isn't ready yet, it might be in 3.x(?) but certainly not - # at the moment. - # bug #718390 - local myctestargs=( - -E "(psa_crypto|psa_its-suite)" - ) - + # Disable parallel run, bug #718390 + # https://github.com/Mbed-TLS/mbedtls/issues/4980 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ - cmake_src_test + cmake_src_test -j1 } multilib_src_install() { diff --git a/net-libs/mbedtls/mbedtls-2.16.11.ebuild b/net-libs/mbedtls/mbedtls-2.28.7.ebuild index 8ddca1907c00..7a9d0182863d 100644 --- a/net-libs/mbedtls/mbedtls-2.16.11.ebuild +++ b/net-libs/mbedtls/mbedtls-2.28.7.ebuild @@ -1,29 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake multilib-minimal +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake multilib-minimal python-any-r1 DESCRIPTION="Cryptographic library for embedded systems" -HOMEPAGE="https://tls.mbed.org/" -SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz" -S=${WORKDIR}/${PN}-${P} - -LICENSE="Apache-2.0" -SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so} -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib" +HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/" +SRC_URI="https://github.com/Mbed-TLS/mbedtls/archive/${P}.tar.gz" +S="${WORKDIR}"/${PN}-${P} + +LICENSE="|| ( Apache-2.0 GPL-2+ )" +SLOT="0/7.14.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so} +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib" RESTRICT="!test? ( test )" RDEPEND=" - programs? ( - dev-libs/openssl:0= + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + doc? ( + app-text/doxygen + media-gfx/graphviz ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen media-gfx/graphviz ) - test? ( dev-lang/perl )" + test? ( dev-lang/perl ) +" enable_mbedtls_option() { local myopt="$@" @@ -34,6 +40,7 @@ enable_mbedtls_option() { } src_prepare() { + use cmac && enable_mbedtls_option MBEDTLS_CMAC_C use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2 use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C @@ -46,12 +53,14 @@ src_prepare() { multilib_src_configure() { local mycmakeargs=( -DENABLE_PROGRAMS=$(multilib_native_usex programs) - -DENABLE_ZLIB_SUPPORT=$(usex zlib) - -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs) -DENABLE_TESTING=$(usex test) - -DUSE_SHARED_MBEDTLS_LIBRARY=ON + -DENABLE_ZLIB_SUPPORT=$(usex zlib) -DINSTALL_MBEDTLS_HEADERS=ON -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DLINK_WITH_PTHREAD=$(usex threads) + -DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946 + -DUSE_SHARED_MBEDTLS_LIBRARY=ON + -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs) ) cmake_src_configure @@ -59,19 +68,14 @@ multilib_src_configure() { multilib_src_compile() { cmake_src_compile - use doc && multilib_is_native_abi && cd "${S}" && emake apidoc + use doc && multilib_is_native_abi && emake -C "${S}" apidoc } multilib_src_test() { - # psa isn't ready yet, it might be in 3.x(?) but certainly not - # at the moment. - # bug #718390 - local myctestargs=( - -E "(psa_crypto|psa_its-suite)" - ) - + # Disable parallel run, bug #718390 + # https://github.com/Mbed-TLS/mbedtls/issues/4980 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ - cmake_src_test + cmake_src_test -j1 } multilib_src_install() { diff --git a/net-libs/mbedtls/mbedtls-3.0.0.ebuild b/net-libs/mbedtls/mbedtls-3.5.2.ebuild index 54ef48f6e4fa..963a8edbe27c 100644 --- a/net-libs/mbedtls/mbedtls-3.0.0.ebuild +++ b/net-libs/mbedtls/mbedtls-3.5.2.ebuild @@ -1,28 +1,31 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake multilib-minimal +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake multilib-minimal python-any-r1 DESCRIPTION="Cryptographic library for embedded systems" -HOMEPAGE="https://tls.mbed.org/" -SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz" -S=${WORKDIR}/${PN}-${P} +HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/" +SRC_URI="https://github.com/Mbed-TLS/mbedtls/archive/${P}.tar.gz" +S="${WORKDIR}"/${PN}-${P} -LICENSE="Apache-2.0" -SLOT="0/10.16.4" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so} -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +LICENSE="|| ( Apache-2.0 GPL-2+ )" +SLOT="0/15.20.6" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so} +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="cpu_flags_x86_sse2 doc programs static-libs test threads" RESTRICT="!test? ( test )" -RDEPEND=" - programs? ( - dev-libs/openssl:0= - )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen media-gfx/graphviz ) - test? ( dev-lang/perl )" +BDEPEND=" + ${PYTHON_DEPS} + doc? ( + app-text/doxygen + media-gfx/graphviz + ) + test? ( dev-lang/perl ) +" enable_mbedtls_option() { local myopt="$@" @@ -43,12 +46,13 @@ src_prepare() { multilib_src_configure() { local mycmakeargs=( -DENABLE_PROGRAMS=$(multilib_native_usex programs) - -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs) -DENABLE_TESTING=$(usex test) - -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DINSTALL_MBEDTLS_HEADERS=ON -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DLINK_WITH_PTHREAD=$(usex threads) -DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946 + -DUSE_SHARED_MBEDTLS_LIBRARY=ON + -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs) ) cmake_src_configure @@ -56,18 +60,14 @@ multilib_src_configure() { multilib_src_compile() { cmake_src_compile - use doc && multilib_is_native_abi && cd "${S}" && emake apidoc + use doc && multilib_is_native_abi && emake -C "${S}" apidoc } multilib_src_test() { - # psa isn't ready yet, even in 3.0.0. - # bug #718390 - local myctestargs=( - -E "(psa_crypto|psa_its-suite)" - ) - + # Disable parallel run, bug #718390 + # https://github.com/Mbed-TLS/mbedtls/issues/4980 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ - cmake_src_test + cmake_src_test -j1 } multilib_src_install() { diff --git a/net-libs/mbedtls/metadata.xml b/net-libs/mbedtls/metadata.xml index abf57a31dfbf..83b4b19aa6eb 100644 --- a/net-libs/mbedtls/metadata.xml +++ b/net-libs/mbedtls/metadata.xml @@ -1,22 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> + <maintainer type="person" proxied="yes"> + <email>azamat.hackimov@gmail.com</email> + <name>Azamat H. Hackimov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <longdescription lang="en"> - The aim of the mbed TLS project is to provide a quality, open-source + The aim of the Mbed TLS project is to provide a quality, open-source cryptographic library written in C and targeted at embedded systems. </longdescription> <use> + <flag name="cmac">Enable block cipher-based message authentication + code algorithm + </flag> <flag name="havege">Enable the HAVEGE random generator. Warning: the HAVEGE random generator is not suitable for virtualized environments </flag> - <flag name="programs">Build PolarSSL programs</flag> + <flag name="programs">Build Mbed TLS programs</flag> </use> <upstream> - <remote-id type="github">ARMmbed/mbedtls</remote-id> + <remote-id type="cpe">cpe:/a:arm:mbed_tls</remote-id> + <remote-id type="github">Mbed-TLS/mbedtls</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild index 6cc8c1ac51fa..365fda05aaf2 100644 --- a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild +++ b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,11 +7,11 @@ inherit autotools flag-o-matic DESCRIPTION="Meanwhile (Sametime protocol) library" HOMEPAGE="http://meanwhile.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="doc debug" RDEPEND="dev-libs/glib:2" @@ -20,7 +20,7 @@ DEPEND=" dev-libs/gmp" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen )" + doc? ( app-text/doxygen )" PATCHES=( # bug 239144 diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest index 8263aaeaa324..1bfa020c464e 100644 --- a/net-libs/miniupnpc/Manifest +++ b/net-libs/miniupnpc/Manifest @@ -1,2 +1,2 @@ -DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad040fd7eab64be5b5716cb06047e86e3ed6a9c17f697fd3210af0fb0a6ae032b6ef0a5c1f0d96a2e185db97b0d06e8 SHA512 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee -DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e +DIST miniupnpc-2.2.7.tar.gz 104258 BLAKE2B 5681c1747c8e330442a0ad46d673e1739283bfc23571cb2225abf82326caa7da979911b3182cab2e3eea49140b90619f4e00bb5b1e2f0cd6067c28017cf87016 SHA512 d24e653c2f7bfed4485342c5ec8d18b4dd4c3430975b5fae392d3534f38bb3fb59e6638e76d57847f49045e22f3afd6cac128d7d9d10ef05bd6ad24ef38303b6 +DIST miniupnpc-2.2.7.tar.gz.sig 543 BLAKE2B 6649e5866afd13034b05a9d771c25c419e85631ca17ed7457e5811aee0ba8c38b0ad34033caa5b611cde21a63251e902e3f24cc4748e52a4a379ef075bf59dc5 SHA512 188837275b20c61c05babac916bff86178774030dbc191ecd0e5314c6e9b6dbb627680b512c554a8b27a020bd7503b141be26a134e0ed7e2cc56c7e2c01d9e81 diff --git a/net-libs/miniupnpc/files/miniupnpc-2.2.3-drop-which.patch b/net-libs/miniupnpc/files/miniupnpc-2.2.3-drop-which.patch new file mode 100644 index 000000000000..fc578e5e6147 --- /dev/null +++ b/net-libs/miniupnpc/files/miniupnpc-2.2.3-drop-which.patch @@ -0,0 +1,38 @@ +Not upstream b/c already done in 2.3.0: +https://github.com/miniupnp/miniupnp/commit/c88178650e2551226a88cbc87084014781f81184 +https://github.com/miniupnp/miniupnp/commit/d2f558f659da923144f591be418380a7ff8a8677 +--- a/Makefile ++++ b/Makefile +@@ -15,7 +15,7 @@ VERSION = $(shell cat VERSION) + + ifneq (, $(findstring darwin, $(OS))) + JARSUFFIX=mac +-LIBTOOL ?= $(shell which libtool) ++LIBTOOL ?= $(shell command -v libtool) + endif + ifneq (, $(findstring linux, $(OS))) + JARSUFFIX=linux +--- a/testminiwget.sh ++++ b/testminiwget.sh +@@ -24,8 +24,8 @@ EXPECTEDFILE="${TMPD}/expectedfile" + DOWNLOADEDFILE="${TMPD}/downloadedfile" + PORT= + RET=0 +-IPCONFIG=$(which ifconfig) +-IP=$(which ip) ++IPCONFIG=$(command -v ifconfig) ++IP=$(command -v ip) + if [ "$IP" ] ; then + if ! $IP addr | grep inet6 ; then + HAVE_IPV6=no +--- a/updateminiupnpcstrings.sh ++++ b/updateminiupnpcstrings.sh +@@ -26,7 +26,7 @@ if [ -f /etc/debian_version ]; then + OS_VERSION=`cat /etc/debian_version` + fi + # use lsb_release (Linux Standard Base) when available +-LSB_RELEASE=`which lsb_release` ++LSB_RELEASE=`command -v lsb_release` + if [ 0 -eq $? -a -x "${LSB_RELEASE}" ]; then + OS_NAME=`${LSB_RELEASE} -i -s` + OS_VERSION=`${LSB_RELEASE} -r -s` diff --git a/net-libs/miniupnpc/files/miniupnpc-2.2.3-makefile.patch b/net-libs/miniupnpc/files/miniupnpc-2.2.3-makefile.patch deleted file mode 100644 index 7578bc3f8819..000000000000 --- a/net-libs/miniupnpc/files/miniupnpc-2.2.3-makefile.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ed1dc4bb5cdc4a53963f3eb01089289e30acc5a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 29 Sep 2021 08:28:27 +0200 -Subject: [PATCH] Makefile: fix install rules to account for $(BUILD) - -Fix missing references to $(BUILD) in the install rules, as well -as incorrect shared library symlink name. Otherwise, the 'install' -phase fails either being unable to find files: - - make: *** No rule to make target 'miniupnpc.pc', needed by 'install'. Stop. - -or trying to create the symlink in the wrong subdirectory: - - ln: failed to create symbolic link '/tmp/z/usr/lib/build/libminiupnpc.so': No such file or directory ---- - miniupnpc/Makefile | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/miniupnpc/Makefile b/miniupnpc/Makefile -index 4563b28..11a17f9 100644 ---- a/Makefile -+++ b/Makefile -@@ -162,7 +162,7 @@ PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig - - FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES) - ifeq (, $(findstring amiga, $(OS))) --FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc -+FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc - endif - - -@@ -251,15 +251,15 @@ install: updateversion $(FILESTOINSTALL) - $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB) - ifeq (, $(findstring amiga, $(OS))) - $(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME) -- ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY) -+ ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(notdir $(SHAREDLIBRARY)) - $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR) -- $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR) -+ $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR) - endif - $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN) - ifneq (, $(findstring amiga, $(OS))) -- $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc -+ $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc - else -- $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc -+ $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc - endif - $(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip - ifeq (, $(findstring amiga, $(OS))) --- -2.33.0 - diff --git a/net-libs/miniupnpc/metadata.xml b/net-libs/miniupnpc/metadata.xml index a3c057ba374d..c89549110c7c 100644 --- a/net-libs/miniupnpc/metadata.xml +++ b/net-libs/miniupnpc/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>MichaÅ‚ Górny</name> -</maintainer> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>MichaÅ‚ Górny</name> + </maintainer> + <upstream> + <remote-id type="github">miniupnp/miniupnp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.7.ebuild index fc6f2fcdf34b..8f58e1fc3ffd 100644 --- a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild +++ b/net-libs/miniupnpc/miniupnpc-2.2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,31 +6,38 @@ EAPI=8 inherit toolchain-funcs verify-sig DESCRIPTION="UPnP client library and a simple UPnP client" -HOMEPAGE="http://miniupnp.free.fr/" -SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz - verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )" +HOMEPAGE=" + http://miniupnp.free.fr/ + https://miniupnp.tuxfamily.org/ + https://github.com/miniupnp/miniupnp/ +" +SRC_URI=" + https://miniupnp.tuxfamily.org/files/${P}.tar.gz + verify-sig? ( + https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig + ) +" LICENSE="BSD" SLOT="0/17" -KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="ipv6 kernel_linux" +KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -RDEPEND="" BDEPEND=" - kernel_linux? ( sys-apps/lsb-release sys-apps/which ) - verify-sig? ( app-crypt/openpgp-keys-miniupnp )" + kernel_linux? ( sys-apps/lsb-release ) + verify-sig? ( sec-keys/openpgp-keys-miniupnp ) +" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc src_prepare() { local PATCHES=( - "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/miniupnpc-2.2.3-drop-which.patch ) default local exprs=( # These bins are not installed, upnpc-static requires building static lib - -e '/EXECUTABLES =/s/ upnpc-static listdevices//' + -e '/EXECUTABLES =/s/ upnpc-static upnp-listdevices-static//' # Prevent gzipping manpage. -e '/gzip/d' # Disable installing the static library @@ -49,14 +56,14 @@ src_compile() { } src_test() { - emake -j1 HAVE_IPV6=$(usex ipv6) check + emake -j1 check } src_install() { emake \ DESTDIR="${D}" \ PREFIX="${EPREFIX}/usr" \ - INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \ + LIBDIR="$(get_libdir)" \ install dodoc README Changelog.txt diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest index 505e78a99b99..cc2200b5f302 100644 --- a/net-libs/nDPI/Manifest +++ b/net-libs/nDPI/Manifest @@ -1 +1,3 @@ -DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4afd3108b1caff3b0d38251808bcd52ead253f451474195994fbf94658f70241acedb23c35a475df3b15c4a20 SHA512 ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c +DIST nDPI-4.2.tar.gz 126559327 BLAKE2B 079267939083e788ce8b13e89b194504031e4c3e628df335ece7aab72cc80b8d8538badd45dac9fdaeeed8cd5dd19a81fece9c1157cba9a91dfa130abef61473 SHA512 c58b228b7de2b5fa111234bb065f9be259cd0282d0058f5985180aab6567c9a18e3453ce9062bd3c057a096ec3dfdc21b7c9680e0148e34af10f707530d853b8 +DIST nDPI-4.4.tar.gz 151062073 BLAKE2B fca968c0d0abcf18a6895dc6066b754925a2aa3cb3f395383f9add25066adf14bb95444a30950e13f7f22223ff203b16e7373c875841f33d8c885be83ed0bb6d SHA512 c5e3d38f7b6533bd4b9f96520c1d965bf0a8e3ec7e2d514bc42683bdb73d8331e28ed695f5d3972ace9e35f1af23359f5a25c0f5a20f7a8cc7a6b5446d592468 +DIST nDPI-4.6.tar.gz 29705235 BLAKE2B 65efdfee7af83093b08897fb726a07cf804a3ff901e7373cdc4b3d4564bbfba6ce9b498ab90172f437568c8275685dc51617e991216e38d515b3b5341760b964 SHA512 12dd50eeaae0aa5c2e3c89cb53cdb9989036759bd900312d3875eaba296646c2e42be31dc2b003cbc2401ccef8fbf8d2e460b9a604d7bece360f17f937d60cad diff --git a/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch b/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch deleted file mode 100644 index 7ae5a04d4e8c..000000000000 --- a/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch +++ /dev/null @@ -1,19 +0,0 @@ -Ensure that we fail if libpcap can't be detected, rather than exiting with a success return code. ---- a/configure.seed -+++ b/configure.seed -@@ -126,12 +126,9 @@ case "$host" in - AC_CHECK_LIB([dl], [dlopen, dlsym], [DL_LIB="-ldl"],[AC_CHECK_LIB([c], [dlopen, dlsym], [DL_LIB="-lc"],[AC_MSG_ERROR([unable to find the dlopen(), dlsym() functions]) ]) ]) - else - AC_CHECK_LIB([pcap], [pcap_open_live], [PCAP_LIB="-lpcap"]) -- if test $ac_cv_lib_pcap_pcap_open_live = "no"; then : -- echo "" -- echo "ERROR: Missing libpcap(-dev) library required to compile the example application" -- echo "ERROR: Please install it and try again" -- exit -- fi -+ if test $ac_cv_lib_pcap_pcap_open_live = "no"; then : -+ AC_MSG_ERROR([Cannot find libpcap which is required to compile the example application]) -+ fi - fi - ;; - esac diff --git a/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch b/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch deleted file mode 100644 index 7e8f381cdeab..000000000000 --- a/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch +++ /dev/null @@ -1,16 +0,0 @@ -Sourced from https://github.com/gentoo/gentoo/commit/c02681fcb7839ac1829ec09394334ddbca1b0aea - -diff --git a/src/lib/protocols/kerberos.c b/src/lib/protocols/kerberos.c -index fa0ab6cb..32319668 100644 ---- a/src/lib/protocols/kerberos.c -+++ b/src/lib/protocols/kerberos.c -@@ -189,7 +189,8 @@ void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct, - - body_offset = koffsetp + 1 + pad_len; - -- for(i=0; i<10; i++) if(body_offset<packet->payload_packet_len && packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */ -+ for(i=0; i<10 && body_offset < packet->payload_packet_len; i++) -+ if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */ - #ifdef KERBEROS_DEBUG - printf("body_offset=%u [%02X %02X] [byte 0 must be 0x05]\n", body_offset, packet->payload[body_offset], packet->payload[body_offset+1]); - #endif diff --git a/net-libs/nDPI/nDPI-3.4.ebuild b/net-libs/nDPI/nDPI-3.4.ebuild deleted file mode 100644 index cb053734cf39..000000000000 --- a/net-libs/nDPI/nDPI-3.4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit" -HOMEPAGE="https://www.ntop.org/" -SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0/$(ver_cut 1)" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-libs/json-c:= - net-libs/libpcap" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-3.4-fix-oob-in-kerberos-dissector.patch" - "${FILESDIR}/${PN}-3.4-configure-fail-libcap.patch" -) - -src_prepare() { - eval $(grep '^NDPI_MAJOR=' autogen.sh) - eval $(grep '^NDPI_MINOR=' autogen.sh) - eval $(grep '^NDPI_PATCH=' autogen.sh) - NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}" - - default - - sed \ - -e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \ - -e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \ - -e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \ - -e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \ - -e "s/@FUZZY@//g" \ - < "${S}/configure.seed" \ - > "${S}/configure.ac" || die - - sed -i \ - -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \ - src/lib/Makefile.in || die - - eautoreconf - - # Taken from autogen.sh (bug #704074): - sed -i \ - -e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \ - -e "s/#define VERSION/#define NDPI_VERSION/g" \ - configure || die -} - -src_install() { - default - rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die -} - -src_test() { - pushd tests || die - ./do.sh || die "Failed tests" - ./do-unit.sh || die "Failed tests" - popd || die -} diff --git a/net-libs/nDPI/nDPI-4.2.ebuild b/net-libs/nDPI/nDPI-4.2.ebuild new file mode 100644 index 000000000000..a7730e61c252 --- /dev/null +++ b/net-libs/nDPI/nDPI-4.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit" +HOMEPAGE="https://www.ntop.org/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ntop/${PN}" + inherit git-r3 +else + SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-3+" +SLOT="0/$(ver_cut 1)" + +DEPEND="dev-libs/json-c:= + dev-libs/libgcrypt:= + dev-libs/libgpg-error + net-libs/libpcap" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i \ + -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \ + src/lib/Makefile.in || die + + eautoreconf +} + +src_test() { + pushd tests || die + + ./do.sh || die "Failed tests" + ./do-unit.sh || die "Failed unit tests" + + popd || die +} + +src_install() { + default + + rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die +} diff --git a/net-libs/nDPI/nDPI-4.4.ebuild b/net-libs/nDPI/nDPI-4.4.ebuild new file mode 100644 index 000000000000..e2efa26265f9 --- /dev/null +++ b/net-libs/nDPI/nDPI-4.4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools edo + +DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit" +HOMEPAGE="https://www.ntop.org/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ntop/${PN}" + inherit git-r3 +else + SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-3+" +SLOT="0/$(ver_cut 1)" + +DEPEND="dev-libs/json-c:= + dev-libs/libgcrypt:= + dev-libs/libgpg-error + net-libs/libpcap" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i \ + -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \ + src/lib/Makefile.in || die + + eautoreconf +} + +src_configure() { + # "local" here means "local to the system", and hence means + # system copy, not the bundled one. + econf --with-local-libgcrypt +} + +src_test() { + pushd tests || die + + edo ./do.sh + edo ./do-unit.sh + + popd || die +} + +src_install() { + default + + rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die +} diff --git a/net-libs/nDPI/nDPI-4.6.ebuild b/net-libs/nDPI/nDPI-4.6.ebuild new file mode 100644 index 000000000000..704e7b7703e2 --- /dev/null +++ b/net-libs/nDPI/nDPI-4.6.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools edo + +DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit" +HOMEPAGE="https://www.ntop.org/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ntop/${PN}" + inherit git-r3 +else + SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-3+" +SLOT="0/$(ver_cut 1)" + +DEPEND="dev-libs/json-c:= + dev-libs/libgcrypt:= + dev-libs/libgpg-error + net-libs/libpcap" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + # "local" here means "local to the system", and hence means + # system copy, not the bundled one. + econf --with-local-libgcrypt +} + +src_test() { + pushd tests || die + + edo ./do.sh + edo ./do-unit.sh + + popd || die +} + +src_install() { + default + + # Makefile logic is broken in 4.6, let's wait a bit given history and + # go with hack for now. + mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/usr/$(get_libdir)/pkgconfig || die + mv "${ED}"/usr/usr/* "${ED}"/usr || die + rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die + rm -rf "${ED}"/usr/usr || die +} diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild index bd4ac3459b84..704e7b7703e2 100644 --- a/net-libs/nDPI/nDPI-9999.ebuild +++ b/net-libs/nDPI/nDPI-9999.ebuild @@ -1,58 +1,57 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools git-r3 +inherit autotools edo DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit" HOMEPAGE="https://www.ntop.org/" -EGIT_REPO_URI="https://github.com/ntop/${PN}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="" -IUSE="static-libs" - -DEPEND=" - dev-libs/json-c:= - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ntop/${PN}" + inherit git-r3 +else + SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-3+" +SLOT="0/$(ver_cut 1)" + +DEPEND="dev-libs/json-c:= + dev-libs/libgcrypt:= + dev-libs/libgpg-error + net-libs/libpcap" +RDEPEND="${DEPEND}" src_prepare() { - eval $(grep '^NDPI_MAJOR=' autogen.sh) - eval $(grep '^NDPI_MINOR=' autogen.sh) - eval $(grep '^NDPI_PATCH=' autogen.sh) - NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}" - - sed \ - -e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \ - -e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \ - -e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \ - -e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \ - < "${S}/configure.seed" \ - > "${S}/configure.ac" || die - - sed -i \ - -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \ - src/lib/Makefile.in || die - default + eautoreconf +} - # Taken from autogen.sh (bug #704074): - sed -i \ - -e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \ - -e "s/#define VERSION/#define NDPI_VERSION/g" \ - configure || die +src_configure() { + # "local" here means "local to the system", and hence means + # system copy, not the bundled one. + econf --with-local-libgcrypt +} + +src_test() { + pushd tests || die + + edo ./do.sh + edo ./do-unit.sh + + popd || die } src_install() { default - if ! use static-libs; then - rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die - fi + + # Makefile logic is broken in 4.6, let's wait a bit given history and + # go with hack for now. + mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/usr/$(get_libdir)/pkgconfig || die + mv "${ED}"/usr/usr/* "${ED}"/usr || die + rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die + rm -rf "${ED}"/usr/usr || die } diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest deleted file mode 100644 index 3e6a65c8c9ed..000000000000 --- a/net-libs/nativebiginteger/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a -DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec diff --git a/net-libs/nativebiginteger/metadata.xml b/net-libs/nativebiginteger/metadata.xml deleted file mode 100644 index a1896da39016..000000000000 --- a/net-libs/nativebiginteger/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>tharvik@gmail.com</email> - <name>Valérian Rousset</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> -</pkgmetadata> diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.48.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.48.ebuild deleted file mode 100644 index e0d376b7aa6d..000000000000 --- a/net-libs/nativebiginteger/nativebiginteger-0.9.48.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2018-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 toolchain-funcs - -DESCRIPTION="jbigi library used by net-vpn/i2p" -HOMEPAGE="https://geti2p.net" -SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/gmp:0= - virtual/jdk:1.8 -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/i2p-${PV}/core" - -PATCHES=( - "${FILESDIR}/${P}-asmfix.patch" -) - -src_compile() { - local compile_lib - compile_lib() { - local name="${1}" - local file="${2}" - shift 2 - - "$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \ - ${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \ - "${file}" -o "lib${name}.so" - } - - cd "${S}/c/jbigi/jbigi" || die "unable to cd to jbigi" - compile_lib jbigi src/jbigi.c -Iinclude -lgmp || - die "unable to build jbigi" - - if use amd64 || use x86; then - cd "${S}/c/jcpuid" || die "unable to cd to jcpuid" - compile_lib jcpuid src/jcpuid.c -Iinclude || - die "unable to build jcpuid" - fi - - if use test; then - cd "${S}/java/src" || die "unable to cd to java/src" - ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java || - die "unable to build tests" - fi -} - -src_test() { - cd "${S}/java/src" || die "unable to cd to java/src" - "$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger || - die "unable to pass tests" -} - -src_install() { - dolib.so c/jbigi/jbigi/libjbigi.so - - if use amd64 || use x86; then - dolib.so c/jcpuid/libjcpuid.so - fi -} diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.50.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.50.ebuild deleted file mode 100644 index efda38f2b606..000000000000 --- a/net-libs/nativebiginteger/nativebiginteger-0.9.50.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2018-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 toolchain-funcs - -DESCRIPTION="jbigi library used by net-vpn/i2p" -HOMEPAGE="https://geti2p.net" -SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/gmp:0= - virtual/jdk:1.8 -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/i2p-${PV}/core" - -PATCHES=( - "${FILESDIR}/${P}-asmfix.patch" -) - -src_compile() { - local compile_lib - compile_lib() { - local name="${1}" - local file="${2}" - shift 2 - - "$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \ - ${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \ - "${file}" -o "lib${name}.so" - } - - cd "${S}/c/jbigi/jbigi" || die "unable to cd to jbigi" - compile_lib jbigi src/jbigi.c -Iinclude -lgmp || - die "unable to build jbigi" - - if use amd64 || use x86; then - cd "${S}/c/jcpuid" || die "unable to cd to jcpuid" - compile_lib jcpuid src/jcpuid.c -Iinclude || - die "unable to build jcpuid" - fi - - if use test; then - cd "${S}/java/src" || die "unable to cd to java/src" - ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java || - die "unable to build tests" - fi -} - -src_test() { - cd "${S}/java/src" || die "unable to cd to java/src" - "$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger || - die "unable to pass tests" -} - -src_install() { - dolib.so c/jbigi/jbigi/libjbigi.so - - if use amd64 || use x86; then - dolib.so c/jcpuid/libjcpuid.so - fi -} diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest index adc5a07fec87..38b6d4682213 100644 --- a/net-libs/neon/Manifest +++ b/net-libs/neon/Manifest @@ -1,5 +1,2 @@ -DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631 -DIST neon-0.31.0.tar.gz 867476 BLAKE2B 84981d0fcca97bfa495f9e8cbf060a06e04c931ce3b5eca41ff1d76a47fd863139b8bf3e102c5e4e8d22d5cffcebc64cee9b8f746f8d6669f0cbccf124fed9cc SHA512 62c55e16609d657ac56bb4a2fd32a10ffa72d5694aa1369be533491a6683034ed42843d5f19ed06cf8c1b7b8ba11b74f9839cdfeef4afc3b2d7b11372ed85cd2 -DIST neon-0.31.1.tar.gz 867810 BLAKE2B 7b7d0c8ab635446c98f3db7072f1dabbb74ad9f579086f209bb3af5460363520be38886a299d22dc0f27a091f322c6d5972a00d4e6c612c710dca12e7620f850 SHA512 00d7297c102ee828d84eb28c9b6a57e66290904acf5327f8a6d3d1759ffacf88329bb2157dcef418c69e93d1370ccbd591829da06c01c3f44aea6c7b92462c13 -DIST neon-0.31.2.tar.gz 867914 BLAKE2B 8ae1301dd5f9ac1a6b518f99919a1b7e7b7c6499413b523ff82e00d364d6d9c5ad96875795330e2fd9c42a42b073e3eea51b6cc0ee9e9a21850763f0cdd0b97e SHA512 1e402b40a0445f68ed24d2697ee60d21636f61ebc98edcde37ff9e26c54430acabf3969ac22a942d1dd51bddee0f312c04073b423b0af3a3e7c9bf60cd53e48c -DIST neon-0.32.1.tar.gz 880434 BLAKE2B 91b942cb0d7184f4da26d7d45e846a0f80aa834226e5ff0689df75650da79cbfad0854c718dbffdd31cc0f09f25458ea37ca39bb38071643a6a609ef6102b896 SHA512 a231865c3aad3668f6effded97a58eb981655f64c71b0954fcb2e667bdec50895d11bf296f4f454bd63e6ce9b02c2fd13cbb17cb82631e16f100000ecd7e1977 +DIST neon-0.32.4.tar.gz 895482 BLAKE2B 917f17739976e159bf91f7c594e59c96bb8b92e39c19f5c881354c11951233d3157f6871e4ebc073d493170844e516acc36be4787dbe2005c33b1ec84ae0d364 SHA512 82bcd1555f047d26cc5ccd67d2fef8dea4eb5a4cc45ca8030d2f3c356eee03fd78efd7ef45f516948e89f1089686731046b3fe48e73b3d84c65848ef6d86bd7a +DIST neon-0.33.0.tar.gz 912146 BLAKE2B 8457e0203fcfbd9209718d139169780898f823d71b950f370f8880c5ec97c7bc5d300b8485803f75e2531a3f58fe6eb78ac5d7a82f57f12078513a3bfd0223b3 SHA512 b214ed34cd832dfaf3af08d4bdbe459c3e791f691548a6d44ee0cdc9811856185522bcbd6c2aca9a536fc021a2ed6329bd093cb3435cc40e3cfd9f5af8b92644 diff --git a/net-libs/neon/files/neon-0.32.4-dash.patch b/net-libs/neon/files/neon-0.32.4-dash.patch new file mode 100644 index 000000000000..cba1660ec62c --- /dev/null +++ b/net-libs/neon/files/neon-0.32.4-dash.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/832851 +https://github.com/notroj/neon/pull/115 +https://github.com/notroj/neon/commit/e02ead4d990e49c912ef053c46b55713685119ee + +From e1bcf0e83012e0c1ff81c573d2650e1a4e40d955 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sat, 6 May 2023 20:50:50 -0700 +Subject: [PATCH 1/2] test/makekeys.sh: fix POSIX compliance + +Not all shells provide 'echo -e' and using printf is more portable. + +One shell that will fail is dash(1). + +ssl................... 10/63 FAIL - dname_readable (certificate subject dname was `-e H\0350llo World, Neon Hackers Ltd, Cambridge, Cambridgeshire, GB' not `Hèllo World, Neon Hackers Ltd, Cambridge, Cambridgeshire, GB' + +Gentoo-Issue: https://bugs.gentoo.org/832851 +--- + test/makekeys.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/test/makekeys.sh b/test/makekeys.sh +index 88dc7b3..8ee90ae 100755 +--- a/test/makekeys.sh ++++ b/test/makekeys.sh +@@ -123,15 +123,15 @@ csr_fields "Self-Signed" | \ + ${MKCERT} -key server.key -out ssigned.pem + + # default => T61String +-csr_fields "`echo -e 'H\0350llo World'`" localhost | ++csr_fields "$(printf 'H%bllo World\n' '\0350')" localhost | + ${REQ} -new -key server.key -out t61subj.csr + + STRMASK=pkix # => BMPString +-csr_fields "`echo -e 'H\0350llo World'`" localhost | ++csr_fields "$(printf 'H%bllo World\n' '\0350')" localhost | + ${REQ} -new -key server.key -out bmpsubj.csr + + STRMASK=utf8only # => UTF8String +-csr_fields "`echo -e 'H\0350llo World'`" localhost | ++csr_fields "$(printf 'H%bllo World\n' '\0350')" localhost | + ${REQ} -new -key server.key -out utf8subj.csr + + STRMASK=default diff --git a/net-libs/neon/files/neon-0.32.4-libressl.patch b/net-libs/neon/files/neon-0.32.4-libressl.patch new file mode 100644 index 000000000000..7c69ad6abfd8 --- /dev/null +++ b/net-libs/neon/files/neon-0.32.4-libressl.patch @@ -0,0 +1,61 @@ +https://bugs.gentoo.org/903001 +https://github.com/notroj/neon/pull/113 +https://github.com/notroj/neon/commit/18e868e4449cd46d494944ced798f9dcd01f65c5 +https://github.com/notroj/neon/pull/116 +https://github.com/notroj/neon/commit/231a1d3f3f427b823753dc2e53adcf9cafda619b +https://github.com/notroj/neon/pull/118 +https://github.com/notroj/neon/commit/6f98a9c9bdd76fb3d367e3b01bcc45bea574c3d1 + +From 233f17b86ebc2cd99d9deede484f4b0be586730f Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Mon, 27 Mar 2023 14:58:49 -0700 +Subject: [PATCH] ne_openssl: Fix the build with libressl + +* Libressl 3.7 currently doesn't provide EVP_sha512_256(). +* Libressl 3.4 added SSL_CTX_set_post_handshake_auth(). +--- + src/ne_openssl.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +From 392e1380e1fa07675934ed25e8980ae18d0bccb4 Mon Sep 17 00:00:00 2001 +From: Joe Orton <jorton@redhat.com> +Date: Tue, 9 May 2023 16:26:55 +0100 +Subject: [PATCH] * src/ne_openssl.c: Fix GCC warning with OpenSSL build. + +--- + src/ne_openssl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +From 1e9483dbb43e82dde06bc84434c8b7124602adbc Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Mon, 29 May 2023 10:07:52 -0700 +Subject: [PATCH] ne_openssl: Update for LibreSSL 3.8.0 + +EVP_sha512_256() was added in LibreSSL 3.8.0. +--- + src/ne_openssl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ne_openssl.c b/src/ne_openssl.c +index d13c25a..bdb73e9 100644 +--- a/src/ne_openssl.c ++++ b/src/ne_openssl.c +@@ -581,7 +581,7 @@ ne_ssl_context *ne_ssl_context_create(int mode) + /* enable workarounds for buggy SSL server implementations */ + SSL_CTX_set_options(ctx->ctx, SSL_OP_ALL); + SSL_CTX_set_verify(ctx->ctx, SSL_VERIFY_PEER, verify_callback); +-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x3040000fL || (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10101000L) + SSL_CTX_set_post_handshake_auth(ctx->ctx, 1); + #endif + } else if (mode == NE_SSL_CTX_SERVER) { +@@ -1122,7 +1122,9 @@ static const EVP_MD *hash_to_md(unsigned int flags) + case NE_HASH_SHA256: return EVP_sha256(); + #ifdef HAVE_OPENSSL11 + case NE_HASH_SHA512: return EVP_sha512(); ++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x3080000fL + case NE_HASH_SHA512_256: return EVP_sha512_256(); ++#endif + #endif + default: break; + } diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml index f53db81ccb5b..e66c01f85a97 100644 --- a/net-libs/neon/metadata.xml +++ b/net-libs/neon/metadata.xml @@ -1,13 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arfrever.fta@gmail.com</email> - </maintainer> - <maintainer type="person" proxied="proxy"> - <email>floppym@gentoo.org</email> - <name>Mike Gilbert</name> - </maintainer> + <!--maintainer-needed--> <longdescription> Neon is an HTTP and WebDAV client library for Unix systems, with a C language API. It provides high-level interfaces to HTTP/1.1 and WebDAV diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild deleted file mode 100644 index 0579d7c523da..000000000000 --- a/net-libs/neon/neon-0.30.2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 2001-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools libtool multilib-minimal - -DESCRIPTION="HTTP and WebDAV client library" -HOMEPAGE="https://notroj.github.io/neon/" -SRC_URI="http://webdav.org/neon/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/27" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib" -RESTRICT="test" - -RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) - !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) - libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] ) - nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - app-misc/ca-certificates - net-libs/gnutls:0=[${MULTILIB_USEDEP}] - ) - !gnutls? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) - pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) - ) - zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/neon-config -) - -src_prepare() { - # Use CHOST-prefixed version of xml2-config for cross-compilation. - sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed" - - # Fix compatibility with OpenSSL >=1.1. - sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed" - - eapply_user - - AT_M4DIR="macros" eautoreconf - - elibtoolize - - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=() - - if has_version sys-libs/glibc; then - einfo "Enabling SSL library thread-safety using POSIX threads..." - myconf+=(--enable-threadsafe-ssl=posix) - fi - - if use expat; then - myconf+=(--with-expat) - else - myconf+=(--with-libxml2) - fi - - if use ssl; then - if use gnutls; then - myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") - else - myconf+=(--with-ssl=openssl) - fi - fi - - econf \ - --enable-shared \ - $(use_with kerberos gssapi) \ - $(use_with libproxy) \ - $(use_enable nls) \ - $(use_with pkcs11 pakchois) \ - $(use_enable static-libs static) \ - $(use_with zlib) \ - "${myconf[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install-{config,headers,lib,man,nls} - - if multilib_is_native_abi && use doc; then - ( - docinto html - dodoc -r doc/html/* - ) - fi -} - -multilib_src_install_all() { - find "${D}" -name "*.la" -type f -delete || die - - dodoc AUTHORS BUGS NEWS README THANKS TODO -} diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild deleted file mode 100644 index adbc8e2dcc79..000000000000 --- a/net-libs/neon/neon-0.31.0.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 2001-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools libtool multilib-minimal - -DESCRIPTION="HTTP and WebDAV client library" -HOMEPAGE="https://notroj.github.io/neon/" -SRC_URI="http://webdav.org/neon/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/27" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib" -RESTRICT="test" - -RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) - !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) - libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] ) - nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - app-misc/ca-certificates - net-libs/gnutls:0=[${MULTILIB_USEDEP}] - ) - !gnutls? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) - pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) - ) - zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/neon-config -) - -src_prepare() { - # Use CHOST-prefixed version of xml2-config for cross-compilation. - sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed" - - # Fix compatibility with OpenSSL >=1.1. - sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed" - - eapply_user - - AT_M4DIR="macros" eautoreconf - - elibtoolize - - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=() - - if has_version sys-libs/glibc; then - einfo "Enabling SSL library thread-safety using POSIX threads..." - myconf+=(--enable-threadsafe-ssl=posix) - fi - - if use expat; then - myconf+=(--with-expat) - else - myconf+=(--with-libxml2) - fi - - if use ssl; then - if use gnutls; then - myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") - else - myconf+=(--with-ssl=openssl) - fi - fi - - econf \ - --enable-shared \ - $(use_with kerberos gssapi) \ - $(use_with libproxy) \ - $(use_enable nls) \ - $(use_with pkcs11 pakchois) \ - $(use_enable static-libs static) \ - $(use_with zlib) \ - "${myconf[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install-{config,headers,lib,man,nls} - - if multilib_is_native_abi && use doc; then - ( - docinto html - dodoc -r doc/html/* - ) - fi -} - -multilib_src_install_all() { - find "${D}" -name "*.la" -type f -delete || die - - dodoc AUTHORS BUGS NEWS README.md THANKS TODO -} diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild deleted file mode 100644 index a6ad1025fb55..000000000000 --- a/net-libs/neon/neon-0.31.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 2001-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools libtool multilib-minimal - -DESCRIPTION="HTTP and WebDAV client library" -HOMEPAGE="https://notroj.github.io/neon/" -SRC_URI="https://notroj.github.io/neon/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/27" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib" -RESTRICT="test" - -RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) - !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) - libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] ) - nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - app-misc/ca-certificates - net-libs/gnutls:0=[${MULTILIB_USEDEP}] - ) - !gnutls? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) - pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) - ) - zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/neon-config -) - -src_prepare() { - # Use CHOST-prefixed version of xml2-config for cross-compilation. - sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed" - - # Fix compatibility with OpenSSL >=1.1. - sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed" - - eapply_user - - AT_M4DIR="macros" eautoreconf - - elibtoolize - - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=() - - if has_version sys-libs/glibc; then - einfo "Enabling SSL library thread-safety using POSIX threads..." - myconf+=(--enable-threadsafe-ssl=posix) - fi - - if use expat; then - myconf+=(--with-expat) - else - myconf+=(--with-libxml2) - fi - - if use ssl; then - if use gnutls; then - myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") - else - myconf+=(--with-ssl=openssl) - fi - fi - - econf \ - --enable-shared \ - $(use_with kerberos gssapi) \ - $(use_with libproxy) \ - $(use_enable nls) \ - $(use_with pkcs11 pakchois) \ - $(use_enable static-libs static) \ - $(use_with zlib) \ - "${myconf[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install-{config,headers,lib,man,nls} - - if multilib_is_native_abi && use doc; then - ( - docinto html - dodoc -r doc/html/* - ) - fi -} - -multilib_src_install_all() { - find "${D}" -name "*.la" -type f -delete || die - - dodoc AUTHORS BUGS NEWS README.md THANKS TODO -} diff --git a/net-libs/neon/neon-0.32.1.ebuild b/net-libs/neon/neon-0.32.1.ebuild deleted file mode 100644 index 92ef286a9128..000000000000 --- a/net-libs/neon/neon-0.32.1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 2001-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools libtool multilib-minimal - -DESCRIPTION="HTTP and WebDAV client library" -HOMEPAGE="https://notroj.github.io/neon/" -SRC_URI="https://notroj.github.io/neon/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/27" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib" -RESTRICT="test" - -RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) - !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) - libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] ) - nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - app-misc/ca-certificates - net-libs/gnutls:0=[${MULTILIB_USEDEP}] - ) - !gnutls? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) - pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) - ) - zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - virtual/pkgconfig -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/neon-config -) - -src_prepare() { - # Use CHOST-prefixed version of xml2-config for cross-compilation. - sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed" - - # Fix compatibility with OpenSSL >=1.1. - sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed" - - eapply_user - - AT_M4DIR="macros" eautoreconf - - elibtoolize - - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=() - - if has_version sys-libs/glibc; then - einfo "Enabling SSL library thread-safety using POSIX threads..." - myconf+=(--enable-threadsafe-ssl=posix) - fi - - if use expat; then - myconf+=(--with-expat) - else - myconf+=(--with-libxml2) - fi - - if use ssl; then - if use gnutls; then - myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") - else - myconf+=(--with-ssl=openssl) - fi - fi - - econf \ - --enable-shared \ - $(use_with kerberos gssapi) \ - $(use_with libproxy) \ - $(use_enable nls) \ - $(use_with pkcs11 pakchois) \ - $(use_enable static-libs static) \ - $(use_with zlib) \ - "${myconf[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install-{config,headers,lib,man,nls} - - if multilib_is_native_abi && use doc; then - ( - docinto html - dodoc -r doc/html/* - ) - fi -} - -multilib_src_install_all() { - find "${D}" -name "*.la" -type f -delete || die - - dodoc AUTHORS BUGS NEWS README.md THANKS TODO -} diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.32.4-r1.ebuild index 77dd704a1b7b..eb9b9acbed73 100644 --- a/net-libs/neon/neon-0.31.2.ebuild +++ b/net-libs/neon/neon-0.32.4-r1.ebuild @@ -1,21 +1,28 @@ -# Copyright 2001-2021 Gentoo Authors +# Copyright 2001-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" inherit autotools libtool multilib-minimal DESCRIPTION="HTTP and WebDAV client library" -HOMEPAGE="https://notroj.github.io/neon/" +HOMEPAGE="https://notroj.github.io/neon/ https://github.com/notroj/neon" SRC_URI="https://notroj.github.io/neon/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/27" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib" -RESTRICT="test" - -RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc +expat gnutls kerberos libproxy nls pkcs11 ssl test zlib" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig + test? ( + ssl? ( + dev-libs/openssl:0 + pkcs11? ( dev-libs/nss ) + ) + )" +DEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] ) @@ -25,27 +32,31 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) app-misc/ca-certificates net-libs/gnutls:0=[${MULTILIB_USEDEP}] ) - !gnutls? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) + !gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) ) zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND="${DEPEND}" MULTILIB_CHOST_TOOLS=( /usr/bin/neon-config ) -src_prepare() { - # Use CHOST-prefixed version of xml2-config for cross-compilation. - sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed" +DOCS=( AUTHORS BUGS NEWS README.md THANKS TODO ) - # Fix compatibility with OpenSSL >=1.1. - sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed" +PATCHES=( + "${FILESDIR}"/${PN}-0.32.4-dash.patch #832851 + "${FILESDIR}"/${PN}-0.32.4-libressl.patch #903001 +) - eapply_user +src_prepare() { + if use gnutls; then + # Ignore failure of test pkcs11. + # https://github.com/notroj/neon/issues/72 + sed -e "s/T(pkcs11)/T_XFAIL(pkcs11)/" -i test/ssl.c || die + fi + + default AT_M4DIR="macros" eautoreconf @@ -82,7 +93,6 @@ multilib_src_configure() { $(use_with libproxy) \ $(use_enable nls) \ $(use_with pkcs11 pakchois) \ - $(use_enable static-libs static) \ $(use_with zlib) \ "${myconf[@]}" } @@ -91,15 +101,12 @@ multilib_src_install() { emake DESTDIR="${D}" install-{config,headers,lib,man,nls} if multilib_is_native_abi && use doc; then - ( - docinto html - dodoc -r doc/html/* - ) + dodoc -r doc/html fi } multilib_src_install_all() { - find "${D}" -name "*.la" -type f -delete || die + find "${ED}" -name "*.la" -delete || die - dodoc AUTHORS BUGS NEWS README.md THANKS TODO + einstalldocs } diff --git a/net-libs/neon/neon-0.33.0.ebuild b/net-libs/neon/neon-0.33.0.ebuild new file mode 100644 index 000000000000..4f5ede0e48f4 --- /dev/null +++ b/net-libs/neon/neon-0.33.0.ebuild @@ -0,0 +1,111 @@ +# Copyright 2001-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools libtool multilib-minimal + +DESCRIPTION="HTTP and WebDAV client library" +HOMEPAGE="https://notroj.github.io/neon/ https://github.com/notroj/neon" +SRC_URI="https://notroj.github.io/neon/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/27" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+expat gnutls kerberos libproxy nls pkcs11 ssl test zlib" +RESTRICT="!test? ( test )" + +DEPEND=" + expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) + !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) + kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) + libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] ) + nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + net-libs/gnutls:0=[${MULTILIB_USEDEP}] + ) + !gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) + ) + zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( + ssl? ( + dev-libs/openssl:0 + pkcs11? ( dev-libs/nss ) + ) + ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/neon-config +) + +DOCS=( AUTHORS BUGS NEWS README.md THANKS TODO ) +HTML_DOCS=( doc/html/. ) + +src_prepare() { + if use gnutls; then + # Ignore failure of test pkcs11. + # https://github.com/notroj/neon/issues/72 + sed -e "s/T(pkcs11)/T_XFAIL(pkcs11)/" -i test/ssl.c || die + fi + + default + + AT_M4DIR="macros" eautoreconf + + elibtoolize + + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=( + --enable-shared + $(use_with kerberos gssapi) + $(use_with libproxy) + $(use_enable nls) + $(use_with pkcs11 pakchois) + $(use_with zlib) + ) + + if has_version sys-libs/glibc; then + einfo "Enabling SSL library thread-safety using POSIX threads..." + myconf+=( --enable-threadsafe-ssl=posix ) + fi + + if use expat; then + myconf+=( --with-expat ) + else + myconf+=( --with-libxml2 ) + fi + + if use ssl; then + if use gnutls; then + myconf+=( + --with-ssl=gnutls + --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" + ) + else + myconf+=( --with-ssl=openssl ) + fi + fi + + econf "${myconf[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install-{config,headers,lib,man,nls} +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die + + einstalldocs +} diff --git a/net-libs/net6/metadata.xml b/net-libs/net6/metadata.xml index bef24d2c2337..700c736b6f3f 100644 --- a/net-libs/net6/metadata.xml +++ b/net-libs/net6/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">gobby/net6</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/net6/net6-1.3.14-r2.ebuild b/net-libs/net6/net6-1.3.14-r2.ebuild index cb41c438fc5d..222b9f1cf536 100644 --- a/net-libs/net6/net6-1.3.14-r2.ebuild +++ b/net-libs/net6/net6-1.3.14-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,8 +6,8 @@ EAPI=7 inherit flag-o-matic DESCRIPTION="Network access framework for IPv4/IPv6 written in C++" -HOMEPAGE="http://gobby.0x539.de/" -SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz" +HOMEPAGE="https://gobby.github.io/" +SRC_URI="https://github.com/gobby/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" diff --git a/net-libs/netwib/files/netwib-5.39.0-C99-decls.patch b/net-libs/netwib/files/netwib-5.39.0-C99-decls.patch new file mode 100644 index 000000000000..4509b3703160 --- /dev/null +++ b/net-libs/netwib/files/netwib-5.39.0-C99-decls.patch @@ -0,0 +1,19 @@ +--- a/genemake ++++ b/genemake +@@ -1279,6 +1279,7 @@ + + #--- + cat > `checkcompilfile` <<EOF ++ #include <string.h> + int ether_hostton(char *para1, char *para2); + int main(void) + { char p1[10], p2[10]; +@@ -1668,7 +1669,7 @@ + #include <pwd.h> + #include <grp.h> + int main(void) +- { getgrgid_r(NULL, NULL, NULL, 0, NULL); ++ { getgrgid_r(0, NULL, NULL, 0, NULL); + return(0); + } + EOF diff --git a/net-libs/netwib/files/netwib-5.39.0-config.patch b/net-libs/netwib/files/netwib-5.39.0-config.patch new file mode 100644 index 000000000000..922c9d0dd887 --- /dev/null +++ b/net-libs/netwib/files/netwib-5.39.0-config.patch @@ -0,0 +1,35 @@ +--- a/config.dat ++++ b/config.dat +@@ -7,11 +7,11 @@ + + ########################################################################## + ### directories where netwib will be installed +-NETWIBDEF_INSTPREFIX=/usr/local ++NETWIBDEF_INSTPREFIX="${EPREFIX}/usr" + NETWIBDEF_INSTINCLUDE=${NETWIBDEF_INSTPREFIX}/include + NETWIBDEF_INSTLIB=${NETWIBDEF_INSTPREFIX}/lib + NETWIBDEF_INSTBIN=${NETWIBDEF_INSTPREFIX}/bin +-NETWIBDEF_INSTMAN=${NETWIBDEF_INSTPREFIX}/man ++NETWIBDEF_INSTMAN=${NETWIBDEF_INSTPREFIX}/share/man + NETWIBDEF_INSTMAN3=${NETWIBDEF_INSTMAN}/man3 + + ### installation destination directory +@@ -19,14 +19,14 @@ + + ########################################################################## + ### programs +-NETWIBDEF_PROGCC=gcc +-NETWIBDEF_PROGAR=ar +-NETWIBDEF_PROGRANLIB=ranlib ++NETWIBDEF_PROGCC="${CC}" ++NETWIBDEF_PROGAR="${AR}" ++NETWIBDEF_PROGRANLIB="${RANLIB}" + NETWIBDEF_PROGGREP=grep + + ########################################################################## + ### compiler options +-NETWIBDEF_PROGCC_OPT="-Wall -O2" ++NETWIBDEF_PROGCC_OPT="${CFLAGS:-} ${CPPFLAGS:-}" + NETWIBDEF_PROGCC_INC="" + NETWIBDEF_PROGCC_LIB="" + NETWIBDEF_PROGCC_OPTPIC="" diff --git a/net-libs/netwib/files/netwib-5.39.0-sched_yield.patch b/net-libs/netwib/files/netwib-5.39.0-sched_yield.patch new file mode 100644 index 000000000000..06bb248bc949 --- /dev/null +++ b/net-libs/netwib/files/netwib-5.39.0-sched_yield.patch @@ -0,0 +1,85 @@ +--- a/genemake ++++ b/genemake +@@ -1598,21 +1598,6 @@ + fi + + #--- +-NETWIBDEF_HAVEFUNC_PTHREAD_YIELD=0 +-if [ $NETWIBDEF_HAVEINCL_PTHREAD = 1 ] ; then +- cat > `checkcompilfile` <<EOF +- #include <pthread.h> +- int main(void) +- { pthread_yield(); +- return(0); +- } +-EOF +- checkcompilstd "pthread_yield" "" "" "" +- NETWIBDEF_HAVEFUNC_PTHREAD_YIELD=`checkcompilyes` +- checkceclean +-fi +- +-#--- + NETWIBDEF_HAVEFUNC_SCHED_YIELD=0 + if [ $NETWIBDEF_HAVEINCL_SCHED = 1 ] ; then + cat > `checkcompilfile` <<EOF +@@ -2042,7 +2027,6 @@ + echo "#define NETWIBDEF_HAVEFUNC_PTHREAD_MUTEX_TIMEDLOCK $NETWIBDEF_HAVEFUNC_PTHREAD_MUTEX_TIMEDLOCK" >> $deffile + echo "#define NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK $NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK" >> $deffile + echo "#define NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK $NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK" >> $deffile +-echo "#define NETWIBDEF_HAVEFUNC_PTHREAD_YIELD $NETWIBDEF_HAVEFUNC_PTHREAD_YIELD" >> $deffile + echo "#define NETWIBDEF_HAVEFUNC_SCHED_YIELD $NETWIBDEF_HAVEFUNC_SCHED_YIELD" >> $deffile + echo "#define NETWIBDEF_HAVEFUNC_GETPWNAM_R $NETWIBDEF_HAVEFUNC_GETPWNAM_R" >> $deffile + echo "#define NETWIBDEF_HAVEFUNC_GETGRNAM_R $NETWIBDEF_HAVEFUNC_GETGRNAM_R" >> $deffile +@@ -2205,7 +2189,6 @@ + HAVEFUNC_PTHREAD_MUTEX_TIMEDLOCK) echo $NETWIBDEF_HAVEFUNC_PTHREAD_MUTEX_TIMEDLOCK ;; + HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK) echo $NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK ;; + HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK) echo $NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK ;; +- HAVEFUNC_PTHREAD_YIELD) echo $NETWIBDEF_HAVEFUNC_PTHREAD_YIELD ;; + HAVEFUNC_SCHED_YIELD) echo $NETWIBDEF_HAVEFUNC_SCHED_YIELD ;; + HAVEFUNC_GETPWNAM_R) echo $NETWIBDEF_HAVEFUNC_GETPWNAM_R ;; + HAVEFUNC_GETGRNAM_R) echo $NETWIBDEF_HAVEFUNC_GETGRNAM_R ;; +--- a/netwib/def_windows.h ++++ b/netwib/def_windows.h +@@ -100,7 +100,6 @@ + #define NETWIBDEF_HAVEFUNC_PTHREAD_MUTEX_TIMEDLOCK 0 + #define NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK 0 + #define NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK 0 +-#define NETWIBDEF_HAVEFUNC_PTHREAD_YIELD 0 + #define NETWIBDEF_HAVEFUNC_SCHED_YIELD 0 + #define NETWIBDEF_HAVEFUNC_GETPWNAM_R 0 + #define NETWIBDEF_HAVEFUNC_GETGRNAM_R 0 +--- a/netwib/inc/missing.h ++++ b/netwib/inc/missing.h +@@ -3,7 +3,6 @@ + #if 0 + /* Some systems have the function in their library, but + prototypes are missing. Those one can be used instead. */ +- int pthread_yield(void); + int getpagesize(void); + int usleep(unsigned int useconds); + int getpwnam_r(const char *name, +--- a/netwib/sys/internal.c ++++ b/netwib/sys/internal.c +@@ -221,8 +221,6 @@ + NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK); + netwib_co_i("NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK", + NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK); +- netwib_co_i("NETWIBDEF_HAVEFUNC_PTHREAD_YIELD", +- NETWIBDEF_HAVEFUNC_PTHREAD_YIELD); + netwib_co_i("NETWIBDEF_HAVEFUNC_SCHED_YIELD", + NETWIBDEF_HAVEFUNC_SCHED_YIELD); + netwib_co_i("NETWIBDEF_HAVEFUNC_GETPWNAM_R", +--- a/netwib/sys/priv/pause.c ++++ b/netwib/sys/priv/pause.c +@@ -6,10 +6,7 @@ + { + + #if defined NETWIBDEF_SYSNAME_Unix +- #if NETWIBDEF_HAVEFUNC_PTHREAD_YIELD == 1 +- pthread_yield(); +- return(NETWIB_ERR_OK); +- #elif NETWIBDEF_HAVEFUNC_SCHED_YIELD == 1 ++ #if NETWIBDEF_HAVEFUNC_SCHED_YIELD == 1 + sched_yield(); + return(NETWIB_ERR_OK); + #endif diff --git a/net-libs/netwib/netwib-5.39.0-r1.ebuild b/net-libs/netwib/netwib-5.39.0-r1.ebuild new file mode 100644 index 000000000000..00c9aa0e1237 --- /dev/null +++ b/net-libs/netwib/netwib-5.39.0-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# NOTE: netwib, netwox and netwag go together, bump all or bump none + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols" +HOMEPAGE=" + http://www.laurentconstantin.com/en/netw/netwib/ + http://ntwib.sourceforge.net/ +" +SRC_URI=" + https://downloads.sourceforge.net/ntwib/${P}-src.tgz + doc? ( https://downloads.sourceforge.net/ntwib/${P}-doc_html.tgz )" +S="${WORKDIR}/${P}-src/src" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc x86" +IUSE="doc" + +DEPEND=" + net-libs/libnet:1.1 + net-libs/libpcap" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-C99-decls.patch + "${FILESDIR}"/${P}-config.patch + "${FILESDIR}"/${P}-sched_yield.patch +) + +src_configure() { + tc-export AR CC RANLIB + sed -e "s:/lib:/$(get_libdir):" \ + -i config.dat || die + + sh genemake || die +} + +src_install() { + default + + dodoc \ + ../README.TXT \ + ../doc/{changelog.txt,credits.txt,integration.txt} \ + ../doc/{problemreport.txt,problemusageunix.txt,todo.txt} + + if use doc; then + docinto html + dodoc -r "${WORKDIR}"/${P}-doc_html/{index.html,${PN}} + fi +} diff --git a/net-libs/netwib/netwib-5.39.0.ebuild b/net-libs/netwib/netwib-5.39.0.ebuild deleted file mode 100644 index c73eb6097f01..000000000000 --- a/net-libs/netwib/netwib-5.39.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# NOTE: netwib, netwox and netwag go together, bump all or bump none - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols" -HOMEPAGE=" - http://www.laurentconstantin.com/en/netw/netwib/ - http://ntwib.sourceforge.net/ -" -SRC_URI="mirror://sourceforge/ntwib/${P}-src.tgz - doc? ( mirror://sourceforge/ntwib/${P}-doc_html.tgz )" -S="${WORKDIR}/${P}-src/src" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc x86" -IUSE="doc" - -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -i \ - -e 's:/man$:/share/man:g' \ - -e "s:/lib:/$(get_libdir):" \ - -e "s:/usr/local:/usr:" \ - -e "s:=ar:=$(tc-getAR):" \ - -e "s:=ranlib:=$(tc-getRANLIB):" \ - -e "s:=gcc:=$(tc-getCC):" \ - -e "s:-O2:${CFLAGS}:" \ - config.dat || die -} - -src_configure() { - sh genemake || die -} - -src_install() { - default - dodoc ../README.TXT - if use doc; then - mkdir "${ED}"/usr/share/doc/${PF}/html || die - mv "${WORKDIR}"/${P}-doc_html/{index.html,${PN}} \ - "${ED}"/usr/share/doc/${PF}/html || die - fi - - cd "${S}"/.. || die - dodoc \ - doc/{changelog.txt,credits.txt,integration.txt} \ - doc/{problemreport.txt,problemusageunix.txt,todo.txt} -} diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest index 9b5f2c56362a..8d9f58da8642 100644 --- a/net-libs/nghttp2/Manifest +++ b/net-libs/nghttp2/Manifest @@ -1,2 +1 @@ -DIST nghttp2-1.45.1.tar.xz 4017852 BLAKE2B 17bc5e0a6270494a0296da7f1394d0b89666ca42ad04bcce097740da2b30cdc575f17e681a8320dc2a2161eeebb753f22f228a340fc7cd690fa883d29149bcd8 SHA512 320a8c9f29b58c55df98be4312d415bc406edbdfb0765aa37570cdb472a84f40c4f95a51c44c5488363c16ad6815c75b5503b32e43d94724c54117ff583c7150 -DIST nghttp2-1.46.0.tar.xz 4024972 BLAKE2B 85fe1259b791ff7cda163265f553e0aac8a10ef6674cf6152d5bc7747c7f4f3bc6e9d9c0472534dd7185f093936efed1b4632da64d426b6a7ac432657e8579a1 SHA512 fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b +DIST nghttp2-1.61.0.tar.xz 1645808 BLAKE2B e78fb94cc9234260447f0d3610e58e22f9eadc2dd8b79eec3c1bb10d5c03ad3a87f83d54e560e5bbdef5d60086c00b465caabca145485ecd636aa35a2cda616f SHA512 01e930d7caf464699505f92b76e2bc8192d168612dc564d2546812c42afea2fb81d552d70e8a5fed35e2bf5deadbec8eda095af94a2484bca41542988afce52a diff --git a/net-libs/nghttp2/metadata.xml b/net-libs/nghttp2/metadata.xml index e79248991e89..8cfb42e029b2 100644 --- a/net-libs/nghttp2/metadata.xml +++ b/net-libs/nghttp2/metadata.xml @@ -2,14 +2,15 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> </maintainer> <use> <flag name="hpack-tools">Install HPACK (header compression) helper tools</flag> <flag name="utils">Install nghttp, nghttpd and nghttpx</flag> </use> <upstream> + <remote-id type="cpe">cpe:/a:nghttp2:nghttp2</remote-id> <remote-id type="github">nghttp2/nghttp2</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild b/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild deleted file mode 100644 index f79b1b5a91ea..000000000000 --- a/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# TODO: Add python support. - -EAPI=7 - -inherit multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" - inherit autotools git-r3 -else - SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="HTTP/2 C Library" -HOMEPAGE="https://nghttp2.org/" - -LICENSE="MIT" -SLOT="0/1.14" # <C++>.<C> SONAMEs -IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml" - -RESTRICT="!test? ( test )" - -SSL_DEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}] -" -RDEPEND=" - cxx? ( - ${SSL_DEPEND} - dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)] - ) - hpack-tools? ( >=dev-libs/jansson-2.5:= ) - jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) - utils? ( - ${SSL_DEPEND} - >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] - net-dns/c-ares:=[${MULTILIB_USEDEP}] - ) - xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-examples - --disable-failmalloc - --disable-python-bindings - --disable-werror - --without-cython - $(use_enable cxx asio-lib) - $(use_enable debug) - $(multilib_native_use_enable hpack-tools) - $(use_enable static-libs static) - $(use_enable threads) - $(multilib_native_use_enable utils app) - $(multilib_native_use_with jemalloc) - $(multilib_native_use_with xml libxml2) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - if ! use static-libs ; then - find "${ED}"/usr -name '*.la' -delete || die - fi -} diff --git a/net-libs/nghttp2/nghttp2-1.46.0.ebuild b/net-libs/nghttp2/nghttp2-1.46.0.ebuild deleted file mode 100644 index 6d92e5272f14..000000000000 --- a/net-libs/nghttp2/nghttp2-1.46.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# TODO: Add python support. - -EAPI=8 - -inherit multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" - inherit autotools git-r3 -else - SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="HTTP/2 C Library" -HOMEPAGE="https://nghttp2.org/" - -LICENSE="MIT" -SLOT="0/1.14" # <C++>.<C> SONAMEs -IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml" - -RESTRICT="!test? ( test )" - -SSL_DEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}] -" -RDEPEND=" - cxx? ( - ${SSL_DEPEND} - dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)] - ) - hpack-tools? ( >=dev-libs/jansson-2.5:= ) - jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) - utils? ( - ${SSL_DEPEND} - >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] - net-dns/c-ares:=[${MULTILIB_USEDEP}] - ) - xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-examples - --disable-failmalloc - --disable-python-bindings - --disable-werror - --without-cython - $(use_enable cxx asio-lib) - $(use_enable debug) - $(multilib_native_use_enable hpack-tools) - $(use_enable static-libs static) - $(use_enable threads) - $(multilib_native_use_enable utils app) - $(multilib_native_use_with jemalloc) - $(multilib_native_use_with xml libxml2) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - if ! use static-libs ; then - find "${ED}"/usr -type f -name '*.la' -delete || die - fi -} diff --git a/net-libs/nghttp2/nghttp2-1.61.0.ebuild b/net-libs/nghttp2/nghttp2-1.61.0.ebuild new file mode 100644 index 000000000000..3f8e52d14272 --- /dev/null +++ b/net-libs/nghttp2/nghttp2-1.61.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="HTTP/2 C Library" +HOMEPAGE="https://nghttp2.org/" +SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0/1.14" # 1.<SONAME> +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" + +REQUIRED_USE="test? ( static-libs )" +RESTRICT="!test? ( test )" + +SSL_DEPEND=" + >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}] +" +RDEPEND=" + hpack-tools? ( >=dev-libs/jansson-2.5:= ) + jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) + utils? ( + ${SSL_DEPEND} + >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] + net-dns/c-ares:=[${MULTILIB_USEDEP}] + ) + systemd? ( >=sys-apps/systemd-209 ) + xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +multilib_src_configure() { + #TODO: enable HTTP3 + #requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3 + local mycmakeargs=( + -DENABLE_EXAMPLES=OFF + -DENABLE_FAILMALLOC=OFF + -DENABLE_HTTP3=OFF + -DENABLE_WERROR=OFF + -DENABLE_THREADS=ON + -DENABLE_DEBUG=$(usex debug) + -DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools) + $(cmake_use_find_package hpack-tools Jansson) + -DWITH_JEMALLOC=$(multilib_native_usex jemalloc) + -DBUILD_STATIC_LIBS=$(usex static-libs) + -DBUILD_TESTING=$(usex test) + $(cmake_use_find_package systemd Systemd) + -DENABLE_APP=$(multilib_native_usex utils) + -DWITH_LIBXML2=$(multilib_native_usex xml) + ) + cmake_src_configure +} + +multilib_src_test() { + eninja check +} diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild index 6d92e5272f14..4ff41e17c664 100644 --- a/net-libs/nghttp2/nghttp2-9999.ebuild +++ b/net-libs/nghttp2/nghttp2-9999.ebuild @@ -1,26 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# TODO: Add python support. - EAPI=8 -inherit multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" - inherit autotools git-r3 -else - SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi +inherit cmake-multilib git-r3 DESCRIPTION="HTTP/2 C Library" HOMEPAGE="https://nghttp2.org/" +EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" LICENSE="MIT" -SLOT="0/1.14" # <C++>.<C> SONAMEs -IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml" +SLOT="0/1.14" # 1.<SONAME> +IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" RESTRICT="!test? ( test )" @@ -28,10 +19,6 @@ SSL_DEPEND=" >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}] " RDEPEND=" - cxx? ( - ${SSL_DEPEND} - dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)] - ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) utils? ( @@ -40,37 +27,33 @@ RDEPEND=" >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + systemd? ( >=sys-apps/systemd-209 ) xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - multilib_src_configure() { - local myeconfargs=( - --disable-examples - --disable-failmalloc - --disable-python-bindings - --disable-werror - --without-cython - $(use_enable cxx asio-lib) - $(use_enable debug) - $(multilib_native_use_enable hpack-tools) - $(use_enable static-libs static) - $(use_enable threads) - $(multilib_native_use_enable utils app) - $(multilib_native_use_with jemalloc) - $(multilib_native_use_with xml libxml2) + #TODO: enable HTTP3 + #requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3 + local mycmakeargs=( + -DENABLE_EXAMPLES=OFF + -DENABLE_FAILMALLOC=OFF + -DENABLE_HTTP3=OFF + -DENABLE_WERROR=OFF + -DENABLE_THREADS=ON + -DENABLE_DEBUG=$(usex debug) + -DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools) + $(cmake_use_find_package hpack-tools Jansson) + -DWITH_JEMALLOC=$(multilib_native_usex jemalloc) + -DBUILD_STATIC_LIBS=$(usex static-libs) + -DBUILD_TESTING=$(usex test) + $(cmake_use_find_package systemd Systemd) + -DENABLE_APP=$(multilib_native_usex utils) + -DWITH_LIBXML2=$(multilib_native_usex xml) ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + cmake_src_configure } -multilib_src_install_all() { - if ! use static-libs ; then - find "${ED}"/usr -type f -name '*.la' -delete || die - fi +multilib_src_test() { + eninja check } diff --git a/net-libs/nghttp3/Manifest b/net-libs/nghttp3/Manifest index 6280de1439df..8a065c0e7ab8 100644 --- a/net-libs/nghttp3/Manifest +++ b/net-libs/nghttp3/Manifest @@ -1 +1,2 @@ -DIST nghttp3-0_pre20190912.tar.gz 155172 BLAKE2B fabd472e429222502288b7a4030b4aa51f8a1b609590d63b51ab3f918b8cdb462b766a40911986b3f72f2f1b0debee1f0ebdf8802991bf4fc5d4a6d14297bdcc SHA512 89c7b40843bde9d2c2ab24211794b6ae0e1fa15413e92dcf2238b876552f29bb2f0db724d9a205c2a1c98f25a14ef570c9e53df52fb519230b6f78dcc04d2117 +DIST nghttp3-1.2.0.tar.xz 387592 BLAKE2B b3ad897fda5d616a93f063bafde760eda6f597c90de6c81793abef3ff30de05bb2a06388fa868f95c0871a6592331d17a2d344c63817179ad21c6390bc0e499b SHA512 51ade6b17215eb15c92b18ad7a94b70e0a442d5968aee31ec734e5826d09ca34197e64407a1ac3f7bfb4ed1a0b3c3b58afc4a152542bacdcc4c71140931a7652 +DIST nghttp3-1.3.0.tar.xz 390176 BLAKE2B 8ff17da3e53efb27b13e9ab17dba4ca27cc8fd948b160a36a0b0496f61a49c2729f1281f9a29cb8fecd4dd2c274696885a3c5e001be3dcfc30f5f1c9b6339467 SHA512 a862e7a3c3f6722b07d5437976850b2998032d1f7b9da7a49e6863d59c611ff7204c9923e8e570301a9bfbd91931a30f8f85e96cfb35481783adfc2f955a8b8c diff --git a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild b/net-libs/nghttp3/nghttp3-1.2.0-r2.ebuild index f397afa4b9bf..6715be902969 100644 --- a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild +++ b/net-libs/nghttp3/nghttp3-1.2.0-r2.ebuild @@ -1,19 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/ngtcp2/nghttp3.git" inherit git-r3 else - GIT_COMMIT="51379a041174ad953dc6ad437712f3b279f81919" - SRC_URI="https://github.com/ngtcp2/nghttp3/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${GIT_COMMIT}" - KEYWORDS="~amd64 ~hppa" + SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~hppa" fi DESCRIPTION="HTTP/3 library written in C" @@ -21,18 +18,16 @@ HOMEPAGE="https://github.com/ngtcp2/nghttp3/" LICENSE="MIT" SLOT="0/0" -IUSE="test" +IUSE="static-libs" BDEPEND="virtual/pkgconfig" -DEPEND="test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" RDEPEND="" -RESTRICT="!test? ( test )" multilib_src_configure() { local mycmakeargs=( -DENABLE_LIB_ONLY=ON + -DENABLE_STATIC_LIB=$(usex static-libs) -DENABLE_EXAMPLES=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test) ) cmake_src_configure } diff --git a/net-libs/nghttp3/nghttp3-1.3.0.ebuild b/net-libs/nghttp3/nghttp3-1.3.0.ebuild new file mode 100644 index 000000000000..6715be902969 --- /dev/null +++ b/net-libs/nghttp3/nghttp3-1.3.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ngtcp2/nghttp3.git" + inherit git-r3 +else + SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~hppa" +fi + +DESCRIPTION="HTTP/3 library written in C" +HOMEPAGE="https://github.com/ngtcp2/nghttp3/" + +LICENSE="MIT" +SLOT="0/0" +IUSE="static-libs" + +BDEPEND="virtual/pkgconfig" +RDEPEND="" + +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_LIB_ONLY=ON + -DENABLE_STATIC_LIB=$(usex static-libs) + -DENABLE_EXAMPLES=OFF + ) + cmake_src_configure +} + +multilib_src_test() { + cmake_build check +} diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild index 3cfc00cf046a..6715be902969 100644 --- a/net-libs/nghttp3/nghttp3-9999.ebuild +++ b/net-libs/nghttp3/nghttp3-9999.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib if [[ ${PV} == 9999 ]] ; then @@ -11,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~hppa" + KEYWORDS="~amd64 ~arm64 ~hppa" fi DESCRIPTION="HTTP/3 library written in C" @@ -19,18 +18,16 @@ HOMEPAGE="https://github.com/ngtcp2/nghttp3/" LICENSE="MIT" SLOT="0/0" -IUSE="test" +IUSE="static-libs" BDEPEND="virtual/pkgconfig" -DEPEND="test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" RDEPEND="" -RESTRICT="!test? ( test )" multilib_src_configure() { local mycmakeargs=( -DENABLE_LIB_ONLY=ON + -DENABLE_STATIC_LIB=$(usex static-libs) -DENABLE_EXAMPLES=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test) ) cmake_src_configure } diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest index 736d30a78734..791d735d120a 100644 --- a/net-libs/ngtcp2/Manifest +++ b/net-libs/ngtcp2/Manifest @@ -1 +1,6 @@ -DIST ngtcp2-0_pre20190912.tar.gz 302984 BLAKE2B 906b248b0c19395288ed2c5ad55c8d42a9df9d76458104785c1013b9ebfaf1b92a4b87ced8755377fcb627018cf8854be0e4687e4c8a23ae994e5a21f466f739 SHA512 91b93575143960af421e8bd37d686602905fa3093750cfbbe3af1b20d743318281d22162676dc451562768ca08b6d0767b1dc28f3f8f6733235ebd76015a05bb +DIST ngtcp2-0.14.1.tar.xz 585788 BLAKE2B 68574767c701432e7558fa85cbad0d49934d220e292ceb82cdf19a715f247c6ec9b3a2b87def1176ade067a78c84bd3495936847a9a53fcadaff7b66971eca8d SHA512 52c55bc322d979d020ab3124a7cc0033d0f3e5649e3c8ee5f00aa64dbad83c4f199d50685704cc9372821e7fc81c59eea79f33894260b5dca171712d5b3899a0 +DIST ngtcp2-1.1.0.tar.xz 595536 BLAKE2B df37cede58fe67e9121d3c985a6d26b3534a2ef2805a9fb0ee92369d87e849164916e36c23b0e3055b4fa817307b1aa47cc1c0bfe3b03690401f00c0f050b9e8 SHA512 0de7d1aa67a5dbbf718313f90b7535980d29902a3d7e7a8a5e0362ec54b5ffe00ec2e844262ab05ddf6a0f3a1acc716a9b6df181121f8c3b66e138a91cfbe067 +DIST ngtcp2-1.2.0.tar.xz 598000 BLAKE2B 7594817c3a26a41f8d32145d81be6060f51830d671b6bfea40c400be6fda75cb0b61b78bb58d6773dcc369ecd977d9f9e871ed5a9b90e80021e11545bec240ab SHA512 98a5724df82340d9448e0d11393bf9638aeb766edcae67255fb421538fba05e01f56fd16b85b157b21ff086696508f2d9ca410e81b8495411afcce77325c241a +DIST ngtcp2-1.3.0.tar.xz 615620 BLAKE2B b8ec40c02979b0f25c1655c3c4a40c5a604d83f049e19793ef920bb21728be212e8e5b3f727c06b2a4fc1641ab8c12f81d24fcf2b623280fd0c1d100f338c650 SHA512 08ef43bb967dc0ca625975cca69e05903490b597531c65234077669cb39b5a28b60ff76726006ce6c4531d6c099d88dde63517f7b7d00e20ec5a879b87a30223 +DIST ngtcp2-1.4.0.tar.xz 618480 BLAKE2B a04010fa227a4cbe4ddb2036034a4eb97d80a410d2aa3959e2af48248e9dfe754c05b2d6b4b2d157c850f3d018d71d6dec1830f51e318f62a00b8fb3aa295ea3 SHA512 6491f158cd3bd659d593810935ceedefea8ee4a77e0a1952c0300f83188d0af1ef8313b24f9dbd3e7a795b6ad9099d2681b70ff1bafd92eed429ee028b2f2dea +DIST ngtcp2-1.5.0.tar.xz 627464 BLAKE2B 6a6fc91f2755d9cbccd6118b53b56b0b4fd3b445c9a491a2d7469ad59d7fe1983516eb79242196db009e7b0875c4db5305bd4c285d2437073b605033f812084d SHA512 6c05beccac5d53c575ceaa594ac6b1d91ae9f0be01394b3520e84b51a44d3c6a71612c2c6f613d3d1b9d2992a83a68696fedbfdc3842f02d4009c95b463ad97f diff --git a/net-libs/ngtcp2/metadata.xml b/net-libs/ngtcp2/metadata.xml index 71f915056b8c..4b6987e8ad53 100644 --- a/net-libs/ngtcp2/metadata.xml +++ b/net-libs/ngtcp2/metadata.xml @@ -8,4 +8,7 @@ <upstream> <remote-id type="github">ngtcp2/ngtcp2</remote-id> </upstream> + <use> + <flag name="openssl">Provide SSL support using OpenSSL (requires <pkg>dev-libs/openssl</pkg>)</flag> + </use> </pkgmetadata> diff --git a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild b/net-libs/ngtcp2/ngtcp2-0.14.1.ebuild index 36e82902fc0c..15a312759fd6 100644 --- a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild +++ b/net-libs/ngtcp2/ngtcp2-0.14.1.ebuild @@ -1,19 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git" inherit git-r3 else - GIT_COMMIT="5122d9e5e1e91c718ebc3933252ee42522c6e942" - SRC_URI="https://github.com/ngtcp2/ngtcp2/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${GIT_COMMIT}" - KEYWORDS="~amd64 ~hppa" + SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~hppa ~riscv x86" fi DESCRIPTION="Implementation of the IETF QUIC Protocol" @@ -21,20 +18,31 @@ HOMEPAGE="https://github.com/ngtcp2/ngtcp2/" LICENSE="MIT" SLOT="0/0" -IUSE="ssl test" +IUSE="+gnutls openssl +ssl static-libs test" +REQUIRED_USE="ssl? ( || ( gnutls openssl ) )" BDEPEND="virtual/pkgconfig" -DEPEND="ssl? ( >=dev-libs/openssl-1.1.1:0= ) +RDEPEND=" + ssl? ( + gnutls? ( >=net-libs/gnutls-3.7.2:0= ) + openssl? ( + >=dev-libs/openssl-1.1.1:0= + ) + )" +DEPEND="${RDEPEND} test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" -RDEPEND="" RESTRICT="!test? ( test )" multilib_src_configure() { local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=$(usex !ssl) + -DENABLE_STATIC_LIB=$(usex static-libs) + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_OPENSSL=$(usex openssl) + -DENABLE_BORINGSSL=OFF + -DENABLE_PICOTLS=OFF + -DENABLE_WOLFSSL=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON - -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test) ) cmake_src_configure } diff --git a/net-libs/ngtcp2/ngtcp2-1.1.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.1.0.ebuild new file mode 100644 index 000000000000..c50194288f25 --- /dev/null +++ b/net-libs/ngtcp2/ngtcp2-1.1.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git" + inherit git-r3 +else + SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86" +fi + +DESCRIPTION="Implementation of the IETF QUIC Protocol" +HOMEPAGE="https://github.com/ngtcp2/ngtcp2/" + +LICENSE="MIT" +SLOT="0/0" +IUSE="+gnutls openssl +ssl static-libs test" +REQUIRED_USE="ssl? ( || ( gnutls openssl ) )" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + ssl? ( + gnutls? ( >=net-libs/gnutls-3.7.2:0= ) + openssl? ( + >=dev-libs/openssl-1.1.1:0= + ) + )" +DEPEND="${RDEPEND} + test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" +RESTRICT="!test? ( test )" + +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_STATIC_LIB=$(usex static-libs) + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_OPENSSL=$(usex openssl) + -DENABLE_BORINGSSL=OFF + -DENABLE_PICOTLS=OFF + -DENABLE_WOLFSSL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON + ) + cmake_src_configure +} + +multilib_src_test() { + cmake_build check +} diff --git a/net-libs/ngtcp2/ngtcp2-1.2.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.2.0.ebuild new file mode 100644 index 000000000000..1f15a2e28c49 --- /dev/null +++ b/net-libs/ngtcp2/ngtcp2-1.2.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git" + inherit git-r3 +else + SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86" +fi + +DESCRIPTION="Implementation of the IETF QUIC Protocol" +HOMEPAGE="https://github.com/ngtcp2/ngtcp2/" + +LICENSE="MIT" +SLOT="0/0" +IUSE="+gnutls openssl +ssl static-libs test" +REQUIRED_USE="ssl? ( || ( gnutls openssl ) )" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + ssl? ( + gnutls? ( >=net-libs/gnutls-3.7.2:0= ) + openssl? ( + >=dev-libs/openssl-1.1.1:0= + ) + )" +DEPEND="${RDEPEND} + test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" +RESTRICT="!test? ( test )" + +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_STATIC_LIB=$(usex static-libs) + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_OPENSSL=$(usex openssl) + -DENABLE_BORINGSSL=OFF + -DENABLE_PICOTLS=OFF + -DENABLE_WOLFSSL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON + ) + cmake_src_configure +} + +multilib_src_test() { + cmake_build check +} diff --git a/net-libs/ngtcp2/ngtcp2-1.3.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.3.0.ebuild new file mode 100644 index 000000000000..1f15a2e28c49 --- /dev/null +++ b/net-libs/ngtcp2/ngtcp2-1.3.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git" + inherit git-r3 +else + SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86" +fi + +DESCRIPTION="Implementation of the IETF QUIC Protocol" +HOMEPAGE="https://github.com/ngtcp2/ngtcp2/" + +LICENSE="MIT" +SLOT="0/0" +IUSE="+gnutls openssl +ssl static-libs test" +REQUIRED_USE="ssl? ( || ( gnutls openssl ) )" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + ssl? ( + gnutls? ( >=net-libs/gnutls-3.7.2:0= ) + openssl? ( + >=dev-libs/openssl-1.1.1:0= + ) + )" +DEPEND="${RDEPEND} + test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" +RESTRICT="!test? ( test )" + +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_STATIC_LIB=$(usex static-libs) + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_OPENSSL=$(usex openssl) + -DENABLE_BORINGSSL=OFF + -DENABLE_PICOTLS=OFF + -DENABLE_WOLFSSL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON + ) + cmake_src_configure +} + +multilib_src_test() { + cmake_build check +} diff --git a/net-libs/ngtcp2/ngtcp2-1.4.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.4.0.ebuild new file mode 100644 index 000000000000..1f15a2e28c49 --- /dev/null +++ b/net-libs/ngtcp2/ngtcp2-1.4.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git" + inherit git-r3 +else + SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86" +fi + +DESCRIPTION="Implementation of the IETF QUIC Protocol" +HOMEPAGE="https://github.com/ngtcp2/ngtcp2/" + +LICENSE="MIT" +SLOT="0/0" +IUSE="+gnutls openssl +ssl static-libs test" +REQUIRED_USE="ssl? ( || ( gnutls openssl ) )" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + ssl? ( + gnutls? ( >=net-libs/gnutls-3.7.2:0= ) + openssl? ( + >=dev-libs/openssl-1.1.1:0= + ) + )" +DEPEND="${RDEPEND} + test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" +RESTRICT="!test? ( test )" + +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_STATIC_LIB=$(usex static-libs) + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_OPENSSL=$(usex openssl) + -DENABLE_BORINGSSL=OFF + -DENABLE_PICOTLS=OFF + -DENABLE_WOLFSSL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON + ) + cmake_src_configure +} + +multilib_src_test() { + cmake_build check +} diff --git a/net-libs/ngtcp2/ngtcp2-1.5.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.5.0.ebuild new file mode 100644 index 000000000000..3d01d4243f5a --- /dev/null +++ b/net-libs/ngtcp2/ngtcp2-1.5.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git" + inherit git-r3 +else + SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86" +fi + +DESCRIPTION="Implementation of the IETF QUIC Protocol" +HOMEPAGE="https://github.com/ngtcp2/ngtcp2/" + +LICENSE="MIT" +SLOT="0/0" +IUSE="+gnutls openssl +ssl static-libs test" +REQUIRED_USE="ssl? ( || ( gnutls openssl ) )" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + ssl? ( + gnutls? ( >=net-libs/gnutls-3.7.2:0= ) + openssl? ( + >=dev-libs/openssl-1.1.1:0= + ) + )" +DEPEND="${RDEPEND} + test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" +RESTRICT="!test? ( test )" + +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_STATIC_LIB=$(usex static-libs) + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_OPENSSL=$(usex openssl) + -DENABLE_BORINGSSL=OFF + -DENABLE_PICOTLS=OFF + -DENABLE_WOLFSSL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON + ) + cmake_src_configure +} + +multilib_src_test() { + cmake_build check +} diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild index e1fef793bf0f..1f15a2e28c49 100644 --- a/net-libs/ngtcp2/ngtcp2-9999.ebuild +++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib if [[ ${PV} == 9999 ]] ; then @@ -11,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~hppa" + KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86" fi DESCRIPTION="Implementation of the IETF QUIC Protocol" @@ -19,20 +18,31 @@ HOMEPAGE="https://github.com/ngtcp2/ngtcp2/" LICENSE="MIT" SLOT="0/0" -IUSE="ssl test" +IUSE="+gnutls openssl +ssl static-libs test" +REQUIRED_USE="ssl? ( || ( gnutls openssl ) )" BDEPEND="virtual/pkgconfig" -DEPEND="ssl? ( >=dev-libs/openssl-1.1.1:0= ) +RDEPEND=" + ssl? ( + gnutls? ( >=net-libs/gnutls-3.7.2:0= ) + openssl? ( + >=dev-libs/openssl-1.1.1:0= + ) + )" +DEPEND="${RDEPEND} test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" -RDEPEND="" RESTRICT="!test? ( test )" multilib_src_configure() { local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=$(usex !ssl) + -DENABLE_STATIC_LIB=$(usex static-libs) + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_OPENSSL=$(usex openssl) + -DENABLE_BORINGSSL=OFF + -DENABLE_PICOTLS=OFF + -DENABLE_WOLFSSL=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON - -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test) ) cmake_src_configure } diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index 21f44c4d3d57..465537b3fcfc 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -1,10 +1,10 @@ -DIST node-v12.22.5.tar.xz 23654908 BLAKE2B ca4f304e31f091ae656142035851d6e4427d8b2ddd2a69506dec96efbb1269a19a08e9ab8d44dfe10f8429bc239e4102f3f030adb25e9c41901c7d94b53e88c8 SHA512 80f3c673a1f2af7fffd6aaa556c06b8225034c8413e1a738c19d491aff1b3e6ed388df66ecbff88e4bfbefe1013dac7e3beb301456c2099b6a954ba468b21883 -DIST node-v12.22.6.tar.xz 23664904 BLAKE2B 04dd4fd4cbe39642a1c3dd8639a4d9e3362055f56bc2565303d0095cda1655033ba4e0ce5a969647d2be73df13ddbcccc4907825a94a41b45c0723b3c02ca980 SHA512 d107f1ff7073d2db9f0198f14b0523870e9b262c71055de2e03fba54f87bc98a57dad43d902c0b349957df21de71dc066133d4831eb7eb07f4e548d0ac724fb2 -DIST node-v12.22.7.tar.xz 23661696 BLAKE2B aa162e2aee98568c207b11a27651cefdf6444568ad0c0dc602d63a6767fc7d00d10e93626168b334d6fe1774fc8da420ed05b9d2ce485f0ec3544d992bfb5b83 SHA512 7697b409537114abf14a3847fffd8952fd35f54569bfa84ba527f231ac1defced5d11fe7bc39ff8ec7cccb282d584ff50a33bcbba16474c6a125808a29104222 -DIST node-v14.17.5.tar.xz 33585724 BLAKE2B cf79397caad8c81e4096f344f9fdb88d8ecea44b97fe208256dfd4afb750ecdf52142a2dc0430285b9d5117bdd43fa5ce42b4418926eec4d2c7f0a5f5d1a1539 SHA512 9d62c8946d05862d96a13a71b241a097b9f592a9e5f7362c81d8f3c74e7c5546a308b4c74bef34a66cafeef5d1a87d9d3e5ae8bb87d470c1ecf5abb8de0dedb5 -DIST node-v14.17.6.tar.xz 33606464 BLAKE2B c2c449e5eaf8214d7ed4bfab8db0208034cee1d08ef0e1fca478c30fc5cf95be037eb141080dbcfbe4fc58ef734457747dcbd0fe585a0536f9c0bec495435f25 SHA512 581c5698112426042fbf54fa793e56a30cae0c54ce8f23af6ac20d73c69a4f1166c5410f357c5a7b0409a773f99e3b9291e4afffd53b3c0e00569725dc4c47d3 -DIST node-v14.18.0.tar.xz 33698388 BLAKE2B 0a26aac559f2cd44d863b5375bc26692f1abf121c368df040041c9916e56410c3c919be377f099651e9a5e27bad972705d02a20f108f527cf23044e8ba95dd78 SHA512 0603e2466bf89b57e404e2992dda25012866a347489fb811a9757aea07056fc4f346236adf44a56d52c442f5f298f4dfdfc961f8582cd194d062beeb80c60cbf -DIST node-v14.18.1.tar.xz 33693816 BLAKE2B 310a53a7319620d8ff77b4e5947c7f2196efe96eb0d4311c8fb91b500331128750096e7b0471def73bee00cfa6a9da968cc8176b1d46d06d14c3409dedb9203b SHA512 a92d6f392e960008efd0c1f48471a3e294aa5292065fb31acc62723e8924f7f1a22bb02f3ab51a440f6e190bdee3c1667a275808c6b76d053a77aa6d7ad68aef -DIST node-v16.10.0.tar.xz 34046720 BLAKE2B e745443a4707eca97ebfc0d3cb8e697f64cd3eb98a419debde79100291ab64306d2c7cbda6ce1bfe6174cbc53880ddbda2965b0b6b8aa4b4b278781f002da277 SHA512 278f3e29f14362c017fbfa768bf0aa54cd208048741622413a67d3277e35fbdbc099fb84ce1de77837616e0e6f485916ccc771a7bee0b2ac5d30b4d4a6cf94f6 -DIST node-v16.13.0.tar.xz 33502788 BLAKE2B d30a63e77ef3b423bfa3a43299f7f6576ee5b0544757d1dbf233cbbc4bc9c70971927283ca87497add5ed05c9bf5d5501b36992cd242468fcd12e7f950ee29c2 SHA512 5d840fa49e8e637398f20b166b590a57e1070fd04c62bcb9b2d56646cf5a97719a70dbd9e0e29a548a268ac84c9a6c63c02ed6d38536ed45d82ffb96896a61c0 -DIST node-v16.9.1.tar.xz 34026992 BLAKE2B 8bb0d75ab91a00d5b03a31ded17a6b8845894630185d353ded616bf8435b672ea5cef06b4ca5bd01bb3536c5c50774f6ad0aa08a0fa8cbb00d8866e29561c2ab SHA512 e570c39fffa5d79c8d3fa1fe90ece53b22729af6e882416a35b54362be7169eeb3d37cf8be69ee1b748a981b1fbc725d8c85a739bc5cb0b22d6d2e313ab646ac +DIST node-v18.17.1.tar.xz 40788836 BLAKE2B 50e0dc0eecd68620ffa7457319e71124bbba302f6acff79286a30cf97442fb09a96cf8781456bafd5c2e497ba88cf392c141f0e221683da421b87f653b1ad7ca SHA512 fd6f586447ecd44ac6738da1cf7d54e74bd33ffd1ee1acc2e0e1bdaf0031bcaef85751d3dd590bb278eb502daf9c77f0763b5a181a30ee4cf537aef254629622 +DIST node-v18.19.0.tar.xz 41248748 BLAKE2B 24f9c99737a6d455ad83a7c55d0c668190570b5947bb3a6b2f321a25ff1e30b2913a4e144821ddf794a975cd9765582426252933235ce033623ccf3ecce816a4 SHA512 db2f1342f028e5cd2ab0a3719b4c822e22439aa097b59df768fb7f6aa581394f81af6f51f7764b99d119ea2c849b55c02897af8caafab7c0f9d0112608a8867f +DIST node-v18.20.1.tar.xz 40434200 BLAKE2B 560e04d5da8c2f3f4ef82e67b483f2c5d9a59b0646108a1dfc0bd80b410b60b15ee517be7d720834232fc49ed5d94785ebd64282c9abd3c10bdcb883a6960a38 SHA512 08864a164cfde08e369653abd17f6fe549db014697bd36abd07233d5ae746417ef18ea80e3d3f3630503a21110bb5e0ebd0073b4f2885b00c2d46e6f31c386a3 +DIST node-v18.20.2.tar.xz 40550044 BLAKE2B 119e1c0a1817b982940704c3fb92bca8fa09d6d26921ffa01aa1240103704d2e2779774a759246f9b00372bcd991e8cff035f3c5ad0bf92e0fde9f640721904a SHA512 b613e1cf5c87535fc3db908cd258359813aae7636ab0e2fdd00ffe813f99e33050926f10016280d8fac4905fb933d1f20315b919fbf3b0b37cd7a9936ae415e3 +DIST node-v20.11.0.tar.xz 42162348 BLAKE2B c090a3b118c9f3b497450ea2572b08a7a0df0834f280b212d6f068e5fb75a0a095cc41fe5d530c51dd7c2ae4815cedce1c52642fdc5aa07345fb546c2ea3b396 SHA512 405cbd53f75d94b9c31536a638c6508215b34a77505471319c46f66eb87ac907cb6796b25efa27162da53cb6a013aaf9ad1a5690eb7ed793969055a648d1d53c +DIST node-v20.12.1.tar.xz 41743360 BLAKE2B 1e2819724051720321a429bb18967a12608e8f93ef1760c520a40c9130e6138f95ab4e87f1acbaa72142bdd801ec3050bc42d7e4fae8d6a62192c3511b922e0a SHA512 c51c4aa37cc80f3fe34381f2cdf431053124ec6b83fc8490573502adfab48601c382448132c9962ab135bebaffc257a9d5b63334ba8ff480db57b5706bbfed67 +DIST node-v20.12.2.tar.xz 41634476 BLAKE2B 4a402cd4d2a3d59e249581b8dafbd09802f1fc6c1173810a7198ebf73bbe9ccbe085226c1889461d6faa2654138f21a2636594dca1a02847af9fd64ef80293e5 SHA512 2ff2873f3e1a15d529d07a74af601194c9dc7c24e566b989c96fadda8636d7ea1c97787642e9483a00db320cf1cf0817b43c4ba3ad45b15a241997c9f0c6c288 +DIST node-v20.6.1.tar.xz 41791920 BLAKE2B c131aa9dd2a155eb24dda80e4997895aab7d935e46d1f21e9e176aa15021aa68be41f49cc43557f0b2c962baf3b2da4ea0ba044efd5016ea58bf2dc0b76c4edd SHA512 8a6d998ae9b52872ff8cdcd44261f644161f31bcb565329ae05e68945c8da939eabcb76d2e0f628c8eb634de37d7b16334823f64122e4483c390117d8aa511bf +DIST node-v22.1.0.tar.xz 44377532 BLAKE2B 161618a71d8f2c5f828e29e45f5eb410fb2c6695012ca7559bddbe3884e578d643414ebf59c1b3292dbe93bf115de43c4145f6ff24e11fb9e87a32cf4eff1859 SHA512 d991fe069e43cfab587f06e81df71b56b82fbdd7042cdbe46136fc9ccad654d6f8bd39ec9fd3a5c00fe73a82732b12e13632c26602c6f8d67c628938c2a55688 +DIST nodejs-22.1.0-deps-import-simdjson-3.9.1-for-GCC-14.patch.xz 192248 BLAKE2B 8acd447cea7ce7d68750c89a1778f0b43279ecd3b7fdbc4db36b9d0f97974efc6769266fbde2934b80e96db5a11f2550098b92d74ef72708d6e2cf542ebf0060 SHA512 7fe3f057b8785ff944cee5ad185a8708ee114f86344b9199f03443d149bc26bd2434c1ad32b8eb388f982f90632643b28aeff60177403c4851d3e7897b0272a6 diff --git a/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch b/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch deleted file mode 100644 index 9c7fe6888fb8..000000000000 --- a/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/deps/npm/lib/config/core.js -+++ b/deps/npm/lib/config/core.js -@@ -153,11 +153,12 @@ - // Eg, `npm config get globalconfig --prefix ~/local` should - // return `~/local/etc/npmrc` - // annoying humans and their expectations! -- if (conf.get('prefix')) { -- var etc = path.resolve(conf.get('prefix'), 'etc') -- defaults.globalconfig = path.resolve(etc, 'npmrc') -- defaults.globalignorefile = path.resolve(etc, 'npmignore') -- } -+ // gentoo deviates wrt global config; store in /etc/npm -+ var globalconfig = path.resolve('/etc', 'npm') -+ mkdirp(globalconfig, function () { -+ defaults.globalconfig = path.resolve(globalconfig, 'npmrc') -+ defaults.globalignorefile = path.resolve(globalconfig, 'npmignore') -+ }) - - conf.addFile(conf.get('globalconfig'), 'global') - diff --git a/net-libs/nodejs/files/nodejs-12.20.1-fix_ppc64_crashes.patch b/net-libs/nodejs/files/nodejs-12.20.1-fix_ppc64_crashes.patch deleted file mode 100644 index 0982d3c81c2a..000000000000 --- a/net-libs/nodejs/files/nodejs-12.20.1-fix_ppc64_crashes.patch +++ /dev/null @@ -1,44 +0,0 @@ -Backport of https://github.com/nodejs/node/pull/33866 to nodejs-12 - ---- a/deps/v8/src/compiler/backend/instruction-selector.cc -+++ b/deps/v8/src/compiler/backend/instruction-selector.cc -@@ -2788,7 +2788,7 @@ - switch (call_descriptor->kind()) { - case CallDescriptor::kCallAddress: { - int misc_field = static_cast<int>(call_descriptor->ParameterCount()); --#if defined(_AIX) -+#if ABI_USES_FUNCTION_DESCRIPTORS - // Highest misc_field bit is used on AIX to indicate if a CFunction call - // has function descriptor or not. - misc_field |= call_descriptor->HasFunctionDescriptor() ---- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc -+++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc -@@ -1026,7 +1026,7 @@ - Label start_call; - bool isWasmCapiFunction = - linkage()->GetIncomingDescriptor()->IsWasmCapiFunction(); --#if defined(_AIX) -+#if ABI_USES_FUNCTION_DESCRIPTORS - // AIX/PPC64BE Linux uses a function descriptor - int kNumParametersMask = kHasFunctionDescriptorBitMask - 1; - num_parameters = kNumParametersMask & misc_field; ---- a/deps/v8/src/execution/simulator.h -+++ b/deps/v8/src/execution/simulator.h -@@ -122,7 +122,7 @@ - - DISABLE_CFI_ICALL Return Call(Args... args) { - // When running without a simulator we call the entry directly. --#if V8_OS_AIX -+#if ABI_USES_FUNCTION_DESCRIPTORS - // AIX ABI requires function descriptors (FD). Artificially create a pseudo - // FD to ensure correct dispatch to generated code. The 'volatile' - // declaration is required to avoid the compiler from not observing the -@@ -134,7 +134,7 @@ - return fn(args...); - #else - return fn_ptr_(args...); --#endif // V8_OS_AIX -+#endif // ABI_USES_FUNCTION_DESCRIPTORS - } - #endif // USE_SIMULATOR - diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch deleted file mode 100644 index 5f0df09b6e2e..000000000000 --- a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/deps/v8/third_party/jinja2/tests.py -+++ b/deps/v8/third_party/jinja2/tests.py -@@ -10,7 +10,7 @@ - """ - import operator - import re --from collections import Mapping -+from collections.abc import Mapping - from jinja2.runtime import Undefined - from jinja2._compat import text_type, string_types, integer_types - import decimal ---- a/deps/v8/third_party/jinja2/runtime.py -+++ b/deps/v8/third_party/jinja2/runtime.py -@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)): - - # register the context as mapping if possible - try: -- from collections import Mapping -+ from collections.abc import Mapping - Mapping.register(Context) - except ImportError: - pass ---- a/deps/v8/third_party/jinja2/sandbox.py -+++ b/deps/v8/third_party/jinja2/sandbox.py -@@ -14,7 +14,7 @@ - """ - import types - import operator --from collections import Mapping -+from collections.abc import Mapping - from jinja2.environment import Environment - from jinja2.exceptions import SecurityError - from jinja2._compat import string_types, PY2 -@@ -79,7 +79,7 @@ except ImportError: - pass - - #: register Python 2.6 abstract base classes --from collections import MutableSet, MutableMapping, MutableSequence -+from collections.abc import MutableSet, MutableMapping, MutableSequence - _mutable_set_types += (MutableSet,) - _mutable_mapping_types += (MutableMapping,) - _mutable_sequence_types += (MutableSequence,) ---- a/deps/v8/third_party/jinja2/utils.py -+++ b/deps/v8/third_party/jinja2/utils.py -@@ -482,7 +482,7 @@ class LRUCache(object): - - # register the LRU cache as mutable mapping if possible - try: -- from collections import MutableMapping -+ from collections.abc import MutableMapping - MutableMapping.register(LRUCache) - except ImportError: - pass ---- a/tools/inspector_protocol/jinja2/runtime.py -+++ b/tools/inspector_protocol/jinja2/runtime.py -@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)): - - # register the context as mapping if possible - try: -- from collections import Mapping -+ from collections.abc import Mapping - Mapping.register(Context) - except ImportError: - pass ---- a/tools/inspector_protocol/jinja2/sandbox.py -+++ b/tools/inspector_protocol/jinja2/sandbox.py -@@ -14,7 +14,7 @@ - """ - import types - import operator --from collections import Mapping -+from collections.abc import Mapping - from jinja2.environment import Environment - from jinja2.exceptions import SecurityError - from jinja2._compat import string_types, PY2 -@@ -79,7 +79,7 @@ except ImportError: - pass - - #: register Python 2.6 abstract base classes --from collections import MutableSet, MutableMapping, MutableSequence -+from collections.abc import MutableSet, MutableMapping, MutableSequence - _mutable_set_types += (MutableSet,) - _mutable_mapping_types += (MutableMapping,) - _mutable_sequence_types += (MutableSequence,) ---- a/tools/inspector_protocol/jinja2/tests.py -+++ b/tools/inspector_protocol/jinja2/tests.py -@@ -10,7 +10,7 @@ - """ - import operator - import re --from collections import Mapping -+from collections.abc import Mapping - from jinja2.runtime import Undefined - from jinja2._compat import text_type, string_types, integer_types - import decimal diff --git a/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch b/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch deleted file mode 100644 index eb56bb87d86d..000000000000 --- a/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/deps/uvwasi/uvwasi.gyp -+++ b/deps/uvwasi/uvwasi.gyp -@@ -18,9 +18,6 @@ - 'src/wasi_rights.c', - 'src/wasi_serdes.c', - ], -- 'dependencies': [ -- '../uv/uv.gyp:libuv', -- ], - 'direct_dependent_settings': { - 'include_dirs': ['include'] - }, diff --git a/net-libs/nodejs/files/nodejs-12.22.5-shared_c-ares_nameser_h.patch b/net-libs/nodejs/files/nodejs-12.22.5-shared_c-ares_nameser_h.patch deleted file mode 100644 index f90084c2bb2e..000000000000 --- a/net-libs/nodejs/files/nodejs-12.22.5-shared_c-ares_nameser_h.patch +++ /dev/null @@ -1,534 +0,0 @@ -From aff98a5667c22794e2eaf658f6dfbee54cdd4a3b Mon Sep 17 00:00:00 2001 -From: Felix Yan <felixonmars@archlinux.org> -Date: Thu, 12 Aug 2021 02:44:43 +0800 -Subject: [PATCH 1/2] deps: fix building with system c-ares on Linux - -The change in #39724 breaks building with system c-ares -(`--shared-cares`): -``` -In file included from ../src/cares_wrap.cc:25: -../src/cares_wrap.h:25:11: fatal error: ares_nameser.h: No such file or -directory - 25 | # include <ares_nameser.h> - | ^~~~~~~~~~~~~~~~ -``` - -Since `ares_nameser.h` isn't available with a default system c-ares -installation, let's copy it as our private header here. - -Tested to build fine on Arch Linux with shared c-ares. ---- - src/ares_nameser.h | 482 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 482 insertions(+) - create mode 100644 src/ares_nameser.h - -diff --git a/src/ares_nameser.h b/src/ares_nameser.h -new file mode 100644 -index 000000000000..5270e5a3a6a0 ---- /dev/null -+++ b/src/ares_nameser.h -@@ -0,0 +1,482 @@ -+ -+#ifndef ARES_NAMESER_H -+#define ARES_NAMESER_H -+ -+#ifdef HAVE_ARPA_NAMESER_H -+# include <arpa/nameser.h> -+#endif -+#ifdef HAVE_ARPA_NAMESER_COMPAT_H -+# include <arpa/nameser_compat.h> -+#endif -+ -+/* ============================================================================ -+ * arpa/nameser.h may or may not provide ALL of the below defines, so check -+ * each one individually and set if not -+ * ============================================================================ -+ */ -+ -+#ifndef NS_PACKETSZ -+# define NS_PACKETSZ 512 /* maximum packet size */ -+#endif -+ -+#ifndef NS_MAXDNAME -+# define NS_MAXDNAME 256 /* maximum domain name */ -+#endif -+ -+#ifndef NS_MAXCDNAME -+# define NS_MAXCDNAME 255 /* maximum compressed domain name */ -+#endif -+ -+#ifndef NS_MAXLABEL -+# define NS_MAXLABEL 63 -+#endif -+ -+#ifndef NS_HFIXEDSZ -+# define NS_HFIXEDSZ 12 /* #/bytes of fixed data in header */ -+#endif -+ -+#ifndef NS_QFIXEDSZ -+# define NS_QFIXEDSZ 4 /* #/bytes of fixed data in query */ -+#endif -+ -+#ifndef NS_RRFIXEDSZ -+# define NS_RRFIXEDSZ 10 /* #/bytes of fixed data in r record */ -+#endif -+ -+#ifndef NS_INT16SZ -+# define NS_INT16SZ 2 -+#endif -+ -+#ifndef NS_INADDRSZ -+# define NS_INADDRSZ 4 -+#endif -+ -+#ifndef NS_IN6ADDRSZ -+# define NS_IN6ADDRSZ 16 -+#endif -+ -+#ifndef NS_CMPRSFLGS -+# define NS_CMPRSFLGS 0xc0 /* Flag bits indicating name compression. */ -+#endif -+ -+#ifndef NS_DEFAULTPORT -+# define NS_DEFAULTPORT 53 /* For both TCP and UDP. */ -+#endif -+ -+/* ============================================================================ -+ * arpa/nameser.h should provide these enumerations always, so if not found, -+ * provide them -+ * ============================================================================ -+ */ -+#ifndef HAVE_ARPA_NAMESER_H -+ -+typedef enum __ns_class { -+ ns_c_invalid = 0, /* Cookie. */ -+ ns_c_in = 1, /* Internet. */ -+ ns_c_2 = 2, /* unallocated/unsupported. */ -+ ns_c_chaos = 3, /* MIT Chaos-net. */ -+ ns_c_hs = 4, /* MIT Hesiod. */ -+ /* Query class values which do not appear in resource records */ -+ ns_c_none = 254, /* for prereq. sections in update requests */ -+ ns_c_any = 255, /* Wildcard match. */ -+ ns_c_max = 65536 -+} ns_class; -+ -+typedef enum __ns_type { -+ ns_t_invalid = 0, /* Cookie. */ -+ ns_t_a = 1, /* Host address. */ -+ ns_t_ns = 2, /* Authoritative server. */ -+ ns_t_md = 3, /* Mail destination. */ -+ ns_t_mf = 4, /* Mail forwarder. */ -+ ns_t_cname = 5, /* Canonical name. */ -+ ns_t_soa = 6, /* Start of authority zone. */ -+ ns_t_mb = 7, /* Mailbox domain name. */ -+ ns_t_mg = 8, /* Mail group member. */ -+ ns_t_mr = 9, /* Mail rename name. */ -+ ns_t_null = 10, /* Null resource record. */ -+ ns_t_wks = 11, /* Well known service. */ -+ ns_t_ptr = 12, /* Domain name pointer. */ -+ ns_t_hinfo = 13, /* Host information. */ -+ ns_t_minfo = 14, /* Mailbox information. */ -+ ns_t_mx = 15, /* Mail routing information. */ -+ ns_t_txt = 16, /* Text strings. */ -+ ns_t_rp = 17, /* Responsible person. */ -+ ns_t_afsdb = 18, /* AFS cell database. */ -+ ns_t_x25 = 19, /* X_25 calling address. */ -+ ns_t_isdn = 20, /* ISDN calling address. */ -+ ns_t_rt = 21, /* Router. */ -+ ns_t_nsap = 22, /* NSAP address. */ -+ ns_t_nsap_ptr = 23, /* Reverse NSAP lookup (deprecated). */ -+ ns_t_sig = 24, /* Security signature. */ -+ ns_t_key = 25, /* Security key. */ -+ ns_t_px = 26, /* X.400 mail mapping. */ -+ ns_t_gpos = 27, /* Geographical position (withdrawn). */ -+ ns_t_aaaa = 28, /* Ip6 Address. */ -+ ns_t_loc = 29, /* Location Information. */ -+ ns_t_nxt = 30, /* Next domain (security). */ -+ ns_t_eid = 31, /* Endpoint identifier. */ -+ ns_t_nimloc = 32, /* Nimrod Locator. */ -+ ns_t_srv = 33, /* Server Selection. */ -+ ns_t_atma = 34, /* ATM Address */ -+ ns_t_naptr = 35, /* Naming Authority PoinTeR */ -+ ns_t_kx = 36, /* Key Exchange */ -+ ns_t_cert = 37, /* Certification record */ -+ ns_t_a6 = 38, /* IPv6 address (deprecates AAAA) */ -+ ns_t_dname = 39, /* Non-terminal DNAME (for IPv6) */ -+ ns_t_sink = 40, /* Kitchen sink (experimentatl) */ -+ ns_t_opt = 41, /* EDNS0 option (meta-RR) */ -+ ns_t_apl = 42, /* Address prefix list (RFC3123) */ -+ ns_t_ds = 43, /* Delegation Signer (RFC4034) */ -+ ns_t_sshfp = 44, /* SSH Key Fingerprint (RFC4255) */ -+ ns_t_rrsig = 46, /* Resource Record Signature (RFC4034) */ -+ ns_t_nsec = 47, /* Next Secure (RFC4034) */ -+ ns_t_dnskey = 48, /* DNS Public Key (RFC4034) */ -+ ns_t_tkey = 249, /* Transaction key */ -+ ns_t_tsig = 250, /* Transaction signature. */ -+ ns_t_ixfr = 251, /* Incremental zone transfer. */ -+ ns_t_axfr = 252, /* Transfer zone of authority. */ -+ ns_t_mailb = 253, /* Transfer mailbox records. */ -+ ns_t_maila = 254, /* Transfer mail agent records. */ -+ ns_t_any = 255, /* Wildcard match. */ -+ ns_t_zxfr = 256, /* BIND-specific, nonstandard. */ -+ ns_t_caa = 257, /* Certification Authority Authorization. */ -+ ns_t_max = 65536 -+} ns_type; -+ -+typedef enum __ns_opcode { -+ ns_o_query = 0, /* Standard query. */ -+ ns_o_iquery = 1, /* Inverse query (deprecated/unsupported). */ -+ ns_o_status = 2, /* Name server status query (unsupported). */ -+ /* Opcode 3 is undefined/reserved. */ -+ ns_o_notify = 4, /* Zone change notification. */ -+ ns_o_update = 5, /* Zone update message. */ -+ ns_o_max = 6 -+} ns_opcode; -+ -+typedef enum __ns_rcode { -+ ns_r_noerror = 0, /* No error occurred. */ -+ ns_r_formerr = 1, /* Format error. */ -+ ns_r_servfail = 2, /* Server failure. */ -+ ns_r_nxdomain = 3, /* Name error. */ -+ ns_r_notimpl = 4, /* Unimplemented. */ -+ ns_r_refused = 5, /* Operation refused. */ -+ /* these are for BIND_UPDATE */ -+ ns_r_yxdomain = 6, /* Name exists */ -+ ns_r_yxrrset = 7, /* RRset exists */ -+ ns_r_nxrrset = 8, /* RRset does not exist */ -+ ns_r_notauth = 9, /* Not authoritative for zone */ -+ ns_r_notzone = 10, /* Zone of record different from zone section */ -+ ns_r_max = 11, -+ /* The following are TSIG extended errors */ -+ ns_r_badsig = 16, -+ ns_r_badkey = 17, -+ ns_r_badtime = 18 -+} ns_rcode; -+ -+#endif /* HAVE_ARPA_NAMESER_H */ -+ -+ -+/* ============================================================================ -+ * arpa/nameser_compat.h typically sets these. However on some systems -+ * arpa/nameser.h does, but may not set all of them. Lets conditionally -+ * define each -+ * ============================================================================ -+ */ -+ -+#ifndef PACKETSZ -+# define PACKETSZ NS_PACKETSZ -+#endif -+ -+#ifndef MAXDNAME -+# define MAXDNAME NS_MAXDNAME -+#endif -+ -+#ifndef MAXCDNAME -+# define MAXCDNAME NS_MAXCDNAME -+#endif -+ -+#ifndef MAXLABEL -+# define MAXLABEL NS_MAXLABEL -+#endif -+ -+#ifndef HFIXEDSZ -+# define HFIXEDSZ NS_HFIXEDSZ -+#endif -+ -+#ifndef QFIXEDSZ -+# define QFIXEDSZ NS_QFIXEDSZ -+#endif -+ -+#ifndef RRFIXEDSZ -+# define RRFIXEDSZ NS_RRFIXEDSZ -+#endif -+ -+#ifndef INDIR_MASK -+# define INDIR_MASK NS_CMPRSFLGS -+#endif -+ -+#ifndef NAMESERVER_PORT -+# define NAMESERVER_PORT NS_DEFAULTPORT -+#endif -+ -+ -+/* opcodes */ -+#ifndef O_QUERY -+# define O_QUERY 0 /* ns_o_query */ -+#endif -+#ifndef O_IQUERY -+# define O_IQUERY 1 /* ns_o_iquery */ -+#endif -+#ifndef O_STATUS -+# define O_STATUS 2 /* ns_o_status */ -+#endif -+#ifndef O_NOTIFY -+# define O_NOTIFY 4 /* ns_o_notify */ -+#endif -+#ifndef O_UPDATE -+# define O_UPDATE 5 /* ns_o_update */ -+#endif -+ -+ -+/* response codes */ -+#ifndef SERVFAIL -+# define SERVFAIL ns_r_servfail -+#endif -+#ifndef NOTIMP -+# define NOTIMP ns_r_notimpl -+#endif -+#ifndef REFUSED -+# define REFUSED ns_r_refused -+#endif -+#if defined(_WIN32) && !defined(HAVE_ARPA_NAMESER_COMPAT_H) && defined(NOERROR) -+# undef NOERROR /* it seems this is already defined in winerror.h */ -+#endif -+#ifndef NOERROR -+# define NOERROR ns_r_noerror -+#endif -+#ifndef FORMERR -+# define FORMERR ns_r_formerr -+#endif -+#ifndef NXDOMAIN -+# define NXDOMAIN ns_r_nxdomain -+#endif -+/* Non-standard response codes, use numeric values */ -+#ifndef YXDOMAIN -+# define YXDOMAIN 6 /* ns_r_yxdomain */ -+#endif -+#ifndef YXRRSET -+# define YXRRSET 7 /* ns_r_yxrrset */ -+#endif -+#ifndef NXRRSET -+# define NXRRSET 8 /* ns_r_nxrrset */ -+#endif -+#ifndef NOTAUTH -+# define NOTAUTH 9 /* ns_r_notauth */ -+#endif -+#ifndef NOTZONE -+# define NOTZONE 10 /* ns_r_notzone */ -+#endif -+#ifndef TSIG_BADSIG -+# define TSIG_BADSIG 16 /* ns_r_badsig */ -+#endif -+#ifndef TSIG_BADKEY -+# define TSIG_BADKEY 17 /* ns_r_badkey */ -+#endif -+#ifndef TSIG_BADTIME -+# define TSIG_BADTIME 18 /* ns_r_badtime */ -+#endif -+ -+ -+/* classes */ -+#ifndef C_IN -+# define C_IN 1 /* ns_c_in */ -+#endif -+#ifndef C_CHAOS -+# define C_CHAOS 3 /* ns_c_chaos */ -+#endif -+#ifndef C_HS -+# define C_HS 4 /* ns_c_hs */ -+#endif -+#ifndef C_NONE -+# define C_NONE 254 /* ns_c_none */ -+#endif -+#ifndef C_ANY -+# define C_ANY 255 /* ns_c_any */ -+#endif -+ -+ -+/* types */ -+#ifndef T_A -+# define T_A 1 /* ns_t_a */ -+#endif -+#ifndef T_NS -+# define T_NS 2 /* ns_t_ns */ -+#endif -+#ifndef T_MD -+# define T_MD 3 /* ns_t_md */ -+#endif -+#ifndef T_MF -+# define T_MF 4 /* ns_t_mf */ -+#endif -+#ifndef T_CNAME -+# define T_CNAME 5 /* ns_t_cname */ -+#endif -+#ifndef T_SOA -+# define T_SOA 6 /* ns_t_soa */ -+#endif -+#ifndef T_MB -+# define T_MB 7 /* ns_t_mb */ -+#endif -+#ifndef T_MG -+# define T_MG 8 /* ns_t_mg */ -+#endif -+#ifndef T_MR -+# define T_MR 9 /* ns_t_mr */ -+#endif -+#ifndef T_NULL -+# define T_NULL 10 /* ns_t_null */ -+#endif -+#ifndef T_WKS -+# define T_WKS 11 /* ns_t_wks */ -+#endif -+#ifndef T_PTR -+# define T_PTR 12 /* ns_t_ptr */ -+#endif -+#ifndef T_HINFO -+# define T_HINFO 13 /* ns_t_hinfo */ -+#endif -+#ifndef T_MINFO -+# define T_MINFO 14 /* ns_t_minfo */ -+#endif -+#ifndef T_MX -+# define T_MX 15 /* ns_t_mx */ -+#endif -+#ifndef T_TXT -+# define T_TXT 16 /* ns_t_txt */ -+#endif -+#ifndef T_RP -+# define T_RP 17 /* ns_t_rp */ -+#endif -+#ifndef T_AFSDB -+# define T_AFSDB 18 /* ns_t_afsdb */ -+#endif -+#ifndef T_X25 -+# define T_X25 19 /* ns_t_x25 */ -+#endif -+#ifndef T_ISDN -+# define T_ISDN 20 /* ns_t_isdn */ -+#endif -+#ifndef T_RT -+# define T_RT 21 /* ns_t_rt */ -+#endif -+#ifndef T_NSAP -+# define T_NSAP 22 /* ns_t_nsap */ -+#endif -+#ifndef T_NSAP_PTR -+# define T_NSAP_PTR 23 /* ns_t_nsap_ptr */ -+#endif -+#ifndef T_SIG -+# define T_SIG 24 /* ns_t_sig */ -+#endif -+#ifndef T_KEY -+# define T_KEY 25 /* ns_t_key */ -+#endif -+#ifndef T_PX -+# define T_PX 26 /* ns_t_px */ -+#endif -+#ifndef T_GPOS -+# define T_GPOS 27 /* ns_t_gpos */ -+#endif -+#ifndef T_AAAA -+# define T_AAAA 28 /* ns_t_aaaa */ -+#endif -+#ifndef T_LOC -+# define T_LOC 29 /* ns_t_loc */ -+#endif -+#ifndef T_NXT -+# define T_NXT 30 /* ns_t_nxt */ -+#endif -+#ifndef T_EID -+# define T_EID 31 /* ns_t_eid */ -+#endif -+#ifndef T_NIMLOC -+# define T_NIMLOC 32 /* ns_t_nimloc */ -+#endif -+#ifndef T_SRV -+# define T_SRV 33 /* ns_t_srv */ -+#endif -+#ifndef T_ATMA -+# define T_ATMA 34 /* ns_t_atma */ -+#endif -+#ifndef T_NAPTR -+# define T_NAPTR 35 /* ns_t_naptr */ -+#endif -+#ifndef T_KX -+# define T_KX 36 /* ns_t_kx */ -+#endif -+#ifndef T_CERT -+# define T_CERT 37 /* ns_t_cert */ -+#endif -+#ifndef T_A6 -+# define T_A6 38 /* ns_t_a6 */ -+#endif -+#ifndef T_DNAME -+# define T_DNAME 39 /* ns_t_dname */ -+#endif -+#ifndef T_SINK -+# define T_SINK 40 /* ns_t_sink */ -+#endif -+#ifndef T_OPT -+# define T_OPT 41 /* ns_t_opt */ -+#endif -+#ifndef T_APL -+# define T_APL 42 /* ns_t_apl */ -+#endif -+#ifndef T_DS -+# define T_DS 43 /* ns_t_ds */ -+#endif -+#ifndef T_SSHFP -+# define T_SSHFP 44 /* ns_t_sshfp */ -+#endif -+#ifndef T_RRSIG -+# define T_RRSIG 46 /* ns_t_rrsig */ -+#endif -+#ifndef T_NSEC -+# define T_NSEC 47 /* ns_t_nsec */ -+#endif -+#ifndef T_DNSKEY -+# define T_DNSKEY 48 /* ns_t_dnskey */ -+#endif -+#ifndef T_TKEY -+# define T_TKEY 249 /* ns_t_tkey */ -+#endif -+#ifndef T_TSIG -+# define T_TSIG 250 /* ns_t_tsig */ -+#endif -+#ifndef T_IXFR -+# define T_IXFR 251 /* ns_t_ixfr */ -+#endif -+#ifndef T_AXFR -+# define T_AXFR 252 /* ns_t_axfr */ -+#endif -+#ifndef T_MAILB -+# define T_MAILB 253 /* ns_t_mailb */ -+#endif -+#ifndef T_MAILA -+# define T_MAILA 254 /* ns_t_maila */ -+#endif -+#ifndef T_ANY -+# define T_ANY 255 /* ns_t_any */ -+#endif -+#ifndef T_ZXFR -+# define T_ZXFR 256 /* ns_t_zxfr */ -+#endif -+#ifndef T_CAA -+# define T_CAA 257 /* ns_t_caa */ -+#endif -+#ifndef T_MAX -+# define T_MAX 65536 /* ns_t_max */ -+#endif -+ -+ -+#endif /* ARES_NAMESER_H */ - -From db4643979ee676b3a3d6cdf2fb597d399cf8013f Mon Sep 17 00:00:00 2001 -From: Felix Yan <felixonmars@archlinux.org> -Date: Fri, 13 Aug 2021 00:01:59 +0800 -Subject: [PATCH 2/2] build: ignore cpplint for third-party ares_nameser.h - ---- - Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile b/Makefile -index ec4c774748cd..c418995c53c1 100644 ---- a/Makefile -+++ b/Makefile -@@ -1289,6 +1289,7 @@ jslint-ci: lint-js-ci - LINT_CPP_ADDON_DOC_FILES_GLOB = test/addons/??_*/*.cc test/addons/??_*/*.h - LINT_CPP_ADDON_DOC_FILES = $(wildcard $(LINT_CPP_ADDON_DOC_FILES_GLOB)) - LINT_CPP_EXCLUDE ?= -+LINT_CPP_EXCLUDE += src/ares_nameser.h - LINT_CPP_EXCLUDE += src/node_root_certs.h - LINT_CPP_EXCLUDE += $(LINT_CPP_ADDON_DOC_FILES) - LINT_CPP_EXCLUDE += $(wildcard test/js-native-api/??_*/*.cc test/js-native-api/??_*/*.h test/node-api/??_*/*.cc test/node-api/??_*/*.h) diff --git a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch deleted file mode 100644 index 8dbf5f43d486..000000000000 --- a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch +++ /dev/null @@ -1,111 +0,0 @@ - Bug: 694100 - Add actions for pax marking mkcodecache, node_mksnapshot and mksnapshot - to disable mprotect for pax enable kernel. - Reported-by: Attila Tóth <atoth@atoth.sote.hu> - Co-developed-by: Attila Tóth <atoth@atoth.sote.hu> - Signed-off-by: Magnus Granberg <zorry@gentoo.org> - ---- a/node.gyp 2019-10-23 11:52:41.000000000 +0200 -+++ b/node.gyp 2019-11-12 20:58:43.957881862 +0100 -@@ -233,7 +233,9 @@ - 'deps/acorn-plugins/acorn-static-class-features/index.js', - ], - 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)', -+ 'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)', - 'conditions': [ - [ 'node_shared=="true"', { - 'node_target_type%': 'shared_library', -@@ -436,10 +438,24 @@ - ], - 'actions': [ - { -+ 'action_name': 'run_pax_mkcodecache', -+ 'inputs': [ -+ '<(mkcodecache_exec)', -+ ], -+ 'outputs': [ -+ '<(mkcodecache_u_exec)', -+ ], -+ 'action': [ -+ 'bash', -+ '-c', -+ 'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)', -+ ], -+ }, -+ { - 'action_name': 'run_mkcodecache', - 'process_outputs_as_sources': 1, - 'inputs': [ -- '<(mkcodecache_exec)', -+ '<(mkcodecache_u_exec)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc', -@@ -461,10 +477,24 @@ - ], - 'actions': [ - { -+ 'action_name': 'run_pax_mksnapshot', -+ 'inputs': [ -+ '<(node_mksnapshot_exec)', -+ ], -+ 'outputs': [ -+ '<(node_mksnapshot_u_exec)', -+ ], -+ 'action': [ -+ 'bash', -+ '-c', -+ 'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)', -+ ], -+ }, -+ { - 'action_name': 'node_mksnapshot', - 'process_outputs_as_sources': 1, - 'inputs': [ -- '<(node_mksnapshot_exec)', -+ '<(node_mksnapshot_u_exec)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', ---- a/tools/v8_gypfiles/v8.gyp 2019-12-03 16:10:36.000000000 +0100 -+++ b/tools/v8_gypfiles/v8.gyp 2019-12-17 18:37:33.695839254 +0100 -@@ -9,6 +9,7 @@ - 'v8_vector_stores%': 0, - 'v8_embed_script%': "", - 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'v8_os_page_size%': 0, - 'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root', - 'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h', -@@ -427,6 +425,20 @@ - }, - 'actions': [ - { -+ 'action_name': 'run_pax_mksnapshot', -+ 'inputs': [ -+ '<(mksnapshot_exec)', -+ ], -+ 'outputs': [ -+ '<(mksnapshot_u_exec)', -+ ], -+ 'action': [ -+ 'bash', -+ '-c', -+ 'mv <(mksnapshot_exec) <(mksnapshot_u_exec) && paxmark.sh m <(mksnapshot_u_exec)', -+ ], -+ }, -+ { - 'action_name': 'run_mksnapshot', - 'message': 'generating: >@(_outputs)', - 'variables': { -@@ -442,7 +454,7 @@ - ], - }, - 'inputs': [ -- '<(mksnapshot_exec)', -+ '<(mksnapshot_u_exec)', - ], - 'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"], - 'process_outputs_as_sources': 1, diff --git a/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch b/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch deleted file mode 100644 index c9c01843cd63..000000000000 --- a/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/deps/v8/src/compiler/backend/instruction-selector.cc -+++ b/deps/v8/src/compiler/backend/instruction-selector.cc -@@ -2808,7 +2808,7 @@ - switch (call_descriptor->kind()) { - case CallDescriptor::kCallAddress: { - int misc_field = static_cast<int>(call_descriptor->ParameterCount()); --#if defined(_AIX) -+#if ABI_USES_FUNCTION_DESCRIPTORS - // Highest misc_field bit is used on AIX to indicate if a CFunction call - // has function descriptor or not. - if (!call_descriptor->NoFunctionDescriptor()) { ---- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc -+++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc -@@ -1039,7 +1039,7 @@ - linkage()->GetIncomingDescriptor()->IsWasmCapiFunction(); - int offset = (FLAG_enable_embedded_constant_pool ? 20 : 23) * kInstrSize; - --#if defined(_AIX) -+#if ABI_USES_FUNCTION_DESCRIPTORS - // AIX/PPC64BE Linux uses a function descriptor - int kNumParametersMask = kHasFunctionDescriptorBitMask - 1; - num_parameters = kNumParametersMask & misc_field; ---- a/deps/v8/src/execution/simulator.h -+++ b/deps/v8/src/execution/simulator.h -@@ -128,7 +128,7 @@ - #if defined(V8_TARGET_OS_WIN) && !defined(V8_OS_WIN) - FATAL("Generated code execution not possible during cross-compilation."); - #endif // defined(V8_TARGET_OS_WIN) && !defined(V8_OS_WIN) --#if V8_OS_AIX -+#if ABI_USES_FUNCTION_DESCRIPTORS - // AIX ABI requires function descriptors (FD). Artificially create a pseudo - // FD to ensure correct dispatch to generated code. The 'volatile' - // declaration is required to avoid the compiler from not observing the diff --git a/net-libs/nodejs/files/nodejs-15.2.0-global-npm-config.patch b/net-libs/nodejs/files/nodejs-15.2.0-global-npm-config.patch deleted file mode 100644 index 2b0705b1d712..000000000000 --- a/net-libs/nodejs/files/nodejs-15.2.0-global-npm-config.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/deps/npm/node_modules/@npmcli/config/lib/index.js -+++ b/deps/npm/node_modules/@npmcli/config/lib/index.js -@@ -275,8 +275,9 @@ - // default the globalconfig file to that location, instead of the default - // global prefix. It's weird that `npm get globalconfig --prefix=/foo` - // returns `/foo/etc/npmrc`, but better to not change it at this point. -+ // gentoo deviates wrt global config; store in /etc/npm - settableGetter(data, 'globalconfig', () => -- resolve(this[_get]('prefix'), 'etc/npmrc')) -+ resolve('/etc', 'npmrc')) - } - - loadHome () { diff --git a/net-libs/nodejs/files/nodejs-18.16.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-18.16.0-paxmarking.patch new file mode 100644 index 000000000000..9decb13ec47b --- /dev/null +++ b/net-libs/nodejs/files/nodejs-18.16.0-paxmarking.patch @@ -0,0 +1,101 @@ +From 4c910c45a73c61f908f85661a1568a614afde081 Mon Sep 17 00:00:00 2001 +From: William Hubbs <w.d.hubbs@gmail.com> +Date: Mon, 17 Apr 2023 11:43:17 -0500 +Subject: [PATCH] pax marking + +--- + node.gyp | 17 ++++++++++++++++- + tools/v8_gypfiles/v8.gyp | 24 +++++++++++++++++++++++- + 2 files changed, 39 insertions(+), 2 deletions(-) + +diff --git a/node.gyp b/node.gyp +index cf52281bb4..80352dfcc5 100644 +--- a/node.gyp ++++ b/node.gyp +@@ -54,6 +54,7 @@ + '<@(node_builtin_shareable_builtins)', + ], + 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)', ++ 'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)', + 'conditions': [ + ['GENERATOR == "ninja"', { + 'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o' +@@ -337,11 +338,25 @@ + ], + }, { + 'actions': [ ++ { ++ 'action_name': 'run_pax_mksnapshot', ++ 'inputs': [ ++ '<(node_mksnapshot_exec)', ++ ], ++ 'outputs': [ ++ '<(node_mksnapshot_u_exec)', ++ ], ++ 'action': [ ++ 'bash', ++ '-c', ++ 'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)', ++ ], ++ }, + { + 'action_name': 'node_mksnapshot', + 'process_outputs_as_sources': 1, + 'inputs': [ +- '<(node_mksnapshot_exec)', ++ '<(node_mksnapshot_u_exec)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', +diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp +index a721ffb41a..4a52a1f822 100644 +--- a/tools/v8_gypfiles/v8.gyp ++++ b/tools/v8_gypfiles/v8.gyp +@@ -9,6 +9,7 @@ + 'v8_vector_stores%': 0, + 'v8_embed_script%': "", + 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', ++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', + 'v8_os_page_size%': 0, + 'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root', + 'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h', +@@ -1419,7 +1420,7 @@ + ], + }, # bytecode_builtins_list_generator + { +- 'target_name': 'mksnapshot', ++ 'target_name': 'mksnapshot_u', + 'type': 'executable', + 'dependencies': [ + 'v8_base_without_compiler', +@@ -1446,6 +1447,27 @@ + ], + }], + ], ++ }, # mksnapshot_u ++ { ++ 'target_name': 'mksnapshot', ++ 'type': 'none', ++ 'dependencies': ['mksnapshot_u'], ++ 'actions': [ ++ { ++ 'action_name': 'paxmark_mksnapshot', ++ 'inputs': [ ++ '<(mksnapshot_u_exec)', ++ ], ++ 'outputs': [ ++ '<(mksnapshot_exec)', ++ ], ++ 'action': [ ++ 'bash', ++ '-c', ++ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)' ++ ], ++ }, ++ ], + }, # mksnapshot + { + 'target_name': 'torque', +-- +2.39.2 + diff --git a/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch b/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch new file mode 100644 index 000000000000..3bf7a80ea078 --- /dev/null +++ b/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch @@ -0,0 +1,155 @@ +From dda5cdb15cfe5c7437f471054f5bd79a82b6eda2 Mon Sep 17 00:00:00 2001 +From: kxxt <rsworktech@outlook.com> +Date: Wed, 17 Jan 2024 09:16:34 +0800 +Subject: [PATCH] Revert "deps: V8: cherry-pick 13192d6e10fa" + +This reverts commit bc2ebb972b34f54e042de9636e7451d2526436a9, which +shouldn't be applied to v20.x. + +Fix https://github.com/nodejs/unofficial-builds/issues/106 +--- + common.gypi | 2 +- + deps/v8/src/builtins/riscv/builtins-riscv.cc | 2 +- + deps/v8/src/codegen/riscv/assembler-riscv-inl.h | 16 ++++++++-------- + deps/v8/src/codegen/riscv/assembler-riscv.h | 2 +- + deps/v8/src/execution/riscv/simulator-riscv.cc | 8 ++++---- + .../regexp/riscv/regexp-macro-assembler-riscv.cc | 2 +- + 6 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/common.gypi b/common.gypi +index db09a8a33df06..fa0729ffe45e8 100644 +--- a/common.gypi ++++ b/common.gypi +@@ -36,7 +36,7 @@ + + # Reset this number to 0 on major V8 upgrades. + # Increment by one for each non-official patch applied to deps/v8. +- 'v8_embedder_string': '-node.17', ++ 'v8_embedder_string': '-node.18', + + ##### V8 defaults for Node.js ##### + +diff --git a/deps/v8/src/builtins/riscv/builtins-riscv.cc b/deps/v8/src/builtins/riscv/builtins-riscv.cc +index d6091434b9b0a..3404562785991 100644 +--- a/deps/v8/src/builtins/riscv/builtins-riscv.cc ++++ b/deps/v8/src/builtins/riscv/builtins-riscv.cc +@@ -1512,7 +1512,7 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) { + // Set the return address to the correct point in the interpreter entry + // trampoline. + Label builtin_trampoline, trampoline_loaded; +- Tagged<Smi> interpreter_entry_return_pc_offset( ++ Smi interpreter_entry_return_pc_offset( + masm->isolate()->heap()->interpreter_entry_return_pc_offset()); + DCHECK_NE(interpreter_entry_return_pc_offset, Smi::zero()); + +diff --git a/deps/v8/src/codegen/riscv/assembler-riscv-inl.h b/deps/v8/src/codegen/riscv/assembler-riscv-inl.h +index ca6d641e2c94e..55f191e6afe76 100644 +--- a/deps/v8/src/codegen/riscv/assembler-riscv-inl.h ++++ b/deps/v8/src/codegen/riscv/assembler-riscv-inl.h +@@ -128,9 +128,9 @@ Handle<HeapObject> Assembler::compressed_embedded_object_handle_at( + } + + void Assembler::deserialization_set_special_target_at( +- Address instruction_payload, Tagged<Code> code, Address target) { ++ Address instruction_payload, Code code, Address target) { + set_target_address_at(instruction_payload, +- !code.is_null() ? code->constant_pool() : kNullAddress, ++ !code.is_null() ? code.constant_pool() : kNullAddress, + target); + } + +@@ -159,13 +159,12 @@ void Assembler::deserialization_set_target_internal_reference_at( + } + } + +-Tagged<HeapObject> RelocInfo::target_object(PtrComprCageBase cage_base) { ++HeapObject RelocInfo::target_object(PtrComprCageBase cage_base) { + DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_)); + if (IsCompressedEmbeddedObject(rmode_)) { +- return HeapObject::cast( +- Tagged<Object>(V8HeapCompressionScheme::DecompressTagged( +- cage_base, +- Assembler::target_compressed_address_at(pc_, constant_pool_)))); ++ return HeapObject::cast(Object(V8HeapCompressionScheme::DecompressTagged( ++ cage_base, ++ Assembler::target_compressed_address_at(pc_, constant_pool_)))); + } else { + return HeapObject::cast( + Object(Assembler::target_address_at(pc_, constant_pool_))); +@@ -187,7 +186,8 @@ Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) { + } + } + +-void RelocInfo::set_target_object(Tagged<HeapObject> target, ++void RelocInfo::set_target_object(Heap* heap, HeapObject target, ++ WriteBarrierMode write_barrier_mode, + ICacheFlushMode icache_flush_mode) { + DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_)); + if (IsCompressedEmbeddedObject(rmode_)) { +diff --git a/deps/v8/src/codegen/riscv/assembler-riscv.h b/deps/v8/src/codegen/riscv/assembler-riscv.h +index bcd5a62d324ee..ed222b52d6927 100644 +--- a/deps/v8/src/codegen/riscv/assembler-riscv.h ++++ b/deps/v8/src/codegen/riscv/assembler-riscv.h +@@ -286,7 +286,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase, + // This is for calls and branches within generated code. The serializer + // has already deserialized the lui/ori instructions etc. + inline static void deserialization_set_special_target_at(Address location, +- Tagged<Code> code, ++ Code code, + Address target); + + // Get the size of the special target encoded at 'instruction_payload'. +diff --git a/deps/v8/src/execution/riscv/simulator-riscv.cc b/deps/v8/src/execution/riscv/simulator-riscv.cc +index 052a2d67dd7e4..9582db489638a 100644 +--- a/deps/v8/src/execution/riscv/simulator-riscv.cc ++++ b/deps/v8/src/execution/riscv/simulator-riscv.cc +@@ -1781,7 +1781,7 @@ void RiscvDebugger::Debug() { + sreg_t value; + StdoutStream os; + if (GetValue(arg1, &value)) { +- Tagged<Object> obj(value); ++ Object obj(value); + os << arg1 << ": \n"; + #ifdef DEBUG + obj.Print(os); +@@ -1830,7 +1830,7 @@ void RiscvDebugger::Debug() { + PrintF(" 0x%012" PRIxPTR " : 0x%016" REGIx_FORMAT + " %14" REGId_FORMAT " ", + reinterpret_cast<intptr_t>(cur), *cur, *cur); +- Tagged<Object> obj(*cur); ++ Object obj(*cur); + Heap* current_heap = sim_->isolate_->heap(); + if (obj.IsSmi() || + IsValidHeapObject(current_heap, HeapObject::cast(obj))) { +@@ -4692,7 +4692,7 @@ bool Simulator::DecodeRvvVS() { + Builtin Simulator::LookUp(Address pc) { + for (Builtin builtin = Builtins::kFirst; builtin <= Builtins::kLast; + ++builtin) { +- if (builtins_.code(builtin)->contains(isolate_, pc)) return builtin; ++ if (builtins_.code(builtin).contains(isolate_, pc)) return builtin; + } + return Builtin::kNoBuiltinId; + } +@@ -4709,7 +4709,7 @@ void Simulator::DecodeRVIType() { + if (builtin != Builtin::kNoBuiltinId) { + auto code = builtins_.code(builtin); + if ((rs1_reg() != ra || imm12() != 0)) { +- if ((Address)get_pc() == code->instruction_start()) { ++ if ((Address)get_pc() == code.InstructionStart()) { + sreg_t arg0 = get_register(a0); + sreg_t arg1 = get_register(a1); + sreg_t arg2 = get_register(a2); +diff --git a/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc b/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc +index 72f89767eb348..4063b4b3d2194 100644 +--- a/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc ++++ b/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc +@@ -1211,7 +1211,7 @@ static T* frame_entry_address(Address re_frame, int frame_offset) { + int64_t RegExpMacroAssemblerRISCV::CheckStackGuardState(Address* return_address, + Address raw_code, + Address re_frame) { +- Tagged<InstructionStream> re_code = InstructionStream::cast(Object(raw_code)); ++ InstructionStream re_code = InstructionStream::cast(Object(raw_code)); + return NativeRegExpMacroAssembler::CheckStackGuardState( + frame_entry<Isolate*>(re_frame, kIsolateOffset), + static_cast<int>(frame_entry<int64_t>(re_frame, kStartIndexOffset)), + diff --git a/net-libs/nodejs/files/nodejs-20.3.0-gcc14.patch b/net-libs/nodejs/files/nodejs-20.3.0-gcc14.patch new file mode 100644 index 000000000000..8011c2bbdfb9 --- /dev/null +++ b/net-libs/nodejs/files/nodejs-20.3.0-gcc14.patch @@ -0,0 +1,31 @@ +From ad0bbaf34aa3150b4f3507b9973b6f5e8ed47474 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@cmpct.info> +Date: Fri, 9 Jun 2023 18:29:00 +0100 +Subject: [PATCH] test: add missing <algorithm> include for std::find + +GCC 14 drops some transitive includes within libstdc++. + +Explicitly include <algorithm> for std::find. + +Signed-off-by: Sam James <sam@gentoo.org> +PR-URL: https://github.com/nodejs/node/pull/48380 +Reviewed-By: LiviaMedeiros <livia@cirno.name> +Reviewed-By: Luigi Pinca <luigipinca@gmail.com> +Reviewed-By: Matthew Aitken <maitken033380023@gmail.com> +--- + test/embedding/embedtest.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/embedding/embedtest.cc b/test/embedding/embedtest.cc +index 3592ccb98132..dbb420f34682 100644 +--- a/test/embedding/embedtest.cc ++++ b/test/embedding/embedtest.cc +@@ -5,6 +5,8 @@ + #include "uv.h" + #include <assert.h> + ++#include <algorithm> ++ + // Note: This file is being referred to from doc/api/embedding.md, and excerpts + // from it are included in the documentation. Try to keep these in sync. + // Snapshot support is not part of the embedder API docs yet due to its diff --git a/net-libs/nodejs/files/nodejs-20.6.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-20.6.0-paxmarking.patch new file mode 100644 index 000000000000..32fbe2d1d00a --- /dev/null +++ b/net-libs/nodejs/files/nodejs-20.6.0-paxmarking.patch @@ -0,0 +1,88 @@ +diff --git a/node.gyp b/node.gyp +index 49e39c3ce8..767ebc4e5f 100644 +--- a/node.gyp ++++ b/node.gyp +@@ -369,6 +369,7 @@ + 'src/quic/transportparams.h', + ], + 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)', ++ 'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)', + 'node_js2c_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_js2c<(EXECUTABLE_SUFFIX)', + 'conditions': [ + ['GENERATOR == "ninja"', { +@@ -626,11 +627,25 @@ + 'conditions': [ + ['node_snapshot_main!=""', { + 'actions': [ ++ { ++ 'action_name': 'run_pax_mksnapshot', ++ 'inputs': [ ++ '<(node_mksnapshot_exec)', ++ ], ++ 'outputs': [ ++ '<(node_mksnapshot_u_exec)', ++ ], ++ 'action': [ ++ 'bash', ++ '-c', ++ 'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)', ++ ], ++ }, + { + 'action_name': 'node_mksnapshot', + 'process_outputs_as_sources': 1, + 'inputs': [ +- '<(node_mksnapshot_exec)', ++ '<(node_mksnapshot_u_exec)', + '<(node_snapshot_main)', + ], + 'outputs': [ +diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp +index f822c056e5..8b2820abf7 100644 +--- a/tools/v8_gypfiles/v8.gyp ++++ b/tools/v8_gypfiles/v8.gyp +@@ -9,6 +9,7 @@ + 'v8_vector_stores%': 0, + 'v8_embed_script%': "", + 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', ++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', + 'v8_os_page_size%': 0, + 'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root', + 'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h', +@@ -1520,7 +1521,7 @@ + ], + }, # bytecode_builtins_list_generator + { +- 'target_name': 'mksnapshot', ++ 'target_name': 'mksnapshot_u', + 'type': 'executable', + 'dependencies': [ + 'v8_base_without_compiler', +@@ -1545,6 +1546,27 @@ + 'ldflags': [ '-fno-lto' ], + }], + ], ++ }, # mksnapshot_u ++ { ++ 'target_name': 'mksnapshot', ++ 'type': 'none', ++ 'dependencies': ['mksnapshot_u'], ++ 'actions': [ ++ { ++ 'action_name': 'paxmark_mksnapshot', ++ 'inputs': [ ++ '<(mksnapshot_u_exec)', ++ ], ++ 'outputs': [ ++ '<(mksnapshot_exec)', ++ ], ++ 'action': [ ++ 'bash', ++ '-c', ++ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)' ++ ], ++ }, ++ ], + }, # mksnapshot + { + 'target_name': 'torque', diff --git a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch b/net-libs/nodejs/files/nodejs-99999999-llhttp.patch deleted file mode 100644 index 1b6eb9fb7fa1..000000000000 --- a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/node.gypi -+++ b/node.gypi -@@ -169,11 +169,15 @@ - - [ 'node_shared_http_parser=="false"', { - 'dependencies': [ -- 'deps/http_parser/http_parser.gyp:http_parser', -- 'deps/llhttp/llhttp.gyp:llhttp' -+ 'deps/http_parser/http_parser.gyp:http_parser' - ], - } ], - -+ [ '"true"', { 'dependencies': [ -+ 'deps/llhttp/llhttp.gyp:llhttp' -+ ], -+ }], -+ - [ 'node_shared_cares=="false"', { - 'dependencies': [ 'deps/cares/cares.gyp:cares' ], - }], diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml index 7f2a10939d00..a81beb28246a 100644 --- a/net-libs/nodejs/metadata.xml +++ b/net-libs/nodejs/metadata.xml @@ -6,8 +6,8 @@ <name>William Hubbs</name> </maintainer> <use> + <flag name="corepack">Enable the experimental corepack package management tool</flag> <flag name="inspector">Enable V8 inspector</flag> - <flag name="lto">Build with link-time optimisation</flag> <flag name="npm">Enable NPM package manager</flag> <flag name="pax-kernel">Enable building under a PaX enabled kernel</flag> <flag name="snapshot">Enable snapshot creation for faster startup</flag> @@ -15,4 +15,8 @@ <flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag> <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag> </use> + <upstream> + <remote-id type="github">nodejs/node</remote-id> + <remote-id type="cpe">cpe:/a:nodejs:nodejs</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/nodejs/nodejs-12.22.5-r1.ebuild b/net-libs/nodejs/nodejs-12.22.5-r1.ebuild deleted file mode 100644 index 1e716cbf5e85..000000000000 --- a/net-libs/nodejs/nodejs-12.22.5-r1.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nodejs/node" - SLOT="0" -else - SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - SLOT="0/$(ver_cut 1)" - KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos" - S="${WORKDIR}/node-v${PV}" -fi - -IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) - system-ssl? ( ssl ) -" - -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.39.0:= - >=net-dns/c-ares-1.17.2:= - >=net-libs/http-parser-2.9.3:= - >=net-libs/nghttp2-1.40.0:= - sys-libs/zlib - icu? ( >=dev-libs/icu-64.2:= ) - system-ssl? ( - >=dev-libs/openssl-1.1.1:0= - <dev-libs/openssl-3.0.0_beta1:0= - ) -" -BDEPEND=" - ${PYTHON_DEPS} - sys-apps/coreutils - virtual/pkgconfig - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch - "${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch - "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch - "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch - "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch - "${FILESDIR}"/${PN}-99999999-llhttp.patch -) - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - if [[ ${MERGE_TYPE} != "binary" ]]; then - if use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - else - # configure.py will abort on this later if we do not - die "${PN} only supports LTO for gcc" - fi - fi - fi -} - -src_prepare() { - tc-export CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother. - rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' - - local myconf=( - --shared-brotli - --shared-cares - --shared-http-parser - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use lto && myconf+=( --enable-lto ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out mksnapshot - pax-mark m "out/${BUILDTYPE}/mksnapshot" - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi - - out/${BUILDTYPE}/cctest || die - "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die -} - -pkg_postinst() { - elog "The global npm config lives in /etc/npm. This deviates slightly" - elog "from upstream which otherwise would have it live in /usr/etc/." - elog "" - elog "Protip: When using node-gyp to install native modules, you can" - elog "avoid having to download extras by doing the following:" - elog "$ node-gyp --nodedir /usr/include/node <command>" -} diff --git a/net-libs/nodejs/nodejs-12.22.6.ebuild b/net-libs/nodejs/nodejs-12.22.6.ebuild deleted file mode 100644 index fc7f6f38aaa1..000000000000 --- a/net-libs/nodejs/nodejs-12.22.6.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nodejs/node" - SLOT="0" -else - SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - SLOT="0/$(ver_cut 1)" - KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos" - S="${WORKDIR}/node-v${PV}" -fi - -IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) - system-ssl? ( ssl ) -" - -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.39.0:= - >=net-dns/c-ares-1.17.2:= - >=net-libs/http-parser-2.9.3:= - >=net-libs/nghttp2-1.40.0:= - sys-libs/zlib - icu? ( >=dev-libs/icu-64.2:= ) - system-ssl? ( - >=dev-libs/openssl-1.1.1:0= - <dev-libs/openssl-3.0.0_beta1:0= - ) -" -BDEPEND=" - ${PYTHON_DEPS} - sys-apps/coreutils - virtual/pkgconfig - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch - "${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch - "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch - "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch - "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch - "${FILESDIR}"/${PN}-99999999-llhttp.patch -) - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - if [[ ${MERGE_TYPE} != "binary" ]]; then - if use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - else - # configure.py will abort on this later if we do not - die "${PN} only supports LTO for gcc" - fi - fi - fi -} - -src_prepare() { - tc-export CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother. - rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' - - local myconf=( - --shared-brotli - --shared-cares - --shared-http-parser - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use lto && myconf+=( --enable-lto ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out mksnapshot - pax-mark m "out/${BUILDTYPE}/mksnapshot" - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi - - out/${BUILDTYPE}/cctest || die - "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die -} - -pkg_postinst() { - elog "The global npm config lives in /etc/npm. This deviates slightly" - elog "from upstream which otherwise would have it live in /usr/etc/." - elog "" - elog "Protip: When using node-gyp to install native modules, you can" - elog "avoid having to download extras by doing the following:" - elog "$ node-gyp --nodedir /usr/include/node <command>" -} diff --git a/net-libs/nodejs/nodejs-12.22.7.ebuild b/net-libs/nodejs/nodejs-12.22.7.ebuild deleted file mode 100644 index b76dbf7ea807..000000000000 --- a/net-libs/nodejs/nodejs-12.22.7.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nodejs/node" - SLOT="0" -else - SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos" - S="${WORKDIR}/node-v${PV}" -fi - -IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) - system-ssl? ( ssl ) -" - -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.39.0:= - >=net-dns/c-ares-1.17.2:= - >=net-libs/http-parser-2.9.3:= - >=net-libs/nghttp2-1.40.0:= - sys-libs/zlib - icu? ( >=dev-libs/icu-64.2:= ) - system-ssl? ( - >=dev-libs/openssl-1.1.1:0= - <dev-libs/openssl-3.0.0_beta1:0= - ) -" -BDEPEND=" - ${PYTHON_DEPS} - sys-apps/coreutils - virtual/pkgconfig - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch - "${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch - "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch - "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch - "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch - "${FILESDIR}"/${PN}-99999999-llhttp.patch -) - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - if [[ ${MERGE_TYPE} != "binary" ]]; then - if use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - else - # configure.py will abort on this later if we do not - die "${PN} only supports LTO for gcc" - fi - fi - fi -} - -src_prepare() { - tc-export CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother. - rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' - - local myconf=( - --shared-brotli - --shared-cares - --shared-http-parser - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use lto && myconf+=( --enable-lto ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out mksnapshot - pax-mark m "out/${BUILDTYPE}/mksnapshot" - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi - - out/${BUILDTYPE}/cctest || die - "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die -} - -pkg_postinst() { - elog "The global npm config lives in /etc/npm. This deviates slightly" - elog "from upstream which otherwise would have it live in /usr/etc/." - elog "" - elog "Protip: When using node-gyp to install native modules, you can" - elog "avoid having to download extras by doing the following:" - elog "$ node-gyp --nodedir /usr/include/node <command>" -} diff --git a/net-libs/nodejs/nodejs-14.17.5-r1.ebuild b/net-libs/nodejs/nodejs-14.17.5-r1.ebuild deleted file mode 100644 index 07bb48eee028..000000000000 --- a/net-libs/nodejs/nodejs-14.17.5-r1.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nodejs/node" - SLOT="0" -else - SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - SLOT="0/$(ver_cut 1)" - KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos" - S="${WORKDIR}/node-v${PV}" -fi - -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" -REQUIRED_USE="inspector? ( icu ssl ) - npm? ( ssl ) - system-icu? ( icu ) - system-ssl? ( ssl )" - -RESTRICT="!test? ( test )" - -RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.2:= - >=net-libs/nghttp2-1.41.0:= - sys-libs/zlib - system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( - >=dev-libs/openssl-1.1.1:0= - <dev-libs/openssl-3.0.0_beta1:0= - )" -BDEPEND="${PYTHON_DEPS} - sys-apps/coreutils - virtual/pkgconfig - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) - pax-kernel? ( sys-apps/elfix )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch - "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch - "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch - "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch - "${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch -) - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - if [[ ${MERGE_TYPE} != "binary" ]]; then - if use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - else - # configure.py will abort on this later if we do not - die "${PN} only supports LTO for gcc" - fi - fi - fi -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - # All this test does is check if the npm CLI produces warnings of any sort, - # failing if it does. Overkill, much? Especially given one possible warning - # is that there is a newer version of npm available upstream (yes, it does - # use the network if available), thus making it a real possibility for this - # test to begin failing one day even though it was fine before. - rm -f test/parallel/test-release-npm.js - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' - - local myconf=( - --shared-brotli - --shared-cares - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use lto && myconf+=( --enable-lto ) - if use system-icu; then - myconf+=( --with-intl=system-icu ) - elif use icu; then - myconf+=( --with-intl=full-icu ) - else - myconf+=( --with-intl=none ) - fi - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi - - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die -} diff --git a/net-libs/nodejs/nodejs-14.17.6.ebuild b/net-libs/nodejs/nodejs-14.17.6.ebuild deleted file mode 100644 index dc855697bb82..000000000000 --- a/net-libs/nodejs/nodejs-14.17.6.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nodejs/node" - SLOT="0" -else - SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - SLOT="0/$(ver_cut 1)" - KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos" - S="${WORKDIR}/node-v${PV}" -fi - -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" -REQUIRED_USE="inspector? ( icu ssl ) - npm? ( ssl ) - system-icu? ( icu ) - system-ssl? ( ssl )" - -RESTRICT="!test? ( test )" - -RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.2:= - >=net-libs/nghttp2-1.41.0:= - sys-libs/zlib - system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( - >=dev-libs/openssl-1.1.1:0= - <dev-libs/openssl-3.0.0_beta1:0= - )" -BDEPEND="${PYTHON_DEPS} - sys-apps/coreutils - virtual/pkgconfig - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) - pax-kernel? ( sys-apps/elfix )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch - "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch - "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch - "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch - "${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch -) - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - if [[ ${MERGE_TYPE} != "binary" ]]; then - if use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - else - # configure.py will abort on this later if we do not - die "${PN} only supports LTO for gcc" - fi - fi - fi -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - # All this test does is check if the npm CLI produces warnings of any sort, - # failing if it does. Overkill, much? Especially given one possible warning - # is that there is a newer version of npm available upstream (yes, it does - # use the network if available), thus making it a real possibility for this - # test to begin failing one day even though it was fine before. - rm -f test/parallel/test-release-npm.js - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' - - local myconf=( - --shared-brotli - --shared-cares - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use lto && myconf+=( --enable-lto ) - if use system-icu; then - myconf+=( --with-intl=system-icu ) - elif use icu; then - myconf+=( --with-intl=full-icu ) - else - myconf+=( --with-intl=none ) - fi - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi - - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die -} diff --git a/net-libs/nodejs/nodejs-14.18.0.ebuild b/net-libs/nodejs/nodejs-14.18.0.ebuild deleted file mode 100644 index 745a7dace6a9..000000000000 --- a/net-libs/nodejs/nodejs-14.18.0.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nodejs/node" - SLOT="0" -else - SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos" - S="${WORKDIR}/node-v${PV}" -fi - -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" -REQUIRED_USE="inspector? ( icu ssl ) - npm? ( ssl ) - system-icu? ( icu ) - system-ssl? ( ssl )" - -RESTRICT="!test? ( test )" - -RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.2:= - >=net-libs/nghttp2-1.41.0:= - sys-libs/zlib - system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( - >=dev-libs/openssl-1.1.1:0= - <dev-libs/openssl-3.0.0_beta1:0= - )" -BDEPEND="${PYTHON_DEPS} - sys-apps/coreutils - virtual/pkgconfig - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) - pax-kernel? ( sys-apps/elfix )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch - "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch - "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch - "${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch -) - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - if [[ ${MERGE_TYPE} != "binary" ]]; then - if use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - else - # configure.py will abort on this later if we do not - die "${PN} only supports LTO for gcc" - fi - fi - fi -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - # All this test does is check if the npm CLI produces warnings of any sort, - # failing if it does. Overkill, much? Especially given one possible warning - # is that there is a newer version of npm available upstream (yes, it does - # use the network if available), thus making it a real possibility for this - # test to begin failing one day even though it was fine before. - rm -f test/parallel/test-release-npm.js - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' - - local myconf=( - --shared-brotli - --shared-cares - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use lto && myconf+=( --enable-lto ) - if use system-icu; then - myconf+=( --with-intl=system-icu ) - elif use icu; then - myconf+=( --with-intl=full-icu ) - else - myconf+=( --with-intl=none ) - fi - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi - - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die -} diff --git a/net-libs/nodejs/nodejs-16.10.0.ebuild b/net-libs/nodejs/nodejs-18.17.1.ebuild index 895cf7cc0b43..393119c2658e 100644 --- a/net-libs/nodejs/nodejs-16.10.0.ebuild +++ b/net-libs/nodejs/nodejs-18.17.1.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +CONFIG_CHECK="~ADVISE_SYSCALLS" +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" @@ -19,12 +20,13 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" -REQUIRED_USE="inspector? ( icu ssl ) +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" +REQUIRED_USE="corepack? ( !npm ) + inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )" @@ -32,42 +34,49 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.2:= + >=dev-libs/libuv-1.44.0:= + >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib + corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= )" + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + sys-devel/gcc:*" BDEPEND="${PYTHON_DEPS} sys-apps/coreutils virtual/pkgconfig - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch - "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch - "${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch -) +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ die "Your CPU doesn't support the required SSE2 instruction." if [[ ${MERGE_TYPE} != "binary" ]]; then - if use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - fi + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend fi fi } +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + src_prepare() { tc-export AR CC CXX PKG_CONFIG export V=1 @@ -97,14 +106,7 @@ src_prepare() { fi # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - # All this test does is check if the npm CLI produces warnings of any sort, - # failing if it does. Overkill, much? Especially given one possible warning - # is that there is a newer version of npm available upstream (yes, it does - # use the network if available), thus making it a real possibility for this - # test to begin failing one day even though it was fine before. - rm -f test/parallel/test-release-npm.js + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch ) default } @@ -113,7 +115,13 @@ src_configure() { xdg_environment_reset # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' + filter-lto + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" local myconf=( --shared-brotli @@ -131,6 +139,7 @@ src_configure() { else myconf+=( --with-intl=none ) fi + use corepack || myconf+=( --without-corepack ) use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) @@ -141,14 +150,15 @@ src_configure() { fi local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - lp64*) myarch="riscv64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; *) myarch="${ABI}";; esac @@ -163,7 +173,7 @@ src_configure() { } src_compile() { - emake -C out + emake -C out -Onone } src_install() { @@ -186,6 +196,8 @@ src_install() { if use npm; then keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm # Install bash completion for `npm` local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" @@ -216,16 +228,31 @@ src_install() { \) \) -exec rm -rf "{}" \; fi + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die } src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi + local drop_tests=( + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" out/${BUILDTYPE}/cctest || die "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die } + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/nodejs/nodejs-16.13.0.ebuild b/net-libs/nodejs/nodejs-18.19.0.ebuild index b7c26db64cbe..d3efbaec84e1 100644 --- a/net-libs/nodejs/nodejs-16.13.0.ebuild +++ b/net-libs/nodejs/nodejs-18.19.0.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +CONFIG_CHECK="~ADVISE_SYSCALLS" +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" @@ -19,11 +20,11 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" REQUIRED_USE="inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) @@ -32,41 +33,49 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.2:= + >=dev-libs/libuv-1.44.0:= + >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib + corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= )" + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + sys-devel/gcc:*" BDEPEND="${PYTHON_DEPS} sys-apps/coreutils virtual/pkgconfig - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch - "${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch -) +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ die "Your CPU doesn't support the required SSE2 instruction." if [[ ${MERGE_TYPE} != "binary" ]]; then - if use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - fi + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend fi fi } +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + src_prepare() { tc-export AR CC CXX PKG_CONFIG export V=1 @@ -96,14 +105,7 @@ src_prepare() { fi # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - # All this test does is check if the npm CLI produces warnings of any sort, - # failing if it does. Overkill, much? Especially given one possible warning - # is that there is a newer version of npm available upstream (yes, it does - # use the network if available), thus making it a real possibility for this - # test to begin failing one day even though it was fine before. - rm -f test/parallel/test-release-npm.js + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch ) default } @@ -112,7 +114,13 @@ src_configure() { xdg_environment_reset # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' + filter-lto + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" local myconf=( --shared-brotli @@ -130,6 +138,7 @@ src_configure() { else myconf+=( --with-intl=none ) fi + use corepack || myconf+=( --without-corepack ) use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) @@ -140,14 +149,15 @@ src_configure() { fi local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - lp64*) myarch="riscv64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; *) myarch="${ABI}";; esac @@ -162,7 +172,7 @@ src_configure() { } src_compile() { - emake -C out + emake -C out -Onone } src_install() { @@ -185,6 +195,8 @@ src_install() { if use npm; then keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm # Install bash completion for `npm` local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" @@ -215,16 +227,33 @@ src_install() { \) \) -exec rm -rf "{}" \; fi + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die } src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi + local drop_tests=( + test/parallel/test-dns-resolveany.js + test/parallel/test-dns-resolveany-bad-ancount.js + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" out/${BUILDTYPE}/cctest || die "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die } + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/nodejs/nodejs-16.9.1.ebuild b/net-libs/nodejs/nodejs-18.20.1.ebuild index 895cf7cc0b43..fde604acf123 100644 --- a/net-libs/nodejs/nodejs-16.9.1.ebuild +++ b/net-libs/nodejs/nodejs-18.20.1.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +CONFIG_CHECK="~ADVISE_SYSCALLS" +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" @@ -19,11 +20,11 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" REQUIRED_USE="inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) @@ -32,42 +33,49 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.2:= + >=dev-libs/libuv-1.44.0:= + >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib + corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= )" + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + sys-devel/gcc:*" BDEPEND="${PYTHON_DEPS} sys-apps/coreutils virtual/pkgconfig - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch - "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch - "${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch -) +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ die "Your CPU doesn't support the required SSE2 instruction." if [[ ${MERGE_TYPE} != "binary" ]]; then - if use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - fi + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend fi fi } +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + src_prepare() { tc-export AR CC CXX PKG_CONFIG export V=1 @@ -77,9 +85,6 @@ src_prepare() { # https://code.google.com/p/gyp/issues/detail?id=260 sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 local LIBDIR=$(get_libdir) sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die @@ -97,14 +102,7 @@ src_prepare() { fi # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - # All this test does is check if the npm CLI produces warnings of any sort, - # failing if it does. Overkill, much? Especially given one possible warning - # is that there is a newer version of npm available upstream (yes, it does - # use the network if available), thus making it a real possibility for this - # test to begin failing one day even though it was fine before. - rm -f test/parallel/test-release-npm.js + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch ) default } @@ -113,7 +111,13 @@ src_configure() { xdg_environment_reset # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' + filter-lto + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" local myconf=( --shared-brotli @@ -131,6 +135,7 @@ src_configure() { else myconf+=( --with-intl=none ) fi + use corepack || myconf+=( --without-corepack ) use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) @@ -141,14 +146,15 @@ src_configure() { fi local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - lp64*) myarch="riscv64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; *) myarch="${ABI}";; esac @@ -163,7 +169,7 @@ src_configure() { } src_compile() { - emake -C out + emake -C out -Onone } src_install() { @@ -186,6 +192,8 @@ src_install() { if use npm; then keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm # Install bash completion for `npm` local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" @@ -216,16 +224,33 @@ src_install() { \) \) -exec rm -rf "{}" \; fi + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die } src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi + local drop_tests=( + test/parallel/test-dns-resolveany.js + test/parallel/test-dns-resolveany-bad-ancount.js + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" out/${BUILDTYPE}/cctest || die "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die } + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/nodejs/nodejs-14.18.1.ebuild b/net-libs/nodejs/nodejs-18.20.2.ebuild index 745a7dace6a9..00566b9e3f4c 100644 --- a/net-libs/nodejs/nodejs-14.18.1.ebuild +++ b/net-libs/nodejs/nodejs-18.20.2.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +CONFIG_CHECK="~ADVISE_SYSCALLS" +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" @@ -19,11 +20,11 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" REQUIRED_USE="inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) @@ -32,49 +33,49 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.2:= + >=dev-libs/libuv-1.44.0:= + >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib + corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( - >=dev-libs/openssl-1.1.1:0= - <dev-libs/openssl-3.0.0_beta1:0= - )" + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + sys-devel/gcc:*" BDEPEND="${PYTHON_DEPS} sys-apps/coreutils virtual/pkgconfig - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch - "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch - "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch - "${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch -) +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ die "Your CPU doesn't support the required SSE2 instruction." if [[ ${MERGE_TYPE} != "binary" ]]; then - if use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - else - # configure.py will abort on this later if we do not - die "${PN} only supports LTO for gcc" - fi + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend fi fi } +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + src_prepare() { tc-export AR CC CXX PKG_CONFIG export V=1 @@ -84,9 +85,6 @@ src_prepare() { # https://code.google.com/p/gyp/issues/detail?id=260 sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 local LIBDIR=$(get_libdir) sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die @@ -104,14 +102,7 @@ src_prepare() { fi # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - # All this test does is check if the npm CLI produces warnings of any sort, - # failing if it does. Overkill, much? Especially given one possible warning - # is that there is a newer version of npm available upstream (yes, it does - # use the network if available), thus making it a real possibility for this - # test to begin failing one day even though it was fine before. - rm -f test/parallel/test-release-npm.js + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch ) default } @@ -120,7 +111,13 @@ src_configure() { xdg_environment_reset # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' + filter-lto + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" local myconf=( --shared-brotli @@ -138,6 +135,7 @@ src_configure() { else myconf+=( --with-intl=none ) fi + use corepack || myconf+=( --without-corepack ) use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) @@ -148,13 +146,15 @@ src_configure() { fi local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; *) myarch="${ABI}";; esac @@ -169,7 +169,7 @@ src_configure() { } src_compile() { - emake -C out + emake -C out -Onone } src_install() { @@ -191,17 +191,14 @@ src_install() { fi if use npm; then - dodir /etc/npm + keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die # Move man pages doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* @@ -227,16 +224,33 @@ src_install() { \) \) -exec rm -rf "{}" \; fi + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die } src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi + local drop_tests=( + test/parallel/test-dns-resolveany.js + test/parallel/test-dns-resolveany-bad-ancount.js + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" out/${BUILDTYPE}/cctest || die "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die } + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/nodejs/nodejs-20.11.0.ebuild b/net-libs/nodejs/nodejs-20.11.0.ebuild new file mode 100644 index 000000000000..a1f833f49275 --- /dev/null +++ b/net-libs/nodejs/nodejs-20.11.0.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CONFIG_CHECK="~ADVISE_SYSCALLS" +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="threads(+)" + +inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" +HOMEPAGE="https://nodejs.org/" +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/nodejs/node" + SLOT="0" +else + SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" + SLOT="0/$(ver_cut 1)" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos" + S="${WORKDIR}/node-v${PV}" +fi + +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" +REQUIRED_USE="inspector? ( icu ssl ) + npm? ( ssl ) + system-icu? ( icu ) + system-ssl? ( ssl ) + x86? ( cpu_flags_x86_sse2 )" + +RESTRICT="!test? ( test )" + +RDEPEND=">=app-arch/brotli-1.0.9:= + >=dev-libs/libuv-1.46.0:= + >=net-dns/c-ares-1.18.1:= + >=net-libs/nghttp2-1.41.0:= + sys-libs/zlib + corepack? ( !sys-apps/yarn ) + system-icu? ( >=dev-libs/icu-71:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + sys-devel/gcc:*" +BDEPEND="${PYTHON_DEPS} + app-alternatives/ninja + sys-apps/coreutils + virtual/pkgconfig + test? ( net-misc/curl ) + pax-kernel? ( sys-apps/elfix )" +DEPEND="${RDEPEND}" + +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + fi +} + +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + tc-export AR CC CXX PKG_CONFIG + export V=1 + export BUILDTYPE=Release + + # fix compilation on Darwin + # https://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # less verbose install output (stating the same as portage, basically) + sed -i -e "/print/d" tools/install.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die + + # Avoid writing a depfile, not useful + sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die + + sed -i -e "/'-O3'/d" common.gypi node.gypi || die + + # debug builds. change install path, remove optimisations and override buildtype + if use debug; then + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die + BUILDTYPE=Debug + fi + + # We need to disable mprotect on two files when it builds Bug 694100. + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) + + # bug 922725 + use riscv && PATCHES+=( "${FILESDIR}"/${P}-riscv.patch ) + + default +} + +src_configure() { + xdg_environment_reset + + # LTO compiler flags are handled by configure.py itself + filter-lto + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" + + local myconf=( + --ninja + --shared-brotli + --shared-cares + --shared-libuv + --shared-nghttp2 + --shared-zlib + ) + use debug && myconf+=( --debug ) + use lto && myconf+=( --enable-lto ) + if use system-icu; then + myconf+=( --with-intl=system-icu ) + elif use icu; then + myconf+=( --with-intl=full-icu ) + else + myconf+=( --with-intl=none ) + fi + use corepack || myconf+=( --without-corepack ) + use inspector || myconf+=( --without-inspector ) + use npm || myconf+=( --without-npm ) + use snapshot || myconf+=( --without-node-snapshot ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi + + local myarch="" + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; + *) myarch="${ABI}";; + esac + + GYP_DEFINES="linux_use_gold_flags=0 + linux_use_bundled_binutils=0 + linux_use_bundled_gold=0" \ + "${EPYTHON}" configure.py \ + --prefix="${EPREFIX}"/usr \ + --dest-cpu=${myarch} \ + "${myconf[@]}" || die +} + +src_compile() { + emake -Onone +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + default + + pax-mark -m "${ED}"/usr/bin/node + + # set up a symlink structure that node-gyp expects.. + dodir /usr/include/node/deps/{v8,uv} + dosym . /usr/include/node/src + for var in deps/{uv,v8}/include; do + dosym ../.. /usr/include/node/${var} + done + + if use doc; then + docinto html + dodoc -r "${S}"/doc/* + fi + + if use npm; then + keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm + + # Install bash completion for `npm` + local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" + "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" + newbashcomp "${tmp_npm_completion_file}" npm + + # Move man pages + doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* + + # Clean up + rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} + + local find_exp="-or -name" + local find_name=() + for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ + ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ + "*.md" "*.markdown" "*.bat" "*.cmd"; do + find_name+=( ${find_exp} "${match}" ) + done + + # Remove various development and/or inappropriate files and + # useless docs of dependend packages. + find "${LIBDIR}"/node_modules \ + \( -type d -name examples \) -or \( -type f \( \ + -iname "LICEN?E*" \ + "${find_name[@]}" \ + \) \) -exec rm -rf "{}" \; + fi + + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die +} + +src_test() { + local drop_tests=( + test/parallel/test-dns-resolveany-bad-ancount.js + test/parallel/test-fs-read-stream.js + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-fs-watch-recursive-add-file.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" + + out/${BUILDTYPE}/cctest || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die +} + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/nodejs/nodejs-20.12.1.ebuild b/net-libs/nodejs/nodejs-20.12.1.ebuild new file mode 100644 index 000000000000..ee96e0b379e1 --- /dev/null +++ b/net-libs/nodejs/nodejs-20.12.1.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CONFIG_CHECK="~ADVISE_SYSCALLS" +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="threads(+)" + +inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" +HOMEPAGE="https://nodejs.org/" +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/nodejs/node" + SLOT="0" +else + SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" + SLOT="0/$(ver_cut 1)" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + S="${WORKDIR}/node-v${PV}" +fi + +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" +REQUIRED_USE="inspector? ( icu ssl ) + npm? ( ssl ) + system-icu? ( icu ) + system-ssl? ( ssl ) + x86? ( cpu_flags_x86_sse2 )" + +RESTRICT="!test? ( test )" + +RDEPEND=">=app-arch/brotli-1.0.9:= + >=dev-libs/libuv-1.46.0:= + >=net-dns/c-ares-1.18.1:= + >=net-libs/nghttp2-1.41.0:= + sys-libs/zlib + corepack? ( !sys-apps/yarn ) + system-icu? ( >=dev-libs/icu-71:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + sys-devel/gcc:*" +BDEPEND="${PYTHON_DEPS} + app-alternatives/ninja + sys-apps/coreutils + virtual/pkgconfig + test? ( net-misc/curl ) + pax-kernel? ( sys-apps/elfix )" +DEPEND="${RDEPEND}" + +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + fi +} + +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + tc-export AR CC CXX PKG_CONFIG + export V=1 + export BUILDTYPE=Release + + # fix compilation on Darwin + # https://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die + + # Avoid writing a depfile, not useful + sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die + + sed -i -e "/'-O3'/d" common.gypi node.gypi || die + + # debug builds. change install path, remove optimisations and override buildtype + if use debug; then + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die + BUILDTYPE=Debug + fi + + # We need to disable mprotect on two files when it builds Bug 694100. + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) + + # bug 922725 + use riscv && PATCHES+=( "${FILESDIR}"/${PN}-20.11.0-riscv.patch ) + + default +} + +src_configure() { + xdg_environment_reset + + # LTO compiler flags are handled by configure.py itself + filter-lto + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" + + local myconf=( + --ninja + --shared-brotli + --shared-cares + --shared-libuv + --shared-nghttp2 + --shared-zlib + ) + use debug && myconf+=( --debug ) + use lto && myconf+=( --enable-lto ) + if use system-icu; then + myconf+=( --with-intl=system-icu ) + elif use icu; then + myconf+=( --with-intl=full-icu ) + else + myconf+=( --with-intl=none ) + fi + use corepack || myconf+=( --without-corepack ) + use inspector || myconf+=( --without-inspector ) + use npm || myconf+=( --without-npm ) + use snapshot || myconf+=( --without-node-snapshot ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi + + local myarch="" + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; + *) myarch="${ABI}";; + esac + + GYP_DEFINES="linux_use_gold_flags=0 + linux_use_bundled_binutils=0 + linux_use_bundled_gold=0" \ + "${EPYTHON}" configure.py \ + --prefix="${EPREFIX}"/usr \ + --dest-cpu=${myarch} \ + "${myconf[@]}" || die +} + +src_compile() { + emake -Onone +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + default + + pax-mark -m "${ED}"/usr/bin/node + + # set up a symlink structure that node-gyp expects.. + dodir /usr/include/node/deps/{v8,uv} + dosym . /usr/include/node/src + for var in deps/{uv,v8}/include; do + dosym ../.. /usr/include/node/${var} + done + + if use doc; then + docinto html + dodoc -r "${S}"/doc/* + fi + + if use npm; then + keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm + + # Install bash completion for `npm` + local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" + "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" + newbashcomp "${tmp_npm_completion_file}" npm + + # Move man pages + doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* + + # Clean up + rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} + + local find_exp="-or -name" + local find_name=() + for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ + ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ + "*.md" "*.markdown" "*.bat" "*.cmd"; do + find_name+=( ${find_exp} "${match}" ) + done + + # Remove various development and/or inappropriate files and + # useless docs of dependend packages. + find "${LIBDIR}"/node_modules \ + \( -type d -name examples \) -or \( -type f \( \ + -iname "LICEN?E*" \ + "${find_name[@]}" \ + \) \) -exec rm -rf "{}" \; + fi + + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die +} + +src_test() { + local drop_tests=( + test/parallel/test-dns-resolveany-bad-ancount.js + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-read-stream.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-fs-watch-recursive-add-file.js + test/parallel/test-process-euid-egid.js + test/parallel/test-process-initgroups.js + test/parallel/test-process-setgroups.js + test/parallel/test-process-uid-gid.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" + + out/${BUILDTYPE}/cctest || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die +} + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/nodejs/nodejs-20.12.2.ebuild b/net-libs/nodejs/nodejs-20.12.2.ebuild new file mode 100644 index 000000000000..1b36063a673d --- /dev/null +++ b/net-libs/nodejs/nodejs-20.12.2.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CONFIG_CHECK="~ADVISE_SYSCALLS" +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="threads(+)" + +inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" +HOMEPAGE="https://nodejs.org/" +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/nodejs/node" + SLOT="0" +else + SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" + SLOT="0/$(ver_cut 1)" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + S="${WORKDIR}/node-v${PV}" +fi + +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" +REQUIRED_USE="inspector? ( icu ssl ) + npm? ( ssl ) + system-icu? ( icu ) + system-ssl? ( ssl ) + x86? ( cpu_flags_x86_sse2 )" + +RESTRICT="!test? ( test )" + +RDEPEND=">=app-arch/brotli-1.0.9:= + >=dev-libs/libuv-1.46.0:= + >=net-dns/c-ares-1.18.1:= + >=net-libs/nghttp2-1.41.0:= + sys-libs/zlib + corepack? ( !sys-apps/yarn ) + system-icu? ( >=dev-libs/icu-71:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + sys-devel/gcc:*" +BDEPEND="${PYTHON_DEPS} + app-alternatives/ninja + sys-apps/coreutils + virtual/pkgconfig + test? ( net-misc/curl ) + pax-kernel? ( sys-apps/elfix )" +DEPEND="${RDEPEND}" + +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + fi +} + +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + tc-export AR CC CXX PKG_CONFIG + export V=1 + export BUILDTYPE=Release + + # fix compilation on Darwin + # https://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die + + # Avoid writing a depfile, not useful + sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die + + sed -i -e "/'-O3'/d" common.gypi node.gypi || die + + # debug builds. change install path, remove optimisations and override buildtype + if use debug; then + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die + BUILDTYPE=Debug + fi + + # We need to disable mprotect on two files when it builds Bug 694100. + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) + + default +} + +src_configure() { + xdg_environment_reset + + # LTO compiler flags are handled by configure.py itself + filter-lto + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" + + local myconf=( + --ninja + --shared-brotli + --shared-cares + --shared-libuv + --shared-nghttp2 + --shared-zlib + ) + use debug && myconf+=( --debug ) + use lto && myconf+=( --enable-lto ) + if use system-icu; then + myconf+=( --with-intl=system-icu ) + elif use icu; then + myconf+=( --with-intl=full-icu ) + else + myconf+=( --with-intl=none ) + fi + use corepack || myconf+=( --without-corepack ) + use inspector || myconf+=( --without-inspector ) + use npm || myconf+=( --without-npm ) + use snapshot || myconf+=( --without-node-snapshot ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi + + local myarch="" + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; + *) myarch="${ABI}";; + esac + + GYP_DEFINES="linux_use_gold_flags=0 + linux_use_bundled_binutils=0 + linux_use_bundled_gold=0" \ + "${EPYTHON}" configure.py \ + --prefix="${EPREFIX}"/usr \ + --dest-cpu=${myarch} \ + "${myconf[@]}" || die +} + +src_compile() { + emake -Onone +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + default + + pax-mark -m "${ED}"/usr/bin/node + + # set up a symlink structure that node-gyp expects.. + dodir /usr/include/node/deps/{v8,uv} + dosym . /usr/include/node/src + for var in deps/{uv,v8}/include; do + dosym ../.. /usr/include/node/${var} + done + + if use doc; then + docinto html + dodoc -r "${S}"/doc/* + fi + + if use npm; then + keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm + + # Install bash completion for `npm` + local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" + "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" + newbashcomp "${tmp_npm_completion_file}" npm + + # Move man pages + doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* + + # Clean up + rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} + + local find_exp="-or -name" + local find_name=() + for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ + ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ + "*.md" "*.markdown" "*.bat" "*.cmd"; do + find_name+=( ${find_exp} "${match}" ) + done + + # Remove various development and/or inappropriate files and + # useless docs of dependend packages. + find "${LIBDIR}"/node_modules \ + \( -type d -name examples \) -or \( -type f \( \ + -iname "LICEN?E*" \ + "${find_name[@]}" \ + \) \) -exec rm -rf "{}" \; + fi + + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die +} + +src_test() { + local drop_tests=( + test/parallel/test-dns-resolveany-bad-ancount.js + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-read-stream.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-fs-watch-recursive-add-file.js + test/parallel/test-process-euid-egid.js + test/parallel/test-process-initgroups.js + test/parallel/test-process-setgroups.js + test/parallel/test-process-uid-gid.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" + + out/${BUILDTYPE}/cctest || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die +} + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/nodejs/nodejs-20.6.1.ebuild b/net-libs/nodejs/nodejs-20.6.1.ebuild new file mode 100644 index 000000000000..1255419a47d8 --- /dev/null +++ b/net-libs/nodejs/nodejs-20.6.1.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CONFIG_CHECK="~ADVISE_SYSCALLS" +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="threads(+)" + +inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" +HOMEPAGE="https://nodejs.org/" +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/nodejs/node" + SLOT="0" +else + SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" + SLOT="0/$(ver_cut 1)" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos" + S="${WORKDIR}/node-v${PV}" +fi + +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" +REQUIRED_USE="corepack? ( !npm ) + inspector? ( icu ssl ) + npm? ( ssl ) + system-icu? ( icu ) + system-ssl? ( ssl ) + x86? ( cpu_flags_x86_sse2 )" + +RESTRICT="!test? ( test )" + +RDEPEND=">=app-arch/brotli-1.0.9:= + >=dev-libs/libuv-1.44.0:= + >=net-dns/c-ares-1.18.1:= + >=net-libs/nghttp2-1.41.0:= + sys-libs/zlib + corepack? ( !sys-apps/yarn ) + system-icu? ( >=dev-libs/icu-71:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + sys-devel/gcc:*" +BDEPEND="${PYTHON_DEPS} + app-alternatives/ninja + sys-apps/coreutils + virtual/pkgconfig + test? ( net-misc/curl ) + pax-kernel? ( sys-apps/elfix )" +DEPEND="${RDEPEND}" + +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" + +PATCHES=( + "${FILESDIR}"/"${PN}"-20.3.0-gcc14.patch + ) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + fi +} + +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + tc-export AR CC CXX PKG_CONFIG + export V=1 + export BUILDTYPE=Release + + # fix compilation on Darwin + # https://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # less verbose install output (stating the same as portage, basically) + sed -i -e "/print/d" tools/install.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die + + # Avoid writing a depfile, not useful + sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die + + sed -i -e "/'-O3'/d" common.gypi node.gypi || die + + # debug builds. change install path, remove optimisations and override buildtype + if use debug; then + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die + BUILDTYPE=Debug + fi + + # We need to disable mprotect on two files when it builds Bug 694100. + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) + + default +} + +src_configure() { + xdg_environment_reset + + # LTO compiler flags are handled by configure.py itself + filter-lto + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" + + local myconf=( + --ninja + --shared-brotli + --shared-cares + --shared-libuv + --shared-nghttp2 + --shared-zlib + ) + use debug && myconf+=( --debug ) + use lto && myconf+=( --enable-lto ) + if use system-icu; then + myconf+=( --with-intl=system-icu ) + elif use icu; then + myconf+=( --with-intl=full-icu ) + else + myconf+=( --with-intl=none ) + fi + use corepack || myconf+=( --without-corepack ) + use inspector || myconf+=( --without-inspector ) + use npm || myconf+=( --without-npm ) + use snapshot || myconf+=( --without-node-snapshot ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi + + local myarch="" + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; + *) myarch="${ABI}";; + esac + + GYP_DEFINES="linux_use_gold_flags=0 + linux_use_bundled_binutils=0 + linux_use_bundled_gold=0" \ + "${EPYTHON}" configure.py \ + --prefix="${EPREFIX}"/usr \ + --dest-cpu=${myarch} \ + "${myconf[@]}" || die +} + +src_compile() { + emake -Onone +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + default + + pax-mark -m "${ED}"/usr/bin/node + + # set up a symlink structure that node-gyp expects.. + dodir /usr/include/node/deps/{v8,uv} + dosym . /usr/include/node/src + for var in deps/{uv,v8}/include; do + dosym ../.. /usr/include/node/${var} + done + + if use doc; then + docinto html + dodoc -r "${S}"/doc/* + fi + + if use npm; then + keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm + + # Install bash completion for `npm` + local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" + "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" + newbashcomp "${tmp_npm_completion_file}" npm + + # Move man pages + doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* + + # Clean up + rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} + + local find_exp="-or -name" + local find_name=() + for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ + ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ + "*.md" "*.markdown" "*.bat" "*.cmd"; do + find_name+=( ${find_exp} "${match}" ) + done + + # Remove various development and/or inappropriate files and + # useless docs of dependend packages. + find "${LIBDIR}"/node_modules \ + \( -type d -name examples \) -or \( -type f \( \ + -iname "LICEN?E*" \ + "${find_name[@]}" \ + \) \) -exec rm -rf "{}" \; + fi + + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die +} + +src_test() { + local drop_tests=( + test/parallel/test-fs-read-stream.js + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-fs-watch-recursive-add-file.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" + + out/${BUILDTYPE}/cctest || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die +} + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/nodejs/nodejs-22.1.0.ebuild b/net-libs/nodejs/nodejs-22.1.0.ebuild new file mode 100644 index 000000000000..e35427690118 --- /dev/null +++ b/net-libs/nodejs/nodejs-22.1.0.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CONFIG_CHECK="~ADVISE_SYSCALLS" +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="threads(+)" + +inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" +HOMEPAGE="https://nodejs.org/" +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/nodejs/node" + SLOT="0" +else + SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" + # We need this until simdjson is updated to 3.9.1 in nodejs (bug 931150) + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/net-libs/nodejs/nodejs-22.1.0-deps-import-simdjson-3.9.1-for-GCC-14.patch.xz" + SLOT="0/$(ver_cut 1)" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + S="${WORKDIR}/node-v${PV}" +fi + +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" +REQUIRED_USE="inspector? ( icu ssl ) + npm? ( ssl ) + system-icu? ( icu ) + system-ssl? ( ssl ) + x86? ( cpu_flags_x86_sse2 )" + +RESTRICT="!test? ( test )" + +RDEPEND=">=app-arch/brotli-1.0.9:= + >=dev-libs/libuv-1.46.0:= + >=net-dns/c-ares-1.18.1:= + >=net-libs/nghttp2-1.41.0:= + sys-libs/zlib + corepack? ( !sys-apps/yarn ) + system-icu? ( >=dev-libs/icu-71:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + sys-devel/gcc:*" +BDEPEND="${PYTHON_DEPS} + app-alternatives/ninja + sys-apps/coreutils + virtual/pkgconfig + test? ( net-misc/curl ) + pax-kernel? ( sys-apps/elfix )" +DEPEND="${RDEPEND}" + +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" + +PATCHES=( + "${WORKDIR}"/nodejs-22.1.0-deps-import-simdjson-3.9.1-for-GCC-14.patch +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + fi +} + +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + tc-export AR CC CXX PKG_CONFIG + export V=1 + export BUILDTYPE=Release + + # fix compilation on Darwin + # https://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die + + # Avoid writing a depfile, not useful + sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die + + sed -i -e "/'-O3'/d" common.gypi node.gypi || die + + # debug builds. change install path, remove optimisations and override buildtype + if use debug; then + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die + BUILDTYPE=Debug + fi + + # We need to disable mprotect on two files when it builds Bug 694100. + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) + + default +} + +src_configure() { + xdg_environment_reset + + # LTO compiler flags are handled by configure.py itself + filter-lto + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" + + local myconf=( + --ninja + --shared-brotli + --shared-cares + --shared-libuv + --shared-nghttp2 + --shared-zlib + ) + use debug && myconf+=( --debug ) + use lto && myconf+=( --enable-lto ) + if use system-icu; then + myconf+=( --with-intl=system-icu ) + elif use icu; then + myconf+=( --with-intl=full-icu ) + else + myconf+=( --with-intl=none ) + fi + use corepack || myconf+=( --without-corepack ) + use inspector || myconf+=( --without-inspector ) + use npm || myconf+=( --without-npm ) + use snapshot || myconf+=( --without-node-snapshot ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi + + local myarch="" + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; + *) myarch="${ABI}";; + esac + + GYP_DEFINES="linux_use_gold_flags=0 + linux_use_bundled_binutils=0 + linux_use_bundled_gold=0" \ + "${EPYTHON}" configure.py \ + --prefix="${EPREFIX}"/usr \ + --dest-cpu=${myarch} \ + "${myconf[@]}" || die +} + +src_compile() { + emake -Onone +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + default + + pax-mark -m "${ED}"/usr/bin/node + + # set up a symlink structure that node-gyp expects.. + dodir /usr/include/node/deps/{v8,uv} + dosym . /usr/include/node/src + for var in deps/{uv,v8}/include; do + dosym ../.. /usr/include/node/${var} + done + + if use doc; then + docinto html + dodoc -r "${S}"/doc/* + fi + + if use npm; then + keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm + + # Install bash completion for `npm` + local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" + "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" + newbashcomp "${tmp_npm_completion_file}" npm + + # Move man pages + doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* + + # Clean up + rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} + + local find_exp="-or -name" + local find_name=() + for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ + ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ + "*.md" "*.markdown" "*.bat" "*.cmd"; do + find_name+=( ${find_exp} "${match}" ) + done + + # Remove various development and/or inappropriate files and + # useless docs of dependend packages. + find "${LIBDIR}"/node_modules \ + \( -type d -name examples \) -or \( -type f \( \ + -iname "LICEN?E*" \ + "${find_name[@]}" \ + \) \) -exec rm -rf "{}" \; + fi + + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die +} + +src_test() { + local drop_tests=( + test/parallel/test-dns-resolveany-bad-ancount.js + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-read-stream.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-fs-watch-recursive-add-file.js + test/parallel/test-process-euid-egid.js + test/parallel/test-process-initgroups.js + test/parallel/test-process-setgroups.js + test/parallel/test-process-uid-gid.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" + + out/${BUILDTYPE}/cctest || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die +} + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index d9745115c19f..8f647b977a19 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +CONFIG_CHECK="~ADVISE_SYSCALLS" +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" @@ -19,53 +20,61 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test" -REQUIRED_USE="inspector? ( icu ssl ) +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" +REQUIRED_USE="corepack? ( !npm ) + inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) - system-ssl? ( ssl )" + system-ssl? ( ssl ) + x86? ( cpu_flags_x86_sse2 )" RESTRICT="!test? ( test )" RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.0:= + >=dev-libs/libuv-1.44.0:= + >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib - system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= )" + corepack? ( !sys-apps/yarn ) + system-icu? ( >=dev-libs/icu-73:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + sys-devel/gcc:*" BDEPEND="${PYTHON_DEPS} + app-alternatives/ninja sys-apps/coreutils virtual/pkgconfig - systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch # still needed as of 2021-06-04 -) +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - if [[ ${MERGE_TYPE} != "binary" ]]; then - if use lto; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -ge 11 ]]; then - # Bug #787158 - die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" - fi - fi + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend fi fi } +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + src_prepare() { tc-export AR CC CXX PKG_CONFIG export V=1 @@ -95,14 +104,7 @@ src_prepare() { fi # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - # All this test does is check if the npm CLI produces warnings of any sort, - # failing if it does. Overkill, much? Especially given one possible warning - # is that there is a newer version of npm available upstream (yes, it does - # use the network if available), thus making it a real possibility for this - # test to begin failing one day even though it was fine before. - rm -f test/parallel/test-release-npm.js + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch ) default } @@ -111,9 +113,16 @@ src_configure() { xdg_environment_reset # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' + filter-lto + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" local myconf=( + --ninja --shared-brotli --shared-cares --shared-libuv @@ -129,6 +138,7 @@ src_configure() { else myconf+=( --with-intl=none ) fi + use corepack || myconf+=( --without-corepack ) use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) @@ -139,13 +149,15 @@ src_configure() { fi local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; *) myarch="${ABI}";; esac @@ -155,12 +167,11 @@ src_configure() { "${EPYTHON}" configure.py \ --prefix="${EPREFIX}"/usr \ --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ "${myconf[@]}" || die } src_compile() { - emake -C out + emake -Onone } src_install() { @@ -183,6 +194,8 @@ src_install() { if use npm; then keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm # Install bash completion for `npm` local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" @@ -213,16 +226,32 @@ src_install() { \) \) -exec rm -rf "{}" \; fi + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die } src_test() { - # parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox - if has usersandbox ${FEATURES}; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" - fi + local drop_tests=( + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-fs-watch-recursive-add-file.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" out/${BUILDTYPE}/cctest || die "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die } + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest index a777910ea00d..bf7aedc80f98 100644 --- a/net-libs/ntirpc/Manifest +++ b/net-libs/ntirpc/Manifest @@ -1 +1 @@ -DIST ntirpc-3.4.tar.gz 387376 BLAKE2B db4d0fd22f1ea46da6e40a613848f9fd396bd85cf01968f5ab976627ab787e8d1bc2a57a8bb87f2ffcaf63b8e59c6ea41145ed9ccafc66d4ba420a15c9a78901 SHA512 913bc9f3208ddb667a7fab6e06585ba15ac3dd1979a15846f49114f54a270c2174a00afc3009d6158851aed779046743dd1ea704227122079164c07b394c01ad +DIST ntirpc-5.0.tar.gz 390950 BLAKE2B b97265eb0af7964b9810f2b4e285531bdd467c9b7385cfcdc75987a6c275e5675d2044e05f560e27a6d5cd4af80b6b27e484ce7cd333878dedf6d1d5fa1e434e SHA512 f73a1bf8a7188bd3fb50ce735ebd18dead63cb93ea8c347aef267082673c40580402b0381d1ed6c7fdecf7752718c059e406dff3051a739632ed8097eccc6646 diff --git a/net-libs/ntirpc/files/ntirpc-5.0-include-assert.h.patch b/net-libs/ntirpc/files/ntirpc-5.0-include-assert.h.patch new file mode 100644 index 000000000000..ad52bbcda007 --- /dev/null +++ b/net-libs/ntirpc/files/ntirpc-5.0-include-assert.h.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/902995 + +--- a/src/work_pool.c ++++ b/src/work_pool.c +@@ -39,6 +39,7 @@ + + #include "config.h" + ++#include <assert.h> + #include <sys/types.h> + #if !defined(_WIN32) + #include <netinet/in.h> diff --git a/net-libs/ntirpc/metadata.xml b/net-libs/ntirpc/metadata.xml index 32ce65debaaa..39ab041d91ac 100644 --- a/net-libs/ntirpc/metadata.xml +++ b/net-libs/ntirpc/metadata.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> -</maintainer> -<use> - <flag name="gssapi">Include support for RPCSEC GSS</flag> - <flag name="rdma">Include support for RDMA RPC</flag> -</use> -<upstream> - <remote-id type="github">nfs-ganesha/ntirpc</remote-id> -</upstream> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + </maintainer> + <use> + <flag name="gssapi">Include support for RPCSEC GSS</flag> + <flag name="rdma">Include support for RDMA RPC</flag> + </use> + <upstream> + <remote-id type="github">nfs-ganesha/ntirpc</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/ntirpc/ntirpc-3.4.ebuild b/net-libs/ntirpc/ntirpc-5.0.ebuild index 6e63e824706b..c6d615747227 100644 --- a/net-libs/ntirpc/ntirpc-3.4.ebuild +++ b/net-libs/ntirpc/ntirpc-5.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -17,17 +17,17 @@ IUSE="gssapi rdma" # Since the GSS option only controls some extra files to be enabled, # there's nothing to list in the depend string for it. RDEPEND=" - dev-libs/userspace-rcu - rdma? ( sys-fabric/librdmacm ) -" -DEPEND=" - ${RDEPEND} + dev-libs/userspace-rcu:= + rdma? ( sys-cluster/rdma-core ) " +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-include-assert.h.patch ) src_configure() { local mycmakeargs=( - -DUSE_GSS="$(usex gssapi)" - -DUSE_RPC_RDMA="$(usex rdma)" + -DUSE_GSS=$(usex gssapi) + -DUSE_RPC_RDMA=$(usex rdma) ) cmake_src_configure } diff --git a/net-libs/obby/Manifest b/net-libs/obby/Manifest deleted file mode 100644 index 9f3d472062e4..000000000000 --- a/net-libs/obby/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST obby-0.4.8.tar.gz 530525 BLAKE2B 81a309763a0720139e91670e03d5107da13ab097e2443b7882c774cfcea1c1a9f8a084e7214590fadc1402c490dcabc9db36a8d9d7090955617980c0732f2b5f SHA512 39cd01e74f8df805bd6f077afab023f70f6da16d421dd0d12abc82972a9ec3e2563cc4ef6bf99c74b59f1c96e18eb3d5065f8b07add8ecb56c26601715f184d0 diff --git a/net-libs/obby/metadata.xml b/net-libs/obby/metadata.xml deleted file mode 100644 index bef24d2c2337..000000000000 --- a/net-libs/obby/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-libs/obby/obby-0.4.8-r1.ebuild b/net-libs/obby/obby-0.4.8-r1.ebuild deleted file mode 100644 index e60864110269..000000000000 --- a/net-libs/obby/obby-0.4.8-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit flag-o-matic multilib - -DESCRIPTION="Library for collaborative text editing" -HOMEPAGE="http://gobby.0x539.de/" -SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86" -IUSE="ipv6 nls static-libs zeroconf" - -RDEPEND=" - net-libs/net6 - dev-libs/libsigc++:2 - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) -" - -src_configure() { - append-cxxflags -std=c++11 - econf \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_enable static-libs static) \ - $(use_with zeroconf) -} - -src_install() { - default - use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib${PN}.la -} diff --git a/net-libs/onion/Manifest b/net-libs/onion/Manifest deleted file mode 100644 index 18f3c70c6226..000000000000 --- a/net-libs/onion/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST onion-0.8.tar.gz 344347 BLAKE2B c43bbbf31d29ccc99d2969c7c8dc9aec8d5e514cc785091e3e0e6d1fc1d5db5f8561d5c2c745b4150a493b607c6c271d669e7ca541f72bf4d8872beeba00b220 SHA512 c40a36346de7dee6e98d0b5c38b5e133606046e29bacb06a0055a361013077ec0f6adb04dfcbf2f4ce0b72317c9ed918573299aed8760f069dcfd7c211a302d7 diff --git a/net-libs/onion/files/protos.patch b/net-libs/onion/files/protos.patch deleted file mode 100644 index 59050a95c4e6..000000000000 --- a/net-libs/onion/files/protos.patch +++ /dev/null @@ -1,28 +0,0 @@ -Prototypes do not match, fixes some build failures. - -Index: onion-0.8/src/onion/poller_libev.c -=================================================================== ---- onion-0.8.orig/src/onion/poller_libev.c -+++ onion-0.8/src/onion/poller_libev.c -@@ -75,7 +75,7 @@ void onion_poller_slot_set_timeout(onion - el->timeout=timeout_ms; - } - /// Sets the polling type: read/write/other. O_POLL_READ | O_POLL_WRITE | O_POLL_OTHER --void onion_poller_slot_set_type(onion_poller_slot *el, int type){ -+void onion_poller_slot_set_type(onion_poller_slot *el, onion_poller_slot_type_e type){ - el->type=0; - if (type&O_POLL_READ) - el->type|=EV_READ; -Index: onion-0.8/src/onion/poller_libevent.c -=================================================================== ---- onion-0.8.orig/src/onion/poller_libevent.c -+++ onion-0.8/src/onion/poller_libevent.c -@@ -77,7 +77,7 @@ void onion_poller_slot_set_timeout(onion - el->timeout=timeout_ms; - } - /// Sets the polling type: read/write/other. O_POLL_READ | O_POLL_WRITE | O_POLL_OTHER --void onion_poller_slot_set_type(onion_poller_slot *el, int type){ -+void onion_poller_slot_set_type(onion_poller_slot *el, onion_poller_slot_type_e type){ - el->type=EV_PERSIST; - if (type&O_POLL_READ) - el->type|=EV_READ; diff --git a/net-libs/onion/metadata.xml b/net-libs/onion/metadata.xml deleted file mode 100644 index a9a869a84ec7..000000000000 --- a/net-libs/onion/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>aballier@gentoo.org</email> - <name>Alexis Ballier</name> - </maintainer> - <use> - <flag name="libev">Use <pkg>dev-libs/libev</pkg> as thread poller instead of Linux's epoll.</flag> - <flag name="libevent">Use <pkg>dev-libs/libevent</pkg> as thread poller instead of libev or Linux's epoll.</flag> - <flag name="boehm-gc">Add <pkg>dev-libs/boehm-gc</pkg> support for memory allocations.</flag> - <flag name="redis">Add support for redis sessions.</flag> - </use> - <upstream> - <remote-id type="github">davidmoreno/onion</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-libs/onion/onion-0.8.ebuild b/net-libs/onion/onion-0.8.ebuild deleted file mode 100644 index a283da472b81..000000000000 --- a/net-libs/onion/onion-0.8.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/davidmoreno/onion" -fi - -inherit ${SCM} cmake-utils - -DESCRIPTION="C library to create simple HTTP servers and Web Applications" -HOMEPAGE="https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion" - -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/davidmoreno/onion/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="|| ( GPL-2+ Apache-2.0 ) AGPL-3" -SLOT="0" -IUSE=" - gnutls pam png jpeg xml systemd sqlite boehm-gc - test examples cxx libev libevent - redis -" -RESTRICT="!test? ( test )" - -RDEPEND=" - gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= ) - pam? ( sys-libs/pam ) - png? ( media-libs/libpng:0= x11-libs/cairo ) - jpeg? ( virtual/jpeg:0 ) - xml? ( dev-libs/libxml2:2 sys-libs/zlib ) - systemd? ( sys-apps/systemd ) - sqlite? ( dev-db/sqlite:3 ) - boehm-gc? ( dev-libs/boehm-gc ) - libev? ( dev-libs/libev ) - !libev? ( libevent? ( dev-libs/libevent ) ) - redis? ( dev-libs/hiredis ) -" -DEPEND="${RDEPEND} - test? ( net-misc/curl ) -" -REQUIRED_USE="test? ( examples )" - -PATCHES=( "${FILESDIR}/protos.patch" ) - -src_configure() { - use test || echo '' > tests/CMakeLists.txt - local mycmakeargs=( - "-DONION_USE_SSL=$(usex gnutls)" - "-DONION_USE_PAM=$(usex pam)" - "-DONION_USE_PNG=$(usex png)" - "-DONION_USE_JPEG=$(usex jpeg)" - "-DONION_USE_XML2=$(usex xml)" - "-DONION_USE_SYSTEMD=$(usex systemd)" - "-DONION_USE_SQLITE3=$(usex sqlite)" - "-DONION_USE_GC=$(usex boehm-gc)" - "-DONION_USE_TESTS=$(usex test)" - "-DONION_EXAMPLES=$(usex examples)" - "-DONION_USE_BINDINGS_CPP=$(usex cxx)" - "-DONION_USE_REDIS=$(usex redis)" - "-DONION_POLLER=$(usex libev libev "$(usex libevent libevent default)")" - ) - cmake-utils_src_configure -} diff --git a/net-libs/onion/onion-9999.ebuild b/net-libs/onion/onion-9999.ebuild deleted file mode 100644 index 10ba2b76bbf0..000000000000 --- a/net-libs/onion/onion-9999.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/davidmoreno/onion" -fi - -inherit ${SCM} cmake-utils - -DESCRIPTION="C library to create simple HTTP servers and Web Applications" -HOMEPAGE="https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion" - -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/davidmoreno/onion/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="|| ( GPL-2+ Apache-2.0 ) AGPL-3" -SLOT="0" -IUSE=" - gnutls pam png jpeg xml systemd sqlite boehm-gc - test examples cxx libev libevent - redis -" -RESTRICT="!test? ( test )" - -RDEPEND=" - gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= ) - pam? ( sys-libs/pam ) - png? ( media-libs/libpng:0= x11-libs/cairo ) - jpeg? ( virtual/jpeg:0 ) - xml? ( dev-libs/libxml2:2 sys-libs/zlib ) - systemd? ( sys-apps/systemd ) - sqlite? ( dev-db/sqlite:3 ) - boehm-gc? ( dev-libs/boehm-gc ) - libev? ( dev-libs/libev ) - !libev? ( libevent? ( dev-libs/libevent ) ) - redis? ( dev-libs/hiredis ) -" -DEPEND="${RDEPEND} - test? ( net-misc/curl ) -" -REQUIRED_USE="test? ( examples )" - -src_configure() { - use test || echo '' > tests/CMakeLists.txt - local mycmakeargs=( - "-DONION_USE_SSL=$(usex gnutls)" - "-DONION_USE_PAM=$(usex pam)" - "-DONION_USE_PNG=$(usex png)" - "-DONION_USE_JPEG=$(usex jpeg)" - "-DONION_USE_XML2=$(usex xml)" - "-DONION_USE_SYSTEMD=$(usex systemd)" - "-DONION_USE_SQLITE3=$(usex sqlite)" - "-DONION_USE_GC=$(usex boehm-gc)" - "-DONION_USE_TESTS=$(usex test)" - "-DONION_EXAMPLES=$(usex examples)" - "-DONION_USE_BINDINGS_CPP=$(usex cxx)" - "-DONION_USE_REDIS=$(usex redis)" - "-DONION_POLLER=$(usex libev libev "$(usex libevent libevent default)")" - ) - cmake-utils_src_configure -} diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest deleted file mode 100644 index 896deddf9d46..000000000000 --- a/net-libs/ortp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ortp-0.23.0.tar.gz 540135 BLAKE2B 46bc411df48f7f8a2fd180ff75dc5f515c36a71bcaced0d3fcf5336ee8e142c6ae6d597ba39a92c38be78ce74d3eb79692f26596f37075829850222cdf381793 SHA512 70560168f1b138ad825e4e836e7ee218bd24b92a2d76666ba2794a4b31cadbdd8fdd40fee78d612187cde6a827005cbd836cdfc13a70947374356fb84a853ea4 diff --git a/net-libs/ortp/metadata.xml b/net-libs/ortp/metadata.xml deleted file mode 100644 index 1b5d3956df0b..000000000000 --- a/net-libs/ortp/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> - <use> - <flag name="ntp-timestamp">Turn on NTP timestamping on received packet</flag> - <flag name="srtp">Add support for Secure RTP</flag> - </use> -</pkgmetadata> diff --git a/net-libs/ortp/ortp-0.23.0-r1.ebuild b/net-libs/ortp/ortp-0.23.0-r1.ebuild deleted file mode 100644 index ce209560f3a4..000000000000 --- a/net-libs/ortp/ortp-0.23.0-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack" -HOMEPAGE="http://www.linphone.org/" -SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/9" -KEYWORDS="~alpha amd64 arm64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos" -IUSE="debug doc examples ipv6 minimal ntp-timestamp ssl srtp" - -RDEPEND=" - ssl? ( dev-libs/openssl:0= ) - srtp? ( net-libs/libsrtp:0= ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - virtual/pkgconfig -" - -src_prepare() { - default - # ${P} is added after ${docdir} - if use doc; then - sed -i -e 's/$(docdir)\/$(PACKAGE)-$(VERSION)/$(docdir)/' Makefile.in \ - || die "patching Makefile.in failed" - fi -} - -src_configure() { - local myeconfargs=( - # memcheck is for HP-UX only - --disable-memcheck - # mode64bit adds +DA2.0W +DS2.0 CFLAGS wich are needed for HP-UX - --disable-mode64bit - # strict adds -Werror, do not want it - --disable-strict - # they seriously failed to understand AC_ARG_ENABLE... - --disable-tests_enabled - --enable-fast-install - --enable-libtool-lock - # this is fine as long as we do not link to polarssl - --enable-broken-srtp - # zrtp removed from the tree - --disable-zrtp - - $(use_enable debug) - $(use_enable ipv6) - $(use_enable minimal perf) - $(use_enable ntp-timestamp) - $(use_enable ssl ssl-hmac) - - --with-srtp=$(usex srtp "${EPREFIX}"/usr none) - $(use doc || echo ac_cv_path_DOXYGEN=false) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \ - install - - einstalldocs - - find "${ED}" -name '*.la' -delete || die - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins src/tests/*.c - fi -} diff --git a/net-libs/pacparser/Manifest b/net-libs/pacparser/Manifest index f688ce59f8ae..9b5284ae8405 100644 --- a/net-libs/pacparser/Manifest +++ b/net-libs/pacparser/Manifest @@ -1 +1,3 @@ -DIST pacparser-1.3.7.tar.gz 905596 BLAKE2B 122127b6e1d8f68fde4c5ca98207bf2a0fa2a081dbb60aaf34126700a3de9d861e7b5f881e78d3eefdd2a9af97a9ba677339ca2b2a0b4459d26e60a62226e839 SHA512 979238204cd352ecf502a5a6216a35d7c47e82a173c32c6f0a5166f1fe790c66ac74ec1d9d0a58b54038d19e893f8b365ed868664f84ab9d5e653584bf20130b +DIST pacparser-1.4.0.tar.gz 902919 BLAKE2B da29b34654764b1569d9d37648e4ccb608142becaf34c65cdf37b2bd81aa073b1945d840fb50aa7cb986687bbdc086c862a05bc421adb08d44e1add637b712ed SHA512 9574068dc4da3db27ddc1242cf98d98ebc7515864789e95b700cd2ce1433a7cff84160f1507976488fab7529839cabe9cf2aa16ddbefc0c83009fa6c0d2ad6b3 +DIST pacparser-1.4.2.tar.gz 903425 BLAKE2B 6b46fd87487feacb3915ddd3705eb60f795257adc5361fddbfc550c537471276f464f367b57124efc49f57666f232c297df763f2adea34d7642bd1e3271f47b4 SHA512 65d12421ee79a969b867d7dcec1527ac9b2596c25f6be2502742ba1b3788f05afeed2fcd5406dfb39485d1d56ef161684acabe6a95008725385c3c5336f331b1 +DIST pacparser-1.4.3.tar.gz 905231 BLAKE2B bffe42154a8de9798c4c7b986e5797c19cbb103ed2977545014278f63a770c7cd9ed6b7fc6a9fff96514a71457b9dbc35104a51d9e5e331e2d19f3baeb86e621 SHA512 cc0d6c0a7b1fd9d55dece6c4ad80711d3d1055a0cde120dbb6e8274508631b325e7d876545b40ca05cefc6dce15aa1476e5b2936527e3183ad86114e4cd661a5 diff --git a/net-libs/pacparser/files/pacparser-1.4.0-build.patch b/net-libs/pacparser/files/pacparser-1.4.0-build.patch new file mode 100644 index 000000000000..2a8898579327 --- /dev/null +++ b/net-libs/pacparser/files/pacparser-1.4.0-build.patch @@ -0,0 +1,96 @@ +Upstream-PR: https://github.com/manugarg/pacparser/pull/136 +From 5d689be2e250242ef4022054f11bf00af339c149 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Fri, 13 May 2022 22:34:37 -0700 +Subject: [PATCH 1/2] build: Don't conflict with the user's CFLAGS + +This uses the variable MAINT_CFLAGS to set the project's flags so that +the user can set CFLAGS as an environment variable or as an make +argument without any conflicts. + +This can be problemtic with the build environment in some distros. +--- + src/Makefile | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 87f5c1b..3642241 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -60,14 +60,14 @@ ifeq ($(OS_ARCH),Darwin) + endif + + PREFIX ?= /usr +-CFLAGS = -g -DXP_UNIX -Wall -DVERSION=$(VERSION) ++MAINT_CFLAGS := -g -DXP_UNIX -Wall -DVERSION=$(VERSION) + + ifndef PYTHON + PYTHON = python + endif + + # Spidermonkey library. +-CFLAGS += -Ispidermonkey/js/src ++MAINT_CFLAGS += -Ispidermonkey/js/src + + LIBRARY_LINK = $(LIBRARY_NAME).$(SO_SUFFIX) + PREFIX := $(DESTDIR)$(PREFIX) +@@ -87,17 +87,17 @@ spidermonkey/libjs.a: spidermonkey/js/src + cd spidermonkey && SMCFLAGS="$(SHFLAGS) $(SMCFLAGS)" $(MAKE) jslib + + pacparser.o: pacparser.c pac_utils.h pacparser.h jsapi_buildstamp +- $(CC) $(CFLAGS) $(SHFLAGS) -c pacparser.c -o pacparser.o ++ $(CC) $(MAINT_CFLAGS) $(CFLAGS) $(SHFLAGS) -c pacparser.c -o pacparser.o + touch pymod/pacparser_o_buildstamp + + $(LIBRARY): pacparser.o spidermonkey/libjs.a +- $(MKSHLIB) $(CFLAGS) $(LDFLAGS) $(LIB_OPTS) -o $(LIBRARY) pacparser.o spidermonkey/libjs.a -lm ++ $(MKSHLIB) $(MAINT_CFLAGS) $(CFLAGS) $(LDFLAGS) $(LIB_OPTS) -o $(LIBRARY) pacparser.o spidermonkey/libjs.a -lm + + $(LIBRARY_LINK): $(LIBRARY) + ln -sf $(LIBRARY) $(LIBRARY_LINK) + + pactester: pactester.c pacparser.h pacparser.o spidermonkey/libjs.a +- $(CC) $(CFLAGS) $(LDFLAGS) pactester.c pacparser.o spidermonkey/libjs.a -o pactester -lm -L. -I. ++ $(CC) $(MAINT_CFLAGS) $(CFLAGS) $(LDFLAGS) pactester.c pacparser.o spidermonkey/libjs.a -o pactester -lm -L. -I. + + testpactester: pactester $(LIBRARY_LINK) + echo "Running tests for pactester." + +From ff86f230de5dd60935e1793077eb038fcbe1e515 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Fri, 13 May 2022 22:45:19 -0700 +Subject: [PATCH 2/2] build: Add DOC_PREFIX + +This can be useful for distro integration. +--- + src/Makefile | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 3642241..af10890 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -74,6 +74,7 @@ PREFIX := $(DESTDIR)$(PREFIX) + LIB_PREFIX = $(PREFIX)/lib + INC_PREFIX = $(PREFIX)/include + BIN_PREFIX = $(PREFIX)/bin ++DOC_PREFIX = $(PREFIX)/share/doc/pacparser + MAN_PREFIX = $(PREFIX)/share/man + + .PHONY: clean pymod install-pymod +@@ -119,11 +120,11 @@ install: all + install -d $(MAN_PREFIX)/man3/ + (test -d ../docs && install -m 644 ../docs/man/man3/*.3 $(MAN_PREFIX)/man3/) || true + # install html docs +- install -d $(PREFIX)/share/doc/pacparser/html/ +- (test -d ../docs/html && install -m 644 ../docs/html/* $(PREFIX)/share/doc/pacparser/html/) || true ++ install -d $(DOC_PREFIX)/html/ ++ (test -d ../docs/html && install -m 644 ../docs/html/* $(DOC_PREFIX)/html/) || true + # install examples +- install -d $(PREFIX)/share/doc/pacparser/examples/ +- (test -d ../examples && install -m 644 ../examples/* $(PREFIX)/share/doc//pacparser/examples/) || true ++ install -d $(DOC_PREFIX)/examples/ ++ (test -d ../examples && install -m 644 ../examples/* $(DOC_PREFIX)/examples/) || true + + # Targets to build python module + pymod: pacparser.o pacparser.h spidermonkey/libjs.a diff --git a/net-libs/pacparser/files/pacparser-1.4.0-pymod.patch b/net-libs/pacparser/files/pacparser-1.4.0-pymod.patch new file mode 100644 index 000000000000..203e34c838f1 --- /dev/null +++ b/net-libs/pacparser/files/pacparser-1.4.0-pymod.patch @@ -0,0 +1,61 @@ +Upstream-PR: https://github.com/manugarg/pacparser/pull/137 +From 351b8f837ebbdf6e6fa4978a70287899436890eb Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sat, 14 May 2022 01:46:25 -0700 +Subject: [PATCH] tests: Fix python path in runtests.py + +In Gentoo the runtests.py script fails when it fails to determine the +pacparser path. + +This happens because 'py_ver' expands to '3.9' when the expected +directory ends in '39'. This can be solved by replacing any periods in +the string. + +python ../tests/runtests.py +Traceback (most recent call last): + File "/tmp/pacparser/src/../tests/runtests.py", line 31, in runtests + pacparser_module_path = glob.glob(os.path.join( +IndexError: list index out of range + +During handling of the above exception, another exception occurred: + +Traceback (most recent call last): + File "/tmp/pacparser/src/../tests/runtests.py", line 81, in <module> + main() + File "/tmp/pacparser/src/../tests/runtests.py", line 78, in main + runtests(pacfile, testdata, tests_dir) + File "/tmp/pacparser/src/../tests/runtests.py", line 34, in runtests + raise Exception('Tests failed. Could not determine pacparser path.') +Exception: Tests failed. Could not determine pacparser path. +--- + tests/runtests.py | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/tests/runtests.py b/tests/runtests.py +index 9760300..a5377d1 100644 +--- a/tests/runtests.py ++++ b/tests/runtests.py +@@ -26,10 +26,20 @@ + import sys + + def runtests(pacfile, testdata, tests_dir): +- py_ver = '.'.join([str(x) for x in sys.version_info[0:2]]) ++ ver = '.'.join([str(x) for x in sys.version_info[0:2]]) ++ py_ver = [ver, ver.replace('.', '')] + try: +- pacparser_module_path = glob.glob(os.path.join( +- tests_dir, '..', 'src', 'pymod', 'build', 'lib*%s' % py_ver))[0] ++ module_path = glob.glob(os.path.join( ++ tests_dir, '..', 'src', 'pymod', 'build', 'lib*')) ++ module_found = False ++ for module in module_path: ++ for version in py_ver: ++ if module.endswith(version): ++ module_found = True ++ break ++ if module_found: ++ pacparser_module_path = module ++ break + except Exception: + raise Exception('Tests failed. Could not determine pacparser path.') + if 'DEBUG' in os.environ: print('Pacparser module path: %s' % diff --git a/net-libs/pacparser/metadata.xml b/net-libs/pacparser/metadata.xml index 0f78f0b389ed..6af09d26aa3e 100644 --- a/net-libs/pacparser/metadata.xml +++ b/net-libs/pacparser/metadata.xml @@ -20,7 +20,7 @@ support PAC files. The idea behind pacparser is to make it easy to add this PAC file parsing capability to any program (C and Python supported right now). -</longdescription> + </longdescription> <upstream> <remote-id type="github">pacparser/pacparser</remote-id> </upstream> diff --git a/net-libs/pacparser/pacparser-1.3.7-r1.ebuild b/net-libs/pacparser/pacparser-1.4.0.ebuild index 911a5d5ce27f..04d6f5b11bde 100644 --- a/net-libs/pacparser/pacparser-1.3.7-r1.ebuild +++ b/net-libs/pacparser/pacparser-1.4.0.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{9,10,11} ) inherit python-r1 toolchain-funcs DESCRIPTION="Library to parse proxy auto-config files" HOMEPAGE="http://pacparser.manugarg.com/" -SRC_URI="https://github.com/pacparser/${PN}/releases/download/${PV}/${P}.tar.gz" +SRC_URI="https://github.com/manugarg/${PN}/archive/v${PV}/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0/1" @@ -24,38 +24,41 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # tested unbundling with spidermonkey-1.8* and 1.7 # and got many failures: unbundling not worth it. +PATCHES=( + "${FILESDIR}/${P}-build.patch" + "${FILESDIR}/${P}-pymod.patch" +) + src_prepare() { default - sed -e 's|CFLAGS = |CFLAGS := $(CFLAGS) |' \ - -e 's|= $(PREFIX)|:= $(PREFIX)|g' \ - -e "s|share/doc.*pacparser|share/doc/${PF}|g" \ - -e "s|/lib|/$(get_libdir)|g" \ - -i src/Makefile || die + + sed -e '/CC = gcc/d' \ + -i src/spidermonkey/js/src/config/Linux_All.mk || die + export NO_INTERNET=yes + export VERSION="${PV}" tc-export CC AR RANLIB } src_compile() { - emake -C src spidermonkey/js/src - sed -e '/CC = gcc/d' \ - -i src/spidermonkey/js/src/config/Linux_All.mk || die # Upstream parallel compilation bug, do that first to work around emake -C src/spidermonkey emake -C src use python && python_foreach_impl emake -C src pymod } -src_test() { - emake -C src testpactester -} - src_install() { - emake DESTDIR="${ED}" LIB_PREFIX="${ED}/usr/$(get_libdir)" -C src install + emake \ + LIB_PREFIX="${ED}/usr/$(get_libdir)" \ + DOC_PREFIX="${ED}/usr/share/doc/${PF}" \ + BIN_PREFIX="${ED}"/usr/bin \ + INC_PREFIX="${ED}"/usr/include \ + MAN_PREFIX="${ED}"/usr/share/man \ + -C src install dodoc README.md if use python; then - python_foreach_impl emake DESTDIR="${D}" \ - LIB_PREFIX="${D}/usr/$(get_libdir)" -C src install-pymod + python_foreach_impl emake DESTDIR="${D}" -C src install-pymod python_foreach_impl python_optimize fi diff --git a/net-libs/pacparser/pacparser-1.4.2.ebuild b/net-libs/pacparser/pacparser-1.4.2.ebuild new file mode 100644 index 000000000000..87e64cf6c25f --- /dev/null +++ b/net-libs/pacparser/pacparser-1.4.2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit python-r1 toolchain-funcs + +DESCRIPTION="Library to parse proxy auto-config files" +HOMEPAGE="http://pacparser.manugarg.com/" +SRC_URI="https://github.com/manugarg/${PN}/archive/v${PV}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/1" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc python" + +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND}" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# spidermonkey-1.7.0 is bundled +# tested unbundling with spidermonkey-1.8* and 1.7 +# and got many failures: unbundling not worth it. + +src_prepare() { + default + + sed -e 's/^SMCFLAGS.*/SMCFLAGS = -DHAVE_VA_COPY -DVA_COPY=va_copy -DHAVE_VA_LIST_AS_ARRAY/' \ + -i src/Makefile || die + sed -e '/CC = gcc/d' \ + -i src/spidermonkey/js/src/config/Linux_All.mk || die + + export NO_INTERNET=yes + export VERSION="${PV}" + tc-export CC AR RANLIB +} + +src_compile() { + # Upstream parallel compilation bug, do that first to work around + emake -C src -j1 + use python && python_foreach_impl emake -C src pymod +} + +src_install() { + emake \ + LIB_PREFIX="${ED}/usr/$(get_libdir)" \ + DOC_PREFIX="${ED}/usr/share/doc/${PF}" \ + BIN_PREFIX="${ED}"/usr/bin \ + INC_PREFIX="${ED}"/usr/include \ + MAN_PREFIX="${ED}"/usr/share/man \ + -C src install + dodoc README.md + + if use python; then + python_foreach_impl emake DESTDIR="${D}" -C src install-pymod + python_foreach_impl python_optimize + fi + + if use doc; then + docompress -x /usr/share/doc/${PF}/{html,examples} + else + rm -r "${ED}"/usr/share/doc/${PF}/{html,examples} || die + fi +} diff --git a/net-libs/pacparser/pacparser-1.4.3.ebuild b/net-libs/pacparser/pacparser-1.4.3.ebuild new file mode 100644 index 000000000000..87e64cf6c25f --- /dev/null +++ b/net-libs/pacparser/pacparser-1.4.3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit python-r1 toolchain-funcs + +DESCRIPTION="Library to parse proxy auto-config files" +HOMEPAGE="http://pacparser.manugarg.com/" +SRC_URI="https://github.com/manugarg/${PN}/archive/v${PV}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/1" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc python" + +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND}" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# spidermonkey-1.7.0 is bundled +# tested unbundling with spidermonkey-1.8* and 1.7 +# and got many failures: unbundling not worth it. + +src_prepare() { + default + + sed -e 's/^SMCFLAGS.*/SMCFLAGS = -DHAVE_VA_COPY -DVA_COPY=va_copy -DHAVE_VA_LIST_AS_ARRAY/' \ + -i src/Makefile || die + sed -e '/CC = gcc/d' \ + -i src/spidermonkey/js/src/config/Linux_All.mk || die + + export NO_INTERNET=yes + export VERSION="${PV}" + tc-export CC AR RANLIB +} + +src_compile() { + # Upstream parallel compilation bug, do that first to work around + emake -C src -j1 + use python && python_foreach_impl emake -C src pymod +} + +src_install() { + emake \ + LIB_PREFIX="${ED}/usr/$(get_libdir)" \ + DOC_PREFIX="${ED}/usr/share/doc/${PF}" \ + BIN_PREFIX="${ED}"/usr/bin \ + INC_PREFIX="${ED}"/usr/include \ + MAN_PREFIX="${ED}"/usr/share/man \ + -C src install + dodoc README.md + + if use python; then + python_foreach_impl emake DESTDIR="${D}" -C src install-pymod + python_foreach_impl python_optimize + fi + + if use doc; then + docompress -x /usr/share/doc/${PF}/{html,examples} + else + rm -r "${ED}"/usr/share/doc/${PF}/{html,examples} || die + fi +} diff --git a/net-libs/paho-mqtt-c/Manifest b/net-libs/paho-mqtt-c/Manifest new file mode 100644 index 000000000000..6b3e38731c3b --- /dev/null +++ b/net-libs/paho-mqtt-c/Manifest @@ -0,0 +1,2 @@ +DIST paho-mqtt-c-1.3.13.tar.gz 3489004 BLAKE2B c835f4e2a741539df900184825b4ce29138f76828ec329d9321c54a845607b8137292330b019e950640f36bb14b0252dfba4906be746742950e3f8f13985608e SHA512 0f436470bcff224461ed3227c8db10914f84bc2dcf76e51b55d4a78b80abaa4e636ac8f7a20e517524625888335c738e975283e5d573ae8d59147aa4de7963fc +DIST paho.mqtt.testing-a4dc694010217b291ee78ee13a6d1db812f9babd.tar.gz 175858 BLAKE2B 7ba1be3e09740f45907c4ba2a5314830a56c4f6626af3fab15928647b235908429a96ece312e7f5b8fa044583c81e6d8deacc0fbd290e6e08fbc328524dba3f1 SHA512 a20ea68cfac7f2a4e140c9b9ebacf4debd544098151545dedb72fe1e3629b3a495df7e15b0e131d52c4e86fb8d165cb7b2ceee019c15599b0cb5d914da0e7723 diff --git a/net-libs/paho-mqtt-c/metadata.xml b/net-libs/paho-mqtt-c/metadata.xml new file mode 100644 index 000000000000..b2e9b98f3ec3 --- /dev/null +++ b/net-libs/paho-mqtt-c/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="high-performance"> + The debugging aids internal tracing and heap tracking are not included + </flag> + </use> + <longdescription lang="en"> + These libraries enable applications to connect to an MQTT broker to publish messages, and to subscribe to topics and receive published messages. + </longdescription> + <upstream> + <remote-id type="github">eclipse/paho.mqtt.c</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild b/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild new file mode 100644 index 000000000000..c86ad8b20189 --- /dev/null +++ b/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-any-r1 toolchain-funcs + +TEST_UTILS="paho.mqtt.testing" +TEST_COMMIT="a4dc694010217b291ee78ee13a6d1db812f9babd" + +DESCRIPTION="An Eclipse Paho C client library for MQTT for Windows, Linux and MacOS." +HOMEPAGE="https://eclipse.org/paho" +SRC_URI=" + https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/eclipse/${TEST_UTILS}/archive/${TEST_COMMIT}.tar.gz -> ${TEST_UTILS}-${TEST_COMMIT}.tar.gz +" +S="${WORKDIR}/paho.mqtt.c-${PV}" + +LICENSE="EPL-2.0" +SLOT="1.3" +KEYWORDS="amd64 ~x86" +IUSE="doc examples +high-performance +ssl test" + +# Building samples needs ssl: #912262 +REQUIRED_USE="examples? ( ssl )" + +# Tests require net-redirections to be enabled in bash. See bug #915718 +BDEPEND=" + doc? ( app-text/doxygen + media-gfx/graphviz ) + ssl? ( dev-libs/openssl ) + test? ( + dev-lang/python + app-shells/bash[net] + ) +" + +# Tests can be run only if a MQTT broker is available +RESTRICT="!test? ( test )" + +BUILD_DIR="${S}_build" + +src_prepare(){ + cmake_src_prepare + if use test; then + mv "${WORKDIR}/${TEST_UTILS}-${TEST_COMMIT}" "${WORKDIR}/${TEST_UTILS}" || die + fi +} + +src_configure(){ + local mycmakeargs=( + -DPAHO_BUILD_SHARED=TRUE + -DPAHO_HIGH_PERFORMANCE="$(usex high-performance "TRUE" "FALSE")" + -DPAHO_WITH_SSL="$(usex ssl "TRUE" "FALSE")" + -DPAHO_BUILD_DOCUMENTATION="$(usex doc "TRUE" "FALSE")" + -DPAHO_BUILD_SAMPLES="$(usex examples "TRUE" "FALSE")" + -DPAHO_ENABLE_TESTING="$(usex test "TRUE" "FALSE")" + ) + cmake_src_configure +} + +src_test() { + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + cd "${WORKDIR}/${TEST_UTILS}/interoperability" || die + + ${EPYTHON} startbroker.py -c localhost_testing.conf \ + > "${T}/testbroker.log" & + local -r startbroker_pid=$! + + ${EPYTHON} "${S}"/test/mqttsas.py \ + > "${T}/testmqttsas.log" & + local -r mqttsas_pid=$! + + local port ports + ports=(1883 1888{3..8}) + + for port in ${ports[@]}; do + einfo "Waiting for TCP port ${port} to become available" + if timeout 30 bash -c \ + 'until printf "" >/dev/tcp/${0}/${1} 2>> "${T}/portlog"; do sleep 1; done' \ + localhost "${port}"; then + continue + fi + + kill ${startbroker_pid} ${mqttsas_pid} + die "Timeout waiting for port ${port} to become available" + done + + local myctestargs=( + -j 1 + --timeout 600 + ) + cmake_src_test + + kill ${startbroker_pid} ${mqttsas_pid} || die +} diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest index 01dc91841c08..99a9b4fa9d11 100644 --- a/net-libs/phodav/Manifest +++ b/net-libs/phodav/Manifest @@ -1 +1 @@ -DIST phodav-2.5.tar.xz 62992 BLAKE2B aca0141c20c727dd27af3760caf27ec0f7a4936c3c35dbdb60a8a15b5bd75ebd97dfef8bb96f50b266d7a0e53fb8c0e21416dea855ff107b362dba0e89283a64 SHA512 4b6cd6a40118bf9c042abcfc3e7cb593b620922aae4dd3daf77682bf9da2030a0958bc0206531d5950f85551ef8f5da21fb21c54b9bd5e56b880f54e0983bc01 +DIST phodav-3.0.tar.xz 65728 BLAKE2B c7980fc9c8e5fe3034b16bbb6433d09b4365a5c50188476f4dfcb1d1ae32f4988c22933b4c811dbef44fe5fc4fbebcf6beb8e859a3c9d01fb7075336caaba8ca SHA512 a4720083fd581023ea78cc09e6df4b5d2f90894f916004cf28c7fa557da61d8c7a5539fa6b50647efcd9f771afd088889fdc40579a8e860c8ea20540b25eb26a diff --git a/net-libs/phodav/files/2.5-meson-Allow-specifying-systemd-udev-directories.patch b/net-libs/phodav/files/2.5-meson-Allow-specifying-systemd-udev-directories.patch deleted file mode 100644 index 87d4331d5397..000000000000 --- a/net-libs/phodav/files/2.5-meson-Allow-specifying-systemd-udev-directories.patch +++ /dev/null @@ -1,79 +0,0 @@ -https://gitlab.gnome.org/GNOME/phodav/-/merge_requests/19 - -From 5f6ca03ab91df31ede9a4435c63cf5af0ef50c06 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Mon, 3 May 2021 22:47:16 -0400 -Subject: [PATCH] meson: Allow specifying systemd/udev directories - -Closes: https://gitlab.gnome.org/GNOME/phodav/-/issues/1 ---- - data/meson.build | 24 ++++++++++++++++++------ - meson_options.txt | 12 ++++++------ - 2 files changed, 24 insertions(+), 12 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index c466030..26ad939 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,16 +1,28 @@ --systemd = dependency('systemd', required : get_option('systemd')) --if systemd.found() -+systemd_systemunitdir = get_option('systemdsystemunitdir') -+if systemd_systemunitdir == '' -+ systemd = dependency('systemd', required : false) -+ if systemd.found() -+ systemd_systemunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir') -+ endif -+endif -+if systemd_systemunitdir != '' - install_data( - 'spice-webdavd.service', -- install_dir : systemd.get_pkgconfig_variable('systemdsystemunitdir') -+ install_dir : systemd_systemunitdir - ) - endif - --udev = dependency('udev', required : get_option('udev')) --if udev.found() -+udev_rulesdir = get_option('udevrulesdir') -+if udev_rulesdir == '' -+ udev = dependency('udev', required : false) -+ if udev.found() -+ udev_rulesdir = '@0@/@1@'.format(udev.get_pkgconfig_variable('udevdir'), 'rules.d') -+ endif -+endif -+if udev_rulesdir != '' - install_data( - '70-spice-webdavd.rules', -- install_dir : '@0@/@1@'.format(udev.get_pkgconfig_variable('udevdir'), 'rules.d'), -+ install_dir : udev_rulesdir - ) - endif - -diff --git a/meson_options.txt b/meson_options.txt -index 724a0d3..1b075f5 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -6,13 +6,13 @@ option('avahi', - type : 'feature', - description : 'Build with avahi/mdns') - --option('systemd', -- type : 'feature', -- description : 'Install systemd units/configuration') -+option('systemdsystemunitdir', -+ type: 'string', -+ description: 'Directory for systemd system unit files') - --option('udev', -- type : 'feature', -- description : 'Install udev rules') -+option('udevrulesdir', -+ type : 'string', -+ description : 'Directory for udev rules') - - option('build-id', - type : 'integer', --- -2.26.3 - diff --git a/net-libs/phodav/metadata.xml b/net-libs/phodav/metadata.xml index 1e3e9e943cae..451e46cd137e 100644 --- a/net-libs/phodav/metadata.xml +++ b/net-libs/phodav/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/phodav</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/phodav/phodav-2.5.ebuild b/net-libs/phodav/phodav-3.0.ebuild index 6382a905ee93..8c52b964a838 100644 --- a/net-libs/phodav/phodav-2.5.ebuild +++ b/net-libs/phodav/phodav-3.0.ebuild @@ -1,38 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit gnome.org meson systemd udev DESCRIPTION="WebDav server implementation using libsoup" -HOMEPAGE="https://wiki.gnome.org/phodav" +HOMEPAGE="https://wiki.gnome.org/phodav https://gitlab.gnome.org/GNOME/phodav" LICENSE="LGPL-2.1+" -SLOT="2.0" -KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 x86" +SLOT="3.0" +KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86" IUSE="gtk-doc systemd test zeroconf" RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.51.2:2 - >=net-libs/libsoup-2.48:2.4 + >=net-libs/libsoup-3.0.0:3.0 dev-libs/libxml2 zeroconf? ( net-dns/avahi[dbus] ) + + !net-libs/phodav:2.0 " DEPEND="${RDEPEND}" BDEPEND=" app-text/asciidoc + app-text/docbook-xml-dtd:4.5 app-text/xmlto sys-devel/gettext virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) test? ( gnome-base/dconf ) " -PATCHES=( - "${FILESDIR}"/${PV}-meson-Allow-specifying-systemd-udev-directories.patch -) - src_prepare() { default @@ -59,3 +59,11 @@ src_install() { udev_dorules "${FILESDIR}/70-spice-webdavd.rules" fi } + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest index 048f8a59e96f..0082f1020d94 100644 --- a/net-libs/pjproject/Manifest +++ b/net-libs/pjproject/Manifest @@ -1 +1,2 @@ -DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa SHA512 a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893 +DIST pjproject-2.13.1.tar.gz 9746437 BLAKE2B a50278be52df755c5cec08da0c1a604a8c0ad6911853a424596ce05bc423a829818d2e7425b55bdc00fa24a91b9a3e891c54aa2add5cdbf8698173ac44ae2975 SHA512 1cdfaedafa2f42b306eef38174530163db19952c6842d5c96324c7439e2437a17cd96670ac58ae04da221b06d7eb91d612f4347cd421e036be62b27cb9501cda +DIST pjproject-2.13.tar.gz 9744716 BLAKE2B 947fe076089b3cd0826a554db3cda9939e228b9e7bb5ed2d01242e44e5e5b0d9d2ddc52b378f141efb89fcbfbd628fcdff341e54bc3615280e23f30ea58daf56 SHA512 df184511d554e5f77ca1a551bdf6b22c4c8ae2b6ad61be0e7e459e2d7db50f496af66c37e080f178019a509ea25847e70a342ac48c820a6b9302b4cbf174c520 diff --git a/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch b/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch deleted file mode 100644 index 0d7df686a157..000000000000 --- a/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 67e46c1ac45ad784db5b9080f5ed8b133c122872 Mon Sep 17 00:00:00 2001 -From: sauwming <ming@teluu.com> -Date: Mon, 8 Mar 2021 17:39:36 +0800 -Subject: [PATCH] Merge pull request from GHSA-8hcp-hm38-mfph - -* Check hostname during TLS transport selection - -* revision based on feedback - -* remove the code in create_request that has been moved ---- - pjsip/include/pjsip/sip_dialog.h | 1 + - pjsip/src/pjsip/sip_dialog.c | 15 +++++++++++++++ - pjsip/src/pjsip/sip_transport.c | 13 +++++++++++++ - pjsip/src/pjsip/sip_util.c | 11 ++++++++--- - 4 files changed, 37 insertions(+), 3 deletions(-) - -diff --git a/pjsip/include/pjsip/sip_dialog.h b/pjsip/include/pjsip/sip_dialog.h -index a0214d28c..e314c2ece 100644 ---- a/pjsip/include/pjsip/sip_dialog.h -+++ b/pjsip/include/pjsip/sip_dialog.h -@@ -165,6 +165,7 @@ struct pjsip_dialog - pjsip_route_hdr route_set; /**< Route set. */ - pj_bool_t route_set_frozen; /**< Route set has been set. */ - pjsip_auth_clt_sess auth_sess; /**< Client authentication session. */ -+ pj_str_t initial_dest;/**< Initial destination host. */ - - /** Session counter. */ - int sess_count; /**< Number of sessions. */ -diff --git a/pjsip/src/pjsip/sip_dialog.c b/pjsip/src/pjsip/sip_dialog.c -index 27530e4f2..9571b5a35 100644 ---- a/pjsip/src/pjsip/sip_dialog.c -+++ b/pjsip/src/pjsip/sip_dialog.c -@@ -467,6 +467,10 @@ pj_status_t create_uas_dialog( pjsip_user_agent *ua, - - /* Save the remote info. */ - pj_strdup(dlg->pool, &dlg->remote.info_str, &tmp); -+ -+ /* Save initial destination host from transport's info */ -+ pj_strdup(dlg->pool, &dlg->initial_dest, -+ &rdata->tp_info.transport->remote_name.host); - - - /* Init remote's contact from Contact header. -@@ -1192,6 +1196,12 @@ static pj_status_t dlg_create_request_throw( pjsip_dialog *dlg, - return status; - } - -+ /* Copy the initial destination host to tdata. This information can be -+ * used later by transport for transport selection. -+ */ -+ if (dlg->initial_dest.slen) -+ pj_strdup(tdata->pool, &tdata->dest_info.name, &dlg->initial_dest); -+ - /* Done. */ - *p_tdata = tdata; - -@@ -1822,6 +1832,11 @@ static void dlg_update_routeset(pjsip_dialog *dlg, const pjsip_rx_data *rdata) - * transaction as the initial transaction that establishes dialog. - */ - if (dlg->role == PJSIP_ROLE_UAC) { -+ /* Save initial destination host from transport's info. */ -+ if (!dlg->initial_dest.slen) { -+ pj_strdup(dlg->pool, &dlg->initial_dest, -+ &rdata->tp_info.transport->remote_name.host); -+ } - - /* Ignore subsequent request from remote */ - if (msg->type != PJSIP_RESPONSE_MSG) -diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c -index bef6d24fe..177274b08 100644 ---- a/pjsip/src/pjsip/sip_transport.c -+++ b/pjsip/src/pjsip/sip_transport.c -@@ -2335,6 +2335,19 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr, - if (!tp_iter->tp->is_shutdown && - !tp_iter->tp->is_destroying) - { -+ if ((type & PJSIP_TRANSPORT_SECURE) && tdata) { -+ /* For secure transport, make sure tdata's -+ * destination host matches the transport's -+ * remote host. -+ */ -+ if (pj_stricmp(&tdata->dest_info.name, -+ &tp_iter->tp->remote_name.host)) -+ { -+ tp_iter = tp_iter->next; -+ continue; -+ } -+ } -+ - if (sel && sel->type == PJSIP_TPSELECTOR_LISTENER && - sel->u.listener) - { -diff --git a/pjsip/src/pjsip/sip_util.c b/pjsip/src/pjsip/sip_util.c -index a1bf878ea..cf916805d 100644 ---- a/pjsip/src/pjsip/sip_util.c -+++ b/pjsip/src/pjsip/sip_util.c -@@ -1417,7 +1417,10 @@ PJ_DEF(pj_status_t) pjsip_endpt_send_request_stateless(pjsip_endpoint *endpt, - */ - if (tdata->dest_info.addr.count == 0) { - /* Copy the destination host name to TX data */ -- pj_strdup(tdata->pool, &tdata->dest_info.name, &dest_info.addr.host); -+ if (!tdata->dest_info.name.slen) { -+ pj_strdup(tdata->pool, &tdata->dest_info.name, -+ &dest_info.addr.host); -+ } - - pjsip_endpt_resolve( endpt, tdata->pool, &dest_info, stateless_data, - &stateless_send_resolver_callback); -@@ -1810,8 +1813,10 @@ PJ_DEF(pj_status_t) pjsip_endpt_send_response( pjsip_endpoint *endpt, - } - } else { - /* Copy the destination host name to TX data */ -- pj_strdup(tdata->pool, &tdata->dest_info.name, -- &res_addr->dst_host.addr.host); -+ if (!tdata->dest_info.name.slen) { -+ pj_strdup(tdata->pool, &tdata->dest_info.name, -+ &res_addr->dst_host.addr.host); -+ } - - pjsip_endpt_resolve(endpt, tdata->pool, &res_addr->dst_host, - send_state, &send_response_resolver_cb); --- -2.26.2 - diff --git a/net-libs/pjproject/files/pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch b/net-libs/pjproject/files/pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch deleted file mode 100644 index 9dc9016e491a..000000000000 --- a/net-libs/pjproject/files/pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 97b3d7addbaa720b7ddb0af9bf6f3e443e664365 Mon Sep 17 00:00:00 2001 -From: Nanang Izzuddin <nanang@teluu.com> -Date: Mon, 8 Mar 2021 16:09:34 +0700 -Subject: [PATCH] Merge pull request from GHSA-hvq6-f89p-frvp - ---- - pjmedia/src/pjmedia/sdp_neg.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c -index f4838f75d..9f76b5200 100644 ---- a/pjmedia/src/pjmedia/sdp_neg.c -+++ b/pjmedia/src/pjmedia/sdp_neg.c -@@ -304,7 +304,6 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2( - { - pjmedia_sdp_session *new_offer; - pjmedia_sdp_session *old_offer; -- char media_used[PJMEDIA_MAX_SDP_MEDIA]; - unsigned oi; /* old offer media index */ - pj_status_t status; - -@@ -323,8 +322,19 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2( - /* Change state to STATE_LOCAL_OFFER */ - neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER; - -+ /* When there is no active local SDP in state PJMEDIA_SDP_NEG_STATE_DONE, -+ * it means that the previous initial SDP nego must have been failed, -+ * so we'll just set the local SDP offer here. -+ */ -+ if (!neg->active_local_sdp) { -+ neg->initial_sdp_tmp = NULL; -+ neg->initial_sdp = pjmedia_sdp_session_clone(pool, local); -+ neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local); -+ -+ return PJ_SUCCESS; -+ } -+ - /* Init vars */ -- pj_bzero(media_used, sizeof(media_used)); - old_offer = neg->active_local_sdp; - new_offer = pjmedia_sdp_session_clone(pool, local); - --- -2.26.2 - diff --git a/net-libs/pjproject/files/pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch b/net-libs/pjproject/files/pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch deleted file mode 100644 index ba31cf19eda7..000000000000 --- a/net-libs/pjproject/files/pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch +++ /dev/null @@ -1,289 +0,0 @@ -From d5f95aa066f878b0aef6a64e60b61e8626e664cd Mon Sep 17 00:00:00 2001 -From: Nanang Izzuddin <nanang@teluu.com> -Date: Fri, 23 Jul 2021 10:49:21 +0700 -Subject: [PATCH] Merge pull request from GHSA-cv8x-p47p-99wr - -* - Avoid SSL socket parent/listener getting destroyed during handshake by increasing parent's reference count. -- Add missing SSL socket close when the newly accepted SSL socket is discarded in SIP TLS transport. - -* - Fix silly mistake: accepted active socket created without group lock in SSL socket. -- Replace assertion with normal validation check of SSL socket instance in OpenSSL verification callback (verify_cb()) to avoid crash, e.g: if somehow race condition with SSL socket destroy happens or OpenSSL application data index somehow gets corrupted. ---- - pjlib/src/pj/ssl_sock_imp_common.c | 47 +++++++++++++++++++++-------- - pjlib/src/pj/ssl_sock_ossl.c | 45 ++++++++++++++++++++++----- - pjsip/src/pjsip/sip_transport_tls.c | 23 +++++++++++++- - 3 files changed, 95 insertions(+), 20 deletions(-) - -diff --git a/pjlib/src/pj/ssl_sock_imp_common.c b/pjlib/src/pj/ssl_sock_imp_common.c -index 025832da4..24533b397 100644 ---- a/pjlib/src/pj/ssl_sock_imp_common.c -+++ b/pjlib/src/pj/ssl_sock_imp_common.c -@@ -255,6 +255,8 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock, - - /* Accepting */ - if (ssock->is_server) { -+ pj_bool_t ret = PJ_TRUE; -+ - if (status != PJ_SUCCESS) { - /* Handshake failed in accepting, destroy our self silently. */ - -@@ -272,6 +274,12 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock, - status); - } - -+ /* Decrement ref count of parent */ -+ if (ssock->parent->param.grp_lock) { -+ pj_grp_lock_dec_ref(ssock->parent->param.grp_lock); -+ ssock->parent = NULL; -+ } -+ - /* Originally, this is a workaround for ticket #985. However, - * a race condition may occur in multiple worker threads - * environment when we are destroying SSL objects while other -@@ -315,23 +323,29 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock, - - return PJ_FALSE; - } -+ - /* Notify application the newly accepted SSL socket */ - if (ssock->param.cb.on_accept_complete2) { -- pj_bool_t ret; - ret = (*ssock->param.cb.on_accept_complete2) - (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr, - pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr), - status); -- if (ret == PJ_FALSE) -- return PJ_FALSE; - } else if (ssock->param.cb.on_accept_complete) { -- pj_bool_t ret; - ret = (*ssock->param.cb.on_accept_complete) - (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr, - pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr)); -- if (ret == PJ_FALSE) -- return PJ_FALSE; - } -+ -+ /* Decrement ref count of parent and reset parent (we don't need it -+ * anymore, right?). -+ */ -+ if (ssock->parent->param.grp_lock) { -+ pj_grp_lock_dec_ref(ssock->parent->param.grp_lock); -+ ssock->parent = NULL; -+ } -+ -+ if (ret == PJ_FALSE) -+ return PJ_FALSE; - } - - /* Connecting */ -@@ -930,9 +944,13 @@ static pj_bool_t ssock_on_accept_complete (pj_ssl_sock_t *ssock_parent, - if (status != PJ_SUCCESS) - goto on_return; - -+ /* Set parent and add ref count (avoid parent destroy during handshake) */ -+ ssock->parent = ssock_parent; -+ if (ssock->parent->param.grp_lock) -+ pj_grp_lock_add_ref(ssock->parent->param.grp_lock); -+ - /* Update new SSL socket attributes */ - ssock->sock = newsock; -- ssock->parent = ssock_parent; - ssock->is_server = PJ_TRUE; - if (ssock_parent->cert) { - status = pj_ssl_sock_set_certificate(ssock, ssock->pool, -@@ -957,16 +975,20 @@ static pj_bool_t ssock_on_accept_complete (pj_ssl_sock_t *ssock_parent, - ssock->asock_rbuf = (void**)pj_pool_calloc(ssock->pool, - ssock->param.async_cnt, - sizeof(void*)); -- if (!ssock->asock_rbuf) -- return PJ_ENOMEM; -+ if (!ssock->asock_rbuf) { -+ status = PJ_ENOMEM; -+ goto on_return; -+ } - - for (i = 0; i<ssock->param.async_cnt; ++i) { - ssock->asock_rbuf[i] = (void*) pj_pool_alloc( - ssock->pool, - ssock->param.read_buffer_size + - sizeof(read_data_t*)); -- if (!ssock->asock_rbuf[i]) -- return PJ_ENOMEM; -+ if (!ssock->asock_rbuf[i]) { -+ status = PJ_ENOMEM; -+ goto on_return; -+ } - } - - /* If listener socket has group lock, automatically create group lock -@@ -980,7 +1002,7 @@ static pj_bool_t ssock_on_accept_complete (pj_ssl_sock_t *ssock_parent, - goto on_return; - - pj_grp_lock_add_ref(glock); -- asock_cfg.grp_lock = ssock->param.grp_lock = glock; -+ ssock->param.grp_lock = glock; - pj_grp_lock_add_handler(ssock->param.grp_lock, ssock->pool, ssock, - ssl_on_destroy); - } -@@ -1008,6 +1030,7 @@ static pj_bool_t ssock_on_accept_complete (pj_ssl_sock_t *ssock_parent, - - /* Create active socket */ - pj_activesock_cfg_default(&asock_cfg); -+ asock_cfg.grp_lock = ssock->param.grp_lock; - asock_cfg.async_cnt = ssock->param.async_cnt; - asock_cfg.concurrency = ssock->param.concurrency; - asock_cfg.whole_data = PJ_TRUE; -diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c -index 88a2a6b94..df4f4f96a 100644 ---- a/pjlib/src/pj/ssl_sock_ossl.c -+++ b/pjlib/src/pj/ssl_sock_ossl.c -@@ -327,7 +327,8 @@ static pj_status_t STATUS_FROM_SSL_ERR(char *action, pj_ssl_sock_t *ssock, - ERROR_LOG("STATUS_FROM_SSL_ERR", err, ssock); - } - -- ssock->last_err = err; -+ if (ssock) -+ ssock->last_err = err; - return GET_STATUS_FROM_SSL_ERR(err); - } - -@@ -344,7 +345,8 @@ static pj_status_t STATUS_FROM_SSL_ERR2(char *action, pj_ssl_sock_t *ssock, - /* Dig for more from OpenSSL error queue */ - SSLLogErrors(action, ret, err, len, ssock); - -- ssock->last_err = ssl_err; -+ if (ssock) -+ ssock->last_err = ssl_err; - return GET_STATUS_FROM_SSL_ERR(ssl_err); - } - -@@ -786,6 +788,13 @@ static pj_status_t init_openssl(void) - - /* Create OpenSSL application data index for SSL socket */ - sslsock_idx = SSL_get_ex_new_index(0, "SSL socket", NULL, NULL, NULL); -+ if (sslsock_idx == -1) { -+ status = STATUS_FROM_SSL_ERR2("Init", NULL, -1, ERR_get_error(), 0); -+ PJ_LOG(1,(THIS_FILE, -+ "Fatal error: failed to get application data index for " -+ "SSL socket")); -+ return status; -+ } - - #if defined(PJ_SSL_SOCK_OSSL_USE_THREAD_CB) && \ - PJ_SSL_SOCK_OSSL_USE_THREAD_CB != 0 && OPENSSL_VERSION_NUMBER < 0x10100000L -@@ -819,21 +828,36 @@ static int password_cb(char *buf, int num, int rwflag, void *user_data) - } - - --/* SSL password callback. */ -+/* SSL certificate verification result callback. -+ * Note that this callback seems to be always called from library worker -+ * thread, e.g: active socket on_read_complete callback, which should have -+ * already been equipped with race condition avoidance mechanism (should not -+ * be destroyed while callback is being invoked). -+ */ - static int verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx) - { -- pj_ssl_sock_t *ssock; -- SSL *ossl_ssl; -+ pj_ssl_sock_t *ssock = NULL; -+ SSL *ossl_ssl = NULL; - int err; - - /* Get SSL instance */ - ossl_ssl = X509_STORE_CTX_get_ex_data(x509_ctx, - SSL_get_ex_data_X509_STORE_CTX_idx()); -- pj_assert(ossl_ssl); -+ if (!ossl_ssl) { -+ PJ_LOG(1,(THIS_FILE, -+ "SSL verification callback failed to get SSL instance")); -+ goto on_return; -+ } - - /* Get SSL socket instance */ - ssock = SSL_get_ex_data(ossl_ssl, sslsock_idx); -- pj_assert(ssock); -+ if (!ssock) { -+ /* SSL socket may have been destroyed */ -+ PJ_LOG(1,(THIS_FILE, -+ "SSL verification callback failed to get SSL socket " -+ "instance (sslsock_idx=%d).", sslsock_idx)); -+ goto on_return; -+ } - - /* Store verification status */ - err = X509_STORE_CTX_get_error(x509_ctx); -@@ -911,6 +935,7 @@ static int verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx) - if (PJ_FALSE == ssock->param.verify_peer) - preverify_ok = 1; - -+on_return: - return preverify_ok; - } - -@@ -1474,6 +1499,12 @@ static void ssl_destroy(pj_ssl_sock_t *ssock) - static void ssl_reset_sock_state(pj_ssl_sock_t *ssock) - { - ossl_sock_t *ossock = (ossl_sock_t *)ssock; -+ -+ /* Detach from SSL instance */ -+ if (ossock->ossl_ssl) { -+ SSL_set_ex_data(ossock->ossl_ssl, sslsock_idx, NULL); -+ } -+ - /** - * Avoid calling SSL_shutdown() if handshake wasn't completed. - * OpenSSL 1.0.2f complains if SSL_shutdown() is called during an -diff --git a/pjsip/src/pjsip/sip_transport_tls.c b/pjsip/src/pjsip/sip_transport_tls.c -index 56a06cf99..24e43ef60 100644 ---- a/pjsip/src/pjsip/sip_transport_tls.c -+++ b/pjsip/src/pjsip/sip_transport_tls.c -@@ -1333,9 +1333,26 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock, - PJ_UNUSED_ARG(src_addr_len); - - listener = (struct tls_listener*) pj_ssl_sock_get_user_data(ssock); -+ if (!listener) { -+ /* Listener already destroyed, e.g: after TCP accept but before SSL -+ * handshake is completed. -+ */ -+ if (new_ssock && accept_status == PJ_SUCCESS) { -+ /* Close the SSL socket if the accept op is successful */ -+ PJ_LOG(4,(THIS_FILE, -+ "Incoming TLS connection from %s (sock=%d) is discarded " -+ "because listener is already destroyed", -+ pj_sockaddr_print(src_addr, addr, sizeof(addr), 3), -+ new_ssock)); -+ -+ pj_ssl_sock_close(new_ssock); -+ } -+ -+ return PJ_FALSE; -+ } - - if (accept_status != PJ_SUCCESS) { -- if (listener && listener->tls_setting.on_accept_fail_cb) { -+ if (listener->tls_setting.on_accept_fail_cb) { - pjsip_tls_on_accept_fail_param param; - pj_ssl_sock_info ssi; - -@@ -1358,6 +1375,8 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock, - PJ_ASSERT_RETURN(new_ssock, PJ_TRUE); - - if (!listener->is_registered) { -+ pj_ssl_sock_close(new_ssock); -+ - if (listener->tls_setting.on_accept_fail_cb) { - pjsip_tls_on_accept_fail_param param; - pj_bzero(¶m, sizeof(param)); -@@ -1409,6 +1428,8 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock, - ssl_info.grp_lock, &tls); - - if (status != PJ_SUCCESS) { -+ pj_ssl_sock_close(new_ssock); -+ - if (listener->tls_setting.on_accept_fail_cb) { - pjsip_tls_on_accept_fail_param param; - pj_bzero(¶m, sizeof(param)); --- -2.31.1 - diff --git a/net-libs/pjproject/files/pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch b/net-libs/pjproject/files/pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch deleted file mode 100644 index b036951d9edd..000000000000 --- a/net-libs/pjproject/files/pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 90a16c523bfdf4d43c10506c972c5fd4250b2856 Mon Sep 17 00:00:00 2001 -From: Nanang Izzuddin <nanang@teluu.com> -Date: Fri, 20 Nov 2020 10:52:22 +0700 -Subject: [PATCH] Race condition between transport destroy and acquire (#2470) - -* Handle race condition between transport_idle_callback() and pjsip_tpmgr_acquire_transport2(). -* Add transport destroy state check as additional of transport shutdown state check ---- - pjsip/src/pjsip/sip_transaction.c | 2 +- - pjsip/src/pjsip/sip_transport.c | 34 +++++++++++++++++++++++++------ - 2 files changed, 29 insertions(+), 7 deletions(-) - -diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c -index 2b4ece7df..f663c7f4b 100644 ---- a/pjsip/src/pjsip/sip_transaction.c -+++ b/pjsip/src/pjsip/sip_transaction.c -@@ -2443,7 +2443,7 @@ static void tsx_update_transport( pjsip_transaction *tsx, - pjsip_transport_add_ref(tp); - pjsip_transport_add_state_listener(tp, &tsx_tp_state_callback, tsx, - &tsx->tp_st_key); -- if (tp->is_shutdown) { -+ if (tp->is_shutdown || tp->is_destroying) { - pjsip_transport_state_info info; - - pj_bzero(&info, sizeof(info)); -diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c -index 06fce358c..bef6d24fe 100644 ---- a/pjsip/src/pjsip/sip_transport.c -+++ b/pjsip/src/pjsip/sip_transport.c -@@ -1071,6 +1071,19 @@ static void transport_idle_callback(pj_timer_heap_t *timer_heap, - return; - - entry->id = PJ_FALSE; -+ -+ /* Set is_destroying flag under transport manager mutex to avoid -+ * race condition with pjsip_tpmgr_acquire_transport2(). -+ */ -+ pj_lock_acquire(tp->tpmgr->lock); -+ if (pj_atomic_get(tp->ref_cnt) == 0) { -+ tp->is_destroying = PJ_TRUE; -+ } else { -+ pj_lock_release(tp->tpmgr->lock); -+ return; -+ } -+ pj_lock_release(tp->tpmgr->lock); -+ - pjsip_transport_destroy(tp); - } - -@@ -1392,8 +1405,8 @@ PJ_DEF(pj_status_t) pjsip_transport_shutdown2(pjsip_transport *tp, - mgr = tp->tpmgr; - pj_lock_acquire(mgr->lock); - -- /* Do nothing if transport is being shutdown already */ -- if (tp->is_shutdown) { -+ /* Do nothing if transport is being shutdown/destroyed already */ -+ if (tp->is_shutdown || tp->is_destroying) { - pj_lock_release(mgr->lock); - pj_lock_release(tp->lock); - return PJ_SUCCESS; -@@ -2256,6 +2269,13 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr, - return PJSIP_ETPNOTSUITABLE; - } - -+ /* Make sure the transport is not being destroyed */ -+ if (seltp->is_destroying) { -+ pj_lock_release(mgr->lock); -+ TRACE_((THIS_FILE,"Transport to be acquired is being destroyed")); -+ return PJ_ENOTFOUND; -+ } -+ - /* We could also verify that the destination address is reachable - * from this transport (i.e. both are equal), but if application - * has requested a specific transport to be used, assume that -@@ -2311,8 +2331,10 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr, - if (tp_entry) { - transport *tp_iter = tp_entry; - do { -- /* Don't use transport being shutdown */ -- if (!tp_iter->tp->is_shutdown) { -+ /* Don't use transport being shutdown/destroyed */ -+ if (!tp_iter->tp->is_shutdown && -+ !tp_iter->tp->is_destroying) -+ { - if (sel && sel->type == PJSIP_TPSELECTOR_LISTENER && - sel->u.listener) - { -@@ -2382,7 +2404,7 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr, - TRACE_((THIS_FILE, "Transport found but from different listener")); - } - -- if (tp_ref!=NULL && !tp_ref->is_shutdown) { -+ if (tp_ref!=NULL && !tp_ref->is_shutdown && !tp_ref->is_destroying) { - /* - * Transport found! - */ -@@ -2624,7 +2646,7 @@ PJ_DEF(pj_status_t) pjsip_transport_add_state_listener ( - - PJ_ASSERT_RETURN(tp && cb && key, PJ_EINVAL); - -- if (tp->is_shutdown) { -+ if (tp->is_shutdown || tp->is_destroying) { - *key = NULL; - return PJ_EINVALIDOP; - } --- -2.26.2 - diff --git a/net-libs/pjproject/files/pjproject-2.12.1-config_site.h b/net-libs/pjproject/files/pjproject-2.12.1-config_site.h new file mode 100644 index 000000000000..37d094e24bbc --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.12.1-config_site.h @@ -0,0 +1,97 @@ +/* + * Based off of the Asterisk config_site.h file. + * + * In general it's the same with some removals due to being ebuild-managed. + */ + +#include <sys/select.h> + +#define GENTOO_INVALID (Gentoo compile failure - please report a bug on bugs.gentoo.org) + +/* asterisk_malloc_debug.h is not required ... most of the operations are no-ops regardless + * and I can't see why asterisk is looking to compile this directly into pjproject */ + +/* + * Defining PJMEDIA_HAS_SRTP to 0 does NOT disable Asterisk's ability to use srtp. + * It only disables the pjmedia srtp transport which Asterisk doesn't use. + * The reason for the disable is that while Asterisk works fine with older libsrtp + * versions, newer versions of pjproject won't compile with them. + * + * Disabling this depends on an additional pjproject patch. So just leave it + * enabled for the time being, as it has always been enabled. + */ +#define PJMEDIA_HAS_SRTP 1 + +/* Ability to change this has ABI implications, force it on */ +/* Can be reconsidered in future: https://bugs.gentoo.org/680496 */ +#define PJ_HAS_IPV6 1 + +#define PJ_MAX_HOSTNAME (256) +#define PJSIP_MAX_URL_SIZE (512) +#ifdef PJ_HAS_LINUX_EPOLL +#define PJ_IOQUEUE_MAX_HANDLES (5000) +#else +#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE) +#endif +#define PJ_IOQUEUE_HAS_SAFE_UNREG 1 +#define PJ_IOQUEUE_MAX_EVENTS_IN_SINGLE_POLL (16) + +#define PJ_SCANNER_USE_BITWISE 0 +#define PJ_OS_HAS_CHECK_STACK 0 + +#ifndef PJ_LOG_MAX_LEVEL +#define PJ_LOG_MAX_LEVEL 6 +#endif + +#define PJ_ENABLE_EXTRA_CHECK 1 +#define PJSIP_MAX_TSX_COUNT ((64*1024)-1) +#define PJSIP_MAX_DIALOG_COUNT ((64*1024)-1) +#define PJSIP_UDP_SO_SNDBUF_SIZE (512*1024) +#define PJSIP_UDP_SO_RCVBUF_SIZE (512*1024) +#define PJ_DEBUG 0 +#define PJSIP_SAFE_MODULE 0 +#define PJ_HAS_STRICMP_ALNUM 0 + +/* + * Do not ever enable PJ_HASH_USE_OWN_TOLOWER because the algorithm is + * inconsistently used when calculating the hash value and doesn't + * convert the same characters as pj_tolower()/tolower(). Thus you + * can get different hash values if the string hashed has certain + * characters in it. (ASCII '@', '[', '\\', ']', '^', and '_') + */ +#undef PJ_HASH_USE_OWN_TOLOWER + +/* + It is imperative that PJSIP_UNESCAPE_IN_PLACE remain 0 or undefined. + Enabling it will result in SEGFAULTS when URIs containing escape sequences are encountered. +*/ +#undef PJSIP_UNESCAPE_IN_PLACE +#define PJSIP_MAX_PKT_LEN 65535 + +#undef PJ_TODO +#define PJ_TODO(x) + +/* Defaults too low for WebRTC */ +#define PJ_ICE_MAX_CAND 64 +#define PJ_ICE_MAX_CHECKS (PJ_ICE_MAX_CAND * PJ_ICE_MAX_CAND) + +/* Increase limits to allow more formats */ +#define PJMEDIA_MAX_SDP_FMT 64 +#define PJMEDIA_MAX_SDP_BANDW 4 +#define PJMEDIA_MAX_SDP_ATTR (PJMEDIA_MAX_SDP_FMT*3 + 4) +#define PJMEDIA_MAX_SDP_MEDIA 16 + +/* + * Turn off the periodic sending of CRLNCRLN. Default is on (90 seconds), + * which conflicts with the global section's keep_alive_interval option in + * pjsip.conf. + */ +#define PJSIP_TCP_KEEP_ALIVE_INTERVAL 0 +#define PJSIP_TLS_KEEP_ALIVE_INTERVAL 0 + +#define PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR 0 +#define PJ_SSL_SOCK_OSSL_USE_THREAD_CB 0 +#define PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER 1 + +/* Required to enable things like USE=video. */ +#define PJMEDIA_HAS_VIDEO GENTOO_INVALID diff --git a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch new file mode 100644 index 000000000000..bfd1fc05e160 --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch @@ -0,0 +1,95 @@ +From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001 +From: Nanang Izzuddin <nanang@teluu.com> +Date: Tue, 20 Dec 2022 11:39:12 +0700 +Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w + +* Fix buffer overread in STUN message decoder + +* Updates based on comments +--- + pjnath/include/pjnath/stun_msg.h | 4 ++++ + pjnath/src/pjnath/stun_msg.c | 14 +++++++++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h +index b52f95c586..e49f096f3a 100644 +--- a/pjnath/include/pjnath/stun_msg.h ++++ b/pjnath/include/pjnath/stun_msg.h +@@ -442,6 +442,7 @@ typedef enum pj_stun_status + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_msg_hdr + { + /** +@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr + pj_uint8_t tsx_id[12]; + + } pj_stun_msg_hdr; ++#pragma pack() + + + /** +@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_attr_hdr + { + /** +@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr + pj_uint16_t length; + + } pj_stun_attr_hdr; ++#pragma pack() + + + /** +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index 3def6b3eac..e904a0ba47 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr) + + #define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \ + (a)->hdr.length=(pj_uint16_t)(l) +-#define ATTR_HDR_LEN 4 ++#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr) + + static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) + { +@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + status = pj_stun_msg_check(pdu, pdu_len, options); + if (status != PJ_SUCCESS) + return status; ++ } else { ++ /* For safety, verify packet length at least */ ++ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20; ++ if (msg_len > pdu_len || ++ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len)) ++ { ++ return PJNATH_EINSTUNMSGLEN; ++ } + } + + /* Create the message, copy the header, and convert to host byte order */ +@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + p_response = NULL; + + /* Parse attributes */ +- while (pdu_len >= 4) { ++ while (pdu_len >= ATTR_HDR_LEN) { + unsigned attr_type, attr_val_len; + const struct attr_desc *adesc; + +@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + attr_val_len = (attr_val_len + 3) & (~3); + + /* Check length */ +- if (pdu_len < attr_val_len) { ++ if (pdu_len < attr_val_len + ATTR_HDR_LEN) { + pj_str_t err_msg; + char err_msg_buf[80]; + diff --git a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch new file mode 100644 index 000000000000..499ce4373b56 --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch @@ -0,0 +1,50 @@ +From bc4812d31a67d5e2f973fbfaf950d6118226cf36 Mon Sep 17 00:00:00 2001 +From: sauwming <ming@teluu.com> +Date: Fri, 23 Dec 2022 15:05:28 +0800 +Subject: [PATCH] Merge pull request from GHSA-cxwq-5g9x-x7fr + +* Fixed heap buffer overflow when parsing STUN errcode attribute + +* Also fixed uint parsing +--- + pjnath/src/pjnath/stun_msg.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index c6b0bdd284..b55d29849a 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -1438,12 +1438,12 @@ static pj_status_t decode_uint_attr(pj_pool_t *pool, + attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr); + GETATTRHDR(buf, &attr->hdr); + +- attr->value = GETVAL32H(buf, 4); +- + /* Check that the attribute length is valid */ + if (attr->hdr.length != 4) + return PJNATH_ESTUNINATTRLEN; + ++ attr->value = GETVAL32H(buf, 4); ++ + /* Done */ + *p_attr = attr; + +@@ -1757,14 +1757,15 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool, + attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr); + GETATTRHDR(buf, &attr->hdr); + ++ /* Check that the attribute length is valid */ ++ if (attr->hdr.length < 4) ++ return PJNATH_ESTUNINATTRLEN; ++ + attr->err_code = buf[6] * 100 + buf[7]; + + /* Get pointer to the string in the message */ + value.ptr = ((char*)buf + ATTR_HDR_LEN + 4); + value.slen = attr->hdr.length - 4; +- /* Make sure the length is never negative */ +- if (value.slen < 0) +- value.slen = 0; + + /* Copy the string to the attribute */ + pj_strdup(pool, &attr->reason, &value); diff --git a/net-libs/pjproject/files/pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch b/net-libs/pjproject/files/pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch new file mode 100644 index 000000000000..009060a124d8 --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch @@ -0,0 +1,46 @@ +From ac685b30c17be461b2bf5b46a772ed9742b8e985 Mon Sep 17 00:00:00 2001 +From: Riza Sulistyo <trengginas@users.noreply.github.com> +Date: Thu, 9 Feb 2023 13:19:23 +0700 +Subject: [PATCH] Make sure that NOTIFY tdata is set before sending it. + +--- + pjsip/src/pjsip-simple/evsub.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/pjsip/src/pjsip-simple/evsub.c b/pjsip/src/pjsip-simple/evsub.c +index da0a9b416..68c1d3951 100644 +--- a/pjsip/src/pjsip-simple/evsub.c ++++ b/pjsip/src/pjsip-simple/evsub.c +@@ -2216,23 +2216,26 @@ static void on_tsx_state_uas( pjsip_evsub *sub, pjsip_transaction *tsx, + } + + } else { + sub->state = old_state; + sub->state_str = old_state_str; + } + + /* Send the pending NOTIFY sent by app from inside + * on_rx_refresh() callback. + */ +- pj_assert(sub->pending_notify); +- status = pjsip_evsub_send_request(sub, sub->pending_notify); +- sub->pending_notify = NULL; ++ //pj_assert(sub->pending_notify); ++ /* Make sure that pending_notify is set. */ ++ if (sub->pending_notify) { ++ status = pjsip_evsub_send_request(sub, sub->pending_notify); ++ sub->pending_notify = NULL; ++ } + + } else if (pjsip_method_cmp(&tsx->method, &pjsip_notify_method)==0) { + + /* Handle authentication */ + if (tsx->state == PJSIP_TSX_STATE_COMPLETED && + (tsx->status_code==401 || tsx->status_code==407)) + { + pjsip_tx_data *tdata; + pj_status_t status; + pjsip_rx_data *rdata = event->body.tsx_state.src.rdata; +-- +2.39.1 + diff --git a/net-libs/pjproject/files/pjproject-2.13.1-fix-ptimesized-wav-input.patch b/net-libs/pjproject/files/pjproject-2.13.1-fix-ptimesized-wav-input.patch new file mode 100644 index 000000000000..9f1459f68d63 --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.13.1-fix-ptimesized-wav-input.patch @@ -0,0 +1,30 @@ +From dc4d4587cb8abe07513b9ae24cf62eaeeb6e8907 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon <jaco@uls.co.za> +Date: Wed, 14 Jun 2023 16:39:41 +0200 +Subject: [PATCH] Fix wave port creation if the input wave file contains + exactly one frame. + +If for example we try to load a file with ptime=10 and there is exactly +10 ms worth of PCM data in the wave file (160 bytes of PCM data) then +the buff_size will be adjusted down to be of a size that matches exactly +one frame, resulting in the check that the buffer size can hold at least +one frame failing due to comparing >= instead of >. + +Signed-off-by: Jaco Kroon <jaco@uls.co.za> +--- + pjmedia/src/pjmedia/wav_player.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pjmedia/src/pjmedia/wav_player.c b/pjmedia/src/pjmedia/wav_player.c +index 84ba53d50..410cf2627 100644 +--- a/pjmedia/src/pjmedia/wav_player.c ++++ b/pjmedia/src/pjmedia/wav_player.c +@@ -428,7 +428,7 @@ PJ_DEF(pj_status_t) pjmedia_wav_player_port_create( pj_pool_t *pool, + /* samples_per_frame must be smaller than bufsize (because get_frame() + * doesn't handle this case). + */ +- if (samples_per_frame * fport->bytes_per_sample >= fport->bufsize) { ++ if (samples_per_frame * fport->bytes_per_sample > fport->bufsize) { + pj_file_close(fport->fd); + return PJ_EINVAL; + } diff --git a/net-libs/pjproject/files/pjproject-2.9-config_site.h b/net-libs/pjproject/files/pjproject-2.13.1-r1-config_site.h index d41ac1d1947b..c2dd59149e9f 100644 --- a/net-libs/pjproject/files/pjproject-2.9-config_site.h +++ b/net-libs/pjproject/files/pjproject-2.13.1-r1-config_site.h @@ -6,10 +6,14 @@ #include <sys/select.h> -/* handled by ebuild, default to disabled here */ -#ifndef PJMEDIA_HAS_SRTP -#define PJMEDIA_HAS_SRTP 0 -#endif +#define GENTOO_INVALID (Gentoo compile failure - please report a bug on bugs.gentoo.org) + +/* asterisk_malloc_debug.h is not required ... most of the operations are no-ops regardless + * and I can't see why asterisk is looking to compile this directly into pjproject */ + +/* Ability to change this has ABI implications, force it on */ +/* Can be reconsidered in future: https://bugs.gentoo.org/680496 */ +#define PJ_HAS_IPV6 1 #define PJ_MAX_HOSTNAME (256) #define PJSIP_MAX_URL_SIZE (512) @@ -33,6 +37,7 @@ #define PJSIP_MAX_DIALOG_COUNT ((64*1024)-1) #define PJSIP_UDP_SO_SNDBUF_SIZE (512*1024) #define PJSIP_UDP_SO_RCVBUF_SIZE (512*1024) +#define PJ_DEBUG 0 #define PJSIP_SAFE_MODULE 0 #define PJ_HAS_STRICMP_ALNUM 0 @@ -50,19 +55,19 @@ Enabling it will result in SEGFAULTS when URIs containing escape sequences are encountered. */ #undef PJSIP_UNESCAPE_IN_PLACE -#define PJSIP_MAX_PKT_LEN 32000 +#define PJSIP_MAX_PKT_LEN 65535 #undef PJ_TODO #define PJ_TODO(x) /* Defaults too low for WebRTC */ -#define PJ_ICE_MAX_CAND 32 +#define PJ_ICE_MAX_CAND 64 #define PJ_ICE_MAX_CHECKS (PJ_ICE_MAX_CAND * PJ_ICE_MAX_CAND) /* Increase limits to allow more formats */ #define PJMEDIA_MAX_SDP_FMT 64 #define PJMEDIA_MAX_SDP_BANDW 4 -#define PJMEDIA_MAX_SDP_ATTR (PJMEDIA_MAX_SDP_FMT*2 + 4) +#define PJMEDIA_MAX_SDP_ATTR (PJMEDIA_MAX_SDP_FMT*3 + 4) #define PJMEDIA_MAX_SDP_MEDIA 16 /* @@ -72,3 +77,10 @@ */ #define PJSIP_TCP_KEEP_ALIVE_INTERVAL 0 #define PJSIP_TLS_KEEP_ALIVE_INTERVAL 0 + +#define PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR 0 +#define PJ_SSL_SOCK_OSSL_USE_THREAD_CB 0 +#define PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER 1 + +/* Required to enable things like USE=video. */ +#define PJMEDIA_HAS_VIDEO GENTOO_INVALID diff --git a/net-libs/pjproject/files/pjproject-2.9-ssl-enable.patch b/net-libs/pjproject/files/pjproject-2.9-ssl-enable.patch deleted file mode 100644 index bb8a11d7f457..000000000000 --- a/net-libs/pjproject/files/pjproject-2.9-ssl-enable.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 2942c73cd3b3389ec1a35258f22ac9d0f0742de1 Mon Sep 17 00:00:00 2001 -From: Jaco Kroon <jaco@iewc.co.za> -Date: Thu, 24 May 2018 15:40:33 +0200 -Subject: [PATCH] Fix support for --enable-ssl. - -This change enables the explicit use of --enable-ssl in such a way that -package managers such as portage (Gentoo) that explicitly does ---enable-ssl or --disable-ssl will get the results that it's looking -for. - -Without this specifying --enable-ssl would end up actually disabling it. - -Additionally, if --enable-ssl is specified but the script ends up being -unable to enable ssl it will fail. ---- - aconfigure | 16 ++++++++++++---- - aconfigure.ac | 15 ++++++++++++--- - 2 files changed, 24 insertions(+), 7 deletions(-) - -diff --git a/aconfigure b/aconfigure -index 0cf17faae..57bdfba87 100755 ---- a/aconfigure -+++ b/aconfigure -@@ -8001,8 +8001,9 @@ if test "${enable_ssl+set}" = set; then : - $as_echo "Checking if SSL support is disabled... yes" >&6; } - fi - --else -+fi - -+if test "x$ac_no_ssl" != "x1"; then - if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then - CFLAGS="$CFLAGS -I$with_ssl/include" - CPPFLAGS="$CPPFLAGS -I$with_ssl/include" -@@ -8317,16 +8318,23 @@ $as_echo "GnuTLS library found, SSL support enabled" >&6; } - - ac_ssl_backend="gnutls" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** No GnuTLS libraries found, disabling SSL support **" >&5 --$as_echo "** No GnuTLS libraries found, disabling SSL support **" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** No GnuTLS libraries found **" >&5 -+$as_echo "** No GnuTLS libraries found **" >&6; } - fi - - fi - -+ if test "x$ac_ssl_backend" = "x"; then -+ if test "x$enable_ssl" = "xyes"; then -+ as_fn_error $? "SSL Support requested but neither OpenSSL nor GnuTLS operational" "$LINENO" 5 -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: No SSL detected, disabling SSL support" >&5 -+$as_echo "No SSL detected, disabling SSL support" >&6; } -+ fi -+ fi - fi - - -- - # Check whether --with-opencore-amrnb was given. - if test "${with_opencore_amrnb+set}" = set; then : - withval=$with_opencore_amrnb; as_fn_error $? "This option is obsolete and replaced by --with-opencore-amr=DIR" "$LINENO" 5 -diff --git a/aconfigure.ac b/aconfigure.ac -index 8d7d944a1..45c42756b 100644 ---- a/aconfigure.ac -+++ b/aconfigure.ac -@@ -1607,7 +1607,8 @@ AC_ARG_ENABLE(ssl, - AC_MSG_RESULT([Checking if SSL support is disabled... yes]) - fi - ], -- [ -+ []) -+if test "x$ac_no_ssl" != "x1"; then - if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then - CFLAGS="$CFLAGS -I$with_ssl/include" - CPPFLAGS="$CPPFLAGS -I$with_ssl/include" -@@ -1692,11 +1693,19 @@ AC_ARG_ENABLE(ssl, - AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_GNUTLS) - ac_ssl_backend="gnutls" - else -- AC_MSG_RESULT([** No GnuTLS libraries found, disabling SSL support **]) -+ AC_MSG_RESULT([** No GnuTLS libraries found **]) - fi - - fi -- ]) -+ -+ if test "x$ac_ssl_backend" = "x"; then -+ if test "x$enable_ssl" = "xyes"; then -+ AC_MSG_ERROR([SSL Support requested but neither OpenSSL nor GnuTLS operational]) -+ else -+ AC_MSG_RESULT([No SSL detected, disabling SSL support]) -+ fi -+ fi -+fi - - dnl # Obsolete option --with-opencore-amrnb - AC_ARG_WITH(opencore-amrnb, --- -2.23.0 - diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml index 6e8f87fab911..b7d5dd9a9604 100644 --- a/net-libs/pjproject/metadata.xml +++ b/net-libs/pjproject/metadata.xml @@ -22,8 +22,12 @@ <flag name="openh264">Include Open H.264 support in the build</flag> <flag name="resample">Include resampling implementations in the build</flag> <flag name="silk">Include SILK support in the build</flag> + <flag name="srtp">Enable support for encrypted voice transmission (secure RTP)</flag> <flag name="v4l2">Include Video4Linux v2 support in the build</flag> <flag name="vpx">Include VP8 and VP9 codec support in the build</flag> <flag name="webrtc">Enable WebRTC support</flag> </use> + <upstream> + <remote-id type="github">pjsip/pjproject</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/pjproject/pjproject-2.10-r1.ebuild b/net-libs/pjproject/pjproject-2.13-r2.ebuild index 3db743937f47..a252ce354257 100644 --- a/net-libs/pjproject/pjproject-2.10-r1.ebuild +++ b/net-libs/pjproject/pjproject-2.13-r2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 - -EAPI=7 +# TODO: Figure out a way to disable SRTP from pjproject entirely. +EAPI=8 inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Open source SIP, Media, and NAT Traversal Library" -HOMEPAGE="https://www.pjsip.org/" +HOMEPAGE="https://github.com/pjsip/pjproject https://www.pjsip.org/" SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" @@ -17,19 +17,12 @@ SLOT="0/${PV}" CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16" VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx" SOUND_FLAGS="alsa portaudio" -IUSE="amr debug epoll examples ipv6 opus resample silk ssl static-libs webrtc +IUSE="amr debug epoll examples opus resample silk ssl static-libs webrtc ${CODEC_FLAGS} g729 ${VIDEO_FLAGS} ${SOUND_FLAGS}" -PATCHES=( - "${FILESDIR}/pjproject-2.9-ssl-enable.patch" - "${FILESDIR}/pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch" - "${FILESDIR}/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch" - "${FILESDIR}/pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch" -) - -RDEPEND="net-libs/libsrtp:= +RDEPEND=">=net-libs/libsrtp-2.3.0:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) @@ -40,7 +33,7 @@ RDEPEND="net-libs/libsrtp:= opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) - sdl? ( media-libs/libsdl ) + sdl? ( media-libs/libsdl2 ) speex? ( media-libs/speex media-libs/speexdsp @@ -52,13 +45,40 @@ RDEPEND="net-libs/libsrtp:= DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch" + "${FILESDIR}/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch" + "${FILESDIR}/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch" +) + src_prepare() { default rm configure || die "Unable to remove unwanted wrapper" mv aconfigure.ac configure.ac || die "Unable to rename configure script source" eautoreconf - cp "${FILESDIR}/pjproject-2.9-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h" + cp "${FILESDIR}/pjproject-2.12.1-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h" +} + +_pj_enable() { + usex "$1" '' "--disable-${2:-$1}" +} + +_pj_get_define() { + local r="$(sed -nre "s/^#define[[:space:]]+$1[[:space:]]+//p" "${S}/pjlib/include/pj/config_site.h")" + [[ -z "${r}" ]] && die "Unable to fine #define $1 in config_site.h" + echo "$r" +} + +_pj_set_define() { + local c=$(_pj_get_define "$1") + [[ "$c" = "$2" ]] && return 0 + sed -re "s/^#define[[:space:]]+$1[[:space:]].*/#define $1 $2/" -i "${S}/pjlib/include/pj/config_site.h" || die "sed failed updating $1 to $2." + [[ "$(_pj_get_define "$1")" != "$2" ]] && die "sed failed to perform update for $1 to $2." +} + +_pj_use_set_define() { + _pj_set_define "$2" $(usex "$1" 1 0) } src_configure() { @@ -67,40 +87,38 @@ src_configure() { local t use debug || append-cflags -DNDEBUG=1 - use ipv6 && append-cflags -DPJ_HAS_IPV6=1 - append-cflags -DPJMEDIA_HAS_SRTP=1 for t in ${CODEC_FLAGS}; do - myconf+=( $(use_enable ${t} ${t}-codec) ) + myconf+=( $(_pj_enable ${t} ${t}-codec) ) done - myconf+=( $(use_enable g729 bcg729) ) + myconf+=( $(_pj_enable g729 bcg729) ) for t in ${VIDEO_FLAGS}; do - myconf+=( $(use_enable ${t}) ) + myconf+=( $(_pj_enable ${t}) ) use "${t}" && videnable="--enable-video" done - [ "${videnable}" = "--enable-video" ] && append-cflags -DPJMEDIA_HAS_VIDEO=1 + [ "${videnable}" = "--enable-video" ] && _pj_set_define PJMEDIA_HAS_VIDEO 1 || _pj_set_define PJMEDIA_HAS_VIDEO 0 LD="$(tc-getCC)" econf \ --enable-shared \ --with-external-srtp \ ${videnable} \ - $(use_enable alsa sound) \ - $(use_enable amr opencore-amr) \ - $(use_enable epoll) \ - $(use_enable opus) \ - $(use_enable portaudio ext-sound) \ - $(use_enable resample libsamplerate) \ - $(use_enable resample resample-dll) \ - $(use_enable resample) \ - $(use_enable silk) \ - $(use_enable speex speex-aec) \ - $(use_enable ssl) \ + $(_pj_enable alsa sound) \ + $(_pj_enable amr opencore-amr) \ + $(_pj_enable epoll) \ + $(_pj_enable opus) \ + $(_pj_enable portaudio ext-sound) \ + $(_pj_enable resample libsamplerate) \ + $(_pj_enable resample resample-dll) \ + $(_pj_enable resample) \ + $(_pj_enable silk) \ + $(_pj_enable speex speex-aec) \ + $(_pj_enable ssl) \ + $(_pj_enable webrtc libwebrtc) \ $(use_with gsm external-gsm) \ $(use_with portaudio external-pa) \ $(use_with speex external-speex) \ - $(usex webrtc '' --disable-libwebrtc) \ "${myconf[@]}" } diff --git a/net-libs/pjproject/pjproject-2.13.1-r1.ebuild b/net-libs/pjproject/pjproject-2.13.1-r1.ebuild new file mode 100644 index 000000000000..3f1be2aecabd --- /dev/null +++ b/net-libs/pjproject/pjproject-2.13.1-r1.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# TODO: Figure out a way to disable SRTP from pjproject entirely. +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Open source SIP, Media, and NAT Traversal Library" +HOMEPAGE="https://github.com/pjsip/pjproject https://www.pjsip.org/" +SRC_URI="https://github.com/pjsip/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +LICENSE="GPL-2" +SLOT="0/${PV}" + +# g729 not included due to special bcg729 handling. +CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16" +VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx" +SOUND_FLAGS="alsa portaudio" +IUSE="amr debug epoll examples opus resample silk srtp ssl static-libs webrtc + ${CODEC_FLAGS} g729 + ${VIDEO_FLAGS} + ${SOUND_FLAGS}" + +RDEPEND=" + alsa? ( media-libs/alsa-lib ) + amr? ( media-libs/opencore-amr ) + ffmpeg? ( media-video/ffmpeg:= ) + g729? ( media-libs/bcg729 ) + gsm? ( media-sound/gsm ) + ilbc? ( media-libs/libilbc ) + openh264? ( media-libs/openh264 ) + opus? ( media-libs/opus ) + portaudio? ( media-libs/portaudio ) + resample? ( media-libs/libsamplerate ) + sdl? ( media-libs/libsdl2 ) + speex? ( + media-libs/speex + media-libs/speexdsp + ) + srtp? ( >=net-libs/libsrtp-2.3.0:= ) + ssl? ( dev-libs/openssl:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch" + "${FILESDIR}/pjproject-2.13.1-fix-ptimesized-wav-input.patch" +) + +src_prepare() { + default + rm configure || die "Unable to remove unwanted wrapper" + mv aconfigure.ac configure.ac || die "Unable to rename configure script source" + eautoreconf + + cp "${FILESDIR}/pjproject-2.13.1-r1-config_site.h" "${S}/pjlib/include/pj/config_site.h" \ + || die "Unable to create config_site.h" +} + +_pj_enable() { + usex "$1" '' "--disable-${2:-$1}" +} + +_pj_get_define() { + local r="$(sed -nre "s/^#define[[:space:]]+$1[[:space:]]+//p" "${S}/pjlib/include/pj/config_site.h")" + [[ -z "${r}" ]] && die "Unable to fine #define $1 in config_site.h" + echo "$r" +} + +_pj_set_define() { + local c=$(_pj_get_define "$1") + [[ "$c" = "$2" ]] && return 0 + sed -re "s/^#define[[:space:]]+$1[[:space:]].*/#define $1 $2/" -i "${S}/pjlib/include/pj/config_site.h" \ + || die "sed failed updating $1 to $2." + [[ "$(_pj_get_define "$1")" != "$2" ]] && die "sed failed to perform update for $1 to $2." +} + +_pj_use_set_define() { + _pj_set_define "$2" $(usex "$1" 1 0) +} + +src_configure() { + local myconf=() + local videnable="--disable-video" + local t + + use debug || append-cflags -DNDEBUG=1 + + for t in ${CODEC_FLAGS}; do + myconf+=( $(_pj_enable ${t} ${t}-codec) ) + done + myconf+=( $(_pj_enable g729 bcg729) ) + + for t in ${VIDEO_FLAGS}; do + myconf+=( $(_pj_enable ${t}) ) + use "${t}" && videnable="--enable-video" + done + + [ "${videnable}" = "--enable-video" ] && _pj_set_define PJMEDIA_HAS_VIDEO 1 || _pj_set_define PJMEDIA_HAS_VIDEO 0 + + LD="$(tc-getCC)" econf \ + --enable-shared \ + ${videnable} \ + $(_pj_enable alsa sound) \ + $(_pj_enable amr opencore-amr) \ + $(_pj_enable epoll) \ + $(_pj_enable opus) \ + $(_pj_enable portaudio ext-sound) \ + $(_pj_enable resample libsamplerate) \ + $(_pj_enable resample resample-dll) \ + $(_pj_enable resample) \ + $(_pj_enable silk) \ + $(_pj_enable speex speex-aec) \ + $(_pj_enable ssl) \ + $(_pj_enable webrtc libwebrtc) \ + $(use_with gsm external-gsm) \ + $(use_with portaudio external-pa) \ + $(use_with speex external-speex) \ + $(usex srtp --with-external-srtp --disable-libsrtp) \ + "${myconf[@]}" +} + +src_compile() { + emake dep LD="$(tc-getCC)" + emake LD="$(tc-getCC)" +} + +src_install() { + default + + newbin pjsip-apps/bin/pjsua-${CHOST} pjsua + newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest + + if use examples; then + insinto "/usr/share/doc/${PF}/examples" + doins -r pjsip-apps/src/samples + fi + + use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error removing static archives" +} diff --git a/net-libs/pjproject/pjproject-2.10-r2.ebuild b/net-libs/pjproject/pjproject-2.13.1.ebuild index c4474ea97453..ad7121f4bf01 100644 --- a/net-libs/pjproject/pjproject-2.10-r2.ebuild +++ b/net-libs/pjproject/pjproject-2.13.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 - -EAPI=7 +# TODO: Figure out a way to disable SRTP from pjproject entirely. +EAPI=8 inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Open source SIP, Media, and NAT Traversal Library" -HOMEPAGE="https://www.pjsip.org/" -SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/pjsip/pjproject https://www.pjsip.org/" +SRC_URI="https://github.com/pjsip/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" LICENSE="GPL-2" @@ -17,20 +17,12 @@ SLOT="0/${PV}" CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16" VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx" SOUND_FLAGS="alsa portaudio" -IUSE="amr debug epoll examples ipv6 opus resample silk ssl static-libs webrtc +IUSE="amr debug epoll examples opus resample silk ssl static-libs webrtc ${CODEC_FLAGS} g729 ${VIDEO_FLAGS} ${SOUND_FLAGS}" -PATCHES=( - "${FILESDIR}/pjproject-2.9-ssl-enable.patch" - "${FILESDIR}/pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch" - "${FILESDIR}/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch" - "${FILESDIR}/pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch" - "${FILESDIR}/pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch" -) - -RDEPEND="net-libs/libsrtp:= +RDEPEND=">=net-libs/libsrtp-2.3.0:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) @@ -41,7 +33,7 @@ RDEPEND="net-libs/libsrtp:= opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) - sdl? ( media-libs/libsdl ) + sdl? ( media-libs/libsdl2 ) speex? ( media-libs/speex media-libs/speexdsp @@ -53,13 +45,41 @@ RDEPEND="net-libs/libsrtp:= DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch" + "${FILESDIR}/pjproject-2.13.1-fix-ptimesized-wav-input.patch" +) + src_prepare() { default rm configure || die "Unable to remove unwanted wrapper" mv aconfigure.ac configure.ac || die "Unable to rename configure script source" eautoreconf - cp "${FILESDIR}/pjproject-2.9-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h" + cp "${FILESDIR}/pjproject-2.12.1-config_site.h" "${S}/pjlib/include/pj/config_site.h" \ + || die "Unable to create config_site.h" +} + +_pj_enable() { + usex "$1" '' "--disable-${2:-$1}" +} + +_pj_get_define() { + local r="$(sed -nre "s/^#define[[:space:]]+$1[[:space:]]+//p" "${S}/pjlib/include/pj/config_site.h")" + [[ -z "${r}" ]] && die "Unable to fine #define $1 in config_site.h" + echo "$r" +} + +_pj_set_define() { + local c=$(_pj_get_define "$1") + [[ "$c" = "$2" ]] && return 0 + sed -re "s/^#define[[:space:]]+$1[[:space:]].*/#define $1 $2/" -i "${S}/pjlib/include/pj/config_site.h" \ + || die "sed failed updating $1 to $2." + [[ "$(_pj_get_define "$1")" != "$2" ]] && die "sed failed to perform update for $1 to $2." +} + +_pj_use_set_define() { + _pj_set_define "$2" $(usex "$1" 1 0) } src_configure() { @@ -68,40 +88,38 @@ src_configure() { local t use debug || append-cflags -DNDEBUG=1 - use ipv6 && append-cflags -DPJ_HAS_IPV6=1 - append-cflags -DPJMEDIA_HAS_SRTP=1 for t in ${CODEC_FLAGS}; do - myconf+=( $(use_enable ${t} ${t}-codec) ) + myconf+=( $(_pj_enable ${t} ${t}-codec) ) done - myconf+=( $(use_enable g729 bcg729) ) + myconf+=( $(_pj_enable g729 bcg729) ) for t in ${VIDEO_FLAGS}; do - myconf+=( $(use_enable ${t}) ) + myconf+=( $(_pj_enable ${t}) ) use "${t}" && videnable="--enable-video" done - [ "${videnable}" = "--enable-video" ] && append-cflags -DPJMEDIA_HAS_VIDEO=1 + [ "${videnable}" = "--enable-video" ] && _pj_set_define PJMEDIA_HAS_VIDEO 1 || _pj_set_define PJMEDIA_HAS_VIDEO 0 LD="$(tc-getCC)" econf \ --enable-shared \ --with-external-srtp \ ${videnable} \ - $(use_enable alsa sound) \ - $(use_enable amr opencore-amr) \ - $(use_enable epoll) \ - $(use_enable opus) \ - $(use_enable portaudio ext-sound) \ - $(use_enable resample libsamplerate) \ - $(use_enable resample resample-dll) \ - $(use_enable resample) \ - $(use_enable silk) \ - $(use_enable speex speex-aec) \ - $(use_enable ssl) \ + $(_pj_enable alsa sound) \ + $(_pj_enable amr opencore-amr) \ + $(_pj_enable epoll) \ + $(_pj_enable opus) \ + $(_pj_enable portaudio ext-sound) \ + $(_pj_enable resample libsamplerate) \ + $(_pj_enable resample resample-dll) \ + $(_pj_enable resample) \ + $(_pj_enable silk) \ + $(_pj_enable speex speex-aec) \ + $(_pj_enable ssl) \ + $(_pj_enable webrtc libwebrtc) \ $(use_with gsm external-gsm) \ $(use_with portaudio external-pa) \ $(use_with speex external-speex) \ - $(usex webrtc '' --disable-libwebrtc) \ "${myconf[@]}" } diff --git a/net-libs/ppp-defs/files/ppp_defs.h b/net-libs/ppp-defs/files/ppp_defs.h new file mode 100644 index 000000000000..c8be812168c1 --- /dev/null +++ b/net-libs/ppp-defs/files/ppp_defs.h @@ -0,0 +1,6 @@ +#ifndef _NET_PPP_DEFS_H +#define _NET_PPP_DEFS_H 1 + +#include <linux/ppp_defs.h> + +#endif /* net/ppp_defs.h */ diff --git a/net-libs/telepathy-accounts-signon/metadata.xml b/net-libs/ppp-defs/metadata.xml index 8641e5bdd399..6b00211d29ea 100644 --- a/net-libs/telepathy-accounts-signon/metadata.xml +++ b/net-libs/ppp-defs/metadata.xml @@ -2,7 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> + <email>musl@gentoo.org</email> </maintainer> </pkgmetadata> diff --git a/net-libs/ppp-defs/ppp-defs-0.ebuild b/net-libs/ppp-defs/ppp-defs-0.ebuild new file mode 100644 index 000000000000..f3f93b109e31 --- /dev/null +++ b/net-libs/ppp-defs/ppp-defs-0.ebuild @@ -0,0 +1,20 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Shim header for net/ppp_defs.h on musl" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Musl" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86" + +RDEPEND="!sys-libs/glibc" + +S=${WORKDIR} + +src_install() { + insinto /usr/include/net + doins "${FILESDIR}/ppp_defs.h" +} diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest index 3138acf9410f..2eff78c012e0 100644 --- a/net-libs/quiche/Manifest +++ b/net-libs/quiche/Manifest @@ -1,42 +1,32 @@ -DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24 -DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00 -DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1 +DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 +DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 +DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c1dbd0e2b808be332bfba5783f40d66e46b2148a677ec61ed89f73bf2db04ebb6d43c8b395162177181d2094 SHA512 362a22854f90032f407875ee3687287f2c9c87e3b462e808219e0fd4d3067ad245544d1b6f38b3130d824af77390a331ac0b5a918498ee6c6b401fc8d0292ccc -DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464bd62e2d377cd378f4faa13078244afc53284bf2838ea0f62802801961d6915f202eea951a8792e9fe825424be9 SHA512 6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4 +DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 -DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3 -DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b +DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0 -DIST bindgen-0.57.0.crate 199132 BLAKE2B ed5d73da72116acca0124770f6f8e162c161c3375980505a704d3fc73ad20fc8cd81ce59680deb4922def8737914027c1c1e2c9fb4b181ddf114a08522657b62 SHA512 a4bf376aa0f84e625f4c5eed7bdc9775549b0ab9e9edcee708d8b56df6cb49611b7093692e772ed7ad5adb1c3d8055d81b4ff19359a193a5bfb4b200ca8a26a8 -DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b +DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 +DIST bindgen-0.68.1.crate 218997 BLAKE2B e3706a992c166c16cd8b8ef996b2eba6a0d67f493825e7257ba660f597de33002a32df7fea0fc2508fb47155f70ace0765e9ac4e4649d1f24b2bbac8ecf06d8f SHA512 29520e30db93ef3e239273854c926eba7bbbe2ec70e5162a4722e03947461510732319bfcfc20d5dfc0df137d69e8c1ad97daa0236c5bd4da8a1679bfd696a90 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 -DIST boring-sys-1.0.2.crate 3121250 BLAKE2B f38c29c9c28a000ffea914e94b7a6284f20d50395a0819f1c7a17230399bc0858054d4ecbc3568e533961faadfecef60cdd13413314d15395165a2ab9e2d24e5 SHA512 b64066d8edd93be7eacb4d3811f960470389cef339c9488a8ace46ce15feed9e147662316bf497a231a07bc86402693897a33432a7b922a3e073f208dd4dbc80 -DIST boring-sys-1.1.1.crate 3301658 BLAKE2B bbc064d2dc0b888e4427702fa15b9123a85f8aac045404ce70fef1d7994ac8d640f9155245c63b4b9489e9c4f7071a4585c62abe23351b8acf9a296a8b9841ae SHA512 23fbcf459c6b7e0023fd572b810de246d4e4e164ca0375b205deba1107a038c167364becaebac44856dd0f8057c72ea3b335fba820ddb8334b4faafb22b38e78 +DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9 +DIST boring-4.6.0.crate 187355 BLAKE2B f3d8b9087351a742686839ee678c97fed25205fc6a2a57d7e23303230b94029472effbc3da00bb32701e0fb43c6081554048fe618554658fab0b91ac8977ae4f SHA512 8dde700cd043a9ade1a062c5021268a02ba128f85c932b92b867cd6a78c789b5c8549d7590d0a8dadc1f272ec44a4a1f707aa98cc38e1027f318527fbedb5f0c +DIST boring-sys-4.6.0.crate 7087060 BLAKE2B 1fbbc360ba9262b544052ad96a92f3bf7dacb5ab13d4816579bd279fd1d131a473f92926b261aafb8335bd00d2332bdb5145500d92b263524c37d87857c2b933 SHA512 7a44e6188c2a437223ee5812054118247bdfda21d2f568095dd8ec7896ab50f9ee2c137e8294579f687c162c583ed7bb8d64ecdc8867694c78506b89f57e4542 DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89 -DIST bumpalo-3.4.0.crate 129102 BLAKE2B b585c8d682acf555cbe695dfe150074e4afb1620736f28b29567070e445a12293b460d3c85ff88979abfc74fe7453010ebbcfd64bb2b2d575258d51fab2b1400 SHA512 955e49eeeb803547092b58c086a2582e905578179d93500c1f55dd3fb7a65349f33ddc4c2710c0ee804abbe4e1f2afbdeb998533d362177298a86a4f9a8822a5 -DIST bumpalo-3.6.0.crate 133234 BLAKE2B e59b65a7b3ff3a7a6d2a91c80d16b169dd974a0293e65ef34b5249530e2a6e038bcf56e1c0886e4cd303179a7bcf6302d109136b226cc5776b6451a3eea32b94 SHA512 d7a6d69e1641cc1a120ca64a72e241864288112f5b051973f404bc409be0d77254cd8b31116a508bd8b025b4617cd2ed9ea67f25c3fb9dc5863bbecf436d9761 -DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866 -DIST bumpalo-3.7.0.crate 134261 BLAKE2B 15c4944abc803537c57076dfa8f5fb4b59949909450edd9e043a6cd438ddd227820e20e95236324c06e40cb27ec1e4d958bebf3d38df90f0723b8e30df79b6ef SHA512 0b570e1baee530b5c3f775330ead7cf5f8878eab75e5a6a61b5d3f64d4d82912cb26de1c098ec9492c29c7a04fc49565db97a54373c546d8ef58aab276d77c59 -DIST bumpalo-3.7.1.crate 78573 BLAKE2B 2bd6c041a703033e0214746c087f3f505853596ff37b5abc04323b45721346c66f6b867387adb000b3cad80eec3661afb008f75d7cdd4e7328e730ed36e926c8 SHA512 879bc0993d8ac18cc7af87276aaf7aa042bdaca338c8cc766d5a1822c5675c1852b97467da0f6d5f4721213e3781a195e143b73d21e02ce11600e13e147e943b +DIST bumpalo-3.15.4.crate 85028 BLAKE2B 9ec98f430fef4e9b59e61d413b3703430f91bc818f3294aea7416cf8a35e0606357bb5b4d1edebe590f07fb614f832da16016c8530ff39ca853aff1d1369cc60 SHA512 59ca9f8e6b74bdd95b9b4ad1bff3bf4be46dacedeb1eea6196a65dfb0ca7b60e86ab6c25d0f91dae3caecd17ab73c48f953be0bc24bdc0ceaaf4c1726b9ffdc8 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0 -DIST cc-1.0.58.crate 52896 BLAKE2B 118619bbe306aef5cb83350ea04a7660a4af2c365a5f0c30d045cdca73f7d68d6646889295590dff29cbf003b44f9b00d5eab22fcde8a57483aec615278dfbb8 SHA512 0a208c4dd7700ba92337ad0044c0ae1614b105d6e799fc660d07e7745c60d8e4c8d3688af7ced77734a2a695ac2e7c565c2f2b7a886d71714c2f7675ea2a22f7 -DIST cc-1.0.61.crate 53454 BLAKE2B 250a847faed1e7ae0a7d3d0f15511222a8cae499aed1e6736d65234d6915cd64abf0b01df5bcc38ff2800902854ed57b297fea2c63d41a480b02cb07863a7490 SHA512 c238590712c5359040ff9670fb60690d983b1a2aa53ab7031f552b4eb026c9e305f401ade77ee389eff90dbadfed6eb1978f67bfa143589a0e0ccf39edafb5d6 -DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e -DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05 -DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c -DIST cc-1.0.70.crate 57200 BLAKE2B 196b0435c8a521a02e9877ed3ff81fbefa88cd56717556776b46366bad1835bff134a1b4fc4e31ee5497600e98d1031119d0973b420cf16aece1ff18fbdcd1bc SHA512 9158eabcb9405fa2ef41fb120821ddaa2e5c7234c02d5cfbb5b59570f7de393d1fa33942ca52f86bf9271765b3df934debdea89e7563cbfe193dc01b2dcd72f9 -DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37 +DIST cc-1.0.94.crate 76456 BLAKE2B bf72e0007d9fe022a66ccc12be48acbc5dd1b716a47f18e4062b415405140764db6ed26bcab071307142167309c9c9ab55382c7973ad43fd15d06e3fe6b24b69 SHA512 67ce0e73904cf7fac81b0b914ec5fd4d9e59f358602199530f51d203a2e42be9814b04f65497a644a0e2720cc6e58c5e4bf1ad4782ded35b710b22c9b0f2bee5 +DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST clang-sys-1.2.0.crate 36874 BLAKE2B ff4bb39ae79280632aae404566ccde614e059d0a04aeeed1475080755fb07853da63353343b0ad66d97588679f461c7f5e5f69b753372174799c52ee7fc3e7d0 SHA512 64577b5f82878ff465eee0bd5f154522640e9bae7e6d52c1c8b868412a2297ded69b104b85b7ca6b6031d6a6eef60579933cb6502bb7342af1f9aa593428a256 -DIST clang-sys-1.2.2.crate 37661 BLAKE2B cbf637171253aca4892270e28c54c43b01cd1d56311555bd6c5e6b142b5f42d561a2808e1ce0baee344d08a2fbc19be1712ca34bbc5b33356a845042ba0df5bd SHA512 7f1736bce5dbc644a4901a73926ea2f6a92a419a7399b6cb49bf8ffed6a3177e9327add6e68fdf6b9966f4b0b580b213555d6cefbe194ad7a4bee987adf555e5 -DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 +DIST chrono-0.4.35.crate 234267 BLAKE2B 92552b9c8fb40160de9ee62ed8c5bea12bf8bae393caf91c1c64596d6b2efd09dce94355fb757ed46eaf4a13d27ee3ebb43af91e2d8c26df1f9a9f429869f319 SHA512 aed8bc3298c8f8dd8146c6a919610b6dda52c038a28b56c837a21590e41fda605cd466dc1b85e407f365e116d741cb82afbeff5d29f95f3f5bce4a62abf80812 +DIST clang-sys-1.7.0.crate 42088 BLAKE2B d1ed314a910c1b676eb780fc1c96f5ac391217ec135480d0a91b11d6f447ad06484b48966ae99115e35d921a506caf6aa7ffbc4ed86aa64367dca321678cfd7d SHA512 e544984d5bd76824ea2093f43f98b59a99e1ca8a5de40e49164b870ed4a91a530f3492faf0678190b91e74aa5d122bdbb32c649998d0ce24912dfb0b83ed6b81 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf -DIST cmake-0.1.44.crate 14377 BLAKE2B 5922b7dd8618e7982064fd754b1ee54941a4555961bbc832da6fb149afa1317951e4ab710f2a13856aee6af18bfd9612514dc56e795a013c8d4094c8be1fca11 SHA512 7adeb6289fb1072aa739b4f6bbe91f612fbab730c3ea67b6024a31ebfe3fadb2da798495ddabd5cbaaa1106bc4ae185b350f618eca3a72de4ea0a4d526664657 -DIST cmake-0.1.45.crate 14375 BLAKE2B aaeb4b910087bcc735f2cef65fb46184de3c3181add90715ec709c3162c081cc506ed4c7f4f3e6ed6d76aef8213ce80b9b865b2e737166b498a50b60acb7c83b SHA512 7de4ae0c3a50806f2b060e145948be6c6dd0db3975b626e0432301f454612fb7bc7fd2f4549529deaf7a1a55063a11dd553efb59a9dd5aa61ede5e63371d6b2d +DIST cmake-0.1.50.crate 16748 BLAKE2B cd3b131fbc27764e15fcefdac31f97a9d12f82ac9758b2aad256ccb371ce3e2db8aed3c76fbf4816df3483dad9fffe9973940ced65be6d31463d8c059c543646 SHA512 868d5cece75d79382ac6176aabde1723bb7e26dc745383a636516ff45856dc9187fe5a83e139f17e3bb0c114624e9e71b93c8a460b89b8facbafbca50d1d0923 +DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100 DIST criterion-0.3.1.crate 95450 BLAKE2B d63477b414176eb3b49857b6a6e3f1e30d72e95856756051974bb99289082315bde362dd39254a766480e167707a147b621ae84a887243ece6f865ba784a9210 SHA512 c6beae7350029632206cd201faf3e9aa16fae39e96b9256b702cb4c09b013be88280b2e8b87ec2790c386be8ef6f9e9179482655f3af3ec9e34f8b402fe8bec9 DIST criterion-plot-0.4.1.crate 17185 BLAKE2B 106f956a32ab2a0f274882e2cf5707c9763e16ca9e98d2bda2ac92520a9dbff46ff4748f4b14417ccbc288b48fc527ffb9810c3cbcd50c1744975ed2e998c148 SHA512 910ee12c373b2003be314a495d162eeec2b6c5d54fa80f3cd31f5b5ef4a5c1c32181ff0744dccd522ca2e5e501a88cf4c56b231f8eb9b2f2732707eb82f98c39 DIST crossbeam-deque-0.7.3.crate 19888 BLAKE2B f83e6915624ed8d01e56ad28e0a40e84732d820fd07f0f0fa4aac9578aed0f4a980bdcd64d29811be2b5055f28135403faf091b902dd4c800d6d736452ab03d0 SHA512 7c6a42643b2eda7ffbe2d485de4d3723c6a37beaf77e81329e39c9300a80492ef46650fe5a6b18101d3f6b4ed031ddb06174624f5449998ec3a7808e979df131 @@ -45,241 +35,154 @@ DIST crossbeam-queue-0.2.1.crate 14543 BLAKE2B 0decf8fc19f33912d129eb73ac981142e DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3 DIST csv-1.1.3.crate 890849 BLAKE2B 4d5fcc75f693a7e5f224866c626f3e65c6af66c8f0c13bf7d3d5fddb31a5078c47b195c3e1068ebdb81a5cdfbd716db649b5f2f3e3ffbb4471bbd0176c3c7b5e SHA512 2e5319b50cdb96f85c129743c0ecfc23638713113641608b817e47ac34c6f9767079b98405808a387a8a870d52c44e858aea98b91126e5d996d4d3efecbab713 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328 -DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15 -DIST darling-0.12.3.crate 18933 BLAKE2B 1f817e2f32b8fc6459cec4f05933ad734720ade175c9cd44767b3351f1c07f2a66dedf1c3ce40c14b30d2c18204355d6a2ad65b819c4ead143b4d26b1e6fbd17 SHA512 1e986c70d629e14d67ffee4e9ec1520c04f6f27599dc3a2df3312ace3ef81f435bff9a8573badb8385bddee188db8eaefa35f562fb83a14269e82c4a425eade0 -DIST darling-0.13.0.crate 19181 BLAKE2B 7880218ff592fb8e0790e7d39695424c7ef942f8f35ee8e06be914da7749b9be54a19bf9de6b5d2cb43e4c76f914fbf594282966099d1cb9ad54e01a01264be6 SHA512 89894f4004f102d2f889a1adbcc79bf3cb96fbe09e6e8bb4233df196367174b626bf5ecce53627a2ec8a6abb251bf027054d39b9b91d799a9d4c1e1c3da4cd96 -DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9 -DIST darling_core-0.12.3.crate 49266 BLAKE2B d6286b82db56ebf63d0025b9298eb6cffac91166e90a785ceca4f3785f3c8589f8070a1c96242a3b482c4225f4530cebd34503483ae5b38d83848aae5b6c4bcf SHA512 279e3bf0f3cdd39ce68d6fdc80ab9e390353d2572887d6a25f4659d24dafd962bcd204f047fe19f8216acf08fe1bb2feeccc7c416df795e2d0f3d0fdcb82e9a3 -DIST darling_core-0.13.0.crate 49969 BLAKE2B a8a26a6b272b00a06d17585edee07d8a3a5a5c7a7a84a389a0fb31b60f9526bf79d5e2e69625f9014cd286657507a268e4a2ff25230cdfaddacfc23a1af234f0 SHA512 b97ebc4cec09aaf1a3ff6773bf312c94889522ca21573271d459c51942c57b71e104993c1b723ad122edfe49c0d029ea27234f07daeb50b5cd36f007ab57bb39 -DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152 -DIST darling_macro-0.12.3.crate 1866 BLAKE2B 766fd2d30dffb53553036df283c3cf95c0f472654c222ab44fd9bfe2936ebb688e16ef937990625d1dac2613a689770fb61485f7f9f60b19c71889f1edd044a9 SHA512 e55d05676b9751e5c067d736f3e2446c1d751d8a24607d5bd5d494d660aa474485fb5f781ce1dfc739061683aa4fbf912c12f839869e4ae26d49f385da9bfdf6 -DIST darling_macro-0.13.0.crate 1915 BLAKE2B 15572e0e3d8122d5dc02929decd93338082d9639d7c5c103aaa04da1620a941333ed35a7d8fdad94bdff6b11d412d31c4cd61e56a41bc0b3f9403d8eefdb7d76 SHA512 a8f96d3f84b1a121b3991b09e262dfacaf3023bcca1143a269ed6b9528c903db1ebb67b9858028e50cfa547c1f9644676ebc9c085d05219f9dca06b24354c9f6 -DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2 -DIST env_logger-0.8.3.crate 32543 BLAKE2B 513790f39c63eb096b0fb62687c74262b42b0edc3e6fc2e2f2fdd44463eb4cfbf67560136ec206e252afa1477fabf66917f4fc0e8192e040670f98f3d7c4bb51 SHA512 7f6c3c79b8f4efb8d1d4e4b879c1c78a427f15669244ce1eca869aea9bcad950ffa5b59f3f8e4513e085c2daf1f5857313b374e238fc78b731bba2646ec895ff +DIST darling-0.20.8.crate 31234 BLAKE2B 13e8ec124715f743486d740241273fa5ff046b5ede86c39ad5413b3e767166dd90e7ba7344a69c1e14991f0572f7ffa24b081ef54236712c5286f211fcfbafd2 SHA512 2b4cf37cf7cce9af8e93f576dcf36b539816e1ee7b8881b5b8480c45e038c97ca2d3a80c54e243d7c6e1ae23782947efaf0d67a37c0d4dc66301c8a86ce0fcc3 +DIST darling_core-0.20.8.crate 64442 BLAKE2B bf1844eba6bac260104e2ef310721d3aae7ff222d99b01b9bb66e3c71ab700095af7dd5b3a77043d6751d94af131f02f23bd321fe9d4a7066f93d1fb7c0c605b SHA512 6f2d047758541355b81e43273cd1eb8865624096c951643e6ce777d716e17256528c47fe012f33eeb1f63883ca08f532b1ca52f43394dff82fd1bbf323763751 +DIST darling_macro-0.20.8.crate 1856 BLAKE2B d7087fa67033c897aae582e5f4d3126e06e024b7db203de7e7513308af7a0ff6ef0584a150c6f30ce434ba6ce4cc2a438f89f024c9d6338198aba3bd15cdd116 SHA512 97d18bb22b79dd95dc5ab23ea7226f9fd2d6e418b7ce9aecd4d43b7a15b37cb91e509607b89eb3a914a5d3dc562b2a292d1343f87f594ab32d41fb583d7cbdc0 +DIST data-encoding-2.3.3.crate 19117 BLAKE2B d77962932be4aefd5855db78379b56a9fdeb784a9916a3e4d0bf3b085a8b3286396122066ad875395bf3be3fe026422fdf5554ca67e0f1b53d9fba36c11c14cb SHA512 5922cdfaaa9b4c3b2faa68e86018653dac7bccef3f2a1e16f6c599dc8c3e98a644f29c3a9082234d3a58f9feb0eb54842e57ab62ceadcf287c43f7eed1906d93 +DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae +DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43 +DIST either-1.11.0.crate 18973 BLAKE2B 31ece6eb44a367926b5f9ee817f6ac9d93746f5b95c95fab360361f6b3a02160c682d298d115f39615e5b4758953f3f29ece22a72fe4285875dce03483f87486 SHA512 f62a3859afdba762b004d4c766090a25d3bd81e4a14509c3bd0f39b0d433aeff997b39759f7dbc5a012bf3b680fc4510a4b2643d63dda8171bad7403554905ff DIST env_logger-0.8.4.crate 33342 BLAKE2B b1bb359be2f34ca6f93f72154c86920b8254f574b48f693b2ae7296cd1ff25d34dea61e95fb2954569fdebb6c522c851ef7499c107005528aa2226df13b0de33 SHA512 9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049 +DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 +DIST foreign-types-0.5.0.crate 7824 BLAKE2B 01a5111a11e48462914f9877d3228008590093633e957883fdafd3a7017e144c14fbbe713bb8b0061ebae78d20a49978191ce416a4e28317b67ec69e38acb879 SHA512 d07c92cf99c99419a3ebe05ba9154e396ab88116f46af736ffdd958c8e47741bca5d9f478f6719d5361360e844375968c1cbf6ac40995d47128a5e5fda3f6c82 +DIST foreign-types-macros-0.2.3.crate 7635 BLAKE2B ee89f576f2d892209c0f344dcab9dd85a671c976c8034b33dc984b93a5c872ff0353311657fa1dafc499243e55d3293a7bfc532ba55894a719a50ddaa6957589 SHA512 c3965e058d15159f789a8ab1597770ff6325e8ac9e6914c98450225ce27af849698646d53326e07b13eb3a9730452d926b73fd76e5a1fbd8ae4a6083bdce3367 +DIST foreign-types-shared-0.3.1.crate 6006 BLAKE2B 27c26518e0de0a298df2996da4959727dcc6a21bb4efa6c28869a9affe7ee3b427d1bae25ed6928477d07959bd143d5d4fa27325f8f5a5cb0ddd3cdb9e5314df SHA512 c68da34b55230941d6655f6a52d5dcb8ee02149f25c25a5ef782402f9a18b33047905f28b70183a5f45b45977c011a5320cf7283b7901c76ede4d82082ca4c9e +DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 +DIST fs_extra-1.3.0.crate 31298 BLAKE2B 96dfb4e886767d3d3850d94cc789867c3ed461feb9da0ba90c600b2b41c3119067953ba795cea5e6c8c338adb6fe6426769a6e6894ea3e02eb1ab11794eb8d5f SHA512 090d2ace0517b86dd2f54c5491366cbb6e1677f64cf64f024f7dc6a3c42c4f8c54b215e954572e2df10ae7f0e956890ecf7ccbeebf66b645c7647409484c845d +DIST fslock-0.2.1.crate 13463 BLAKE2B dca565da8e760d016a659b7b81289034b8c48c416b326e403086a96aa4f50d6b30abe96f3026bc87e9deecbb49d7ee2b8352641f26d99dd9e9b85dfa7640d6ed SHA512 89f69658457994697f090c5ea090fed0699d032e2fa66fdafaab12d545ad6d21a324912e7132dab02e2bb1a09fc7b72d6562004c0321988a0b34332542f061f4 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 -DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46 -DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c -DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd -DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914 +DIST getrandom-0.2.14.crate 37307 BLAKE2B 5904388869335ea904d950ee83ad1867a0d3f6831b7139102b53f4bb4a2c12371c9396f1f1cbcc44e3ce69a4ea316651b1674722071bfa7562385ad4b6a88c33 SHA512 6c334415e09f570e3123e3c6c6eed1727533ac6c9c4142e16ae995c237a16effe146832a891be9fdde4335bd02b454e0fdd9160f20dc02f107ad106756221658 +DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a -DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b +DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c +DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722 +DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9 -DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a -DIST indexmap-1.6.1.crate 49644 BLAKE2B 605929e1b6b3473171fb2af7500d769783d7e3872244800c107664fdd7decb7603bd3657ba208d3022a931fc499bb2c2e6b8aed85f880d3ed1deb827dab70703 SHA512 a859cf4f2db46fe753aae0562ba6ea32dd529789a29784324e82b03f64f42a4f302789230ac298860513b1cd8cb238b7a150f6f865d342d606fcb7a2787f9a03 -DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406 -DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9 +DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea +DIST intrusive-collections-0.9.6.crate 56560 BLAKE2B b2258f0ca375364a416a1e95b51eda8a263df3b53cac3acea372e3d5d8ea73656bca7b0b5ddc90bcb98de963d4a495eee54067e4549bd691469ab21d74833ad7 SHA512 320eb1beb5fa2f393bce4c3092f37eed7c227c76b1f913abbcb3fd05cfc8f819ac1b619398cce5fdcb7a2dcc6b60dba3c1b2f2ac261e132d9e78a0bc2fe18bbe DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3 -DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692 -DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f -DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e -DIST js-sys-0.3.42.crate 67017 BLAKE2B a5db2a97a9cc4738d698e3db36c0a1024fc3d60a23dbd0ec4ddd7f887d04a7860b1641729ea4ac24669d98aafaff78d0a3d8a3211f8523e104cd668a11ce2af0 SHA512 5193b77f58741a7cb59ab871d5e66a2629e56c8a036bbe0cd7619e1115e9925e19a5f01f6b0f4854c22f36fcc3c1a335779f5f6923dbd6c617e850247a3c85b5 -DIST js-sys-0.3.45.crate 67143 BLAKE2B ecae52ec5f1cc7a52baf3d82915de57f9351ddf5e9fa35d279336ee2d2d5547e640ab8387d8d85ce9ed2ef02ad63d985d26db0df81b482bd021f8a2bb260dc28 SHA512 34d27c11bbdbfd7745166045ee20c578d3b4b917b5017a24d55349b5064d4f4bfba68dfaf1f16ce7df06ca88f727afd61487e96cab0e480447fdbf920a0ff7e7 -DIST js-sys-0.3.47.crate 67063 BLAKE2B c4c6f0bbc18e6ca8fb01ec052e1f897c69a4fa1276afdfc84d9b0f030ebc267022d5e397ea5e95cbab3e4e62c4b12b51756bc7fd93439ed0c9be506f5090e077 SHA512 28d4d16059421862db91789d9401486708a1e1c32f45717bf18507bc38ae8b52c40f9f7a26fafeb11c335ccf49b552d95225462f6246982a02eb3f2123c8a6b8 -DIST js-sys-0.3.50.crate 67123 BLAKE2B e31d81932e8c219524aca9159013e3e7e24519f154e6789b9b5e23de7da0b89e7ec5bf3f949a28a87a0a9671831d619aff1b84ed0b2011ddb01668b110c4d9b7 SHA512 961f1e2949ae8e662aac866807b2522537ed8756caaeaeca2be837329d6b684dd928aca1a7da9dbc402388625c54177dbc6b8141a1efa4087c78a3240d002d87 -DIST js-sys-0.3.51.crate 67124 BLAKE2B 4f4c28c1ea1a490551ff759ccc494536b099fee6d2eaa597f6ef5ab22e7dbcb72ee870df5550205efbee181aea8cf6623abdb6ecc35418eb17ebd2bf3f56877b SHA512 e352238ec085a9381c27fbd849000c8a26d71d947b75ccabecf941612a87e446c45f793eaa152062e7c699cdae74512a016d44ed06f3298b4cc7d32ae5139f5e -DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02ccb368a05bdc0e259768be4708e449647b254bc3c542a366492a02f0569d08e69c00249f58b07a566cdf97a SHA512 bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac +DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311 +DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d -DIST libc-0.2.102.crate 537138 BLAKE2B 2814792c4215555d5a33d4e3d21f2c78e1d9c87b3e1884d7fffa512aaed0737ed2329db6298fc074d477abfdc02f5bd30ec485f3fa7afe7d7a3e608453985c63 SHA512 cec681043b9c279e25ffbfdf2aeffe2a5fe057a8187fc2c986aca9a3fc900eac96ae3134632b124f1aaae4e5d2ecbc7122aeb40d94f83b5ec075769ede361643 -DIST libc-0.2.72.crate 478292 BLAKE2B 23914e92f9ae57a023bbb9bd9cd823cf535ba14ce8d01f171d3223cd227bb9d3884f7596dc2f74c690f7de813da4783e277204dfa690fc1e4f26ee566f1fe32b SHA512 f59caec272f24b8cc29d421baa4ee4145afea8eb9e4a83d8c245602f6bd8de3c91c04008a9920f7f70c9967a3392cc44d8df141c83c6c18d1f14893b21ae4ea0 -DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c -DIST libc-0.2.84.crate 517732 BLAKE2B dbffb14589552ecb7a6f610afd01feb94d3f5fbd44b5f03eb3f8ffd855d1e8eab4a397e3d40faa854c7ab364a65d11fc05118ecd401b5fe6a6972a82980259b0 SHA512 acbd268e02f360907c6939805973cb45f1f474f71a09efcad9c6a603de9c814a4912764c30ff8c929e06a544bf3e03eac08f42acde33a3edb4dac479f257eaa7 -DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c14309eed4c98a56be97aab6512d6b8b7574fdbf5a453f1400c9120eeb12e4f90970819f5c19ee544a975f5 SHA512 e82bd56c282b7473de50ec730646ae64384661e533f78b19bdd737d7a637cc93ca6f4e0b576d901576413a48d274635b917ec4b0c5144b5196155b04015ca94e -DIST libc-0.2.95.crate 515341 BLAKE2B 5bbb10917433ac9b305e4eadd4626a31149ec46aaef91f7d360bea8b5956499c55066339ea63102e71976a3aa969744c871c0683eb137e3c8ad2f8d62570cea0 SHA512 40ba9908c202f3d40c1bd7d7bf516f3b236e7751020bad0007f185802fada64fc5e959b68a33aa1f59de76d5a649f62bcce7eea671fd420852e0bb902544ebbf -DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28 -DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9 -DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec -DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc -DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590 -DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305 +DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST libloading-0.8.3.crate 28480 BLAKE2B b8588be0e7034e94c808490adb8ee6e81c29e962aec436a0d8f8c7617b3ba9177887ce59b95b2f0af00ab030bc77b73e0a889d8a77b84deb437245211a969c94 SHA512 af8fa5fe2428fa98177d6adfc01bcd6e701b0d77ac18c95b8b8d5abb3a6376f16241ccc71b9fe100782c73c843ca53c9bad465545d8bb7def52320dad0eecef9 +DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5 +DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b +DIST matches-0.1.10.crate 2592 BLAKE2B 6e9e8ce8ade3fa0f144a1befae104f63764f8346fe864395be44f99d40ff0fbaeb45b6f2fafb2e7822d1ca72f1cbeaee4c5f9bc3e2485cfef2b8de2a4183ec04 SHA512 2248c6192238a8eda2dc389a5c27357555607b726d195c36c4cf647f793a4a9e17ecdf5145b5a4d8fe6eba7f9b23c7b2db1cbd553f5610d25976e3709bc2fe4d DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434 -DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248 -DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6 -DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb -DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11 -DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c -DIST mio-0.6.22.crate 102782 BLAKE2B 8a088fb24797f4b16b6da28fee56a1c8bf1346959905c3501e3d78d16d169125c03495d9e21dc9da4fb6735a48af38b2883544d1c9ea2486d48542fde6ad47eb SHA512 b500b0271779942512c1d02756ee4caf4e00488f6929a06a7be8a46cc44318edaeb80abfaf6367d7201978a3529a6b5424679e07b719ee8194f0dc37aaf56ca5 -DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c -DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72 -DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba -DIST net2-0.2.34.crate 20620 BLAKE2B aee9aac0deb14a13c5f90793f1e439c94362403cb329e24607c1970c117bc379049da1b173d1bf827f0e3db38740a2d2e696981daf88c1b2302d81564be5433a SHA512 136ba95ad540545165fc2e34fdb5aab7da8f6b20e7682302ad5796b86cbf3d80b5364679c82caa19151b277f9d18de053968fda779ffff8ac88024940772709b -DIST net2-0.2.35.crate 20660 BLAKE2B 8bfbbad0c8ccd364f1be6fd67b3087a0dbd7a6301b8133bd28cacca3d32a5baa9dcbbc81cf957bf1591b20512f283e3fd441190e33c3ddc09dea3f9bd5dba251 SHA512 5a5b4ee65654fec31d820a71bc50a0d81555ab661e4d3c1dcafb048588218d6ba347f1ce5423b092f078f3bce55f7c74e33193d1924086bb1d43a5e6efc80540 +DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40 +DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa +DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c +DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1 +DIST miow-0.4.0.crate 27567 BLAKE2B fbd395d3766c3874da8067dec37bfe40f3dd90c995af5139d2583aacb9d634cea73467b87b84af84c760cad89031c1d26670174b2c52e932ef6729d3fc98dfdd SHA512 fc974ec96a82c92492cafd15a5002c1c647841d607cc1726eb2b98645bb528a5d6adb086322d6fc1753326500ecceecb6cf26d721af26441de8ee23ef87be0f0 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec -DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca -DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9 +DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad +DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100 +DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381 -DIST once_cell-1.4.0.crate 24625 BLAKE2B 6cfb6ffa2326fb53c4381d4b6a462928f96ad4133c653335c34265a1475c4f50067fcd2a6d9bb0660aab4406401edf02776ceff8d2b43c9d6b443998d2e3cdb7 SHA512 8debf21169653719820c4892ebceda67fedcc3c86e958aec42ade0d38247e12265a0152846f9284c37faa183e452ddf666b117e7ec5c066893cd33ec407dfaa6 -DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958 -DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba -DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6 -DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827 +DIST octets-0.3.0.crate 5760 BLAKE2B 0375ce7b14f37a072fc0269c3995004152759e14f4c933daff26b5fc0cbf5c6e8640746dd5bc65694810066729c3efdeba0791958180c4beb63c0b892230f135 SHA512 cf74ad97161da7db775d4f46db045b6aeb9a1a65cbf83539f765e9254735db1d8e18aa349b108a046bb7d931c71fd26e91957dd119abdef27248de031869f226 +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c DIST oorandom-11.1.0.crate 9762 BLAKE2B 0589af12d0ad99009655272035738a6a5f57abb47eda2f2dc3be443474cb67cf4808207f95aee0be5417714f1c72c13fca82fdde778565574d670271ee9528d1 SHA512 faf840b52a315125d5f6c80f6101fcbff6ac29217d362915ebbae4f7337c18ecd46b89da96bf67147e84d0f805edb626be0da448af12b0bf537fb0f0a3a25c0c DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721 -DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9 +DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 +DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d DIST plotters-0.2.12.crate 3194754 BLAKE2B 21035d561321bc66b47cd3a1d3374f4e11d49cae62cc363a3bac98938328aebd527592270ac4014f558751bcdcf7e4994da5647baf98437200a93849bc9e549f SHA512 f9d8be381ffbb853b9a3bfdb0cf5b29c23fbab9b376ab2cc9a734fb7d573a1ef1ae3a32c5b4f080f534e52505fba1d6051475d62811da01205323420f2045dff -DIST proc-macro2-1.0.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef -DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be -DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2 -DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4 -DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63 -DIST qlog-0.3.0.crate 23295 BLAKE2B 1a4216fee65e73f72a85a4227a1765883fd121fe4d0216d28755501b104aeb80dbe5bbe493991c0a2dd635351224f345b283e18e6db2206556b7cf0f3a884c7f SHA512 76a234231b2f4ab7af9ede41525679595083b5faafb3e0e516e08968ee9294f4a0cc74b81df69041b8dcafabdb09494f9cad9a73cbbd1aac3388667d8366dbf7 -DIST qlog-0.4.0.crate 23452 BLAKE2B 219053b98d09189415d45c6487356e565f6240c35508b84dc4b1a1d0d7aff0af8b02889805cc36930c600ec37bdc2941b52d9ca325c719497ee49e5bdbf3228f SHA512 d1ae8fc0ec99ca77946e89c3295183aec551e41f44e5c44178c0b60e997311a6fbce7a44eeafea757303f6f051c3fef08724c85b273dd11014d555f3c5761613 -DIST qlog-0.5.0.crate 18586 BLAKE2B 81a2c7650d019069a0ed101e27bfd0fe729fbbcb5c512b78bebecb85f85b7449bbd5c933524bb864a024dd70c632f92e2d4405448b9c92f3860e0fcf6d7d5a67 SHA512 f185edfab8e1499066eeee0fa35711f9a035a56d0d0a192ca8b964168152e3431f6f55c5b72df78d7af3aaa66ecfb8c897889939ce47570f5296e42df5c5febb -DIST quiche-0.10.0.crate 3604568 BLAKE2B b79bf113e21bfe613ef88a1279f0a6be2df5efa82db719a8407ff5db2f1f757a076326e1f243483e042000dfdee6bf81a649b51384a8f804f39016d388e14efe SHA512 94265a4245dd64e40e211a8e3dda356c0774971009afe0aa6c10c507d688535a3e54d318217de4b98de1b7828a5de921e6490003d55a77b7a4fd5b1316a262a3 -DIST quiche-0.5.1.crate 3265682 BLAKE2B 1d404317e48a62ac2cb3759aae51f0b91eb87d9c9694333331db528b79cc19a72f0f8da2b0785469ae81237c8b8afa760a4f00b039895330aa8b6e3b3d356ca3 SHA512 7f9af3f104aa788076cf7be2f643c823264cb616dbc9dbafb21afbbdfde4d74edff9e48ef79828ee47e3185215a3177131dec9b48a65e96e8ab4b6214b409fc5 -DIST quiche-0.6.0.crate 3264703 BLAKE2B f5703d86866b4ff11fba3c620e65da26050d744202bb520783c91f9925e030f0bf5ff2c75af02a015006d9b8a3991092df15a523dd316d7973df06c694927529 SHA512 c73a06d8f426193c6a0859a4a1beb453382c6dd67e70e1ea58999a5585d468442ea86457f3dbaed1d6d5dd33fc204a5c9aeed26de1072563d6951c4f386c957c -DIST quiche-0.7.0.crate 3405961 BLAKE2B e873c97fb6cec335297753f53dc8db74fca8716fb9ef25f5d5d5fbed6e34943205e15eceb4988c3e061e557dfe20efa38c70850938b23d9f5520f89296581e7f SHA512 35d6bb736900c6715dab5a1706729591e884fbf8e652a161ce4b140a799e0d752aa14a414902418a8b97e3e77d27759d61c17a53ba6d8d289238d37bbfd8fb37 -DIST quiche-0.8.0.crate 3522026 BLAKE2B f039c8fa2fbb90201cea4b737d6d8540d4b5f7a558e7034263873fa190bfb3d8c33ae395f4160a40949891a9131ff1f06dfefa131e57cda9fdc6a31d857bbbb6 SHA512 ecab57cf7830c6f4778703f59d55adbd756253fe0bddb1ad4deabab6b5edc213b9e24b849ce8e276952824f93a3a6e52effd92d5fd92ada7a3a3891004c873de -DIST quiche-0.8.1.crate 3522157 BLAKE2B 69ac246f3de61edf0f0f3f39534c732baa6264fc916c4088e67a5c6a172c1d66d11759b38bd543791fae965b7142922c1a3805a135f9e7fec820f88a4d8e2150 SHA512 053d2312a80a1dd2031d5cd204725321e7c24328903be353f89e15e916aadaa33703e4c0caa7d0afa4aedf5d11c292112ad78fa511db10cc6afd6e329d6c0919 -DIST quiche-0.9.0.crate 3536510 BLAKE2B 0051d349677f7a5b9c7560c8765c8eaa551ee2575a7234f01eab32878140cdf2ffedc5dd78abe3156ac554f7c4d0d078ba1ebaba93870a3445e63ccb2fb201eb SHA512 791945f5c15dfbf018f6329b7fb8e0b19912d1ed85b58e6490df5a72115a715f654ac57c5a5658877f5e7e4a5e365535b89172667c42a9425c5528973e157de8 -DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953 -DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f -DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8 +DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029 +DIST proc-macro2-1.0.80.crate 48227 BLAKE2B 1b4d2a1d613af8e03fab7a976707ed9ad4809ba50775992df54de10e5b8deabfcce423ca962fbce5c22090421cb0b8b26b8026d56562aa6569a8acfbb49d55de SHA512 d40181bbc4f83ee66be7721e8f89f9a08e368e12a8a0d4c1dcdb1c29cc72b1bcb8da598de1ad1a155a8182026ab7f8365f7a46fc76d589282fbffbd35aa228a0 +DIST qlog-0.13.0.crate 22388 BLAKE2B 62dd0a53852bcc40f2a9cf13eea582cb041d45ccf17ddc5b4c6240f6f4ce068b102dfeadf6b38e06f548915d401e88969400343e53f8147e16d6a19cf1a6caf9 SHA512 6ec2d870c890da33378ca33350ccda64f7502653b45813c14a1cfe7be6fbbeb98f85e79fd84697d27c02ee3448759cfe3b517d3fcb3f7a0cc6bb1b65e926d1d7 +DIST quiche-0.21.0.crate 3703765 BLAKE2B 9b9b09e272ee7b70575aa5aaa47a2cd6885df5bd7dd89174cafa1ea4e141ca6602bdc2a3c5141d4093e5f5259b9e1db1eacb46528bf3baea108cd57e3f1507e7 SHA512 b16eb5dd96fcd7487789f0e2d187519b660423bf8de37a0b13e2281575c9ed5a00483753a6593180a18c489ceede8a0eba28f80969aa0c677497baa8f8568eff +DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685 DIST rayon-1.3.0.crate 143294 BLAKE2B c52c0ca7f3424eb6c251f91a4a8f556ff40120889b91fb0e4dce36401cbc653310c16393c12b73b29d56eb04846e06c04942b7fd41173cd8fcd8dc11046163f7 SHA512 176af1a8148026954e271ece820c67b215223cdf11b80ff4e3229e4871ad87ce9c21c0b5b5c9f1c9e8063102ed0722c3e5194c13bbe77d8688fdf81e0ba8a599 DIST rayon-core-1.7.0.crate 58306 BLAKE2B ffcff7e465267a5c360fd92089787281fd1dc07af05cc49b62dd2030267fccb31ea7590509d2af8b7e7a87df9f23167358e91044bb61062bdfaef790d2a4684d SHA512 7bacda8330518c137b433ac1f7f65f64aaf7939d7fdae1c8263bdaefbdf6734003054a1fc7acf73d4e323f27e9f152f273ffb7388abbf6cca0fa2357f1362e2e -DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7 -DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a -DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19 -DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0 -DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f -DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34 -DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5 -DIST ring-0.16.15.crate 5279241 BLAKE2B 1de5d0f5117246e344a04b6958a678d067a93083dfba74b057a48dfe6922bc8b980ecadc94fbf76ef996dfd7ff3cc7b2da6a4c7c9ae31fb6dc334a3b7a377533 SHA512 17c72ba204cdbc80856bc588dea220d2475a2dd1e2990ec9bf76fe4c0acae8a91a8fd532127e2ce679b43be0a52bc05dcda309744876d8faf0c50de0bb8c399a -DIST ring-0.16.19.crate 5195787 BLAKE2B 308feafd2a3a673ea47b4e62b94352a070cdd8f91369bde9d1612b6627a6ab387d33e6a8a612e66bda396935d90b3d8e0c718eefc627060f40c879792eaed907 SHA512 86dff6211232c6175c395d8716dc767929841efc34af5f2892d1661e794dffd20bd7df3cb1f68f1fef57ae4636398f9d0be8ad0c2925067545e6bad2d3f023bb -DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191 +DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b +DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1 +DIST regex-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76 +DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358 +DIST rust_decimal-1.35.0.crate 128340 BLAKE2B de57ffa9901ebf325dc3ae80226b20780fe6611c3a317419667940f55eaab01c4099abbc484af67b0d050880f03922de1861b7d624467f52d4529b9a1aeee7e6 SHA512 17ffd08f67305e428820d0e64ee06a381eb026f1ef1903da48f26c079505365c122d3159ebbd7566261ba3abb5360b8e80b51efc6ca5d182a8d68646aeaa9dcd DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779 -DIST rustversion-1.0.4.crate 16704 BLAKE2B d1ab318021d96bc62d6f202685c9c48e8e3624370bb42f9e7172d51d9b8dd412fcbd22cc267eb55279e2799dfab74ec64f82e6ee36f822e4f2465baaa6fb2532 SHA512 d15a79acc524ceac97a01b1083e109c1eb4b9d4ae6113b77b335a222667c18048a776afa7634200fe21c022812ed90282e09a472aa227c734f09d6ffee62a528 -DIST rustversion-1.0.5.crate 16984 BLAKE2B 314d4a7b78a91fe6a0f35d850ef7a4dda72859fec7f603307154d2b25722ef6be71d5986991b4958009ba066d3078a53131691b0d375677985b9e351876dcd15 SHA512 43f3ed12e007e0a7bf0ecbe44edec5ff092c88973903ad8032b12d678d98d8827a9e51040fa157b0d5b07d26a5b6cd314b410553fec46689b3a31b392c24770a -DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c +DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc +DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f -DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f -DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b -DIST serde-1.0.123.crate 74379 BLAKE2B c6d1a0d833b50d1ec65f7c2439388eac08db6231e5f8d719582d545948b5f36f2a429338e12e33e4bdbaf439cdf25840e37f37470d993f6e80d8e5746e5c7564 SHA512 73d584193f1885561063d15c0124f0611f59ba60b14eb5df3fdfe9545e9e31a1a2afdb22b2a7dd4176ea0856a24352ca6d822e0bc779f0fbcfc41e545e27e823 -DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b -DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed -DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3 -DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2 -DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d -DIST serde_derive-1.0.123.crate 54122 BLAKE2B 9663f89cc23966d338ed1f952629276b4dd6a4c7edb8a3d9cc888e135752a7d5b748d55428566ce5ef98c11593dd45116f7aae0278bebd41b5e818928a414579 SHA512 ec80de18fcee0c50a4297272fddb54e111b580012ec79b7827ad8a4b9c02a621b07aa02070480cf89d6eafc1ed7a577d763c2657938f14c5b546d98e0df83227 -DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f -DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf -DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8 -DIST serde_json-1.0.56.crate 114541 BLAKE2B 1e393b296983b55d6f516f87ac0b3222956e3ecd7e088955f430c0957642ba59f6d7e927bd924b30f8ca989a04f611078b5c05690d8b1195a0e8b0d11f1b6412 SHA512 ee937a1449701235984a71c9e92035251019d922eccf29e1dc95cdfa008e9bae614650949d8536a5a42ae7b8decfb419b75ec5285b1f85618750efbad24cb11f -DIST serde_json-1.0.59.crate 114956 BLAKE2B 27552d21b80d88cc3c643b25e5f0105c0d79a7c74c5bc3c2cdcc68050103ad73b75f7ee9d1d5afb60adbae33c351091b180cb1f8aa17c80f06cce4fb4c57f2d8 SHA512 2f9bf96fa770f9be9c43fc889e1671e9bb883f49a820aa69a1709d9f679f21f01cef2b771eea4d1fe7994cf850af44577710521fffdc4cc46d0dc6f913842075 -DIST serde_json-1.0.61.crate 114887 BLAKE2B a06e2b3572b01b57d39a7df4d4c333408594cfe80b6b6a810f8c36479550f56f085cbd7e693d3c27f307bf0b49eefd34f55bef1872a4a0318797e4b9585cce9e SHA512 ff626602b547fa8e48c37251d2f6c91633fd45b49ed8211e66a3174f52f9aafe8778238466e7deb5d5477ed23eea0091596d78894e0967d6978f6737ae115891 -DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d -DIST serde_json-1.0.68.crate 114986 BLAKE2B a588a87ac9fe2b3635d7bf72c185801e3866101020a0afb8f714d37939c2dc7b5b32e2177910df7221df197e4e8a92d92187968efdb5e9f1f1616647c10d81d3 SHA512 54a0345029016873883dbdcd2094615f509759f61b04d9a496dfdbc1e27ee5361dfb3d129f209a9ad66984cc1f4c82751adfe1a564198649ecc939e8c3dd1ac5 -DIST serde_with-1.10.0.crate 75349 BLAKE2B 840944d399144e383ef5f974588de0f126cc27174409a498ab2e0f193ddfa757853256255990d4ec3048d1ee983af3dded203d905d7d08f182da4905e67d8afa SHA512 c3a27433b25eab8ea87716caed67b778fc4c6d7d721d95c466d545e19b2fe02d9496a9e927450b4a08703ab7857f7127968ffb3f4389080cd054a43d07bc8489 -DIST serde_with-1.4.0.crate 25789 BLAKE2B d91f5fed9ef2f3a8b7a8973e69ffff0715bb0bc0e2c9e92b263139ff54f2c325926db9312d402ef6b47006ccce6d951835896893b1d27738f22f066e61e64260 SHA512 702034da0c16c57b8f66301619f9323bfdfcb4943b4a6c4df89508345b6ace57b1caa6b3b2d662eff9c9df6ddb313d2fb2ef85d7f8a79bdb986eb832cc716b89 -DIST serde_with-1.5.1.crate 49687 BLAKE2B 6acae2c78b47fd5d4d17f2111f0a14ed2d76be93c1113adfb151b3dcbfa1ec48deb163bbc020ebb230c8263bd3f7e351c1b86fad84a33788b816b59fd9d92ef0 SHA512 4b961006c59c0c8cdb70d6ce7bb99f5ffd49e6ab782e8d20125b7495f5e4425c950ed60727affb8d7aedcad6b735af6505bb1b47414f82e1c731dc79fe1a3c6a -DIST serde_with-1.6.2.crate 55947 BLAKE2B 44f426a460b8aa4b68b518caf571465c546a888a9429248ea8bec988c84416c5a4a2eac0c6fd37e9e2e3eb48cddab045eb360251c528850203c0971d9e7fc859 SHA512 eca7061d6261d1afc98ffb0cde78c81cf27eaf5b03e662bb783312abdc79d0b844988d0cbe3d2bd723fe354a4ee605cac3595371a45b94a71953f8e0438eba66 -DIST serde_with-1.8.0.crate 64318 BLAKE2B ca457f0500eb7d02ab424affe92040bc861990a6ae922e8783813785a4b8a557d89ee714579515b459b7b24699bbee7481ab02934852cbd2ff2ab4c2efa55e4a SHA512 a4e28086bbac51354850fa41fea0c0dcf5f3cedc2f70f14c55757f4cdcd33de523e55a4ccc82a98d8161637ad064145e2c22be3db339228068951bb1aca27ff6 -DIST serde_with-1.9.2.crate 67712 BLAKE2B 1a297b422a0e783ea5da1485bea7c726f7b1b33be8e1ec13a14290a5a666343a50241c2ae4580d4c4bd00c37f9013391aeb2adf2231297d8c9f3e2b726a7f370 SHA512 832ccccb63eff2ceae77d317394fed71b7cdcf42078fb30dfdd63bdd0a294f88a1959aa62de8ddfe18d9f2f791227208500a8b8e6efa16f573b1ad0e54ed0a3d -DIST serde_with_macros-1.1.0.crate 11235 BLAKE2B 46d45ef95ca4bf276abe5571671614927aef01c811b5eefd84801b50bf10d7ba562c42caf9ba901413962e4f7b4662e86ad3ab81e0fb4b442e3baa1a8a7f9c0c SHA512 36de2149a1a4da3162458d79518aa276517456c48cbfbcd564fb84d509b267566b2c2dcd707604b502cd9e152eeabea63234837cb1ad216fe4d9eb27c51cc288 -DIST serde_with_macros-1.2.2.crate 14879 BLAKE2B db14145d27bf1f586a2403ac80c24bf0b231146444c90a6f5cfeebbc93f3bba1cffd286326ae30109fc8a2b2aee13f5ed82ec3c4b046657d61e88815b2df1313 SHA512 aee30f8b8a48bf074f04ca7f0da180d25c523521321189830cdcd036db3f66e3305d53aedb590ca60809e6678f83f1133f7965e636fd166bcb0ad8f9752a44e5 -DIST serde_with_macros-1.3.0.crate 15844 BLAKE2B 98246e2de2401fef1523719d6452a9e4350272ae46fb4283afd9bd7e0ecdb1e14f72f130843a7bc9c78be9c25fc3db8ef364d9a0d2753daa2c2bf107664269b8 SHA512 1717f7f87f2e456b56ac93547f246171fa3b9d193c7de41ed43039ce310ae5dca873e5ebd3dca1b331be81e30b9e8fc5948ed99a430772d1bbd9fef6548ffb93 -DIST serde_with_macros-1.4.1.crate 16901 BLAKE2B 78703dc5a8432e7580a2a72103c804d921a6d526c62f6fb62561c8dcb5b0e609dd00af3380e53de4916802d67f8ee16bb56c5a374f5781aff7820b18b8cfd686 SHA512 e7aaca8d4b033b9ce7eea4b79fd34018574ad4d1f3a688a20e9a5bcc3f4b1edb0987c0fb848b511b10c8ef90e3f93702ca9d462339b0e2e8a2b6245e5aad6e41 -DIST serde_with_macros-1.4.2.crate 17752 BLAKE2B 2549b65d267be90e5dd3e64b38c2e220dcb156adf95f3816a98c2b729f4270dd7399e8527b77d0f6c9deea5b4d99d9b7fef52a2d7c5af9e382cf20b022157f2d SHA512 ef9191d94d0402b65eaec653fbaa91ecaf3fbf3c77279eaef121c2882e0b8ed3031c1f8d3e199c3af8b371fcda4f830f703bfe47635284c6520873ff3b5215b8 -DIST serde_with_macros-1.5.0.crate 20802 BLAKE2B aa80bd116dca4ff483ba8f1cb59c8126fec7e064cebcbefb3ee90527345974b8ba3eae2b0ea9d218e84f064e1762f65d414f60c04bf622fa0dceb5ed928e221d SHA512 878f9cce2131816bc40a3cf44dbf03ead30317b709cf12cbc9b59709ef781107e647df35ccbdf385205b63588d96d1e85df6dccf0e07fc42704058bd84e00454 -DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069 -DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661 -DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15 -DIST slab-0.4.4.crate 15725 BLAKE2B 54f3d5e4e76aee03d52f25e2927c03c10d89fb7ff62d83ba6f56003daf8a98e63ec220f564107f3282e96bdf3bd525b68e71511ba367db2550d3aed18b4bc59d SHA512 a8232c85d9693c2a417201768a5b2ecd82e3a721fee39ec80e44c769c66f8cb3ddf00a157f376ebe4c168082550ec48e63af23de2da4f30ed343b4e3bd13c3d1 -DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63 -DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267 +DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410 +DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994 +DIST serde_json-1.0.115.crate 147100 BLAKE2B baa2dce9d85e331d1308f2ece9dbeff24bcc70e37be3f06c7e819ad9f4eb59fb1f00658736fd336a41a65e3616d1bf75a0c9adb359eb606e1418159a9455132f SHA512 d1a60e20af770fdfe0585853c87c5631e56944a3c1bbdf9e1e91003af8e924a8076335bd37563d167c760aad10d4c08fe59ebd47fc52e461bc3586b835808d22 +DIST serde_with-3.7.0.crate 140905 BLAKE2B fa749055ab1b1f271d46f68a169b18c7e670640e937002ee6f59814c4ed7a7dcee13340ec4a4bc116c57224472f919dad85ac64270441987d3cb0110162d6b05 SHA512 a923993d3ebf1543de6f73e264f436849de6d9a292668ca5508e20c1231b78105307f62140d06bd401fa7001d83a46b56a14f3ad95a2360a55e276ec7b94e142 +DIST serde_with_macros-3.7.0.crate 30834 BLAKE2B 2da5db01fbbbc9e3ad94531c4947bab966e7284c3867f1bb2520cfad23f5a7f5dabe58b821ecfd8bd1f89041e57ee388910636479faea2506fad232c5c7aeafe SHA512 43d666624e6216de285aa3ff8435bc01bfacb675544f63922d1113c4d1a37e8556c61d19807558e002aa05888f8a5d19e7ff8b339b50c4b9c54f0a2cdfc4e9b0 +DIST sfv-0.9.4.crate 22456 BLAKE2B ffb5a0da73eb11ea452b5ad8eef7c2019ad6f2e067aa4156485c78ea61fe0432fa3c0aec37c2593828f174d0ef614b208b22ca0277ef6c250fe474b59075c023 SHA512 78e55d45341d2133b4fd005aeecc083c04951970d20d74a44afbae3ef00341e90f0f9f23bf826e913226200fa09567e263ec861fa0acb444ee45e4b9e2a22301 +DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a +DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 +DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679 +DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 -DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51 -DIST syn-1.0.34.crate 205051 BLAKE2B 3d609502637038d6c2d96b11a99dc96a232ad9d68e94571838cca727dc41450148047509108d6ec3cbcf15f146286dc54023db8ac394b2443a37f55c269a630c SHA512 4aaae0369c08f9f505acc62e9c603d3f5c531f2da42308665cb3c656fb7828ec8c46dc2ee2ef0cbe6ed20c8d7482f66118e4c949f3bff3eb67ae1c93fbbc90b4 -DIST syn-1.0.48.crate 225747 BLAKE2B f7bfc4c38dec562a6dc7ecb7120c6df5e25ddc8591762bf5018ee0efa506613c9462a79e0e9cbd952cf5fa083abc164608d594bf2a47d226de4b4bdf02da050c SHA512 16b022a418eb9a7e5d651197561c329f749050a1710ff03b1af9a5f580543d00a1724826e0ced044d6ee4ad55dc615fff5a71ad72755e1685c429dc5853d93b3 -DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24 -DIST syn-1.0.69.crate 231954 BLAKE2B 1dde7e78cdbf5c5b93d0196e008dd4e92e4367f8e88395d6157b92a58cd9317dbb6e47caf2d570a5a9fb6b4fdd4fdea5e414eb9b04e054ec4e4dde8bb9f36a96 SHA512 6934423e48f8d6b1e403fe5e4bb2e180f472f125f4337b7d9889788c16cf11d79d1673ed06178604279e0b8a04bd80f7efba187cc8fa44c535457eb1b4f51c20 -DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9 -DIST syn-1.0.76.crate 233723 BLAKE2B 99b781b6ffa926ca71d0a09ae81dacfc6ee713e15fd057232e527761b73f088c30967eb13d624bdf34a089c5a33fa28ecf6ca069e3dfd7061932643849243967 SHA512 0f32138d219ca74fcff1ee5ee5bb89f965a30b74c10a040bd8361332cb84900322194dd85ad7571c4bce72c1f66368546db5881165939800f2587b15ce07298a +DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d +DIST syn-2.0.59.crate 255393 BLAKE2B 872c6fdf55eef2f050c02fd054f383ede1793286e787f447d242a0436186e67151ce4f47a63c7ac8ab00a87d2fa9452ccc166a32cc7f1c1de2e0f2581c01d2ee SHA512 0e9e1529a0ce43afeec5e9847f8f4c86939ebb1fa0236d25aab73a9fc253b97ebc62f1c741e137a5a3173e2342b33d776a488210ccbdcd36177a1df31188afdc DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a +DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116 +DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52 +DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c DIST tinytemplate-1.0.3.crate 24781 BLAKE2B a965579d9551968f5134e2892595abb01950346fe083a32234fe7184d86b1003ed1a71800a1ddfb2eedd2f3a56baafd05eac5a34a4adcdb1477f5cf510027fe2 SHA512 bb3941d197e3d3f98709d2dfee977a35040eb50217fb017487aebec6d75e53d08cc281ead712bffa2ac606a8bdcb9e5e064993c2bf6e0fe66b1bd3d401ab5817 -DIST tinyvec-0.3.3.crate 17860 BLAKE2B d3665da9e5e2369bbd68c84827ce13cd1c0afa07b8cf689b04a62e24e5bafe41e8f32b136e048ce85aad324c22ca68fb43995a5445092d1f331379366f71cb03 SHA512 41200e022e66624b45e186a5ef6e7cc05dc3e2fd28d332deb689699b17bb85ecd0d960809e4ea2a08ac1ebeb5f2fcf364f4f9626d297f23169476c8be9dc1557 -DIST tinyvec-0.3.4.crate 17586 BLAKE2B 2173653c5433ba8fda3afb7e88e9065e2b5cbae6b25753eb306423e8b0ac694074d678bc50a53b2ccc228a8e8b4d06de2ddeb63f0adf057feaff8a998820eb5b SHA512 91613078d89456fa233ee2fa3309f6b2b8d490771b62fdcc027336bfb20ee5fa3d8d3dec446ab397b5974127567d4f62186c6eea45bd9c767719bb770101ab2c -DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9aae9b8eab78c1584c904a6ac1a75511952b7f63eb953590b0b3a3c436296c13b6dabba11d279931ca769442 SHA512 de8de26bdb39d4b2255099b85c116a95b7f563f27549816d360a7cf68f04d3940745236aea4c73eeb86ed5427ae5f65d8936f0d60dae9b16076827134d77281e -DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e -DIST tinyvec-1.4.0.crate 42418 BLAKE2B a5a3c22a9a7e9b356d2cd7c74e27d59eaa8b7a0c7706ff0bffe4f173842d35f8233ea745653d1c76d52b71da4683db00eb0ff5c61a7c9498e2853ce8d0f696c5 SHA512 a77f1cc0cd73875a2e6bf18ab95ce97ddb15f4d1c1ece0b43e242e08bd853bae5a23ae976f4bc928205d2b24dabbf412cb74650c7665cc0c0f499cbcc21660fc -DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873 -DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e -DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad -DIST unicode-bidi-0.3.6.crate 33737 BLAKE2B 90cb2d05bcafd32a237b747e290f3dba186d069845e50ffdcd7e62a2ddd73f4e8fc27ad972d86453ff375fab50fd5ec47ac323413e351fb7d4b80f1536519d7f SHA512 a1013539b0da1609d9c37cc1d8359efa93bd88b4ae176d25398e6c44d93b615835a54b184641f00313b14cf46542b1e92278b0dc1bd00dfca0566467b21857e7 -DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20 -DIST unicode-normalization-0.1.16.crate 92805 BLAKE2B 556b0b95b6d21f95ad99181e999d2f2a1291951db14e95cdaa4596b159323e999a135380ca0f795c996f97ffaa0c25465bfe5884bebc8903130bfd7437d4b86a SHA512 c1f83a79b0fffd2f0e1b8a579ae4e5021c4cffd74c259d065919b937bdd78b9ef83650cfd777010e7008ceb51e072777b195dd2483e1a85798a98b72f8648ead -DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6 -DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f -DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84 -DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0 -DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4 -DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d -DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2 -DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8 -DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0 -DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04 +DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c +DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e +DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5 +DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b +DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5 +DIST unicode-xid-0.2.4.crate 15352 BLAKE2B 80c327b39f3b8f2cdb5747cde968cfa1efe7b65b6bee9136adc881fa19f66aa5b1010d9d08de55a61b322d665b5b0cb0395e9ac471f6333c40d8dca5d97e123c SHA512 e67bd1258e1961807d9d5fe583a89ab5b82b2a529ecd32cadfc79aa5331380eb4a2db9fd96b74c8eace47f2f29021587d69bcdbf79f7e2650e92a25f7839d03c +DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416 +DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9 -DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951 -DIST wasm-bindgen-0.2.65.crate 156753 BLAKE2B 4b68313c60c6bf1ccdde58c05cf736e1806e1115271172b2751e256eeff83b93e65d00306ff18529f02c7e5c47df89a2784334d8cf44e09ab4d4465cf85dbe3f SHA512 6fdbc50e06c0db49833b2e5a638d1dc2444b326a4ef19f640316fdbbcb83704a79a6fe0f47818bc69d271bd3791ea6945194960a5d005a3e4a823300023a35c2 -DIST wasm-bindgen-0.2.68.crate 159094 BLAKE2B eb7fa3c2f80e5ab7c0d8e99b11bfc025fd32c8347b9baee9f947570a85426dcdadd052248af7a0ab17bdfbe494f71037fa1980fc875d84c089b70a80d0321bce SHA512 a3e877a43242a35518b84852ac71f3cd6c9ca558234fc23bece38780a0abcbf9e7c6d07e20e81c1f6641835ed3b55dff8245fb75901205b0b5658f4e3b0c05ea -DIST wasm-bindgen-0.2.70.crate 159291 BLAKE2B 8420da36597a61cb293268f7cce742e1ab3f9ea990382af1c40e37f5b088d558ffa28814c8cdd9cad518246451cb9805d708c9fbe91ae8b6ee4fd2c666588944 SHA512 2cc77c540738fe454aebac4d23ad9b97ddcf867afc2fab8d92e1a995ec3db7126b9dc9153a3e47d048477cf15363d5242caee3064ba850780ad5d121368a7c8c -DIST wasm-bindgen-0.2.73.crate 159293 BLAKE2B 3ad8a4221d5a3824d8c7788294b3b3b571ba4d676c782f7890be6f0f8acf5fc88166b8bf28933bb7511a388defa5ebd968b8fb8a69bdc424ff8ae64fddba1d16 SHA512 69b070d71df7b5539a9b45cb61704629cb917626e8e9f892ff684007647c36aaa04b7413f1f87eee7fffbcf28550b2d9e632c3747cd1a73a2a75043ea0849722 -DIST wasm-bindgen-0.2.74.crate 158439 BLAKE2B 28a0be539d0bdec4e23d4c5a613ec0727c00112d1da1948c050d4ce6f5f42a07fce6d1f2fafa7a66ecee9183fee9a7c23845e12eb50d206f760bfc76dad41491 SHA512 21ac04c54be9f3d3f32edbcffcd24cb9401418e0a398a3f00b6d4a0302bb32b7b044b513163a12952b09b9465b07ec7e4c26a83ad88f8ae39ac5fdc9439a1af5 -DIST wasm-bindgen-0.2.78.crate 162111 BLAKE2B a3311e67900961b35a59ead7a8972dcee37671921c0f524895c821658a7b1246403d4674bee1735f1b2b94aa789d5376edd02afe4c8ebda110f4344ef58c9225 SHA512 bedeb2828d1e74b1e373bdf34dc2eaec70dd523e9ed96a341da1ab3729a7cf8470a828ddb9cfd4cf15af6e2fff75b4368553ab4f6f02c8dec9419dcdd7578de9 -DIST wasm-bindgen-backend-0.2.65.crate 23551 BLAKE2B 4aa556cd36d2b7742cc8397eab0c1e3c9e0c24433e82a516aa71dbd3a32cfa760bfba93fc4311e9b69f527dffcd39be6dd7fe81f0fcbae30ebe6fc21c5e632e9 SHA512 7043f525453da6060574cab9926023b65e1e402d10c042804ab90ada78981300fcfabb97f3a661acc9c685bbc65a29c7c5c6ac446f11705bc85b8c9488985bb5 -DIST wasm-bindgen-backend-0.2.68.crate 23522 BLAKE2B ad87e1cbfe42d6b3f6c14f793dcec31fb0f9418454e0870a3951bf5f6b0eb9f39e5363129fbbdf986aa50e1fb2c13b03bbd9e21364204ace72460856fcfa7610 SHA512 aae99cefabc91417bda499b4fe8f136a81ffd44d5122f0c13ca5711eae26f2f8b16ef55c18dd4fd3f0e71edfff8610379adc458f978eaab057671b520de9d564 -DIST wasm-bindgen-backend-0.2.70.crate 25517 BLAKE2B 121690827f7500c19d4964b91fd69cc189e018f534e79a8462b69ef8a7c189ab0475e49a9689cbc4ce2ae082ac591567335a5a416675f0afed02aa14d68425be SHA512 22304a91c6d636bd721209c622ffdce4ed2646bb2c0b2433eaac61cb582ba59bee5ec0d08b4ed88695a8956b38292e646b8481cdfdb86de254e1b321a25308cf -DIST wasm-bindgen-backend-0.2.73.crate 25434 BLAKE2B 63298c33497fac327ecf31f2dafa3681b906c8d0a873a80bce1282c53a6d63aa8b0d30b8962ecef1f9a0986ab481a41b79cba5b8180f48b084d04fb0c6ba4577 SHA512 853fd0e354aa41706e19de192c9872812072cc881520f8c81b94eadb0cceaa693855598380dcb7729c8c6125eb90cac440453545a5fff0e40714038c86ff2cb6 -DIST wasm-bindgen-backend-0.2.74.crate 25434 BLAKE2B 211365a4407865646376bc40fbfd9865715b137aadc18f267a9d32be8e0e585d05286f8a40cba20060e3591e3a5afa49f678bac6546cde7ef88c2bde36909724 SHA512 df9fdca6c48ecf1926552c4fe06a5936f7ea0523d62e0c62f104ce5eeae7ced1fa33875e2d3ef43d58a6395f77dd37e4882850443eb1d6aa59f0ec0bcf537cfb -DIST wasm-bindgen-backend-0.2.78.crate 25576 BLAKE2B 03dc6b255ab9e30f9eb54f81638eb02a05a0b994ddd51f47852bca376a02080fcce596453d688f5e8e7b5a814fd081b9709c1215f7e9f9fec0e4a7a6cba1000c SHA512 00a0ec9afb65c084b64cf9d25f778ab03bf2368a1e0ff213e07b8fe742a125ddae00c7b4d693225d6d798618b0441d4dea3c175cacdb37fdd75b0a46ba3a287b -DIST wasm-bindgen-macro-0.2.65.crate 11624 BLAKE2B 010ec37dd315fa9053745978a4bbe2758904f5599c3c05195e0fab0c6bc40e671eb6f025e48afe8a0376933eadf550c1ee5b61fddee0d82f3e8f6216e4615e25 SHA512 a5a1071cd09548b2ec2bd0dce4713f00d72ede2c2be8c8e4b3a852e5b2f0456a1e87996f31604523e3e1f226b14d8e4d6e263af86bdde78df830f65fa1a37244 -DIST wasm-bindgen-macro-0.2.68.crate 11630 BLAKE2B 407ec70043b1b6e7f454ac9d986d6df98ae19c9ab8ada98f4f968520b7cd75886cdeeeb739d61615bcf0d6ca3a757ba618f0ed9abc76308c461f159ac05ec61c SHA512 c70f536072ce9bcb109ea762c6235aea7eafd37eb3faad1b50184b733d09417b02f6f75b5c29fa46691b75b449316a039b79c630387f04903f6304453f98e772 -DIST wasm-bindgen-macro-0.2.70.crate 11596 BLAKE2B ce91e20491ef421dbb4a87d1d775e55ca1cd6367825a7cbebe848bfe6af972bb4f514b62de949b8945da335dc57352b8f5c5fd0c6114498b195627f6455ff223 SHA512 b0deff7972a95472d4edec101c080bdd40e0c2ddbaee07f62093847f7e39142388b6f223cef75d71c2c7c90f1022e9ad3e797439c7d61200719b883707d9d171 -DIST wasm-bindgen-macro-0.2.73.crate 11545 BLAKE2B 481800c0c118048b29733a3bbe11ed5c816c1b5496b10b4142310d79ab6b825eb12280cf3c7304e768e6c8acd77105faa8574cf21afbf27810c9b7eac31010b9 SHA512 7ac842e68e6ba577b33df50ebe5c5fd250b1f4bc4e1ec1112be4fc806980d21f73f33612b14024626904a6116a8c72b83f2b7c5405fc111cd2164b4744f843d1 -DIST wasm-bindgen-macro-0.2.74.crate 11536 BLAKE2B 65cd4b6206cc3f8303f89a76628cf54f7e31b31857eac3cc2c377b4a11f7c32548faf6a87f4a821e4ac6f66ca8d36427f4563eac8cc84e2612d5a9438b8df861 SHA512 34c7f3703ee1ee2060ba6ae638bc69193d32ced9e30c40d75bae1431efdd76b4f3adca8f9a72fb7c75f894de42a478556828e1a3854e436427bbd5dc6dc7b838 -DIST wasm-bindgen-macro-0.2.78.crate 11700 BLAKE2B 9f1538d79a39555f643b9ac6bfe026c259dfd129c45fdcc33cfbeeba2acb2a26ff4c9df83a3d11674c5ef8e9393af7a4d0cd7e3bd08b7eca0fa55986c893c5e3 SHA512 3389922198b0d5c19163f4de345e0cd7a3c0609d48ff933bd5af0cfb205463632878b5d60bfeeb8dd8f8a98f28f23c5185dd6d8389f599f31176297c944b595d -DIST wasm-bindgen-macro-support-0.2.65.crate 17801 BLAKE2B 1c54484f3d04e4da5b5d9c0f30935420f04a3db9389190f1dfb051c283a274a9f3c37685db6e3f40f836f022c92f9613f5b1570b47d53ca1f15418c4b6e02e95 SHA512 7c12ac36a8e7295e66dc3bdddb26ba2ccef73d1d47dddc98d7416f387963a3def8e86e07dd1464703e9f06132ad1353d54f6d220fcebd2d96bb85dcf10d1f84b -DIST wasm-bindgen-macro-support-0.2.68.crate 17793 BLAKE2B 619c0484ce4f97742972f1f6fed67643f570df3bad436cd2a93c5cd7477a8208082cafdad87e01caa1ba752bb200e65c61e49136e8037a9c52b9f06ca0c4ba9c SHA512 53d3e483a7df0a816eba308e5a9a736b5e812da9778889686994ed964888b4bb9a8b12cea448b1c68607e6a8b10596f8a81f4c85dc1311667cea5f445e7bb993 -DIST wasm-bindgen-macro-support-0.2.70.crate 17904 BLAKE2B 614121a2625eaaaa8303576cc3c3b05961aaa7c4ea0a65244f055582d8c22960d019e4afcaf7332f7ed7fc742a07ad654eb9848587f36270a6c7a64b9e83f4ea SHA512 a88b4650a05d28f1bf42a236b7f506450f3f84a215e363bb1fd434804bd73211ee7117a4fc07a6f4153aeaf8ad03737617aa29bc4072dd4c9f9a0f2c7fbeedab -DIST wasm-bindgen-macro-support-0.2.73.crate 17835 BLAKE2B 8e18ef319106273d3f41e947bd1f5ffa7a91e04f713fd67fa0bb697579ae51bbcce75b48a91949aca8e64e6f52ed35eda6b49cec366365126115a9c30572281c SHA512 22e322840ebda05ffdd2f4ffd07745d0f24b928e3425c66425392560f8dd59b007f80d7c4e4a01dafd83c09d76953ecc2cd61d362219791ed88f7f4ecc56960d -DIST wasm-bindgen-macro-support-0.2.74.crate 17831 BLAKE2B 29f3828f58b0e8eaae04e1d73bbf0b4cea7b75c1a5ae4348938a5f77d9eb1a1ee13dd137f9750f4c8defa6f2f5444d66b6715bc5052c57a603bf3a94cb05a428 SHA512 feab4a3661a879d5fdef852531e3261060db46f1d80106926bc8a8294a19adb104a9cfb59f3fead693abf3707118084a063906248d3f4c566b43e9aa9c2983b4 -DIST wasm-bindgen-macro-support-0.2.78.crate 17858 BLAKE2B 8378f639a94797d2d149f2cd836f56143a498d3be5fc30eced6fe4fc2e1bfe14a70f3165cdc5cc1c88f0162efec75b64e56aa9819596984afa97003601b933ce SHA512 84d9867407a7caa942ab11f0ad1c343839bf51793930cdc3ebc5279ca370062eda006540448cc401f6afa078dbb1523b348ae69f4c6d7ccc9a7b8fa1ff895236 -DIST wasm-bindgen-shared-0.2.65.crate 6745 BLAKE2B 3881c8e3db5968f51490676cdfa5a06f8def5e8d6417e41ad592f506291299863342fb59984249ab2484ce6135f67df4545f1ab896bc99dc8cd60ef318223e90 SHA512 32aba8419c42b6798ebeeb57cb562251db6d37bff84b4e2f29264b5f910e8e1fc76c8989f82bd8e224dff978d1e7c25ac19e646f93474f7dd53a85ad2a05d284 -DIST wasm-bindgen-shared-0.2.68.crate 6725 BLAKE2B 891ce0bf742bb32be1549c5b8822952f5cdd15ddd73aed164f753fef211c4087269fc3a859950045bf1e895e255b6f09b6788a7a5d43387365079f106580bf90 SHA512 cf161076d07dd7e91790bb1f773a6f53cf31cc0f9ffe7a650c98d2c6c98d02ba8d1b32fc2aa15128f739c86f49baf206444516c3f8b8df82238eabb72032be0f -DIST wasm-bindgen-shared-0.2.70.crate 6729 BLAKE2B ae9f755efcb7efdc8aae9bbaa4809526ef3b9b03d0caee6bf673e739d268d7de3c40d395e8c78d4b021c18dd457bcfe038e4bb3d15e846d4446f5414819afa17 SHA512 f9ef2275fb3ef0c61d7ed84e72e820f5b607981e57e0ec042cddc631789533da87a36f717ab6ff7a5f1dbf00f809cb32ab593514aa5fcd586ca0e4fdf53c62c3 -DIST wasm-bindgen-shared-0.2.73.crate 6691 BLAKE2B fbde26dfb5f36474ed3e01f7254dbe742a205cacc85848b85efda09c22e1f9fdb464bd3b7a2c429b73e4f5f3095803e9e477cfb81d6bcc779c04c2602c465bb6 SHA512 d3a28e4bf42071496f2e48c3ba3134a06856be12deac79fe13d1e2e7da8018d5e7f220f4dcc02fdda9eddfc2d52ceef18cd180db7d2bcced44e88a36304f947c -DIST wasm-bindgen-shared-0.2.74.crate 7163 BLAKE2B 076464004d12495342a4b24f1dedc629f0ebb49993fce74271a5e59cd39e9a38ceea9a287716c65c2e61744c829388f7cdd7597a541da22b4f794b8bc3d44094 SHA512 4613c677d04abcabe6132f8f2a5a24f622cb1cb0c084f535e2f97584acba7a0faa12fd0636186b58756a7e4a82f364b04ea73330d7841940917f5e3324d0e60a -DIST wasm-bindgen-shared-0.2.78.crate 7206 BLAKE2B ee60946d3a90a2760d8cb045657de659c6367aed2d98efd60074cb57f6b06aedf9ac44fed3d41c20299c5edc095cac5537a365fdb01183f3e60b6323da581935 SHA512 a808b7a7909e4a287ccced1b251ad4c1230399c84c05e246127b6a91fa4ed328d6a24316dbdc1843db71a5bd78cfd80113424f9984e0777323d74e3125607134 -DIST wasm-bindgen-webidl-0.2.65.crate 35843 BLAKE2B 444b0c2d46d6971b7bd06f9ed80fb2088818524a58aefe4b0dac7ca4be40bb3480228883feeacadae3be1b3e6c30b7d5642cdae6fd23c11212991eb26a3a9e5e SHA512 3ee204a0e7588f02b19e03c83843f773b179a07815b1c17bb814fb78e5a430ee0d3c8a58b626465709a6f62efadd9467ea9869f5d44c22e3bda2142e96a38267 -DIST wasm-bindgen-webidl-0.2.68.crate 35751 BLAKE2B 0ead30af7cc22475150d9a8c14f75606427e8d9ccaba8d566d76d32f4aa70f5f22812871abf003bb29e81891936e7a2c7f23d323e45480a806aaa6b0ba10ef28 SHA512 e28946290221b0af418f5ba75190e689e99fd67806de329a4dfa9826f389927eb7f93bc74a96f74c1b5d77f9d71373b081b06b7c047d8e0c144667e5dd19e375 -DIST wasm-bindgen-webidl-0.2.70.crate 35872 BLAKE2B e6f9146165cd5097c6b402a5484e06e8e51d21cdc69697cc9a99021c343897dd2b76408b3e8b3c3fd9d25830340190fdae51b0b2ca779b23d105a1654b7a9343 SHA512 ba6a513c69f8b284cf43a71b2fc3cde43ec89f542073c2b8273e9b7a8f96c505a0cf8f62bc8fba2bf0957a1d8f6b68ab625419c0f7f4ea6f7e93b49b63b14034 -DIST wasm-bindgen-webidl-0.2.73.crate 35649 BLAKE2B 4be4503ef4e12100b7109ef14c59b708858fd30d56939263254c881206d986f5d4d91d4df5d031479989ed36c57cd2d51b73563652c1e74bc20597b4894863a4 SHA512 868da400b9a6828330e64fbd56b724f315c94cc2fa0c3429db2dd3980b960dc4887f676dc3f845a38addf3f5d8cf8892bed0e12272990886cb45826c0441fecd -DIST wasm-bindgen-webidl-0.2.74.crate 35657 BLAKE2B 22e9fc1503833035213afcbec8402cd62c62f183ed51c970af883772b38ab24dc41c981edb6c1bfa0282ab6cd62270bc3e34437e68e768310a26a02513bb58cd SHA512 0b18a3638625a2d574a005d6d8a4acf05fa3d5d217a673c9a4276725fc96840c2a4775c29f6a2205a5a83524a50f440872263d7098767140c96e3eaa03e5f3f6 -DIST web-sys-0.3.42.crate 628615 BLAKE2B 7fa7c50c8e71c6b9ac43e056f70a03ddd9532b756fda50ce2183a7f24bbf3b2ad6fbca29f10f955e0032d21aa20b966c2a292f24defc00ad9021af86c0115006 SHA512 6e0af1c1f2ba0ea63033b67c25d45ec550086ba864eea532175e4424a7073f7c2a9d006f19702cbd3369eea80bce08bc25a014911ea1d7ffcc9e3c007e711a4b -DIST web-sys-0.3.45.crate 630993 BLAKE2B a5a72bf3785902a65a7fd65b53d696b491e9438ba4dd78d4e97f3c3d62df4144716ca09822e074f27ae5506765c7c2d547a110ccaf5c4c214da6b5a4816425b8 SHA512 d208e2271f59691b13b94b952dbce966f54ca180d09c6725964541c00684787a3610623294f81032cc931273ac655dc6163b23fda736b603ff327abd603fbfc8 -DIST web-sys-0.3.47.crate 648902 BLAKE2B a670816a41130dc1c5a202cfb7e60f281850be7916c825096a41e306ec2a221a443eafcc1a2e8d037697ee3fe564968974947fd29b026f6a565d0e542114aec1 SHA512 d8edc7e942fa3c97102dca51a2d398c616d96b7a9aba872f055e9e2dc00878f59fb7bf3c4975f527300bc7fc418f5da8a2f6ba8242a5e9f2edc445d391a47813 -DIST web-sys-0.3.50.crate 650100 BLAKE2B 448227dfbb6b91ab316ceebe554c9d9b89c397c25cd465f2e8a77560f185eb7308caf3b6052946e691d8fc22d6d382a0e3f164f7d29d873591ce17da792a993a SHA512 32afbfd3021c6cc4f228fc1762a4e29935373f4e7c572128723b508e6ab9588f3737167b91d5837e05a08c0bd182dd339c8f16b71e8a032f7e735cd619949d14 -DIST web-sys-0.3.51.crate 651133 BLAKE2B 330aaa7323a516eb840b2a6ff0ee2e076ed70990c04679dca328d5eeae9aac01fb07a4e2852615715f14abe368989f84f159ac72a4c320c01437056dd7dec706 SHA512 fd0e1ec156d88699adc271d092dd1adf4d41cd554b2b49e2c53423eabbc2215b539a435d1b9146dccc40282339d766565ccdedef82febcafca43cb6e1437e5fc -DIST web-sys-0.3.55.crate 664827 BLAKE2B 1864f320e6c9b80c6b4b4fd8941d66cf9368a9b0cebcb86d3486b99f65456748b46c507a1bb761611c4825d412986f5bd8c8fc38c3bda3dad2e9de213467ee51 SHA512 ddf191f009d49388bf60ee31650eff1ff884f01822989a226c559b9560aebd90681fadd34e7437f555d627a0a3139ebe267375618eadac8c17ace5fd47650764 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5 +DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa +DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462 +DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7 +DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07 +DIST wasm-bindgen-webidl-0.2.75.crate 36412 BLAKE2B 28f31c6d56ebbcc3f6efa8ba81e9402b813d75a1626f10de4202083b5f77d5e05ff8db1ced914fb888f24b4e4cf69ea159d9421f0e7eee040aaf15df9bda060d SHA512 65e51312cdd3c8ffed9b1ced0809c6f46f55bb188ed6831fce528e49af2780b8b5fc19210fa3aab254baabc3bee5778e5aaded42ef0b59da1cdec3c0fb146d3b +DIST web-sys-0.3.65.crate 734287 BLAKE2B 38891902fd194962dfeabd71ec799727c87bfe119ea1a47fa1ee52bb074792de40fbd2a7d65f5c2bbffb89ee045b10e1f6a464a9cd1e1830b9760a92cc1d96ae SHA512 870eb6cc0fc0cdbc9facc79c34ff98086a53dbc840cf17b16232b13eb2e79bffe75b792eaa1ec1a1c3d601e282687c8e5592a1ec2389bfc818873eb0639cb53a DIST which-3.1.1.crate 8071 BLAKE2B b53adc5136f26fc1be6ae18987d0129527cfd6eb2fb1f0876600ff55ac2f935f608337ff89478f3aed2e8c97a08c474109382a56eabe67dc788b744d90c73ad9 SHA512 3677d709eced54a332e68d9c9385708205838301a576da0c4d88049403a81676c3939a97cd1bec4ab261c7e8fb6211956b47afe5d1fee84d9c4ecf4eb30184f5 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 -DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36 +DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows-targets-0.52.5.crate 6376 BLAKE2B 1d39fd86380ab086c536d88e67b60956410b345790ccea62a25e6a700757b2a9cfa6dfeb7b86934cf47b981ea2e5f42dddf49780ad9829a551dc507fcf108641 SHA512 d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_gnullvm-0.52.5.crate 433266 BLAKE2B dee1b69cdf1fbd4143136909e4df3adaa7b80d7630a01ca9a42fc5ad0d5a4d9a9e2873b43c6d8e55de59f237d9199fad0768c4e1cda3b1e5354847bd70d4c79e SHA512 b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_aarch64_msvc-0.52.5.crate 827944 BLAKE2B 3bcb16d527be1dfdf18a9105ab259a064f00e949937ca423c8dcd1d2b90090d85aa7e42ca6ccc50c9baeee1aa144123d0a04643f9ff1147e62b2fce28b8a697b SHA512 c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_gnu-0.52.5.crate 875699 BLAKE2B 528ea431d080c5326e4c6ed316d9ea3e38b40c2e1322a12a432506a2c11555a94537661a0941e90c20eff4a9ce42c12539876dae6e77a1df18b522529928b309 SHA512 cc3e0362fb62dd5e8a855bda3be0177708ec8629ee9685f1f9aaac3f71a8cb082387388bdf49b09d3f5ee24a636b0b4f933d2c8bb75db434ee0192c8ce0547d2 +DIST windows_i686_gnullvm-0.52.5.crate 473064 BLAKE2B abe41ee330c05ee1366b3a835d15c6db3964ffd7b340ee69d215056b0d4b65c67f2782b0c04a55db64001098de87c93e2d447e25ef2a27f2cfa6685b8cf20c88 SHA512 da45c882248070911bf55698f62c245cb081a23254cdcf578df053905adb9117454235e52dcf1dd97c0d2248f92ff1d2fd3e18844a7be8d93ba08590c1eca22b +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_i686_msvc-0.52.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693fc871ea0d7d33f52f60e164bacb35cec13d463af07c57fec4667948047cc222d8bda7f6a0be01a07e7184b69e4adc2b4577 SHA512 08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634 +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08 +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f diff --git a/net-libs/quiche/quiche-0.10.0.ebuild b/net-libs/quiche/quiche-0.10.0.ebuild deleted file mode 100644 index 1af1e9043742..000000000000 --- a/net-libs/quiche/quiche-0.10.0.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anyhow-1.0.26 -ansi_term-0.11.0 -aho-corasick-0.7.18 -arrayvec-0.4.11 -atty-0.2.14 -autocfg-1.0.1 -backtrace-0.3.37 -backtrace-sys-0.1.31 -bindgen-0.57.0 -bitflags-1.3.2 -boring-sys-1.1.1 -bstr-0.2.12 -bumpalo-3.7.1 -byteorder-1.3.4 -cast-0.2.3 -cc-1.0.70 -cexpr-0.4.0 -cfg-if-0.1.10 -cfg-if-1.0.0 -clang-sys-1.2.2 -clap-2.33.3 -cmake-0.1.45 -criterion-0.3.1 -criterion-plot-0.4.1 -crossbeam-deque-0.7.3 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.2.1 -crossbeam-utils-0.7.2 -csv-1.1.3 -csv-core-0.1.10 -either-1.5.3 -darling-0.13.0 -darling_core-0.13.0 -darling_macro-0.13.0 -env_logger-0.8.4 -fnv-1.0.7 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -glob-0.3.0 -hashbrown-0.11.2 -hermit-abi-0.1.19 -humantime-2.1.0 -ident_case-1.0.1 -idna-0.1.5 -iovec-0.1.4 -itertools-0.8.2 -itoa-0.4.8 -js-sys-0.3.55 -kernel32-sys-0.2.2 -lazycell-1.3.0 -lazy_static-1.4.0 -libc-0.2.102 -libloading-0.7.0 -libm-0.2.1 -log-0.4.14 -matches-0.1.9 -maybe-uninit-2.0.0 -memchr-2.4.1 -memoffset-0.5.3 -mio-0.6.23 -miow-0.2.2 -net2-0.2.37 -nom-5.1.2 -num-traits-0.2.11 -num_cpus-1.12.0 -peeking_take_while-0.1.2 -indexmap-1.7.0 -once_cell-1.8.0 -oorandom-11.1.0 -percent-encoding-1.0.1 -plotters-0.2.12 -proc-macro2-1.0.29 -qlog-0.5.0 -quote-1.0.9 -rayon-1.3.0 -rayon-core-1.7.0 -regex-1.5.4 -regex-automata-0.1.9 -regex-syntax-0.6.25 -ring-0.16.20 -rustc_version-0.2.3 -rustc-hash-1.1.0 -rustversion-1.0.5 -ryu-1.0.5 -same-file-1.0.6 -scopeguard-1.1.0 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.130 -serde_derive-1.0.130 -serde_json-1.0.68 -serde_with-1.10.0 -serde_with_macros-1.5.0 -shlex-0.1.1 -slab-0.4.4 -smallvec-1.4.0 -spin-0.5.2 -strsim-0.8.0 -strsim-0.10.0 -syn-1.0.76 -termcolor-1.1.2 -textwrap-0.11.0 -tinytemplate-1.0.3 -tinyvec-1.4.0 -tinyvec_macros-0.1.0 -unicode-bidi-0.3.6 -unicode-normalization-0.1.19 -unicode-width-0.1.9 -unicode-xid-0.1.0 -unicode-xid-0.2.2 -untrusted-0.7.1 -url-1.7.2 -vec_map-0.8.2 -version_check-0.9.3 -walkdir-2.3.1 -wasm-bindgen-0.2.78 -wasm-bindgen-backend-0.2.78 -wasm-bindgen-macro-0.2.78 -wasm-bindgen-macro-support-0.2.78 -wasm-bindgen-shared-0.2.78 -wasm-bindgen-webidl-0.2.74 -web-sys-0.3.55 -which-3.1.1 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.5 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal - -DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" -HOMEPAGE="https://github.com/cloudflare/quiche" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git" - inherit git-r3 -else - CRATES+=" ${P//_/-}" - SRC_URI="$(cargo_crate_uris ${CRATES})" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P//_/-}" -fi - -LICENSE="|| ( Apache-2.0 Boost-1.0 ) - || ( Apache-2.0 MIT ) - || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) - BSD-2 - BSD - ISC - MIT - || ( Unlicense MIT ) - openssl" -SLOT="0/0" -IUSE="" -DOCS=( CODEOWNERS COPYING README.md ) - -BDEPEND=" - >=virtual/rust-1.47.0[${MULTILIB_USEDEP}] - dev-util/cmake -" -DEPEND="" -RDEPEND="" - -CMAKE_USE_DIR="${S}/deps/boringssl" -BUILD_DIR="${WORKDIR}/${P}" - -src_unpack() { - if [[ "${PV}" == *9999* ]]; then - git-r3_src_unpack - cargo_live_src_unpack - else - cargo_src_unpack - tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die - fi -} - -src_prepare() { - default - cmake_src_prepare - multilib_copy_sources -} - -multilib_src_configure() { - append-flags "-fPIC" - local mycmakeargs=( - -DOPENSSL_NO_ASM=ON - -DBUILD_SHARED_LIBS=OFF - ) - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure -} - -multilib_src_compile() { - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)" -} - -multilib_src_test() { - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" -} - -multilib_src_install() { - sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die - insinto "/usr/$(get_libdir)/pkgconfig" - doins target/release/quiche.pc - doheader -r include/* - dolib.so "target/$(rust_abi)/release/libquiche.so" - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS - QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 -} diff --git a/net-libs/quiche/quiche-0.21.0.ebuild b/net-libs/quiche/quiche-0.21.0.ebuild new file mode 100644 index 000000000000..a9b28c4abdb5 --- /dev/null +++ b/net-libs/quiche/quiche-0.21.0.ebuild @@ -0,0 +1,276 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +${PN}@${PV} +anyhow@1.0.26 +ansi_term@0.11.0 +aho-corasick@1.1.3 +android-tzdata@0.1.1 +android_system_properties@0.1.5 +arrayvec@0.7.4 +atty@0.2.14 +autocfg@1.2.0 +backtrace@0.3.37 +backtrace@sys-0.1.31 +base64@0.21.7 +bindgen@0.68.1 +bitflags@1.3.2 +bitflags@2.5.0 +boring@4.6.0 +boring-sys@4.6.0 +bstr@0.2.12 +bumpalo@3.15.4 +byteorder@1.3.4 +cast@0.2.3 +cc@1.0.94 +cexpr@0.6.0 +cfg@if-0.1.10 +cfg@if-1.0.0 +chrono@0.4.35 +clang-sys@1.7.0 +clap@2.33.3 +cmake@0.1.50 +core-foundation-sys@0.8.6 +criterion@0.3.1 +criterion@plot-0.4.1 +crossbeam@deque-0.7.3 +crossbeam@epoch-0.8.2 +crossbeam@queue-0.2.1 +crossbeam@utils-0.7.2 +csv@1.1.3 +csv@core-0.1.10 +data-encoding@2.5.0 +darling@0.20.8 +darling_core@0.20.8 +darling_macro@0.20.8 +data@encoding-2.3.3 +deranged@0.3.11 +either@1.11.0 +env_logger@0.8.4 +equivalent@1.0.1 +fnv@1.0.7 +foreign-types@0.5.0 +foreign-types-macros@0.2.3 +foreign-types-shared@0.3.1 +form_urlencoded@1.2.1 +fuchsia-zircon@0.3.3 +fuchsia-zircon-sys@0.3.3 +fs_extra@1.3.0 +fslock@0.2.1 +getrandom@0.2.14 +glob@0.3.1 +hashbrown@0.12.3 +hashbrown@0.14.3 +hermit@abi-0.1.19 +hex@0.4.3 +humantime@2.1.0 +iana-time-zone-haiku@0.1.2 +iana-time-zone@0.1.60 +ident_case@1.0.1 +idna@0.5.0 +intrusive-collections@0.9.6 +iovec@0.1.4 +itertools@0.8.2 +itoa@1.0.11 +js-sys@0.3.69 +kernel32-sys@0.2.2 +lazycell@1.3.0 +lazy_static@1.4.0 +libc@0.2.153 +libloading@0.8.3 +libm@0.2.8 +log@0.4.21 +matches@0.1.10 +maybe-uninit@2.0.0 +memchr@2.7.2 +memoffset@0.9.1 +minimal-lexical@0.2.1 +mio@0.8.11 +miow@0.4.0 +net2@0.2.37 +nom@7.1.3 +num-conv@0.1.0 +num-traits@0.2.18 +num_cpus@1.12.0 +octets@0.3.0 +peeking_take_while@0.1.2 +indexmap@1.9.3 +indexmap@2.2.6 +once_cell@1.19.0 +oorandom@11.1.0 +percent-encoding@2.3.1 +pkg-config@0.3.30 +plotters@0.2.12 +powerfmt@0.2.0 +proc-macro2@1.0.80 +qlog@0.13.0 +quote@1.0.36 +rayon@1.3.0 +rayon@core-1.7.0 +regex@1.10.4 +regex-automata@0.4.6 +regex-syntax@0.8.3 +ring@0.17.8 +rustc_version@0.2.3 +rustc@hash-1.1.0 +rustversion@1.0.6 +rust_decimal@1.35.0 +ryu@1.0.17 +same-file@1.0.6 +scopeguard@1.1.0 +sfv@0.9.4 +semver@0.9.0 +semver-parser@0.7.0 +serde@1.0.197 +serde_derive@1.0.197 +serde_json@1.0.115 +serde_with@3.7.0 +serde_with_macros@3.7.0 +shlex@1.3.0 +slab@0.4.9 +smallvec@1.13.2 +spin@0.9.8 +strsim@0.8.0 +strsim@0.10.0 +syn@1.0.109 +syn@2.0.59 +termcolor@1.1.2 +textwrap@0.11.0 +time@0.3.34 +time-core@0.1.2 +time-macros@0.2.17 +tinytemplate@1.0.3 +tinyvec@1.6.0 +tinyvec_macros@0.1.1 +unicode-bidi@0.3.15 +unicode-ident@1.0.12 +unicode-normalization@0.1.23 +unicode-width@0.1.10 +unicode-xid@0.2.4 +unicode-xid@0.2.3 +untrusted@0.9.0 +url@2.5.0 +vec_map@0.8.2 +version_check@0.9.4 +walkdir@2.3.1 +wasm-bindgen@0.2.92 +wasm-bindgen-backend@0.2.92 +wasm-bindgen-macro@0.2.92 +wasm-bindgen-macro-support@0.2.92 +wasm-bindgen-shared@0.2.92 +wasm-bindgen-webidl@0.2.75 +wasi@0.11.0+wasi-snapshot-preview1 +web-sys@0.3.65 +which@3.1.1 +winapi@0.2.8 +winapi@0.3.9 +winapi-build@0.1.1 +winapi-i686-pc-windows-gnu@0.4.0 +winapi-util@0.1.5 +winapi-x86_64-pc-windows-gnu@0.4.0 +windows-core@0.52.0 +windows_aarch64_gnullvm@0.48.5 +windows_aarch64_gnullvm@0.52.5 +windows_aarch64_msvc@0.48.5 +windows_aarch64_msvc@0.52.5 +windows_i686_gnu@0.48.5 +windows_i686_gnu@0.52.5 +windows_i686_gnullvm@0.52.5 +windows_i686_msvc@0.48.5 +windows_i686_msvc@0.52.5 +windows_x86_64_gnu@0.48.5 +windows_x86_64_gnu@0.52.5 +windows_x86_64_gnullvm@0.48.5 +windows_x86_64_gnullvm@0.52.5 +windows_x86_64_msvc@0.48.5 +windows_x86_64_msvc@0.52.5 +windows-sys@0.48.0 +windows-sys@0.52.0 +windows-targets@0.48.5 +windows-targets@0.52.5 +ws2_32-sys@0.2.1 +" + +inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal + +DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" +HOMEPAGE="https://github.com/cloudflare/quiche" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git" + inherit git-r3 + CMAKE_USE_DIR="${S}/quiche/deps/boringssl" +else + SRC_URI="${CARGO_CRATE_URIS}" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + S="${WORKDIR}/${P//_/-}" + CMAKE_USE_DIR="${S}/deps/boringssl" +fi + +LICENSE="|| ( Apache-2.0 Boost-1.0 ) + || ( Apache-2.0 MIT ) + || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) + BSD-2 + BSD + ISC + MIT + || ( Unlicense MIT ) + openssl" +SLOT="0/0" +IUSE="" +DOCS=( COPYING README.md ) + +BDEPEND=" + >=virtual/rust-1.66.0[${MULTILIB_USEDEP}] + dev-build/cmake +" +DEPEND="" +RDEPEND="" + +BUILD_DIR="${WORKDIR}/${P}" + +src_unpack() { + if [[ "${PV}" == *9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die + fi +} + +src_prepare() { + cmake_src_prepare + multilib_copy_sources +} + +multilib_src_configure() { + append-flags "-fPIC" + local mycmakeargs=( + -DOPENSSL_NO_ASM=ON + -DBUILD_SHARED_LIBS=OFF + ) + BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure +} + +multilib_src_compile() { + BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl + QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)" +} + +multilib_src_test() { + QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" +} + +multilib_src_install() { + sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/$(rust_abi)/release/quiche.pc || die + insinto "/usr/$(get_libdir)/pkgconfig" + doins target/$(rust_abi)/release/quiche.pc + doheader -r include/* + dolib.so "target/$(rust_abi)/release/libquiche.so" + QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS + QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 +} diff --git a/net-libs/quiche/quiche-0.5.1.ebuild b/net-libs/quiche/quiche-0.5.1.ebuild deleted file mode 100644 index 2f16f911407a..000000000000 --- a/net-libs/quiche/quiche-0.5.1.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anyhow-1.0.26 -aho-corasick-0.7.6 -arrayvec-0.4.11 -atty-0.2.14 -autocfg-1.0.0 -backtrace-0.3.37 -backtrace-sys-0.1.31 -bitflags-1.2.1 -bstr-0.2.12 -bumpalo-3.4.0 -byteorder-1.3.4 -cast-0.2.3 -cc-1.0.58 -cfg-if-0.1.10 -clap-2.33.0 -cmake-0.1.44 -criterion-0.3.1 -criterion-plot-0.4.1 -crossbeam-deque-0.7.3 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.2.1 -crossbeam-utils-0.7.2 -csv-1.1.3 -csv-core-0.1.10 -either-1.5.3 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -hermit-abi-0.1.8 -idna-0.1.5 -iovec-0.1.4 -itertools-0.8.2 -itoa-0.4.6 -js-sys-0.3.42 -kernel32-sys-0.2.2 -lazy_static-1.4.0 -libc-0.2.72 -libm-0.2.1 -log-0.4.11 -matches-0.1.8 -maybe-uninit-2.0.0 -memchr-2.3.3 -memoffset-0.5.3 -mio-0.6.22 -miow-0.2.1 -net2-0.2.34 -num-traits-0.2.11 -num_cpus-1.12.0 -once_cell-1.4.0 -oorandom-11.1.0 -percent-encoding-1.0.1 -plotters-0.2.12 -proc-macro2-1.0.18 -qlog-0.3.0 -quote-1.0.7 -rayon-1.3.0 -rayon-core-1.7.0 -regex-1.3.5 -regex-automata-0.1.9 -regex-syntax-0.6.17 -ring-0.16.15 -rustc_version-0.2.3 -ryu-1.0.5 -same-file-1.0.6 -scopeguard-1.1.0 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.114 -serde_derive-1.0.114 -serde_json-1.0.56 -serde_with-1.4.0 -serde_with_macros-1.1.0 -slab-0.4.2 -smallvec-1.4.0 -spin-0.5.2 -syn-1.0.34 -textwrap-0.11.0 -tinytemplate-1.0.3 -tinyvec-0.3.3 -unicode-bidi-0.3.4 -unicode-normalization-0.1.13 -unicode-width-0.1.7 -unicode-xid-0.1.0 -unicode-xid-0.2.1 -untrusted-0.7.1 -url-1.7.2 -walkdir-2.3.1 -wasm-bindgen-0.2.65 -wasm-bindgen-backend-0.2.65 -wasm-bindgen-macro-0.2.65 -wasm-bindgen-macro-support-0.2.65 -wasm-bindgen-shared-0.2.65 -wasm-bindgen-webidl-0.2.65 -web-sys-0.3.42 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.3 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain - -DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" -HOMEPAGE="https://github.com/cloudflare/quiche" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git" - inherit git-r3 -else - CRATES+=" ${P//_/-}" - SRC_URI="$(cargo_crate_uris ${CRATES})" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P//_/-}" -fi - -LICENSE="|| ( Apache-2.0 Boost-1.0 ) - || ( Apache-2.0 MIT ) - || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) - BSD-2 - BSD - ISC - MIT - || ( Unlicense MIT ) - openssl" -SLOT="0/0" -IUSE="" -DOCS=( CODEOWNERS COPYING README.md ) - -BDEPEND=" - >=virtual/rust-1.39.0[${MULTILIB_USEDEP}] - dev-util/cmake -" -DEPEND="" -RDEPEND="" - -CMAKE_USE_DIR="${S}/deps/boringssl" - -src_unpack() { - if [[ "${PV}" == *9999* ]]; then - git-r3_src_unpack - cargo_live_src_unpack - else - cargo_src_unpack - tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die - fi -} - -src_prepare() { - default - cmake-utils_src_prepare - multilib_copy_sources -} - -multilib_src_configure() { - append-flags "-fPIC" - local mycmakeargs=( - -DOPENSSL_NO_ASM=ON - -DBUILD_SHARED_LIBS=OFF - ) - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure -} - -multilib_src_compile() { - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)" -} - -multilib_src_test() { - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" -} - -multilib_src_install() { - sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die - insinto "/usr/$(get_libdir)/pkgconfig" - doins target/release/quiche.pc - doheader -r include/* - dolib.so "target/$(rust_abi)/release/libquiche.so" - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS - QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 - -} diff --git a/net-libs/quiche/quiche-0.6.0.ebuild b/net-libs/quiche/quiche-0.6.0.ebuild deleted file mode 100644 index 7bd57abb4a15..000000000000 --- a/net-libs/quiche/quiche-0.6.0.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anyhow-1.0.26 -aho-corasick-0.7.6 -arrayvec-0.4.11 -atty-0.2.14 -autocfg-1.0.0 -backtrace-0.3.37 -backtrace-sys-0.1.31 -bitflags-1.2.1 -bstr-0.2.12 -bumpalo-3.4.0 -byteorder-1.3.4 -cast-0.2.3 -cc-1.0.61 -cfg-if-0.1.10 -clap-2.33.0 -cmake-0.1.44 -criterion-0.3.1 -criterion-plot-0.4.1 -crossbeam-deque-0.7.3 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.2.1 -crossbeam-utils-0.7.2 -csv-1.1.3 -csv-core-0.1.10 -either-1.5.3 -darling-0.10.2 -darling_core-0.10.2 -darling_macro-0.10.2 -fnv-1.0.7 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -hermit-abi-0.1.8 -ident_case-1.0.1 -idna-0.1.5 -iovec-0.1.4 -itertools-0.8.2 -itoa-0.4.6 -js-sys-0.3.45 -kernel32-sys-0.2.2 -lazy_static-1.4.0 -libc-0.2.80 -libm-0.2.1 -log-0.4.11 -matches-0.1.8 -maybe-uninit-2.0.0 -memchr-2.3.3 -memoffset-0.5.3 -mio-0.6.22 -miow-0.2.1 -net2-0.2.35 -num-traits-0.2.11 -num_cpus-1.12.0 -once_cell-1.4.1 -oorandom-11.1.0 -percent-encoding-1.0.1 -plotters-0.2.12 -proc-macro2-1.0.24 -qlog-0.3.0 -quote-1.0.7 -rayon-1.3.0 -rayon-core-1.7.0 -regex-1.3.5 -regex-automata-0.1.9 -regex-syntax-0.6.17 -ring-0.16.15 -rustc_version-0.2.3 -ryu-1.0.5 -same-file-1.0.6 -scopeguard-1.1.0 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.117 -serde_derive-1.0.117 -serde_json-1.0.59 -serde_with-1.5.1 -serde_with_macros-1.2.2 -slab-0.4.2 -smallvec-1.4.0 -spin-0.5.2 -strsim-0.9.3 -syn-1.0.48 -textwrap-0.11.0 -tinytemplate-1.0.3 -tinyvec-0.3.4 -unicode-bidi-0.3.4 -unicode-normalization-0.1.13 -unicode-width-0.1.7 -unicode-xid-0.1.0 -unicode-xid-0.2.1 -untrusted-0.7.1 -url-1.7.2 -walkdir-2.3.1 -wasm-bindgen-0.2.68 -wasm-bindgen-backend-0.2.68 -wasm-bindgen-macro-0.2.68 -wasm-bindgen-macro-support-0.2.68 -wasm-bindgen-shared-0.2.68 -wasm-bindgen-webidl-0.2.68 -web-sys-0.3.45 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.3 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain - -DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" -HOMEPAGE="https://github.com/cloudflare/quiche" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git" - inherit git-r3 -else - CRATES+=" ${P//_/-}" - SRC_URI="$(cargo_crate_uris ${CRATES})" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P//_/-}" -fi - -LICENSE="|| ( Apache-2.0 Boost-1.0 ) - || ( Apache-2.0 MIT ) - || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) - BSD-2 - BSD - ISC - MIT - || ( Unlicense MIT ) - openssl" -SLOT="0/0" -IUSE="" -DOCS=( CODEOWNERS COPYING README.md ) - -BDEPEND=" - >=virtual/rust-1.39.0[${MULTILIB_USEDEP}] - dev-util/cmake -" -DEPEND="" -RDEPEND="" - -CMAKE_USE_DIR="${S}/deps/boringssl" - -src_unpack() { - if [[ "${PV}" == *9999* ]]; then - git-r3_src_unpack - cargo_live_src_unpack - else - cargo_src_unpack - tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die - fi -} - -src_prepare() { - default - cmake-utils_src_prepare - multilib_copy_sources -} - -multilib_src_configure() { - append-flags "-fPIC" - local mycmakeargs=( - -DOPENSSL_NO_ASM=ON - -DBUILD_SHARED_LIBS=OFF - ) - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure -} - -multilib_src_compile() { - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)" -} - -multilib_src_test() { - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" -} - -multilib_src_install() { - sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die - insinto "/usr/$(get_libdir)/pkgconfig" - doins target/release/quiche.pc - doheader -r include/* - dolib.so "target/$(rust_abi)/release/libquiche.so" - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS - QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 - -} diff --git a/net-libs/quiche/quiche-0.7.0.ebuild b/net-libs/quiche/quiche-0.7.0.ebuild deleted file mode 100644 index 55a9755ce101..000000000000 --- a/net-libs/quiche/quiche-0.7.0.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anyhow-1.0.26 -aho-corasick-0.7.6 -arrayvec-0.4.11 -atty-0.2.14 -autocfg-1.0.1 -backtrace-0.3.37 -backtrace-sys-0.1.31 -bitflags-1.2.1 -boring-sys-1.0.2 -bstr-0.2.12 -bumpalo-3.6.0 -byteorder-1.3.4 -cast-0.2.3 -cc-1.0.66 -cfg-if-0.1.10 -cfg-if-1.0.0 -clap-2.33.0 -cmake-0.1.45 -criterion-0.3.1 -criterion-plot-0.4.1 -crossbeam-deque-0.7.3 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.2.1 -crossbeam-utils-0.7.2 -csv-1.1.3 -csv-core-0.1.10 -either-1.5.3 -darling-0.10.2 -darling_core-0.10.2 -darling_macro-0.10.2 -fnv-1.0.7 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -hashbrown-0.9.1 -hermit-abi-0.1.8 -ident_case-1.0.1 -idna-0.1.5 -iovec-0.1.4 -itertools-0.8.2 -itoa-0.4.7 -js-sys-0.3.47 -kernel32-sys-0.2.2 -lazy_static-1.4.0 -libc-0.2.84 -libm-0.2.1 -log-0.4.14 -matches-0.1.8 -maybe-uninit-2.0.0 -memchr-2.3.3 -memoffset-0.5.3 -mio-0.6.23 -miow-0.2.2 -net2-0.2.37 -num-traits-0.2.11 -num_cpus-1.12.0 -indexmap-1.6.1 -once_cell-1.5.2 -oorandom-11.1.0 -percent-encoding-1.0.1 -plotters-0.2.12 -proc-macro2-1.0.24 -qlog-0.4.0 -quote-1.0.8 -rayon-1.3.0 -rayon-core-1.7.0 -regex-1.3.5 -regex-automata-0.1.9 -regex-syntax-0.6.17 -ring-0.16.19 -rustc_version-0.2.3 -ryu-1.0.5 -same-file-1.0.6 -scopeguard-1.1.0 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.123 -serde_derive-1.0.123 -serde_json-1.0.61 -serde_with-1.6.2 -serde_with_macros-1.3.0 -slab-0.4.2 -smallvec-1.4.0 -spin-0.5.2 -strsim-0.9.3 -syn-1.0.60 -textwrap-0.11.0 -tinytemplate-1.0.3 -tinyvec-1.1.1 -tinyvec_macros-0.1.0 -unicode-bidi-0.3.4 -unicode-normalization-0.1.16 -unicode-width-0.1.7 -unicode-xid-0.1.0 -unicode-xid-0.2.1 -untrusted-0.7.1 -url-1.7.2 -walkdir-2.3.1 -wasm-bindgen-0.2.70 -wasm-bindgen-backend-0.2.70 -wasm-bindgen-macro-0.2.70 -wasm-bindgen-macro-support-0.2.70 -wasm-bindgen-shared-0.2.70 -wasm-bindgen-webidl-0.2.70 -web-sys-0.3.47 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.3 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain - -DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" -HOMEPAGE="https://github.com/cloudflare/quiche" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git" - inherit git-r3 -else - CRATES+=" ${P//_/-}" - SRC_URI="$(cargo_crate_uris ${CRATES})" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P//_/-}" -fi - -LICENSE="|| ( Apache-2.0 Boost-1.0 ) - || ( Apache-2.0 MIT ) - || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) - BSD-2 - BSD - ISC - MIT - || ( Unlicense MIT ) - openssl" -SLOT="0/0" -IUSE="" -DOCS=( CODEOWNERS COPYING README.md ) - -BDEPEND=" - >=virtual/rust-1.47.0[${MULTILIB_USEDEP}] - dev-util/cmake -" -DEPEND="" -RDEPEND="" - -CMAKE_USE_DIR="${S}/deps/boringssl" - -src_unpack() { - if [[ "${PV}" == *9999* ]]; then - git-r3_src_unpack - cargo_live_src_unpack - else - cargo_src_unpack - tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die - fi -} - -src_prepare() { - default - cmake-utils_src_prepare - multilib_copy_sources -} - -multilib_src_configure() { - append-flags "-fPIC" - local mycmakeargs=( - -DOPENSSL_NO_ASM=ON - -DBUILD_SHARED_LIBS=OFF - ) - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure -} - -multilib_src_compile() { - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)" -} - -multilib_src_test() { - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" -} - -multilib_src_install() { - sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die - insinto "/usr/$(get_libdir)/pkgconfig" - doins target/release/quiche.pc - doheader -r include/* - dolib.so "target/$(rust_abi)/release/libquiche.so" - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS - QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 - -} diff --git a/net-libs/quiche/quiche-0.8.0.ebuild b/net-libs/quiche/quiche-0.8.0.ebuild deleted file mode 100644 index 1f5b5a82e1a6..000000000000 --- a/net-libs/quiche/quiche-0.8.0.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anyhow-1.0.26 -ansi_term-0.11.0 -aho-corasick-0.7.15 -arrayvec-0.4.11 -atty-0.2.14 -autocfg-1.0.1 -backtrace-0.3.37 -backtrace-sys-0.1.31 -bindgen-0.57.0 -bitflags-1.2.1 -boring-sys-1.1.1 -bstr-0.2.12 -bumpalo-3.6.1 -byteorder-1.3.4 -cast-0.2.3 -cc-1.0.67 -cexpr-0.4.0 -cfg-if-0.1.10 -cfg-if-1.0.0 -clang-sys-1.2.0 -clap-2.33.3 -cmake-0.1.45 -criterion-0.3.1 -criterion-plot-0.4.1 -crossbeam-deque-0.7.3 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.2.1 -crossbeam-utils-0.7.2 -csv-1.1.3 -csv-core-0.1.10 -either-1.5.3 -darling-0.12.3 -darling_core-0.12.3 -darling_macro-0.12.3 -env_logger-0.8.3 -fnv-1.0.7 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -glob-0.3.0 -hashbrown-0.9.1 -hermit-abi-0.1.18 -humantime-2.1.0 -ident_case-1.0.1 -idna-0.1.5 -iovec-0.1.4 -itertools-0.8.2 -itoa-0.4.7 -js-sys-0.3.50 -kernel32-sys-0.2.2 -lazycell-1.3.0 -lazy_static-1.4.0 -libc-0.2.93 -libloading-0.7.0 -libm-0.2.1 -log-0.4.14 -matches-0.1.8 -maybe-uninit-2.0.0 -memchr-2.3.4 -memoffset-0.5.3 -mio-0.6.23 -miow-0.2.2 -net2-0.2.37 -nom-5.1.2 -num-traits-0.2.11 -num_cpus-1.12.0 -peeking_take_while-0.1.2 -indexmap-1.6.2 -once_cell-1.7.2 -oorandom-11.1.0 -percent-encoding-1.0.1 -plotters-0.2.12 -proc-macro2-1.0.26 -qlog-0.4.0 -quote-1.0.9 -rayon-1.3.0 -rayon-core-1.7.0 -regex-1.4.5 -regex-automata-0.1.9 -regex-syntax-0.6.23 -ring-0.16.20 -rustc_version-0.2.3 -rustc-hash-1.1.0 -rustversion-1.0.4 -ryu-1.0.5 -same-file-1.0.6 -scopeguard-1.1.0 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.125 -serde_derive-1.0.125 -serde_json-1.0.64 -serde_with-1.8.0 -serde_with_macros-1.4.1 -shlex-0.1.1 -slab-0.4.2 -smallvec-1.4.0 -spin-0.5.2 -strsim-0.8.0 -strsim-0.10.0 -syn-1.0.69 -termcolor-1.1.2 -textwrap-0.11.0 -tinytemplate-1.0.3 -tinyvec-1.2.0 -tinyvec_macros-0.1.0 -unicode-bidi-0.3.5 -unicode-normalization-0.1.17 -unicode-width-0.1.8 -unicode-xid-0.1.0 -unicode-xid-0.2.1 -untrusted-0.7.1 -url-1.7.2 -vec_map-0.8.2 -version_check-0.9.3 -walkdir-2.3.1 -wasm-bindgen-0.2.73 -wasm-bindgen-backend-0.2.73 -wasm-bindgen-macro-0.2.73 -wasm-bindgen-macro-support-0.2.73 -wasm-bindgen-shared-0.2.73 -wasm-bindgen-webidl-0.2.73 -web-sys-0.3.50 -which-3.1.1 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.5 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain - -DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" -HOMEPAGE="https://github.com/cloudflare/quiche" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git" - inherit git-r3 -else - CRATES+=" ${P//_/-}" - SRC_URI="$(cargo_crate_uris ${CRATES})" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P//_/-}" -fi - -LICENSE="|| ( Apache-2.0 Boost-1.0 ) - || ( Apache-2.0 MIT ) - || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) - BSD-2 - BSD - ISC - MIT - || ( Unlicense MIT ) - openssl" -SLOT="0/0" -IUSE="" -DOCS=( CODEOWNERS COPYING README.md ) - -BDEPEND=" - >=virtual/rust-1.47.0[${MULTILIB_USEDEP}] - dev-util/cmake -" -DEPEND="" -RDEPEND="" - -CMAKE_USE_DIR="${S}/deps/boringssl" - -src_unpack() { - if [[ "${PV}" == *9999* ]]; then - git-r3_src_unpack - cargo_live_src_unpack - else - cargo_src_unpack - tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die - fi -} - -src_prepare() { - default - cmake-utils_src_prepare - multilib_copy_sources -} - -multilib_src_configure() { - append-flags "-fPIC" - local mycmakeargs=( - -DOPENSSL_NO_ASM=ON - -DBUILD_SHARED_LIBS=OFF - ) - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure -} - -multilib_src_compile() { - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)" -} - -multilib_src_test() { - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" -} - -multilib_src_install() { - sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die - insinto "/usr/$(get_libdir)/pkgconfig" - doins target/release/quiche.pc - doheader -r include/* - dolib.so "target/$(rust_abi)/release/libquiche.so" - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS - QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 - -} diff --git a/net-libs/quiche/quiche-0.8.1.ebuild b/net-libs/quiche/quiche-0.8.1.ebuild deleted file mode 100644 index 1f5b5a82e1a6..000000000000 --- a/net-libs/quiche/quiche-0.8.1.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anyhow-1.0.26 -ansi_term-0.11.0 -aho-corasick-0.7.15 -arrayvec-0.4.11 -atty-0.2.14 -autocfg-1.0.1 -backtrace-0.3.37 -backtrace-sys-0.1.31 -bindgen-0.57.0 -bitflags-1.2.1 -boring-sys-1.1.1 -bstr-0.2.12 -bumpalo-3.6.1 -byteorder-1.3.4 -cast-0.2.3 -cc-1.0.67 -cexpr-0.4.0 -cfg-if-0.1.10 -cfg-if-1.0.0 -clang-sys-1.2.0 -clap-2.33.3 -cmake-0.1.45 -criterion-0.3.1 -criterion-plot-0.4.1 -crossbeam-deque-0.7.3 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.2.1 -crossbeam-utils-0.7.2 -csv-1.1.3 -csv-core-0.1.10 -either-1.5.3 -darling-0.12.3 -darling_core-0.12.3 -darling_macro-0.12.3 -env_logger-0.8.3 -fnv-1.0.7 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -glob-0.3.0 -hashbrown-0.9.1 -hermit-abi-0.1.18 -humantime-2.1.0 -ident_case-1.0.1 -idna-0.1.5 -iovec-0.1.4 -itertools-0.8.2 -itoa-0.4.7 -js-sys-0.3.50 -kernel32-sys-0.2.2 -lazycell-1.3.0 -lazy_static-1.4.0 -libc-0.2.93 -libloading-0.7.0 -libm-0.2.1 -log-0.4.14 -matches-0.1.8 -maybe-uninit-2.0.0 -memchr-2.3.4 -memoffset-0.5.3 -mio-0.6.23 -miow-0.2.2 -net2-0.2.37 -nom-5.1.2 -num-traits-0.2.11 -num_cpus-1.12.0 -peeking_take_while-0.1.2 -indexmap-1.6.2 -once_cell-1.7.2 -oorandom-11.1.0 -percent-encoding-1.0.1 -plotters-0.2.12 -proc-macro2-1.0.26 -qlog-0.4.0 -quote-1.0.9 -rayon-1.3.0 -rayon-core-1.7.0 -regex-1.4.5 -regex-automata-0.1.9 -regex-syntax-0.6.23 -ring-0.16.20 -rustc_version-0.2.3 -rustc-hash-1.1.0 -rustversion-1.0.4 -ryu-1.0.5 -same-file-1.0.6 -scopeguard-1.1.0 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.125 -serde_derive-1.0.125 -serde_json-1.0.64 -serde_with-1.8.0 -serde_with_macros-1.4.1 -shlex-0.1.1 -slab-0.4.2 -smallvec-1.4.0 -spin-0.5.2 -strsim-0.8.0 -strsim-0.10.0 -syn-1.0.69 -termcolor-1.1.2 -textwrap-0.11.0 -tinytemplate-1.0.3 -tinyvec-1.2.0 -tinyvec_macros-0.1.0 -unicode-bidi-0.3.5 -unicode-normalization-0.1.17 -unicode-width-0.1.8 -unicode-xid-0.1.0 -unicode-xid-0.2.1 -untrusted-0.7.1 -url-1.7.2 -vec_map-0.8.2 -version_check-0.9.3 -walkdir-2.3.1 -wasm-bindgen-0.2.73 -wasm-bindgen-backend-0.2.73 -wasm-bindgen-macro-0.2.73 -wasm-bindgen-macro-support-0.2.73 -wasm-bindgen-shared-0.2.73 -wasm-bindgen-webidl-0.2.73 -web-sys-0.3.50 -which-3.1.1 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.5 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain - -DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" -HOMEPAGE="https://github.com/cloudflare/quiche" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git" - inherit git-r3 -else - CRATES+=" ${P//_/-}" - SRC_URI="$(cargo_crate_uris ${CRATES})" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P//_/-}" -fi - -LICENSE="|| ( Apache-2.0 Boost-1.0 ) - || ( Apache-2.0 MIT ) - || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) - BSD-2 - BSD - ISC - MIT - || ( Unlicense MIT ) - openssl" -SLOT="0/0" -IUSE="" -DOCS=( CODEOWNERS COPYING README.md ) - -BDEPEND=" - >=virtual/rust-1.47.0[${MULTILIB_USEDEP}] - dev-util/cmake -" -DEPEND="" -RDEPEND="" - -CMAKE_USE_DIR="${S}/deps/boringssl" - -src_unpack() { - if [[ "${PV}" == *9999* ]]; then - git-r3_src_unpack - cargo_live_src_unpack - else - cargo_src_unpack - tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die - fi -} - -src_prepare() { - default - cmake-utils_src_prepare - multilib_copy_sources -} - -multilib_src_configure() { - append-flags "-fPIC" - local mycmakeargs=( - -DOPENSSL_NO_ASM=ON - -DBUILD_SHARED_LIBS=OFF - ) - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure -} - -multilib_src_compile() { - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)" -} - -multilib_src_test() { - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" -} - -multilib_src_install() { - sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die - insinto "/usr/$(get_libdir)/pkgconfig" - doins target/release/quiche.pc - doheader -r include/* - dolib.so "target/$(rust_abi)/release/libquiche.so" - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS - QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 - -} diff --git a/net-libs/quiche/quiche-0.9.0-r1.ebuild b/net-libs/quiche/quiche-0.9.0-r1.ebuild deleted file mode 100644 index e3b15c8690e5..000000000000 --- a/net-libs/quiche/quiche-0.9.0-r1.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anyhow-1.0.26 -ansi_term-0.11.0 -aho-corasick-0.7.18 -arrayvec-0.4.11 -atty-0.2.14 -autocfg-1.0.1 -backtrace-0.3.37 -backtrace-sys-0.1.31 -bindgen-0.57.0 -bitflags-1.2.1 -boring-sys-1.1.1 -bstr-0.2.12 -bumpalo-3.7.0 -byteorder-1.3.4 -cast-0.2.3 -cc-1.0.68 -cexpr-0.4.0 -cfg-if-0.1.10 -cfg-if-1.0.0 -clang-sys-1.2.0 -clap-2.33.3 -cmake-0.1.45 -criterion-0.3.1 -criterion-plot-0.4.1 -crossbeam-deque-0.7.3 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.2.1 -crossbeam-utils-0.7.2 -csv-1.1.3 -csv-core-0.1.10 -either-1.5.3 -darling-0.13.0 -darling_core-0.13.0 -darling_macro-0.13.0 -env_logger-0.8.3 -fnv-1.0.7 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -glob-0.3.0 -hashbrown-0.9.1 -hermit-abi-0.1.18 -humantime-2.1.0 -ident_case-1.0.1 -idna-0.1.5 -iovec-0.1.4 -itertools-0.8.2 -itoa-0.4.7 -js-sys-0.3.51 -kernel32-sys-0.2.2 -lazycell-1.3.0 -lazy_static-1.4.0 -libc-0.2.95 -libloading-0.7.0 -libm-0.2.1 -log-0.4.14 -matches-0.1.8 -maybe-uninit-2.0.0 -memchr-2.4.0 -memoffset-0.5.3 -mio-0.6.23 -miow-0.2.2 -net2-0.2.37 -nom-5.1.2 -num-traits-0.2.11 -num_cpus-1.12.0 -peeking_take_while-0.1.2 -indexmap-1.6.2 -once_cell-1.7.2 -oorandom-11.1.0 -percent-encoding-1.0.1 -plotters-0.2.12 -proc-macro2-1.0.27 -qlog-0.4.0 -quote-1.0.9 -rayon-1.3.0 -rayon-core-1.7.0 -regex-1.5.4 -regex-automata-0.1.9 -regex-syntax-0.6.25 -ring-0.16.20 -rustc_version-0.2.3 -rustc-hash-1.1.0 -rustversion-1.0.5 -ryu-1.0.5 -same-file-1.0.6 -scopeguard-1.1.0 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.126 -serde_derive-1.0.126 -serde_json-1.0.64 -serde_with-1.9.2 -serde_with_macros-1.4.2 -shlex-0.1.1 -slab-0.4.3 -smallvec-1.4.0 -spin-0.5.2 -strsim-0.8.0 -strsim-0.10.0 -syn-1.0.72 -termcolor-1.1.2 -textwrap-0.11.0 -tinytemplate-1.0.3 -tinyvec-1.2.0 -tinyvec_macros-0.1.0 -unicode-bidi-0.3.5 -unicode-normalization-0.1.19 -unicode-width-0.1.8 -unicode-xid-0.1.0 -unicode-xid-0.2.2 -untrusted-0.7.1 -url-1.7.2 -vec_map-0.8.2 -version_check-0.9.3 -walkdir-2.3.1 -wasm-bindgen-0.2.74 -wasm-bindgen-backend-0.2.74 -wasm-bindgen-macro-0.2.74 -wasm-bindgen-macro-support-0.2.74 -wasm-bindgen-shared-0.2.74 -wasm-bindgen-webidl-0.2.74 -web-sys-0.3.51 -which-3.1.1 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.5 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal - -DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" -HOMEPAGE="https://github.com/cloudflare/quiche" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git" - inherit git-r3 -else - CRATES+=" ${P//_/-}" - SRC_URI="$(cargo_crate_uris ${CRATES})" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P//_/-}" -fi - -LICENSE="|| ( Apache-2.0 Boost-1.0 ) - || ( Apache-2.0 MIT ) - || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) - BSD-2 - BSD - ISC - MIT - || ( Unlicense MIT ) - openssl" -SLOT="0/0" -IUSE="" -DOCS=( CODEOWNERS COPYING README.md ) - -BDEPEND=" - >=virtual/rust-1.47.0[${MULTILIB_USEDEP}] - dev-util/cmake -" -DEPEND="" -RDEPEND="" - -CMAKE_USE_DIR="${S}/deps/boringssl" -BUILD_DIR="${WORKDIR}/${P}" - -src_unpack() { - if [[ "${PV}" == *9999* ]]; then - git-r3_src_unpack - cargo_live_src_unpack - else - cargo_src_unpack - tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die - fi -} - -src_prepare() { - default - cmake_src_prepare - multilib_copy_sources -} - -multilib_src_configure() { - append-flags "-fPIC" - local mycmakeargs=( - -DOPENSSL_NO_ASM=ON - -DBUILD_SHARED_LIBS=OFF - ) - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure -} - -multilib_src_compile() { - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)" -} - -multilib_src_test() { - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" -} - -multilib_src_install() { - sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die - insinto "/usr/$(get_libdir)/pkgconfig" - doins target/release/quiche.pc - doheader -r include/* - dolib.so "target/$(rust_abi)/release/libquiche.so" - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS - QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 -} diff --git a/net-libs/quiche/quiche-0.9.0.ebuild b/net-libs/quiche/quiche-0.9.0.ebuild deleted file mode 100644 index d2759feb7f7f..000000000000 --- a/net-libs/quiche/quiche-0.9.0.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anyhow-1.0.26 -ansi_term-0.11.0 -aho-corasick-0.7.18 -arrayvec-0.4.11 -atty-0.2.14 -autocfg-1.0.1 -backtrace-0.3.37 -backtrace-sys-0.1.31 -bindgen-0.57.0 -bitflags-1.2.1 -boring-sys-1.1.1 -bstr-0.2.12 -bumpalo-3.7.0 -byteorder-1.3.4 -cast-0.2.3 -cc-1.0.68 -cexpr-0.4.0 -cfg-if-0.1.10 -cfg-if-1.0.0 -clang-sys-1.2.0 -clap-2.33.3 -cmake-0.1.45 -criterion-0.3.1 -criterion-plot-0.4.1 -crossbeam-deque-0.7.3 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.2.1 -crossbeam-utils-0.7.2 -csv-1.1.3 -csv-core-0.1.10 -either-1.5.3 -darling-0.13.0 -darling_core-0.13.0 -darling_macro-0.13.0 -env_logger-0.8.3 -fnv-1.0.7 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -glob-0.3.0 -hashbrown-0.9.1 -hermit-abi-0.1.18 -humantime-2.1.0 -ident_case-1.0.1 -idna-0.1.5 -iovec-0.1.4 -itertools-0.8.2 -itoa-0.4.7 -js-sys-0.3.51 -kernel32-sys-0.2.2 -lazycell-1.3.0 -lazy_static-1.4.0 -libc-0.2.95 -libloading-0.7.0 -libm-0.2.1 -log-0.4.14 -matches-0.1.8 -maybe-uninit-2.0.0 -memchr-2.4.0 -memoffset-0.5.3 -mio-0.6.23 -miow-0.2.2 -net2-0.2.37 -nom-5.1.2 -num-traits-0.2.11 -num_cpus-1.12.0 -peeking_take_while-0.1.2 -indexmap-1.6.2 -once_cell-1.7.2 -oorandom-11.1.0 -percent-encoding-1.0.1 -plotters-0.2.12 -proc-macro2-1.0.27 -qlog-0.4.0 -quote-1.0.9 -rayon-1.3.0 -rayon-core-1.7.0 -regex-1.5.4 -regex-automata-0.1.9 -regex-syntax-0.6.25 -ring-0.16.20 -rustc_version-0.2.3 -rustc-hash-1.1.0 -rustversion-1.0.5 -ryu-1.0.5 -same-file-1.0.6 -scopeguard-1.1.0 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.126 -serde_derive-1.0.126 -serde_json-1.0.64 -serde_with-1.9.2 -serde_with_macros-1.4.2 -shlex-0.1.1 -slab-0.4.3 -smallvec-1.4.0 -spin-0.5.2 -strsim-0.8.0 -strsim-0.10.0 -syn-1.0.72 -termcolor-1.1.2 -textwrap-0.11.0 -tinytemplate-1.0.3 -tinyvec-1.2.0 -tinyvec_macros-0.1.0 -unicode-bidi-0.3.5 -unicode-normalization-0.1.19 -unicode-width-0.1.8 -unicode-xid-0.1.0 -unicode-xid-0.2.2 -untrusted-0.7.1 -url-1.7.2 -vec_map-0.8.2 -version_check-0.9.3 -walkdir-2.3.1 -wasm-bindgen-0.2.74 -wasm-bindgen-backend-0.2.74 -wasm-bindgen-macro-0.2.74 -wasm-bindgen-macro-support-0.2.74 -wasm-bindgen-shared-0.2.74 -wasm-bindgen-webidl-0.2.74 -web-sys-0.3.51 -which-3.1.1 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.5 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain - -DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" -HOMEPAGE="https://github.com/cloudflare/quiche" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git" - inherit git-r3 -else - CRATES+=" ${P//_/-}" - SRC_URI="$(cargo_crate_uris ${CRATES})" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P//_/-}" -fi - -LICENSE="|| ( Apache-2.0 Boost-1.0 ) - || ( Apache-2.0 MIT ) - || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) - BSD-2 - BSD - ISC - MIT - || ( Unlicense MIT ) - openssl" -SLOT="0/0" -IUSE="" -DOCS=( CODEOWNERS COPYING README.md ) - -BDEPEND=" - >=virtual/rust-1.47.0[${MULTILIB_USEDEP}] - dev-util/cmake -" -DEPEND="" -RDEPEND="" - -CMAKE_USE_DIR="${S}/deps/boringssl" - -src_unpack() { - if [[ "${PV}" == *9999* ]]; then - git-r3_src_unpack - cargo_live_src_unpack - else - cargo_src_unpack - tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die - fi -} - -src_prepare() { - default - cmake-utils_src_prepare - multilib_copy_sources -} - -multilib_src_configure() { - append-flags "-fPIC" - local mycmakeargs=( - -DOPENSSL_NO_ASM=ON - -DBUILD_SHARED_LIBS=OFF - ) - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure -} - -multilib_src_compile() { - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)" -} - -multilib_src_test() { - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" -} - -multilib_src_install() { - sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die - insinto "/usr/$(get_libdir)/pkgconfig" - doins target/release/quiche.pc - doheader -r include/* - dolib.so "target/$(rust_abi)/release/libquiche.so" - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS - QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 - -} diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild index 1af1e9043742..a9b28c4abdb5 100644 --- a/net-libs/quiche/quiche-9999.ebuild +++ b/net-libs/quiche/quiche-9999.ebuild @@ -1,139 +1,197 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CRATES=" -anyhow-1.0.26 -ansi_term-0.11.0 -aho-corasick-0.7.18 -arrayvec-0.4.11 -atty-0.2.14 -autocfg-1.0.1 -backtrace-0.3.37 -backtrace-sys-0.1.31 -bindgen-0.57.0 -bitflags-1.3.2 -boring-sys-1.1.1 -bstr-0.2.12 -bumpalo-3.7.1 -byteorder-1.3.4 -cast-0.2.3 -cc-1.0.70 -cexpr-0.4.0 -cfg-if-0.1.10 -cfg-if-1.0.0 -clang-sys-1.2.2 -clap-2.33.3 -cmake-0.1.45 -criterion-0.3.1 -criterion-plot-0.4.1 -crossbeam-deque-0.7.3 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.2.1 -crossbeam-utils-0.7.2 -csv-1.1.3 -csv-core-0.1.10 -either-1.5.3 -darling-0.13.0 -darling_core-0.13.0 -darling_macro-0.13.0 -env_logger-0.8.4 -fnv-1.0.7 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -glob-0.3.0 -hashbrown-0.11.2 -hermit-abi-0.1.19 -humantime-2.1.0 -ident_case-1.0.1 -idna-0.1.5 -iovec-0.1.4 -itertools-0.8.2 -itoa-0.4.8 -js-sys-0.3.55 -kernel32-sys-0.2.2 -lazycell-1.3.0 -lazy_static-1.4.0 -libc-0.2.102 -libloading-0.7.0 -libm-0.2.1 -log-0.4.14 -matches-0.1.9 -maybe-uninit-2.0.0 -memchr-2.4.1 -memoffset-0.5.3 -mio-0.6.23 -miow-0.2.2 -net2-0.2.37 -nom-5.1.2 -num-traits-0.2.11 -num_cpus-1.12.0 -peeking_take_while-0.1.2 -indexmap-1.7.0 -once_cell-1.8.0 -oorandom-11.1.0 -percent-encoding-1.0.1 -plotters-0.2.12 -proc-macro2-1.0.29 -qlog-0.5.0 -quote-1.0.9 -rayon-1.3.0 -rayon-core-1.7.0 -regex-1.5.4 -regex-automata-0.1.9 -regex-syntax-0.6.25 -ring-0.16.20 -rustc_version-0.2.3 -rustc-hash-1.1.0 -rustversion-1.0.5 -ryu-1.0.5 -same-file-1.0.6 -scopeguard-1.1.0 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.130 -serde_derive-1.0.130 -serde_json-1.0.68 -serde_with-1.10.0 -serde_with_macros-1.5.0 -shlex-0.1.1 -slab-0.4.4 -smallvec-1.4.0 -spin-0.5.2 -strsim-0.8.0 -strsim-0.10.0 -syn-1.0.76 -termcolor-1.1.2 -textwrap-0.11.0 -tinytemplate-1.0.3 -tinyvec-1.4.0 -tinyvec_macros-0.1.0 -unicode-bidi-0.3.6 -unicode-normalization-0.1.19 -unicode-width-0.1.9 -unicode-xid-0.1.0 -unicode-xid-0.2.2 -untrusted-0.7.1 -url-1.7.2 -vec_map-0.8.2 -version_check-0.9.3 -walkdir-2.3.1 -wasm-bindgen-0.2.78 -wasm-bindgen-backend-0.2.78 -wasm-bindgen-macro-0.2.78 -wasm-bindgen-macro-support-0.2.78 -wasm-bindgen-shared-0.2.78 -wasm-bindgen-webidl-0.2.74 -web-sys-0.3.55 -which-3.1.1 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.5 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 +${PN}@${PV} +anyhow@1.0.26 +ansi_term@0.11.0 +aho-corasick@1.1.3 +android-tzdata@0.1.1 +android_system_properties@0.1.5 +arrayvec@0.7.4 +atty@0.2.14 +autocfg@1.2.0 +backtrace@0.3.37 +backtrace@sys-0.1.31 +base64@0.21.7 +bindgen@0.68.1 +bitflags@1.3.2 +bitflags@2.5.0 +boring@4.6.0 +boring-sys@4.6.0 +bstr@0.2.12 +bumpalo@3.15.4 +byteorder@1.3.4 +cast@0.2.3 +cc@1.0.94 +cexpr@0.6.0 +cfg@if-0.1.10 +cfg@if-1.0.0 +chrono@0.4.35 +clang-sys@1.7.0 +clap@2.33.3 +cmake@0.1.50 +core-foundation-sys@0.8.6 +criterion@0.3.1 +criterion@plot-0.4.1 +crossbeam@deque-0.7.3 +crossbeam@epoch-0.8.2 +crossbeam@queue-0.2.1 +crossbeam@utils-0.7.2 +csv@1.1.3 +csv@core-0.1.10 +data-encoding@2.5.0 +darling@0.20.8 +darling_core@0.20.8 +darling_macro@0.20.8 +data@encoding-2.3.3 +deranged@0.3.11 +either@1.11.0 +env_logger@0.8.4 +equivalent@1.0.1 +fnv@1.0.7 +foreign-types@0.5.0 +foreign-types-macros@0.2.3 +foreign-types-shared@0.3.1 +form_urlencoded@1.2.1 +fuchsia-zircon@0.3.3 +fuchsia-zircon-sys@0.3.3 +fs_extra@1.3.0 +fslock@0.2.1 +getrandom@0.2.14 +glob@0.3.1 +hashbrown@0.12.3 +hashbrown@0.14.3 +hermit@abi-0.1.19 +hex@0.4.3 +humantime@2.1.0 +iana-time-zone-haiku@0.1.2 +iana-time-zone@0.1.60 +ident_case@1.0.1 +idna@0.5.0 +intrusive-collections@0.9.6 +iovec@0.1.4 +itertools@0.8.2 +itoa@1.0.11 +js-sys@0.3.69 +kernel32-sys@0.2.2 +lazycell@1.3.0 +lazy_static@1.4.0 +libc@0.2.153 +libloading@0.8.3 +libm@0.2.8 +log@0.4.21 +matches@0.1.10 +maybe-uninit@2.0.0 +memchr@2.7.2 +memoffset@0.9.1 +minimal-lexical@0.2.1 +mio@0.8.11 +miow@0.4.0 +net2@0.2.37 +nom@7.1.3 +num-conv@0.1.0 +num-traits@0.2.18 +num_cpus@1.12.0 +octets@0.3.0 +peeking_take_while@0.1.2 +indexmap@1.9.3 +indexmap@2.2.6 +once_cell@1.19.0 +oorandom@11.1.0 +percent-encoding@2.3.1 +pkg-config@0.3.30 +plotters@0.2.12 +powerfmt@0.2.0 +proc-macro2@1.0.80 +qlog@0.13.0 +quote@1.0.36 +rayon@1.3.0 +rayon@core-1.7.0 +regex@1.10.4 +regex-automata@0.4.6 +regex-syntax@0.8.3 +ring@0.17.8 +rustc_version@0.2.3 +rustc@hash-1.1.0 +rustversion@1.0.6 +rust_decimal@1.35.0 +ryu@1.0.17 +same-file@1.0.6 +scopeguard@1.1.0 +sfv@0.9.4 +semver@0.9.0 +semver-parser@0.7.0 +serde@1.0.197 +serde_derive@1.0.197 +serde_json@1.0.115 +serde_with@3.7.0 +serde_with_macros@3.7.0 +shlex@1.3.0 +slab@0.4.9 +smallvec@1.13.2 +spin@0.9.8 +strsim@0.8.0 +strsim@0.10.0 +syn@1.0.109 +syn@2.0.59 +termcolor@1.1.2 +textwrap@0.11.0 +time@0.3.34 +time-core@0.1.2 +time-macros@0.2.17 +tinytemplate@1.0.3 +tinyvec@1.6.0 +tinyvec_macros@0.1.1 +unicode-bidi@0.3.15 +unicode-ident@1.0.12 +unicode-normalization@0.1.23 +unicode-width@0.1.10 +unicode-xid@0.2.4 +unicode-xid@0.2.3 +untrusted@0.9.0 +url@2.5.0 +vec_map@0.8.2 +version_check@0.9.4 +walkdir@2.3.1 +wasm-bindgen@0.2.92 +wasm-bindgen-backend@0.2.92 +wasm-bindgen-macro@0.2.92 +wasm-bindgen-macro-support@0.2.92 +wasm-bindgen-shared@0.2.92 +wasm-bindgen-webidl@0.2.75 +wasi@0.11.0+wasi-snapshot-preview1 +web-sys@0.3.65 +which@3.1.1 +winapi@0.2.8 +winapi@0.3.9 +winapi-build@0.1.1 +winapi-i686-pc-windows-gnu@0.4.0 +winapi-util@0.1.5 +winapi-x86_64-pc-windows-gnu@0.4.0 +windows-core@0.52.0 +windows_aarch64_gnullvm@0.48.5 +windows_aarch64_gnullvm@0.52.5 +windows_aarch64_msvc@0.48.5 +windows_aarch64_msvc@0.52.5 +windows_i686_gnu@0.48.5 +windows_i686_gnu@0.52.5 +windows_i686_gnullvm@0.52.5 +windows_i686_msvc@0.48.5 +windows_i686_msvc@0.52.5 +windows_x86_64_gnu@0.48.5 +windows_x86_64_gnu@0.52.5 +windows_x86_64_gnullvm@0.48.5 +windows_x86_64_gnullvm@0.52.5 +windows_x86_64_msvc@0.48.5 +windows_x86_64_msvc@0.52.5 +windows-sys@0.48.0 +windows-sys@0.52.0 +windows-targets@0.48.5 +windows-targets@0.52.5 +ws2_32-sys@0.2.1 " inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal @@ -144,11 +202,12 @@ HOMEPAGE="https://github.com/cloudflare/quiche" if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git" inherit git-r3 + CMAKE_USE_DIR="${S}/quiche/deps/boringssl" else - CRATES+=" ${P//_/-}" - SRC_URI="$(cargo_crate_uris ${CRATES})" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + SRC_URI="${CARGO_CRATE_URIS}" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" S="${WORKDIR}/${P//_/-}" + CMAKE_USE_DIR="${S}/deps/boringssl" fi LICENSE="|| ( Apache-2.0 Boost-1.0 ) @@ -162,16 +221,15 @@ LICENSE="|| ( Apache-2.0 Boost-1.0 ) openssl" SLOT="0/0" IUSE="" -DOCS=( CODEOWNERS COPYING README.md ) +DOCS=( COPYING README.md ) BDEPEND=" - >=virtual/rust-1.47.0[${MULTILIB_USEDEP}] - dev-util/cmake + >=virtual/rust-1.66.0[${MULTILIB_USEDEP}] + dev-build/cmake " DEPEND="" RDEPEND="" -CMAKE_USE_DIR="${S}/deps/boringssl" BUILD_DIR="${WORKDIR}/${P}" src_unpack() { @@ -185,7 +243,6 @@ src_unpack() { } src_prepare() { - default cmake_src_prepare multilib_copy_sources } @@ -209,9 +266,9 @@ multilib_src_test() { } multilib_src_install() { - sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die + sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/$(rust_abi)/release/quiche.pc || die insinto "/usr/$(get_libdir)/pkgconfig" - doins target/release/quiche.pc + doins target/$(rust_abi)/release/quiche.pc doheader -r include/* dolib.so "target/$(rust_abi)/release/libquiche.so" QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest index 44eeca3bc7ce..10cdd928d23a 100644 --- a/net-libs/qxmpp/Manifest +++ b/net-libs/qxmpp/Manifest @@ -1,2 +1 @@ -DIST qxmpp-1.2.0.tar.gz 310801 BLAKE2B a3d1c708fe33e6ecd226e867fc030c6cddb5009c90db46544a0081e1198f69b609239304f56aec00c7b399e7f74fa9bed82eb38db3439e092719a7a68b440a14 SHA512 9b9541dd2ffc689877969bdd1063e7ab21761e5feb7bf911acba3b0a0d953199b8bc08a1ad8c2031b0e135af7a127cbbc108bb3e8dbf1b7712ab8dc8f4cbd371 -DIST qxmpp-1.4.0.tar.gz 313356 BLAKE2B a3a5c5cf3b16c319a6eddb3808f22af946040945eb8e66a641fe3117217b04eaf4e2b88dab8fa9cd2a3034d54884e1fa3563b0e775660645a5bdd6045469f9a5 SHA512 5a0cb72899314e47846b8b47340738df20a8d198c2db8cfe38c2cc31615166e9d86c6aaf6931be16078b2f9decca2d767497ad32e1d6dd0f6af888406c33fee9 +DIST qxmpp-1.5.5.tar.gz 606405 BLAKE2B 999dfcaa601f1d79df97febcd63bfcdcce87de9c0e68db6c1253407c89414003f326011a9a5e366031f78ddae084d06f04851ab3f4573ee53c59567770ae0edc SHA512 39774655fdb87dc54f32f7a018d4964c9ff8e9bebedd9cc94e6ad41288bd67365eec524525de09c5a3d2ea274e418fc6d5497ac2c1927946154cadaf7fc0d655 diff --git a/net-libs/qxmpp/metadata.xml b/net-libs/qxmpp/metadata.xml index 1af484a2057c..c52c160e34ed 100644 --- a/net-libs/qxmpp/metadata.xml +++ b/net-libs/qxmpp/metadata.xml @@ -11,10 +11,10 @@ </maintainer> <upstream> <bugs-to>https://github.com/qxmpp-project/qxmpp/issues</bugs-to> - <changelog>https://raw.githubusercontent.com/qxmpp-project/qxmpp/master/CHANGELOG</changelog> + <changelog>https://raw.githubusercontent.com/qxmpp-project/qxmpp/master/CHANGELOG.md</changelog> <remote-id type="github">qxmpp-project/qxmpp</remote-id> </upstream> <use> - <flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag> + <flag name="omemo">Enable OMEMO encryption</flag> </use> </pkgmetadata> diff --git a/net-libs/qxmpp/qxmpp-1.2.0.ebuild b/net-libs/qxmpp/qxmpp-1.2.0.ebuild deleted file mode 100644 index ee138b7ec58f..000000000000 --- a/net-libs/qxmpp/qxmpp-1.2.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework" -HOMEPAGE="https://github.com/qxmpp-project/qxmpp/" -SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug doc opus +speex test theora vpx" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtxml:5 - opus? ( media-libs/opus ) - speex? ( media-libs/speex ) - theora? ( media-libs/libtheora ) - vpx? ( media-libs/libvpx:= ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" -BDEPEND=" - doc? ( app-doc/doxygen ) -" - -src_prepare() { - # requires network connection, bug #623708 - sed \ - -e "/qxmppiceconnection/d" \ - -e "/qxmppserver/d" \ - -e "/qxmpptransfermanager/d" \ - -i tests/CMakeLists.txt \ - || die "failed to drop certain network tests" - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(usex doc) - -DBUILD_EXAMPLES=OFF - -DBUILD_TESTS=$(usex test) - -DBUILD_INTERNAL_TESTS=$(usex test) - -DWITH_OPUS=$(usex opus) - -DWITH_SPEEX=$(usex speex) - -DWITH_THEORA=$(usex theora) - -DWITH_VPX=$(usex vpx) - ) - - cmake_src_configure -} diff --git a/net-libs/qxmpp/qxmpp-1.4.0.ebuild b/net-libs/qxmpp/qxmpp-1.5.5.ebuild index 74b3aa3678f9..943f6c7e5580 100644 --- a/net-libs/qxmpp/qxmpp-1.4.0.ebuild +++ b/net-libs/qxmpp/qxmpp-1.5.5.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework" -HOMEPAGE="https://github.com/qxmpp-project/qxmpp/" +HOMEPAGE="https://github.com/qxmpp-project/qxmpp" SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc gstreamer test" +KEYWORDS="amd64 x86" +IUSE="doc gstreamer omemo test" RESTRICT="!test? ( test )" RDEPEND=" @@ -20,34 +20,38 @@ RDEPEND=" dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 gstreamer? ( media-libs/gstreamer ) + omemo? ( + app-crypt/qca:2[qt5(+)] + net-libs/libomemo-c + ) " DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) " BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " -src_prepare() { - # requires network connection, bug #623708 - sed \ - -e "/qxmppiceconnection/d" \ - -e "/qxmppserver/d" \ - -e "/qxmpptransfermanager/d" \ - -i tests/CMakeLists.txt \ - || die "failed to drop certain network tests" - - cmake_src_prepare -} - src_configure() { local mycmakeargs=( -DBUILD_DOCUMENTATION=$(usex doc) -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=$(usex test) -DBUILD_INTERNAL_TESTS=$(usex test) + -DBUILD_OMEMO=$(usex omemo) + -DWITH_QCA=$(usex omemo) -DWITH_GSTREAMER=$(usex gstreamer) + -DQT_VERSION_MAJOR=5 ) cmake_src_configure } + +src_test() { + local myctestargs=( + # require network connection, bug #623708 + -E "tst_(qxmpptransfermanager|qxmppiceconnection)" + ) + + cmake_src_test +} diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild deleted file mode 100644 index 453364d6055c..000000000000 --- a/net-libs/qxmpp/qxmpp-9999.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit git-r3 cmake - -DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework" -HOMEPAGE="https://github.com/qxmpp-project/qxmpp/" -EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="" -IUSE="debug doc opus +speex test theora vpx" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtxml:5 - opus? ( media-libs/opus ) - speex? ( media-libs/speex ) - theora? ( media-libs/libtheora ) - vpx? ( media-libs/libvpx:= ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" -BDEPEND=" - doc? ( app-doc/doxygen ) -" - -src_prepare() { - # requires network connection, bug #623708 - sed \ - -e "/qxmppiceconnection/d" \ - -e "/qxmppserver/d" \ - -e "/qxmpptransfermanager/d" \ - -i tests/CMakeLists.txt \ - || die "failed to drop certain network tests" - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(usex doc) - -DBUILD_EXAMPLES=OFF - -DBUILD_TESTS=$(usex test) - -DBUILD_INTERNAL_TESTS=$(usex test) - -DWITH_OPUS=$(usex opus) - -DWITH_SPEEX=$(usex speex) - -DWITH_THEORA=$(usex theora) - -DWITH_VPX=$(usex vpx) - ) - - cmake_src_configure -} diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest index 6e572b6614b2..39fae857ee72 100644 --- a/net-libs/rabbitmq-c/Manifest +++ b/net-libs/rabbitmq-c/Manifest @@ -1,2 +1 @@ -DIST rabbitmq-c-0.10.0.tar.gz 145361 BLAKE2B 99b53d5178fa407225d2060584239af83377027fb6a209002d11ed54be4b49bab70ae55c86ab971394ab745a632ece6f070f9c10a9bdd330de4778edbd8e1ea8 SHA512 52a1194fab2dc8698ed065d63898e32aa004a4d68080d4aaf5cb7148cc28ad967283f7a99910d7f054cbba92b487b3a67b839b6f0bd88486ef9be043c9517d4c -DIST rabbitmq-c-0.11.0.tar.gz 145638 BLAKE2B dce862d132d4bca010dbc284957f34a35d55407ea0eb4fb79369f699207c01cc7ed64c1bd58bea2d1178bd2c02176c3e93b66177fc975175b1da9ab9baaf661f SHA512 0c3dbb6e2b862e9f25e3f76df798ea272bbd81de2865950b95adf1f1e5791eb20d7c9d5a76cb7d2fda54bad5f12bdf69cbfa7e9fd1afdede6f9ec729ca2287de +DIST rabbitmq-c-0.13.0.tar.gz 126670 BLAKE2B dbb759bfb21cdce532bb770fecc21e18881da198f55278301143e9d4a0f070f58c00e4cadab71c6b4a0b91f198a1fd66cc405f518d52972cf68c0ef33ee2176c SHA512 a93c104846b7d004c97019f81879db4daf747fd29ee6f4feaf287302c0f24d5d34d8c7bc232805ccabf105fd1aa6dfcb88218236bb6bb33cebf64ec9e3dcd77c diff --git a/net-libs/rabbitmq-c/files/rabbitmq-c-0.13.0-read-credentials-from-file.patch b/net-libs/rabbitmq-c/files/rabbitmq-c-0.13.0-read-credentials-from-file.patch new file mode 100644 index 000000000000..363068139adf --- /dev/null +++ b/net-libs/rabbitmq-c/files/rabbitmq-c-0.13.0-read-credentials-from-file.patch @@ -0,0 +1,127 @@ +From 463054383fbeef889b409a7f843df5365288e2a0 Mon Sep 17 00:00:00 2001 +From: Christian Kastner <ckk@kvr.at> +Date: Tue, 13 Jun 2023 14:21:52 +0200 +Subject: [PATCH] Add option to read username/password from file (#781) + +* Add option to read username/password from file +--- + tools/common.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + +diff --git a/tools/common.c b/tools/common.c +index 73b47e25..7efe557b 100644 +--- a/tools/common.c ++++ b/tools/common.c +@@ -18,6 +18,11 @@ + #include "compat.h" + #endif + ++/* For when reading auth data from a file */ ++#define MAXAUTHTOKENLEN 128 ++#define USERNAMEPREFIX "username:" ++#define PASSWORDPREFIX "password:" ++ + void die(const char *fmt, ...) { + va_list ap; + va_start(ap, fmt); +@@ -125,6 +130,7 @@ static char *amqp_vhost; + static char *amqp_username; + static char *amqp_password; + static int amqp_heartbeat = 0; ++static char *amqp_authfile; + #ifdef WITH_SSL + static int amqp_ssl = 0; + static char *amqp_cacert = "/etc/ssl/certs/cacert.pem"; +@@ -147,6 +153,8 @@ struct poptOption connect_options[] = { + "the password to login with", "password"}, + {"heartbeat", 0, POPT_ARG_INT, &amqp_heartbeat, 0, + "heartbeat interval, set to 0 to disable", "heartbeat"}, ++ {"authfile", 0, POPT_ARG_STRING, &amqp_authfile, 0, ++ "path to file containing username/password for authentication", "file"}, + #ifdef WITH_SSL + {"ssl", 0, POPT_ARG_NONE, &amqp_ssl, 0, "connect over SSL/TLS", NULL}, + {"cacert", 0, POPT_ARG_STRING, &amqp_cacert, 0, +@@ -158,6 +166,50 @@ struct poptOption connect_options[] = { + #endif /* WITH_SSL */ + {NULL, '\0', 0, NULL, 0, NULL, NULL}}; + ++void read_authfile(const char *path) { ++ size_t n; ++ FILE *fp = NULL; ++ char token[MAXAUTHTOKENLEN]; ++ ++ if ((amqp_username = malloc(MAXAUTHTOKENLEN)) == NULL || ++ (amqp_password = malloc(MAXAUTHTOKENLEN)) == NULL) { ++ die("Out of memory"); ++ } else if ((fp = fopen(path, "r")) == NULL) { ++ die("Could not read auth data file %s", path); ++ } ++ ++ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || ++ strncmp(token, USERNAMEPREFIX, strlen(USERNAMEPREFIX))) { ++ die("Malformed auth file (missing username)"); ++ } ++ strncpy(amqp_username, &token[strlen(USERNAMEPREFIX)], MAXAUTHTOKENLEN); ++ /* Missing newline means token was cut off */ ++ n = strlen(amqp_username); ++ if (amqp_username[n - 1] != '\n') { ++ die("Username too long"); ++ } else { ++ amqp_username[n - 1] = '\0'; ++ } ++ ++ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || ++ strncmp(token, PASSWORDPREFIX, strlen(PASSWORDPREFIX))) { ++ die("Malformed auth file (missing password)"); ++ } ++ strncpy(amqp_password, &token[strlen(PASSWORDPREFIX)], MAXAUTHTOKENLEN); ++ /* Missing newline means token was cut off */ ++ n = strlen(amqp_password); ++ if (amqp_password[n - 1] != '\n') { ++ die("Password too long"); ++ } else { ++ amqp_password[n - 1] = '\0'; ++ } ++ ++ (void)fgetc(fp); ++ if (!feof(fp)) { ++ die("Malformed auth file (trailing data)"); ++ } ++} ++ + static void init_connection_info(struct amqp_connection_info *ci) { + ci->user = NULL; + ci->password = NULL; +@@ -237,6 +289,8 @@ static void init_connection_info(struct amqp_connection_info *ci) { + if (amqp_username) { + if (amqp_url) { + die("--username and --url options cannot be used at the same time"); ++ } else if (amqp_authfile) { ++ die("--username and --authfile options cannot be used at the same time"); + } + + ci->user = amqp_username; +@@ -245,11 +299,23 @@ static void init_connection_info(struct amqp_connection_info *ci) { + if (amqp_password) { + if (amqp_url) { + die("--password and --url options cannot be used at the same time"); ++ } else if (amqp_authfile) { ++ die("--password and --authfile options cannot be used at the same time"); + } + + ci->password = amqp_password; + } + ++ if (amqp_authfile) { ++ if (amqp_url) { ++ die("--authfile and --url options cannot be used at the same time"); ++ } ++ ++ read_authfile(amqp_authfile); ++ ci->user = amqp_username; ++ ci->password = amqp_password; ++ } ++ + if (amqp_vhost) { + if (amqp_url) { + die("--vhost and --url options cannot be used at the same time"); diff --git a/net-libs/rabbitmq-c/metadata.xml b/net-libs/rabbitmq-c/metadata.xml index 0fed8249ebef..e7e3e0b1837d 100644 --- a/net-libs/rabbitmq-c/metadata.xml +++ b/net-libs/rabbitmq-c/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>prathamIN@proton.me</email> + <name>Pratham K</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> <flag name="tools">Builds cli tools to interact with brokers</flag> </use> diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild deleted file mode 100644 index b34a4fa9ac9a..000000000000 --- a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake - -DESCRIPTION="RabbitMQ C client" -HOMEPAGE="https://github.com/alanxz/rabbitmq-c" - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/alanxz/${PN}.git" -else - SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" -fi - -LICENSE="MIT" -SLOT="0/4" -IUSE="doc test +ssl static-libs tools" - -REQUIRED_USE="test? ( static-libs )" - -RESTRICT="!test? ( test )" - -RDEPEND="ssl? ( dev-libs/openssl:0= ) - tools? ( dev-libs/popt )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - tools? ( app-text/xmlto )" -DOCS=( AUTHORS README.md THANKS TODO ) - -src_configure() { - mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON - -DBUILD_API_DOCS=$(usex doc) - -DBUILD_STATIC_LIBS=$(usex static-libs) - -DBUILD_TESTS=$(usex test) - -DBUILD_TOOLS=$(usex tools) - -DBUILD_TOOLS_DOCS=$(usex tools) - -DENABLE_SSL_SUPPORT=$(usex ssl) - ) - cmake_src_configure -} - -src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - - # Skip "basic" test which requires running local rabbitmq-server instance, - # see https://github.com/alanxz/rabbitmq-c/issues/530 - ctest -v -E basic || die -} diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.13.0.ebuild index af593238e7f0..fd8f4d0c870a 100644 --- a/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild +++ b/net-libs/rabbitmq-c/rabbitmq-c-0.13.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/alanxz/${PN}.git" else SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="MIT" @@ -27,16 +27,18 @@ RESTRICT="!test? ( test )" RDEPEND="ssl? ( dev-libs/openssl:0= ) tools? ( dev-libs/popt )" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen ) +BDEPEND="doc? ( app-text/doxygen ) tools? ( app-text/xmlto )" -DOCS=( AUTHORS README.md THANKS TODO ) +PATCHES=( + "${FILESDIR}"/${P}-read-credentials-from-file.patch +) src_configure() { local mycmakeargs=( -DBUILD_API_DOCS=$(usex doc) -DBUILD_STATIC_LIBS=$(usex static-libs) - -DBUILD_TESTS=$(usex test) + -DBUILD_TESTING=$(usex test) -DBUILD_TOOLS=$(usex tools) -DBUILD_TOOLS_DOCS=$(usex tools) -DENABLE_SSL_SUPPORT=$(usex ssl) diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest index 5b3ce5ca09e0..5c72975c2de7 100644 --- a/net-libs/rest/Manifest +++ b/net-libs/rest/Manifest @@ -1 +1 @@ -DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3 +DIST rest-0.9.1.tar.xz 71136 BLAKE2B 696a43db8a05d90cd2cb86cb2ffe22a817c7b0565c1e90e2508b0dffd3824fa46afef78c039d8911dc50f93c0afe1efbc783676c677b71bb7a2b5ad9ac5a1a26 SHA512 7fb219f571aec2b8d09d71e257e2b230bfb5c862e7e425fd540c96f6e2a22457df7d3df32838d71beec00ba54c7adbd0301d744bb0497c46b3a1413949304462 diff --git a/net-libs/rest/files/0001-rest_proxy_call_sync-bail-out-if-no-payload.patch b/net-libs/rest/files/0001-rest_proxy_call_sync-bail-out-if-no-payload.patch new file mode 100644 index 000000000000..14e41ba17174 --- /dev/null +++ b/net-libs/rest/files/0001-rest_proxy_call_sync-bail-out-if-no-payload.patch @@ -0,0 +1,40 @@ +From fbad64abe28a96f591a30e3a5d3189c10172a414 Mon Sep 17 00:00:00 2001 +From: Adam Williamson <awilliam@redhat.com> +Date: Tue, 30 Aug 2022 10:03:57 -0700 +Subject: [PATCH 1/2] rest_proxy_call_sync: bail out if no payload + +goa-daemon is crashing on suspend/resume with a traceback that +points here: it calls rest_proxy_call_sync, that calls +_rest_proxy_send_message, assumes it gets a `payload` back, +and calls `finish_call` with it. However, it's not actually +guaranteed that `_rest_proxy_send_message` will return a payload +(a `GBytes`). There are three ways it can return `NULL` instead: +if it's passed a wrong proxy or message, or - when built against +libsoup3 - if there is an error sending the message (it passes +through the return value of `soup_session_send_and_read`, and +that's documented to be `NULL` on error). + +If `payload` comes back `NULL`, let's just return `FALSE`, like +we do if there's a problem with the call or message. + +Signed-off-by: Adam Williamson <awilliam@redhat.com> +--- + rest/rest-proxy-call.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/rest/rest-proxy-call.c b/rest/rest-proxy-call.c +index 851b397..07b8b49 100644 +--- a/rest/rest-proxy-call.c ++++ b/rest/rest-proxy-call.c +@@ -1428,6 +1428,8 @@ rest_proxy_call_sync (RestProxyCall *call, + return FALSE; + + payload = _rest_proxy_send_message (priv->proxy, message, priv->cancellable, error_out); ++ if (!payload) ++ return FALSE; + + ret = finish_call (call, message, payload, error_out); + +-- +2.37.1 + diff --git a/net-libs/rest/files/0002-Handle-some-potential-problems-in-parsing-oauth2-acc.patch b/net-libs/rest/files/0002-Handle-some-potential-problems-in-parsing-oauth2-acc.patch new file mode 100644 index 000000000000..f437c7d9e74d --- /dev/null +++ b/net-libs/rest/files/0002-Handle-some-potential-problems-in-parsing-oauth2-acc.patch @@ -0,0 +1,52 @@ +From 49c2d0ac00b959ce53cc00ca4e7758c21085722f Mon Sep 17 00:00:00 2001 +From: Adam Williamson <awilliam@redhat.com> +Date: Tue, 30 Aug 2022 10:59:01 -0700 +Subject: [PATCH 2/2] Handle some potential problems in parsing oauth2 access + tokens + +It's possible for `_rest_proxy_send_message` to return `NULL`, +which would mean the `payload` here would be `NULL`. If so, +we're not going to be able to do anything, so we should just +bail out. + +It's also possible for `json_parser_load_from_data` to return +`FALSE` without setting an error. The most obvious way would be +if `data` was `NULL`, which the bailout avoids, but it could +also happen if we pass an invalid parser somehow. Let's just +handle that too, to be safe. + +Signed-off-by: Adam Williamson <awilliam@redhat.com> +--- + rest/rest-oauth2-proxy.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/rest/rest-oauth2-proxy.c b/rest/rest-oauth2-proxy.c +index 9511f97..a715b2b 100644 +--- a/rest/rest-oauth2-proxy.c ++++ b/rest/rest-oauth2-proxy.c +@@ -68,18 +68,21 @@ rest_oauth2_proxy_parse_access_token (RestOAuth2Proxy *self, + gsize size; + gint expires_in; + gint created_at; ++ gboolean ret; + + g_return_if_fail (REST_IS_OAUTH2_PROXY (self)); ++ g_return_if_fail (payload); + + data = g_bytes_get_data (payload, &size); + + parser = json_parser_new (); +- json_parser_load_from_data (parser, data, size, &error); ++ ret = json_parser_load_from_data (parser, data, size, &error); + if (error != NULL) + { + g_task_return_error (task, error); + return; + } ++ g_return_if_fail (ret); + + root = json_parser_get_root (parser); + root_object = json_node_get_object (root); +-- +2.37.1 + diff --git a/net-libs/rest/metadata.xml b/net-libs/rest/metadata.xml index c6e394b17a27..1ec8aafcadb4 100644 --- a/net-libs/rest/metadata.xml +++ b/net-libs/rest/metadata.xml @@ -5,4 +5,7 @@ <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/librest</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild deleted file mode 100644 index 1a871b83d473..000000000000 --- a/net-libs/rest/rest-0.8.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -GNOME2_LA_PUNT="yes" - -inherit gnome2 multilib-minimal virtualx - -DESCRIPTION="Helper library for RESTful services" -HOMEPAGE="https://wiki.gnome.org/Projects/Librest" - -LICENSE="LGPL-2.1" -SLOT="0.7" -IUSE="+introspection test" -RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86" - -# Coverage testing should not be enabled -RDEPEND=" - app-misc/ca-certificates - >=dev-libs/glib-2.24:2[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[${MULTILIB_USEDEP}] - net-libs/libsoup:2.4[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.13 - >=dev-util/intltool-0.40 - virtual/pkgconfig - test? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) -" - -multilib_src_configure() { - # gnome support only adds dependency on obsolete libsoup-gnome - # https://bugzilla.gnome.org/show_bug.cgi?id=758166 - ECONF_SOURCE="${S}" \ - gnome2_src_configure \ - --disable-static \ - --disable-gcov \ - --without-gnome \ - --with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \ - $(multilib_native_use_enable introspection) - - if multilib_is_native_abi; then - ln -s "${S}"/docs/reference/rest/html docs/reference/rest/html || die - fi -} - -multilib_src_test() { - # Tests need dbus - virtx emake check -} - -multilib_src_compile() { - gnome2_src_compile -} - -multilib_src_install() { - gnome2_src_install -} diff --git a/net-libs/rest/rest-0.9.1-r1.ebuild b/net-libs/rest/rest-0.9.1-r1.ebuild new file mode 100644 index 000000000000..2127ae60fc5e --- /dev/null +++ b/net-libs/rest/rest-0.9.1-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson vala + +DESCRIPTION="Helper library for RESTful services" +HOMEPAGE="https://wiki.gnome.org/Projects/Librest" + +LICENSE="LGPL-2.1" +SLOT="1.0" # librest_soversion +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86" +IUSE="gtk-doc +introspection test vala" +REQUIRED_USE=" + gtk-doc? ( introspection ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.44.0:2 + >=net-libs/libsoup-2.99.2:3.0 + dev-libs/json-glib:0[introspection?] + dev-libs/libxml2:2 + app-misc/ca-certificates + introspection? ( >=dev-libs/gobject-introspection-1.74.0:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + gtk-doc? ( >=dev-util/gi-docgen-2021.6 ) + vala? ( $(vala_depend) ) +" + +PATCHES=( + # Fix some crash paths exposed by the libsoup3 port + # https://gitlab.gnome.org/GNOME/librest/-/merge_requests/30 + "${FILESDIR}"/0001-rest_proxy_call_sync-bail-out-if-no-payload.patch + "${FILESDIR}"/0002-Handle-some-potential-problems-in-parsing-oauth2-acc.patch +) + +src_prepare() { + default + vala_setup + + # The only two tests from the rest-extras suite (flickr and lastfm) require + # network access + if has network-sandbox ${FEATURES}; then + sed -i -e '/flickr/d' -e '/lastfm/d' tests/meson.build + fi +} + +src_configure() { + local emesonargs=( + -Dca_certificates=true + -Dca_certificates_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt + $(meson_use introspection) + $(meson_use vala vapi) + -Dexamples=false + $(meson_use gtk-doc gtk_doc) + -Dsoup2=false + $(meson_use test tests) + ) + meson_src_configure +} diff --git a/net-libs/rpc2/Manifest b/net-libs/rpc2/Manifest index da4659b57c16..529ebdbf6455 100644 --- a/net-libs/rpc2/Manifest +++ b/net-libs/rpc2/Manifest @@ -1 +1 @@ -DIST rpc2-2.14.tar.gz 628236 BLAKE2B 7956bc218fbdf0d14390c7d7090f14dbc813edd1ea45e105bb75c99cebd4acef17e91db979390835449f9a67c4a5b2e5dd01150049f9fb64daa8d32dc65f673b SHA512 7d80a9d2c69469526fa31e0c0a3f0eee20e2662d1ee03eaa3a642d48f152f611f5e219a4d730a94d49b65b77e67eeefb179bc160c0cf7a9d0e7e31f8d7f882c5 +DIST rpc2-2.14.tar.xz 427144 BLAKE2B e0b2fb6d0eb8d1391b7049142cfea7d4e8d760e6c2d5d646c705b4efbfcd9ac7ea40168ca40e0c184e2b04f0b3a26afd19fb2f2bda4bd12b511d44962749f7ca SHA512 b8a1b87ee27d820cbe30e7d031ca36b5e07340e3795755672d3831109f844de9b3985deb371b52cd9cde0b023d59a8d9d6c73576afcf0af8034b29bf9f3602be diff --git a/net-libs/rpc2/files/rpc2-2.14-include.patch b/net-libs/rpc2/files/rpc2-2.14-include.patch new file mode 100644 index 000000000000..248604654427 --- /dev/null +++ b/net-libs/rpc2/files/rpc2-2.14-include.patch @@ -0,0 +1,10 @@ +--- a/rpc2-src/rpc2b.c ++++ b/rpc2-src/rpc2b.c +@@ -42,6 +42,7 @@ + #include <config.h> + #endif + ++#include <fcntl.h> + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> diff --git a/net-libs/rpc2/files/rpc2-2.14-respect-flags.patch b/net-libs/rpc2/files/rpc2-2.14-respect-flags.patch new file mode 100644 index 000000000000..e93e08ab6a4c --- /dev/null +++ b/net-libs/rpc2/files/rpc2-2.14-respect-flags.patch @@ -0,0 +1,21 @@ +--- a/rp2gen/Makefile.in ++++ b/rp2gen/Makefile.in +@@ -198,7 +198,8 @@ + CCDEPMODE = @CCDEPMODE@ + + # override any cross compilation target flags +-CFLAGS = -Wall ++AM_CFLAGS = -Wall ++CFLAGS = @CFLAGS@ + CONFIG_DATE = @CONFIG_DATE@ + CP = @CP@ + CPP = @CPP@ +@@ -225,7 +226,7 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LD = @LD@ +-LDFLAGS = ++LDFLAGS = @LDFLAGS@ + LEX = @LEX@ + LEXLIB = @LEXLIB@ + LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ diff --git a/net-libs/rpc2/metadata.xml b/net-libs/rpc2/metadata.xml index 73dda144f9ac..eefc50cbc6d0 100644 --- a/net-libs/rpc2/metadata.xml +++ b/net-libs/rpc2/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <upstream> + <remote-id type="github">cmusatyalab/coda</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/rpc2/rpc2-2.14.ebuild b/net-libs/rpc2/rpc2-2.14-r1.ebuild index a43d3795e550..6e2f4af36aa0 100644 --- a/net-libs/rpc2/rpc2-2.14.ebuild +++ b/net-libs/rpc2/rpc2-2.14-r1.ebuild @@ -1,26 +1,26 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Remote procedure call package for IP/UDP (used by Coda)" HOMEPAGE="http://www.coda.cs.cmu.edu/" -SRC_URI="http://www.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.gz" +SRC_URI="http://www.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="1" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86" -IUSE="static-libs" RDEPEND=">=sys-libs/lwp-2.5" DEPEND="${RDEPEND}" -src_configure() { - econf $(use_enable static-libs static) -} +PATCHES=( + "${FILESDIR}"/${P}-respect-flags.patch + "${FILESDIR}"/${P}-include.patch +) src_install() { default - dodoc README.ipv6 - use static-libs || find "${ED}"/usr -name '*.la' -delete + + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest index e0324f8e649c..2141468596b2 100644 --- a/net-libs/rpcsvc-proto/Manifest +++ b/net-libs/rpcsvc-proto/Manifest @@ -1 +1 @@ -DIST rpcsvc-proto-1.4.2.tar.gz 61788 BLAKE2B e941fa86088d690e3e80a501beb5169a51ff77b60d618f54db9d9fd5fb96c2b2a4277ab8d847dcdb29dadd2f6947d155b15cd8b6af1f1420e023da8637d555c0 SHA512 6769f9439e3f187eebdeef4ee8d54f8a6fee6f410e3137d0c1b26e61b705873932890856faff55b68c39aa702e456b36fe9410b85baf1ef9b20ee97f2158971a +DIST rpcsvc-proto-1.4.4.tar.xz 168648 BLAKE2B 2cba39b0307d773133306c4222e43cc44d4189bb125f993634b2a5e7679e5f5b4d28b05b95db6e694d316b4fdd182cf91c2a01ed1c519a3ca7ced5ebf5da3d10 SHA512 0138ac8fb2d8de3cb56f661bd1b6435fa0a35d3bd12c5cb7081c9ae1701e3620f47fe3dd002263db456655b61316749768e9a1a44325a1a6a542beae364a0393 diff --git a/net-libs/rpcsvc-proto/metadata.xml b/net-libs/rpcsvc-proto/metadata.xml index 2d4f8ac9895a..779ecf1ccbe6 100644 --- a/net-libs/rpcsvc-proto/metadata.xml +++ b/net-libs/rpcsvc-proto/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>toolchain@gentoo.org</email> - <name>Gentoo Toolchain Project</name> -</maintainer> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System Project</name> -</maintainer> + <maintainer type="project"> + <email>toolchain@gentoo.org</email> + <name>Gentoo Toolchain Project</name> + </maintainer> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System Project</name> + </maintainer> + <upstream> + <remote-id type="github">thkukuk/rpcsvc-proto</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild index 865a87574ece..95113756b22c 100644 --- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild +++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="rpcsvc protocol definitions from glibc" HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto" # Fake version to help portage upgrading. -SLOT="0" LICENSE="LGPL-2.1+ BSD" +SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="" DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )" RDEPEND="${DEPEND}" diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild deleted file mode 100644 index 0d012345ff83..000000000000 --- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="rpcsvc protocol definitions from glibc" -HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto" -SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="LGPL-2.1+ BSD" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="" - -# sys-devel/gettext is only for libintl detection macros. -DEPEND="sys-devel/gettext" -RDEPEND=" - !<sys-libs/glibc-2.26 - virtual/libintl -" - -src_prepare() { - default - eautoreconf - - # Use ${CHOST}-cpp, not 'cpp': bug #718138 - # Ideally we should use @CPP@ but rpcgen makes it hard to use '${CHOST}-gcc -E' - sed -i -s "s/CPP = \"cpp\";/CPP = \"${CHOST}-cpp\";/" rpcgen/rpc_main.c || die -} - -src_install() { - default - - # provided by sys-fs/quota[rpc] - rm "${ED}"/usr/include/rpcsvc/rquota.{x,h} || die -} diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.4.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.4.ebuild new file mode 100644 index 000000000000..a8c26ec4e97e --- /dev/null +++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.4.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="rpcsvc protocol definitions from glibc" +HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto" +SRC_URI="https://github.com/thkukuk/rpcsvc-proto/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="LGPL-2.1+ BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +RDEPEND=" + !<sys-libs/glibc-2.26 + virtual/libintl +" +DEPEND="${RDEPEND}" +# sys-devel/gettext is only for libintl detection macros. +BDEPEND="sys-devel/gettext" + +src_prepare() { + default + + # Search for a valid 'cpp' command. + # The CPP envvar might contain '${CC} -E', which does not work for rpcgen. + # Bug 718138, 870031, 870061. + local x cpp= + for x in {${CHOST}-,}{,clang-}cpp; do + if type -P "${x}" >/dev/null; then + cpp=${x} + break + fi + done + [[ -n ${cpp} ]] || die "Unable to find cpp" + sed -i -e "s/CPP = \"cpp\";/CPP = \"${cpp}\";/" rpcgen/rpc_main.c || die +} + +src_install() { + default + + # provided by sys-fs/quota[rpc] + rm "${ED}"/usr/include/rpcsvc/rquota.{x,h} || die +} diff --git a/net-libs/rtrlib/Manifest b/net-libs/rtrlib/Manifest index 3aeaadc07521..31df884f3465 100644 --- a/net-libs/rtrlib/Manifest +++ b/net-libs/rtrlib/Manifest @@ -1 +1 @@ -DIST rtrlib-0.7.0.tar.gz 260699 BLAKE2B ea8b70b1ca1fb7cacc2943228e398e16f61de6264702f87e6bc5dc011dbb77e760a4e317f109e13b882efd9c080847e6e86c9c47afdc4518db5de210621181fc SHA512 e1c78ce92d066308c1c4fbb6575c2f0dc0f6840c16be90e27bd0da184cab7d0fa4dd1cff3677eda5f1720184756e02765e5abd267b0da0d183082721fee2ffd8 +DIST rtrlib-0.8.0.tar.gz 262281 BLAKE2B 82fc5c8416540fdd87ba3683664ab0afdd905758541a9283ca60b5ec89c1642394cacf453d254f996128a5a9ab64fcefaf15d9a18a04451cdb3e1aa0e8e3c841 SHA512 36e44dce5c6117f3fe3c21994a7f9ebfeb4029ade1fddcb0f1df680c9ca4713fe3031da4cf80963b8a3d9bdb930bd9fd95c84b1fe182a9089a29ddfe879060dc diff --git a/net-libs/rtrlib/metadata.xml b/net-libs/rtrlib/metadata.xml index 388f6d12fc33..ced9127dbe29 100644 --- a/net-libs/rtrlib/metadata.xml +++ b/net-libs/rtrlib/metadata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="ssh"> Enable SSH support </flag> </use> + <upstream> + <remote-id type="github">rtrlib/rtrlib</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/rtrlib/rtrlib-0.7.0.ebuild b/net-libs/rtrlib/rtrlib-0.8.0.ebuild index 494f58bcc643..50d2d94eb403 100644 --- a/net-libs/rtrlib/rtrlib-0.7.0.ebuild +++ b/net-libs/rtrlib/rtrlib-0.8.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="An open-source C implementation of the RPKI/Router Protocol client" HOMEPAGE="https://rtrlib.realmv6.org/" @@ -18,14 +18,10 @@ IUSE="doc ssh" RDEPEND="ssh? ( net-libs/libssh:0= )" DEPEND=" ${RDEPEND} - doc? ( app-doc/doxygen[dot] ) + doc? ( app-text/doxygen[dot] ) " src_prepare() { - # Fix checks for libssh version - sed -i \ - -e 's:/libssh/libssh.h:/libssh/libssh_version.h:g' \ - cmake/modules/FindLibSSH.cmake || die # Fix automagic dependency on doxygen, fix path for installing docs if use doc; then sed -i -e "s:share/doc/rtrlib:share/doc/${PF}:" CMakeLists.txt || die @@ -36,6 +32,14 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861581 + # https://github.com/rtrlib/rtrlib/issues/287 + # + # Do not trust LTO either. + append-flags -fno-strict-aliasing + filter-lto + local mycmakeargs=( -DRTRLIB_TRANSPORT_SSH=$(usex ssh) ) diff --git a/net-libs/rustls-ffi/Manifest b/net-libs/rustls-ffi/Manifest new file mode 100644 index 000000000000..2ac72c76fb9d --- /dev/null +++ b/net-libs/rustls-ffi/Manifest @@ -0,0 +1,124 @@ +DIST aho-corasick-1.1.1.crate 182812 BLAKE2B df74c2cfa0ae392a8d466e370ba761c4cd37c65773affba9a3cdcf7f5797b34b4a25e1646be3de5081644b34db2dce273609edb4f18a1ce7fdbf31ac28a10b88 SHA512 a894e1cefbb63a3b7b78a3676874d0b7a507c27970f48cdfbda1e5deefbf6b20ed4271b660a12eea77b318cd2fa0f80850a0b1ddfe0d0731ffa326c0fc295692 +DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671 +DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b +DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b16690ecebbcb500e4613afa057ab2b294bbafdcaa4007f46412825260a0711d89e55664418a503dde02c8afd1a SHA512 40b1d8470a932c8b7f31717e33bf26742c1bf920caae639b8a992f77e64d5e6d287569742c1348daa25b7325f8ca8d8a312754a743dab3932181f37149d91b16 +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bumpalo-3.11.1.crate 81207 BLAKE2B ba76008fb5a975aca12b6f893779e18dd353a22a42cbbeecd5870622a7cbc0cd7e37036af600c570b8a55f26ea8d07f44a9aa1a8373d977b6f75bd4276730292 SHA512 70e90bee1fa4e783ff5a3b18f192b9347bafab7daaa907e74913a415a66c29acfb073fcfb46150801aa7649ab0d2ec8a610de239551565dd167bac72ab13a9bc +DIST bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4 +DIST cbindgen-0.19.0.crate 181286 BLAKE2B e09931704cfe0f0f777e67c66fdfd08820e8185a7ad475521eca2d6819d1d0a92791d5cd5dfb2b2199e911da9e8a92dfa09ec20d2912f1073d456f7932944438 SHA512 dc31896c75d43fa7efb6256b861b7d4a51b9b0e4dc605bcaf769b32cba2dc0b7a5c49b01f0ff48ada08488ad8c020c3bbb645d6796046caf0bd7d9eaae25a962 +DIST cc-1.0.77.crate 60723 BLAKE2B 93720cee6c5721ec43b3f502b0879043afc44049e2ce528addebd8b6cf182a8e370143d67e32a965f1ef4fc07e55c87aaf95c0b1b5f9b85eb4e743a95b17bdf5 SHA512 38a421818bbb22fa6a6bd871a7d69add88932db68683ec91d1b4ce1ba68ea2b9272c42c35f437030614cb522f43db964e3a8f1223dcdef9158090b00d17afe2b +DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5 +DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8 +DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1 +DIST getrandom-0.2.11.crate 35391 BLAKE2B cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa SHA512 2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345 +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f +DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a +DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85 +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 +DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d26ccb3bdd798ac0e04d9a6a9307927c17558f1284fa5491464cfceba2f0b880d00673449b94c0fb783150 SHA512 a70bb6fbdbcab27fbb5a84041bcbad8e0c8fda58d55ca7ac757f7be5cd373101be40df99e9acd6ae49e637e40de037c6bc59560f96c9adeccb2b2e0bf6531e42 +DIST js-sys-0.3.60.crate 79257 BLAKE2B 714facdab00d567d074de4a25b69487400c23194d0f58ca784159483f9e02289acadce084b1514d8816cc9e0597800de82a5298b071b7df19a24df93541f23c1 SHA512 543dfd444539fad27bafcbbf112366f53d4ccf4bc63f8bb17820d818c3e1804656697ed6268a793f383ddf6b6227f7e9b3a11fb6fbb24e10732fdbd971801665 +DIST js-sys-0.3.61.crate 80158 BLAKE2B 07980db627a1f4f385586ad0609b5daf30d590931d2ca0c123f2d84f6c97be0ea935aaae3ccd082440c7e7da1adb4eccfd054a3598d99351fafdfa748f567b5b SHA512 f97bb546af2111fe072a23cbdc71e4fbfd39fbfc6be37132b306853d5737175d4c9c0c4661096012f7fce3612f81509e62a97df8bcb21d7cc796a8084e5b2e16 +DIST libc-0.2.138.crate 609081 BLAKE2B 210aa9a7ba99d69533946fb06c2ac6ca0714b3d4c0c5a80096e188f849319dc5509b3b41ec56aff7d1ee899378be2197fe9f8dc921500b11ea6cdc8b3b15df45 SHA512 986ccf0fcd18dd124fa6d3d89c3c7cfeca1046270a6a1b5c4addcdbc7f7f36216cb74094836ce8e97a9e331b97ed893d57daf39e919d24b001c4789a022f7761 +DIST libc-0.2.140.crate 669153 BLAKE2B f4269549f6b450a3da3196ecaae52afe178d5b6905666fae04e2879f975f0129788898ca2ccd214d721af42a8b2fa86b26355d6baa0a81c223b56c658ee66dd5 SHA512 f450fe619ea2f45e4ada2567981987f19d35a9f13f88a0ce3a53e1751c6fbff708ca69fa6a64d807cce5dfe18b08751f0695d8a01e68e269da1aafc831528b7b +DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 +DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b +DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa +DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4 +DIST num_enum-0.5.11.crate 16772 BLAKE2B 4f032e0605730dbd72d2e7d6e06085211e885f66ff43193b32c7860905fb85070030371544ad1ce0f926e93ce13a1aad6f70f4c300abeed447373f40a46d02b3 SHA512 962e0e05e7c0eeb8e7520a699066f2b0af2ad0d5d8b4ff174c93aecb609051a1d45992c0cb6a62cbea0ed391d716656047966d5bf4c3467adacd2c5550f33578 +DIST num_enum-0.5.7.crate 15199 BLAKE2B 8ff2688036ecab51fbfd74c1ff9b6ad22b229aa4dd0f9a57547252862bd149659e307042c07f473f99a8f15c744a6e6a484d57ca3b31eec785227632521966e0 SHA512 14749c9fb3cb30366e4915b2afd00b1f005de753ac3458982ef53285efa718c8059bf4804f4db170f43c1978c222aa706f30757c191f8613b8165a54a7c5f4ce +DIST num_enum_derive-0.5.11.crate 15552 BLAKE2B 35ea9ca8b1a4e7b40b7c9193f57a466d4436945a8ca1e11e40fafaefff8de6229957594db72e6632dfb49382c52cddac3c0198e9ea063299502ead3b6d958900 SHA512 c2f89d0642c41faf6baf6b718b52b8b09cd17b6753c0098649eb8333cb253c8a166e1f1ebf1be99039e1d7d9c50541a8741645d630df8285905ebff7b26759af +DIST num_enum_derive-0.5.7.crate 12225 BLAKE2B 44ddaa0a4c3e9e49a4c476ee8b9db92a4ba6047628fce0758811aec2dc594a0902e4b168ff5c34aae48c3b1ef647bf1c3d84ce548d1826c7ea6877e6a4575159 SHA512 716d9b58d192230ec633207af741cd198772c6f0880a27255bf1b7d48e51f14ee987af14580982b0d22fe0e876167d9850b077f1b50557f47c6ff81b64542b15 +DIST once_cell-1.16.0.crate 32120 BLAKE2B 59bfc8a44f1fec72442e3d34bf4be3a5af073f854f07b3618b2857c759dca4a0fa6ba358514ae28c25d745b01bb7b390ffe9ed6e296d163fd3dd67e49092b87a SHA512 bc199570ee43bde9245a2c4637ae738e370ce9988635c8342349ceb6fb158f376247b69f9ec4ea0e6d76b934decdc77a524299ebde96c0a2c2d29d9501b9a568 +DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904 +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c +DIST proc-macro-crate-1.2.1.crate 9161 BLAKE2B 4c498132d80ee3de239991e2c631ba219accccf093460b2e3f22ab364207336f575692ceecd92be9735713b0c999578f13e9a3a6bcdb26024914450f9bc3711c SHA512 94e39efafb9afd36996b4b03f23398c2b01e3da3f029d868e7cc9c114dee4263628460037f194b3e31580c931ee7842882633fec3f39d344c71f961e4deed0a7 +DIST proc-macro-crate-1.3.1.crate 9678 BLAKE2B ed617a1930bf28a26e865f6477229566a0c4ade7f2c1e8f70d628c5536985f03c7533c561490415e207c0f58b4885367e7f54ddcf10b058711829f78a34d68a9 SHA512 5306f017933ffa89eb6111ee00b0536179c5cfab56529440630a0bec86b62194ff16f57ebb471b233e88cd886b7b9871de8402ed29073b23e5ca98193e513659 +DIST proc-macro2-1.0.47.crate 41955 BLAKE2B dbfc20b61443225130d08b05deeba56e63e76921e56359c9b0531798b18778d6ddcb56c3372fb6ccc68586a6c1dc725054f0e83f93e8623cb5ff6a7a2ed3dc83 SHA512 60c5d0dcbdee7ddab40664882d3cf5a868f7ea5b49ebab3b4419c3f325582b816625e73e0d1737bbd46bd7d765ece6c81c2ff4be894555d4b255f5cb9255e931 +DIST proc-macro2-1.0.55.crate 44176 BLAKE2B a37b69f40222dbe4b33f04a9a721c1d652044aaffd91ab2de36c82c8e5771b6a38d577a1c8b59ceac400f62e04c3da07d5f39501fc02252a4bcbc92512ef1f42 SHA512 95b1cccc0747a891bb8d6dc50e1a9e4cae624ee8b8bb40dccad6060ce52c37b29b5caed6f4f7a76c182b8f06d0f958e6d76327aa45a756115ee235a0d64476b0 +DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc +DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5 +DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 +DIST regex-1.9.6.crate 254981 BLAKE2B e0341184d93703a32734f1081d8962723873ef558f4db764b1996dfa9eeb359ac530f7dd93f4d32947e91c056b8bdc51dde99b890c14f959b02763dc22bd996c SHA512 e0da225eeeb9d02b83992959889fa9360b9c549905e4ae4982e61743fccce6d721eb0283a5d2f3e9323193bd5c839a2d0da603849bf6ec5f8ad2b7ffc81c59ab +DIST regex-automata-0.3.9.crate 610489 BLAKE2B 6eccdf930979ff4e8657cdb8fc67feebe18d16f6deefda7e1692c6cb6f311bd3c360d9dc091938bdaba061669b003ff7689d7717489326aba70aee563a4f0e20 SHA512 c404677bf470f913c1ca70385a1b9694ec4c048d306380c23001bb746803ff70999c7e215efdf02c6bf03cd9a922e98a6ecb3be588fd4f05c1f57836dbe54c0f +DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd +DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c +DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191 +DIST ring-0.17.5.crate 4147790 BLAKE2B 452973d50f89d676afb71057bb32222b9ee3c9ae62392c5552e4a9c4a1afb6e64b222fc6a5f1cac80a65e21a8f5576fc4418ce7be3056b05fbb2bb44a64bf23e SHA512 d4fe515031ee3545d257651d07fd23c670b313c64a26af33fe93bbdd006219908c1d2ff1b382ebfe3a85e8aae1a69f0693ccb640edc0a1f51a3af783c20b6df2 +DIST rustls-0.20.4.crate 256347 BLAKE2B 96989d813691a70066958b5c30554237cf86f25bf06e0ccd098044b4329d26fff19bc5863f8c2390c03813aedc67be5f4da433d82b5a9c6b120efaaedf51dc2c SHA512 897e93f7fd06be64773db0630a06dc440c0f5b43f12d5780523b2419d11bdec62ece3ce12a317badc2ec8cb1536d8bfd82d7c69105196929e7fa5471b29d0462 +DIST rustls-0.21.0.crate 275213 BLAKE2B 171a60d69ac0d56ed269fdf588a42dfb64f0b8acd752ce3c721ccca0972d5f252e5b6c957b5280820dbc66922260d858da16565c827ef664bff378f52e94d8d8 SHA512 b4eafdc78171ab79b569cd34c0a7dfbf91d3cd3a1993de0bb0264345312940c2e569a1f000114ab5f94e508bf8315e2cf05eaa547d4d0f0fee5f05ccf9f6c28e +DIST rustls-0.22.0.crate 324340 BLAKE2B 5271032969b2b57fd180bacf01a4366d8634fcf1026c569fdda88b51235555414ede32abca2f1510ca32ffa28f7bc013c9c1c2487d1889de8252e1b55ee8298a SHA512 224c5ab84f647fa5416507c790bfa1c33f80219f28ba114816c3674885268f4c412fdcb00063e4253bf552c38f1e9156ea98f2f1234e0dcc16600f6dba4411a0 +DIST rustls-0.23.4.crate 371883 BLAKE2B e9b77701b1e6bc15a71fbe060de7cecf50d7c7d07bbf2bb99a1490971ac263f45a7d1ad025f3056cbc141a467dac2a2a516db42ac93207ec77aeaf0a41564012 SHA512 80f96d023fdbeb6f3f30d97a3f4cdfd28ce3c4355d415575c947b71f7330a69a8eba225f185dab61ba280dde2ba2cbf30b4f51d1fcce193c68c9c27b19ec3102 +DIST rustls-ffi-0.10.0.tar.gz 95815 BLAKE2B ec776649b18a0cfae1249d5824a4b043d3a3b854ee4571a11ffb4828e107d1c5afb09cb84f0f9074c80d683b083b315301958fd806dc00b549a080707f84ad14 SHA512 f9208c830f1963484e8f12f81457c7beddd0ce8679988b7ff2356240cd753c8948b6566ba603fc6cf707c5eef26cc74316bdb3f71cfa060cf3228f5cd813eeb3 +DIST rustls-ffi-0.12.1.tar.gz 107794 BLAKE2B 0fddfcb5980811a1b80db2bfb578132d627ad8b47f1abeeaf052a7135f43b2e29888aa6aaa89ccd315299b73b147126cd67be41b104b1911d06c8324dee0b0e9 SHA512 bf188492ad14e32b1c26873fe5c078a5b24067a0e00e675b7b107f616ab8e3316b7b0e4d0c5646b9407bd171c2e16e97a9bb2fb1a335212aa72fe07045da6aab +DIST rustls-ffi-0.12.2.tar.gz 107905 BLAKE2B 8aadfd5d0e0a6372aef7646d52ab4b1690e2128ce2e7927657a631b32c5e291bcfe4fc6dba51b7ae17d700a78d1b447b50576aa09aca2e03020622f8ba72fc3e SHA512 30ff92a9faa1c7e683258c5910e726bb793d77dc1dcc14546780c36762fa6d3fbb49cb39f75258221fa01316cf6705de982edfc77c40ca8b37affd7cc64f7019 +DIST rustls-ffi-0.13.0.tar.gz 109078 BLAKE2B 2629866bae83497d52dda65ead6664b522a8b46c66c57cabcc10d2dfe95237a9ec0ffee5924d0cee3d20cbb56d2deb164228b976534db4b55ea18dad4337fbf9 SHA512 cfef6c1d0de22dbeb2b17bbcbacc0937e997ee96daf7cf787cc8f077e829d672254c345ee157d5f6f298d5e3bd0a64bf6b44e3c7c67a7e7b652bd03d15b124f7 +DIST rustls-ffi-0.9.1.tar.gz 80976 BLAKE2B cf9ad6a5666be19d882e0bd3575b2f7bc1e8dec891a7c192c0fc7bcff48801cc7af1c73d005d32c5801514ce852dbee54f74ea0a16110638184bed9fd483740c SHA512 cbced119a486a28aa437da09eda841b00a8bee47d2aadf4cf39601baaa8481b2600dd554d5a6e219374690c2c9d25f0d4ed253b9401ba5ac9ecfb6947625a38d +DIST rustls-pemfile-0.2.1.crate 14278 BLAKE2B 2cd27153a5db80581e43009c0ac21209f57341e584c8f11789bc9e9ac71d6cc456c60554bd97176c7567ad67896b74acc6372c62973a3ff1e965bd1d0dd52bfa SHA512 1c03cd74314bc0bffda4803f6e7692e53e3cf67a6bd30e6c96a861d8c118363b0e871a9e28c4e1a4d4f1fcdf98f3a5af3be5f0250f3653836429a27645a10c80 +DIST rustls-pemfile-2.1.1.crate 26161 BLAKE2B d761c8c0944b4697336ba389e379e9224471d64e61ec3499427615ba99f9eeb38a47b2bf23579bd9445c28b14811028a81fde89308d1552d805f49bda18833a0 SHA512 5acffbcfa1dc50c20f290f2546caf669334de0ade8153cdfc7f8259ec9076808d2d47ce602829ad1369d546d21347965250cd2c4e46e835f29111d11f38aafde +DIST rustls-pki-types-1.3.1.crate 21637 BLAKE2B 7734df5facdf21120d0dba9d6e2c0e30ac36d4368048e89639d53e68d6cb72a03cab08dc64e443f6d5b43c3f25020016bb2010ec8d20c329fb60d6cd93c9134b SHA512 741cf0def113336865320aecde54a56cd5bbc7f3aad6e71dd209b4e38b642f42d0244b6fabf03a55467aa42fc3d1582bfa1fd5fda6402ae2ca11191f21158939 +DIST rustls-webpki-0.100.1.crate 70719 BLAKE2B e92e62bb60520393b6f834d9b386c4cf7385c44bfa8e956fcb59b8e74e0702f07a12aec2f6770a4fe8cf41172184e4225e1d7e5af6ed236a9463f60594141fa7 SHA512 0f7ef484ba0ea6e1568373839a3afda246c983c0ef7e66dbc95e295f361b9e34fd0046461ea7c73fed293df500143d01b2fb6122f2da50753e4a498e6a2086a1 +DIST rustls-webpki-0.102.0.crate 195872 BLAKE2B b6c60d73fa84d5e284c12a2fae185f5db0c02188b435a18a5946ecbde96c7c61bae70707c859f9740cd804a824c3e56821a5f5f2e6768ee1758d863809f545c7 SHA512 2a091c1074c5be4b2bd6a8e15e9953e10dee904451fc7ca3af996c1875cc325e08ac2aaf084870c48bb401e843b73de8ec59f4403bf5428066dde253e4325b9d +DIST rustls-webpki-0.102.2.crate 196881 BLAKE2B 783877064d2cfbc9078d33f081b2b1edfe43218184e60a8a3b3917ba0a3ab97a226f677d4bf4addef5d19d29ac63a8268dab5bd3cf973d64df866e3e71492f9d SHA512 697d44daa5e0a8ea2d12aa6f68026eb63a6e1c4420ee92656c9479df77e3f672ca2525442be55ab6183111fe594ac85661647150326223129ec23686792f6014 +DIST rustversion-1.0.12.crate 17278 BLAKE2B ceefd32afcabec344a1bb87d818fa22b84c986367ebe58bfa54389080194141489e1c87397a34eab4d60d660c9e0d75eca3958225640d4e6a061c96d27778c6c SHA512 eb55f3c0324359e897ad07a5182426d68a067ea41461b62a44f98c2864d5a5d0f47733f88d977a6f537e39a801beaa3b5a6041230828c3213085b562edab133d +DIST rustversion-1.0.14.crate 17261 BLAKE2B db30d01914059a893bdb4c448ed0bf04852085c2d948bfbed8819a1d2317c34133cf609abdd806ad628b86974a9c1ab9d09f79743cb8e13257ef32cd444f49c6 SHA512 466d753c28c4899ab3da3e9f3366f7ecc435d484f51e0c07acfa5f3367af0de27ea3bc75efda22159b4990c976b1466a27e7c31c834c72a87d8234318357454b +DIST rustversion-1.0.9.crate 17425 BLAKE2B 0d4bf497848b3fc0ce10cdb3f1cfd73965bba1c0aa49f24c0b4abb92c2dc133ff546b119a69d2f5843f68cf4d42e4f64e9c59e2879788f91208bd75a2b7c62e8 SHA512 b2c116585816ee3aff5b21ac72ef05520ebb01fc164519e43407685c223ad5f2d3ded663c643a1f0e8150d334383c7504b701ea2708a570e5d7e29d98e2e7c61 +DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408 +DIST sct-0.7.0.crate 27502 BLAKE2B 93912044e47473d72d7415e01cbe2545f84d7d087e7a7fb210be7524d44f69daaa58edf487ea6f8e5f06cbe25ec02062b1b55978e7cb4761b8bfd79a32d4fcc7 SHA512 175d2a912e3f35dcb110991a066d7d9b0d47a0febe4e92ab7d92a27c886a7eb9abf203c9080b3e2cbda9bedbc816bd138476363c2a0c7367d3abc7e6bce83046 +DIST serde-1.0.149.crate 76702 BLAKE2B 7ae815ef79d4c0cdc91fbb12aeaef291b16f6e6e4990fa22b13c8edf2fee426adc235756850df98e8b412cfe48bb32d0f908241717b33070e6bfc6712ddfb7c4 SHA512 dc4ada7a0becfd7c5a1e8e7852454bea5074644a77e00886d87f9443aac1aa42b4662cd5705644cbcf7f6068e8eff6f3c5a5db076a022081fe558914a271bf13 +DIST serde_derive-1.0.149.crate 55561 BLAKE2B e1bc0b105444b6f01ce775f0d28cfcfa45d197eb52a1857c8bdb924accc2acb0436aeec6a6791321775fce309863c952f841975e7ac86afc6438dbd4ace80c17 SHA512 d3b4f2b851d0ae87ffa99c1e11fbd49d2cc8ed5d88b89ba4854b9a2fff55009d85d0eb1357482a133bc34d11f5d39935e3d4fb2d8e61f49627e316733cce922f +DIST serde_json-1.0.89.crate 144638 BLAKE2B e296fd2fd3054b81349f246d207de4f7f8072e480a34f1c39afc2d46cdb6b861d1514a8bb64f2f68920e8db43b642814f7f4e989dab95cee62485ca2f8db2e8d SHA512 4bafa5693977e129f5787f2ff10f914e2a7740bf7e631bcdf51b27d0d9e5517873184b56649914371e1881107e7ed0a8fedf487617db334d4a7a4bf95c6c16a3 +DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267 +DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee +DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 +DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0 +DIST syn-1.0.105.crate 237549 BLAKE2B 14e3187e9e1300c3c62d47504d61f154d4f3f22284fd1a44a5149764eb5b8937d74783e42d48380e1a31920a9319e8e7af8a86e8e9e8bb46bee839964bc4029e SHA512 4e2475853587ec669d43890c88074c00c0fd45a84631f8a0b513f8eeeb78cacc297976121af9488419d2979b33579c5d2b782e18e3fd32dcee35227e767cae0d +DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d +DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e +DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a +DIST thiserror-1.0.37.crate 18752 BLAKE2B b8d792715cfdffccba72af132e414a6ef28f8e4dfc0608bea49bda1bde5b6acb13da24feaabf4467b8aeace9b6d90a97e2202f7d24bfb753cc4019c2243bda25 SHA512 07f0cf9da1bf1029d70c1b6f0c54bc41ed759214683f35cf6b321ec2d69173e3da0abf80a692115a1e4630400b1fbf462878053853fdc6026edb40f7e13be72e +DIST thiserror-impl-1.0.37.crate 15428 BLAKE2B d91e9f058e1a2b722f604d9a399c0f291c5309299c4bc103427f8927ba41c9937c7e7cd4c0f394dfb9d96799be8a3d5b33f8e869045f58228a43354dead5117b SHA512 37d90875118fe45b51afa89dd0acfbe4d9852b899ad391b419b5181a92bda115cf5569ffef57caf6020964d5d847c2b1f191c99e2c0caf7d4166f531bd19f952 +DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7 +DIST toml_datetime-0.6.1.crate 10765 BLAKE2B d31627732a1a70dce5142ecf6dafa2b52e56b7df7d865b64dc477affbb2cdf148fe4acdba84373c4fa1b8bb8de06380e2a105c10fe34e7591683697d78b17c78 SHA512 024fc32f5c3b8efa764bc3fc59af710627513ba2e536f01f227d36661eaee099ed78320ea65b15a15e39c0fc30ff2b44c501f96d5a2618034daeb290524694e0 +DIST toml_edit-0.19.8.crate 94457 BLAKE2B 8fb45302a44f48a5a75db4dd6e3c7c2b3e4cbc357d67e247da36fe631ba66ee64a6786c8a2f9d915a260aa15bafe986ea8085f9dbce5e03fce92330c782b8b65 SHA512 467454b0b55514e039e8049bfe41ffbee7677a0c4fed4cacd96cd8d91d14cbbb2ce77ba3f356d486ddd8deee9b9939ebf519dcb087aa3d5413eb709f7f003ff6 +DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c +DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088 +DIST unicode-segmentation-1.10.0.crate 93893 BLAKE2B f0604ca03586726b878f7884a639554037816ae01965fbb97b4998fbbd12e614f2af50065a59c834448413418a56b198b016e685ef9509513e8994a5c063da40 SHA512 e6a1baacb557a5a7ed7ff780c542c5947eb473763eb2a6018cb1e0a1abb9f4bf3f8073610e4897393f15df076f6657a0f162a5c5bb7ed5f3b3fd832e533a522c +DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b +DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0 +DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416 +DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasm-bindgen-0.2.83.crate 169618 BLAKE2B f6158596c80a0385bee0a05bd9cf0b3beee83a7958efb40244956b4fec2c83baa1a1b4605eb604f313db3508a7911c78f645acbb19f6fc93eef27e9f7f0ac109 SHA512 ec93d1334417d0329e113d5f2da7f16c0f1209d71e5cbd21a2dc9278d877e70ca2327ff7863b40505504883ed51d6bf20dda98c22ef44011a47c604a7b44e82d +DIST wasm-bindgen-0.2.84.crate 172947 BLAKE2B 90c9b846bcea9d099a394b42f126990db82d1dcbe247f8b63f8c91cdfbb5e2d184d36daedaf8fcee58c34afe89bf9a30454063693d64806ead3427680a87e7af SHA512 20f8c9e4f8d81c66e34d9ca2b266fabaae30da9015d139cd4eba3f314c67c17cb562c6eec5127c41302c11c2f314237add2524a8b9a4d5346b8822a37e467b2d +DIST wasm-bindgen-backend-0.2.83.crate 25620 BLAKE2B 3cbba20a2f5344c0ed2791de7b04ee294746606289ba83a9c139b53b56edf31eab8d3b3802cec309d5395e2404bbd75b7fab5d748a9961b36906fabeb0e66493 SHA512 dd1b65733e4d0a198d61a5287bb75db3e03ef738d2c2dcd3ce3e873c27d41c90cfcbb775ad40b2a546190db8d7213e5866f8e3f9913c28fe4b43a49054bfea44 +DIST wasm-bindgen-backend-0.2.84.crate 26344 BLAKE2B 5686a252082afe128ded295584d972fe4af11a30fe37a80e142d213eb2e4bca567182bfc5addf1571696bd12e68e029148cffaa9af088d1269a1201af72e64d1 SHA512 afb06e21d916cf1af137159ac86924fbee3a958ef73725bdf6bf205e15465857791070c721e0fc0164eb6e37d195bbb6a3f03661c81e1e5a9ab8502bc3704058 +DIST wasm-bindgen-macro-0.2.83.crate 12075 BLAKE2B 3b358ba7c2a3563840f54f11170cde78044a8f087659daa7c784fa252f5dd4b7f6200eba425d95b568e50fd43c04c32a509994ddaf5248120feaa67586402150 SHA512 eb83e06f998e858cf25494c1d171984269e72db798147d4d1d8aeeb25ea7a35c5986b882011e131968621742ceecff976430856b4e8b7d7fd7f1237767cf01b4 +DIST wasm-bindgen-macro-0.2.84.crate 12857 BLAKE2B 23ae9963cc2cf9bc589f5d77c8d3819aeb9d671f0bddd17093b2df096cc800d2130bd2a994b786a5f446e9194947199b3f0cdf1c16f15e7283a4ae319ca849a1 SHA512 23b69ff601c149909d81200bc2902018ec71efad8aec9cd84a0653025aaf852cc86d93e28c5f60144ba6ce5aeff04b90d23761e263e3783d45097316525d6f43 +DIST wasm-bindgen-macro-support-0.2.83.crate 18530 BLAKE2B f305c9fc1f7bba5bee65a1c76fc2216c98aa306a072286e1ced048ab191f49e7e4436bf2f67d4c1fff558f59b2cef5e9b40e9e940268128ab1ebeb3c64696107 SHA512 804014c75ae5f8c1c7f0fad3f3209887fa346d74029e5f6e1830e44f7318719e65c4a643c71d87cf388f131fd370af40d536bbc15fc11c25b91cb785f56a908b +DIST wasm-bindgen-macro-support-0.2.84.crate 19076 BLAKE2B 4f779d7d0a406f376092ea8193851dbc86e9dbb822464db66a2022274665b03b9bf6552f79263014510cfaf4284847e98e8173263a6565f1af0c29054bd33fff SHA512 f2a8b6e0170dcea0d2f4a50361f036ad6604c499a89f0cf602578d0958d47c193aecebbd98e63310f592b08f8fe53da6c3d7a124b433ee384aa22371d9c963e5 +DIST wasm-bindgen-shared-0.2.83.crate 7194 BLAKE2B 4dd1cffea1edc98dcd4993bf6fdde8100fe00d1e97322ce8bc0bdefd0c659047c8c726e5da27b59fd7a6621c1e5385c18204e834c6c6fd1fb9de52f95b40e40d SHA512 2bfc1a068fa41a9ecacce7bda494fc0485c57ccb102c1d76c87a42e00ad30b944b0cb788642e8339d050a0e831ce8306844a77292ab9f79ed765b65cdb4765e7 +DIST wasm-bindgen-shared-0.2.84.crate 7219 BLAKE2B 4910158ed884dd9dbb32b1539b0c89a583f98df05cb29654487a26db063c973d44cb086dad4b466f9bc63104e3d4da72fe9feed32618f8243151dfb9ccfaff29 SHA512 fc4bf134a33c71852b91d09fbf1e1801e2b97b5c2756e2680d0c1f8701da30b22b56777d8e806e13602beb040775824966e378f7b9805e131a385e7816ddd010 +DIST web-sys-0.3.60.crate 700485 BLAKE2B 13942a583dd8462b0591a19759a41f41fb17d2356b3bcd78402e420fdf5726782e5b4ed211c3716a81c1cdf64ce9b8adecaa3fa22756a3ec84eb7c3e12e3018c SHA512 d883363f99300e2d50bc5bf198f0fb8d6c53e5a778217e340573560ac07db26a71c98419fa2ced32820472126d6f97ad5773ad082521be0a1c9a374af9d61df9 +DIST web-sys-0.3.61.crate 706333 BLAKE2B f57cb14032e2ea01b5e0ffcef0988ee3e8227c1da7d27ef8799583f64cddb4bcfbbb145f5ea1889006fc9ff61d42b1c02d4b278d67371c9d914827113f5e4128 SHA512 dd8c93a92295a9cd94a4a4cac4a81d9fa41c2c0bc885c1861eae5cc317a0d55e1a9d34b97b91999bf617a071f7f8acc39bb0d4a684b40543519f0cad6b82a25c +DIST webpki-0.22.0.crate 58663 BLAKE2B 4fff91a8ce3d46a9daa9e39c50755f79574c91faddead2f6c879f6e9bc2189b76c4951cbc36e607e099ab8a870b422e1afcd4bcbecc14e96555c26c8cbefeb84 SHA512 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570 +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST winnow-0.4.1.crate 138177 BLAKE2B 9fb55dc5dbca2250c5921aebc42fd8dff7da6fc70656d5690475cf9d81d569b01e68c5134401f70759a9edbe1704cf76727efe5442961b1d220827130497b735 SHA512 390b3da6688d61d90d9bb221d95c7243968209b692737999b13326204954d1e916b390ac8a3a0e0864695ad9a073ed8a79e592ca565be374cc6e909b4166d52a +DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756 diff --git a/net-libs/rustls-ffi/files/rustls-ffi-0.10.0-cargo-c.patch b/net-libs/rustls-ffi/files/rustls-ffi-0.10.0-cargo-c.patch new file mode 100644 index 000000000000..e51cb398a37f --- /dev/null +++ b/net-libs/rustls-ffi/files/rustls-ffi-0.10.0-cargo-c.patch @@ -0,0 +1,75 @@ +https://github.com/rustls/rustls-ffi/pull/274 + +From ea8c871eba61af4f656cb20d8b1b62a3e50c8a0a Mon Sep 17 00:00:00 2001 +From: Luca Barbato <lu_zero@gentoo.org> +Date: Sat, 10 Dec 2022 12:00:41 +0100 +Subject: [PATCH 1/2] Move the language configuration to cbindgen.toml + +--- + Makefile | 2 +- + cbindgen.toml | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index efd5beba..e9fdff1c 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,7 +39,7 @@ target: + mkdir -p $@ + + src/rustls.h: src/*.rs cbindgen.toml +- cbindgen --lang C > $@ ++ cbindgen > $@ + + target/$(PROFILE)/librustls_ffi.a: src/*.rs Cargo.toml + RUSTFLAGS="-C metadata=rustls-ffi" ${CARGO} build $(CARGOFLAGS) +diff --git a/cbindgen.toml b/cbindgen.toml +index ffcc0fcf..a5a6cf1c 100644 +--- a/cbindgen.toml ++++ b/cbindgen.toml +@@ -1,4 +1,5 @@ + include_guard = "RUSTLS_H" ++language = "C" + + usize_is_size_t = true + + +From 76542bbc4634fddf17f3e575cea60da63a3a9ad9 Mon Sep 17 00:00:00 2001 +From: Luca Barbato <lu_zero@gentoo.org> +Date: Sat, 10 Dec 2022 12:29:23 +0100 +Subject: [PATCH 2/2] Initial cargo-c support + +--- + Cargo.toml | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/Cargo.toml b/Cargo.toml +index d90689cf..b16e9d98 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -20,6 +20,7 @@ rust-version = "1.57" + # libraries. + no_log_capture = [] + read_buf = ["rustls/read_buf"] ++capi = [] + + [dependencies] + # Keep in sync with RUSTLS_CRATE_VERSION in build.rs +@@ -34,3 +35,16 @@ num_enum = "0.5.10" + [lib] + name = "rustls_ffi" + crate-type = ["lib", "staticlib"] ++ ++ ++[package.metadata.capi.header] ++name = "rustls" ++subdirectory = false ++ ++[package.metadata.capi.library] ++name = "rustls" ++rustflags = "-Cmetadata=rustls-ffi" ++ ++[package.metadata.capi.pkg_config] ++name = "rustls" ++filename = "rustls" + diff --git a/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch b/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch new file mode 100644 index 000000000000..c6349e37ddba --- /dev/null +++ b/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch @@ -0,0 +1,48 @@ +https://github.com/rustls/rustls-ffi/issues/397 +https://github.com/rustls/rustls-ffi/pull/398 + +From 9890aff0f0b1cc69f86c24b217a2515525e57056 Mon Sep 17 00:00:00 2001 +From: Daniel McCarney <daniel@binaryparadox.net> +Date: Wed, 27 Mar 2024 21:08:16 -0400 +Subject: [PATCH] Cargo: configure cargo-c to use vendored .h + +Presently we pre-generate the rustls.h header file using `cbindgen`, +commit the result to `src/rustls.h`, and check that the generated result +matches the checked-in result in CI. + +The new experimental cargo-c build regenerates its own header file using +`cbindgen` by default unless told to do otherwise. We'd prefer it didn't +do this because we're using a `cbindgen` feature that requires nightly +rust. + +This commit updates the `Cargo.toml` capi metadata to tell cargo-c to +skip generation of its own header file. We then configure the +pre-generated checked-in header file as an asset to be copied into the +install include directory. + +This better matches how the `Makefile` build allowed building the static +lib without needing nightly rust or `cbindgen`. +--- + Cargo.toml | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Cargo.toml b/Cargo.toml +index 7a910a9d..d601c7f8 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -41,6 +41,7 @@ regex = "1.9.6" + [package.metadata.capi.header] + name = "rustls" + subdirectory = false ++generation = false # Prefer a vendored .h + + [package.metadata.capi.library] + name = "rustls" +@@ -50,3 +51,6 @@ rustflags = "-Cmetadata=rustls-ffi" + [package.metadata.capi.pkg_config] + name = "rustls" + filename = "rustls" ++ ++[package.metadata.capi.install.include] ++asset = [{from = "src/rustls.h", to = "" }] + diff --git a/net-libs/rustls-ffi/files/rustls-ffi-0.9.1-cargo-c.patch b/net-libs/rustls-ffi/files/rustls-ffi-0.9.1-cargo-c.patch new file mode 100644 index 000000000000..4d0af35d36d9 --- /dev/null +++ b/net-libs/rustls-ffi/files/rustls-ffi-0.9.1-cargo-c.patch @@ -0,0 +1,61 @@ +https://github.com/rustls/rustls-ffi/pull/274 +https://github.com/rustls/rustls-ffi/issues/220 + +From 1c1968a374b1e14551f32c360489185e9b6e4376 Mon Sep 17 00:00:00 2001 +From: Luca Barbato <lu_zero@gentoo.org> +Date: Sat, 10 Dec 2022 12:00:41 +0100 +Subject: [PATCH 1/2] Move the language configuration to cbindgen.toml + +--- a/Makefile ++++ b/Makefile +@@ -33,7 +33,7 @@ target: + mkdir -p $@ + + src/rustls.h: src/*.rs cbindgen.toml +- cbindgen --lang C > $@ ++ cbindgen > $@ + + target/$(PROFILE)/librustls_ffi.a: src/*.rs Cargo.toml + RUSTFLAGS="-C metadata=rustls-ffi" cargo build $(CARGOFLAGS) +--- a/cbindgen.toml ++++ b/cbindgen.toml +@@ -1,4 +1,5 @@ + include_guard = "CRUSTLS_H" ++language = "C" + + usize_is_size_t = true + + +From 5d3e109bea0f3fe3d9080a5d5ca4e30c66d4e2e9 Mon Sep 17 00:00:00 2001 +From: Luca Barbato <lu_zero@gentoo.org> +Date: Sat, 10 Dec 2022 12:29:23 +0100 +Subject: [PATCH 2/2] Initial cargo-c support + +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -19,6 +19,7 @@ links = "rustls_ffi" + # libraries. + no_log_capture = [] + read_buf = ["rustls/read_buf"] ++capi = [] + + [dependencies] + # Keep in sync with RUSTLS_CRATE_VERSION in build.rs +@@ -33,3 +34,16 @@ num_enum = "0.5.4" + [lib] + name = "rustls_ffi" + crate-type = ["lib", "staticlib"] ++ ++ ++[package.metadata.capi.header] ++name = "rustls" ++subdirectory = false ++ ++[package.metadata.capi.library] ++name = "rustls" ++rustflags = "-Cmetadata=rustls-ffi" ++ ++[package.metadata.capi.pkg_config] ++name = "rustls" ++filename = "rustls" + diff --git a/net-libs/rustls-ffi/files/rustls-ffi-0.9.1-tests-32-bit.patch b/net-libs/rustls-ffi/files/rustls-ffi-0.9.1-tests-32-bit.patch new file mode 100644 index 000000000000..bfba079bf60a --- /dev/null +++ b/net-libs/rustls-ffi/files/rustls-ffi-0.9.1-tests-32-bit.patch @@ -0,0 +1,106 @@ +https://github.com/rustls/rustls-ffi/pull/275 + +From ab059728729dc53da0bac64a42cccde92535b7c5 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 11 Dec 2022 01:46:59 +0000 +Subject: [PATCH] tests: fix -Wformat + +Bug: https://github.com/rustls/rustls-ffi/issues/235 +--- a/tests/client.c ++++ b/tests/client.c +@@ -129,7 +129,7 @@ do_read(struct conndata *conn, struct rustls_connection *rconn) + signed_n = read(conn->fd, buf, sizeof(buf)); + if(signed_n > 0) { + fprintf(stderr, +- "client: error: read returned %ld bytes after receiving close_notify\n", ++ "client: error: read returned %zu bytes after receiving close_notify\n", + n); + return CRUSTLS_DEMO_ERROR; + } +@@ -237,7 +237,7 @@ send_request_and_read_response(struct conndata *conn, + body = body_beginning(&conn->data); + if(body != NULL) { + headers_len = body - conn->data.data; +- fprintf(stderr, "client: body began at %ld\n", headers_len); ++ fprintf(stderr, "client: body began at %zu\n", headers_len); + content_length_str = get_first_header_value(conn->data.data, + headers_len, + CONTENT_LENGTH, +@@ -256,7 +256,7 @@ send_request_and_read_response(struct conndata *conn, + content_length_str); + goto cleanup; + } +- fprintf(stderr, "client: content length %ld\n", content_length); ++ fprintf(stderr, "client: content length %lu\n", content_length); + } + } + if(headers_len != 0 && +@@ -294,7 +294,7 @@ send_request_and_read_response(struct conndata *conn, + if(result != CRUSTLS_DEMO_OK && result != CRUSTLS_DEMO_EOF) { + goto cleanup; + } +- fprintf(stderr, "client: writing %ld bytes to stdout\n", conn->data.len); ++ fprintf(stderr, "client: writing %zu bytes to stdout\n", conn->data.len); + if(write(STDOUT_FILENO, conn->data.data, conn->data.len) < 0) { + fprintf(stderr, "error writing to stderr\n"); + goto cleanup; +@@ -375,15 +375,15 @@ verify(void *userdata, const rustls_verify_server_cert_params *params) + "client: custom certificate verifier called for %.*s\n", + (int)params->dns_name.len, + params->dns_name.data); +- fprintf(stderr, "client: end entity len: %ld\n", params->end_entity_cert_der.len); ++ fprintf(stderr, "client: end entity len: %zu\n", params->end_entity_cert_der.len); + fprintf(stderr, "client: intermediates:\n"); + for(i = 0; i < intermediates_len; i++) { + bytes = rustls_slice_slice_bytes_get(intermediates, i); + if(bytes.data != NULL) { +- fprintf(stderr, "client: intermediate, len = %ld\n", bytes.len); ++ fprintf(stderr, "client: intermediate, len = %zu\n", bytes.len); + } + } +- fprintf(stderr, "client: ocsp response len: %ld\n", params->ocsp_response.len); ++ fprintf(stderr, "client: ocsp response len: %zu\n", params->ocsp_response.len); + if(0 != strcmp(conn->verify_arg, "verify_arg")) { + fprintf(stderr, "client: invalid argument to verify: %p\n", userdata); + return RUSTLS_RESULT_GENERAL; +--- a/tests/common.c ++++ b/tests/common.c +@@ -197,7 +197,7 @@ bytevec_ensure_available(struct bytevec *vec, size_t n) + } + newdata = realloc(vec->data, newsize); + if(newdata == NULL) { +- fprintf(stderr, "out of memory trying to get %ld bytes\n", newsize); ++ fprintf(stderr, "out of memory trying to get %zu bytes\n", newsize); + return CRUSTLS_DEMO_ERROR; + } + vec->data = newdata; +--- a/tests/server.c ++++ b/tests/server.c +@@ -86,7 +86,7 @@ do_read(struct conndata *conn, struct rustls_connection *rconn) + if(n == 0) { + return CRUSTLS_DEMO_EOF; + } +- fprintf(stderr, "server: read %ld bytes from socket\n", n); ++ fprintf(stderr, "server: read %zu bytes from socket\n", n); + + result = rustls_connection_process_new_packets(rconn); + if(result != RUSTLS_RESULT_OK) { +@@ -105,7 +105,7 @@ do_read(struct conndata *conn, struct rustls_connection *rconn) + signed_n = read(conn->fd, buf, sizeof(buf)); + if(signed_n > 0) { + fprintf(stderr, +- "server: error: read returned %ld bytes after receiving close_notify\n", ++ "server: error: read returned %zu bytes after receiving close_notify\n", + n); + return CRUSTLS_DEMO_ERROR; + } +@@ -144,7 +144,7 @@ send_response(struct conndata *conn) + + free(response); + if(n != response_size) { +- fprintf(stderr, "server: failed to write all response bytes. wrote %ld\n", n); ++ fprintf(stderr, "server: failed to write all response bytes. wrote %zu\n", n); + return CRUSTLS_DEMO_ERROR; + } + return CRUSTLS_DEMO_OK; + diff --git a/net-libs/kdav2/metadata.xml b/net-libs/rustls-ffi/metadata.xml index d925f2439758..4cdfc3df6e6d 100644 --- a/net-libs/kdav2/metadata.xml +++ b/net-libs/rustls-ffi/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> </maintainer> <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="github">rustls/rustls-ffi</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/rustls-ffi/rustls-ffi-0.10.0-r1.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.10.0-r1.ebuild new file mode 100644 index 000000000000..db915dbc209b --- /dev/null +++ b/net-libs/rustls-ffi/rustls-ffi-0.10.0-r1.ebuild @@ -0,0 +1,120 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + autocfg-1.1.0 + base64-0.13.1 + bumpalo-3.12.0 + cc-1.0.79 + cfg-if-1.0.0 + hashbrown-0.12.3 + indexmap-1.9.3 + js-sys-0.3.61 + libc-0.2.140 + log-0.4.17 + memchr-2.5.0 + num_enum-0.5.11 + num_enum_derive-0.5.11 + once_cell-1.17.1 + proc-macro-crate-1.3.1 + proc-macro2-1.0.55 + quote-1.0.26 + ring-0.16.20 + rustls-0.21.0 + rustls-pemfile-0.2.1 + rustls-webpki-0.100.1 + rustversion-1.0.12 + sct-0.7.0 + spin-0.5.2 + syn-1.0.109 + toml_datetime-0.6.1 + toml_edit-0.19.8 + unicode-ident-1.0.8 + untrusted-0.7.1 + wasm-bindgen-0.2.84 + wasm-bindgen-backend-0.2.84 + wasm-bindgen-macro-0.2.84 + wasm-bindgen-macro-support-0.2.84 + wasm-bindgen-shared-0.2.84 + web-sys-0.3.61 + webpki-0.22.0 + winapi-0.3.9 + winapi-i686-pc-windows-gnu-0.4.0 + winapi-x86_64-pc-windows-gnu-0.4.0 + winnow-0.4.1 +" + +inherit cargo flag-o-matic multilib-minimal rust-toolchain + +DESCRIPTION="C-to-rustls bindings" +HOMEPAGE="https://github.com/rustls/rustls-ffi" +SRC_URI="https://github.com/rustls/rustls-ffi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" $(cargo_crate_uris)" + +# From cargo-ebuild (note that webpki is also just ISC) +LICENSE="|| ( MIT Apache-2.0 ) BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016" +# Dependent crate licenses +LICENSE+=" ISC MIT Unicode-DFS-2016" +# For Ring (see its LICENSE) +LICENSE+=" ISC openssl SSLeay MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" + +BDEPEND="dev-util/cargo-c" + +QA_FLAGS_IGNORED="usr/lib.*/librustls.*" + +PATCHES=( + "${FILESDIR}"/${PN}-0.10.0-cargo-c.patch +) + +src_prepare() { + default + + multilib_copy_sources +} + +src_configure() { + # bug #927231 + filter-lto + + multilib-minimal_src_configure +} + +multilib_src_compile() { + local cargoargs=( + --library-type=cdylib + --prefix=/usr + --libdir="/usr/$(get_libdir)" + --target="$(rust_abi)" + $(usev !debug '--release') + ) + + cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed" +} + +multilib_src_test() { + local cargoargs=( + --prefix=/usr + --libdir="/usr/$(get_libdir)" + --target="$(rust_abi)" + $(usex debug '--debug' '--release') + ) + + cargo ctest "${cargoargs[@]}" || die "cargo ctest failed" +} + +multilib_src_install() { + local cargoargs=( + --library-type=cdylib + --prefix=/usr + --libdir="/usr/$(get_libdir)" + --target="$(rust_abi)" + --destdir="${ED}" + $(usex debug '--debug' '--release') + ) + + cargo cinstall "${cargoargs[@]}" || die "cargo cinstall failed" +} diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.1-r2.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r2.ebuild new file mode 100644 index 000000000000..962808494628 --- /dev/null +++ b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r2.ebuild @@ -0,0 +1,114 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + aho-corasick@1.1.1 + base64@0.21.5 + cc@1.0.83 + cfg-if@1.0.0 + getrandom@0.2.11 + libc@0.2.153 + log@0.4.21 + memchr@2.6.4 + regex-automata@0.3.9 + regex-syntax@0.7.5 + regex@1.9.6 + ring@0.17.5 + rustls-pemfile@2.1.1 + rustls-pki-types@1.3.1 + rustls-webpki@0.102.0 + rustls@0.22.0 + rustversion@1.0.14 + spin@0.9.8 + subtle@2.5.0 + untrusted@0.9.0 + wasi@0.11.0+wasi-snapshot-preview1 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 + zeroize@1.7.0 +" + +inherit cargo flag-o-matic multilib-minimal rust-toolchain + +DESCRIPTION="C-to-rustls bindings" +HOMEPAGE="https://github.com/rustls/rustls-ffi" +SRC_URI="https://github.com/rustls/rustls-ffi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" ${CARGO_CRATE_URIS}" + +LICENSE="|| ( Apache-2.0 MIT ISC )" +# Dependent crate licenses +LICENSE+=" BSD ISC MIT" +# For Ring (see its LICENSE) +LICENSE+=" ISC openssl SSLeay MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" + +BDEPEND="dev-util/cargo-c" + +QA_FLAGS_IGNORED="usr/lib.*/librustls.*" + +PATCHES=( + "${FILESDIR}"/${PN}-0.12.1-no-rust-nightly.patch +) + +src_prepare() { + default + + multilib_copy_sources +} + +src_configure() { + # bug #927231 + filter-lto + + # textrels in ring + # Hopefully fixed with https://github.com/rustls/rustls-ffi/pull/389 + export RUSTFLAGS="${RUSTFLAGS} -C link-arg=-Wl,-z,notext" + + multilib-minimal_src_configure +} + +multilib_src_compile() { + local cargoargs=( + --library-type=cdylib + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}/usr/$(get_libdir)" + --target="$(rust_abi)" + $(usev !debug '--release') + ) + + cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed" +} + +multilib_src_test() { + local cargoargs=( + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}/usr/$(get_libdir)" + --target="$(rust_abi)" + $(usex debug '--debug' '--release') + ) + + cargo ctest "${cargoargs[@]}" || die "cargo ctest failed" +} + +multilib_src_install() { + local cargoargs=( + --library-type=cdylib + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}/usr/$(get_libdir)" + --target="$(rust_abi)" + --destdir="${D}" + $(usex debug '--debug' '--release') + ) + + cargo cinstall "${cargoargs[@]}" || die "cargo cinstall failed" +} diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.2.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.12.2.ebuild new file mode 100644 index 000000000000..a09c7412e487 --- /dev/null +++ b/net-libs/rustls-ffi/rustls-ffi-0.12.2.ebuild @@ -0,0 +1,110 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + aho-corasick@1.1.1 + base64@0.21.5 + cc@1.0.83 + cfg-if@1.0.0 + getrandom@0.2.11 + libc@0.2.153 + log@0.4.21 + memchr@2.6.4 + regex-automata@0.3.9 + regex-syntax@0.7.5 + regex@1.9.6 + ring@0.17.5 + rustls-pemfile@2.1.1 + rustls-pki-types@1.3.1 + rustls-webpki@0.102.0 + rustls@0.22.0 + rustversion@1.0.14 + spin@0.9.8 + subtle@2.5.0 + untrusted@0.9.0 + wasi@0.11.0+wasi-snapshot-preview1 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 + zeroize@1.7.0 +" + +inherit cargo flag-o-matic multilib-minimal rust-toolchain + +DESCRIPTION="C-to-rustls bindings" +HOMEPAGE="https://github.com/rustls/rustls-ffi" +SRC_URI="https://github.com/rustls/rustls-ffi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" ${CARGO_CRATE_URIS}" + +LICENSE="|| ( Apache-2.0 MIT ISC )" +# Dependent crate licenses +LICENSE+=" BSD ISC MIT" +# For Ring (see its LICENSE) +LICENSE+=" ISC openssl SSLeay MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" + +BDEPEND="dev-util/cargo-c" + +QA_FLAGS_IGNORED="usr/lib.*/librustls.*" + +src_prepare() { + default + + multilib_copy_sources +} + +src_configure() { + # bug #927231 + filter-lto + + # textrels in ring + # Hopefully fixed with https://github.com/rustls/rustls-ffi/pull/389 + export RUSTFLAGS="${RUSTFLAGS} -C link-arg=-Wl,-z,notext" + + multilib-minimal_src_configure +} + +multilib_src_compile() { + local cargoargs=( + --library-type=cdylib + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}/usr/$(get_libdir)" + --target="$(rust_abi)" + $(usev !debug '--release') + ) + + cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed" +} + +multilib_src_test() { + local cargoargs=( + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}/usr/$(get_libdir)" + --target="$(rust_abi)" + $(usex debug '--debug' '--release') + ) + + cargo ctest "${cargoargs[@]}" || die "cargo ctest failed" +} + +multilib_src_install() { + local cargoargs=( + --library-type=cdylib + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}/usr/$(get_libdir)" + --target="$(rust_abi)" + --destdir="${D}" + $(usex debug '--debug' '--release') + ) + + cargo cinstall "${cargoargs[@]}" || die "cargo cinstall failed" +} diff --git a/net-libs/rustls-ffi/rustls-ffi-0.13.0.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.13.0.ebuild new file mode 100644 index 000000000000..4f144686f120 --- /dev/null +++ b/net-libs/rustls-ffi/rustls-ffi-0.13.0.ebuild @@ -0,0 +1,107 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + aho-corasick@1.1.1 + base64@0.21.5 + cc@1.0.83 + cfg-if@1.0.0 + getrandom@0.2.11 + libc@0.2.153 + log@0.4.21 + memchr@2.6.4 + once_cell@1.19.0 + regex-automata@0.3.9 + regex-syntax@0.7.5 + regex@1.9.6 + ring@0.17.5 + rustls-pemfile@2.1.1 + rustls-pki-types@1.3.1 + rustls-webpki@0.102.2 + rustls@0.23.4 + rustversion@1.0.14 + spin@0.9.8 + subtle@2.5.0 + untrusted@0.9.0 + wasi@0.11.0+wasi-snapshot-preview1 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 + zeroize@1.7.0 +" + +inherit cargo flag-o-matic multilib-minimal rust-toolchain + +DESCRIPTION="C-to-rustls bindings" +HOMEPAGE="https://github.com/rustls/rustls-ffi" +SRC_URI="https://github.com/rustls/rustls-ffi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" ${CARGO_CRATE_URIS}" + +LICENSE="|| ( Apache-2.0 MIT ISC )" +# Dependent crate licenses +LICENSE+=" BSD ISC MIT" +# For Ring (see its LICENSE) +LICENSE+=" ISC openssl SSLeay MIT" +SLOT="0/${PV%.*}" +KEYWORDS="~amd64" + +BDEPEND="dev-util/cargo-c" + +QA_FLAGS_IGNORED="usr/lib.*/librustls.*" + +src_prepare() { + default + + multilib_copy_sources +} + +src_configure() { + # bug #927231 + filter-lto + + multilib-minimal_src_configure +} + +multilib_src_compile() { + local cargoargs=( + --library-type=cdylib + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}/usr/$(get_libdir)" + --target="$(rust_abi)" + $(usev !debug '--release') + ) + + cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed" +} + +multilib_src_test() { + local cargoargs=( + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}/usr/$(get_libdir)" + --target="$(rust_abi)" + $(usex debug '--debug' '--release') + ) + + cargo ctest "${cargoargs[@]}" || die "cargo ctest failed" +} + +multilib_src_install() { + local cargoargs=( + --library-type=cdylib + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}/usr/$(get_libdir)" + --target="$(rust_abi)" + --destdir="${D}" + $(usex debug '--debug' '--release') + ) + + cargo cinstall "${cargoargs[@]}" || die "cargo cinstall failed" +} diff --git a/net-libs/rustls-ffi/rustls-ffi-0.9.1-r1.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.9.1-r1.ebuild new file mode 100644 index 000000000000..bf9f34bba51c --- /dev/null +++ b/net-libs/rustls-ffi/rustls-ffi-0.9.1-r1.ebuild @@ -0,0 +1,139 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + ansi_term-0.12.1 + atty-0.2.14 + autocfg-1.1.0 + base64-0.13.1 + bitflags-1.3.2 + bumpalo-3.11.1 + cbindgen-0.19.0 + cc-1.0.77 + cfg-if-1.0.0 + clap-2.34.0 + fastrand-1.8.0 + hashbrown-0.12.3 + heck-0.3.3 + hermit-abi-0.1.19 + indexmap-1.9.2 + instant-0.1.12 + itoa-1.0.4 + js-sys-0.3.60 + libc-0.2.138 + log-0.4.17 + num_enum-0.5.7 + num_enum_derive-0.5.7 + once_cell-1.16.0 + proc-macro-crate-1.2.1 + proc-macro2-1.0.47 + quote-1.0.21 + redox_syscall-0.2.16 + remove_dir_all-0.5.3 + ring-0.16.20 + rustls-0.20.4 + rustls-pemfile-0.2.1 + rustversion-1.0.9 + ryu-1.0.11 + sct-0.7.0 + serde-1.0.149 + serde_derive-1.0.149 + serde_json-1.0.89 + spin-0.5.2 + strsim-0.8.0 + syn-1.0.105 + tempfile-3.3.0 + textwrap-0.11.0 + thiserror-1.0.37 + thiserror-impl-1.0.37 + toml-0.5.9 + unicode-ident-1.0.5 + unicode-segmentation-1.10.0 + unicode-width-0.1.10 + untrusted-0.7.1 + vec_map-0.8.2 + wasm-bindgen-0.2.83 + wasm-bindgen-backend-0.2.83 + wasm-bindgen-macro-0.2.83 + wasm-bindgen-macro-support-0.2.83 + wasm-bindgen-shared-0.2.83 + web-sys-0.3.60 + webpki-0.22.0 + winapi-0.3.9 + winapi-i686-pc-windows-gnu-0.4.0 + winapi-x86_64-pc-windows-gnu-0.4.0 +" + +inherit cargo flag-o-matic multilib-minimal rust-toolchain + +DESCRIPTION="C-to-rustls bindings" +HOMEPAGE="https://github.com/rustls/rustls-ffi" +SRC_URI="https://github.com/rustls/rustls-ffi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" $(cargo_crate_uris)" + +# From cargo-ebuild (note that webpki is also just ISC) +LICENSE="|| ( MIT Apache-2.0 ) BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016" +# For Ring (see its LICENSE) +LICENSE+=" ISC openssl SSLeay MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" + +BDEPEND="dev-util/cargo-c" + +QA_FLAGS_IGNORED="usr/lib.*/librustls.*" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9.1-cargo-c.patch + "${FILESDIR}"/${PN}-0.9.1-tests-32-bit.patch +) + +src_prepare() { + default + + multilib_copy_sources +} + +src_configure() { + # bug #927231 + filter-lto + + multilib-minimal_src_configure +} + +multilib_src_compile() { + local cargoargs=( + --library-type=cdylib + --prefix=/usr + --libdir="/usr/$(get_libdir)" + --target="$(rust_abi)" + $(usev !debug '--release') + ) + + cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed" +} + +multilib_src_test() { + local cargoargs=( + --prefix=/usr + --libdir="/usr/$(get_libdir)" + --target="$(rust_abi)" + $(usex debug '--debug' '--release') + ) + + cargo ctest "${cargoargs[@]}" || die "cargo ctest failed" +} + +multilib_src_install() { + local cargoargs=( + --library-type=cdylib + --prefix=/usr + --libdir="/usr/$(get_libdir)" + --target="$(rust_abi)" + --destdir="${ED}" + $(usex debug '--debug' '--release') + ) + + cargo cinstall "${cargoargs[@]}" || die "cargo cinstall failed" +} diff --git a/net-libs/serf/files/serf-1.3.9-libressl.patch b/net-libs/serf/files/serf-1.3.9-libressl.patch new file mode 100644 index 000000000000..bfb07bd5a0ad --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-libressl.patch @@ -0,0 +1,35 @@ +This backported patch avoids the upstream scons check to prevent unintended +issues and can be removed next release bump where it may be preferable to +use the newer cmake build system. + +https://bugs.gentoo.org/906123 +https://bugs.gentoo.org/903001 +https://github.com/apache/serf/commit/df0d2d0dbdf88576f26da9c71df3ab6249d351dc + +From df0d2d0dbdf88576f26da9c71df3ab6249d351dc Mon Sep 17 00:00:00 2001 +From: Stefan Sperling <stsp@apache.org> +Date: Tue, 20 Dec 2016 09:57:08 +0000 +Subject: [PATCH] Fix another build problem with LibreSSL. + +* SConstruct: Check for OpenSSL_malloc_init() and provide the + SERF_HAVE_OPENSSL_MALLOC_INIT feature flag. + +* buckets/ssl_buckets.c + (init_ssl_libraries): Use SERF_HAVE_OPENSSL_MALLOC_INIT instead + of USE_LEGACY_OPENSSL. + +git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1775242 13f79535-47bb-0310-9956-ffa450edef68 + +diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c +index b01e535..27c84c7 100644 +--- a/buckets/ssl_buckets.c ++++ b/buckets/ssl_buckets.c +@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void) + } + #endif + +-#ifdef USE_OPENSSL_1_1_API ++#ifndef LIBRESSL_VERSION_NUMBER + OPENSSL_malloc_init(); + #else + CRYPTO_malloc_init(); diff --git a/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch b/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch new file mode 100644 index 000000000000..6bf3aba6de47 --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch @@ -0,0 +1,22 @@ +https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-bio-ctrl.patch +https://bugs.gentoo.org/805161 +https://issues.apache.org/jira/projects/SERF/issues/SERF-198 +--- a/buckets/ssl_buckets.c ++++ b/buckets/ssl_buckets.c +@@ -407,7 +407,7 @@ static int bio_bucket_destroy(BIO *bio) + + static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr) + { +- long ret = 1; ++ long ret = 0; + + switch (cmd) { + default: +@@ -415,6 +415,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr) + break; + case BIO_CTRL_FLUSH: + /* At this point we can't force a flush. */ ++ ret = 1; + break; + case BIO_CTRL_PUSH: + case BIO_CTRL_POP: diff --git a/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch b/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch new file mode 100644 index 000000000000..2823ee88e17b --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch @@ -0,0 +1,15 @@ +https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch +https://bugs.gentoo.org/805161 +--- a/buckets/ssl_buckets.c ++++ b/buckets/ssl_buckets.c +@@ -1204,6 +1204,10 @@ + } + } + ++#ifndef ERR_GET_FUNC ++#define ERR_GET_FUNC(ec) (0) ++#endif ++ + static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey) + { + serf_ssl_context_t *ctx = SSL_get_app_data(ssl); diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml index 9bb005e5c177..bc9fee8abdf6 100644 --- a/net-libs/serf/metadata.xml +++ b/net-libs/serf/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arfrever.fta@gmail.com</email> - </maintainer> - <maintainer type="person" proxied="proxy"> - <email>floppym@gentoo.org</email> - <name>Mike Gilbert</name> - </maintainer> + <!--maintainer-needed--> + <upstream> + <remote-id type="github">apache/serf</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r4.ebuild index daf94ac8d992..0d7c80cd62a3 100644 --- a/net-libs/serf/serf-1.3.9-r2.ebuild +++ b/net-libs/serf/serf-1.3.9-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic @@ -13,8 +13,9 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="kerberos static-libs" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="kerberos" +# Many test failures. RESTRICT="test" RDEPEND="dev-libs/apr:1= @@ -22,21 +23,25 @@ RDEPEND="dev-libs/apr:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND} - >=dev-util/scons-2.3.0" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-build/scons-2.3.0" -PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch +PATCHES=( + "${FILESDIR}"/${PN}-1.3.8-static-lib.patch "${FILESDIR}"/${PN}-1.3.8-openssl.patch "${FILESDIR}"/${PN}-1.3.9-python3.patch "${FILESDIR}"/${PN}-1.3.9-python3_byte.patch "${FILESDIR}"/${PN}-1.3.9-python3-check.patch + "${FILESDIR}"/${PN}-1.3.9-openssl-3-bio-ctrl.patch + "${FILESDIR}"/${PN}-1.3.9-openssl-3-errgetfunc.patch + "${FILESDIR}"/${PN}-1.3.9-libressl.patch #903001, 906123 ) src_prepare() { default # https://code.google.com/p/serf/issues/detail?id=133 - sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct + sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct || die # need limits.h for PATH_MAX (only when EXTENSIONS is enabled) [[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__ @@ -44,6 +49,7 @@ src_prepare() { src_compile() { myesconsargs=( + BUILD_STATIC=no PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" # These config scripts are sent through a shell with an empty env @@ -51,7 +57,6 @@ src_compile() { # avoid that. APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config" APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config" - BUILD_STATIC=$(usex static-libs) AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" CC="$(tc-getCC)" diff --git a/net-libs/shairplay/Manifest b/net-libs/shairplay/Manifest index dc2906a022fb..c7b79435caeb 100644 --- a/net-libs/shairplay/Manifest +++ b/net-libs/shairplay/Manifest @@ -1,2 +1 @@ -DIST shairplay-0_pre20170118.tar.gz 291352 BLAKE2B 0eb1a60e7cd3511d24d7f6fc910afa85df4488a96ffca80d98bf00b8544b05630f8edb2f5204bc93e8901c4d8efa752f2eef94ed625e2bf7d77cd74ed3053572 SHA512 05a8ac399659235e88d3b1a7fbe8364ba526881b24ee082c3b7a5709b9b63eac376071d44028e4758ab22ca56d30f8e996b12dc9d3bd99bd38fe453e00a4a18b DIST shairplay-0_pre20180824.tar.gz 554332 BLAKE2B cbebe272a15a602b79f384c7497bd849145bf065a9b2c6fd335c5536dd0cbefef332945662ad4962e69273d64a23c1f2ace3edcb7c38362607414d27a61397fd SHA512 38d947740da85546cccc4186dfd6d1ab0be71463107b24beb374b17a9e557fc7e4c97e34bfd69e962ddb3e481ecc8e37070e225761d8543588cf047be25ca3a6 diff --git a/net-libs/shairplay/metadata.xml b/net-libs/shairplay/metadata.xml index 08b8ba3d740e..6c95395c2a6d 100644 --- a/net-libs/shairplay/metadata.xml +++ b/net-libs/shairplay/metadata.xml @@ -2,9 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <use> - <flag name="alac">Add support for Apple Lossless Audio Codec files</flag> <flag name="playfair">Add support for handling fairplay handshake (used in for example screen mirroring)</flag> - <flag name="tools">Build and install a binary shairplay in /usr/bin</flag> </use> <maintainer type="person"> <email>candrews@gentoo.org</email> diff --git a/net-libs/shairplay/shairplay-0_pre20170118.ebuild b/net-libs/shairplay/shairplay-0_pre20170118.ebuild deleted file mode 100644 index 0df35df053a7..000000000000 --- a/net-libs/shairplay/shairplay-0_pre20170118.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools vcs-snapshot - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/juhovh/${PN}.git" -else - EGIT_COMMIT="498bc5bcdd305e04721f94a04b9f26a7da72673f" - SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="Apple airplay and raop protocol server" -HOMEPAGE="https://github.com/juhovh/shairplay" -LICENSE="BSD LGPL-2.1 MIT" - -SLOT="0" -IUSE="alac static-libs tools" - -DEPEND=" - tools? ( media-libs/libao ) -" - -RDEPEND=" - alac? ( - media-sound/alac_decoder - net-libs/shairplay[tools] - ) - tools? ( - dev-libs/openssl:0= - net-dns/avahi[mdnsresponder-compat] - ) -" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild b/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild index b54926af8fe8..372378fa6a56 100644 --- a/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild +++ b/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ else EGIT_COMMIT="096b61ad14c90169f438e690d096e3fcf87e504e" SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - KEYWORDS="amd64 ~arm arm64 x86" + KEYWORDS="amd64 ~arm arm64 ~riscv x86" fi DESCRIPTION="Apple airplay and raop protocol server" diff --git a/net-libs/shairplay/shairplay-0_pre20180824.ebuild b/net-libs/shairplay/shairplay-0_pre20180824.ebuild deleted file mode 100644 index f4af8a0449c9..000000000000 --- a/net-libs/shairplay/shairplay-0_pre20180824.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/juhovh/${PN}.git" -else - EGIT_COMMIT="096b61ad14c90169f438e690d096e3fcf87e504e" - SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Apple airplay and raop protocol server" -HOMEPAGE="https://github.com/juhovh/shairplay" -LICENSE="BSD LGPL-2.1 MIT - playfair? ( GPL-3+ )" - -SLOT="0" -IUSE="alac +playfair static-libs tools" - -DEPEND=" - tools? ( media-libs/libao ) -" - -RDEPEND=" - alac? ( - media-sound/alac_decoder - net-libs/shairplay[tools] - ) - tools? ( - dev-libs/openssl:0= - net-dns/avahi[mdnsresponder-compat] - ) -" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_with playfair) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest index effff8a83604..72b46cb014b2 100644 --- a/net-libs/signon-oauth2/Manifest +++ b/net-libs/signon-oauth2/Manifest @@ -1 +1,2 @@ DIST signon-oauth2-0.25.tar.gz 41090 BLAKE2B d14cde073cf834427e337f94345b719ad1af38a285587f987f6ed42f96e8aecfcf63720e42b7f86f2018565c198e1f31b7b75da74c86db3e8a15680da70d3f9e SHA512 721cd514ee0a1175e3b1bbaa78dc1a87fd382327bcbee8356de040f04455f7cc80ed173e3f33a6acf4c0d679847063a25282e9d5c9a9be99f730bec41be96451 +DIST signon-oauth2-0.25_p20210102.tar.bz2 34873 BLAKE2B 4e53f6d19cf0e9c8513afef44ab640dcd3ed811a9830acff65abd997691926388015b35e6f010c6a0bc25cc257e22a4b8e359ec690bbc35182cd1cf87c716b85 SHA512 5b371e6230c9ed4352ff151626dfaf40d2ecb41e389ee3a753fc41be3937191d416b864d555fd85cecbfe1615233a063db881adae3ea29aefb652a36d46633b5 diff --git a/net-libs/signon-oauth2/files/0001-Port-QSignalSpys-to-PMF-syntax.patch b/net-libs/signon-oauth2/files/0001-Port-QSignalSpys-to-PMF-syntax.patch new file mode 100644 index 000000000000..96b6d0af77f3 --- /dev/null +++ b/net-libs/signon-oauth2/files/0001-Port-QSignalSpys-to-PMF-syntax.patch @@ -0,0 +1,200 @@ +From d3ba6d4c19ca0b1081fbafc757d3c496cc21ada2 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 18:34:07 +0200 +Subject: [PATCH 01/10] Port QSignalSpys to PMF syntax + +--- + tests/oauth2plugintest.cpp | 86 ++++++++++++++++---------------------- + 1 file changed, 37 insertions(+), 49 deletions(-) + +diff --git a/tests/oauth2plugintest.cpp b/tests/oauth2plugintest.cpp +index 94e5c43..b257dc7 100644 +--- a/tests/oauth2plugintest.cpp ++++ b/tests/oauth2plugintest.cpp +@@ -244,7 +244,7 @@ void OAuth2PluginTest::testPluginCancel() + m_testPlugin->cancel(); + + //then real cancel +- QSignalSpy pluginError(m_testPlugin, SIGNAL(error(const SignOn::Error &))); ++ QSignalSpy pluginError(m_testPlugin, &Plugin::error); + + OAuth2PluginData userAgentData; + userAgentData.setHost("https://localhost"); +@@ -435,11 +435,10 @@ void OAuth2PluginTest::testPluginProcess() + QFETCH(QVariantMap, response); + QFETCH(QVariantMap, stored); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); +- QSignalSpy store(m_testPlugin, SIGNAL(store(const SignOn::SessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); ++ QSignalSpy store(m_testPlugin, &Plugin::store); + + m_testPlugin->process(sessionData, mechanism); + if (errorCode < 0) { +@@ -696,11 +695,10 @@ void OAuth2PluginTest::testPluginHmacSha1Process() + QFETCH(QVariantMap, response); + QFETCH(QVariantMap, stored); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); +- QSignalSpy store(m_testPlugin, SIGNAL(store(const SignOn::SessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); ++ QSignalSpy store(m_testPlugin, &Plugin::store); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -777,11 +775,10 @@ void OAuth2PluginTest::testPluginUseragentUserActionFinished() + QStringList scopes = QStringList() << "scope1" << "scope2"; + data.setScope(scopes); + +- QSignalSpy resultSpy(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); +- QSignalSpy store(m_testPlugin, SIGNAL(store(const SignOn::SessionData&))); ++ QSignalSpy resultSpy(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); ++ QSignalSpy store(m_testPlugin, &Plugin::store); + + m_testPlugin->process(data, QString("user_agent")); + +@@ -1286,10 +1283,9 @@ void OAuth2PluginTest::testPluginWebserverUserActionFinished() + data.setScope(QStringList() << "one" << "two" << "three"); + data.setDisableStateParameter(disableStateParameter); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1362,9 +1358,8 @@ void OAuth2PluginTest::testUserActionFinishedErrors() + data.setClientSecret("fa28f40b5a1f8c1d5628963d880636fbkjkjkj"); + data.setRedirectUri("http://localhost/resp.html"); + +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + m_testPlugin->process(data, QString("web_server")); + QTRY_COMPARE(userActionRequired.count(), 1); +@@ -1486,10 +1481,9 @@ void OAuth2PluginTest::testOauth1UserActionFinished() + data.setConsumerSecret("fa28f40b5a1f8c1d5628963d880636fbkjkjkj"); + data.setRealm("MyHost"); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1610,9 +1604,8 @@ void OAuth2PluginTest::testOAuth2Errors() + data.setClientSecret("fa28f40b5a1f8c1d5628963d880636fbkjkjkj"); + data.setRedirectUri("http://localhost/resp.html"); + +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1683,8 +1676,8 @@ void OAuth2PluginTest::testRefreshToken() + + SignOn::UiSessionData info; + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1766,9 +1759,8 @@ void OAuth2PluginTest::testRefreshTokenError() + + SignOn::UiSessionData info; + +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1842,10 +1834,9 @@ void OAuth2PluginTest::testClientAuthentication() + data.setRedirectUri("http://localhost/resp.html"); + data.setForceClientAuthViaRequestBody(forceAuthViaRequestBody); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1908,10 +1899,9 @@ void OAuth2PluginTest::testTokenPath() + data.setClientId("104660106251471"); + data.setRedirectUri("http://localhost/resp.html"); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + TestNetworkAccessManager *nam = new TestNetworkAccessManager; + m_testPlugin->m_networkAccessManager = nam; +@@ -1995,10 +1985,9 @@ void OAuth2PluginTest::testTokenQuery() + data.setClientId("104660106251471"); + data.setRedirectUri("http://localhost/resp.html"); + +- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&))); +- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &))); +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy result(m_testPlugin, &Plugin::result); ++ QSignalSpy error(m_testPlugin, &Plugin::error); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + QScopedPointer<TestNetworkAccessManager> nam(new TestNetworkAccessManager); + m_testPlugin->m_networkAccessManager = nam.data(); +@@ -2062,8 +2051,7 @@ void OAuth2PluginTest::testOAuth2AuthRequestUri() + QFETCH(QVariantMap, sessionData); + QFETCH(QString, expectedUri); + +- QSignalSpy userActionRequired(m_testPlugin, +- SIGNAL(userActionRequired(const SignOn::UiSessionData&))); ++ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired); + + m_testPlugin->process(sessionData, mechanism); + QCOMPARE(userActionRequired.count(), 1); +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0002-Port-to-new-connection-syntax.patch b/net-libs/signon-oauth2/files/0002-Port-to-new-connection-syntax.patch new file mode 100644 index 000000000000..f97e0041698a --- /dev/null +++ b/net-libs/signon-oauth2/files/0002-Port-to-new-connection-syntax.patch @@ -0,0 +1,101 @@ +From a0b372dfb6d37d0a81a545239128fec5ee94283c Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 18:51:29 +0200 +Subject: [PATCH 02/10] Port to new connection syntax + +--- + example/oauthclient.cpp | 8 ++++---- + src/base-plugin.cpp | 12 ++++++------ + src/plugin.cpp | 18 ++++++------------ + tests/oauth2plugintest.cpp | 4 ++-- + 4 files changed, 18 insertions(+), 24 deletions(-) + +diff --git a/example/oauthclient.cpp b/example/oauthclient.cpp +index adfcabf..328e8b7 100644 +--- a/example/oauthclient.cpp ++++ b/example/oauthclient.cpp +@@ -47,10 +47,10 @@ OAuthClient::~OAuthClient() + void OAuthClient::authenticate() + { + SignOn::AuthSession *m_session = m_identity->createSession("oauth2"); +- QObject::connect(m_session, SIGNAL(response(const SignOn::SessionData &)), +- this, SLOT(onResponse(const SignOn::SessionData &))); +- QObject::connect(m_session, SIGNAL(error(const SignOn::Error &)), +- this, SLOT(onError(const SignOn::Error &))); ++ QObject::connect(m_session, &SignOn::AuthSession::response, ++ this, &OAuthClient::onResponse); ++ QObject::connect(m_session, &SignOn::AuthSession::error, ++ this, &OAuthClient::onError); + + OAuth2PluginData data; + data.setHost("www.facebook.com"); +diff --git a/src/base-plugin.cpp b/src/base-plugin.cpp +index aa2d639..d5ce81c 100644 +--- a/src/base-plugin.cpp ++++ b/src/base-plugin.cpp +@@ -124,12 +124,12 @@ void BasePlugin::postRequest(const QNetworkRequest &request, + Q_D(BasePlugin); + + d->m_reply = d->m_networkAccessManager->post(request, data); +- connect(d->m_reply, SIGNAL(finished()), +- this, SLOT(onPostFinished())); +- connect(d->m_reply, SIGNAL(error(QNetworkReply::NetworkError)), +- this, SLOT(onNetworkError(QNetworkReply::NetworkError))); +- connect(d->m_reply, SIGNAL(sslErrors(QList<QSslError>)), +- this, SLOT(handleSslErrors(QList<QSslError>))); ++ connect(d->m_reply, &QNetworkReply::finished, ++ this, &BasePlugin::onPostFinished); ++ connect(d->m_reply, &QNetworkReply::error, ++ this, &BasePlugin::onNetworkError); ++ connect(d->m_reply, &QNetworkReply::sslErrors, ++ this, &BasePlugin::handleSslErrors); + } + + void BasePlugin::serverReply(QNetworkReply *reply) +diff --git a/src/plugin.cpp b/src/plugin.cpp +index e6af807..c764609 100644 +--- a/src/plugin.cpp ++++ b/src/plugin.cpp +@@ -107,18 +107,12 @@ void Plugin::process(const SignOn::SessionData &inData, + impl->setNetworkAccessManager(m_networkAccessManager); + + // Forward the signals from the implementation +- connect(impl, SIGNAL(result(const SignOn::SessionData &)), +- SIGNAL(result(const SignOn::SessionData &))); +- connect(impl, SIGNAL(store(const SignOn::SessionData &)), +- SIGNAL(store(const SignOn::SessionData &))); +- connect(impl, SIGNAL(error(const SignOn::Error &)), +- SIGNAL(error(const SignOn::Error &))); +- connect(impl, SIGNAL(userActionRequired(const SignOn::UiSessionData &)), +- SIGNAL(userActionRequired(const SignOn::UiSessionData &))); +- connect(impl, SIGNAL(refreshed(const SignOn::UiSessionData &)), +- SIGNAL(refreshed(const SignOn::UiSessionData &))); +- connect(impl, SIGNAL(statusChanged(const AuthPluginState, const QString&)), +- SIGNAL(statusChanged(const AuthPluginState, const QString&))); ++ connect(impl, &BasePlugin::result, this, &Plugin::result); ++ connect(impl, &BasePlugin::store, this, &Plugin::store); ++ connect(impl, &BasePlugin::error, this, &Plugin::error); ++ connect(impl, &BasePlugin::userActionRequired, this, &Plugin::userActionRequired); ++ connect(impl, &BasePlugin::refreshed, this, &Plugin::refreshed); ++ connect(impl, &BasePlugin::statusChanged, this, &Plugin::statusChanged); + + impl->process(inData, mechanism); + } +diff --git a/tests/oauth2plugintest.cpp b/tests/oauth2plugintest.cpp +index b257dc7..9e16950 100644 +--- a/tests/oauth2plugintest.cpp ++++ b/tests/oauth2plugintest.cpp +@@ -142,8 +142,8 @@ public: + open(ReadOnly | Unbuffered); + setHeader(QNetworkRequest::ContentLengthHeader, QVariant(content.size())); + +- QTimer::singleShot(0, this, SIGNAL(readyRead())); +- QTimer::singleShot(10, this, SLOT(finish())); ++ QTimer::singleShot(0, this, &TestNetworkReply::readyRead); ++ QTimer::singleShot(10, this, &TestNetworkReply::finish); + } + + public Q_SLOTS: +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0003-Port-away-from-deprecated-error-signal.patch b/net-libs/signon-oauth2/files/0003-Port-away-from-deprecated-error-signal.patch new file mode 100644 index 000000000000..5c7979b7e754 --- /dev/null +++ b/net-libs/signon-oauth2/files/0003-Port-away-from-deprecated-error-signal.patch @@ -0,0 +1,51 @@ +From 8211fd4a3ca31370069c6953db1589c1110dca90 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 18:59:12 +0200 +Subject: [PATCH 03/10] Port away from deprecated error() signal + +--- + src/base-plugin.cpp | 7 ++++++- + tests/oauth2plugintest.cpp | 8 +++++++- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/src/base-plugin.cpp b/src/base-plugin.cpp +index d5ce81c..ffc8ad5 100644 +--- a/src/base-plugin.cpp ++++ b/src/base-plugin.cpp +@@ -126,8 +126,13 @@ void BasePlugin::postRequest(const QNetworkRequest &request, + d->m_reply = d->m_networkAccessManager->post(request, data); + connect(d->m_reply, &QNetworkReply::finished, + this, &BasePlugin::onPostFinished); +- connect(d->m_reply, &QNetworkReply::error, ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++ connect(d->m_reply, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), + this, &BasePlugin::onNetworkError); ++#else ++ connect(d->m_reply, &QNetworkReply::errorOccurred, ++ this, &BasePlugin::onNetworkError); ++#endif + connect(d->m_reply, &QNetworkReply::sslErrors, + this, &BasePlugin::handleSslErrors); + } +diff --git a/tests/oauth2plugintest.cpp b/tests/oauth2plugintest.cpp +index 9e16950..f5221cc 100644 +--- a/tests/oauth2plugintest.cpp ++++ b/tests/oauth2plugintest.cpp +@@ -148,7 +148,13 @@ public: + + public Q_SLOTS: + void finish() { setFinished(true); Q_EMIT finished(); } +- void fail() { Q_EMIT error(error()); } ++ void fail() { ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++ Q_EMIT error(error()); ++#else ++ Q_EMIT errorOccurred(error()); ++#endif ++ } + + protected: + void abort() Q_DECL_OVERRIDE {} +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0004-Port-away-from-deprecated-qrand.patch b/net-libs/signon-oauth2/files/0004-Port-away-from-deprecated-qrand.patch new file mode 100644 index 000000000000..ef7804995346 --- /dev/null +++ b/net-libs/signon-oauth2/files/0004-Port-away-from-deprecated-qrand.patch @@ -0,0 +1,69 @@ +From 039dab8db2e16d02872c6e12c698157e05dc43e2 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:02:04 +0200 +Subject: [PATCH 04/10] Port away from deprecated qrand + +--- + src/oauth1plugin.cpp | 7 +++++++ + src/oauth2plugin.cpp | 6 ++++++ + 2 files changed, 13 insertions(+) + +diff --git a/src/oauth1plugin.cpp b/src/oauth1plugin.cpp +index 8ec7645..6c38cbb 100644 +--- a/src/oauth1plugin.cpp ++++ b/src/oauth1plugin.cpp +@@ -94,8 +94,10 @@ public: + { + TRACE(); + ++#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + // Initialize randomizer + qsrand(QTime::currentTime().msec()); ++#endif + } + + ~OAuth1PluginPrivate() +@@ -437,8 +439,13 @@ QString OAuth1Plugin::createOAuth1Header(const QString &aUrl, + .arg(urlEncode(inData.ConsumerKey()))); + authHeader.append(DELIMITER); + // Nonce ++#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + unsigned long nonce1 = (unsigned long) qrand(); + unsigned long nonce2 = (unsigned long) qrand(); ++#else ++ unsigned long nonce1 = QRandomGenerator::global()->generate64(); ++ unsigned long nonce2 = QRandomGenerator::global()->generate64(); ++#endif + QString oauthNonce = QString("%1%2").arg(nonce1).arg(nonce2); + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_NONCE) + .arg(urlEncode(oauthNonce))); +diff --git a/src/oauth2plugin.cpp b/src/oauth2plugin.cpp +index 418e7db..8763f00 100644 +--- a/src/oauth2plugin.cpp ++++ b/src/oauth2plugin.cpp +@@ -84,8 +84,10 @@ public: + { + TRACE(); + ++#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + // Initialize randomizer + qsrand(QTime::currentTime().msec()); ++#endif + } + + ~OAuth2PluginPrivate() +@@ -180,7 +182,11 @@ void OAuth2Plugin::sendOAuth2AuthRequest() + QString redirectUri = d->m_oauth2Data.RedirectUri(); + query.addQueryItem(REDIRECT_URI, QUrl::toPercentEncoding(redirectUri)); + if (!d->m_oauth2Data.DisableStateParameter()) { ++#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + d->m_state = QString::number(qrand()); ++#else ++ d->m_state = QString::number(QRandomGenerator::global()->generate()); ++#endif + query.addQueryItem(STATE, d->m_state); + } + QStringList responseType = d->m_oauth2Data.ResponseType(); +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0005-Fix-string-concatenation-in-Qt6.patch b/net-libs/signon-oauth2/files/0005-Fix-string-concatenation-in-Qt6.patch new file mode 100644 index 000000000000..daadd43423e8 --- /dev/null +++ b/net-libs/signon-oauth2/files/0005-Fix-string-concatenation-in-Qt6.patch @@ -0,0 +1,181 @@ +From 47ff5a950e54ae2a570183be21312bcaa5271396 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:04:44 +0200 +Subject: [PATCH 05/10] Fix string concatenation in Qt6 + +--- + src/oauth1plugin.cpp | 33 ++++++++++++++++----------------- + src/oauth1plugin.h | 2 +- + src/oauth2plugin.cpp | 4 ++-- + src/oauth2plugin.h | 2 +- + 4 files changed, 20 insertions(+), 21 deletions(-) + +diff --git a/src/oauth1plugin.cpp b/src/oauth1plugin.cpp +index 6c38cbb..3a1bbd5 100644 +--- a/src/oauth1plugin.cpp ++++ b/src/oauth1plugin.cpp +@@ -60,7 +60,6 @@ const QString TIMESTAMP = QString("timestamp"); + const QString AUTH_ERROR = QString("error"); + + const QString EQUAL = QString("="); +-const QString AMPERSAND = QString("&"); + const QString EQUAL_WITH_QUOTES = QString("%1=\"%2\""); + const QString DELIMITER = QString(", "); + const QString SPACE = QString(" "); +@@ -321,7 +320,7 @@ void OAuth1Plugin::process(const SignOn::SessionData &inData, + sendOAuth1PostRequest(); + } + +-QString OAuth1Plugin::urlEncode(QString strData) ++QByteArray OAuth1Plugin::urlEncode(QString strData) + { + return QUrl::toPercentEncoding(strData).constData(); + } +@@ -399,7 +398,7 @@ QByteArray OAuth1Plugin::constructSignatureBaseString(const QString &aUrl, + bool first = true; + for (i = oAuthHeaderMap.begin(); i != oAuthHeaderMap.end(); ++i) { + if(!first) { +- oAuthHeaderString.append(AMPERSAND); ++ oAuthHeaderString.append(QLatin1Char('&')); + } else { + first = false; + } +@@ -411,9 +410,9 @@ QByteArray OAuth1Plugin::constructSignatureBaseString(const QString &aUrl, + + QByteArray signatureBase; + signatureBase.append("POST"); +- signatureBase.append(AMPERSAND); ++ signatureBase.append('&'); + signatureBase.append(urlEncode(urlWithHostAndPath)); +- signatureBase.append(AMPERSAND); ++ signatureBase.append('&'); + signatureBase.append(urlEncode(oAuthHeaderString)); + return signatureBase; + } +@@ -427,16 +426,16 @@ QString OAuth1Plugin::createOAuth1Header(const QString &aUrl, + QString authHeader = OAUTH + SPACE; + if (!inData.Realm().isEmpty()) { + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_REALM) +- .arg(urlEncode(inData.Realm()))); ++ .arg(urlEncode(inData.Realm()).constData())); + authHeader.append(DELIMITER); + } + if (!inData.Callback().isEmpty()) { + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_CALLBACK) +- .arg(urlEncode(inData.Callback()))); ++ .arg(urlEncode(inData.Callback()).constData())); + authHeader.append(DELIMITER); + } + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_CONSUMERKEY) +- .arg(urlEncode(inData.ConsumerKey()))); ++ .arg(urlEncode(inData.ConsumerKey()).constData())); + authHeader.append(DELIMITER); + // Nonce + #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) +@@ -448,32 +447,32 @@ QString OAuth1Plugin::createOAuth1Header(const QString &aUrl, + #endif + QString oauthNonce = QString("%1%2").arg(nonce1).arg(nonce2); + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_NONCE) +- .arg(urlEncode(oauthNonce))); ++ .arg(urlEncode(oauthNonce).constData())); + authHeader.append(DELIMITER); + // Timestamp + QString oauthTimestamp = + QString("%1").arg(QDateTime::currentDateTime().toSecsSinceEpoch()); + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_TIMESTAMP) +- .arg(urlEncode(oauthTimestamp))); ++ .arg(urlEncode(oauthTimestamp).constData())); + authHeader.append(DELIMITER); + if (!d->m_oauth1Token.isEmpty()) { + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_TOKEN) +- .arg(urlEncode(d->m_oauth1Token))); ++ .arg(urlEncode(d->m_oauth1Token).constData())); + authHeader.append(DELIMITER); + } + + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_SIGNATURE_METHOD) +- .arg(urlEncode(d->m_mechanism))); ++ .arg(urlEncode(d->m_mechanism).constData())); + authHeader.append(DELIMITER); + // Creating the signature + // PLAINTEXT signature method + QByteArray secretKey; +- secretKey.append(urlEncode(inData.ConsumerSecret()) + AMPERSAND + ++ secretKey.append(urlEncode(inData.ConsumerSecret()) + '&' + + urlEncode(d->m_oauth1TokenSecret)); + if (d->m_mechanism == PLAINTEXT) { + TRACE() << "Signature = " << secretKey; + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_SIGNATURE) +- .arg(urlEncode(secretKey))); ++ .arg(urlEncode(secretKey).constData())); + authHeader.append(DELIMITER); + } + // HMAC-SHA1 signature method +@@ -484,7 +483,7 @@ QString OAuth1Plugin::createOAuth1Header(const QString &aUrl, + QByteArray signature = hashHMACSHA1(secretKey, signatureBase); + TRACE() << "Signature = " << signature; + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_SIGNATURE) +- .arg(urlEncode(signature.toBase64()))); ++ .arg(urlEncode(signature.toBase64()).constData())); + authHeader.append(DELIMITER); + } + // TODO: RSA-SHA1 signature method should be implemented +@@ -494,11 +493,11 @@ QString OAuth1Plugin::createOAuth1Header(const QString &aUrl, + + if (!d->m_oauth1TokenVerifier.isEmpty()) { + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_VERIFIER) +- .arg(urlEncode(d->m_oauth1TokenVerifier))); ++ .arg(urlEncode(d->m_oauth1TokenVerifier).constData())); + authHeader.append(DELIMITER); + } + authHeader.append(EQUAL_WITH_QUOTES.arg(OAUTH_VERSION) +- .arg(urlEncode(OAUTH_VERSION_1))); ++ .arg(urlEncode(OAUTH_VERSION_1).constData())); + + return authHeader; + } +diff --git a/src/oauth1plugin.h b/src/oauth1plugin.h +index 3ff227a..aa37e26 100644 +--- a/src/oauth1plugin.h ++++ b/src/oauth1plugin.h +@@ -65,7 +65,7 @@ private: + const OAuth1PluginData &inData, + const QString ×tamp, + const QString &nonce); +- QString urlEncode(QString strData); ++ QByteArray urlEncode(QString strData); + QString createOAuth1Header(const QString &aUrl, OAuth1PluginData inData); + QByteArray hashHMACSHA1(const QByteArray &keyForHash ,const QByteArray &secret); + OAuth1PluginTokenData oauth1responseFromMap(const QVariantMap &map); +diff --git a/src/oauth2plugin.cpp b/src/oauth2plugin.cpp +index 8763f00..c7f7f84 100644 +--- a/src/oauth2plugin.cpp ++++ b/src/oauth2plugin.cpp +@@ -393,9 +393,9 @@ void OAuth2Plugin::process(const SignOn::SessionData &inData, + } + } + +-QString OAuth2Plugin::urlEncode(QString strData) ++QByteArray OAuth2Plugin::urlEncode(QString strData) + { +- return QUrl::toPercentEncoding(strData).constData(); ++ return QUrl::toPercentEncoding(strData); + } + + void OAuth2Plugin::userActionFinished(const SignOn::UiSessionData &data) +diff --git a/src/oauth2plugin.h b/src/oauth2plugin.h +index a16c316..389d3c3 100644 +--- a/src/oauth2plugin.h ++++ b/src/oauth2plugin.h +@@ -84,7 +84,7 @@ private: + QVariantMap parseJSONReply(const QByteArray &reply); + QVariantMap parseTextReply(const QByteArray &reply); + void handleOAuth2Error(const QByteArray &reply); +- QString urlEncode(QString strData); ++ QByteArray urlEncode(QString strData); + QUrl getAuthUrl(); + QUrl getTokenUrl(); + +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0006-Port-away-from-deprecated-QRegExp.patch b/net-libs/signon-oauth2/files/0006-Port-away-from-deprecated-QRegExp.patch new file mode 100644 index 000000000000..dc2ab505552d --- /dev/null +++ b/net-libs/signon-oauth2/files/0006-Port-away-from-deprecated-QRegExp.patch @@ -0,0 +1,43 @@ +From bef68f45e80c13501f836ec9d14aa3df682748e8 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:05:13 +0200 +Subject: [PATCH 06/10] Port away from deprecated QRegExp + +--- + tests/oauth2plugintest.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/oauth2plugintest.cpp b/tests/oauth2plugintest.cpp +index f5221cc..5cbbab2 100644 +--- a/tests/oauth2plugintest.cpp ++++ b/tests/oauth2plugintest.cpp +@@ -26,7 +26,7 @@ + #include <QNetworkAccessManager> + #include <QNetworkReply> + #include <QPointer> +-#include <QRegExp> ++#include <QRegularExpression> + #include <QScopedPointer> + #include <QSignalSpy> + #include <QTimer> +@@ -749,7 +749,7 @@ void OAuth2PluginTest::testPluginHmacSha1Process() + QString authorizationHeader = + QString::fromUtf8(nam->m_lastRequest.rawHeader("Authorization")); + QStringList authorizationHeaderParts = +- authorizationHeader.split(QRegExp(",?\\s+")); ++ authorizationHeader.split(QRegularExpression(",?\\s+")); + QCOMPARE(authorizationHeaderParts[0], QString("OAuth")); + + /* The rest of the header should be a mapping, let's parse it */ +@@ -1535,7 +1535,7 @@ void OAuth2PluginTest::testOauth1UserActionFinished() + QString authorizationHeader = + QString::fromUtf8(nam->m_lastRequest.rawHeader("Authorization")); + QStringList authorizationHeaderParts = +- authorizationHeader.split(QRegExp(",?\\s+")); ++ authorizationHeader.split(QRegularExpression(",?\\s+")); + QCOMPARE(authorizationHeaderParts[0], QString("OAuth")); + + /* The rest of the header should be a mapping, let's parse it */ +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0007-Build-with-C-17.patch b/net-libs/signon-oauth2/files/0007-Build-with-C-17.patch new file mode 100644 index 000000000000..193923a6612a --- /dev/null +++ b/net-libs/signon-oauth2/files/0007-Build-with-C-17.patch @@ -0,0 +1,26 @@ +From e9d3bdbd4eb8331a03b0c49d6b3a6c020db11c7f Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:06:05 +0200 +Subject: [PATCH 07/10] Build with C++17 + +Needed for Qt6 +--- + common-project-config.pri | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common-project-config.pri b/common-project-config.pri +index 1d5cdc6..dc9b95d 100644 +--- a/common-project-config.pri ++++ b/common-project-config.pri +@@ -8,7 +8,7 @@ + #----------------------------------------------------------------------------- + + CONFIG += \ +- c++11 \ ++ c++17 \ + link_pkgconfig + #MOC_DIR = .moc + #OBJECTS_DIR = .obj +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0008-Use-correct-signon-in-example.patch b/net-libs/signon-oauth2/files/0008-Use-correct-signon-in-example.patch new file mode 100644 index 000000000000..50635d936909 --- /dev/null +++ b/net-libs/signon-oauth2/files/0008-Use-correct-signon-in-example.patch @@ -0,0 +1,29 @@ +From a275d6eacc71a1c0ac6a95e2c77a29b13e6c189e Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:10:17 +0200 +Subject: [PATCH 08/10] Use correct signon in example + +--- + example/example.pro | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/example/example.pro b/example/example.pro +index 9b8ec65..1b2c6a8 100644 +--- a/example/example.pro ++++ b/example/example.pro +@@ -11,11 +11,7 @@ CONFIG += \ + link_pkgconfig + QT -= gui + +-lessThan(QT_MAJOR_VERSION, 5) { +- PKGCONFIG += libsignon-qt +-} else { +- PKGCONFIG += libsignon-qt5 +-} ++PKGCONFIG += libsignon-qt$$QT_MAJOR_VERSION + + HEADERS += \ + oauthclient.h +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0009-Port-away-from-deprecated-QString-SplitBehavior.patch b/net-libs/signon-oauth2/files/0009-Port-away-from-deprecated-QString-SplitBehavior.patch new file mode 100644 index 000000000000..67e4b07abc6d --- /dev/null +++ b/net-libs/signon-oauth2/files/0009-Port-away-from-deprecated-QString-SplitBehavior.patch @@ -0,0 +1,40 @@ +From 3ead61662e9b931ff2487869904c9be33cf97a85 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:13:10 +0200 +Subject: [PATCH 09/10] Port away from deprecated QString::SplitBehavior + +--- + src/oauth2plugin.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/oauth2plugin.cpp b/src/oauth2plugin.cpp +index c7f7f84..45510ad 100644 +--- a/src/oauth2plugin.cpp ++++ b/src/oauth2plugin.cpp +@@ -436,7 +436,11 @@ void OAuth2Plugin::userActionFinished(const SignOn::UiSessionData &data) + } else if (pair.first == STATE) { + state = pair.second; + } else if (pair.first == SCOPE) { ++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + respData.setScope(pair.second.split(' ', QString::SkipEmptyParts)); ++#else ++ respData.setScope(pair.second.split(' ', Qt::SkipEmptyParts)); ++#endif + } else { + extraFields.insert(pair.first, pair.second); + } +@@ -587,7 +591,11 @@ void OAuth2Plugin::serverReply(QNetworkReply *reply) + QStringList scope; + if (map.contains(SCOPE)) { + QString rawScope = QString::fromUtf8(map.take(SCOPE).toByteArray()); ++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + scope = rawScope.split(' ', QString::SkipEmptyParts); ++#else ++ scope = rawScope.split(' ', Qt::SkipEmptyParts); ++#endif + } else { + scope = d->m_oauth2Data.Scope(); + } +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/0010-Port-away-from-deprecated-QList-toSet.patch b/net-libs/signon-oauth2/files/0010-Port-away-from-deprecated-QList-toSet.patch new file mode 100644 index 000000000000..59b3dd3700e4 --- /dev/null +++ b/net-libs/signon-oauth2/files/0010-Port-away-from-deprecated-QList-toSet.patch @@ -0,0 +1,34 @@ +From fab698862466994a8fdc9aa335c87b4f05430ce6 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 19:15:56 +0200 +Subject: [PATCH 10/10] Port away from deprecated QList::toSet + +--- + src/oauth2plugin.cpp | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/oauth2plugin.cpp b/src/oauth2plugin.cpp +index 45510ad..0c23b99 100644 +--- a/src/oauth2plugin.cpp ++++ b/src/oauth2plugin.cpp +@@ -256,9 +256,15 @@ bool OAuth2Plugin::respondWithStoredToken(const QVariantMap &token, + * we cannot use it now */ + if (!scopes.isEmpty()) { + if (!token.contains(SCOPES)) return false; +- QSet<QString> cachedScopes = +- token.value(SCOPES).toStringList().toSet(); ++ ++ QStringList scopesList = token.value(SCOPES).toStringList(); ++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) ++ QSet<QString> cachedScopes = scopesList.toSet(); + if (!cachedScopes.contains(scopes.toSet())) return false; ++#else ++ QSet<QString> cachedScopes(scopesList.begin(), scopesList.end()); ++ if (!cachedScopes.contains(QSet(scopes.begin(), scopes.end()))) return false; ++#endif + } + + if (token.contains(TOKEN)) { +-- +2.43.0 + diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.25-drop-fno-rtti.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.25-drop-fno-rtti.patch new file mode 100644 index 000000000000..04aad5416941 --- /dev/null +++ b/net-libs/signon-oauth2/files/signon-oauth2-0.25-drop-fno-rtti.patch @@ -0,0 +1,26 @@ +From 94e7cdbe1b15455e932a2272fdf2284fecfb9204 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 11 Nov 2020 22:35:06 +0100 +Subject: [PATCH] Disable -fno-rtti + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + common-project-config.pri | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/common-project-config.pri b/common-project-config.pri +index e149d90..9c7801a 100644 +--- a/common-project-config.pri ++++ b/common-project-config.pri +@@ -17,8 +17,7 @@ + UI_HEADERS_DIR = ui/include + UI_SOURCES_DIR = ui/src + +-QMAKE_CXXFLAGS += -fno-exceptions \ +- -fno-rtti ++QMAKE_CXXFLAGS += -fno-exceptions + + TOP_SRC_DIR = $$PWD + +-- +2.29.2 diff --git a/net-libs/signon-oauth2/metadata.xml b/net-libs/signon-oauth2/metadata.xml index 8641e5bdd399..ff21736a4492 100644 --- a/net-libs/signon-oauth2/metadata.xml +++ b/net-libs/signon-oauth2/metadata.xml @@ -5,4 +5,7 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="gitlab">accounts-sso/signon-plugin-oauth2</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild index 2af346f5d955..adb2b609e2f5 100644 --- a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild +++ b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_P}.tar LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-libs/signon-oauth2/signon-oauth2-0.25_p20210102.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.25_p20210102.ebuild new file mode 100644 index 000000000000..dd60c8ff1151 --- /dev/null +++ b/net-libs/signon-oauth2/signon-oauth2-0.25_p20210102.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=signon-plugin-oauth2 +MY_PV=VERSION_${PV} +MY_P=${MY_PN}-${MY_PV} +inherit qmake-utils + +if [[ ${PV} = *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/nicolasfella/${MY_PN}.git/" + EGIT_BRANCH="qt6" + inherit git-r3 +else + COMMIT=d759439066f0a34e5ad352ebab0b3bb2790d429e + if [[ -n ${COMMIT} ]] ; then + SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${COMMIT}/${MY_PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${MY_PN}-${COMMIT}" + else + SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${MY_P}" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="OAuth2 plugin for Signon daemon" +HOMEPAGE="https://gitlab.com/accounts-sso/signon-plugin-oauth2" + +LICENSE="LGPL-2.1" +SLOT="0" +# TODO: drop USE=qt5 and just have USE=qt6 to control which qt? +IUSE="+qt5 qt6 test" +REQUIRED_USE="|| ( qt5 qt6 )" +RESTRICT="!test? ( test )" + +RDEPEND=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtnetwork:5[ssl] + ) + qt6? ( dev-qt/qtbase:6[network,ssl] ) + >=net-libs/signond-8.61-r100[qt5=,qt6=] +" +DEPEND=" + ${RDEPEND} + test? ( + qt5? ( dev-qt/qttest:5 ) + ) +" + +PATCHES=( + "${FILESDIR}"/0001-Port-QSignalSpys-to-PMF-syntax.patch + "${FILESDIR}"/0002-Port-to-new-connection-syntax.patch + "${FILESDIR}"/0003-Port-away-from-deprecated-error-signal.patch + "${FILESDIR}"/0004-Port-away-from-deprecated-qrand.patch + "${FILESDIR}"/0005-Fix-string-concatenation-in-Qt6.patch + "${FILESDIR}"/0006-Port-away-from-deprecated-QRegExp.patch + "${FILESDIR}"/0007-Build-with-C-17.patch + "${FILESDIR}"/0008-Use-correct-signon-in-example.patch + "${FILESDIR}"/0009-Port-away-from-deprecated-QString-SplitBehavior.patch + "${FILESDIR}"/0010-Port-away-from-deprecated-QList-toSet.patch + # downstream patches + "${FILESDIR}/${PN}-0.24-dont-install-tests.patch" + "${FILESDIR}/${PN}-0.25-pkgconfig-libdir.patch" + "${FILESDIR}/${PN}-0.25-drop-fno-rtti.patch" +) + +src_prepare() { + default + sed -i "s|@LIBDIR@|$(get_libdir)|g" src/signon-oauth2plugin.pc || die +} + +src_configure() { + local myqmakeargs=( + LIBDIR=/usr/$(get_libdir) + ) + use test || myqmakeargs+=( CONFIG+=nomake_tests ) + + if use qt6 ; then + eqmake6 "${myqmakeargs[@]}" + else + eqmake5 "${myqmakeargs[@]}" + fi +} + +src_install() { + emake INSTALL_ROOT="${D}" install +} diff --git a/net-libs/signon-ui/Manifest b/net-libs/signon-ui/Manifest index 13dc394fd005..bb13961d15c1 100644 --- a/net-libs/signon-ui/Manifest +++ b/net-libs/signon-ui/Manifest @@ -1 +1,2 @@ DIST signon-ui-0.15_p20171022.tar.bz2 55849 BLAKE2B 6b97b3f673fb4494c7e32dc345f6c4697acdb19305b9459fe954d88983e4666211926921dac70829435706cdd9a41f36d36241a73905b2a795873c2894ffa8d7 SHA512 d0a4ca222de00abf4000905d917799fc6f9e04a2c3f49d0d0882dc4e90fdbcde14da91f355d10f8a3feac03661febd321ea6de1df227fa5a3c404eaefa7c2d60 +DIST signon-ui-0.15_p20231016.tar.bz2 55078 BLAKE2B eff35b2b311c4b923148656ad7512418ee6e19607babd02f2bc8bff9d6f2f5cfdc37c7030fb842b65b25c310f6e44f76a73b9d0a4569af52f7661b0eb09da2f2 SHA512 c26be8921c5d2a559bd62793f3eca19184c236c2e2649728631d60d2781f4b4457f63bbd35238cb274ff3a7747220688688f0880df8db0e78ccaf6f126d6e86e diff --git a/net-libs/signon-ui/metadata.xml b/net-libs/signon-ui/metadata.xml index fbd0d6ae95b8..634eccaeb0b9 100644 --- a/net-libs/signon-ui/metadata.xml +++ b/net-libs/signon-ui/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo KDE Project</name> </maintainer> <upstream> - <remote-id type="launchpad">signon-ui</remote-id> + <remote-id type="gitlab">accounts-sso/signon-ui</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/signon-ui/signon-ui-0.15_p20171022-r1.ebuild b/net-libs/signon-ui/signon-ui-0.15_p20171022-r1.ebuild index 4a868b3f52df..7840862ff861 100644 --- a/net-libs/signon-ui/signon-ui-0.15_p20171022-r1.ebuild +++ b/net-libs/signon-ui/signon-ui-0.15_p20171022-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${COMMIT}/${PN}-${COMMI LICENSE="GPL-2 GPL-3" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 x86" +KEYWORDS="amd64 arm64 ~x86" IUSE="test" BDEPEND="test? ( dev-qt/qttest:5 )" @@ -51,6 +51,10 @@ src_configure() { eqmake5 } +src_compile() { + emake -j1 +} + src_install() { - emake INSTALL_ROOT="${D}" install + emake INSTALL_ROOT="${D}" -j1 install } diff --git a/net-libs/signon-ui/signon-ui-0.15_p20231016.ebuild b/net-libs/signon-ui/signon-ui-0.15_p20231016.ebuild new file mode 100644 index 000000000000..36db60ad1d2f --- /dev/null +++ b/net-libs/signon-ui/signon-ui-0.15_p20231016.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils + +if [[ ${PV} = *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/accounts-sso/signon-ui.git/" + inherit git-r3 +else + COMMIT=eef943f0edf3beee8ecb85d4a9dae3656002fc24 + SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${PN}-${COMMIT}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Online accounts signon UI" +HOMEPAGE="https://gitlab.com/accounts-sso/signon-ui" + +LICENSE="GPL-2 GPL-3" +SLOT="0" +IUSE="qt6 test" + +RESTRICT="test" + +COMMON_DEPEND=" + dev-libs/glib:2 + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtwebengine:5 + dev-qt/qtwidgets:5 + >=net-libs/accounts-qt-1.16_p20220803[qt5] + >=net-libs/signond-8.61-r100[qt5] + ) + qt6? ( + dev-qt/qtbase:6[dbus,gui,network,ssl,widgets] + dev-qt/qtdeclarative:6 + dev-qt/qtwebengine:6[qml] + >=net-libs/accounts-qt-1.16_p20220803[qt6] + >=net-libs/signond-8.61-r100[qt6] + ) + net-libs/libproxy + x11-libs/libnotify +" +RDEPEND="${COMMON_DEPEND} + !qt6? ( dev-qt/qtwebchannel:5 ) + qt6? ( dev-qt/qtwebchannel:6 ) +" +DEPEND="${COMMON_DEPEND} + test? ( + !qt6? ( dev-qt/qttest:5 ) + ) +" + +PATCHES=( + # thanks to openSUSE + "${FILESDIR}/${PN}-0.15_p20171022-webengine-cachedir-path.patch" + "${FILESDIR}/${PN}-0.15_p20171022-fix-username-field-reading.patch" + # downstream + "${FILESDIR}/${PN}-0.15_p20171022-drop-fno-rtti.patch" + "${FILESDIR}/${PN}-0.15_p20171022-disable-tests.patch" +) + +src_configure() { + if use qt6; then + eqmake6 PREFIX="${EPREFIX}"/usr + else + eqmake5 PREFIX="${EPREFIX}"/usr + fi +} + +src_compile() { + emake -j1 +} + +src_install() { + emake INSTALL_ROOT="${D}" -j1 install +} diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest index e3af90ab7166..f62f3f43ee5a 100644 --- a/net-libs/signond/Manifest +++ b/net-libs/signond/Manifest @@ -1 +1,2 @@ -DIST signond-8.60.tar.gz 281359 BLAKE2B 3ecd8048d8c5551c3611e48091c35a9f0fe4c972e6b4730fe1f610b4870fe86911dee04c331847deee2a50f4a04acd5a8a0d1c605d1f4f0a24272d44c289a6d3 SHA512 fb3ccc99c692506ca29d5bae39bc375ff97057734fac1551ea39105d5f8e78f3df23e01a286f73be3a606c54b40f957c3c0d985484926e57f354218e4137ff3c +DIST signond-8.61.tar.bz2 203066 BLAKE2B 2f78e08143d346777ab3517ef6b76b54ab1b17efa6d15b2c5a16487c2e11f38c88cb2820bff8dd04deb334d0c178c16bd061c0eba694c5edfb0e31411581648a SHA512 95e83bc672792ec10493f1f456788af7e8051ce0bed6b047b6b6f5fa9ac019dd3392063152930be49cf68d590567fd7467c544d642cc58624b1aabdc0b405258 +DIST signond-8.61.tar.gz 282965 BLAKE2B 8ab8f4ac3f8416ef9c1b8d8c73057ffcf0024a7e3cf6c2fa97a3119826f6c655b215e2530137c199e60e9e9518b0858fa1a23a3f107c71751f33d2a34898a610 SHA512 1652ee8e97d6aee036075f5416909649c5848e33c3c71f367176f3e5d6f9c360fd7a46c65ba877d58b3ae8fb8df0712938c5e073409ba945d66d8afeacfd6f72 diff --git a/net-libs/signond/files/0001-Don-t-forward-declare-QStringList.patch b/net-libs/signond/files/0001-Don-t-forward-declare-QStringList.patch new file mode 100644 index 000000000000..015280921652 --- /dev/null +++ b/net-libs/signond/files/0001-Don-t-forward-declare-QStringList.patch @@ -0,0 +1,35 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From 65a9af6663738c5e169a1779b8d0106c6223e96e Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 5 Jul 2022 17:36:19 +0200 +Subject: [PATCH 01/11] Don't forward-declare QStringList + +It doesn't work with Qt6 +--- + lib/plugins/SignOn/authpluginif.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/plugins/SignOn/authpluginif.h b/lib/plugins/SignOn/authpluginif.h +index 7b3243c..9cfc527 100644 +--- a/lib/plugins/SignOn/authpluginif.h ++++ b/lib/plugins/SignOn/authpluginif.h +@@ -31,6 +31,7 @@ + #include <QtCore/qobject.h> + #include <QtCore/qpointer.h> + #include <QtCore/qplugin.h> ++#include <QtCore/qstringlist.h> + + #include <QVariantMap> + #include <SignOn/sessiondata.h> +@@ -39,7 +40,6 @@ + + QT_BEGIN_NAMESPACE + class QString; +-class QStringList; + class QByteArray; + class QVariant; + QT_END_NAMESPACE +-- +2.43.0 + diff --git a/net-libs/signond/files/0002-Remove-usage-of-Q_EXTERN_C.patch b/net-libs/signond/files/0002-Remove-usage-of-Q_EXTERN_C.patch new file mode 100644 index 000000000000..6f0e11ef1da8 --- /dev/null +++ b/net-libs/signond/files/0002-Remove-usage-of-Q_EXTERN_C.patch @@ -0,0 +1,28 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From afef34ba90f525081226b49be76dd53aa158967d Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 5 Jul 2022 17:37:00 +0200 +Subject: [PATCH 02/11] Remove usage of Q_EXTERN_C + +It doesn't exist in Qt6 any more +--- + lib/plugins/SignOn/authpluginif.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/plugins/SignOn/authpluginif.h b/lib/plugins/SignOn/authpluginif.h +index 9cfc527..cad5d35 100644 +--- a/lib/plugins/SignOn/authpluginif.h ++++ b/lib/plugins/SignOn/authpluginif.h +@@ -73,7 +73,7 @@ enum AuthPluginState { + } + + #define SIGNON_DECL_AUTH_PLUGIN(pluginclass) \ +- Q_EXTERN_C AuthPluginInterface *auth_plugin_instance() \ ++ extern "C" AuthPluginInterface *auth_plugin_instance() \ + SIGNON_PLUGIN_INSTANCE(pluginclass) + + /*! +-- +2.43.0 + diff --git a/net-libs/signond/files/0003-Port-from-QProcess-pid-to-processId.patch b/net-libs/signond/files/0003-Port-from-QProcess-pid-to-processId.patch new file mode 100644 index 000000000000..ea1b7e715208 --- /dev/null +++ b/net-libs/signond/files/0003-Port-from-QProcess-pid-to-processId.patch @@ -0,0 +1,32 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From a089361356e73bcd721f14314ec9745bbf28c5be Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 5 Jul 2022 17:37:34 +0200 +Subject: [PATCH 03/11] Port from QProcess::pid to ::processId + +The former is deprecated +--- + src/signond/pluginproxy.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/signond/pluginproxy.cpp b/src/signond/pluginproxy.cpp +index d31c712..582aef4 100644 +--- a/src/signond/pluginproxy.cpp ++++ b/src/signond/pluginproxy.cpp +@@ -125,10 +125,10 @@ PluginProxy::~PluginProxy() + + if (!m_process->waitForFinished(PLUGINPROCESS_STOP_TIMEOUT)) + { +- if (m_process->pid()) { ++ if (m_process->processId()) { + qCritical() << "The signon plugin seems to ignore kill(), " + "killing it from command line"; +- QString killProcessCommand(QString::fromLatin1("kill -9 %1").arg(m_process->pid())); ++ QString killProcessCommand(QString::fromLatin1("kill -9 %1").arg(m_process->processId())); + QProcess::execute(killProcessCommand); + } + } +-- +2.43.0 + diff --git a/net-libs/signond/files/0004-Port-away-from-deprecated-QString-SplitBehavior.patch b/net-libs/signond/files/0004-Port-away-from-deprecated-QString-SplitBehavior.patch new file mode 100644 index 000000000000..7bf3fe2db650 --- /dev/null +++ b/net-libs/signond/files/0004-Port-away-from-deprecated-QString-SplitBehavior.patch @@ -0,0 +1,38 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From b48507f58d66356fbcdd349d14e6e145a4a60bbd Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 5 Jul 2022 17:38:08 +0200 +Subject: [PATCH 04/11] Port away from deprecated QString::SplitBehavior + +--- + src/signond/signonidentityinfo.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/signond/signonidentityinfo.cpp b/src/signond/signonidentityinfo.cpp +index a5ae15d..bf7985f 100644 +--- a/src/signond/signonidentityinfo.cpp ++++ b/src/signond/signonidentityinfo.cpp +@@ -27,6 +27,7 @@ + #include <QDBusArgument> + #include <QDataStream> + #include <QDebug> ++#include <QtGlobal> + + namespace SignonDaemonNS { + +@@ -104,7 +105,11 @@ bool SignonIdentityInfo::checkMethodAndMechanism(const QString &method, + * mechanisms is allowed. + */ + QStringList mechanisms = ++#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) ++ mechanism.split(QLatin1Char(' '), Qt::SkipEmptyParts); ++#else + mechanism.split(QLatin1Char(' '), QString::SkipEmptyParts); ++#endif + + /* if the list is empty of it has only one element, then we already know + * that it didn't pass the previous checks */ +-- +2.43.0 + diff --git a/net-libs/signond/files/0005-Port-away-from-QtContainer-toSet.patch b/net-libs/signond/files/0005-Port-away-from-QtContainer-toSet.patch new file mode 100644 index 000000000000..94927fecaaa0 --- /dev/null +++ b/net-libs/signond/files/0005-Port-away-from-QtContainer-toSet.patch @@ -0,0 +1,94 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From 728bda378878e505ac6b7977306b6f3ffe9f53d6 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 5 Jul 2022 17:39:20 +0200 +Subject: [PATCH 05/11] Port away from QtContainer::toSet + +it's deprecated +--- + src/signond/signonsessioncore.cpp | 12 ++++++++++-- + tests/signond-tests/databasetest.cpp | 24 +++++++++++++++++------- + 2 files changed, 27 insertions(+), 9 deletions(-) + +diff --git a/src/signond/signonsessioncore.cpp b/src/signond/signonsessioncore.cpp +index 93a7328..bebf934 100644 +--- a/src/signond/signonsessioncore.cpp ++++ b/src/signond/signonsessioncore.cpp +@@ -217,8 +217,16 @@ SignonSessionCore::queryAvailableMechanisms(const QStringList &wantedMechanisms) + if (!wantedMechanisms.size()) + return m_plugin->mechanisms(); + +- return m_plugin->mechanisms().toSet(). +- intersect(wantedMechanisms.toSet()).toList(); ++ const QStringList mechanisms = m_plugin->mechanisms(); ++#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) ++ QSet<QString> mechanismSet(mechanisms.begin(), mechanisms.end()); ++ QSet<QString> wantedMechanismSet(wantedMechanisms.begin(), wantedMechanisms.end()); ++#else ++ QSet<QString> mechanismSet = mechanisms.toSet(); ++ QSet<QString> wantedMechanismSet = wantedMechanisms.toSet(); ++#endif ++ ++ return mechanismSet.intersect(wantedMechanismSet).values(); + } + + void SignonSessionCore::process(const PeerContext &peerContext, +diff --git a/tests/signond-tests/databasetest.cpp b/tests/signond-tests/databasetest.cpp +index b5ee761..b22ba54 100644 +--- a/tests/signond-tests/databasetest.cpp ++++ b/tests/signond-tests/databasetest.cpp +@@ -32,6 +32,15 @@ + const QString dbFile = QLatin1String("/tmp/signon_test.db"); + const QString secretsDbFile = QLatin1String("/tmp/signon_test_secrets.db"); + ++static QSet<QString> toSet(const QStringList &list) ++{ ++#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) ++ return QSet<QString>(list.begin(), list.end()); ++#else ++ return list.toSet(); ++#endif ++} ++ + void TestDatabase::initTestCase() + { + QFile::remove(dbFile); +@@ -353,17 +362,18 @@ void TestDatabase::updateCredentialsTest() + + /* The sorting of the method's mechanisms might vary, so we cannot just + * compare the whole method map as a whole. */ +- QCOMPARE(retInfo.methods().keys().toSet(), +- updateInfo.methods().keys().toSet()); ++ QCOMPARE(toSet(retInfo.methods().keys()), ++ toSet(updateInfo.methods().keys())); ++ + QMapIterator<QString, QStringList> it(retInfo.methods()); + while (it.hasNext()) { + it.next(); +- QCOMPARE(it.value().toSet(), umethods.value(it.key()).toSet()); ++ QCOMPARE(toSet(it.value()), toSet(umethods.value(it.key()))); + } + +- QCOMPARE(retInfo.realms().toSet(), updateInfo.realms().toSet()); +- QCOMPARE(retInfo.accessControlList().toSet(), +- updateInfo.accessControlList().toSet()); ++ QCOMPARE(toSet(retInfo.realms()), toSet(updateInfo.realms())); ++ QCOMPARE(toSet(retInfo.accessControlList()), ++ toSet(updateInfo.accessControlList())); + } + + void TestDatabase::removeCredentialsTest() +@@ -658,8 +668,8 @@ void TestDatabase::credentialsOwnerSecurityTokenTest() + QString token = m_db->credentialsOwnerSecurityToken(id); + QCOMPARE(token, QLatin1String("AID::12345678")); + QStringList tokens = m_db->ownerList(id); +- QCOMPARE(tokens.toSet(), testAcl.toSet()); + ++ QCOMPARE(toSet(tokens), toSet(testAcl)); + } + + QTEST_MAIN(TestDatabase) +-- +2.43.0 + diff --git a/net-libs/signond/files/0006-Port-away-from-deprecated-QMap-unite.patch b/net-libs/signond/files/0006-Port-away-from-deprecated-QMap-unite.patch new file mode 100644 index 000000000000..b063361c243a --- /dev/null +++ b/net-libs/signond/files/0006-Port-away-from-deprecated-QMap-unite.patch @@ -0,0 +1,53 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From b1e63bd07f4fcf1a47f142674889b157b4d68af8 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 1 Aug 2022 19:27:34 +0200 +Subject: [PATCH 06/11] Port away from deprecated QMap::unite + +--- + src/signond/signonidentity.cpp | 3 +-- + src/signond/signonsessioncoretools.cpp | 6 ++++++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/signond/signonidentity.cpp b/src/signond/signonidentity.cpp +index 92ff476..aef4a97 100644 +--- a/src/signond/signonidentity.cpp ++++ b/src/signond/signonidentity.cpp +@@ -288,8 +288,7 @@ void SignonIdentity::verifyUser(const QVariantMap ¶ms, + } + + //create ui request to ask password +- QVariantMap uiRequest; +- uiRequest.unite(params); ++ QVariantMap uiRequest = params; + uiRequest.insert(SSOUI_KEY_QUERYPASSWORD, true); + uiRequest.insert(SSOUI_KEY_USERNAME, info.userName()); + uiRequest.insert(SSOUI_KEY_CAPTION, info.caption()); +diff --git a/src/signond/signonsessioncoretools.cpp b/src/signond/signonsessioncoretools.cpp +index 8b74840..e856d1a 100644 +--- a/src/signond/signonsessioncoretools.cpp ++++ b/src/signond/signonsessioncoretools.cpp +@@ -34,6 +34,7 @@ QVariantMap SignonDaemonNS::mergeVariantMaps(const QVariantMap &map1, + if (map1.isEmpty()) return map2; + if (map2.isEmpty()) return map1; + ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + QVariantMap map = map1; + //map2 values will overwrite map1 values for the same keys. + QMapIterator<QString, QVariant> it(map2); +@@ -43,6 +44,11 @@ QVariantMap SignonDaemonNS::mergeVariantMaps(const QVariantMap &map1, + map.remove(it.key()); + } + return map.unite(map2); ++#else ++ QVariantMap map = map1; ++ map.insert(map2); ++ return map; ++#endif + } + + /* --------------------- StoreOperation ---------------------- */ +-- +2.43.0 + diff --git a/net-libs/signond/files/0007-Add-Qt6-CI.patch b/net-libs/signond/files/0007-Add-Qt6-CI.patch new file mode 100644 index 000000000000..37891277d0de --- /dev/null +++ b/net-libs/signond/files/0007-Add-Qt6-CI.patch @@ -0,0 +1,91 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From 10f791a62e229bcb5e3975c752bcd5519758240f Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 1 Aug 2022 19:37:41 +0200 +Subject: [PATCH 07/11] Add Qt6 CI + +--- + .gitlab-ci.yml | 48 ++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 40 insertions(+), 8 deletions(-) + +diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml +index 409f6e2..c784909 100644 +--- a/.gitlab-ci.yml ++++ b/.gitlab-ci.yml +@@ -1,18 +1,14 @@ +-image: ubuntu:bionic +- + cache: + key: apt-cache + paths: + - apt-cache/ + +-before_script: +- - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR +- - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev +- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev +- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y lcov gcovr +- + build_amd64: + stage: build ++ image: ubuntu:bionic ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev + script: + - mkdir build + - cd build +@@ -24,6 +20,10 @@ build_amd64: + + test_amd64: + stage: test ++ image: ubuntu:bionic ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev + script: + - find build | xargs touch # Avoid rebuilding + - cd build +@@ -34,6 +34,38 @@ test_amd64: + paths: + - ./ + ++build_amd64_qt6: ++ stage: build ++ image: ubuntu:jammy ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make ++ script: ++ - mkdir build ++ - cd build ++ - qmake6 CONFIG+=debug CONFIG+=coverage CONFIG+=enable-backup CONFIG+=enable-p2p .. ++ - make -j 4 ++ artifacts: ++ paths: ++ - build/ ++ ++test_amd64_qt6: ++ stage: test ++ image: ubuntu:jammy ++ before_script: ++ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR ++ - export DEBIAN_FRONTEND=noninteractive ++ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make ++ script: ++ - find build | xargs touch # Avoid rebuilding ++ - cd build ++ - make coverage-html ++ dependencies: ++ - build_amd64_qt6 ++ artifacts: ++ paths: ++ - ./ ++ + pages: + stage: deploy + script: +-- +2.43.0 + diff --git a/net-libs/signond/files/0008-Use-return-instead-of-reference-for-DBus-output-para.patch b/net-libs/signond/files/0008-Use-return-instead-of-reference-for-DBus-output-para.patch new file mode 100644 index 000000000000..38a92d1db289 --- /dev/null +++ b/net-libs/signond/files/0008-Use-return-instead-of-reference-for-DBus-output-para.patch @@ -0,0 +1,57 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From 929f34fb07e30e17fc6a6ec117207390675be03b Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sat, 6 Aug 2022 15:46:16 +0200 +Subject: [PATCH 08/11] Use return instead of reference for DBus output + parameter + +From a DBus perspective it's the same but it seems to work better that way with Qt6 +--- + src/signond/signondaemonadaptor.cpp | 7 ++++--- + src/signond/signondaemonadaptor.h | 3 +-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/signond/signondaemonadaptor.cpp b/src/signond/signondaemonadaptor.cpp +index a407175..0f01d34 100644 +--- a/src/signond/signondaemonadaptor.cpp ++++ b/src/signond/signondaemonadaptor.cpp +@@ -63,17 +63,18 @@ SignonDaemonAdaptor::registerObject(const QDBusConnection &connection, + return QDBusObjectPath(path); + } + +-void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext, +- QDBusObjectPath &objectPath) ++QDBusObjectPath SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext) + { + Q_UNUSED(applicationContext); + + SignonIdentity *identity = m_parent->registerNewIdentity(); + + QDBusConnection dbusConnection(parentDBusContext().connection()); +- objectPath = registerObject(dbusConnection, identity); ++ QDBusObjectPath objectPath = registerObject(dbusConnection, identity); + + SignonDisposable::destroyUnused(); ++ ++ return objectPath; + } + + void SignonDaemonAdaptor::securityErrorReply() +diff --git a/src/signond/signondaemonadaptor.h b/src/signond/signondaemonadaptor.h +index c51a6b8..639a135 100644 +--- a/src/signond/signondaemonadaptor.h ++++ b/src/signond/signondaemonadaptor.h +@@ -49,8 +49,7 @@ public: + { return *static_cast<QDBusContext *>(m_parent); } + + public Q_SLOTS: +- void registerNewIdentity(const QString &applicationContext, +- QDBusObjectPath &objectPath); ++ QDBusObjectPath registerNewIdentity(const QString &applicationContext); + void getIdentity(const quint32 id, const QString &applicationContext, + QDBusObjectPath &objectPath, + QVariantMap &identityData); +-- +2.43.0 + diff --git a/net-libs/signond/files/0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch b/net-libs/signond/files/0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch new file mode 100644 index 000000000000..dd180898cd34 --- /dev/null +++ b/net-libs/signond/files/0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch @@ -0,0 +1,202 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From 9b439d09712fe31cbb9b3f30a6cbc75cbbc11d20 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Fri, 7 Apr 2023 16:10:31 +0200 +Subject: [PATCH 09/11] Adjust buildsystem to include correct Qt Major version + number + +--- + common-project-config.pri | 4 ++-- + lib/SignOn/SignOnQt5Config.cmake.in | 2 +- + lib/SignOn/SignOnQt6Config.cmake.in | 7 +++++++ + lib/SignOn/SignOnQt6ConfigVersion.cmake.in | 10 ++++++++++ + lib/SignOn/libsignon-qt.pri | 2 +- + lib/SignOn/libsignon-qt6.pc.in | 11 +++++++++++ + .../signon-plugins-common/signon-plugins-common.pc.in | 2 +- + lib/plugins/signon-plugins.pc.in | 2 +- + lib/signond/SignOn/SignOnExtension.pc.in | 2 +- + tests/libsignon-qt-tests/libsignon-qt-tests.pro | 2 +- + tests/signond-tests/identity-tool.pro | 2 +- + .../mock-ac-plugin/identity-ac-helper.pro | 2 +- + tests/signond-tests/signond-tests.pri | 2 +- + 13 files changed, 39 insertions(+), 11 deletions(-) + create mode 100644 lib/SignOn/SignOnQt6Config.cmake.in + create mode 100644 lib/SignOn/SignOnQt6ConfigVersion.cmake.in + create mode 100644 lib/SignOn/libsignon-qt6.pc.in + +diff --git a/common-project-config.pri b/common-project-config.pri +index abe6cf6..af5f425 100644 +--- a/common-project-config.pri ++++ b/common-project-config.pri +@@ -29,8 +29,8 @@ DEFINES += DEBUG_ENABLED + DEFINES += NO_SIGNON_USER + + # Library name for CMake and pkg-config +-LIBSIGNON = libsignon-qt5 +-CMAKE_BASENAME = SignOnQt5 ++LIBSIGNON = libsignon-qt$${QT_MAJOR_VERSION} ++CMAKE_BASENAME = SignOnQt$${QT_MAJOR_VERSION} + + #----------------------------------------------------------------------------- + # setup the installation prefix +diff --git a/lib/SignOn/SignOnQt5Config.cmake.in b/lib/SignOn/SignOnQt5Config.cmake.in +index 523fffb..128ee8d 100644 +--- a/lib/SignOn/SignOnQt5Config.cmake.in ++++ b/lib/SignOn/SignOnQt5Config.cmake.in +@@ -4,4 +4,4 @@ + + set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) + set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a) +-set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) +\ No newline at end of file ++set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) +diff --git a/lib/SignOn/SignOnQt6Config.cmake.in b/lib/SignOn/SignOnQt6Config.cmake.in +new file mode 100644 +index 0000000..128ee8d +--- /dev/null ++++ b/lib/SignOn/SignOnQt6Config.cmake.in +@@ -0,0 +1,7 @@ ++# SIGNONQT_INCLUDE_DIRS - The libsignon-qt include directories ++# SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt ++# SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt ++ ++set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) ++set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a) ++set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) +diff --git a/lib/SignOn/SignOnQt6ConfigVersion.cmake.in b/lib/SignOn/SignOnQt6ConfigVersion.cmake.in +new file mode 100644 +index 0000000..616cd60 +--- /dev/null ++++ b/lib/SignOn/SignOnQt6ConfigVersion.cmake.in +@@ -0,0 +1,10 @@ ++set(PACKAGE_VERSION $${PROJECT_VERSION}) ++ ++if(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" ) ++ set(PACKAGE_VERSION_COMPATIBLE FALSE) ++else(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" ) ++ set(PACKAGE_VERSION_COMPATIBLE TRUE) ++ if( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\") ++ set(PACKAGE_VERSION_EXACT TRUE) ++ endif( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\") ++endif(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" ) +diff --git a/lib/SignOn/libsignon-qt.pri b/lib/SignOn/libsignon-qt.pri +index 1458c50..a318fe8 100644 +--- a/lib/SignOn/libsignon-qt.pri ++++ b/lib/SignOn/libsignon-qt.pri +@@ -2,7 +2,7 @@ include( ../../common-project-config.pri ) + include( ../../common-vars.pri ) + TEMPLATE = lib + +-TARGET = signon-qt5 ++TARGET = signon-qt$${QT_MAJOR_VERSION} + + # Input + public_headers += \ +diff --git a/lib/SignOn/libsignon-qt6.pc.in b/lib/SignOn/libsignon-qt6.pc.in +new file mode 100644 +index 0000000..6a1bcb1 +--- /dev/null ++++ b/lib/SignOn/libsignon-qt6.pc.in +@@ -0,0 +1,11 @@ ++prefix=$$INSTALL_PREFIX ++exec_prefix=${prefix} ++libdir=$$INSTALL_LIBDIR ++includedir=${prefix}/include ++ ++Name: libsignon-qt6 ++Description: Client library for the Single Sign On daemon, Qt6 bindings. ++Version: $$PROJECT_VERSION ++Libs: -L${libdir} -lsignon-qt6 ++Requires: Qt6Core ++Cflags: -I${includedir}/signon-qt6 -I${includedir}/signon-qt6/SignOn +diff --git a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in +index 3d7f3db..8cbc9d4 100644 +--- a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in ++++ b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in +@@ -6,5 +6,5 @@ plugin_includedir=${includedir}/signon-plugins/SignOn + Name: signon-plugins-common + Description: SignonPluginsCommon + Version: $$PROJECT_VERSION +-Libs.private: -L/usr/lib -lQt5Core ++Libs.private: -L/usr/lib -lQt$${QT_MAJOR_VERSION}Core + Cflags: -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn +diff --git a/lib/plugins/signon-plugins.pc.in b/lib/plugins/signon-plugins.pc.in +index 5be38df..8849e5a 100644 +--- a/lib/plugins/signon-plugins.pc.in ++++ b/lib/plugins/signon-plugins.pc.in +@@ -8,6 +8,6 @@ Name: signon-plugins + Description: SignonPlugins + Version: $$PROJECT_VERSION + Requires: $${LIBSIGNON} +-Libs.private: -L/usr/lib -lQt5Core ++Libs.private: -L/usr/lib -lQt$${QT_MAJOR_VERSION}Core + Cflags: -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn + Libs: -lsignon-plugins +diff --git a/lib/signond/SignOn/SignOnExtension.pc.in b/lib/signond/SignOn/SignOnExtension.pc.in +index e439284..ce7ad9c 100644 +--- a/lib/signond/SignOn/SignOnExtension.pc.in ++++ b/lib/signond/SignOn/SignOnExtension.pc.in +@@ -7,6 +7,6 @@ plugindir=$$SIGNOND_EXTENSIONS_DIR + Name: SignOnExtension + Description: SignOn extension development + Version: $$PROJECT_VERSION +-Requires: Qt5Core ++Requires: Qt$${QT_MAJOR_VERSION}Core + Libs: -L${libdir} -lsignon-extension + Cflags: -I${includedir}/signon-extension +diff --git a/tests/libsignon-qt-tests/libsignon-qt-tests.pro b/tests/libsignon-qt-tests/libsignon-qt-tests.pro +index 4dd6ce4..7e44272 100644 +--- a/tests/libsignon-qt-tests/libsignon-qt-tests.pro ++++ b/tests/libsignon-qt-tests/libsignon-qt-tests.pro +@@ -10,7 +10,7 @@ QT += \ + testlib + QT -= gui + +-LIBS *= -lsignon-qt5 ++LIBS *= -lsignon-qt$${QT_MAJOR_VERSION} + QMAKE_LIBDIR += $${TOP_BUILD_DIR}/lib/SignOn + QMAKE_RPATHDIR = $${QMAKE_LIBDIR} + +diff --git a/tests/signond-tests/identity-tool.pro b/tests/signond-tests/identity-tool.pro +index c90e046..3a99e9d 100644 +--- a/tests/signond-tests/identity-tool.pro ++++ b/tests/signond-tests/identity-tool.pro +@@ -6,7 +6,7 @@ TARGET = identity-tool + QT += core + QT -= gui + +-LIBS += -lsignon-qt5 ++LIBS += -lsignon-qt$${QT_MAJOR_VERSION} + + QMAKE_LIBDIR += \ + $${TOP_BUILD_DIR}/lib/signond/SignOn \ +diff --git a/tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro b/tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro +index 2dac5ad..b78e691 100644 +--- a/tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro ++++ b/tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro +@@ -6,7 +6,7 @@ TARGET = identity-ac-helper + QT += core + QT -= gui + +-LIBS += -lsignon-qt5 ++LIBS += -lsignon-qt$${QT_MAJOR_VERSION} + + QMAKE_LIBDIR += \ + $${TOP_BUILD_DIR}/lib/signond/SignOn \ +diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri +index cbdfae3..74fa5b4 100644 +--- a/tests/signond-tests/signond-tests.pri ++++ b/tests/signond-tests/signond-tests.pri +@@ -11,7 +11,7 @@ QT -= gui + + LIBS += \ + -lsignon-extension \ +- -lsignon-qt5 ++ -lsignon-qt$${QT_MAJOR_VERSION} + + QMAKE_LIBDIR += \ + $${TOP_BUILD_DIR}/lib/signond/SignOn \ +-- +2.43.0 + diff --git a/net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch b/net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch new file mode 100644 index 000000000000..0cc5a3f31925 --- /dev/null +++ b/net-libs/signond/files/0010-Fix-plugin-datastream-in-Qt6.patch @@ -0,0 +1,33 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From f4e9e3b541027eb0a360d4e3de27ac48b67411eb Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 17:14:47 +0200 +Subject: [PATCH 10/11] Fix plugin datastream in Qt6 + +We send the size of the to-be-sent data to the datastream + +In Qt6 QByteArray::size() is 64 bit, but the other side reads it as int, breaking the communication + +Cast the size to int to avoid that +--- + lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp b/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp +index d156659..fe35031 100644 +--- a/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp ++++ b/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp +@@ -63,7 +63,8 @@ bool BlobIOHandler::sendData(const QVariantMap &map) + + QDataStream stream(m_writeChannel); + QByteArray ba = variantMapToByteArray(map); +- stream << ba.size(); ++ // in Qt6 QByteArray::size() is 64 bit, but the receiving side expects int ++ stream << static_cast<int>(ba.size()); + + QVector<QByteArray> pages = pageByteArray(ba); + for (int i = 0; i < pages.count(); ++i) +-- +2.43.0 + diff --git a/net-libs/signond/files/0011-Port-away-from-deprecated-QProcess-signal.patch b/net-libs/signond/files/0011-Port-away-from-deprecated-QProcess-signal.patch new file mode 100644 index 000000000000..d3948b55f29d --- /dev/null +++ b/net-libs/signond/files/0011-Port-away-from-deprecated-QProcess-signal.patch @@ -0,0 +1,30 @@ +https://gitlab.com/accounts-sso/signond/-/merge_requests/36 + +From c8ad98249af541514ff7a81634d3295e712f1a39 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 15 Oct 2023 17:15:00 +0200 +Subject: [PATCH 11/11] Port away from deprecated QProcess signal + +--- + src/signond/pluginproxy.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/signond/pluginproxy.cpp b/src/signond/pluginproxy.cpp +index 582aef4..2b9b28d 100644 +--- a/src/signond/pluginproxy.cpp ++++ b/src/signond/pluginproxy.cpp +@@ -99,8 +99,9 @@ PluginProxy::PluginProxy(QString type, QObject *parent): + */ + connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), + this, SLOT(onExit(int, QProcess::ExitStatus))); +- connect(m_process, SIGNAL(error(QProcess::ProcessError)), +- this, SLOT(onError(QProcess::ProcessError))); ++ ++ connect(m_process, &PluginProcess::errorOccurred, ++ this, &PluginProxy::onError); + } + + PluginProxy::~PluginProxy() +-- +2.43.0 + diff --git a/net-libs/signond/files/signond-8.60-crashfix.patch b/net-libs/signond/files/signond-8.60-crashfix.patch deleted file mode 100644 index 8cfc79ac431e..000000000000 --- a/net-libs/signond/files/signond-8.60-crashfix.patch +++ /dev/null @@ -1,160 +0,0 @@ -From ab9fab9763277783363f8c6d4b62405c3b0b0413 Mon Sep 17 00:00:00 2001 -From: Chris Adams <chris.adams@jollamobile.com> -Date: Wed, 31 Jul 2019 12:45:14 +1000 -Subject: [PATCH] Don't emit QObject::destroyed() within Identity::destroy() - -QObject::destroyed() should not be emitted manually, as that can -cause unwanted side effects. - -Specifically, in this case, the -QDBusConnectionPrivate::objectDestroyed() slot was invoked with -invalidated object parameter (perhaps due to duplicate invocation) -resulting in a warning in QObject::disconnect(). - -Instead, ensure the object is unregistered from DBus immediately. ---- - src/signond/signondaemonadaptor.cpp | 29 ++++++++++++++++++++++++++++- - src/signond/signondaemonadaptor.h | 3 +++ - src/signond/signonidentity.cpp | 13 ++++++++----- - src/signond/signonidentity.h | 1 + - 4 files changed, 40 insertions(+), 6 deletions(-) - -diff --git a/src/signond/signondaemonadaptor.cpp b/src/signond/signondaemonadaptor.cpp -index 8b35e4bd..abd8fd3a 100644 ---- a/src/signond/signondaemonadaptor.cpp -+++ b/src/signond/signondaemonadaptor.cpp -@@ -29,6 +29,13 @@ - - namespace SignonDaemonNS { - -+struct RegisteredIdentity { -+ RegisteredIdentity(const QDBusConnection &connection, QObject *identity) -+ : conn(connection), ident(identity) {} -+ QDBusConnection conn; -+ QObject *ident = nullptr; -+}; -+ - SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent): - QDBusAbstractAdaptor(parent), - m_parent(parent) -@@ -38,6 +45,7 @@ SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent): - - SignonDaemonAdaptor::~SignonDaemonAdaptor() - { -+ qDeleteAll(m_registeredIdentities); - } - - void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext, -@@ -46,7 +54,10 @@ void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext, - Q_UNUSED(applicationContext); - - QObject *identity = m_parent->registerNewIdentity(); -- objectPath = registerObject(parentDBusContext().connection(), identity); -+ QDBusConnection dbusConnection(parentDBusContext().connection()); -+ objectPath = registerObject(dbusConnection, identity); -+ m_registeredIdentities.append(new RegisteredIdentity(dbusConnection, identity)); -+ connect(identity, SIGNAL(unregistered()), this, SLOT(onIdentityUnregistered())); - - SignonDisposable::destroyUnused(); - } -@@ -130,6 +141,22 @@ void SignonDaemonAdaptor::getIdentity(const quint32 id, - SignonDisposable::destroyUnused(); - } - -+void SignonDaemonAdaptor::onIdentityUnregistered() -+{ -+ QObject *ident = sender(); -+ if (!ident) { -+ return; -+ } -+ -+ for (int i = 0; i < m_registeredIdentities.size(); ++i) { -+ if (m_registeredIdentities[i]->ident == ident) { -+ m_registeredIdentities[i]->conn.unregisterObject(ident->objectName()); -+ delete m_registeredIdentities.takeAt(i); -+ return; -+ } -+ } -+} -+ - void SignonDaemonAdaptor::onIdentityAccessReplyFinished() - { - SignOn::AccessReply *reply = qobject_cast<SignOn::AccessReply*>(sender()); -diff --git a/src/signond/signondaemonadaptor.h b/src/signond/signondaemonadaptor.h -index db8d875f..1c20cac3 100644 ---- a/src/signond/signondaemonadaptor.h -+++ b/src/signond/signondaemonadaptor.h -@@ -34,6 +34,7 @@ - namespace SignonDaemonNS { - - typedef QList<QVariantMap> MapList; -+class RegisteredIdentity; - - class SignonDaemonAdaptor: public QDBusAbstractAdaptor - { -@@ -74,10 +75,12 @@ private: - QObject *object); - - private Q_SLOTS: -+ void onIdentityUnregistered(); - void onIdentityAccessReplyFinished(); - void onAuthSessionAccessReplyFinished(); - - private: -+ QList<RegisteredIdentity*> m_registeredIdentities; - SignonDaemon *m_parent; - }; //class SignonDaemonAdaptor - -diff --git a/src/signond/signonidentity.cpp b/src/signond/signonidentity.cpp -index ce1ecfb0..a143c223 100644 ---- a/src/signond/signonidentity.cpp -+++ b/src/signond/signonidentity.cpp -@@ -84,7 +84,8 @@ private: - SignonIdentity::SignonIdentity(quint32 id, int timeout, - SignonDaemon *parent): - SignonDisposable(timeout, parent), -- m_pInfo(NULL) -+ m_pInfo(NULL), -+ m_destroyed(false) - { - m_id = id; - -@@ -112,7 +113,10 @@ SignonIdentity::SignonIdentity(quint32 id, int timeout, - - SignonIdentity::~SignonIdentity() - { -- emit unregistered(); -+ if (!m_destroyed) { -+ m_destroyed = true; -+ Q_EMIT unregistered(); -+ } - - delete m_signonui; - delete m_pInfo; -@@ -125,9 +129,8 @@ SignonIdentity *SignonIdentity::createIdentity(quint32 id, SignonDaemon *parent) - - void SignonIdentity::destroy() - { -- /* Emitting the destroyed signal makes QDBusConnection unregister the -- * object */ -- Q_EMIT destroyed(); -+ m_destroyed = true; -+ Q_EMIT unregistered(); - deleteLater(); - } - -diff --git a/src/signond/signonidentity.h b/src/signond/signonidentity.h -index 9ec9be4e..f6321f30 100644 ---- a/src/signond/signonidentity.h -+++ b/src/signond/signonidentity.h -@@ -96,6 +96,7 @@ private: - quint32 m_id; - SignonUiAdaptor *m_signonui; - SignonIdentityInfo *m_pInfo; -+ bool m_destroyed; - }; //class SignonDaemon - - } //namespace SignonDaemonNS --- -2.26.2 - diff --git a/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch b/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch deleted file mode 100644 index 175d88361c43..000000000000 --- a/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch +++ /dev/null @@ -1,123 +0,0 @@ -From e21867fa27e32f5391d73d145eef1c8d908dee44 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Thu, 18 Jun 2020 10:22:04 +0200 -Subject: [PATCH] Don't use -fno-rtti - -QProcess uses typeid and crashes otherwise. ---- - common-project-config.pri | 2 -- - src/extensions/cryptsetup/cryptsetup.pro | 1 - - src/plugins/plugins.pri | 3 +-- - src/remotepluginprocess/remotepluginprocess.pro | 3 +-- - tests/extensions/extensions.pri | 3 +-- - tests/libsignon-qt-tests/libsignon-qt-tests.pro | 3 +-- - tests/passwordplugintest/passwordplugintest.pro | 3 +-- - tests/signond-tests/signond-tests.pri | 3 +-- - 8 files changed, 6 insertions(+), 15 deletions(-) - -diff --git a/common-project-config.pri b/common-project-config.pri -index 606f70bb..abe6cf6d 100644 ---- a/common-project-config.pri -+++ b/common-project-config.pri -@@ -13,8 +13,6 @@ RCC_DIR = resources - - # we don't like warnings... - QMAKE_CXXFLAGS -= -Werror -Wno-write-strings --# Disable RTTI --QMAKE_CXXFLAGS += -fno-rtti - # Disable exceptions - CONFIG += exceptions_off - # Use C++11 -diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro -index f4b6e53b..5cc214e4 100644 ---- a/src/extensions/cryptsetup/cryptsetup.pro -+++ b/src/extensions/cryptsetup/cryptsetup.pro -@@ -29,7 +29,6 @@ QT -= gui - - QMAKE_CXXFLAGS += \ - -fno-exceptions \ -- -fno-rtti \ - -fvisibility=hidden - - DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII -diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri -index 2c03e743..074896d5 100644 ---- a/src/plugins/plugins.pri -+++ b/src/plugins/plugins.pri -@@ -22,8 +22,7 @@ LIBS += -lsignon-plugins - QMAKE_LIBDIR += \ - $${TOP_BUILD_DIR}/lib/plugins - --QMAKE_CXXFLAGS += -fno-exceptions \ -- -fno-rtti -+QMAKE_CXXFLAGS += -fno-exceptions - - headers.path = $${INSTALL_PREFIX}/include/signon-plugins - -diff --git a/src/remotepluginprocess/remotepluginprocess.pro b/src/remotepluginprocess/remotepluginprocess.pro -index 7c2ea007..36b4cbe0 100644 ---- a/src/remotepluginprocess/remotepluginprocess.pro -+++ b/src/remotepluginprocess/remotepluginprocess.pro -@@ -40,8 +40,7 @@ LIBS += \ - -lsignon-plugins-common \ - -lsignon-plugins - --QMAKE_CXXFLAGS += -fno-exceptions \ -- -fno-rtti -+QMAKE_CXXFLAGS += -fno-exceptions - - #DEFINES += QT_NO_CAST_TO_ASCII \ - # QT_NO_CAST_FROM_ASCII -diff --git a/tests/extensions/extensions.pri b/tests/extensions/extensions.pri -index 179cd28d..2fd75955 100644 ---- a/tests/extensions/extensions.pri -+++ b/tests/extensions/extensions.pri -@@ -20,5 +20,4 @@ INCLUDEPATH += . \ - $$TOP_SRC_DIR/lib/signond - - QMAKE_CXXFLAGS += \ -- -fno-exceptions \ -- -fno-rtti -+ -fno-exceptions -diff --git a/tests/libsignon-qt-tests/libsignon-qt-tests.pro b/tests/libsignon-qt-tests/libsignon-qt-tests.pro -index 43f2d59f..ac87781d 100644 ---- a/tests/libsignon-qt-tests/libsignon-qt-tests.pro -+++ b/tests/libsignon-qt-tests/libsignon-qt-tests.pro -@@ -36,8 +36,7 @@ INCLUDEPATH += . \ - $$TOP_SRC_DIR/src/plugins/test - DEFINES += SSO_CI_TESTMANAGEMENT - DEFINES += "SIGNOND_PLUGINS_DIR=$${SIGNOND_PLUGINS_DIR_QUOTED}" --QMAKE_CXXFLAGS += -fno-exceptions \ -- -fno-rtti -+QMAKE_CXXFLAGS += -fno-exceptions - - check.depends = $$TARGET - check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./libsignon-qt-tests" -diff --git a/tests/passwordplugintest/passwordplugintest.pro b/tests/passwordplugintest/passwordplugintest.pro -index 6132921e..ce16fdcf 100644 ---- a/tests/passwordplugintest/passwordplugintest.pro -+++ b/tests/passwordplugintest/passwordplugintest.pro -@@ -19,5 +19,4 @@ INCLUDEPATH += $${TOP_SRC_DIR}/lib/plugins \ - $${TOP_SRC_DIR}/src/plugins \ - $${TOP_SRC_DIR}/lib - --QMAKE_CXXFLAGS += -fno-exceptions \ -- -fno-rtti -+QMAKE_CXXFLAGS += -fno-exceptions -diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri -index 1bbd5a15..e95556ba 100644 ---- a/tests/signond-tests/signond-tests.pri -+++ b/tests/signond-tests/signond-tests.pri -@@ -34,8 +34,7 @@ INCLUDEPATH += . \ - $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common/SignOn \ - $${TOP_SRC_DIR}/lib \ - --QMAKE_CXXFLAGS += -fno-exceptions \ -- -fno-rtti -+QMAKE_CXXFLAGS += -fno-exceptions - - check.depends = $$TARGET - check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./$$TARGET" --- -GitLab - diff --git a/net-libs/signond/files/signond-8.61-consistent-paths.patch b/net-libs/signond/files/signond-8.61-consistent-paths.patch new file mode 100644 index 000000000000..16e0276a4e02 --- /dev/null +++ b/net-libs/signond/files/signond-8.61-consistent-paths.patch @@ -0,0 +1,288 @@ +From 62ce2305081075a53836999441214f03d37b50b5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 28 Jun 2020 21:44:42 +0200 +Subject: [PATCH 3/3] Consistent overrideable install paths + +At least signon-plugins.pc and signon-plugins-common.pc were getting it wrong. + +This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath +INSTALL_PREFIX. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + common-installs-config.pri | 2 +- + common-pkgconfig.pri | 2 +- + common-project-config.pri | 30 +++++++++---------- + lib/SignOn/SignOnQt5Config.cmake.in | 6 ++-- + lib/SignOn/SignOnQt6Config.cmake.in | 6 ++-- + lib/SignOn/libsignon-qt.pc.in | 2 +- + lib/SignOn/libsignon-qt.pri | 2 +- + lib/SignOn/libsignon-qt5.pc.in | 2 +- + lib/SignOn/libsignon-qt6.pc.in | 2 +- + .../signon-plugins-common.pc.in | 4 +-- + lib/plugins/signon-plugins.pc.in | 4 +-- + lib/signond/SignOn/SignOnExtension.pc.in | 2 +- + lib/signond/signond.pc.in | 2 +- + src/extensions/cryptsetup/cryptsetup.pro | 2 +- + src/plugins/plugins.pri | 4 +-- + 13 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/common-installs-config.pri b/common-installs-config.pri +index 69c5ae8..b72477a 100644 +--- a/common-installs-config.pri ++++ b/common-installs-config.pri +@@ -18,7 +18,7 @@ contains( TEMPLATE, app ) { + # default installation target for libraries + #----------------------------------------------------------------------------- + contains( TEMPLATE, lib ) { +- target.path = $${INSTALL_LIBDIR} ++ target.path = $${INSTALL_PREFIX}/$${LIBDIR} + INSTALLS += target + message("====") + message("==== INSTALLS += target") +diff --git a/common-pkgconfig.pri b/common-pkgconfig.pri +index 975068a..9f010d3 100644 +--- a/common-pkgconfig.pri ++++ b/common-pkgconfig.pri +@@ -3,7 +3,7 @@ + !isEmpty(pkgconfig.files) { + QMAKE_SUBSTITUTES += $${pkgconfig.files}.in + pkgconfig.CONFIG = no_check_exist +- pkgconfig.path = $${INSTALL_LIBDIR}/pkgconfig ++ pkgconfig.path = $${INSTALL_PREFIX}/$${LIBDIR}/pkgconfig + QMAKE_EXTRA_TARGETS += pkgconfig + + QMAKE_CLEAN += $${pkgconfig.files} +diff --git a/common-project-config.pri b/common-project-config.pri +index 606f70b..1185559 100644 +--- a/common-project-config.pri ++++ b/common-project-config.pri +@@ -57,36 +57,36 @@ exists( meego-release ) { + ARCH = $$system(uname -m) + } + +-linux-g++-64|linux-icc-64: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64 +-else: linux-g++-32|linux-icc-32: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib32 +-else: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib ++linux-g++-64|linux-icc-64: DEFAULT_LIBDIR = lib64 ++else: linux-g++-32|linux-icc-32: DEFAULT_LIBDIR = lib32 ++else: DEFAULT_LIBDIR = lib + + # default library directory can be overriden by defining LIBDIR when + # running qmake + isEmpty( LIBDIR ) { ++ LIBDIR = $${DEFAULT_LIBDIR} + message("====") +- message("==== NOTE: To override the library installation path run: `qmake LIBDIR=/custom/path'") +- message("==== (current installation path is `$${INSTALL_LIBDIR}')") ++ message("==== NOTE: To override the library dir beneath INSTALL_PREFIX run: `qmake LIBDIR=customdir'") ++ message("==== (current library dir is `$${LIBDIR}`, install path `$${INSTALL_PREFIX}/$${LIBDIR}')") + } else { +- INSTALL_LIBDIR = $${LIBDIR} + message("====") +- message("==== library install path set to `$${INSTALL_LIBDIR}'") ++ message("==== library dir set to `$${LIBDIR}`, install path `$${INSTALL_PREFIX}/$${LIBDIR}'") + } + +-isEmpty ( CMAKE_CONFIG_PATH ) { +- CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake/$${CMAKE_BASENAME} ++isEmpty ( CMAKE_MODULE_DIR ) { ++ CMAKE_MODULE_DIR = $${LIBDIR}/cmake/$${CMAKE_BASENAME} + message("====") +- message("==== NOTE: To override the cmake module installation path run: `qmake CMAKE_CONFIG_PATH=/custom/path'") +- message("==== (current installation path is `$${CMAKE_CONFIG_PATH}')") ++ message("==== NOTE: To override the cmake module dir beneath INSTALL_PREFIX run: `qmake CMAKE_MODULE_DIR=customdir'") ++ message("==== (current cmake module dir is `$${CMAKE_MODULE_DIR}`, install path `$${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR}')") + } else { + message("====") +- message("==== cmake module install path set to `$${CMAKE_CONFIG_PATH}'") ++ message("==== cmake module dir set to `$${CMAKE_MODULE_DIR}', install path `$${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR}')") + } + + # Default directory for signond extensions + _EXTENSIONS = $$(SIGNOND_EXTENSIONS_DIR) + isEmpty(_EXTENSIONS) { +- SIGNOND_EXTENSIONS_DIR = $${INSTALL_LIBDIR}/signon/extensions ++ SIGNOND_EXTENSIONS_DIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon/extensions + } else { + SIGNOND_EXTENSIONS_DIR = $$_EXTENSIONS + } +@@ -94,7 +94,7 @@ SIGNOND_EXTENSIONS_DIR_QUOTED = \\\"$$SIGNOND_EXTENSIONS_DIR\\\" + + _PLUGINS = $$(SIGNOND_PLUGINS_DIR) + isEmpty(_PLUGINS) { +- SIGNOND_PLUGINS_DIR = $${INSTALL_LIBDIR}/signon ++ SIGNOND_PLUGINS_DIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon + } else { + SIGNOND_PLUGINS_DIR = $$_PLUGINS + } +@@ -102,7 +102,7 @@ SIGNOND_PLUGINS_DIR_QUOTED = \\\"$$SIGNOND_PLUGINS_DIR\\\" + + # Note that you have to CONFIG+=install_tests in order to install tests + isEmpty(TESTDIR) { +- INSTALL_TESTDIR = $${INSTALL_LIBDIR}/signon ++ INSTALL_TESTDIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon + } else { + INSTALL_TESTDIR = $${TESTDIR} + } +diff --git a/lib/SignOn/SignOnQt5Config.cmake.in b/lib/SignOn/SignOnQt5Config.cmake.in +index 523fffb..7105315 100644 +--- a/lib/SignOn/SignOnQt5Config.cmake.in ++++ b/lib/SignOn/SignOnQt5Config.cmake.in +@@ -2,6 +2,6 @@ + # SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt + # SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt + +-set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) +-set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a) +-set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) ++set(SIGNONQT_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so) ++set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.a) ++set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) +--- a/lib/SignOn/SignOnQt6Config.cmake.in ++++ b/lib/SignOn/SignOnQt6Config.cmake.in +@@ -2,6 +2,6 @@ + # SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt + # SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt + +-set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) +-set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a) ++set(SIGNONQT_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so) ++set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.a) + set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}) + +diff --git a/lib/SignOn/libsignon-qt.pc.in b/lib/SignOn/libsignon-qt.pc.in +index 26f0f5b..c614541 100644 +--- a/lib/SignOn/libsignon-qt.pc.in ++++ b/lib/SignOn/libsignon-qt.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + + Name: libsignon-qt +diff --git a/lib/SignOn/libsignon-qt.pri b/lib/SignOn/libsignon-qt.pri +index 1458c50..d80f8bb 100644 +--- a/lib/SignOn/libsignon-qt.pri ++++ b/lib/SignOn/libsignon-qt.pri +@@ -79,6 +79,6 @@ QMAKE_SUBSTITUTES += $${CMAKE_BASENAME}Config.cmake.in \ + $${CMAKE_BASENAME}ConfigVersion.cmake.in + cmake_modules.files = $${CMAKE_BASENAME}Config.cmake \ + $${CMAKE_BASENAME}ConfigVersion.cmake +-cmake_modules.path = $${CMAKE_CONFIG_PATH} ++cmake_modules.path = $${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR} + + INSTALLS += cmake_modules +diff --git a/lib/SignOn/libsignon-qt5.pc.in b/lib/SignOn/libsignon-qt5.pc.in +index 2181359..5d98b6d 100644 +--- a/lib/SignOn/libsignon-qt5.pc.in ++++ b/lib/SignOn/libsignon-qt5.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + + Name: libsignon-qt5 +--- a/lib/SignOn/libsignon-qt6.pc.in ++++ b/lib/SignOn/libsignon-qt6.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + + Name: libsignon-qt6 +diff --git a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in +index 3d7f3db..2240789 100644 +--- a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in ++++ b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in +@@ -1,10 +1,10 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + plugin_includedir=${includedir}/signon-plugins/SignOn + Name: signon-plugins-common + Description: SignonPluginsCommon + Version: $$PROJECT_VERSION +-Libs.private: -L/usr/lib -lQt$${QT_MAJOR_VERSION}Core ++Libs.private: -L${libdir} -lQt$${QT_MAJOR_VERSION}Core + Cflags: -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn +diff --git a/lib/plugins/signon-plugins.pc.in b/lib/plugins/signon-plugins.pc.in +index 5be38df..2e3c087 100644 +--- a/lib/plugins/signon-plugins.pc.in ++++ b/lib/plugins/signon-plugins.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + plugin_includedir=${includedir}/signon-plugins/SignOn + plugindir=$$SIGNOND_PLUGINS_DIR +@@ -8,6 +8,6 @@ Name: signon-plugins + Description: SignonPlugins + Version: $$PROJECT_VERSION + Requires: $${LIBSIGNON} +-Libs.private: -L/usr/lib -lQt$${QT_MAJOR_VERSION}Core ++Libs.private: -L${libdir} -lQt$${QT_MAJOR_VERSION}Core + Cflags: -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn + Libs: -lsignon-plugins +diff --git a/lib/signond/SignOn/SignOnExtension.pc.in b/lib/signond/SignOn/SignOnExtension.pc.in +index e439284..8fc669c 100644 +--- a/lib/signond/SignOn/SignOnExtension.pc.in ++++ b/lib/signond/SignOn/SignOnExtension.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + plugindir=$$SIGNOND_EXTENSIONS_DIR + +diff --git a/lib/signond/signond.pc.in b/lib/signond/signond.pc.in +index a7b5036..9ec0b1a 100644 +--- a/lib/signond/signond.pc.in ++++ b/lib/signond/signond.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include + + Name: signond-dev +diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro +index f4b6e53..2657b47 100644 +--- a/src/extensions/cryptsetup/cryptsetup.pro ++++ b/src/extensions/cryptsetup/cryptsetup.pro +@@ -41,6 +41,6 @@ LIBS += \ + + include( $${TOP_SRC_DIR}/common-installs-config.pri ) + +-target.path = $${INSTALL_LIBDIR}/signon/extensions ++target.path = $${INSTALL_PREFIX}/$${LIBDIR}/signon/extensions + INSTALLS += target + +diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri +index 2c03e74..ea2fcb2 100644 +--- a/src/plugins/plugins.pri ++++ b/src/plugins/plugins.pri +@@ -27,7 +27,7 @@ QMAKE_CXXFLAGS += -fno-exceptions \ + + headers.path = $${INSTALL_PREFIX}/include/signon-plugins + +-pkgconfig.path = $${INSTALL_LIBDIR}/pkgconfig ++pkgconfig.path = $${INSTALL_PREFIX}/$${LIBDIR}/pkgconfig + +-target.path = $${INSTALL_LIBDIR}/signon ++target.path = $${INSTALL_PREFIX}/$${LIBDIR}/signon + INSTALLS = target +-- +2.27.0 diff --git a/net-libs/signond/metadata.xml b/net-libs/signond/metadata.xml index 8641e5bdd399..5fdf45f73ba9 100644 --- a/net-libs/signond/metadata.xml +++ b/net-libs/signond/metadata.xml @@ -5,4 +5,8 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:signond_project:signond</remote-id> + <remote-id type="gitlab">accounts-sso/signond</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/signond/signond-8.61-r100.ebuild b/net-libs/signond/signond-8.61-r100.ebuild new file mode 100644 index 000000000000..1c3cc37a6396 --- /dev/null +++ b/net-libs/signond/signond-8.61-r100.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils multibuild + +if [[ ${PV} = *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/nicolasfella/signond.git/" + EGIT_BRANCH="qt6" + inherit git-r3 +else + SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${PN}-VERSION_${PV}" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Signon daemon for libaccounts-glib" +HOMEPAGE="https://gitlab.com/accounts-sso" + +LICENSE="LGPL-2.1" +SLOT="0" +# The qt5/qt6 situation is complicated: https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/merge_requests/28#note_1689621252 +# 1) the library is coinstallable for qt5/qt6 +# 2) signond (the daemon) must be built for only one Qt version, matching the +# Qt version of all consumer plugins. +IUSE="doc +qt5 qt6 test" +REQUIRED_USE="|| ( qt5 qt6 )" + +# tests are brittle; they all pass when stars align, bug 727666 +RESTRICT="test !test? ( test )" + +RDEPEND=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsql:5 + ) + qt6? ( dev-qt/qtbase:6[dbus,gui,network,sql] ) + net-libs/libproxy +" +DEPEND="${RDEPEND} + test? ( + qt5? ( dev-qt/qttest:5 ) + ) +" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + || ( + dev-qt/qttools:6[assistant] + dev-qt/qthelp:5 + ) + ) +" + +PATCHES=( + "${FILESDIR}"/0001-Don-t-forward-declare-QStringList.patch + "${FILESDIR}"/0002-Remove-usage-of-Q_EXTERN_C.patch + "${FILESDIR}"/0003-Port-from-QProcess-pid-to-processId.patch + "${FILESDIR}"/0004-Port-away-from-deprecated-QString-SplitBehavior.patch + "${FILESDIR}"/0005-Port-away-from-QtContainer-toSet.patch + "${FILESDIR}"/0006-Port-away-from-deprecated-QMap-unite.patch + "${FILESDIR}"/0007-Add-Qt6-CI.patch + "${FILESDIR}"/0008-Use-return-instead-of-reference-for-DBus-output-para.patch + "${FILESDIR}"/0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch + "${FILESDIR}"/0010-Fix-plugin-datastream-in-Qt6.patch + "${FILESDIR}"/0011-Port-away-from-deprecated-QProcess-signal.patch + "${FILESDIR}/${PN}-8.60-buildsystem.patch" + "${FILESDIR}/${PN}-8.60-unused-dep.patch" # bug 727346 + "${FILESDIR}/${PN}-8.61-consistent-paths.patch" # bug 701142 +) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_prepare() { + default + + local qhelpgeneratorpath + if has_version "dev-qt/qttools:6[assistant]"; then + qhelpgeneratorpath="$(qt6_get_libdir)/qt6/libexec" + elif has_version "dev-qt/qthelp:5"; then + qhelpgeneratorpath="$(qt5_get_bindir)" + else + eerror "dev-qt/qttools:6[assistant] nor dev-qt/qthelp:5 available even though in deps(?)" + fi + + sed -e "/QHG_LOCATION/s|qhelpgenerator|${qhelpgeneratorpath}/&|" \ + -i {lib/plugins/,lib/SignOn/,}doc/doxy.conf || die + + # install docs to correct location + sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \ + -i doc/doc.pri || die + sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/\$\${TARGET}/" \ + -i lib/plugins/doc/doc.pri || die + sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/libsignon-qt/" \ + -i lib/SignOn/doc/doc.pri || die + + use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" \ + -i signon.pro lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die + + use test || sed -e '/^SUBDIRS/s/tests//' \ + -i signon.pro || die "couldn't disable tests" + + multibuild_copy_sources +} + +src_configure() { + my_src_configure() { + cd "${BUILD_DIR}" || die + + local myqmakeargs=( + PREFIX="${EPREFIX}"/usr + LIBDIR=$(get_libdir) + ) + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + eqmake6 "${myqmakeargs[@]}" + else + eqmake5 "${myqmakeargs[@]}" + fi + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + my_src_compile() { + emake -C "${BUILD_DIR}" + } + + multibuild_foreach_variant my_src_compile +} + +src_install() { + my_src_install() { + emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install + } + + multibuild_foreach_variant my_src_install +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] && \ + ! has_version "kde-apps/signon-kwallet-extension:*"; then + ewarn "Without kde-apps/signon-kwallet-extension installed, passwords" + ewarn "will be saved in plaintext!" + fi +} diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.61.ebuild index f9995daf5819..6f21b1bec048 100644 --- a/net-libs/signond/signond-8.60-r2.ebuild +++ b/net-libs/signond/signond-8.61.ebuild @@ -1,20 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qmake-utils DESCRIPTION="Signon daemon for libaccounts-glib" HOMEPAGE="https://gitlab.com/accounts-sso" SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-VERSION_${PV}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="doc test" -BDEPEND="doc? ( app-doc/doxygen )" +# tests are brittle; they all pass when stars align, bug 727666 +RESTRICT="test !test? ( test )" + RDEPEND=" dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -26,23 +29,25 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) " - -# tests are brittle; they all pass when stars align, bug 727666 -RESTRICT="test !test? ( test )" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + dev-qt/qthelp:5 + ) +" PATCHES=( - "${FILESDIR}/${P}-buildsystem.patch" - "${FILESDIR}/${P}-consistent-paths.patch" # bug 701142 - "${FILESDIR}/${P}-crashfix.patch" - "${FILESDIR}/${P}-unused-dep.patch" # bug 727346 - "${FILESDIR}/${P}-drop-fno-rtti.patch" # runtime crashes + "${FILESDIR}/${PN}-8.60-buildsystem.patch" + "${FILESDIR}/${PN}-8.60-consistent-paths.patch" # bug 701142 + "${FILESDIR}/${PN}-8.60-unused-dep.patch" # bug 727346 ) -S="${WORKDIR}/${PN}-VERSION_${PV}" - src_prepare() { default + sed -e "/QHG_LOCATION/s|qhelpgenerator|$(qt5_get_bindir)/&|" \ + -i {lib/plugins/,lib/SignOn/,}doc/doxy.conf || die + # install docs to correct location sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \ -i doc/doc.pri || die @@ -65,3 +70,11 @@ src_configure() { src_install() { emake INSTALL_ROOT="${D}" install } + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] && \ + ! has_version "kde-apps/signon-kwallet-extension:*"; then + ewarn "Without kde-apps/signon-kwallet-extension installed, passwords" + ewarn "will be saved in plaintext!" + fi +} diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest index db0b6d157fdc..4c35b40ce963 100644 --- a/net-libs/socket_wrapper/Manifest +++ b/net-libs/socket_wrapper/Manifest @@ -1 +1,2 @@ -DIST socket_wrapper-1.3.2.tar.gz 86255 BLAKE2B 33f526a8871cfb1a889a84660ea8e82b6e591646924e16d2c452bb001e0eb4c1457b8151208bbec55c13c40fd124c160fc85d0df227519f62a2683e4ea1acb85 SHA512 f4d3a7026f1777a4c3b5481a0f6e6057b6372e9b64f44523ec1ebf0a34159d7154493dce6ee3c95fbea15607c6ada1382f2475d5d553133a061c80719c135b9d +DIST socket_wrapper-1.4.0.tar.gz 87353 BLAKE2B 67c2a4bae2e1031399137e404e95e6e6cfa1143ff659a7d34533e908f9169b8a79d1dfffaa51a6280a8cfc9e03dc07585ff41b0e087527b1ad0bb5adb282156e SHA512 944e5ff2b6919e414f9045fe294b9b4813272fe7c00f5ac144c999b99572be6b3ed2eb975ec1d07bd853cffea6dffe339280e4961520d34667f808f76b47db57 +DIST socket_wrapper-1.4.2.tar.gz 90641 BLAKE2B 8a43f48ed8f3809eac8c86ee55e740ac37068d729f3f36955b9f017f29c40fa86f1f4455d2e33c8bb9413e25d8e7cb4bab84cd2688f54febb17d41c37ceb4d79 SHA512 30de1dfa6bfae51114b0557a00b87c785b7a00cf62d495b5c4bd837f32016ed58f942e7de0c33d09aa72e533f58283af6b5ae50f276ad7e58e853e32a8400024 diff --git a/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.4.0.ebuild index 4729ad6d13e4..be6ea8f06919 100644 --- a/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild +++ b/net-libs/socket_wrapper/socket_wrapper-1.4.0.ebuild @@ -1,20 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib -DESCRIPTION="A library passing all socket communications through unix sockets" +DESCRIPTION="Library passing all socket communications through unix sockets" HOMEPAGE="https://cwrap.org/socket_wrapper.html" SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="test" - RESTRICT="!test? ( test )" BDEPEND="test? ( >=dev-util/cmocka-1.1.0 )" diff --git a/net-libs/socket_wrapper/socket_wrapper-1.4.2.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.4.2.ebuild new file mode 100644 index 000000000000..616af852b9e3 --- /dev/null +++ b/net-libs/socket_wrapper/socket_wrapper-1.4.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +DESCRIPTION="Library passing all socket communications through unix sockets" +HOMEPAGE="https://cwrap.org/socket_wrapper.html" +SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( >=dev-util/cmocka-1.1.0 )" + +src_configure() { + # https://gcc.gnu.org/PR46596 + # https://gcc.gnu.org/PR101270 + filter-flags -fno-semantic-interposition + + local mycmakeargs=( + -DUNIT_TESTING=$(usex test ON OFF) + ) + cmake-multilib_src_configure +} + +src_test() { + ewarn "test_echo_tcp_poll takes a while to run!" + cmake_src_test +} diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest deleted file mode 100644 index 6302e6ab2d91..000000000000 --- a/net-libs/sofia-sip/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sofia-sip-1.12.11.tar.gz 2927808 BLAKE2B 2723aef491b5f85c047cc54a191fdd2ae63b23445f24b6ee9910af88e2daa684eded6e44cee50c3a52bec2901b5310f34c09e7cf4efce714210755046ceaecd7 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c diff --git a/net-libs/sofia-sip/metadata.xml b/net-libs/sofia-sip/metadata.xml deleted file mode 100644 index b8486fef3faa..000000000000 --- a/net-libs/sofia-sip/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">sofia-sip</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild deleted file mode 100644 index 5ef2784fddd4..000000000000 --- a/net-libs/sofia-sip/sofia-sip-1.12.11.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 - -DESCRIPTION="RFC3261 compliant SIP User-Agent library" -HOMEPAGE="http://sofia-sip.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1+ BSD public-domain" # See COPYRIGHT -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux" -IUSE="ssl" -# tests are broken, see bugs 304607 and 330261 -RESTRICT="test" - -RDEPEND=" - dev-libs/glib:2 - ssl? ( - dev-libs/openssl:0= - )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_configure() { - econf \ - --disable-static \ - $(use_with ssl openssl) -} - -src_install() { - default - dodoc RELEASE - - # no static archives - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest index eadddf1a977f..63af13697704 100644 --- a/net-libs/srt/Manifest +++ b/net-libs/srt/Manifest @@ -1,2 +1,2 @@ -DIST srt-1.4.2.tar.gz 1538231 BLAKE2B 1b3f625bb5a6436d6c35f957796217ed8c7f9d2412e96cbb2b83b8372f0738b5c9219b218b644e74f6f16457d1b8606fedc238310e800cce84fe127f86b33be1 SHA512 4c978e3898737e566f47222a0095df1b49591d79927850cc94c838b7eaccf401faf1c5d038fa45b6fd30c85f980e7c212a79c07ed6f9008430e8a5a594a31ffe -DIST srt-1.4.3.tar.gz 1602671 BLAKE2B ed4ec46cab887461f6dccfc2d695fe78a3782f42f4ef6c3ac5ba6e2ea068a7943eb8079c0a448f35864c575009d556363bcfe7d815d0f47a368001a3df478837 SHA512 5cd15fd0c7b324226ab096c1b6c6f81b4ce5600617e1bd2c38985f18d7d551c9a4a09b1e34c7a705c92ae54bb57c5d736ca7eff6e4992e67666aa167e0da855f +DIST srt-1.5.1.tar.gz 1694199 BLAKE2B 4c215ef936100b02b3a5a9aab6e9a715ecdb728517b0648e91f2144bb34a34cb1573c4e6905441a366ea281c9410c2d00d5ebc64144f327f7a115d81038942af SHA512 f3aa1f7773540e2dd31cd19b124eec3c3d830f59c08d953cae01e129a58db7e639bdf94c8a5a678435ae9a1d2402e2c77196fc9c4e75b42aa37d8eafcc16f436 +DIST srt-1.5.3.tar.gz 1706632 BLAKE2B fd053782e58602ccd06690c5785b68ff20531afd890678fbd77660e376887b0886cc020d449e2669672748c3d1a515b56d9fd94670c33d085eadb961220a7431 SHA512 5b576d6fd325515e05074e4568e3b65d1ae265e3e971db6e6242e5138243fc1594df1e3a7d90962385dac38abc34c4c4b0a567439050f8c0ff818b3b3d497efc diff --git a/net-libs/srt/files/1.4.3-always-GNUInstallDirs.patch b/net-libs/srt/files/1.4.3-always-GNUInstallDirs.patch deleted file mode 100644 index f561d789af3f..000000000000 --- a/net-libs/srt/files/1.4.3-always-GNUInstallDirs.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4036afdcd07083159d66c6e12caa20d6ac6d4926 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sat, 10 Jul 2021 15:02:35 +0300 -Subject: [PATCH] [build] Always use GNUInstallDirs - ---- - CMakeLists.txt | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 25f34c8..fe23f90 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,9 +47,7 @@ set_if(SYMLINKABLE LINUX OR DARWIN OR BSD OR CYGWIN OR GNU) - # inside "bin" and "lib64" directories. At least this maintains - # the current status. Shall this be not desired, override values - # of CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR. --if (NOT DEFINED CMAKE_INSTALL_LIBDIR) -- include(GNUInstallDirs) --endif() -+include(GNUInstallDirs) - - # The CMAKE_BUILD_TYPE seems not to be always set, weird. - if (NOT DEFINED ENABLE_DEBUG) --- -2.32.0 - diff --git a/net-libs/srt/files/srt-1.4.2-cxx-include-gcc11.patch b/net-libs/srt/files/srt-1.4.2-cxx-include-gcc11.patch deleted file mode 100644 index 16c57af80929..000000000000 --- a/net-libs/srt/files/srt-1.4.2-cxx-include-gcc11.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugs.gentoo.org/787023 -https://github.com/Haivision/srt/commit/f1b35cbf5b9b42b031e9b119e4c802b5f744468c - -From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux <krop@users.noreply.github.com> -Date: Wed, 10 Feb 2021 12:42:45 +0000 -Subject: [PATCH] [core] Fix build with GCC 11. (#1806) - -The 'limits' header must be included explicitly. ---- a/srtcore/sync.h -+++ b/srtcore/sync.h -@@ -15,6 +15,7 @@ - //#define ENABLE_CXX17 - - #include <cstdlib> -+#include <limits> - #ifdef ENABLE_STDCXX_SYNC - #include <chrono> - #include <thread> diff --git a/net-libs/srt/files/srt-always-GNUInstallDirs.patch b/net-libs/srt/files/srt-always-GNUInstallDirs.patch deleted file mode 100644 index 94332ad44762..000000000000 --- a/net-libs/srt/files/srt-always-GNUInstallDirs.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 68190ee0db1bc7577f17c51616966f509f971b0a Mon Sep 17 00:00:00 2001 -From: Craig Andrews <candrews@integralblue.com> -Date: Mon, 26 Nov 2018 12:45:38 -0500 -Subject: [PATCH] Always use GNUInstallDirs - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eb2582c..59a41d4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,9 +32,9 @@ set_if(SYMLINKABLE LINUX OR DARWIN OR CYGWIN) - # inside "bin" and "lib64" directories. At least this maintains - # the current status. Shall this be not desired, override values - # of CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR. --if (NOT DEFINED CMAKE_INSTALL_LIBDIR) -+# if (NOT DEFINED CMAKE_INSTALL_LIBDIR) - include(GNUInstallDirs) --endif() -+# endif() - - set (SRT_VERSION 1.3.1) - set_version_variables(SRT_VERSION ${SRT_VERSION}) diff --git a/net-libs/srt/srt-1.4.2.ebuild b/net-libs/srt/srt-1.4.2.ebuild deleted file mode 100644 index de77f27cd91a..000000000000 --- a/net-libs/srt/srt-1.4.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2018-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib - -DESCRIPTION="Secure Reliable Transport (SRT) library and tools" -HOMEPAGE="https://github.com/Haivision/srt" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/Haivision/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos" -fi - -LICENSE="MPL-2.0" -SLOT="0" -IUSE="gnutls" - -DEPEND=" - gnutls? ( - dev-libs/nettle:0=[${MULTILIB_USEDEP}] - net-libs/gnutls:0=[${MULTILIB_USEDEP}] - ) - !gnutls? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-always-GNUInstallDirs.patch" - "${FILESDIR}/${P}-cxx-include-gcc11.patch" -) - -src_prepare() { - cmake_src_prepare - sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_STATIC=OFF - -DUSE_GNUTLS=$(usex gnutls) - ) - cmake-multilib_src_configure -} diff --git a/net-libs/srt/srt-1.4.3.ebuild b/net-libs/srt/srt-1.5.1.ebuild index f0b8cf62e0d1..b23cb847814e 100644 --- a/net-libs/srt/srt-1.4.3.ebuild +++ b/net-libs/srt/srt-1.5.1.ebuild @@ -1,10 +1,9 @@ -# Copyright 2018-2021 Gentoo Authors +# Copyright 2018-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake -inherit cmake-multilib +inherit cmake-multilib flag-o-matic DESCRIPTION="Secure Reliable Transport (SRT) library and tools" HOMEPAGE="https://github.com/Haivision/srt" @@ -14,12 +13,13 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv -sparc ~x86 ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv -sparc x86 ~ppc-macos ~x64-macos" fi LICENSE="MPL-2.0" -SLOT="0/1.4.3" -IUSE="gnutls" +SLOT="0/$(ver_cut 1-2)" +IUSE="gnutls test" +RESTRICT="!test? ( test )" RDEPEND=" gnutls? ( @@ -31,20 +31,27 @@ RDEPEND=" ) " DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PV}-always-GNUInstallDirs.patch" -) +BDEPEND="virtual/pkgconfig + test? ( >=dev-cpp/gtest-1.8[${MULTILIB_USEDEP}] )" src_configure() { + # ODR violations + # https://github.com/Haivision/srt/issues/2145 (bug #861584) + filter-lto + local mycmakeargs=( -DENABLE_STATIC=OFF + -DENABLE_UNITTESTS=$(usex test) + -DENABLE_TESTING=$(usex test) -DUSE_GNUTLS=$(usex gnutls) ) cmake-multilib_src_configure } +multilib_src_test() { + cmake_src_test -j1 +} + multilib_src_install() { cmake_src_install # remove old upstream temporary compatibility pc diff --git a/net-libs/srt/srt-1.5.3.ebuild b/net-libs/srt/srt-1.5.3.ebuild new file mode 100644 index 000000000000..de20957ff470 --- /dev/null +++ b/net-libs/srt/srt-1.5.3.ebuild @@ -0,0 +1,62 @@ +# Copyright 2018-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +DESCRIPTION="Secure Reliable Transport (SRT) library and tools" +HOMEPAGE="https://github.com/Haivision/srt" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/Haivision/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~ppc-macos ~x64-macos" +fi + +LICENSE="MPL-2.0" +SLOT="0/$(ver_cut 1-2)" +IUSE="gnutls test" +RESTRICT="!test? ( test )" + +RDEPEND=" + gnutls? ( + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + net-libs/gnutls:0=[${MULTILIB_USEDEP}] + ) + !gnutls? ( + dev-libs/openssl:0=[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + test? ( >=dev-cpp/gtest-1.10[${MULTILIB_USEDEP}] )" + +src_configure() { + # ODR violations + # https://github.com/Haivision/srt/issues/2145 (bug #861584) + filter-lto + + local mycmakeargs=( + -DUSE_CXX_STD=c++14 # Required for gtest + -DENABLE_STATIC=OFF + # Bonding is experimental in 1.5, but works good and doesn't affect anything when not enabled with API calls + -DENABLE_BONDING=ON + -DENABLE_UNITTESTS=$(usex test) + -DENABLE_TESTING=OFF # Not installed developer/testing tools + -DUSE_GNUTLS=$(usex gnutls) + ) + cmake-multilib_src_configure +} + +multilib_src_test() { + cmake_src_test -j1 +} + +multilib_src_install() { + cmake_src_install + # remove old upstream temporary compatibility pc + rm "${ED}/usr/$(get_libdir)/pkgconfig/haisrt.pc" || die +} diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild deleted file mode 100644 index 31de6038b93b..000000000000 --- a/net-libs/srt/srt-9999.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2018-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib - -DESCRIPTION="Secure Reliable Transport (SRT) library and tools" -HOMEPAGE="https://github.com/Haivision/srt" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/Haivision/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos" -fi - -LICENSE="MPL-2.0" -SLOT="0" -IUSE="gnutls test" - -RDEPEND=" - gnutls? ( - dev-libs/nettle:0=[${MULTILIB_USEDEP}] - net-libs/gnutls:0=[${MULTILIB_USEDEP}] - ) - !gnutls? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-always-GNUInstallDirs.patch" -) - -src_prepare() { - cmake_src_prepare - sed -i -e "s:hcrypt_ut.c::" haicrypt/*.maf || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_STATIC=OFF - -DUSE_GNUTLS=$(usex gnutls) - -DENABLE_UNITTESTS=$(usex test) - ) - cmake-multilib_src_configure -} diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest index 1a541ce1a82c..8e45a8395e6e 100644 --- a/net-libs/stem/Manifest +++ b/net-libs/stem/Manifest @@ -1 +1,2 @@ -DIST stem-1.8.0.tar.gz 2853802 BLAKE2B a275a38e53c5a4a3771a30528fd5781c51370352dd384a77ce27b31f034bece6fef448d74008adb82d2d909104b7338b5168a1a343c799637f9e12d39028bd09 SHA512 aa2033567b79aef960f8321e4c6cbc28105c59d6513ff49a9f12509d8f97b1a2e8a3b04dc28abb07fad59b0f6ba66443b92bbefa0d08b26038bbaf24f7f2846d +DIST stem-1.8.1.tar.gz 2859634 BLAKE2B f78da079791583a17eb439a4e2459c7e0af454e45300202df1085d1b1ba150ee097cfa1b93df5ad0d7090644fad6e035604382c73b94744076cad490ab52459a SHA512 bad2f4f96e37caa3ee2928bb027318c4941ca3f6c0072c5f6e87fe647d2b68400ad352d9c27fa2a35c00f4f327aa9cc00e2907b21a9cbd26fab46ec21e2a038a +DIST stem-1.8.2.tar.gz 2859640 BLAKE2B 4539fc42a463cd1c2ebba10bb31a69d529c41cdaee623beebd3219a2c1d59f8f9b8242b537dd4244e666fb765c5af2729caeeb22a7f8cd1ca6c13dd3cf6aac93 SHA512 f054bbc9a61e04fb7e3b7d1534803b938b855c29795471953661f8fd9c0a5196fe1f9ccfd01e5b3256ea42893a7d57fda34fa54932012e345f74bb3303ff98c5 diff --git a/net-libs/stem/files/1.8.0-replace-all-usages-of-inspect.getargspec.patch b/net-libs/stem/files/1.8.0-replace-all-usages-of-inspect.getargspec.patch new file mode 100644 index 000000000000..608fe5f5224f --- /dev/null +++ b/net-libs/stem/files/1.8.0-replace-all-usages-of-inspect.getargspec.patch @@ -0,0 +1,53 @@ +From 6497514ea89ba44d404b661d495a8cd2649ac628 Mon Sep 17 00:00:00 2001 +From: Juan Orti Alcaine <jortialc@redhat.com> +Date: Fri, 1 Jul 2022 09:40:41 +0200 +Subject: [PATCH] Replace all usages of inspect.getargspec + +--- + stem/control.py | 2 +- + stem/prereq.py | 2 +- + stem/util/conf.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/stem/control.py b/stem/control.py +index 42736486..3b29898d 100644 +--- a/stem/control.py ++++ b/stem/control.py +@@ -474,7 +474,7 @@ def with_default(yields = False): + + def decorator(func): + def get_default(func, args, kwargs): +- arg_names = inspect.getargspec(func).args[1:] # drop 'self' ++ arg_names = inspect.getfullargspec(func).args[1:] # drop 'self' + default_position = arg_names.index('default') if 'default' in arg_names else None + + if default_position is not None and default_position < len(args): +diff --git a/stem/prereq.py b/stem/prereq.py +index 4af6c093..4009c317 100644 +--- a/stem/prereq.py ++++ b/stem/prereq.py +@@ -241,7 +241,7 @@ def is_mock_available(): + + # check for mock's new_callable argument for patch() which was introduced in version 0.8.0 + +- if 'new_callable' not in inspect.getargspec(mock.patch).args: ++ if 'new_callable' not in inspect.getfullargspec(mock.patch).args: + raise ImportError() + + return True +diff --git a/stem/util/conf.py b/stem/util/conf.py +index 80399810..15c4db8b 100644 +--- a/stem/util/conf.py ++++ b/stem/util/conf.py +@@ -285,7 +285,7 @@ def uses_settings(handle, path, lazy_load = True): + config.load(path) + config._settings_loaded = True + +- if 'config' in inspect.getargspec(func).args: ++ if 'config' in inspect.getfullargspec(func).args: + return func(*args, config = config, **kwargs) + else: + return func(*args, **kwargs) +-- +2.36.1 + diff --git a/net-libs/stem/files/1.8.1-Add-an-exclude-test-argument.patch b/net-libs/stem/files/1.8.1-Add-an-exclude-test-argument.patch new file mode 100644 index 000000000000..88d5e48ccb74 --- /dev/null +++ b/net-libs/stem/files/1.8.1-Add-an-exclude-test-argument.patch @@ -0,0 +1,219 @@ +From e24fe02265186b1649e3813a51eff11cd2e1cc21 Mon Sep 17 00:00:00 2001 +From: Damian Johnson <atagar@torproject.org> +Date: Thu, 30 Jan 2020 15:49:36 -0800 +Subject: [PATCH] Add an --exclude-test argument + +Implementing a great suggestion from teor for an --exclude-test argument... + + https://github.com/torproject/stem/issues/53 + +This can be used to skip both modules... + + % run_tests.py --unit --exclude-test interpreter.commands + [ runs all the tests except the interpreter.commands module ] + +... and individual tests... + + % run_tests.py --unit --test interpreter.commands --exclude-test interpreter.commands.test_events --verbose + [ only runs interpreter.commands tests, but skips test_events ] +--- + run_tests.py | 58 +++++++++++++++++++++++++++++++++++------------ + test/arguments.py | 5 +++- + test/settings.cfg | 7 +++++- + 3 files changed, 54 insertions(+), 16 deletions(-) + +diff --git a/run_tests.py b/run_tests.py +index a3a90d04..490be50b 100755 +--- a/run_tests.py ++++ b/run_tests.py +@@ -7,6 +7,7 @@ Runs unit and integration tests. For usage information run this with '--help'. + """ + + import errno ++import io + import importlib + import logging + import multiprocessing +@@ -115,40 +116,57 @@ def log_traceback(sig, frame): + os._exit(-1) + + +-def get_unit_tests(module_prefixes = None): ++def get_unit_tests(module_prefixes, exclude): + """ + Provides the classes for our unit tests. + + :param list module_prefixes: only provide the test if the module starts with + any of these substrings ++ :param list exclude: test modules explicitly excluded + + :returns: an **iterator** for our unit tests + """ + +- return _get_tests(CONFIG['test.unit_tests'].splitlines(), module_prefixes) ++ return _get_tests(CONFIG['test.unit_tests'].splitlines(), module_prefixes, exclude) + + +-def get_integ_tests(module_prefixes = None): ++def get_integ_tests(module_prefixes, exclude): + """ + Provides the classes for our integration tests. + + :param list module_prefixes: only provide the test if the module starts with + any of these substrings ++ :param list exclude: test modules explicitly excluded + + :returns: an **iterator** for our integration tests + """ + +- return _get_tests(CONFIG['test.integ_tests'].splitlines(), module_prefixes) ++ return _get_tests(CONFIG['test.integ_tests'].splitlines(), module_prefixes, exclude) + + +-def _get_tests(modules, module_prefixes): ++def _get_tests(modules, module_prefixes, exclude): + for import_name in modules: ++ cropped_name = test.arguments.crop_module_name(import_name) ++ cropped_name = cropped_name.rsplit('.', 1)[0] # exclude the class name ++ ++ if exclude: ++ # Check if '--exclude-test' says we should skip this whole module. The ++ # argument can also skip individual tests, but that must be handled ++ # elsewhere. ++ ++ skip = False ++ ++ for exclude_prefix in exclude: ++ if cropped_name.startswith(exclude_prefix): ++ skip = True ++ break ++ ++ if skip: ++ continue ++ + if not module_prefixes: + yield import_name + else: +- cropped_name = test.arguments.crop_module_name(import_name) +- cropped_name = cropped_name.rsplit('.', 1)[0] # exclude the class name +- + for prefix in module_prefixes: + if cropped_name.startswith(prefix): + yield import_name +@@ -277,8 +295,8 @@ def main(): + test.output.print_divider('UNIT TESTS', True) + error_tracker.set_category('UNIT TEST') + +- for test_class in get_unit_tests(args.specific_test): +- run_result = _run_test(args, test_class, output_filters) ++ for test_class in get_unit_tests(args.specific_test, args.exclude_test): ++ run_result = _run_test(args, test_class, args.exclude_test, output_filters) + test.output.print_logging(logging_buffer) + skipped_tests += len(getattr(run_result, 'skipped', [])) + +@@ -296,8 +314,8 @@ def main(): + + println('Running tests...\n', STATUS) + +- for test_class in get_integ_tests(args.specific_test): +- run_result = _run_test(args, test_class, output_filters) ++ for test_class in get_integ_tests(args.specific_test, args.exclude_test): ++ run_result = _run_test(args, test_class, args.exclude_test, output_filters) + test.output.print_logging(logging_buffer) + skipped_tests += len(getattr(run_result, 'skipped', [])) + +@@ -401,7 +419,7 @@ def _print_static_issues(static_check_issues): + println() + + +-def _run_test(args, test_class, output_filters): ++def _run_test(args, test_class, exclude, output_filters): + # When logging to a file we don't have stdout's test delimiters to correlate + # logs with the test that generated them. + +@@ -442,7 +460,19 @@ def _run_test(args, test_class, output_filters): + traceback.print_exc(exc) + return None + +- test_results = StringIO() ++ # check if we should skip any individual tests within this module ++ ++ if exclude: ++ cropped_name = test.arguments.crop_module_name(test_class) ++ cropped_name = cropped_name.rsplit('.', 1)[0] # exclude the class name ++ ++ for prefix in exclude: ++ if prefix.startswith(cropped_name): ++ test_name = prefix.split('.')[-1] ++ ++ suite._tests = list(filter(lambda test: test.id().split('.')[-1] != test_name, suite._tests)) ++ ++ test_results = io.StringIO() + run_result = stem.util.test_tools.TimedTestRunner(test_results, verbosity = 2).run(suite) + + if args.verbose: +diff --git a/test/arguments.py b/test/arguments.py +index a871b4e5..4a31aa48 100644 +--- a/test/arguments.py ++++ b/test/arguments.py +@@ -27,6 +27,7 @@ DEFAULT_ARGS = { + 'run_unit': False, + 'run_integ': False, + 'specific_test': [], ++ 'exclude_test': [], + 'logging_runlevel': None, + 'logging_path': None, + 'tor_path': 'tor', +@@ -38,7 +39,7 @@ DEFAULT_ARGS = { + } + + OPT = 'auit:l:qvh' +-OPT_EXPANDED = ['all', 'unit', 'integ', 'targets=', 'test=', 'log=', 'log-file=', 'tor=', 'quiet', 'verbose', 'help'] ++OPT_EXPANDED = ['all', 'unit', 'integ', 'targets=', 'test=', 'exclude-test=', 'log=', 'log-file=', 'tor=', 'quiet', 'verbose', 'help'] + + + def parse(argv): +@@ -105,6 +106,8 @@ def parse(argv): + args['attribute_targets'] = attribute_targets + elif opt == '--test': + args['specific_test'].append(crop_module_name(arg)) ++ elif opt == '--exclude-test': ++ args['exclude_test'].append(crop_module_name(arg)) + elif opt in ('-l', '--log'): + arg = arg.upper() + +diff --git a/test/settings.cfg b/test/settings.cfg +index 2c18110f..97286543 100644 +--- a/test/settings.cfg ++++ b/test/settings.cfg +@@ -67,7 +67,6 @@ msg.help + | -a, --all runs unit, integ, and style checks (same as '-ui') + | -u, --unit runs unit tests + | -i, --integ runs integration tests +-| --test TEST_NAME only run tests with this in the module name + | + | -t, --target TARGET comma separated list of integ targets (see below) + | --tor PATH custom tor binary to run testing against +@@ -76,6 +75,9 @@ msg.help + | TRACE, DEBUG, INFO, NOTICE, WARN, ERROR + | --log-file PATH logs to this file, otherwise logging is to stdout + | ++| --test TEST_NAME only run this test or or test module ++| --exclude-test TEST_NAME skip this test or test module ++| + | -q, --quiet only present failures + | -v, --verbose provides additional test output + | -h, --help presents this help +@@ -91,6 +93,9 @@ msg.help + | run_tests.py --integ --test test.integ.util + | Only run integration tests for the util modules. + | ++| run_tests.py --unit --test interpreter.commands --exclude-test interpreter.commands.test_events --verbose ++| Only run interpreter.commands tests, but skip test_events. ++| + | Integration targets: + | + +-- +2.39.2 + diff --git a/net-libs/stem/metadata.xml b/net-libs/stem/metadata.xml index 17dfac743651..a7fa412fa301 100644 --- a/net-libs/stem/metadata.xml +++ b/net-libs/stem/metadata.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="pypi">stem</remote-id> + <remote-id type="github">torproject/stem</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/stem/stem-1.8.0-r1.ebuild b/net-libs/stem/stem-1.8.0-r1.ebuild deleted file mode 100644 index 33afc5191683..000000000000 --- a/net-libs/stem/stem-1.8.0-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=(python3_{7,8,9} pypy3) -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 - -DESCRIPTION="Stem is a Python controller library for Tor" -HOMEPAGE="https://stem.torproject.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] - net-vpn/tor ) - dev-python/setuptools[${PYTHON_USEDEP}]" - -RDEPEND="net-vpn/tor" - -DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} ) - -python_prepare_all() { - # Disable failing test - sed -i -e "/test_expand_path/a \ - \ \ \ \ return" test/integ/util/system.py || die - sed -i -e "/test_parsing_with_example/a \ - \ \ \ \ return" test/unit/manual.py || die - sed -i -e "/test_parsing_with_unknown_options/a \ - \ \ \ \ return" test/unit/manual.py || die - sed -i -e "/test_saving_manual/a \ - \ \ \ \ return" test/unit/manual.py || die - sed -i -e "/test_sdist_matches_git/a \ - \ \ \ \ return" test/integ/installation.py || die - sed -i -e "/test_connections_by_ss/a \ - \ \ \ \ return" test/integ/util/connection.py || die - distutils-r1_python_prepare_all -} - -python_test() { - ${PYTHON} run_tests.py --all --target RUN_ALL || die -} diff --git a/net-libs/stem/stem-1.8.1.ebuild b/net-libs/stem/stem-1.8.1.ebuild new file mode 100644 index 000000000000..6cd30508aeaa --- /dev/null +++ b/net-libs/stem/stem-1.8.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} pypy3 ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 pypi + +DESCRIPTION="Stem is a Python controller library for Tor" +HOMEPAGE="https://stem.torproject.org" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-python/pyflakes[${PYTHON_USEDEP}] + net-vpn/tor )" + +RDEPEND="net-vpn/tor" + +DOCS=( docs/{_static,_templates,api,tutorials,{api,change_log,contents,download,faq,index,tutorials}.rst} ) + +src_prepare() { + default + + # https://bugzilla.redhat.com/2021902 + eapply "${FILESDIR}/1.8.0-replace-all-usages-of-inspect.getargspec.patch" + + # https://github.com/torproject/stem/issues/53 + eapply "${FILESDIR}/${PV}-Add-an-exclude-test-argument.patch" + + # https://github.com/torproject/stem/issues/56 + sed -i '/MOCK_VERSION/d' run_tests.py || die +} + +python_test() { + # Disable failing test + ${PYTHON} run_tests.py --all --target RUN_ALL \ + --exclude-test test.integ.installation.TestInstallation.test_install \ + --exclude-test test.integ.util.system.TestSystem.test_expand_path \ + --exclude-test test.integ.control.controller.TestController.test_get_listeners \ + --exclude-test test.integ.control.controller.TestController.test_get_ports \ + --exclude-test test.integ.control.controller.TestController.test_getinfo_freshrelaydescs \ + || die + +} diff --git a/net-libs/stem/stem-1.8.2.ebuild b/net-libs/stem/stem-1.8.2.ebuild new file mode 100644 index 000000000000..029f9e97a8f3 --- /dev/null +++ b/net-libs/stem/stem-1.8.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} pypy3 ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 pypi + +DESCRIPTION="Stem is a Python controller library for Tor" +HOMEPAGE="https://stem.torproject.org" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="net-vpn/tor" +BDEPEND="test? ( net-vpn/tor )" + +DOCS=( docs/{_static,_templates,api,tutorials,{api,change_log,contents,download,faq,index,tutorials}.rst} ) + +PATCHES=( + # https://github.com/torproject/stem/issues/53 + "${FILESDIR}"/1.8.1-Add-an-exclude-test-argument.patch +) + +python_prepare_all() { + # https://github.com/torproject/stem/issues/56 + sed -i '/MOCK_VERSION/d' run_tests.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + local skipped_tests=( + --exclude-test test.integ.installation.TestInstallation.test_install + --exclude-test test.integ.util.system.TestSystem.test_expand_path + --exclude-test test.integ.control.controller.TestController.test_get_listeners + --exclude-test test.integ.control.controller.TestController.test_get_ports + --exclude-test test.integ.control.controller.TestController.test_getinfo_freshrelaydescs + # confused by exception text change for JSON parsing + --exclude-test test.unit.descriptor.collector.TestCollector.test_index_malformed_json + ) + + # We use --unit --integ to avoid the static/style/lint checks. + ${EPYTHON} run_tests.py --verbose --unit --integ "${skipped_tests[@]}" || die "Tests failed with ${EPYTHON}" +} diff --git a/net-libs/telepathy-accounts-signon/Manifest b/net-libs/telepathy-accounts-signon/Manifest deleted file mode 100644 index 3ea2f9b95d5c..000000000000 --- a/net-libs/telepathy-accounts-signon/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST telepathy-accounts-signon-2.1.tar.bz2 15362 BLAKE2B 62919b9dda9514ad554026c733e03fbb272334f72f4c8d5220ba10b7680220f67e696f2a4e0824da8f450ea901dc9a7e8b4628f05b733bd492af69c4d713b43b SHA512 537d5e1da577101514662771de6394c66ae2e3e95189a755432f1c88b61aa493843b2c8eac778b45e281e5a612fbadf2cda8d4ae09c6e2ccebdc3700009096bd diff --git a/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.1.ebuild b/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.1.ebuild deleted file mode 100644 index a22270af9078..000000000000 --- a/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="Mission control plugin for Telepathy to provide IM accounts and authentication" -HOMEPAGE="https://gitlab.com/accounts-sso/telepathy-accounts-signon" -SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm64 ~riscv x86" -IUSE="" - -DEPEND=" - dev-libs/glib:2 - net-im/telepathy-mission-control - net-libs/libaccounts-glib:= - >=net-libs/libsignon-glib-2.0 - net-libs/telepathy-glib -" -RDEPEND="${DEPEND}" diff --git a/net-libs/telepathy-farstream/Manifest b/net-libs/telepathy-farstream/Manifest deleted file mode 100644 index 80639d181f6d..000000000000 --- a/net-libs/telepathy-farstream/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST telepathy-farstream-0.6.2.tar.gz 601409 BLAKE2B 0e130f657fe888e7be732aff2d14782f9b650a004aff1962f0df99f88537a9425acc88764b1945c6fef1e6e53edfafce08c3e1f81530a3703f9c09bc61e6ca2c SHA512 ef9c07df607add411df404f5e2dfbf92afde8387291980e59f9e0b85d6edf0904582f10491316ae01349fe242d44a3579a27663127d5a91cb7b06ad163b6e4a6 diff --git a/net-libs/telepathy-farstream/metadata.xml b/net-libs/telepathy-farstream/metadata.xml deleted file mode 100644 index 7b343b06be8a..000000000000 --- a/net-libs/telepathy-farstream/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild b/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild deleted file mode 100644 index b547deb7fd6f..000000000000 --- a/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Telepathy client library that uses Farstream to handle Call channels" -HOMEPAGE="https://telepathy.freedesktop.org/" -SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/3" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86" -IUSE="examples +introspection" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - >=sys-apps/dbus-0.60 - >=dev-libs/dbus-glib-0.60 - media-libs/gstreamer:1.0[introspection?] - >=net-libs/telepathy-glib-0.21[introspection?] - net-libs/farstream:0.2=[introspection?] - introspection? ( >=dev-libs/gobject-introspection-1.30 ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.17 - virtual/pkgconfig -" - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --disable-Werror \ - $(use_enable introspection) -} - -src_install() { - gnome2_src_install - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.c - insinto /usr/share/doc/${PF}/examples/python - doins examples/python/*.py - fi -} diff --git a/net-libs/telepathy-glib/metadata.xml b/net-libs/telepathy-glib/metadata.xml index f453528b934f..20e37f2a1a53 100644 --- a/net-libs/telepathy-glib/metadata.xml +++ b/net-libs/telepathy-glib/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">telepathy/telepathy-glib</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.2-r1.ebuild index 241006fa8303..5466878f5741 100644 --- a/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild +++ b/net-libs/telepathy-glib/telepathy-glib-0.24.2-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) -VALA_MIN_API_VERSION="0.18" -VALA_USE_DEPEND="vapigen" +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..12} ) inherit gnome2 python-any-r1 vala virtualx @@ -15,11 +14,9 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" - +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="debug +introspection +vala" REQUIRED_USE="vala? ( introspection )" - # Broken for a long time and upstream doesn't care # https://bugs.freedesktop.org/show_bug.cgi?id=63212 RESTRICT="test" @@ -29,29 +26,24 @@ RDEPEND=" >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) " -DEPEND="${RDEPEND} - vala? ( $(vala_depend) ) -" +DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} dev-libs/libxslt dev-util/glib-utils - dev-util/gtk-doc-am + dev-build/gtk-doc-am virtual/pkgconfig + vala? ( $(vala_depend) ) " # See bug 504744 for reference PDEPEND=" net-im/telepathy-mission-control " -src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare -} - src_configure() { + use vala && vala_setup + gnome2_src_configure \ - --disable-static \ --disable-installed-tests \ $(use_enable debug backtrace) \ $(use_enable debug debug-cache) \ diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest deleted file mode 100644 index 4113a5fc50aa..000000000000 --- a/net-libs/telepathy-logger-qt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST telepathy-logger-qt-17.09.0.tar.xz 93480 BLAKE2B f516ff58b64a59ba3b51c0daf0c871fd0e03b7860fa94f2139175cccb3e5ff4f108b09db22366bdc2e4031556ab06712d1d935b8db7b1ed9b08803f047c943c3 SHA512 1524673a7dcba0d65c57e49d6e0dafd1b826b6444faaabc1dc482b29f6515374a1beb09a9bbfb115097e10fc18722ffe0187dc1bff9be06dc56a95ef32d805e3 diff --git a/net-libs/telepathy-logger-qt/metadata.xml b/net-libs/telepathy-logger-qt/metadata.xml deleted file mode 100644 index d925f2439758..000000000000 --- a/net-libs/telepathy-logger-qt/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> - </upstream> -</pkgmetadata> diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild deleted file mode 100644 index ef9772b444ab..000000000000 --- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) -QTMIN=5.12.3 -inherit ecm kde.org python-any-r1 - -DESCRIPTION="Qt bindings for the Telepathy logger" -HOMEPAGE="https://invent.kde.org/network/telepathy-logger-qt" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/telepathy-logger-qt/${PV%.*}/src/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~riscv x86" -fi - -LICENSE="LGPL-2.1" -SLOT="5" -IUSE="" - -BDEPEND="${PYTHON_DEPS}" -DEPEND=" - dev-libs/dbus-glib - dev-libs/glib:2 - dev-libs/libxml2 - >=dev-qt/qtdbus-${QTMIN}:5 - net-im/telepathy-logger - net-libs/telepathy-glib - net-libs/telepathy-qt[qt5(+)] - sys-apps/dbus -" -RDEPEND="${DEPEND}" diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest deleted file mode 100644 index a4f9a110b5d7..000000000000 --- a/net-libs/telepathy-qt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml deleted file mode 100644 index 3a5cd3fd9568..000000000000 --- a/net-libs/telepathy-qt/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>akulichalexander@gmail.com</email> - <name>Alexandr Akulich</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <use> - <flag name="farstream">Enable support for audio/video calls via farstream</flag> - </use> -</pkgmetadata> diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild deleted file mode 100644 index 9f392ed86abb..000000000000 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="xml(+)" -inherit python-any-r1 cmake virtualx - -DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol" -HOMEPAGE="https://telepathy.freedesktop.org/" -SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" -IUSE="debug farstream test" - -REQUIRED_USE="test? ( farstream )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - farstream? ( - >=net-libs/telepathy-farstream-0.2.2 - >=net-libs/telepathy-glib-0.18.0 - ) -" -DEPEND="${RDEPEND} - test? ( - dev-libs/dbus-glib - dev-qt/qttest:5 - ) -" -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig - test? ( - dev-libs/glib:2 - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - ') - ) -" - -python_check_deps() { - use test || return 0 - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DPython3_EXECUTABLE="${PYTHON}" - -DENABLE_DEBUG_OUTPUT=$(usex debug) - -DENABLE_FARSTREAM=$(usex farstream) - -DENABLE_TESTS=$(usex test) - -DENABLE_EXAMPLES=OFF - ) - cmake_src_configure -} - -src_test() { - # some tests require D-Bus, bug #732110 - local myctestargs=( - -E "(BaseConnectionManager|BaseProtocol|StreamTubeHandlers)" - ) - pushd "${BUILD_DIR}" > /dev/null || die - virtx cmake_src_test - popd > /dev/null || die -} diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild deleted file mode 100644 index 4ae1fc73d370..000000000000 --- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="xml(+)" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI=( "https://gitlab.freedesktop.org/telepathy/${PN}" ) - inherit git-r3 -else - SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" -fi -inherit python-any-r1 cmake virtualx - -DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol" -HOMEPAGE="https://telepathy.freedesktop.org/" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="debug farstream test" - -REQUIRED_USE="test? ( farstream )" - -RESTRICT="!test? ( test )" - -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig - test? ( - dev-libs/glib:2 - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - ') - ) -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - farstream? ( - >=net-libs/telepathy-farstream-0.2.2 - >=net-libs/telepathy-glib-0.18.0 - ) -" -DEPEND="${RDEPEND} - test? ( - dev-libs/dbus-glib - dev-qt/qttest:5 - ) -" - -python_check_deps() { - use test || return 0 - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DPython3_EXECUTABLE="${PYTHON}" - -DENABLE_DEBUG_OUTPUT=$(usex debug) - -DENABLE_FARSTREAM=$(usex farstream) - -DENABLE_TESTS=$(usex test) - -DENABLE_EXAMPLES=OFF - ) - cmake_src_configure -} - -src_test() { - # some tests require D-Bus, bug #732110 - local myctestargs=( - -E "(BaseConnectionManager|BaseProtocol|StreamTubeHandlers)" - ) - pushd "${BUILD_DIR}" > /dev/null || die - virtx cmake_src_test - popd > /dev/null || die -} diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest index baec84db1210..2fc1f7467d21 100644 --- a/net-libs/tox/Manifest +++ b/net-libs/tox/Manifest @@ -1,2 +1,2 @@ -DIST c-toxcore-0.2.11.tar.gz 507476 BLAKE2B 67e86a5e5c8da1c387a319e6726eaccec28608f165f0b165d12e379cc7d8080baf9b89f438804ab8e59a8690a11bebba7f2ef689554800312fe039da77e70cac SHA512 616b30423a170463b4445f6940e038fd9af820946c970260fcf72cc54d08d2615364b9f086869180e3ae26154ea92fea6e9a602366306bc40c3e1575e86350df -DIST c-toxcore-0.2.12.tar.gz 504832 BLAKE2B 625713142cc1e4b6583879144c05d47a40a1d98031a8a2bf0deec85a199f816a0ff6df5c76e9487a526d7c1c1650b37a10ed81be8233eaa1395707851378474f SHA512 c22f139cfff3a5aedf5fb08c33cae0dae3d6fbceec87867c81290e3bf9d2e13466a0e2bad8378a7a7ba1e9b7b9ad756712963461ae248102e4cab7d4691228d8 +DIST c-toxcore-0.2.13.tar.gz 511533 BLAKE2B 8c68180710e3d06eaaef9fc05dc0ff2492907586934d1d6f57f147e07bb78b262f78b0057911e4b5cd27d2d1efb51cb714f757b90caa269988e604cafa62cd00 SHA512 f4ed9ea4afb7f9c14a5afd949f3a52e7880838c910acaf5adc39acb09ad574406be08f43b76a9fbdd4fc4bd14f0d73212dc7bd10783565055c910c6c3e5e357a +DIST c-toxcore-0.2.18.tar.gz 653247 BLAKE2B c27da02753aede5056c42e5bf1949920fc30e98a23c058ab445c2fe345271e442885a3eeb011e8fde16d8fc8451376a015c5f821145785c75e7d0dda3a8b72eb SHA512 e9b0d73a2e0460290c8453a0a64fc91deed2e0cf87f945d0ba203b929f19a296571d7140f4df89b06f7e67f2b61894460ce4dd32ab9ecf6ea7d5b67538fadb23 diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml index fa963f9331e6..434e886648f5 100644 --- a/net-libs/tox/metadata.xml +++ b/net-libs/tox/metadata.xml @@ -12,6 +12,7 @@ <use> <flag name="av">Adds support for audio and video.</flag> <flag name="dht-node">Enables DHT Bootstrap Node.</flag> + <flag name="key-utils">Builds utilities to create custom keys and profiles</flag> <flag name="log-error">Log level: 1</flag> <flag name="log-warn">Log level: 2</flag> <flag name="log-info">Log level: 3</flag> diff --git a/net-libs/tox/tox-0.2.12-r1.ebuild b/net-libs/tox/tox-0.2.13-r1.ebuild index 62cb752a4e22..cabfe0645e38 100644 --- a/net-libs/tox/tox-0.2.12-r1.ebuild +++ b/net-libs/tox/tox-0.2.13-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake systemd @@ -13,7 +13,7 @@ SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.ta LICENSE="GPL-3+" SLOT="0/0.2" KEYWORDS="amd64 ~arm x86" -IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test" +IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn test" REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn ) daemon? ( dht-node )" @@ -21,7 +21,7 @@ RESTRICT="!test? ( test )" BDEPEND="virtual/pkgconfig" DEPEND=" - >dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal] + dev-libs/libsodium:=[asm,urandom,-minimal(-)] av? ( media-libs/libvpx:= media-libs/opus @@ -39,29 +39,28 @@ S="${WORKDIR}/${MY_P}" src_prepare() { cmake_src_prepare - # Remove faulty tests - local testname= - for testname in lan_discovery save_compatibility; do + #Remove faulty tests + for testname in lan_discovery save_compatibility set_status_message; do sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die done } src_configure() { local mycmakeargs=( - -DAUTOTEST=$(usex test) - -DBOOTSTRAP_DAEMON=$(usex daemon) - -DBUILD_MISC_TESTS=$(usex test) - -DBUILD_TOXAV=$(usex av) - -DDHT_BOOTSTRAP=$(usex dht-node) + -DAUTOTEST=$(usex test ON OFF) + -DBOOTSTRAP_DAEMON=$(usex daemon ON OFF) + -DBUILD_MISC_TESTS=$(usex test ON OFF) + -DBUILD_TOXAV=$(usex av ON OFF) + -DDHT_BOOTSTRAP=$(usex dht-node ON OFF) -DENABLE_SHARED=ON - -DENABLE_STATIC=$(usex static-libs) - -DMUST_BUILD_TOXAV=$(usex av) + -DENABLE_STATIC=OFF + -DMUST_BUILD_TOXAV=$(usex av ON OFF) ) if use test; then mycmakeargs+=( - -DTEST_TIMEOUT_SECONDS=120 - -DUSE_IPV6=$(usex ipv6) + -DTEST_TIMEOUT_SECONDS=150 + -DUSE_IPV6=$(usex ipv6 ON OFF) ) else mycmakeargs+=(-DUSE_IPV6=OFF) diff --git a/net-libs/tox/tox-0.2.11-r1.ebuild b/net-libs/tox/tox-0.2.18-r3.ebuild index e508bc927f6d..4cc9474eb842 100644 --- a/net-libs/tox/tox-0.2.11-r1.ebuild +++ b/net-libs/tox/tox-0.2.18-r3.ebuild @@ -1,63 +1,72 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake systemd MY_P="c-toxcore-${PV}" +S="${WORKDIR}/${MY_P}" + DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" -HOMEPAGE="https://tox.chat" -SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" +HOMEPAGE="https://tox.chat https://github.com/TokTok/c-toxcore" +SRC_URI="https://github.com/TokTok/c-toxcore/releases/download/v${PV}/${MY_P}.tar.gz" LICENSE="GPL-3+" SLOT="0/0.2" -KEYWORDS="amd64 ~arm x86" -IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+av debug daemon dht-node ipv6 key-utils log-debug +log-error log-info log-trace log-warn test" REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn ) daemon? ( dht-node )" RESTRICT="!test? ( test )" BDEPEND="virtual/pkgconfig" -DEPEND=" - >dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal] +DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal(-)] av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig:= )" -RDEPEND=" - ${DEPEND} + +RDEPEND="${DEPEND} daemon? ( acct-group/tox acct-user/tox - )" - -S="${WORKDIR}/${MY_P}" + ) + key-utils? ( || ( sys-devel/gcc[openmp] sys-devel/clang-runtime[openmp] ) )" src_prepare() { cmake_src_prepare - #remove faulty tests - for testname in bootstrap lan_discovery save_compatibility; do - sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die + + #Remove faulty tests + for testname in lan_discovery save_load; do + sed -i -e "/^auto_test(${testname})$/d" ./auto_tests/CMakeLists.txt || die done } src_configure() { local mycmakeargs=( - -DAUTOTEST=$(usex test) - -DBOOTSTRAP_DAEMON=$(usex daemon) - -DBUILD_MISC_TESTS=$(usex test) - -DBUILD_TOXAV=$(usex av) - -DDHT_BOOTSTRAP=$(usex dht-node) + -DAUTOTEST=$(usex test ON OFF) + -DBOOTSTRAP_DAEMON=$(usex daemon ON OFF) + -DBUILD_FUN_UTILS=$(usex key-utils ON OFF) + -DBUILD_FUZZ_TESTS=OFF #Upstream reports that this breaks all other tests + -DBUILD_MISC_TESTS=$(usex test ON OFF) + -DBUILD_TOXAV=$(usex av ON OFF) + -DCMAKE_BUILD_TYPE=$(usex debug Debug Release) + -DDHT_BOOTSTRAP=$(usex dht-node ON OFF) -DENABLE_SHARED=ON - -DENABLE_STATIC=$(usex static-libs) - -DMUST_BUILD_TOXAV=$(usex av)) + -DENABLE_STATIC=OFF + -DFULLY_STATIC=OFF + -DMUST_BUILD_TOXAV=$(usex av ON OFF) + ) + if use test; then mycmakeargs+=( - -DTEST_TIMEOUT_SECONDS=120 - -DUSE_IPV6=$(usex ipv6)) + -DTEST_TIMEOUT_SECONDS=150 + -DNON_HERMETIC_TESTS=OFF + -DUSE_IPV6=$(usex ipv6 ON OFF) + ) else mycmakeargs+=(-DUSE_IPV6=OFF) fi @@ -99,21 +108,12 @@ src_install() { pkg_postinst() { if use dht-node; then ewarn "The QA notice regarding libmisc_tools.so is known by the upstream" - ewarn "developers and is on their TODO list." + ewarn "developers and is on their TODO list. For more information," + ewarn "please see 'https://github.com/toktok/c-toxcore/issues/1144'" ewarn "" ewarn "There is currently an unresolved issue with tox DHT Bootstrap node" ewarn "that causes the program to be built with a null library reference." ewarn "This causes an infinite loop for certain revdep-rebuild commands." ewarn "If you aren't running a node, please consider disabling the dht-node use flag." fi - if use daemon; then - if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then - ewarn "Backwards compatability with the bootstrap daemon might have been" - ewarn "broken a while ago. To resolve this issue, REMOVE the following files:" - ewarn " ${EROOT}/var/lib/tox-dht-bootstrap/key" - ewarn " ${EROOT}/etc/tox-bootstrapd.conf" - ewarn " ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid" - ewarn "Then just re-emerge net-libs/tox" - fi - fi } diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild index e80ab4531665..e8d52a959406 100644 --- a/net-libs/tox/tox-9999.ebuild +++ b/net-libs/tox/tox-9999.ebuild @@ -1,65 +1,76 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake git-r3 systemd +inherit cmake systemd DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" -HOMEPAGE="https://tox.chat" -SRC_URI="" -EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git" +HOMEPAGE="https://tox.chat https://github.com/TokTok/c-toxcore" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git" +else + MY_P="c-toxcore-${PV}" + SRC_URI="https://github.com/TokTok/c-toxcore/releases/download/v${PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" + S="${WORKDIR}/${MY_P}" +fi LICENSE="GPL-3+" SLOT="0/0.2" -KEYWORDS="" -IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test" -RESTRICT="!test? ( test )" +IUSE="+av debug daemon dht-node ipv6 key-utils log-debug +log-error log-info log-trace log-warn test" -REQUIRED_USE="^^ ( log-debug log-error log-info log-trace log-warn ) +REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn ) daemon? ( dht-node )" +RESTRICT="!test? ( test )" BDEPEND="virtual/pkgconfig" -DEPEND=">dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal] +DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal(-)] av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig:= )" -RDEPEND=" - ${DEPEND} + +RDEPEND="${DEPEND} daemon? ( acct-group/tox acct-user/tox - )" + ) + key-utils? ( || ( sys-devel/gcc[openmp] sys-devel/clang-runtime[openmp] ) )" src_prepare() { cmake_src_prepare - # Remove faulty tests - local faultytest=(lan_discovery save_compatibility) - local testname= - for testname in "${faultytest[@]}"; do - sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die + #Remove faulty tests + for testname in lan_discovery save_load; do + sed -i -e "/^auto_test(${testname})$/d" ./auto_tests/CMakeLists.txt || die done } src_configure() { local mycmakeargs=( - -DAUTOTEST=$(usex test) - -DBOOTSTRAP_DAEMON=$(usex daemon) - -DBUILD_MISC_TESTS=$(usex test) - -DBUILD_TOXAV=$(usex av) - -DDHT_BOOTSTRAP=$(usex dht-node) + -DAUTOTEST=$(usex test ON OFF) + -DBOOTSTRAP_DAEMON=$(usex daemon ON OFF) + -DBUILD_FUN_UTILS=$(usex key-utils ON OFF) + -DBUILD_FUZZ_TESTS=OFF #Upstream reports that this breaks all other tests + -DBUILD_MISC_TESTS=$(usex test ON OFF) + -DBUILD_TOXAV=$(usex av ON OFF) + -DCMAKE_BUILD_TYPE=$(usex debug Debug Release) + -DDHT_BOOTSTRAP=$(usex dht-node ON OFF) -DENABLE_SHARED=ON - -DENABLE_STATIC=$(usex static-libs) - -DMUST_BUILD_TOXAV=$(usex av) + -DENABLE_STATIC=OFF + -DFULLY_STATIC=OFF + -DMUST_BUILD_TOXAV=$(usex av ON OFF) ) if use test; then mycmakeargs+=( - -DTEST_TIMEOUT_SECONDS=120 - -DUSE_IPV6=$(usex ipv6) + -DTEST_TIMEOUT_SECONDS=150 + -DNON_HERMETIC_TESTS=OFF + -DUSE_IPV6=$(usex ipv6 ON OFF) ) else mycmakeargs+=(-DUSE_IPV6=OFF) @@ -77,8 +88,9 @@ src_configure() { mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR") else mycmakeargs+=(-DMIN_LOGGER_LEVEL="") - einfo "Logging Disabled" + einfo "Logging disabled" fi + cmake_src_configure } @@ -100,12 +112,13 @@ src_install() { pkg_postinst() { if use dht-node; then - ewarn "There is currently an unresolved issuer with tox DHT" - ewarn "Bootstrap node that causes the program to be built" - ewarn "with a null libray reference. This causes an infinite" - ewarn "loop for certain revdep-rebuild commands. If you aren't" - ewarn "running a node, please consider disabling the dht node" - ewarn "use flag. For more information please refer to" - ewarn "https://github.com/toktok/c-toxcore/issues/1144" + ewarn "The QA notice regarding libmisc_tools.so is known by the upstream" + ewarn "developers and is on their TODO list. For more information," + ewarn "please see 'https://github.com/toktok/c-toxcore/issues/1144'" + ewarn "" + ewarn "There is currently an unresolved issue with tox DHT Bootstrap node" + ewarn "that causes the program to be built with a null library reference." + ewarn "This causes an infinite loop for certain revdep-rebuild commands." + ewarn "If you aren't running a node, please consider disabling the dht-node use flag." fi } diff --git a/net-libs/tox_extension_messages/Manifest b/net-libs/tox_extension_messages/Manifest index 4c83be7f1394..cdbe5d34dc6b 100644 --- a/net-libs/tox_extension_messages/Manifest +++ b/net-libs/tox_extension_messages/Manifest @@ -1 +1 @@ -DIST tox_extension_messages-0.0.2.tar.gz 21822 BLAKE2B 23c4be3e001420db7ada0208174a667f213e43fc492bd09cc896eba6bd7e0d1fe929f6f4e191e5680901793df561421dd95ebb9804efc1d55bce98483321a077 SHA512 973dd569151fcabee2d31d793fd0a229f71edcddf7470f891b88f0a47e4fc4bc0f9daeb02d37918b5e44ad51e4b4241b8e4723ec9261710dd9a33b37b5e2e065 +DIST tox_extension_messages-0.0.3.tar.gz 21906 BLAKE2B db04941ce65cf33b6c65571cf7878178842241156342c32faaa6b3b086535eb38e11b8504a6f7b87593915552726d7674471e19c20a41d74d9ee751c40f9dba3 SHA512 71da6b1850d7775db9514ee1e13805e02ef4cae5399369f1e644180c5672c2d1faf7584cd939ea002d7315b36d16233a26697dbefe74bb476c70108db01ea2d9 diff --git a/net-libs/tox_extension_messages/metadata.xml b/net-libs/tox_extension_messages/metadata.xml index 92855b87739b..8f809d65df18 100644 --- a/net-libs/tox_extension_messages/metadata.xml +++ b/net-libs/tox_extension_messages/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> + <maintainer type="person"> <email>chiitoo@gentoo.org</email> <name>Jimi Huotari</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <remote-id type="github">toxext/tox_extension_messages</remote-id> </upstream> diff --git a/net-libs/tox_extension_messages/tox_extension_messages-0.0.2.ebuild b/net-libs/tox_extension_messages/tox_extension_messages-0.0.3.ebuild index 42ade66e6989..ddbba22fc4b2 100644 --- a/net-libs/tox_extension_messages/tox_extension_messages-0.0.2.ebuild +++ b/net-libs/tox_extension_messages/tox_extension_messages-0.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/net-libs/toxext/Manifest b/net-libs/toxext/Manifest index f4320a9b33d3..be5b651116c0 100644 --- a/net-libs/toxext/Manifest +++ b/net-libs/toxext/Manifest @@ -1 +1 @@ -DIST toxext-0.0.2.tar.gz 34178 BLAKE2B 477a8f70e5b11c2e9d03b8b10adf83f36b95f0c31661cc042d4ab74ee3b6bdc7ed86ab678d0901c0ec6a2466fa698e6423044663d8b6d3b137eee52c2256bc75 SHA512 2e8c326715e5730b0315dbb309d4f6a6965049203579cb500fcac5cf5bd1124f98a8e1ada68e9a65ee572981ae417cb32aa7e99932fedc393da43e2e42f7f6d3 +DIST toxext-0.0.3.tar.gz 34759 BLAKE2B b33c06bd982888415637a5c823889c74090b7719a03f3e41667ed136e40f87876956f2cb5abb95a53fa1d6a03951fb1fd9f32b8bbe83b03f33fa6f87ab338f67 SHA512 34612e789fb928f9dc79181a61126e3f781ef134d3b5cad2b48c17f1fc3521f0fb6713b0e42e73a789e3eb9b1a566f2d4cbd38a9b26f8f9f6015890be045e4ed diff --git a/net-libs/toxext/metadata.xml b/net-libs/toxext/metadata.xml index a85638b0e187..0499d4109862 100644 --- a/net-libs/toxext/metadata.xml +++ b/net-libs/toxext/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> + <maintainer type="person"> <email>chiitoo@gentoo.org</email> <name>Jimi Huotari</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <remote-id type="github">toxext/toxext</remote-id> </upstream> diff --git a/net-libs/toxext/toxext-0.0.2.ebuild b/net-libs/toxext/toxext-0.0.3.ebuild index 356610149149..ec77c5f446fc 100644 --- a/net-libs/toxext/toxext-0.0.2.ebuild +++ b/net-libs/toxext/toxext-0.0.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Extension Library for Tox" HOMEPAGE="https://github.com/toxext/toxext" @@ -21,4 +21,9 @@ src_prepare() { cmake_src_prepare sed -i 's/-Werror//' CMakeLists.txt || die + sed -i '/-fsanitize=/d' test/CMakeLists.txt || die + + # Fix build with clang and lld. + # https://bugs.gentoo.org/831338 + append-flags -fPIC } diff --git a/net-libs/udns/files/udns-0.4-configure-c99.patch b/net-libs/udns/files/udns-0.4-configure-c99.patch new file mode 100644 index 000000000000..cedf073fe0ff --- /dev/null +++ b/net-libs/udns/files/udns-0.4-configure-c99.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/874759 +https://bugs.gentoo.org/883285 +https://bugs.gentoo.org/919260 +https://src.fedoraproject.org/rpms/udns/c/27e7b66faa416c13b113e895c204373596282c37?branch=rawhide + +Provide autoconf-style fake prototype for socket to avoid implicit +function declarations. Otherwise the check will always fail with soem +C99 compilers. + +Avoid incorrect pointer types and a pointer-to-int conversion with +inet_pton and inet_ntop. + +--- a/configure ++++ b/configure +@@ -75,6 +75,7 @@ int main(int argc, char **argv) { + EOF + + if ac_library_find_v 'socket and connect' "" "-lsocket -lnsl" <<EOF ++char socket(void); char connect(void); + int main() { socket(); connect(); return 0; } + EOF + then : +@@ -92,8 +93,8 @@ ac_ign \ + int main() { + char buf[64]; + long x = 0; +- inet_pton(AF_INET, &x, buf); +- return inet_ntop(AF_INET, &x, buf, sizeof(buf)); ++ inet_pton(AF_INET, (void *) &x, buf); ++ return inet_ntop(AF_INET, (void *) &x, buf, sizeof(buf)) != 0; + } + EOF + diff --git a/net-libs/udns/files/udns-0.4-configure-clang16.patch b/net-libs/udns/files/udns-0.4-configure-clang16.patch new file mode 100644 index 000000000000..6b2dcda26ca0 --- /dev/null +++ b/net-libs/udns/files/udns-0.4-configure-clang16.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/874759 +--- a/configure ++++ b/configure +@@ -65,9 +65,9 @@ ac_prog_ranlib_v + + ac_ign ac_yesno "for getopt()" ac_have GETOPT ac_link <<EOF + #include <stdio.h> ++#include <unistd.h> + extern int optind; + extern char *optarg; +-extern int getopt(int, char **, char *); + int main(int argc, char **argv) { + getopt(argc, argv, "abc"); + return optarg ? optind : 0; +@@ -75,7 +75,8 @@ int main(int argc, char **argv) { + EOF + + if ac_library_find_v 'socket and connect' "" "-lsocket -lnsl" <<EOF +-int main() { socket(); connect(); return 0; } ++#include <sys/socket.h> ++int main() { socket(0, 0, 0); connect(0, 0, 0); return 0; } + EOF + then : + else diff --git a/net-libs/udns/files/udns-0.4-configure-pton-ntop-clang16.patch b/net-libs/udns/files/udns-0.4-configure-pton-ntop-clang16.patch new file mode 100644 index 000000000000..5eb0010092a8 --- /dev/null +++ b/net-libs/udns/files/udns-0.4-configure-pton-ntop-clang16.patch @@ -0,0 +1,22 @@ +Bug: https://bugs.gentoo.org/883285 + +From e39b749619191226ccbf8730084c0d2dcadc9065 Mon Sep 17 00:00:00 2001 +From: Violet Purcell <vimproved@inventati.org> +Date: Sat, 8 Jul 2023 18:34:11 +0000 +Subject: [PATCH] Fix detection of dns_pton and dns_ntop with clang 16 + +--- a/configure ++++ b/configure +@@ -94,7 +94,8 @@ int main() { + char buf[64]; + long x = 0; + inet_pton(AF_INET, &x, buf); +- return inet_ntop(AF_INET, &x, buf, sizeof(buf)); ++ inet_ntop(AF_INET, &x, buf, sizeof(buf)); ++ return 0; + } + EOF + +-- +2.41.0 + diff --git a/net-libs/udns/udns-0.4-r2.ebuild b/net-libs/udns/udns-0.4-r2.ebuild new file mode 100644 index 000000000000..a963d2ac18b4 --- /dev/null +++ b/net-libs/udns/udns-0.4-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +DESCRIPTION="Async-capable DNS stub resolver library" +HOMEPAGE="http://www.corpit.ru/mjt/udns.html" +SRC_URI="http://www.corpit.ru/mjt/udns/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86" +IUSE="ipv6 static +tools" + +PATCHES=( + "${FILESDIR}"/${PN}-0.4-configure-clang16.patch + "${FILESDIR}"/${PN}-0.4-configure-pton-ntop-clang16.patch +) + +src_configure() { + # Uses non-standard configure script, econf doesn't work + CC="$(tc-getCC)" edo ./configure $(use_enable ipv6) +} + +src_compile() { + emake $(usex tools shared sharedlib) +} + +src_install() { + dolib.so libudns.so.0 + dosym libudns.so.0 /usr/$(get_libdir)/libudns.so + + if use tools; then + newbin dnsget_s dnsget + newbin ex-rdns_s ex-rdns + newbin rblcheck_s rblcheck + fi + + doheader udns.h + + doman udns.3 + use tools && doman dnsget.1 rblcheck.1 + + dodoc NEWS NOTES TODO +} diff --git a/net-libs/udns/udns-0.4.ebuild b/net-libs/udns/udns-0.4-r3.ebuild index 0953628925ed..76ee1d6bd4c5 100644 --- a/net-libs/udns/udns-0.4.ebuild +++ b/net-libs/udns/udns-0.4-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs +inherit edo toolchain-funcs DESCRIPTION="Async-capable DNS stub resolver library" HOMEPAGE="http://www.corpit.ru/mjt/udns.html" @@ -11,12 +11,16 @@ SRC_URI="http://www.corpit.ru/mjt/udns/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="ipv6 static +tools" +PATCHES=( + "${FILESDIR}"/${PN}-0.4-configure-c99.patch +) + src_configure() { # Uses non-standard configure script, econf doesn't work - CC=$(tc-getCC) ./configure $(use_enable ipv6) || die "Configure failed" + CC="$(tc-getCC)" edo ./configure $(use_enable ipv6) } src_compile() { diff --git a/net-libs/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest index 883e07b670ad..685594a8c641 100644 --- a/net-libs/uhttpmock/Manifest +++ b/net-libs/uhttpmock/Manifest @@ -1 +1,2 @@ -DIST uhttpmock-0.5.3.tar.xz 318708 BLAKE2B 7bd257fbc8869ce2d55070bc1f84f0d34c999cd55ba5e09a54031ea391c3c65bb149d48f2ab1ab9de93acac98783ad0e7d5fca4d86dda055d4a5a3407f5ba4ee SHA512 9fccdb58ce04c1615d47bafac275c632f161a8148f0af82447286d0017d6b3946145b8a289f9abb55842bf4610ca3e5f2484bf322fb7a33dce42b3ebed45b2ee +DIST uhttpmock-0.5.5.tar.bz2 47013 BLAKE2B 1b59801c13909525e05ec88f5ccfde1606cf427fc41896b14411344281046148bbe652162726aa643610bda447d04c64041a292b46838a3b98b849d670ce6909 SHA512 0fa6e03095c7b66ebd02736b95222b66e1232e5854839a352ee2ec59822ab027bdcf6c871b23433da46725a9807232b0b6bdd0c4cb8a59a23604787acd3d5f0f +DIST uhttpmock-0.9.0.tar.bz2 48659 BLAKE2B 02eb787e2bf778a107088b0361fd9efb9e68be16c1c9db656fb9692cbedf5bd0012c085c753a5c2f26317afd7d963c9c79d668836872b583890a4437a5c43930 SHA512 5f238b6aee339608000c2b1fb62a62197935555842d335517beb57319f427a618166c29ce67d929199af94ecc5de1a4a0641d049fecc66dcd9b49a5c539fbbf1 diff --git a/net-libs/uhttpmock/metadata.xml b/net-libs/uhttpmock/metadata.xml index 7b343b06be8a..1b875c540402 100644 --- a/net-libs/uhttpmock/metadata.xml +++ b/net-libs/uhttpmock/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">pwithnall/uhttpmock</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild deleted file mode 100644 index 7526fe4fd04d..000000000000 --- a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit gnome2 vala - -DESCRIPTION="HTTP web service mocking library" -HOMEPAGE="https://gitlab.com/uhttpmock/uhttpmock" -SRC_URI="https://tecnocode.co.uk/downloads/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="debug +introspection vala" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" - -RDEPEND=" - >=dev-libs/glib-2.38.0:2 - >=net-libs/libsoup-2.37.91:2.4 - introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) -" -DEPEND="${RDEPEND} - vala? ( $(vala_depend) ) -" -BDEPEND=" - >=dev-util/gtk-doc-am-1.14 - virtual/pkgconfig -" - -src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - $(use_enable debug) \ - $(use_enable introspection) \ - $(use_enable vala) -} diff --git a/net-libs/uhttpmock/uhttpmock-0.5.5-r1.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.5-r1.ebuild new file mode 100644 index 000000000000..b35a96965a64 --- /dev/null +++ b/net-libs/uhttpmock/uhttpmock-0.5.5-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson vala + +DESCRIPTION="HTTP web service mocking library" +HOMEPAGE="https://gitlab.freedesktop.org/pwithnall/uhttpmock" +SRC_URI="https://gitlab.freedesktop.org/pwithnall/${PN}/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +IUSE="gtk-doc +introspection vala" +REQUIRED_USE="vala? ( introspection )" + +RDEPEND=" + >=dev-libs/glib-2.38.0:2 + >=net-libs/libsoup-2.47.3:2.4 + introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-build/gtk-doc-am-1.14 + virtual/pkgconfig + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.3 + ) + vala? ( $(vala_depend) ) +" + +src_configure() { + use vala && vala_setup + + local emesonargs=( + $(meson_use introspection) + $(meson_feature vala vapi) + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} diff --git a/net-libs/uhttpmock/uhttpmock-0.9.0.ebuild b/net-libs/uhttpmock/uhttpmock-0.9.0.ebuild new file mode 100644 index 000000000000..28651001ebc6 --- /dev/null +++ b/net-libs/uhttpmock/uhttpmock-0.9.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson vala + +DESCRIPTION="HTTP web service mocking library" +HOMEPAGE="https://gitlab.freedesktop.org/pwithnall/uhttpmock" +SRC_URI="https://gitlab.freedesktop.org/pwithnall/${PN}/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2+" +SLOT="1.0" + +IUSE="gtk-doc +introspection vala" +REQUIRED_USE="vala? ( introspection )" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" + +RDEPEND=" + >=dev-libs/glib-2.38.0:2 + >=net-libs/libsoup-3.1.2:3.0 + introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.3 + ) + vala? ( $(vala_depend) ) + virtual/pkgconfig +" + +src_prepare() { + default + use vala && vala_setup +} + +src_configure() { + local emesonargs=( + $(meson_use introspection) + $(meson_feature vala vapi) + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} diff --git a/net-libs/usrsctp/Manifest b/net-libs/usrsctp/Manifest index 53b044995133..a2ef0fa4495a 100644 --- a/net-libs/usrsctp/Manifest +++ b/net-libs/usrsctp/Manifest @@ -1,2 +1 @@ -DIST usrsctp-0.9.3.0_p20201102.tar.gz 770742 BLAKE2B 94c7b0417a076d627065c625726eb214ec58be90d0965748610f63c076f1c172cb114dc8162af5604751cfe5e86ebf5444f002d07e43c94e461e21f6a3a4819a SHA512 a4bb4dd0ec81b2314e8590cfe5386179697e64d82915a0ef7e8f7a0baf67f88e3da89329ea73b38e8c417668f971f6580e120ed5be8588761b4b334a65ab4120 DIST usrsctp-0.9.5.0.tar.gz 771701 BLAKE2B 279394aecea61795360db3b57140c55dc2801f55471fb97754e054ccd5d99c87e17dc637cdcb347be258034175b96efbc18d75a114f47e1957cacef897822df3 SHA512 7b28706449f9365ba9750fd39925e7171516a1e3145d123ec69a12486637ae2393ad4c587b056403298dc13c149f0b01a262cbe4852abca42e425d7680c77ee3 diff --git a/net-libs/usrsctp/usrsctp-0.9.3.0_p20201102.ebuild b/net-libs/usrsctp/usrsctp-0.9.3.0_p20201102.ebuild deleted file mode 100644 index 3f61a85db62a..000000000000 --- a/net-libs/usrsctp/usrsctp-0.9.3.0_p20201102.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A cross-platform userland SCTP stack" -HOMEPAGE="https://github.com/sctplab/usrsctp" -USRSCTP_VERSION="a3e76b281ff5e3469e1c216d47533a73b3b03fab" -SRC_URI="https://github.com/sctplab/usrsctp/archive/${USRSCTP_VERSION}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DOCS=( LICENSE.md Manual.md README.md ) - -S="${WORKDIR}/${PN}-${USRSCTP_VERSION}" - -src_configure() { - local mycmakeargs=( - -Dsctp_werror=0 - -Dsctp_build_programs=0 - -Dsctp_build_shared_lib=1 - ) - cmake_src_configure -} diff --git a/net-libs/usrsctp/usrsctp-0.9.5.0.ebuild b/net-libs/usrsctp/usrsctp-0.9.5.0.ebuild index 68cb10c3837b..dcfe7560f3e3 100644 --- a/net-libs/usrsctp/usrsctp-0.9.5.0.ebuild +++ b/net-libs/usrsctp/usrsctp-0.9.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sctplab/usrsctp/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" DOCS=( LICENSE.md Manual.md README.md ) PATCHES=( "${FILESDIR}/${P}-pc-inc-path.patch" ) diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest index c133a6de73e3..0a339c4ac462 100644 --- a/net-libs/wandio/Manifest +++ b/net-libs/wandio/Manifest @@ -1 +1,2 @@ DIST wandio-4.2.3_p1.tar.gz 15418423 BLAKE2B 1274f10b87964e2dc87ed25a465991b1e4e9211b75fb5ac5a13a0aa535ff30ddfa69059b3d41de7dc758220bda8dd9d02ca7ed31b7c0ca2997641968cc729e48 SHA512 b4bfff9d33010c04826318c560592ee7f7aba9fccd0eba0f29c6294a636971bf4ac5105ffb9addfc22946e7b7234396dafa6c7e0a0d8de3ee1b7e586c069b438 +DIST wandio-4.2.4.tar.gz 15417703 BLAKE2B a4b6f066ac513975c669bd8f57b8791b87a240e6b5a6ad55340a829adfe89b614ab3541cab224e7cc4fb5daf0656108d02de231bce5cb2f1660871d1b3f9c13e SHA512 ac267d8762b38c073a67e7c6b3e7efbd551b668b5b56879c15aefa4ea353b5d86cea0f30acde76be187243843bdb08cae101dea0f346244b07a43a2796a6ca62 diff --git a/net-libs/wandio/files/wandio-4.2.3_p1-fix-lz4-check.patch b/net-libs/wandio/files/wandio-4.2.3_p1-fix-lz4-check.patch new file mode 100644 index 000000000000..db50cf1c0c04 --- /dev/null +++ b/net-libs/wandio/files/wandio-4.2.3_p1-fix-lz4-check.patch @@ -0,0 +1,12 @@ +https://github.com/wanduow/wandio/pull/51 +--- a/configure.ac ++++ b/configure.ac +@@ -260,7 +260,7 @@ AC_ARG_WITH([lz4], + AS_IF([test "x$with_lz4" != "xno"], + [ + AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, have_lz4f=no) +- ], [have_zstd=no]) ++ ], [have_lz4f=no]) + + AS_IF([test "x$have_lz4f" = "xyes"], [ + if test "$ac_cv_lib_lz4_code" != "none required"; then diff --git a/net-libs/wandio/metadata.xml b/net-libs/wandio/metadata.xml index a41dd862c997..f8af6549e574 100644 --- a/net-libs/wandio/metadata.xml +++ b/net-libs/wandio/metadata.xml @@ -8,6 +8,6 @@ <flag name="http">Build support for reading files over HTTP using <pkg>net-misc/curl</pkg></flag> </use> <upstream> - <remote-id type="github">wanduow/wandio</remote-id> + <remote-id type="github">LibtraceTeam/wandio</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/wandio/wandio-4.2.3_p1-r2.ebuild b/net-libs/wandio/wandio-4.2.3_p1-r2.ebuild new file mode 100644 index 000000000000..d927232b4f66 --- /dev/null +++ b/net-libs/wandio/wandio-4.2.3_p1-r2.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="C library for simple and efficient file IO" +HOMEPAGE="https://research.wand.net.nz/software/libwandio.php" +SRC_URI="https://github.com/wanduow/${PN}/archive/${PV/_p/-}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P/_p/-}" + +LICENSE="LGPL-3" +SLOT="0/6" +KEYWORDS="~amd64 ~x86" +IUSE="bzip2 http lzma lzo lz4 test zlib zstd" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( lzma lzo )" + +RDEPEND=" + !<net-libs/libtrace-4 + bzip2? ( app-arch/bzip2 ) + lzma? ( app-arch/xz-utils ) + lzo? ( dev-libs/lzo ) + lz4? ( app-arch/lz4:= ) + http? ( net-misc/curl ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} + test? ( app-arch/lzop ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2.3_p1-fix-lz4-check.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + $(use_with bzip2) \ + $(use_with http) \ + $(use_with lzma) \ + $(use_with lzo) \ + $(use_with lz4) \ + $(use_with zlib) \ + $(use_with zstd) +} + +src_test() { + pushd test || die + "${BROOT}"/bin/bash do-basic-tests.sh || die +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/wandio/wandio-4.2.4.ebuild b/net-libs/wandio/wandio-4.2.4.ebuild new file mode 100644 index 000000000000..dbad39f516a9 --- /dev/null +++ b/net-libs/wandio/wandio-4.2.4.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="C library for simple and efficient file IO" +HOMEPAGE="https://github.com/LibtraceTeam/wandio" +SRC_URI="https://github.com/LibtraceTeam/wandio/archive/refs/tags/${PV}-1.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${P}-1 + +LICENSE="LGPL-3" +SLOT="0/6" +KEYWORDS="~amd64 ~x86" +IUSE="bzip2 http lzma lzo test zlib" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( lzma lzo )" + +RDEPEND=" + !<net-libs/libtrace-4 + bzip2? ( app-arch/bzip2 ) + lzma? ( app-arch/xz-utils ) + lzo? ( dev-libs/lzo ) + http? ( net-misc/curl ) + zlib? ( sys-libs/zlib ) +" +DEPEND=" + ${RDEPEND} + test? ( app-arch/lzop ) +" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_with bzip2) \ + $(use_with http) \ + $(use_with lzma) \ + $(use_with lzo) \ + $(use_with zlib) +} + +src_test() { + pushd test || die + + "${BROOT}"/bin/bash do-basic-tests.sh || die +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 781f160fbd1d..a612e3d5a00d 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,2 +1 @@ -DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b -DIST webkitgtk-2.34.1.tar.xz 24996620 BLAKE2B 645326467f3155ab15e15fa6431e2652b4957dcbcc28f43ddcfcf088aab205a34b0442e610d3493cd938067af0f335e7abc95eb2df36b45bc0aeec649c83eaa6 SHA512 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed +DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16 SHA512 b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169 diff --git a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch deleted file mode 100644 index 7feb2fac42c3..000000000000 --- a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch +++ /dev/null @@ -1,55 +0,0 @@ -https://bugs.webkit.org/show_bug.cgi?id=208907 - -From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sat, 9 May 2020 23:11:52 +0300 -Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix - some build configurations - ---- - Source/WebCore/platform/graphics/GLContext.cpp | 5 ++++- - Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp -index b217988b990..1ba0eb8a482 100644 ---- a/Source/WebCore/platform/graphics/GLContext.cpp -+++ b/Source/WebCore/platform/graphics/GLContext.cpp -@@ -28,6 +28,9 @@ - - #if USE(GLX) - #include "GLContextGLX.h" -+#endif -+ -+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) - #include "OpenGLShims.h" - #endif - -@@ -57,7 +60,7 @@ inline ThreadGlobalGLContext* currentContext() - - static bool initializeOpenGLShimsIfNeeded() - { --#if USE(OPENGL_ES) || USE(LIBEPOXY) -+#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE) - return true; - #else - static bool initialized = false; -diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -index 3515be452b2..82cce70f14b 100644 ---- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -@@ -64,7 +64,10 @@ - - #if USE(GLX) - #include <GL/glx.h> --#include <WebCore/OpenGLShims.h> -+#endif -+ -+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) -+#include "WebCore/OpenGLShims.h" - #endif - - #if USE(GSTREAMER) --- -2.20.1 - diff --git a/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch deleted file mode 100644 index a4cf86f36cbf..000000000000 --- a/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://bugs.webkit.org/show_bug.cgi?id=208907 - -From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sat, 9 May 2020 23:11:52 +0300 -Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix - some build configurations - ---- - Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletions(-) - -diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -index 3515be452b2..82cce70f14b 100644 ---- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -@@ -64,7 +64,10 @@ - - #if USE(GLX) - #include <GL/glx.h> --#include <WebCore/OpenGLShims.h> -+#endif -+ -+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) -+#include "WebCore/OpenGLShims.h" - #endif - - #if USE(GSTREAMER) --- -2.20.1 - diff --git a/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch b/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch new file mode 100644 index 000000000000..51fc45fa32c4 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch @@ -0,0 +1,29 @@ +From 56001e951362a5064027b1af81283e523e35559b Mon Sep 17 00:00:00 2001 +From: Dennis Camera <dennis.camera+webkit@riiengineering.ch> +Date: Mon, 4 Mar 2024 09:27:54 -0800 +Subject: [PATCH] [JSC] A64DOpcode include <mutex> + https://bugs.webkit.org/show_bug.cgi?id=270394 + +Reviewed by Michael Catanzaro. + +When UNIFIED_BUILDS are disabled, the build fails due to missing std::call_once. + +* Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h: include <mutex>. + +Canonical link: https://commits.webkit.org/275630@main +--- + Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h +index 0392bcb6e20a0..202aa4d1d81de 100644 +--- a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h ++++ b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h +@@ -25,6 +25,7 @@ + + #pragma once + ++#include <mutex> + #include <stdint.h> + #include <wtf/Assertions.h> + #include <wtf/DataLog.h> diff --git a/net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch b/net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch new file mode 100644 index 000000000000..869c85e84a6e --- /dev/null +++ b/net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch @@ -0,0 +1,262 @@ +From 53ca279739365f9a604fba0a673f0539dfd67c55 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis <pgriffis@igalia.com> +Date: Mon, 8 Apr 2024 10:21:34 -0700 +Subject: [PATCH 1/6] Cherry-pick 277203@main (bd1249cc9c4f). + https://bugs.webkit.org/show_bug.cgi?id=272309 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + Workaround restrict error in GCC 12 + https://bugs.webkit.org/show_bug.cgi?id=272309 + + Reviewed by Darin Adler. + + In GCC 12.3.0: + + In static member function ‘static constexpr std::char_traits<char>::char_type* std::char_traits<char>::copy(char_type*, const char_type*, std::size_t)’, + inlined from ‘static constexpr void std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::_S_copy(_CharT*, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:431:21, + inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Allocator>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::_M_replace(size_type, size_type, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.tcc:532:22, + inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Alloc>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::replace(size_type, size_type, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:2179:19, + inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Alloc>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::insert(size_type, const _CharT*) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:1936:22, + inlined from ‘std::ostream& WTF::operator<<(std::ostream&, Int128Impl)’ at /host/home/tingping/Projects/WebKit/Source/WTF/wtf/Int128.cpp:268:17: + /usr/include/c++/12/bits/char_traits.h:435:56: error: ‘void* __builtin_memcpy(void*, const void*, long unsigned int)’ accessing 9223372036854775810 or more bytes at offsets [2, 9223372036854775807] and 1 may overlap up to 9223372036854775813 bytes at offset -3 [-Werror=restrict] + 435 | return static_cast<char_type*>(__builtin_memcpy(__s1, __s2, __n)); + | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~ + + * Source/WTF/wtf/Int128.cpp: + (WTF::operator<<): + + Canonical link: https://commits.webkit.org/277203@main + +Canonical link: https://commits.webkit.org/274313.129@webkitglib/2.44 +--- + Source/WTF/wtf/Int128.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Source/WTF/wtf/Int128.cpp b/Source/WTF/wtf/Int128.cpp +index 3962059d0cb9..c04f6d74543a 100644 +--- a/Source/WTF/wtf/Int128.cpp ++++ b/Source/WTF/wtf/Int128.cpp +@@ -265,9 +265,9 @@ std::ostream& operator<<(std::ostream& os, Int128Impl v) { + (flags & std::ios::basefield) == std::ios_base::fmtflags(); + if (print_as_decimal) { + if (Int128High64(v) < 0) { +- rep = "-"; ++ rep.append("-"); + } else if (flags & std::ios::showpos) { +- rep = "+"; ++ rep.append("+"); + } + } + +-- +2.43.0 + + +From 8ce83c4bf224122e0062248752a3ed014efc67e5 Mon Sep 17 00:00:00 2001 +From: Tim Nguyen <ntim@apple.com> +Date: Wed, 3 Apr 2024 09:22:37 -0700 +Subject: [PATCH 4/6] Cherry-pick 277007@main (1870b119a450). + https://bugs.webkit.org/show_bug.cgi?id=272044 + + CrashTracer: com.apple.WebKit.WebContent at WebCore: WebCore::ValidatedFormListedElement::updateValidity + https://bugs.webkit.org/show_bug.cgi?id=272044 + rdar://117727866 + + Reviewed by Ryosuke Niwa. + + It speculatively fixes a bug that RadioButtonGroup::m_members may contain a nullptr WeakRef. + + * Source/WebCore/dom/RadioButtonGroups.cpp: + (WebCore::RadioButtonGroup::isEmpty const): + (WebCore::RadioButtonGroup::remove): + (WebCore::RadioButtonGroup::setNeedsStyleRecalcForAllButtons): + (WebCore::RadioButtonGroup::updateValidityForAllButtons): + + Canonical link: https://commits.webkit.org/277007@main + +Canonical link: https://commits.webkit.org/274313.132@webkitglib/2.44 +--- + Source/WebCore/dom/RadioButtonGroups.cpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Source/WebCore/dom/RadioButtonGroups.cpp b/Source/WebCore/dom/RadioButtonGroups.cpp +index ba07a3fbdf09..4bbae6cbb72f 100644 +--- a/Source/WebCore/dom/RadioButtonGroups.cpp ++++ b/Source/WebCore/dom/RadioButtonGroups.cpp +@@ -31,7 +31,7 @@ namespace WebCore { + class RadioButtonGroup { + WTF_MAKE_FAST_ALLOCATED; + public: +- bool isEmpty() const { return m_members.isEmpty(); } ++ bool isEmpty() const { return m_members.isEmptyIgnoringNullReferences(); } + bool isRequired() const { return m_requiredCount; } + RefPtr<HTMLInputElement> checkedButton() const { return m_checkedButton.get(); } + void add(HTMLInputElement&); +@@ -47,7 +47,7 @@ private: + bool isValid() const; + void setCheckedButton(HTMLInputElement*); + +- HashSet<WeakRef<HTMLInputElement, WeakPtrImplWithEventTargetData>> m_members; ++ WeakHashSet<HTMLInputElement, WeakPtrImplWithEventTargetData> m_members; + WeakPtr<HTMLInputElement, WeakPtrImplWithEventTargetData> m_checkedButton; + size_t m_requiredCount { 0 }; + }; +@@ -60,7 +60,7 @@ inline bool RadioButtonGroup::isValid() const + Vector<Ref<HTMLInputElement>> RadioButtonGroup::members() const + { + auto sortedMembers = WTF::map(m_members, [](auto& element) -> Ref<HTMLInputElement> { +- return element.get(); ++ return element; + }); + std::sort(sortedMembers.begin(), sortedMembers.end(), [](auto& a, auto& b) { + return is_lt(treeOrder<ComposedTree>(a, b)); +@@ -155,7 +155,7 @@ void RadioButtonGroup::remove(HTMLInputElement& button) + } + } + +- if (m_members.isEmpty()) { ++ if (m_members.isEmptyIgnoringNullReferences()) { + ASSERT(!m_requiredCount); + ASSERT(!m_checkedButton); + } else if (wasValid != isValid()) +@@ -170,7 +170,7 @@ void RadioButtonGroup::remove(HTMLInputElement& button) + void RadioButtonGroup::setNeedsStyleRecalcForAllButtons() + { + for (auto& checkedButton : m_members) { +- Ref button = checkedButton.get(); ++ Ref button = checkedButton; + ASSERT(button->isRadioButton()); + button->invalidateStyleForSubtree(); + } +@@ -179,7 +179,7 @@ void RadioButtonGroup::setNeedsStyleRecalcForAllButtons() + void RadioButtonGroup::updateValidityForAllButtons() + { + for (auto& checkedButton : m_members) { +- Ref button = checkedButton.get(); ++ Ref button = checkedButton; + ASSERT(button->isRadioButton()); + button->updateValidity(); + } +-- +2.43.0 + + +From 93bde17ed761f5de54726de83ced4959303794c6 Mon Sep 17 00:00:00 2001 +From: Abrar Rahman Protyasha <a_protyasha@apple.com> +Date: Mon, 1 Apr 2024 22:42:12 -0700 +Subject: [PATCH 5/6] Cherry-pick 276925@main (59cedf7135bc). + https://bugs.webkit.org/show_bug.cgi?id=271962 + + Linker error when logging ViewportConfiguration to TextStream in Release configuration + https://bugs.webkit.org/show_bug.cgi?id=271962 + rdar://125713559 + + Reviewed by Sihui Liu. + + WebCore::operator<<(WTF::TextStream&, WebCore::ViewConfiguration const&) + is defined behind !LOG_DISABLED, which means in Release configuration, + the linker cannot find this definition. + + This patch fixes the linker error by removing the relevant !LOG_DISABLED + checks around both the operator<< overload definition and the + description()/dump() declarations, since said methods are referenced by + the operator<< overload. + + * Source/WebCore/page/ViewportConfiguration.cpp: + (WebCore::ViewportConfiguration::setIsKnownToLayOutWiderThanViewport): + (WebCore::ViewportConfiguration::dump const): + * Source/WebCore/page/ViewportConfiguration.h: + + Canonical link: https://commits.webkit.org/276925@main + +Canonical link: https://commits.webkit.org/274313.133@webkitglib/2.44 +--- + Source/WebCore/page/ViewportConfiguration.cpp | 4 ++-- + Source/WebCore/page/ViewportConfiguration.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Source/WebCore/page/ViewportConfiguration.cpp b/Source/WebCore/page/ViewportConfiguration.cpp +index 51abb1154515..c58bc368cd6c 100644 +--- a/Source/WebCore/page/ViewportConfiguration.cpp ++++ b/Source/WebCore/page/ViewportConfiguration.cpp +@@ -674,8 +674,6 @@ bool ViewportConfiguration::setIsKnownToLayOutWiderThanViewport(bool value) + return true; + } + +-#if !LOG_DISABLED +- + TextStream& operator<<(TextStream& ts, const ViewportConfiguration::Parameters& parameters) + { + ts.startGroup(); +@@ -747,6 +745,8 @@ String ViewportConfiguration::description() const + return ts.release(); + } + ++#if !LOG_DISABLED ++ + void ViewportConfiguration::dump() const + { + WTFLogAlways("%s", description().utf8().data()); +diff --git a/Source/WebCore/page/ViewportConfiguration.h b/Source/WebCore/page/ViewportConfiguration.h +index acd5a92ae089..1a7c27225a4b 100644 +--- a/Source/WebCore/page/ViewportConfiguration.h ++++ b/Source/WebCore/page/ViewportConfiguration.h +@@ -148,9 +148,9 @@ public: + WEBCORE_EXPORT static Parameters imageDocumentParameters(); + WEBCORE_EXPORT static Parameters xhtmlMobileParameters(); + WEBCORE_EXPORT static Parameters testingParameters(); +- +-#if !LOG_DISABLED ++ + String description() const; ++#if !LOG_DISABLED + WEBCORE_EXPORT void dump() const; + #endif + +-- +2.43.0 + + +From aff53249f2d491d082094a2aa57008c46e55d278 Mon Sep 17 00:00:00 2001 +From: Erica Li <lerica@apple.com> +Date: Tue, 19 Mar 2024 18:27:04 -0700 +Subject: [PATCH 6/6] Cherry-pick 276379@main (d036679431a5). + https://bugs.webkit.org/show_bug.cgi?id=271028 + + ASAN_SEGV | WebCore::LocalFrame::injectUserScripts. + rdar://124432384 + https://bugs.webkit.org/show_bug.cgi?id=271028 + + Reviewed by Ryosuke Niwa. + + Frame might be detached early, null checking before injectUserScripts from image document. + + * Source/WebCore/html/ImageDocument.cpp: + (WebCore::ImageDocument::createDocumentStructure): + + Canonical link: https://commits.webkit.org/276379@main + +Canonical link: https://commits.webkit.org/274313.134@webkitglib/2.44 +--- + Source/WebCore/html/ImageDocument.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Source/WebCore/html/ImageDocument.cpp b/Source/WebCore/html/ImageDocument.cpp +index f91478f138fe..67d3ed0d09af 100644 +--- a/Source/WebCore/html/ImageDocument.cpp ++++ b/Source/WebCore/html/ImageDocument.cpp +@@ -230,7 +230,8 @@ void ImageDocument::createDocumentStructure() + rootElement->insertedByParser(); + rootElement->setInlineStyleProperty(CSSPropertyHeight, 100, CSSUnitType::CSS_PERCENTAGE); + +- frame()->injectUserScripts(UserScriptInjectionTime::DocumentStart); ++ if (RefPtr localFrame = frame()) ++ localFrame->injectUserScripts(UserScriptInjectionTime::DocumentStart); + + // We need a <head> so that the call to setTitle() later on actually has an <head> to append to <title> to. + auto head = HTMLHeadElement::create(*this); +-- +2.43.0 + diff --git a/net-libs/webkit-gtk/files/2.44.1-non-unified-build-fixes.patch b/net-libs/webkit-gtk/files/2.44.1-non-unified-build-fixes.patch new file mode 100644 index 000000000000..ee5a1c222e70 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.44.1-non-unified-build-fixes.patch @@ -0,0 +1,322 @@ +From 211b73efb2a416f3b464d9d74da0aa8f93abe016 Mon Sep 17 00:00:00 2001 +From: Don Olmstead <don.olmstead@sony.com> +Date: Fri, 8 Mar 2024 17:27:09 -0800 +Subject: [PATCH] Non-unified build fixes, early March 2024 edition + https://bugs.webkit.org/show_bug.cgi?id=270719 + +Unreviewed non-unified build fix. + +* Source/JavaScriptCore/jit/JITSizeStatistics.cpp: +* Source/WebCore/Modules/model-element/ModelPlayerClient.h: +* Source/WebCore/css/CSSCrossfadeValue.h: +* Source/WebCore/css/CSSImageSetOptionValue.cpp: +* Source/WebCore/css/CSSImageSetOptionValue.h: +* Source/WebCore/css/CSSReflectValue.cpp: +* Source/WebCore/css/CSSReflectValue.h: +* Source/WebCore/css/CSSShadowValue.h: +* Source/WebCore/css/CSSValuePair.cpp: +* Source/WebCore/css/CSSValuePair.h: +* Source/WebCore/dom/SlotAssignment.h: +* Source/WebCore/dom/TrustedType.cpp: +* Source/WebCore/rendering/svg/RenderSVGPath.cpp: +* Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp: +* Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp: +* Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp: +* Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp: +* Source/WebKit/GPUProcess/graphics/RemoteImageBufferSet.cpp: +* Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp: +* Source/WebKit/UIProcess/BrowsingContextGroup.cpp: +* Source/WebKit/UIProcess/FrameProcess.cpp: +* Source/WebKit/UIProcess/ProvisionalPageProxy.cpp: + +Canonical link: https://commits.webkit.org/275863@main + +(cherry picked from commit 38c6ecad0ea32e80cb3e811c3ff759074006791f) +--- + Source/JavaScriptCore/jit/JITSizeStatistics.cpp | 1 + + Source/WebCore/Modules/model-element/ModelPlayerClient.h | 1 + + Source/WebCore/css/CSSCrossfadeValue.h | 3 ++- + Source/WebCore/css/CSSImageSetOptionValue.cpp | 1 - + Source/WebCore/css/CSSImageSetOptionValue.h | 4 ++-- + Source/WebCore/css/CSSReflectValue.cpp | 2 -- + Source/WebCore/css/CSSReflectValue.h | 4 ++-- + Source/WebCore/css/CSSShadowValue.h | 4 ++-- + Source/WebCore/css/CSSValuePair.cpp | 1 + + Source/WebCore/css/CSSValuePair.h | 1 + + Source/WebCore/dom/SlotAssignment.h | 1 + + Source/WebCore/rendering/svg/RenderSVGPath.cpp | 2 ++ + .../WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp | 2 ++ + Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp | 2 ++ + Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp | 2 ++ + .../WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp | 2 ++ + .../Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp | 1 + + Source/WebKit/UIProcess/ProvisionalPageProxy.cpp | 1 + + 18 files changed, 25 insertions(+), 10 deletions(-) + +diff --git a/Source/JavaScriptCore/jit/JITSizeStatistics.cpp b/Source/JavaScriptCore/jit/JITSizeStatistics.cpp +index f1bc2780343a..b2ffd81ee34d 100644 +--- a/Source/JavaScriptCore/jit/JITSizeStatistics.cpp ++++ b/Source/JavaScriptCore/jit/JITSizeStatistics.cpp +@@ -29,6 +29,7 @@ + #if ENABLE(JIT) + + #include "CCallHelpers.h" ++#include "JITPlan.h" + #include "LinkBuffer.h" + #include <wtf/BubbleSort.h> + #include <wtf/TZoneMallocInlines.h> +diff --git a/Source/WebCore/Modules/model-element/ModelPlayerClient.h b/Source/WebCore/Modules/model-element/ModelPlayerClient.h +index 9343d5102015..b9cf2857eee2 100644 +--- a/Source/WebCore/Modules/model-element/ModelPlayerClient.h ++++ b/Source/WebCore/Modules/model-element/ModelPlayerClient.h +@@ -25,6 +25,7 @@ + + #pragma once + ++#include "LayerHostingContextIdentifier.h" + #include "PlatformLayerIdentifier.h" + #include <wtf/Forward.h> + #include <wtf/WeakPtr.h> +diff --git a/Source/WebCore/css/CSSCrossfadeValue.h b/Source/WebCore/css/CSSCrossfadeValue.h +index eafa3bb5e828..86b87be608fe 100644 +--- a/Source/WebCore/css/CSSCrossfadeValue.h ++++ b/Source/WebCore/css/CSSCrossfadeValue.h +@@ -25,11 +25,12 @@ + + #pragma once + ++#include "CSSPrimitiveValue.h" + #include "CSSValue.h" ++#include <wtf/Function.h> + + namespace WebCore { + +-class CSSPrimitiveValue; + class StyleImage; + + namespace Style { +diff --git a/Source/WebCore/css/CSSImageSetOptionValue.cpp b/Source/WebCore/css/CSSImageSetOptionValue.cpp +index 9becc5444e10..2b7812e419a2 100644 +--- a/Source/WebCore/css/CSSImageSetOptionValue.cpp ++++ b/Source/WebCore/css/CSSImageSetOptionValue.cpp +@@ -27,7 +27,6 @@ + #include "CSSImageSetOptionValue.h" + + #include "CSSImageValue.h" +-#include "CSSPrimitiveValue.h" + + namespace WebCore { + +diff --git a/Source/WebCore/css/CSSImageSetOptionValue.h b/Source/WebCore/css/CSSImageSetOptionValue.h +index 60ef16534b24..c65ddccc04b5 100644 +--- a/Source/WebCore/css/CSSImageSetOptionValue.h ++++ b/Source/WebCore/css/CSSImageSetOptionValue.h +@@ -25,13 +25,13 @@ + + #pragma once + ++#include "CSSPrimitiveValue.h" + #include "CSSValue.h" ++#include <wtf/Function.h> + #include <wtf/text/WTFString.h> + + namespace WebCore { + +-class CSSPrimitiveValue; +- + class CSSImageSetOptionValue final : public CSSValue { + public: + static Ref<CSSImageSetOptionValue> create(Ref<CSSValue>&&); +diff --git a/Source/WebCore/css/CSSReflectValue.cpp b/Source/WebCore/css/CSSReflectValue.cpp +index 371e6ed16087..6049d4af7d2d 100644 +--- a/Source/WebCore/css/CSSReflectValue.cpp ++++ b/Source/WebCore/css/CSSReflectValue.cpp +@@ -26,8 +26,6 @@ + #include "config.h" + #include "CSSReflectValue.h" + +-#include "CSSPrimitiveValue.h" +- + namespace WebCore { + + CSSReflectValue::CSSReflectValue(CSSValueID direction, Ref<CSSPrimitiveValue> offset, RefPtr<CSSValue> mask) +diff --git a/Source/WebCore/css/CSSReflectValue.h b/Source/WebCore/css/CSSReflectValue.h +index c67d2ad0dc4b..84f7b1d0e7e1 100644 +--- a/Source/WebCore/css/CSSReflectValue.h ++++ b/Source/WebCore/css/CSSReflectValue.h +@@ -25,12 +25,12 @@ + + #pragma once + ++#include "CSSPrimitiveValue.h" + #include "CSSValue.h" ++#include <wtf/Function.h> + + namespace WebCore { + +-class CSSPrimitiveValue; +- + class CSSReflectValue final : public CSSValue { + public: + static Ref<CSSReflectValue> create(CSSValueID direction, Ref<CSSPrimitiveValue> offset, RefPtr<CSSValue> mask); +diff --git a/Source/WebCore/css/CSSShadowValue.h b/Source/WebCore/css/CSSShadowValue.h +index 26857028cf36..7d6d25980f72 100644 +--- a/Source/WebCore/css/CSSShadowValue.h ++++ b/Source/WebCore/css/CSSShadowValue.h +@@ -20,13 +20,13 @@ + + #pragma once + ++#include "CSSPrimitiveValue.h" + #include "CSSValue.h" ++#include <wtf/Function.h> + #include <wtf/RefPtr.h> + + namespace WebCore { + +-class CSSPrimitiveValue; +- + // Used for text-shadow and box-shadow + class CSSShadowValue final : public CSSValue { + public: +diff --git a/Source/WebCore/css/CSSValuePair.cpp b/Source/WebCore/css/CSSValuePair.cpp +index 7c64d5a9e353..a3e169a697c7 100644 +--- a/Source/WebCore/css/CSSValuePair.cpp ++++ b/Source/WebCore/css/CSSValuePair.cpp +@@ -25,6 +25,7 @@ + + #include "config.h" + #include "CSSValuePair.h" ++ + #include <wtf/Hasher.h> + #include <wtf/text/WTFString.h> + +diff --git a/Source/WebCore/css/CSSValuePair.h b/Source/WebCore/css/CSSValuePair.h +index 0fc85298ca62..44c4d97c01ab 100644 +--- a/Source/WebCore/css/CSSValuePair.h ++++ b/Source/WebCore/css/CSSValuePair.h +@@ -26,6 +26,7 @@ + #pragma once + + #include "CSSValue.h" ++#include <wtf/Function.h> + + namespace WebCore { + +diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h +index 9f9e1159e10a..478ca88bfca6 100644 +--- a/Source/WebCore/dom/SlotAssignment.h ++++ b/Source/WebCore/dom/SlotAssignment.h +@@ -30,6 +30,7 @@ + #include <wtf/HashSet.h> + #include <wtf/Vector.h> + #include <wtf/WeakHashMap.h> ++#include <wtf/WeakHashSet.h> + #include <wtf/WeakPtr.h> + #include <wtf/text/AtomString.h> + #include <wtf/text/AtomStringHash.h> +diff --git a/Source/WebCore/rendering/svg/RenderSVGPath.cpp b/Source/WebCore/rendering/svg/RenderSVGPath.cpp +index e9977db1c8b6..eba99e3a49d3 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGPath.cpp ++++ b/Source/WebCore/rendering/svg/RenderSVGPath.cpp +@@ -30,12 +30,14 @@ + #include "RenderSVGPath.h" + + #if ENABLE(LAYER_BASED_SVG_ENGINE) ++ + #include "Gradient.h" + #include "ReferencedSVGResources.h" + #include "RenderLayer.h" + #include "RenderSVGResourceMarkerInlines.h" + #include "RenderSVGShapeInlines.h" + #include "RenderStyleInlines.h" ++#include "SVGElementTypeHelpers.h" + #include "SVGMarkerElement.h" + #include "SVGPathElement.h" + #include "SVGSubpathData.h" +diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp +index 85f79031ed4e..2b379fa4ebfe 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp ++++ b/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp +@@ -23,8 +23,10 @@ + #include "RenderSVGResourceLinearGradient.h" + + #if ENABLE(LAYER_BASED_SVG_ENGINE) ++ + #include "RenderSVGModelObjectInlines.h" + #include "RenderSVGResourceLinearGradientInlines.h" ++#include "SVGElementTypeHelpers.h" + #include <wtf/IsoMallocInlines.h> + + namespace WebCore { +diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp +index d65a81f773eb..27abd9b6e0f7 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp ++++ b/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp +@@ -24,6 +24,7 @@ + #include "RenderSVGResourceMarker.h" + + #if ENABLE(LAYER_BASED_SVG_ENGINE) ++ + #include "Element.h" + #include "ElementIterator.h" + #include "FloatPoint.h" +@@ -34,6 +35,7 @@ + #include "RenderLayerInlines.h" + #include "RenderSVGModelObjectInlines.h" + #include "RenderSVGResourceMarkerInlines.h" ++#include "SVGElementTypeHelpers.h" + #include "SVGGraphicsElement.h" + #include "SVGLengthContext.h" + #include "SVGRenderStyle.h" +diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp +index 81321523d0e4..86c59ca6fab6 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp ++++ b/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp +@@ -22,6 +22,7 @@ + #include "RenderSVGResourceMasker.h" + + #if ENABLE(LAYER_BASED_SVG_ENGINE) ++ + #include "Element.h" + #include "ElementIterator.h" + #include "FloatPoint.h" +@@ -33,6 +34,7 @@ + #include "RenderSVGModelObjectInlines.h" + #include "RenderSVGResourceMaskerInlines.h" + #include "SVGContainerLayout.h" ++#include "SVGElementTypeHelpers.h" + #include "SVGGraphicsElement.h" + #include "SVGLengthContext.h" + #include "SVGRenderStyle.h" +diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp +index 7d70fd721d73..25a9b293468e 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp ++++ b/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp +@@ -23,9 +23,11 @@ + #include "RenderSVGResourceRadialGradient.h" + + #if ENABLE(LAYER_BASED_SVG_ENGINE) ++ + #include "RenderSVGModelObjectInlines.h" + #include "RenderSVGResourceRadialGradientInlines.h" + #include "RenderSVGShape.h" ++#include "SVGElementTypeHelpers.h" + #include <wtf/IsoMallocInlines.h> + + namespace WebCore { +diff --git a/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp b/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp +index a0c521a767f1..3d4c130de7fa 100644 +--- a/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp ++++ b/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp +@@ -31,6 +31,7 @@ + #include "WebGPUConvertFromBackingContext.h" + #include "WebGPUConvertToBackingContext.h" + #include <WebCore/WebGPURenderPassDepthStencilAttachment.h> ++#include <WebCore/WebGPUTextureView.h> + + namespace WebKit::WebGPU { + +-- +2.43.0 + diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml index 6c378126f60f..a370a1712c2f 100644 --- a/net-libs/webkit-gtk/metadata.xml +++ b/net-libs/webkit-gtk/metadata.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="avif">Enable support for AVIF images via <pkg>media-libs/libavif</pkg></flag> - <flag name="egl">Enable EGL support</flag> - <flag name="examples">Install the MiniBrowser example application</flag> - <flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag> - <flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag> - <flag name="jumbo-build">Combine source files to speed up build process</flag> -</use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="examples">Install the MiniBrowser example application</flag> + <flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag> + <flag name="jumbo-build">Combine source files to speed up build process</flag> + </use> + <upstream> + <remote-id type="github">WebKit/WebKit</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild deleted file mode 100644 index 2dd5eb64206c..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -USE_RUBY="ruby26 ruby27 ruby30" - -inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx - -MY_P="webkitgtk-${PV}" -DESCRIPTION="Open source web browser engine" -HOMEPAGE="https://www.webkitgtk.org" -SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" - -LICENSE="LGPL-2+ BSD" -SLOT="4/37" # soname version of libwebkit2gtk-4.0 -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86" - -IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X" - -# gstreamer with opengl/gles2 needs egl -REQUIRED_USE=" - gles2-only? ( egl !opengl ) - gstreamer? ( opengl? ( egl ) ) - wayland? ( egl ) - || ( aqua wayland X ) -" - -# Tests fail to link for inexplicable reasons -# https://bugs.webkit.org/show_bug.cgi?id=148210 -RESTRICT="test" - -# Aqua support in gtk3 is untested -# Dependencies found at Source/cmake/OptionsGTK.cmake -# Various compile-time optionals for gtk+-3.22.0 - ensure it -# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30 -# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) -wpe_depend=" - >=gui-libs/libwpe-1.5.0:1.0 - >=gui-libs/wpebackend-fdo-1.7.0:1.0 -" -# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix -RDEPEND=" - >=x11-libs/cairo-1.16.0:=[X?] - >=media-libs/fontconfig-2.13.0:1.0 - >=media-libs/freetype-2.9.0:2 - >=dev-libs/libgcrypt-1.7.0:0= - >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] - >=media-libs/harfbuzz-1.4.2:=[icu(+)] - >=dev-libs/icu-60.2:= - virtual/jpeg:0= - >=net-libs/libsoup-2.54:2.4[introspection?] - >=dev-libs/libxml2-2.8.0:2 - >=media-libs/libpng-1.4:0= - dev-db/sqlite:3= - sys-libs/zlib:0 - >=dev-libs/atk-2.16.0 - media-libs/libwebp:= - - >=dev-libs/glib-2.67.1:2 - >=dev-libs/libxslt-1.1.7 - media-libs/woff2 - gnome-keyring? ( app-crypt/libsecret ) - introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) - dev-libs/libtasn1:= - spell? ( >=app-text/enchant-0.22:2 ) - gstreamer? ( - >=media-libs/gstreamer-1.14:1.0 - >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] - gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) - >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 - >=media-libs/gst-plugins-bad-1.14:1.0 ) - - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender - x11-libs/libXt ) - - libnotify? ( x11-libs/libnotify ) - dev-libs/hyphen - jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) - - egl? ( media-libs/mesa[egl(+)] ) - gles2-only? ( media-libs/mesa[gles2] ) - opengl? ( virtual/opengl ) - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.12 - opengl? ( ${wpe_depend} ) - gles2-only? ( ${wpe_depend} ) - ) - - seccomp? ( - >=sys-apps/bubblewrap-0.3.1 - sys-libs/libseccomp - sys-apps/xdg-dbus-proxy - ) - - systemd? ( sys-apps/systemd:= ) - gamepad? ( >=dev-libs/libmanette-0.2.4 ) -" -unset wpe_depend -DEPEND="${RDEPEND}" -# paxctl needed for bug #407085 -# Need real bison, not yacc -BDEPEND=" - ${PYTHON_DEPS} - ${RUBY_DEPS} - >=app-accessibility/at-spi2-core-2.5.3 - dev-util/glib-utils - >=dev-util/gperf-3.0.1 - >=sys-devel/bison-2.4.3 - || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) - sys-devel/gettext - virtual/pkgconfig - - >=dev-lang/perl-5.10 - virtual/perl-Data-Dumper - virtual/perl-Carp - virtual/perl-JSON-PP - - gtk-doc? ( >=dev-util/gtk-doc-1.32 ) - geolocation? ( dev-util/gdbus-codegen ) - >=dev-util/cmake-3.10 -" -# test? ( -# dev-python/pygobject:3[python_targets_python2_7] -# x11-themes/hicolor-icon-theme -# jit? ( sys-apps/paxctl ) ) -RDEPEND="${RDEPEND} - geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) -" - -S="${WORKDIR}/${MY_P}" - -CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] ; then - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" - check-reqs_pkg_pretend - fi - - if ! test-flag-CXX -std=c++17 ; then - die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags" - fi - fi - - if ! use opengl && ! use gles2-only; then - ewarn - ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely." - ewarn "This is an unsupported configuration meant for very specific embedded" - ewarn "use cases, where there truly is no GL possible (and even that use case" - ewarn "is very unlikely to come by). If you have GL (even software-only), you" - ewarn "really really should be enabling OpenGL!" - ewarn - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - check-reqs_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch - cmake_src_prepare - gnome2_src_prepare -} - -src_configure() { - # Respect CC, otherwise fails on prefix #395875 - tc-export CC - - # It does not compile on alpha without this in LDFLAGS - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 - use alpha && append-ldflags "-Wl,--no-relax" - - # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 - use ia64 && append-ldflags "-Wl,--no-as-needed" - - # Sigbuses on SPARC with mcpu and co., bug #??? - use sparc && filter-flags "-mvis" - - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - # Try to use less memory, bug #469942 (see Fedora .spec for reference) - # --no-keep-memory doesn't work on ia64, bug #502492 - if ! use ia64; then - append-ldflags "-Wl,--no-keep-memory" - fi - - # We try to use gold when possible for this package -# if ! tc-ld-is-gold ; then -# append-ldflags "-Wl,--reduce-memory-overheads" -# fi - - # Ruby situation is a bit complicated. See bug 513888 - local rubyimpl - local ruby_interpreter="" - for rubyimpl in ${USE_RUBY}; do - if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" - fi - done - # This will rarely occur. Only a couple of corner cases could lead us to - # that failure. See bug 513888 - [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found" - - # TODO: Check Web Audio support - # should somehow let user select between them? - # - # opengl needs to be explicetly handled, bug #576634 - - local use_wpe_renderer=OFF - local opengl_enabled - if use opengl || use gles2-only; then - opengl_enabled=ON - use wayland && use_wpe_renderer=ON - else - opengl_enabled=OFF - fi - - local mycmakeargs=( - -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) - -DENABLE_QUARTZ_TARGET=$(usex aqua) - -DENABLE_API_TESTS=$(usex test) - -DENABLE_GTKDOC=$(usex gtk-doc) - -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service) - $(cmake_use_find_package gles2-only OpenGLES2) - -DENABLE_GLES2=$(usex gles2-only) - -DENABLE_MINIBROWSER=$(usex examples) - -DENABLE_VIDEO=$(usex gstreamer) - -DENABLE_WEB_AUDIO=$(usex gstreamer) - -DENABLE_INTROSPECTION=$(usex introspection) - -DUSE_LIBNOTIFY=$(usex libnotify) - -DUSE_LIBSECRET=$(usex gnome-keyring) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_WOFF2=ON - -DENABLE_SPELLCHECK=$(usex spell) - -DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging - -DENABLE_GAMEPAD=$(usex gamepad) - -DENABLE_WAYLAND_TARGET=$(usex wayland) - -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland - $(cmake_use_find_package egl EGL) - $(cmake_use_find_package opengl OpenGL) - -DENABLE_X11_TARGET=$(usex X) - -DUSE_OPENGL_OR_ES=${opengl_enabled} - -DENABLE_WEBGL=${opengl_enabled} - # Supported only under ANGLE, see - # https://bugs.webkit.org/show_bug.cgi?id=225563 - # https://bugs.webkit.org/show_bug.cgi?id=224888 - -DENABLE_WEBGL2=OFF - -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) - -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that - -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy - -DPORT=GTK - ${ruby_interpreter} - ) - - # Allow it to use GOLD when possible as it has all the magic to - # detect when to use it and using gold for this concrete package has - # multiple advantages and is also the upstream default, bug #585788 -# if tc-ld-is-gold ; then -# mycmakeargs+=( -DUSE_LD_GOLD=ON ) -# else -# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) -# fi - - # https://bugs.gentoo.org/761238 - append-cppflags -DNDEBUG - - WK_USE_CCACHE=NO cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_test() { - # Prevents test failures on PaX systems - pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* - - cmake_src_test -} - -src_install() { - cmake_src_install - - # Prevents crashes on PaX systems, bug #522808 - pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess" - pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" -} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild deleted file mode 100644 index fec3dc003ca7..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -USE_RUBY="ruby26 ruby27 ruby30" - -inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx - -MY_P="webkitgtk-${PV}" -DESCRIPTION="Open source web browser engine" -HOMEPAGE="https://www.webkitgtk.org" -SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" - -LICENSE="LGPL-2+ BSD" -SLOT="4/37" # soname version of libwebkit2gtk-4.0 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +opengl seccomp spell systemd wayland +X" - -# gstreamer with opengl/gles2 needs egl -REQUIRED_USE=" - gles2-only? ( egl !opengl ) - gstreamer? ( opengl? ( egl ) ) - wayland? ( egl ) - || ( aqua wayland X ) -" - -# Tests fail to link for inexplicable reasons -# https://bugs.webkit.org/show_bug.cgi?id=148210 -RESTRICT="test" - -# Aqua support in gtk3 is untested -# Dependencies found at Source/cmake/OptionsGTK.cmake -# Various compile-time optionals for gtk+-3.22.0 - ensure it -# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30 -# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) -wpe_depend=" - >=gui-libs/libwpe-1.5.0:1.0 - >=gui-libs/wpebackend-fdo-1.7.0:1.0 -" -# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix -RDEPEND=" - >=x11-libs/cairo-1.16.0:=[X?] - >=media-libs/fontconfig-2.13.0:1.0 - >=media-libs/freetype-2.9.0:2 - >=dev-libs/libgcrypt-1.7.0:0= - >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] - >=media-libs/harfbuzz-1.4.2:=[icu(+)] - >=dev-libs/icu-61.2:= - virtual/jpeg:0= - >=net-libs/libsoup-2.54:2.4[introspection?] - >=dev-libs/libxml2-2.8.0:2 - >=media-libs/libpng-1.4:0= - dev-db/sqlite:3= - sys-libs/zlib:0 - >=dev-libs/atk-2.16.0 - media-libs/libwebp:= - - >=dev-libs/glib-2.67.1:2 - >=dev-libs/libxslt-1.1.7 - media-libs/woff2 - gnome-keyring? ( app-crypt/libsecret ) - introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) - dev-libs/libtasn1:= - spell? ( >=app-text/enchant-0.22:2 ) - gstreamer? ( - >=media-libs/gstreamer-1.14:1.0 - >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] - gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) - >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 - >=media-libs/gst-plugins-bad-1.14:1.0 ) - - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender - x11-libs/libXt ) - - libnotify? ( x11-libs/libnotify ) - dev-libs/hyphen - jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) - avif? ( >=media-libs/libavif-0.9.0:= ) - lcms? ( media-libs/lcms:2 ) - - egl? ( media-libs/mesa[egl(+)] ) - gles2-only? ( media-libs/mesa[gles2] ) - opengl? ( virtual/opengl ) - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.12 - opengl? ( ${wpe_depend} ) - gles2-only? ( ${wpe_depend} ) - ) - - seccomp? ( - >=sys-apps/bubblewrap-0.3.1 - sys-libs/libseccomp - sys-apps/xdg-dbus-proxy - ) - - systemd? ( sys-apps/systemd:= ) - gamepad? ( >=dev-libs/libmanette-0.2.4 ) -" -unset wpe_depend -DEPEND="${RDEPEND}" -# paxctl needed for bug #407085 -# Need real bison, not yacc -BDEPEND=" - ${PYTHON_DEPS} - ${RUBY_DEPS} - >=app-accessibility/at-spi2-core-2.5.3 - dev-util/glib-utils - >=dev-util/gperf-3.0.1 - >=sys-devel/bison-2.4.3 - || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) - sys-devel/gettext - virtual/pkgconfig - - >=dev-lang/perl-5.10 - virtual/perl-Data-Dumper - virtual/perl-Carp - virtual/perl-JSON-PP - - gtk-doc? ( >=dev-util/gtk-doc-1.32 ) - geolocation? ( dev-util/gdbus-codegen ) - >=dev-util/cmake-3.10 -" -# test? ( -# dev-python/pygobject:3[python_targets_python2_7] -# x11-themes/hicolor-icon-theme -# jit? ( sys-apps/paxctl ) ) -RDEPEND="${RDEPEND} - geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) -" - -S="${WORKDIR}/${MY_P}" - -CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] ; then - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" - check-reqs_pkg_pretend - fi - - if ! test-flag-CXX -std=c++17 ; then - die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags" - fi - fi - - if ! use opengl && ! use gles2-only; then - ewarn - ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely." - ewarn "This is an unsupported configuration meant for very specific embedded" - ewarn "use cases, where there truly is no GL possible (and even that use case" - ewarn "is very unlikely to come by). If you have GL (even software-only), you" - ewarn "really really should be enabling OpenGL!" - ewarn - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - check-reqs_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}"/2.34.1-opengl-without-X-fixes.patch - cmake_src_prepare - gnome2_src_prepare -} - -src_configure() { - # Respect CC, otherwise fails on prefix #395875 - tc-export CC - - # It does not compile on alpha without this in LDFLAGS - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 - use alpha && append-ldflags "-Wl,--no-relax" - - # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 - use ia64 && append-ldflags "-Wl,--no-as-needed" - - # Sigbuses on SPARC with mcpu and co., bug #??? - use sparc && filter-flags "-mvis" - - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - # Try to use less memory, bug #469942 (see Fedora .spec for reference) - # --no-keep-memory doesn't work on ia64, bug #502492 - if ! use ia64; then - append-ldflags "-Wl,--no-keep-memory" - fi - - # Ruby situation is a bit complicated. See bug 513888 - local rubyimpl - local ruby_interpreter="" - for rubyimpl in ${USE_RUBY}; do - if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" - fi - done - # This will rarely occur. Only a couple of corner cases could lead us to - # that failure. See bug 513888 - [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found" - - # TODO: Check Web Audio support - # should somehow let user select between them? - - # opengl needs to be explicetly handled, bug #576634 - local use_wpe_renderer=OFF - local opengl_enabled - if use opengl || use gles2-only; then - opengl_enabled=ON - use wayland && use_wpe_renderer=ON - else - opengl_enabled=OFF - fi - - local mycmakeargs=( - ${ruby_interpreter} - $(cmake_use_find_package gles2-only OpenGLES2) - $(cmake_use_find_package egl EGL) - $(cmake_use_find_package opengl OpenGL) - -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that - -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy - -DPORT=GTK - # Source/cmake/WebKitFeatures.cmake - -DENABLE_API_TESTS=$(usex test) - -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) - -DENABLE_GAMEPAD=$(usex gamepad) - -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service) - -DENABLE_MINIBROWSER=$(usex examples) - -DENABLE_SPELLCHECK=$(usex spell) - -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) - -DENABLE_VIDEO=$(usex gstreamer) - -DENABLE_WEBGL=${opengl_enabled} - # Supported only under ANGLE and default off PRIVATE option still@2.34.1, see - # https://bugs.webkit.org/show_bug.cgi?id=225563 - # https://bugs.webkit.org/show_bug.cgi?id=224888 - -DENABLE_WEBGL2=OFF - -DENABLE_WEB_AUDIO=$(usex gstreamer) - # Source/cmake/OptionsGTK.cmake - -DENABLE_GLES2=$(usex gles2-only) - -DENABLE_GTKDOC=$(usex gtk-doc) - -DENABLE_INTROSPECTION=$(usex introspection) - -DENABLE_QUARTZ_TARGET=$(usex aqua) - -DENABLE_WAYLAND_TARGET=$(usex wayland) - -DENABLE_X11_TARGET=$(usex X) - -DUSE_AVIF=$(usex avif) - -DUSE_GTK4=OFF - -DUSE_LCMS=$(usex lcms) - -DUSE_LIBHYPHEN=ON - -DUSE_LIBNOTIFY=$(usex libnotify) - -DUSE_LIBSECRET=$(usex gnome-keyring) - -DUSE_OPENGL_OR_ES=${opengl_enabled} - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_SOUP2=ON - -DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging - -DUSE_WOFF2=ON - -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland - ) - - # https://bugs.gentoo.org/761238 - append-cppflags -DNDEBUG - - WK_USE_CCACHE=NO cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_test() { - # Prevents test failures on PaX systems - pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* - - cmake_src_test -} - -src_install() { - cmake_src_install - - # Prevents crashes on PaX systems, bug #522808 - pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess" - pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" -} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild new file mode 100644 index 000000000000..94d5800a3acd --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild @@ -0,0 +1,257 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..12} ) +USE_RUBY="ruby31 ruby32 ruby33" + +inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake + +MY_P="webkitgtk-${PV}" +DESCRIPTION="Open source web browser engine" +HOMEPAGE="https://www.webkitgtk.org" +SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" + +LICENSE="LGPL-2+ BSD" +SLOT="4.1/0" # soname version of libwebkit2gtk-4.1 +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" + +IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X" +REQUIRED_USE="|| ( aqua wayland X )" + +# Tests do not run when built from tarballs +# https://bugs.webkit.org/show_bug.cgi?id=215986 +RESTRICT="test" + +# Dependencies found at Source/cmake/OptionsGTK.cmake +# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream +# media-libs/mesa dep is for libgbm +# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) +# TODO: gst-plugins-base[X] is only needed when build configuration ends up +# with GLX set, but that's a bit automagic too to fix +# Softblocking webkit-gtk-2.38:4 as at that time WebKitWebDriver migrated to SLOT=4.1; currently it is found in SLOT=6 +RDEPEND=" + >=x11-libs/cairo-1.16.0[X?] + >=media-libs/fontconfig-2.13.0:1.0 + >=media-libs/freetype-2.9.0:2 + >=dev-libs/libgcrypt-1.7.0:0= + dev-libs/libtasn1:= + >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] + >=media-libs/harfbuzz-1.4.2:=[icu(+)] + >=dev-libs/icu-61.2:= + media-libs/libjpeg-turbo:0= + >=media-libs/libepoxy-1.5.4[egl(+)] + >=net-libs/libsoup-3.0.8:3.0[introspection?] + >=dev-libs/libxml2-2.8.0:2 + >=media-libs/libpng-1.4:0= + dev-db/sqlite:3 + sys-libs/zlib:0 + media-libs/libwebp:= + >=app-accessibility/at-spi2-core-2.46.0:2 + + >=dev-libs/glib-2.70.0:2 + >=dev-libs/libxslt-1.1.7 + media-libs/woff2 + keyring? ( app-crypt/libsecret ) + introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) + x11-libs/libdrm + media-libs/mesa + spell? ( >=app-text/enchant-0.22:2 ) + gstreamer? ( + >=media-libs/gstreamer-1.20:1.0 + >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] + media-libs/gst-plugins-base:1.0[opengl] + >=media-plugins/gst-plugins-opus-1.20:1.0 + >=media-libs/gst-plugins-bad-1.20:1.0 + ) + + X? ( x11-libs/libX11 ) + + dev-libs/hyphen + jpegxl? ( >=media-libs/libjxl-0.7.0:= ) + avif? ( >=media-libs/libavif-0.9.0:= ) + lcms? ( media-libs/lcms:2 ) + + media-libs/libglvnd + wayland? ( + >=dev-libs/wayland-1.20 + >=dev-libs/wayland-protocols-1.24 + ) + + seccomp? ( + >=sys-apps/bubblewrap-0.3.1 + sys-libs/libseccomp + sys-apps/xdg-dbus-proxy + ) + + systemd? ( sys-apps/systemd:= ) + gamepad? ( >=dev-libs/libmanette-0.2.4 ) + !<net-libs/webkit-gtk-2.38:4 +" +DEPEND="${RDEPEND}" +# Need real bison, not yacc +BDEPEND=" + ${PYTHON_DEPS} + ${RUBY_DEPS} + >=app-accessibility/at-spi2-core-2.5.3 + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/gperf-3.0.1 + dev-util/unifdef + >=sys-devel/bison-2.4.3 + || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) + sys-devel/gettext + virtual/pkgconfig + + >=dev-lang/perl-5.10 + virtual/perl-Data-Dumper + virtual/perl-Carp + virtual/perl-JSON-PP + + wayland? ( dev-util/wayland-scanner ) +" + +S="${WORKDIR}/${MY_P}" + +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 + +# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and +# gnome2_src_prepare, and both apply ${PATCHES[@]} +PATCHES=() + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] ; then + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + + if ! test-flag-CXX -std=c++17 ; then + die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags" + fi + fi +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then + check-reqs_pkg_setup + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + gnome2_src_prepare + + # Upstream 2.44 branch commits up to aff53249f2d491d, includes a linking and GCC 12 fix + eapply "${FILESDIR}"/${PV}-branch-patchset.patch + # Fix USE=-jumbo-build compilation on arm64 + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch + # Fix USE=-jumbo-build on all arches + eapply "${FILESDIR}"/${PV}-non-unified-build-fixes.patch +} + +src_configure() { + # Respect CC, otherwise fails on prefix #395875 + tc-export CC + + # ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007) + filter-lto + + # It does not compile on alpha without this in LDFLAGS + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 + use alpha && append-ldflags "-Wl,--no-relax" + + # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 + use ia64 && append-ldflags "-Wl,--no-as-needed" + + # Sigbuses on SPARC with mcpu and co., bug #??? + use sparc && filter-flags "-mvis" + + # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 + use ppc64 && append-flags "-mminimal-toc" + + # Try to use less memory, bug #469942 (see Fedora .spec for reference) + # --no-keep-memory doesn't work on ia64, bug #502492 + if ! use ia64; then + append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory") + fi + + # Ruby situation is a bit complicated. See bug 513888 + local rubyimpl + local ruby_interpreter="" + local RUBY + for rubyimpl in ${USE_RUBY}; do + if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then + RUBY="$(type -P ${rubyimpl})" + ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}" + fi + done + # This will rarely occur. Only a couple of corner cases could lead us to + # that failure. See bug 513888 + [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found" + # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly + # so it doesn't respect RUBY_EXECUTABLE, bug #771744. + sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die + + # TODO: Check Web Audio support + # should somehow let user select between them? + + local mycmakeargs=( + -DPython_EXECUTABLE="${PYTHON}" + ${ruby_interpreter} + # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that + -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap + -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy + -DPORT=GTK + # Source/cmake/WebKitFeatures.cmake + -DENABLE_API_TESTS=OFF + -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) + -DENABLE_GAMEPAD=$(usex gamepad) + -DENABLE_MINIBROWSER=$(usex examples) + -DENABLE_PDFJS=$(usex pdf) + -DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service) + -DENABLE_SPELLCHECK=$(usex spell) + -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) + -DENABLE_VIDEO=$(usex gstreamer) + -DUSE_GSTREAMER_WEBRTC=$(usex gstreamer) + -DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer) + -DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147 + -DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one + -DENABLE_WEBGL=ON + -DENABLE_WEB_AUDIO=$(usex gstreamer) + -DUSE_AVIF=$(usex avif) + # Source/cmake/OptionsGTK.cmake + -DENABLE_DOCUMENTATION=OFF + -DENABLE_INTROSPECTION=$(usex introspection) + -DENABLE_JOURNALD_LOG=$(usex systemd) + -DENABLE_QUARTZ_TARGET=$(usex aqua) + -DENABLE_WAYLAND_TARGET=$(usex wayland) + -DENABLE_X11_TARGET=$(usex X) + -DUSE_GBM=ON + -DUSE_GTK4=OFF + -DUSE_JPEGXL=$(usex jpegxl) + -DUSE_LCMS=$(usex lcms) + -DUSE_LIBBACKTRACE=OFF + -DUSE_LIBDRM=ON + -DUSE_LIBHYPHEN=ON + -DUSE_LIBSECRET=$(usex keyring) + -DUSE_SOUP2=OFF + -DUSE_WOFF2=ON + ) + + # https://bugs.gentoo.org/761238 + append-cppflags -DNDEBUG + + WK_USE_CCACHE=NO cmake_src_configure +} + +pkg_postinst() { + optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue" + optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta" + optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]" + optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash" + optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls" +} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild new file mode 100644 index 000000000000..dca160b9f744 --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..12} ) +USE_RUBY="ruby31 ruby32 ruby33" + +inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake + +MY_P="webkitgtk-${PV}" +DESCRIPTION="Open source web browser engine" +HOMEPAGE="https://www.webkitgtk.org" +SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" + +LICENSE="LGPL-2+ BSD" +SLOT="6/0" # soname version of libwebkit2gtk-6.0 +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" + +IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X" +REQUIRED_USE="|| ( aqua wayland X )" + +# Tests do not run when built from tarballs +# https://bugs.webkit.org/show_bug.cgi?id=215986 +RESTRICT="test" + +# Dependencies found at Source/cmake/OptionsGTK.cmake +# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream +# media-libs/mesa dep is for libgbm +# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) +# TODO: gst-plugins-base[X] is only needed when build configuration ends up +# with GLX set, but that's a bit automagic too to fix +# Softblocking <webkit-gtk-2.38:4 and <webkit-gtk-2.44:4.1 as since 2.44 this SLOT ships the WebKitWebDriver binary; +# WebKitWebDriver is an automation tool for web developers, which lets one control the browser via WebDriver API - only one SLOT can ship it +# TODO: There is build-time conditional depend on gtk-4.13.4 for using more efficient DmaBuf buffer type instead of EglImage, and gtk-4.13.7 for a11y support - ensure it at some point with a min dep +# TODO: at-spi2-core (atspi-2.pc) is checked at build time, but not linked to in the gtk4 SLOT - is it an upstream check bug and only gtk-4.14 a11y support is used? +RDEPEND=" + >=x11-libs/cairo-1.16.0[X?] + >=media-libs/fontconfig-2.13.0:1.0 + >=media-libs/freetype-2.9.0:2 + >=dev-libs/libgcrypt-1.7.0:0= + dev-libs/libtasn1:= + >=gui-libs/gtk-4.6.0:4[aqua?,introspection?,wayland?,X?] + >=media-libs/harfbuzz-1.4.2:=[icu(+)] + >=dev-libs/icu-61.2:= + media-libs/libjpeg-turbo:0= + >=media-libs/libepoxy-1.5.4[egl(+)] + >=net-libs/libsoup-3.0.8:3.0[introspection?] + >=dev-libs/libxml2-2.8.0:2 + >=media-libs/libpng-1.4:0= + dev-db/sqlite:3 + sys-libs/zlib:0 + media-libs/libwebp:= + >=app-accessibility/at-spi2-core-2.46.0:2 + + >=dev-libs/glib-2.70.0:2 + >=dev-libs/libxslt-1.1.7 + media-libs/woff2 + keyring? ( app-crypt/libsecret ) + introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) + x11-libs/libdrm + media-libs/mesa + spell? ( >=app-text/enchant-0.22:2 ) + gstreamer? ( + >=media-libs/gstreamer-1.20:1.0 + >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] + media-libs/gst-plugins-base:1.0[opengl] + >=media-plugins/gst-plugins-opus-1.20:1.0 + >=media-libs/gst-plugins-bad-1.20:1.0 + ) + + X? ( x11-libs/libX11 ) + + dev-libs/hyphen + jpegxl? ( >=media-libs/libjxl-0.7.0:= ) + avif? ( >=media-libs/libavif-0.9.0:= ) + lcms? ( media-libs/lcms:2 ) + + media-libs/libglvnd + wayland? ( + >=dev-libs/wayland-1.20 + >=dev-libs/wayland-protocols-1.24 + ) + + seccomp? ( + >=sys-apps/bubblewrap-0.3.1 + sys-libs/libseccomp + sys-apps/xdg-dbus-proxy + ) + + systemd? ( sys-apps/systemd:= ) + gamepad? ( >=dev-libs/libmanette-0.2.4 ) + !<net-libs/webkit-gtk-2.38:4 + !<net-libs/webkit-gtk-2.44:4.1 +" +DEPEND="${RDEPEND}" +# Need real bison, not yacc +BDEPEND=" + ${PYTHON_DEPS} + ${RUBY_DEPS} + >=app-accessibility/at-spi2-core-2.5.3 + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/gperf-3.0.1 + dev-util/unifdef + >=sys-devel/bison-2.4.3 + || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) + sys-devel/gettext + virtual/pkgconfig + + >=dev-lang/perl-5.10 + virtual/perl-Data-Dumper + virtual/perl-Carp + virtual/perl-JSON-PP + + wayland? ( dev-util/wayland-scanner ) +" + +S="${WORKDIR}/${MY_P}" + +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 + +# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and +# gnome2_src_prepare, and both apply ${PATCHES[@]} +PATCHES=() + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] ; then + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + + if ! test-flag-CXX -std=c++17 ; then + die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags" + fi + fi +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then + check-reqs_pkg_setup + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + gnome2_src_prepare + + # Upstream 2.44 branch commits up to aff53249f2d491d, includes a linking and GCC 12 fix + eapply "${FILESDIR}"/${PV}-branch-patchset.patch + # Fix USE=-jumbo-build compilation on arm64 + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch + # Fix USE=-jumbo-build on all arches + eapply "${FILESDIR}"/${PV}-non-unified-build-fixes.patch +} + +src_configure() { + # Respect CC, otherwise fails on prefix #395875 + tc-export CC + + # ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007) + filter-lto + + # It does not compile on alpha without this in LDFLAGS + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 + use alpha && append-ldflags "-Wl,--no-relax" + + # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 + use ia64 && append-ldflags "-Wl,--no-as-needed" + + # Sigbuses on SPARC with mcpu and co., bug #??? + use sparc && filter-flags "-mvis" + + # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 + use ppc64 && append-flags "-mminimal-toc" + + # Try to use less memory, bug #469942 (see Fedora .spec for reference) + # --no-keep-memory doesn't work on ia64, bug #502492 + if ! use ia64; then + append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory") + fi + + # Ruby situation is a bit complicated. See bug 513888 + local rubyimpl + local ruby_interpreter="" + local RUBY + for rubyimpl in ${USE_RUBY}; do + if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then + RUBY="$(type -P ${rubyimpl})" + ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}" + fi + done + # This will rarely occur. Only a couple of corner cases could lead us to + # that failure. See bug 513888 + [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found" + # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly + # so it doesn't respect RUBY_EXECUTABLE, bug #771744. + sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die + + # TODO: Check Web Audio support + # should somehow let user select between them? + + local mycmakeargs=( + -DPython_EXECUTABLE="${PYTHON}" + ${ruby_interpreter} + # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that + -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap + -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy + -DPORT=GTK + # Source/cmake/WebKitFeatures.cmake + -DENABLE_API_TESTS=OFF + -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) + -DENABLE_GAMEPAD=$(usex gamepad) + -DENABLE_MINIBROWSER=$(usex examples) + -DENABLE_PDFJS=$(usex pdf) + -DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service) + -DENABLE_SPELLCHECK=$(usex spell) + -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) + -DENABLE_VIDEO=$(usex gstreamer) + -DUSE_GSTREAMER_WEBRTC=$(usex gstreamer) + -DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer) + -DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147 + -DENABLE_WEBDRIVER=ON + -DENABLE_WEBGL=ON + -DENABLE_WEB_AUDIO=$(usex gstreamer) + -DUSE_AVIF=$(usex avif) + # Source/cmake/OptionsGTK.cmake + -DENABLE_DOCUMENTATION=OFF + -DENABLE_INTROSPECTION=$(usex introspection) + -DENABLE_JOURNALD_LOG=$(usex systemd) + -DENABLE_QUARTZ_TARGET=$(usex aqua) + -DENABLE_WAYLAND_TARGET=$(usex wayland) + -DENABLE_X11_TARGET=$(usex X) + -DUSE_GBM=ON + -DUSE_GTK4=ON # webkit2gtk-6.0 + -DUSE_JPEGXL=$(usex jpegxl) + -DUSE_LCMS=$(usex lcms) + -DUSE_LIBBACKTRACE=OFF + -DUSE_LIBDRM=ON + -DUSE_LIBHYPHEN=ON + -DUSE_LIBSECRET=$(usex keyring) + -DUSE_SOUP2=OFF + -DUSE_WOFF2=ON + ) + + # https://bugs.gentoo.org/761238 + append-cppflags -DNDEBUG + + WK_USE_CCACHE=NO cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto /usr/share/gtk-doc/html + # This will install API docs specific to webkit2gtk-6.0 + doins -r "${S}"/Documentation/{jsc-glib,webkitgtk,webkitgtk-web-process-extension}-6.0 +} + +pkg_postinst() { + optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue" + optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta" + optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]" + optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash" + optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls" +} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild new file mode 100644 index 000000000000..69d3434a09ce --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild @@ -0,0 +1,255 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..12} ) +USE_RUBY="ruby31 ruby32 ruby33" + +inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake + +MY_P="webkitgtk-${PV}" +DESCRIPTION="Open source web browser engine" +HOMEPAGE="https://www.webkitgtk.org" +SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" + +LICENSE="LGPL-2+ BSD" +SLOT="4/37" # soname version of libwebkit2gtk-4.0 +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" + +IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X" +REQUIRED_USE="|| ( aqua wayland X )" + +# Tests do not run when built from tarballs +# https://bugs.webkit.org/show_bug.cgi?id=215986 +RESTRICT="test" + +# Dependencies found at Source/cmake/OptionsGTK.cmake +# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream +# media-libs/mesa dep is for libgbm +# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) +# TODO: gst-plugins-base[X] is only needed when build configuration ends up +# with GLX set, but that's a bit automagic too to fix +RDEPEND=" + >=x11-libs/cairo-1.16.0[X?] + >=media-libs/fontconfig-2.13.0:1.0 + >=media-libs/freetype-2.9.0:2 + >=dev-libs/libgcrypt-1.7.0:0= + dev-libs/libtasn1:= + >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] + >=media-libs/harfbuzz-1.4.2:=[icu(+)] + >=dev-libs/icu-61.2:= + media-libs/libjpeg-turbo:0= + >=media-libs/libepoxy-1.5.4[egl(+)] + >=net-libs/libsoup-2.54:2.4[introspection?] + >=dev-libs/libxml2-2.8.0:2 + >=media-libs/libpng-1.4:0= + dev-db/sqlite:3 + sys-libs/zlib:0 + media-libs/libwebp:= + >=app-accessibility/at-spi2-core-2.46.0:2 + + >=dev-libs/glib-2.70.0:2 + >=dev-libs/libxslt-1.1.7 + media-libs/woff2 + keyring? ( app-crypt/libsecret ) + introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) + x11-libs/libdrm + media-libs/mesa + spell? ( >=app-text/enchant-0.22:2 ) + gstreamer? ( + >=media-libs/gstreamer-1.20:1.0 + >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] + media-libs/gst-plugins-base:1.0[opengl] + >=media-plugins/gst-plugins-opus-1.20:1.0 + >=media-libs/gst-plugins-bad-1.20:1.0 + ) + + X? ( x11-libs/libX11 ) + + dev-libs/hyphen + jpegxl? ( >=media-libs/libjxl-0.7.0:= ) + avif? ( >=media-libs/libavif-0.9.0:= ) + lcms? ( media-libs/lcms:2 ) + + media-libs/libglvnd + wayland? ( + >=dev-libs/wayland-1.20 + >=dev-libs/wayland-protocols-1.24 + ) + + seccomp? ( + >=sys-apps/bubblewrap-0.3.1 + sys-libs/libseccomp + sys-apps/xdg-dbus-proxy + ) + + systemd? ( sys-apps/systemd:= ) + gamepad? ( >=dev-libs/libmanette-0.2.4 ) +" +DEPEND="${RDEPEND}" +# Need real bison, not yacc +BDEPEND=" + ${PYTHON_DEPS} + ${RUBY_DEPS} + >=app-accessibility/at-spi2-core-2.5.3 + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/gperf-3.0.1 + dev-util/unifdef + >=sys-devel/bison-2.4.3 + || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) + sys-devel/gettext + virtual/pkgconfig + + >=dev-lang/perl-5.10 + virtual/perl-Data-Dumper + virtual/perl-Carp + virtual/perl-JSON-PP + + wayland? ( dev-util/wayland-scanner ) +" + +S="${WORKDIR}/${MY_P}" + +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 + +# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and +# gnome2_src_prepare, and both apply ${PATCHES[@]} +PATCHES=() + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] ; then + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + + if ! test-flag-CXX -std=c++17 ; then + die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags" + fi + fi +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then + check-reqs_pkg_setup + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + gnome2_src_prepare + + # Upstream 2.44 branch commits up to aff53249f2d491d, includes a linking and GCC 12 fix + eapply "${FILESDIR}"/${PV}-branch-patchset.patch + # Fix USE=-jumbo-build compilation on arm64 + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch + # Fix USE=-jumbo-build on all arches + eapply "${FILESDIR}"/${PV}-non-unified-build-fixes.patch +} + +src_configure() { + # Respect CC, otherwise fails on prefix #395875 + tc-export CC + + # ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007) + filter-lto + + # It does not compile on alpha without this in LDFLAGS + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 + use alpha && append-ldflags "-Wl,--no-relax" + + # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 + use ia64 && append-ldflags "-Wl,--no-as-needed" + + # Sigbuses on SPARC with mcpu and co., bug #??? + use sparc && filter-flags "-mvis" + + # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 + use ppc64 && append-flags "-mminimal-toc" + + # Try to use less memory, bug #469942 (see Fedora .spec for reference) + # --no-keep-memory doesn't work on ia64, bug #502492 + if ! use ia64; then + append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory") + fi + + # Ruby situation is a bit complicated. See bug 513888 + local rubyimpl + local ruby_interpreter="" + local RUBY + for rubyimpl in ${USE_RUBY}; do + if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then + RUBY="$(type -P ${rubyimpl})" + ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}" + fi + done + # This will rarely occur. Only a couple of corner cases could lead us to + # that failure. See bug 513888 + [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found" + # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly + # so it doesn't respect RUBY_EXECUTABLE, bug #771744. + sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die + + # TODO: Check Web Audio support + # should somehow let user select between them? + + local mycmakeargs=( + -DPython_EXECUTABLE="${PYTHON}" + ${ruby_interpreter} + # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that + -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap + -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy + -DPORT=GTK + # Source/cmake/WebKitFeatures.cmake + -DENABLE_API_TESTS=OFF + -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) + -DENABLE_GAMEPAD=$(usex gamepad) + -DENABLE_MINIBROWSER=$(usex examples) + -DENABLE_PDFJS=$(usex pdf) + -DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service) + -DENABLE_SPELLCHECK=$(usex spell) + -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) + -DENABLE_VIDEO=$(usex gstreamer) + -DUSE_GSTREAMER_WEBRTC=$(usex gstreamer) + -DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer) + -DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147 + -DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one + -DENABLE_WEBGL=ON + -DENABLE_WEB_AUDIO=$(usex gstreamer) + -DUSE_AVIF=$(usex avif) + # Source/cmake/OptionsGTK.cmake + -DENABLE_DOCUMENTATION=OFF + -DENABLE_INTROSPECTION=$(usex introspection) + -DENABLE_JOURNALD_LOG=$(usex systemd) + -DENABLE_QUARTZ_TARGET=$(usex aqua) + -DENABLE_WAYLAND_TARGET=$(usex wayland) + -DENABLE_X11_TARGET=$(usex X) + -DUSE_GBM=ON + -DUSE_GTK4=OFF + -DUSE_JPEGXL=$(usex jpegxl) + -DUSE_LCMS=$(usex lcms) + -DUSE_LIBBACKTRACE=OFF + -DUSE_LIBDRM=ON + -DUSE_LIBHYPHEN=ON + -DUSE_LIBSECRET=$(usex keyring) + -DUSE_SOUP2=ON + -DUSE_WOFF2=ON + ) + + # https://bugs.gentoo.org/761238 + append-cppflags -DNDEBUG + + WK_USE_CCACHE=NO cmake_src_configure +} + +pkg_postinst() { + optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue" + optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta" + optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]" + optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash" + optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls" +} diff --git a/net-libs/wslay/Manifest b/net-libs/wslay/Manifest new file mode 100644 index 000000000000..664d4098dc5d --- /dev/null +++ b/net-libs/wslay/Manifest @@ -0,0 +1 @@ +DIST wslay-1.1.1_p20210115.tar.gz 57514 BLAKE2B 1808814cf9cecc874f341989f14b36d53c9386681934f86547274dd9c926d1add84182960f02f0f2738e55723da17b99b16f046eea75ed1ec65be997d274ed21 SHA512 97fd58fba956162ebba8f824748ad3c161afb6a72e6e5db515f94a81edb99ddcd8eb332de4ffd08cb36f79010761036e4432e6d93b000ac5e4b0a88deeda9023 diff --git a/net-libs/kimap2/metadata.xml b/net-libs/wslay/metadata.xml index d925f2439758..47029d119abf 100644 --- a/net-libs/kimap2/metadata.xml +++ b/net-libs/wslay/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> </maintainer> <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="github">tatsuhiro-t/wslay</remote-id> </upstream> </pkgmetadata> diff --git a/net-libs/wslay/wslay-1.1.1_p20210115.ebuild b/net-libs/wslay/wslay-1.1.1_p20210115.ebuild new file mode 100644 index 000000000000..03e102a9da97 --- /dev/null +++ b/net-libs/wslay/wslay-1.1.1_p20210115.ebuild @@ -0,0 +1,50 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +WSLAY_HASH="45d22583b488f79d5a4e598cc7675c191c5ab53f" + +DESCRIPTION="WebSocket library in C" +HOMEPAGE="https://tatsuhiro-t.github.io/wslay/" +SRC_URI="https://github.com/tatsuhiro-t/wslay/archive/${WSLAY_HASH}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${WSLAY_HASH}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-util/cunit )" +BDEPEND="doc? ( dev-python/sphinx )" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local econfargs=( + # no options... and cmake build has different issues + $(usev !doc ac_cv_path_SPHINX_BUILD=) + $(usev !test ac_cv_lib_cunit_CU_initialize_registry=) + PKG_CONFIG=false # disables examples by failing to find nettle + ) + + econf "${econfargs[@]}" +} + +src_compile() { + emake $(usev doc -j1) #921192 +} + +src_install() { + local DOCS=( AUTHORS NEWS README.rst ) # skip non-rst README + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/net-libs/wvstreams/files/wvstreams-99999-openssl-ldflags.patch b/net-libs/wvstreams/files/wvstreams-99999-openssl-ldflags.patch deleted file mode 100644 index 0bf2bc4a7b02..000000000000 --- a/net-libs/wvstreams/files/wvstreams-99999-openssl-ldflags.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/config.ac -+++ b/config.ac -@@ -444,7 +444,6 @@ - if test "$with_openssl" != "no"; then - if test "$with_openssl" != ""; then - WV_APPEND(CPPFLAGS, [-I$with_openssl/include]) -- WV_APPEND(LDFLAGS, [-L$with_openssl]) - fi - AC_CHECK_HEADERS(openssl/ssl.h,, [with_openssl=no], - [#define OPENSSL_NO_KRB5]) diff --git a/net-libs/wvstreams/files/wvstreams-99999-soname.patch b/net-libs/wvstreams/files/wvstreams-99999-soname.patch deleted file mode 100644 index 9dd0d8ab8260..000000000000 --- a/net-libs/wvstreams/files/wvstreams-99999-soname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/default.so.do -+++ b/default.so.do -@@ -47,7 +47,7 @@ - redo-ifchange "$OUT/$2.a" - ln -s $2.a "$sofile" - else -- $CXX -o "$sofile" -shared \ -+ $CXX -o "$sofile" -shared -Wl,-soname,$sofile \ - $zdefs \ - $LDFLAGS \ - $obj $libdep $libs diff --git a/net-libs/wvstreams/metadata.xml b/net-libs/wvstreams/metadata.xml index 7e634a4e962f..822d1d9ff637 100644 --- a/net-libs/wvstreams/metadata.xml +++ b/net-libs/wvstreams/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> - <remote-id type="google-code">wvstreams</remote-id> + <remote-id type="github">apenwarr/wvstreams</remote-id> </upstream> <use> <flag name="boost"> diff --git a/net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild b/net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild index d02b539ada6d..41938e8d821f 100644 --- a/net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild +++ b/net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,8 +34,8 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - doc? ( app-doc/doxygen ) - boost? ( >=dev-libs/boost-1.34.1:= ) + doc? ( app-text/doxygen ) + boost? ( dev-libs/boost:= ) " DOCS="ChangeLog README*" PATCHES=( diff --git a/net-libs/wvstreams/wvstreams-99999.ebuild b/net-libs/wvstreams/wvstreams-99999.ebuild deleted file mode 100644 index 11e465328157..000000000000 --- a/net-libs/wvstreams/wvstreams-99999.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -AT_NOELIBTOOLIZE=yes -inherit autotools flag-o-matic git-r3 multiprocessing toolchain-funcs out-of-source - -DESCRIPTION="A network programming library in C++" -HOMEPAGE="https://github.com/apenwarr/wvstreams" -EGIT_REPO_URI="https://github.com/apenwarr/wvstreams" - -LICENSE="GPL-2" -SLOT="0/5.0" -KEYWORDS="" -IUSE="+dbus debug doc pam static-libs +zlib" - -RDEPEND=" - <dev-libs/openssl-1.1:0= - sys-libs/readline:0= - sys-libs/zlib - virtual/libcrypt:= - dbus? ( >=sys-apps/dbus-1.4.20 ) - pam? ( sys-libs/pam ) -" -DEPEND=" - ${RDEPEND} - dev-util/redo - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -PATCHES=( - "${FILESDIR}"/${PN}-99999-openssl-ldflags.patch - "${FILESDIR}"/${PN}-99999-soname.patch -) - -src_prepare() { - sed -i -e 's|-pre||g' config.ac || die - - default - - ln -s config.ac configure.ac || die - eautoreconf -} - -my_src_configure() { - append-flags -fno-strict-aliasing - append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375 - - tc-export AR CC CXX - - econf \ - $(use_enable debug) \ - $(use_with dbus) \ - $(use_with pam) \ - $(use_with zlib) \ - --cache-file="${BUILD_DIR}"/config.cache \ - --disable-optimization \ - --localstatedir=/var \ - --without-qt \ - --without-valgrind -} - -my_src_compile() { - redo -j$(makeopts_jobs) || die - - if use doc; then - doxygen "${S}"/Doxyfile || die - fi -} - -my_src_test() { - redo -j$(makeopts_jobs) test || die -} - -my_src_install() { - DESTDIR="${D}" redo -j$(makeopts_jobs) install || die - - local lib - for lib in $(find "${BUILD_DIR}" -name '*.so' -type l | grep -v libwvstatic); do - insinto /usr/$(get_libdir)/pkgconfig - doins "${BUILD_DIR}"/pkgconfig/$(basename ${lib/.so}).pc - done - - if use doc; then - #the list of files is too big for dohtml -r Docs/doxy-html/* - docinto html - dodoc -r Docs/doxy-html/* - fi - - if ! use static-libs; then - find "${D}/usr/$(get_libdir)" -name '*.a' -delete || die - fi -} diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest index 5ecf7cd4b235..dfdf3285fdf0 100644 --- a/net-libs/xdp-tools/Manifest +++ b/net-libs/xdp-tools/Manifest @@ -1 +1,2 @@ -DIST xdp-tools-1.2.0.tar.gz 233676 BLAKE2B 488bd24c5b0c25cb90cc434c0d7cecaf0cf2818d949008fabf4a1245f773e1a1e7a6520c4155df5a6364b0cc8ce2ae49b7b428209b762ecd11f9d6adc10cc57b SHA512 484e5aed6d695665e9e7edec8033b6034281fb215c758a8a8600b5b2215c7decb538efbafa4204306497197a329c3ad7c51beb33717fbe0296a345a1aca8c0a9 +DIST xdp-tools-1.4.1.tar.gz 339878 BLAKE2B 30ed245dd0da8404cf67313ea4d5f9a148507d14bd7330bdac3b03c07d1cc0b38eb1a376636551cb8ea14c8a2e77d02527da363733a1059e1c2ebaee9ac90392 SHA512 9d2ad42713aa53c10ccbde2c344bf2696524e317544f3693114b343ab74240187699c3802cfc6efa05b3e9f9bfec80fd2537799aa3ae050717bb1f6aab435996 +DIST xdp-tools-1.4.2.tar.gz 340864 BLAKE2B c5197330ff917043e03a16346823acab760db5fe903f2e039bd2c178ad34bb04d96a0d6b321fd3565256c39422f3f1f7b475970bd22ab487e30468c96e11c711 SHA512 aedf79859872523d514f18e7a6e8b7999bd1942021968dbba9a7e86cde1c193e31b328bc56d6bf2b3fbc7f266c9df8d942d90a70bbd9d514ce38d56c07cd18ca diff --git a/net-libs/xdp-tools/files/1.4.1-fix-memory-leak-in-xsk_setup_xdp_prog.patch b/net-libs/xdp-tools/files/1.4.1-fix-memory-leak-in-xsk_setup_xdp_prog.patch new file mode 100644 index 000000000000..6c95a970f876 --- /dev/null +++ b/net-libs/xdp-tools/files/1.4.1-fix-memory-leak-in-xsk_setup_xdp_prog.patch @@ -0,0 +1,34 @@ + +Patch from: +https://github.com/xdp-project/xdp-tools/commit/cae9c91353cd3ed51753168203ed101905b9ac9e + +From cae9c91353cd3ed51753168203ed101905b9ac9e Mon Sep 17 00:00:00 2001 +From: Ric Li <ming3.li@intel.com> +Date: Tue, 21 Nov 2023 15:36:57 +0800 +Subject: [PATCH] libxdp: Fix xdp prog memory leak in xsk_setup_xdp_prog + +In the xsk_setup_xdp_prog function, the xsk structure +temporarily takes ownership of an xdp_prog and stores it in +ctx->xdp_prog. However, the allocated memory is not freed +in xsk_destroy_xsk_struct, leading to a memory leak. This +commit addresses the issue by adding a call to +xdp_program_close to properly release the allocated +xdp_prog memory. + +Signed-off-by: Ric Li <ming3.li@intel.com> +--- + lib/libxdp/xsk.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/libxdp/xsk.c b/lib/libxdp/xsk.c +index a854f771..b3527fb6 100644 +--- a/lib/libxdp/xsk.c ++++ b/lib/libxdp/xsk.c +@@ -978,6 +978,7 @@ static struct xsk_ctx *xsk_create_ctx(struct xsk_socket *xsk, + + static void xsk_destroy_xsk_struct(struct xsk_socket *xsk) + { ++ xdp_program__close(xsk->ctx->xdp_prog); + free(xsk->ctx); + free(xsk); + } diff --git a/net-libs/xdp-tools/metadata.xml b/net-libs/xdp-tools/metadata.xml index 878714e41628..790067f24136 100644 --- a/net-libs/xdp-tools/metadata.xml +++ b/net-libs/xdp-tools/metadata.xml @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>holger@applied-asynchrony.com</email> + <name>Holger Hoffstätte</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="person"> <email>zx2c4@gentoo.org</email> <name>Jason A. Donenfeld</name> diff --git a/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild b/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild deleted file mode 100644 index 1c7f80eb7c0d..000000000000 --- a/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="The libxdp library and various tools for use with XDP" -HOMEPAGE="https://github.com/xdp-project/xdp-tools" -SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="+doc +tools" - -DEPEND="dev-libs/libbpf:= - sys-libs/zlib - net-libs/libpcap - virtual/libelf" -RDEPEND="${DEPEND}" -BDEPEND=">=sys-devel/clang-10.0.0 - doc? ( app-editors/emacs )" - -# Not prebuilt -- we build them -- but they're not ordinary ELF objects either. -QA_PREBUILT="usr/lib/bpf/*.o" - -MAKEOPTS+=" V=1" - -src_configure() { - export PRODUCTION=1 - export DYNAMIC_LIBXDP=1 - export FORCE_EMACS=$(usex doc 1 0) - use doc || export EMACS=false - export FORCE_SYSTEM_LIBBPF=1 - default - { - echo "PREFIX := ${EPREFIX}/usr" - echo "LIBDIR := \$(PREFIX)/$(get_libdir)" - echo "BPF_OBJECT_DIR := \$(PREFIX)/lib/bpf" - } >> config.mk -} - -src_install() { - default - rm -r "${ED}/usr/share/xdp-tools" || die - rm "${ED}/usr/$(get_libdir)/libxdp.a" || die - use tools || { rm "${ED}/usr/sbin"/* || die; } - dostrip -x /usr/lib/bpf -} diff --git a/net-libs/xdp-tools/xdp-tools-1.4.1-r1.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.1-r1.ebuild new file mode 100644 index 000000000000..62df6baaace5 --- /dev/null +++ b/net-libs/xdp-tools/xdp-tools-1.4.1-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="The libxdp library and various tools for use with XDP" +HOMEPAGE="https://github.com/xdp-project/xdp-tools" +SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1 BSD-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="+tools" + +DEPEND=" + dev-libs/libbpf:= + dev-util/bpftool + net-libs/libpcap + sys-libs/zlib + virtual/libelf +" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/grep[pcre] + >=sys-devel/clang-11.0.0 +" + +# Not prebuilt -- we build them -- but they're not ordinary ELF objects either. +QA_PREBUILT="usr/lib/bpf/*.o" + +MAKEOPTS+=" V=1" + +PATCHES=( + "${FILESDIR}"/1.4.1-fix-memory-leak-in-xsk_setup_xdp_prog.patch +) + +src_prepare() { + # remove -Werror: #899744 + sed -i 's/-Werror//g' lib/Makefile lib/defines.mk || die + sed -i '/-Werror/d' lib/common.mk lib/libxdp/Makefile \ + lib/libxdp/tests/Makefile lib/util/Makefile || die + + default +} + +src_configure() { + # filter LTO: #861587 + filter-lto + + # filter LDFLAGS some more: #916591 + filter-ldflags -Wl,--{icf,lto}* + + # force ld.bfd: #916591 + tc-ld-force-bfd + + export CC="$(tc-getCC)" + export PREFIX="${EPREFIX}/usr" + export LIBDIR="${PREFIX}/$(get_libdir)" + export BPF_OBJECT_DIR="${PREFIX}/lib/bpf" + export PRODUCTION=1 + export DYNAMIC_LIBXDP=1 + export FORCE_SYSTEM_LIBBPF=1 + + default +} + +src_test() { :; } + +src_install() { + default + + # To remove the scripts/testing files that are installed. + rm -r "${ED}/usr/share/xdp-tools" || die + # We can't control static archive generation yet. + rm "${ED}/usr/$(get_libdir)/libxdp.a" || die + + use tools || { rm "${ED}/usr/sbin"/* || die; } + + # These are ELF objects but BPF ones. + dostrip -x /usr/lib/bpf +} + +pkg_postinst() { + elog + elog "Many BPF utilities need access to a mounted bpffs virtual file system." + elog "Either mount it manually like this:" + elog + elog " mount bpffs /sys/fs/bpf -t bpf -o nosuid,nodev,noexec,relatime,mode=700" + elog + elog "or add the following line to your /etc/fstab to always mount it at boot time:" + elog + elog " bpffs /sys/fs/bpf bpf nosuid,nodev,noexec,relatime,mode=700 0 0" + elog + elog "You can verify that bpffs is mounted with:" + elog + elog " mount | grep /sys/fs/bpf" + elog +} diff --git a/net-libs/xdp-tools/xdp-tools-1.4.2.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.2.ebuild new file mode 100644 index 000000000000..6861f5e2c969 --- /dev/null +++ b/net-libs/xdp-tools/xdp-tools-1.4.2.ebuild @@ -0,0 +1,96 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="The libxdp library and various tools for use with XDP" +HOMEPAGE="https://github.com/xdp-project/xdp-tools" +SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1 BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="+tools" + +DEPEND=" + dev-libs/libbpf:= + dev-util/bpftool + net-libs/libpcap + sys-libs/zlib + virtual/libelf +" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/grep[pcre] + >=sys-devel/clang-11.0.0 +" + +# Not prebuilt -- we build them -- but they're not ordinary ELF objects either. +QA_PREBUILT="usr/lib/bpf/*.o" + +MAKEOPTS+=" V=1" + +src_prepare() { + # remove -Werror: #899744 + sed -i 's/-Werror//g' lib/Makefile lib/defines.mk || die + sed -i '/-Werror/d' lib/common.mk lib/libxdp/Makefile \ + lib/libxdp/tests/Makefile lib/util/Makefile || die + + default +} + +src_configure() { + # filter LTO: #861587 + filter-lto + + # filter LDFLAGS some more: #916591 + filter-ldflags -Wl,--{icf,lto}* + + # force ld.bfd: #916591 + tc-ld-force-bfd + + export CC="$(tc-getCC)" + export PREFIX="${EPREFIX}/usr" + export LIBDIR="${PREFIX}/$(get_libdir)" + export BPF_OBJECT_DIR="${PREFIX}/lib/bpf" + export PRODUCTION=1 + export DYNAMIC_LIBXDP=1 + export FORCE_SYSTEM_LIBBPF=1 + + default +} + +src_test() { :; } + +src_install() { + default + + # To remove the scripts/testing files that are installed. + rm -r "${ED}/usr/share/xdp-tools" || die + # We can't control static archive generation yet. + rm "${ED}/usr/$(get_libdir)/libxdp.a" || die + + use tools || { rm "${ED}/usr/sbin"/* || die; } + + # These are ELF objects but BPF ones. + dostrip -x /usr/lib/bpf +} + +pkg_postinst() { + elog + elog "Many BPF utilities need access to a mounted bpffs virtual file system." + elog "Either mount it manually like this:" + elog + elog " mount bpffs /sys/fs/bpf -t bpf -o nosuid,nodev,noexec,relatime,mode=700" + elog + elog "or add the following line to your /etc/fstab to always mount it at boot time:" + elog + elog " bpffs /sys/fs/bpf bpf nosuid,nodev,noexec,relatime,mode=700 0 0" + elog + elog "You can verify that bpffs is mounted with:" + elog + elog " mount | grep /sys/fs/bpf" + elog +} diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest deleted file mode 100644 index 025b6132986f..000000000000 --- a/net-libs/xrootd-ceph/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST xrootd-ceph-5.0.3.tar.gz 81835 BLAKE2B 1be45c78dd0ec4b20451cfa4a8a579e076e718509a47fa04027207c12e433338decefb9f82749cc15cae3cad75d97485fe0a7d6582cdcc0739bd222bc1d97b6b SHA512 3338a0ab0446e4c7ee3d232f5cce8f93c49e040b4792aa52f9dcf6f27f6767e6ffbaff17eb30a87c5b3ff713e1b0c4edb24d8d116c91351c4ed0c13963f80fc9 -DIST xrootd-ceph-5.1.1.tar.gz 81981 BLAKE2B 6f0ddfd2e20c0127223d3d41e614fbefefb8e1ce20ae9a805fc0d01d7c442f0b9b9323ba1761a9b5a160f63bfe1c823384f84c160eb98d316bddc3c1affe2b6c SHA512 fede94cbe614b6c7dced07d1bbe8661706c0e0c98c77cab0a777b62cb7b1a0790ce597bb6764b36b6d2cba9884f23f6d37d54adb5b11cb6d20e32b95a2877ef3 -DIST xrootd-ceph-5.2.0.tar.gz 82017 BLAKE2B 604c2c9eae857f05160b3cd853591283c5aebdec2345a810d2454f34bc22768db15f973ca9f672e6522297f939586ca8e996222487e2c1733205159521bf4996 SHA512 fdfe71c9bd087d216c2c4536b130cf90a392032ac8d0ad294b8ee7358449cbdf779f0f5d5aca02062cc04f510678bc6171f3dd29ad1f7aa207617aa3dfbd6f54 -DIST xrootd-ceph-5.3.1.tar.gz 82029 BLAKE2B 1946da121e620c68ddafe448f049d4495ec5326cfc0286944cea41cb940ac8982ced939989efddb3879baa694c34f93f75f6e58c00b75c5d385da863daa15154 SHA512 bcf4fc341644e6c4d2c83b4bc913203187385964da3d00d019d69de0e0abd19915a5194713574bb1b8562e80edd3eeefb6fee1762e7c8595b14d13657c237861 diff --git a/net-libs/xrootd-ceph/metadata.xml b/net-libs/xrootd-ceph/metadata.xml deleted file mode 100644 index 1ca52bb0ad68..000000000000 --- a/net-libs/xrootd-ceph/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-physics@gentoo.org</email> - <name>Gentoo Physics Project</name> - </maintainer> - <longdescription lang="en"> - This XROOTD plug-in allows it to interface with rados block devices via - <pkg>sys-cluster/ceph</pkg>. Until its version 4.10.0 it used to part - of <pkg>net-libs/xrootd</pkg> itself. - </longdescription> -</pkgmetadata> diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild deleted file mode 100644 index fe49b3f4f5c1..000000000000 --- a/net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform" -HOMEPAGE="https://xrootd.slac.stanford.edu/" -SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="amd64 ~amd64-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=">=net-libs/xrootd-5.0.0 - sys-cluster/ceph" -RDEPEND="${DEPEND}" -BDEPEND="test? ( dev-util/cppunit )" - -# xrootd plugins are not intended to be linked with, -# they are to be loaded at runtime by xrootd, -# see https://github.com/xrootd/xrootd/issues/447 -QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so - /usr/lib.*/libXrdCephTests\.so" - -src_configure() { - local mycmakeargs=( - -DENABLE_TESTS=$(usex test) - # As of 5.0.3 the default plug-in version is still 4. - -DPLUGIN_VERSION=$(ver_cut 1) - ) - cmake_src_configure -} diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.1.1.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.1.1.ebuild deleted file mode 100644 index bdacb70cc802..000000000000 --- a/net-libs/xrootd-ceph/xrootd-ceph-5.1.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform" -HOMEPAGE="https://xrootd.slac.stanford.edu/" -SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~amd64-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=">=net-libs/xrootd-5.0.0 - sys-cluster/ceph" -RDEPEND="${DEPEND}" -BDEPEND="test? ( dev-util/cppunit )" - -# xrootd plugins are not intended to be linked with, -# they are to be loaded at runtime by xrootd, -# see https://github.com/xrootd/xrootd/issues/447 -QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so - /usr/lib.*/libXrdCephTests\.so" - -src_configure() { - local mycmakeargs=( - -DENABLE_TESTS=$(usex test) - # As of 5.0.3 the default plug-in version is still 4. - -DPLUGIN_VERSION=$(ver_cut 1) - ) - cmake_src_configure -} diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.2.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.2.0.ebuild deleted file mode 100644 index a9f500fa3351..000000000000 --- a/net-libs/xrootd-ceph/xrootd-ceph-5.2.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform" -HOMEPAGE="https://xrootd.slac.stanford.edu/" -SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~amd64-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=">=net-libs/xrootd-5.0.0 - sys-cluster/ceph" -RDEPEND="${DEPEND}" -BDEPEND="test? ( dev-util/cppunit )" - -# xrootd plugins are not intended to be linked with, -# they are to be loaded at runtime by xrootd, -# see https://github.com/xrootd/xrootd/issues/447 -QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so - /usr/lib.*/libXrdCephTests\.so" - -src_configure() { - local mycmakeargs=( - -DENABLE_TESTS=$(usex test) - ) - cmake_src_configure -} diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.3.1.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.3.1.ebuild deleted file mode 100644 index 01734365262d..000000000000 --- a/net-libs/xrootd-ceph/xrootd-ceph-5.3.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform" -HOMEPAGE="https://xrootd.slac.stanford.edu/" -SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~amd64-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=">=net-libs/xrootd-5.0.0 - sys-cluster/ceph" -RDEPEND="${DEPEND}" -BDEPEND="test? ( dev-util/cppunit )" - -# xrootd plugins are not intended to be linked with, -# they are to be loaded at runtime by xrootd, -# see https://github.com/xrootd/xrootd/issues/447 -QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so - /usr/lib.*/libXrdCephTests\.so" - -src_configure() { - local mycmakeargs=( - -DENABLE_TESTS=$(usex test) - ) - cmake_src_configure -} diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest index fa1e42cc0cca..80cba32dee34 100644 --- a/net-libs/xrootd/Manifest +++ b/net-libs/xrootd/Manifest @@ -1,4 +1,4 @@ -DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0 -DIST xrootd-5.1.1.tar.gz 2869346 BLAKE2B daad5f4e1253dce7d83d144aabbbd24afca9affafc6643b8e7124c68ff8651a3a15ed1b40680a40b737411132ccd0b697d4cacfcdd2bd64d5b5640875684c464 SHA512 aee5373f2064eaa489abc7a560ca61b98f824e8f0b3665dbea82e0362a91a3b4f9e6457d0a304692ae58619ef7c16333a8c69a69d282bd48948a968dd4a06e4f -DIST xrootd-5.2.0.tar.gz 2935040 BLAKE2B 1aa58ea188faef3e3691e77b08529d14e0bf04c18127b8b8ae6a7154700af67b1d900b64cf4f505b90963e2925e32935d4bcf9d1d913ba0973713b5c69301dd2 SHA512 cfd41d2e678ad339677abb62f329828de368ea5af9c9103722b75bcbb0812a2f1695986ca953651e2418fc839d7a50072635b806c9292aeaff702e269bbc11da -DIST xrootd-5.3.1.tar.gz 2957788 BLAKE2B 6669ce4811e6c65ef17f06ae219e19e1f12027f4f9b620ad447df53ac437b30ce6425dc783a0ac7e4557d18ab562c266ac2497d93e93a2058fe5bd4aa7bc1d42 SHA512 a65436fe649233bb28123d9529d496c11b4ff40ba5490cbcbb32ff5379e555cfd684fad350c784c80e70056bb5d2e9701a80543c7f4a8ceb11e935aea01800b3 +DIST xrootd-5.5.4.tar.gz 3241021 BLAKE2B 505890ab7dbd0530d3c42390c9a6858cf0c8b53d42631b3bed615cb9b7c4d738bb791d26e625b010fef79f57291eb8bcd653ec629d240df92d37c12c973210f8 SHA512 1bf8fec3e20950e1dfbb5a7914c2f2b1d7d1fc1ce6b419dda129bb6cfb083ae674a14732b7b7330dee2287635749d91f8ee7e16badd71c723d189a1a44c309dd +DIST xrootd-5.6.4.tar.gz 6696858 BLAKE2B 09e7bcd750f6eac5714eab7eb945a55e939d4ad5310b3bfe90b1322f00064778d179396d9e9a89dc4bafda5ee924054e71c5bfe8474889b31dc3e2bcd24ed4c4 SHA512 efa88da2c9e9e55aeab9c4fbec0ec688fbc6ea8e16178bbcbdd534a09609b5c645cafee023fed48495cda8e865210e2fd3ba4830852f157626ecc1995eb55988 +DIST xrootd-5.6.7.tar.gz 6698751 BLAKE2B cb702a450b81665b53cf15d5c8df239826148c3cd746db7778b48ae01244257ce4877402c3e07ef6aa5228f9ae97f1b39210ed46ea2c802c35b7c4d8ad6a7fcf SHA512 e7ec8b6eae684f27b5044890c45492f7d9b2b8812a9131ff45db63984869aa62cd85836d71b4100e89a6bb98ee3864062940d4dec0fdb340472df126d6de4d41 +DIST xrootd-5.6.9.tar.gz 6701277 BLAKE2B 0086455f251879acf2d635ed0ae533dfa2c3e006798df27111d35599f1833ce1342c9eec1f540f3a165376c91233181420635bae5e1cb4d552681d8cfe36d902 SHA512 9ba15524451ebe7ee12d689f9c56d85508996285d01885236d396b7742ff6cc03036a6b4bd1424b0e1553cbf382c0954c10cec76fa1a99a7dfff330686bad0cd diff --git a/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch b/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch new file mode 100644 index 000000000000..04607cdd7b04 --- /dev/null +++ b/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch @@ -0,0 +1,15 @@ +--- a/bindings/python/CMakeLists.txt ++++ b/bindings/python/CMakeLists.txt +@@ -32,6 +32,7 @@ + + configure_file(${SETUP_PY_IN} ${SETUP_PY}) + ++if (0) + string(FIND "${PIP_OPTIONS}" "--prefix" PIP_OPTIONS_PREFIX_POSITION) + if( "${PIP_OPTIONS_PREFIX_POSITION}" EQUAL "-1" ) + string(APPEND PIP_OPTIONS " --prefix \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}") +@@ -100,3 +101,4 @@ + )" + ) + endif() ++endif() diff --git a/net-libs/xrootd/files/xrootd-5.4.3-python_tests_py3.patch b/net-libs/xrootd/files/xrootd-5.4.3-python_tests_py3.patch new file mode 100644 index 000000000000..e20e45309e39 --- /dev/null +++ b/net-libs/xrootd/files/xrootd-5.4.3-python_tests_py3.patch @@ -0,0 +1,169 @@ +--- a/bindings/python/tests/test_copy.py ++++ b/bindings/python/tests/test_copy.py +@@ -61,15 +61,15 @@ + + class TestProgressHandler(object): + def begin(self, id, total, source, target): +- print '+++ begin(): %d, total: %d' % (id, total) +- print '+++ source: %s' % source +- print '+++ target: %s' % target ++ print('+++ begin(): %d, total: %d' % (id, total)) ++ print('+++ source: %s' % source) ++ print('+++ target: %s' % target) + + def end(self, jobId, status): +- print '+++ end(): jobId: %s, status: %s' % (jobId, status) ++ print('+++ end(): jobId: %s, status: %s' % (jobId, status)) + + def update(self, jobId, processed, total): +- print '+++ update(): jobid: %s, processed: %d, total: %d' % (jobId, processed, total) ++ print('+++ update(): jobid: %s, processed: %d, total: %d' % (jobId, processed, total)) + + def test_copy_progress_handler(): + c = client.CopyProcess() +--- a/bindings/python/tests/test_file.py ++++ b/bindings/python/tests/test_file.py +@@ -289,9 +289,9 @@ + for i, l in enumerate(lines): + total += len(l) + if l != pylines[i]: +- print '!!!!!', total, i +- print '+++++ py: %r' % pylines[i] +- print '+++++ me: %r' % l ++ print('!!!!!', total, i) ++ print('+++++ py: %r' % pylines[i]) ++ print('+++++ me: %r' % l) + break + if pylines[i].endswith('\n'): + assert l.endswith('\n') +--- a/bindings/python/tests/test_filesystem.py ++++ b/bindings/python/tests/test_filesystem.py +@@ -37,20 +37,20 @@ + status, response = f.open(smallfile, OpenFlags.NEW) + + for func, args, hasReturnObject in funcspecs: +- async(func, args, hasReturnObject) ++ run_async(func, args, hasReturnObject) + + def sync(func, args, hasReturnObject): + status, response = func(*args) +- print status ++ print(status) + assert status.ok + if hasReturnObject: +- print response ++ print(response) + assert response + +-def async(func, args, hasReturnObject): ++def run_async(func, args, hasReturnObject): + handler = AsyncResponseHandler() + status = func(callback=handler, *args) +- print status ++ print(status) + assert status.ok + status, response, hostlist = handler.wait() + +@@ -60,7 +60,7 @@ + + for host in hostlist: + assert host.url +- print host.url ++ print(host.url) + + if hasReturnObject: + assert response +@@ -79,7 +79,7 @@ + + try: + os.remove('/tmp/eggs') +- except OSError, __: ++ except OSError as __: + pass + + def test_locate_sync(): +@@ -127,7 +127,7 @@ + + for item in response: + assert item.name +- print item.statinfo ++ print(item.statinfo) + assert item.statinfo + assert item.hostaddr + +@@ -143,11 +143,11 @@ + assert status.ok + + for h in hostlist: +- print h.url ++ print(h.url) + + for item in response: + assert item.name +- print item.statinfo ++ print(item.statinfo) + assert item.statinfo + assert item.hostaddr + +@@ -158,7 +158,7 @@ + status, response = c.query(QueryCode.STATS, 'a') + assert status.ok + assert response +- print response ++ print(response) + + def test_query_async(): + c = client.FileSystem(SERVER_URL) +@@ -169,7 +169,7 @@ + status, response, hostlist = handler.wait() + assert status.ok + assert response +- print response ++ print(response) + + def test_mkdir_flags(): + c = client.FileSystem(SERVER_URL) +--- a/bindings/python/tests/test_glob.py ++++ b/bindings/python/tests/test_glob.py +@@ -2,7 +2,7 @@ + import os + import glob as norm_glob + import XRootD.client.glob_funcs as glob +-from pathlib2 import Path ++from pathlib import Path + + + @pytest.fixture +@@ -13,7 +13,7 @@ + subdir2.mkdir() + for i in range(3): + dummy = subdir1 / ("a_file_%d.txt" % i) +- dummy.write_text(u"This is file %d\n" % i, encoding="utf-8") ++ dummy.write_text("This is file %d\n" % i, encoding="utf-8") + return tmpdir + + +--- a/bindings/python/tests/test_threads.py ++++ b/bindings/python/tests/test_threads.py +@@ -15,10 +15,10 @@ + s, _ = self.file.write(smallbuffer) + assert s.ok + +- print '+++ thread %d says: %s' % (self.id, self.file.read()) ++ print('+++ thread %d says: %s' % (self.id, self.file.read())) + + for line in self.file: +- print '+++ thread %d says: %s' % (self.id, line) ++ print('+++ thread %d says: %s' % (self.id, line)) + + self.file.close() + +@@ -28,7 +28,7 @@ + # assert f.is_open() + # f.write(smallbuffer) + +- for i in xrange(3): ++ for i in range(3): + tt = TestThread(f, i) + tt.start() + tt.join() diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml index 07427db64e20..45b738d5359a 100644 --- a/net-libs/xrootd/metadata.xml +++ b/net-libs/xrootd/metadata.xml @@ -9,12 +9,21 @@ XROOTD software framework is a fully generic suite for fast, low latency and scalable data access, which can serve natively any kind of data, organized as a hierarchical filesystem-like namespace, based on the - concept of directory. + concept of directory. It is usually used with <pkg>sci-physics/root</pkg> and its PROOF facilities for cluster computing in high energy physics. -</longdescription> + </longdescription> + <upstream> + <remote-id type="github">xrootd/xrootd</remote-id> + </upstream> <use> + <flag name="ceph">Enable suport for <pkg>sys-cluster/ceph</pkg> (XrdCeph plugin)</flag> <flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag> <flag name="http">Enable http protocol support</flag> + <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing (preferred) instead of bundled tinyxml</flag> + <flag name="macaroons">Enable support for macaroons with <pkg>dev-libs/libmacaroons</pkg></flag> + <flag name="scitokens">Enable support for scitokens with <pkg>dev-cpp/scitokens-cpp</pkg></flag> + <flag name="server">Install xrootd server and related plug-ins</flag> + <flag name="xrdec">Enable erasure coding support (XrdEc plugin) with <pkg>dev-libs/isa-l</pkg></flag> </use> </pkgmetadata> diff --git a/net-libs/xrootd/xrootd-5.0.3-r1.ebuild b/net-libs/xrootd/xrootd-5.0.3-r1.ebuild deleted file mode 100644 index 260b6f8047ba..000000000000 --- a/net-libs/xrootd/xrootd-5.0.3-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -# Upstream does not support the building of Python bindings -# via CMake for more than one implementation at a time. -inherit cmake python-single-r1 - -DESCRIPTION="Extended ROOT remote file server" -HOMEPAGE="http://xrootd.org/" -SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc examples fuse http kerberos python readline ssl test" -RESTRICT="!test? ( test )" - -CDEPEND="acct-group/xrootd - acct-user/xrootd - sys-libs/zlib - virtual/libcrypt:= - fuse? ( sys-fs/fuse:= ) - kerberos? ( virtual/krb5 ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - ssl? ( dev-libs/openssl:0= ) -" -DEPEND="${CDEPEND}" -BDEPEND=" - doc? ( - app-doc/doxygen[dot] - python? ( dev-python/sphinx ) - ) - test? ( dev-util/cppunit ) -" -RDEPEND="${CDEPEND} - dev-lang/perl -" -REQUIRED_USE=" - http? ( kerberos ssl ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch ) - -# xrootd plugins are not intended to be linked with, -# they are to be loaded at runtime by xrootd, -# see https://github.com/xrootd/xrootd/issues/447 -QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so - /usr/lib.*/libXrdClTests\.so" - -pkg_setup() { - use python && python_setup -} - -src_configure() { - local mycmakeargs=( - -DENABLE_CRYPTO=$(usex ssl) - -DENABLE_FUSE=$(usex fuse) - -DENABLE_HTTP=$(usex http) - -DENABLE_KRB5=$(usex kerberos) - -DENABLE_PYTHON=$(usex python) - -DENABLE_READLINE=$(usex readline) - -DENABLE_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc; then - doxygen Doxyfile || die - if use python; then - emake -C bindings/python/docs html - fi - fi -} - -src_install() { - use doc && HTML_DOCS=( doxydoc/html/. ) - dodoc docs/ReleaseNotes.txt - cmake_src_install - find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die - - # base configs - insinto /etc/xrootd - doins packaging/common/*.cfg - - fowners root:xrootd /etc/xrootd - keepdir /var/log/xrootd - fowners xrootd:xrootd /var/log/xrootd - - local i - for i in cmsd frm_purged frm_xfrd xrootd; do - newinitd "${FILESDIR}"/${i}.initd ${i} - done - # all daemons MUST use single master config file - newconfd "${FILESDIR}"/xrootd.confd xrootd - - if use python; then - python_optimize "${D}/$(python_get_sitedir)" - - if use doc; then - docinto python - docompress -x "/usr/share/doc/${PF}/python/html" - dodoc -r bindings/python/docs/build/html - fi - if use examples; then - docinto python - dodoc -r bindings/python/examples - fi - fi -} diff --git a/net-libs/xrootd/xrootd-5.1.1-r1.ebuild b/net-libs/xrootd/xrootd-5.1.1-r1.ebuild deleted file mode 100644 index dd384c7040ef..000000000000 --- a/net-libs/xrootd/xrootd-5.1.1-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -# Upstream does not support the building of Python bindings -# via CMake for more than one implementation at a time. -inherit cmake python-single-r1 - -DESCRIPTION="Extended ROOT remote file server" -HOMEPAGE="http://xrootd.org/" -SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples fuse http kerberos python readline ssl test" -RESTRICT="!test? ( test )" - -CDEPEND="acct-group/xrootd - acct-user/xrootd - sys-libs/zlib - virtual/libcrypt:= - fuse? ( sys-fs/fuse:= ) - kerberos? ( virtual/krb5 ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - ssl? ( dev-libs/openssl:0= ) -" -DEPEND="${CDEPEND}" -BDEPEND=" - doc? ( - app-doc/doxygen[dot] - python? ( dev-python/sphinx ) - ) - test? ( dev-util/cppunit ) -" -RDEPEND="${CDEPEND} - dev-lang/perl -" -REQUIRED_USE=" - http? ( kerberos ssl ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch ) - -# xrootd plugins are not intended to be linked with, -# they are to be loaded at runtime by xrootd, -# see https://github.com/xrootd/xrootd/issues/447 -QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so - /usr/lib.*/libXrdClTests\.so" - -pkg_setup() { - use python && python_setup -} - -src_configure() { - local mycmakeargs=( - -DENABLE_CRYPTO=$(usex ssl) - -DENABLE_FUSE=$(usex fuse) - -DENABLE_HTTP=$(usex http) - -DENABLE_KRB5=$(usex kerberos) - -DENABLE_PYTHON=$(usex python) - -DENABLE_READLINE=$(usex readline) - -DENABLE_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc; then - doxygen Doxyfile || die - if use python; then - emake -C bindings/python/docs html - fi - fi -} - -src_install() { - use doc && HTML_DOCS=( doxydoc/html/. ) - dodoc docs/ReleaseNotes.txt - cmake_src_install - find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die - - # base configs - insinto /etc/xrootd - doins packaging/common/*.cfg - - fowners root:xrootd /etc/xrootd - keepdir /var/log/xrootd - fowners xrootd:xrootd /var/log/xrootd - - local i - for i in cmsd frm_purged frm_xfrd xrootd; do - newinitd "${FILESDIR}"/${i}.initd ${i} - done - # all daemons MUST use single master config file - newconfd "${FILESDIR}"/xrootd.confd xrootd - - if use python; then - python_optimize "${D}/$(python_get_sitedir)" - - if use doc; then - docinto python - docompress -x "/usr/share/doc/${PF}/python/html" - dodoc -r bindings/python/docs/build/html - fi - if use examples; then - docinto python - dodoc -r bindings/python/examples - fi - fi -} diff --git a/net-libs/xrootd/xrootd-5.2.0-r1.ebuild b/net-libs/xrootd/xrootd-5.2.0-r1.ebuild deleted file mode 100644 index 0b53eaf8ca75..000000000000 --- a/net-libs/xrootd/xrootd-5.2.0-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) - -# Upstream does not support the building of Python bindings -# via CMake for more than one implementation at a time. -inherit cmake python-single-r1 - -DESCRIPTION="Extended ROOT remote file server" -HOMEPAGE="http://xrootd.org/" -SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples fuse http kerberos python readline ssl test" -RESTRICT="!test? ( test )" - -CDEPEND="acct-group/xrootd - acct-user/xrootd - sys-libs/zlib - virtual/libcrypt:= - fuse? ( sys-fs/fuse:= ) - kerberos? ( virtual/krb5 ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - ssl? ( dev-libs/openssl:0= ) -" -DEPEND="${CDEPEND}" -BDEPEND=" - doc? ( - app-doc/doxygen[dot] - python? ( dev-python/sphinx ) - ) - test? ( dev-util/cppunit ) -" -RDEPEND="${CDEPEND} - dev-lang/perl -" -REQUIRED_USE=" - http? ( kerberos ssl ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch ) - -# xrootd plugins are not intended to be linked with, -# they are to be loaded at runtime by xrootd, -# see https://github.com/xrootd/xrootd/issues/447 -QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so - /usr/lib.*/libXrdClTests\.so" - -pkg_setup() { - use python && python_setup -} - -src_configure() { - local mycmakeargs=( - -DENABLE_CRYPTO=$(usex ssl) - -DENABLE_FUSE=$(usex fuse) - -DENABLE_HTTP=$(usex http) - -DENABLE_KRB5=$(usex kerberos) - -DENABLE_PYTHON=$(usex python) - -DENABLE_READLINE=$(usex readline) - -DENABLE_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc; then - doxygen Doxyfile || die - if use python; then - emake -C bindings/python/docs html - fi - fi -} - -src_install() { - use doc && HTML_DOCS=( doxydoc/html/. ) - dodoc docs/ReleaseNotes.txt - cmake_src_install - find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die - - # base configs - insinto /etc/xrootd - doins packaging/common/*.cfg - - fowners root:xrootd /etc/xrootd - keepdir /var/log/xrootd - fowners xrootd:xrootd /var/log/xrootd - - local i - for i in cmsd frm_purged frm_xfrd xrootd; do - newinitd "${FILESDIR}"/${i}.initd ${i} - done - # all daemons MUST use single master config file - newconfd "${FILESDIR}"/xrootd.confd xrootd - - if use python; then - python_optimize "${D}/$(python_get_sitedir)" - - if use doc; then - docinto python - docompress -x "/usr/share/doc/${PF}/python/html" - dodoc -r bindings/python/docs/build/html - fi - if use examples; then - docinto python - dodoc -r bindings/python/examples - fi - fi -} diff --git a/net-libs/xrootd/xrootd-5.3.1.ebuild b/net-libs/xrootd/xrootd-5.3.1.ebuild deleted file mode 100644 index 7f1abe069f44..000000000000 --- a/net-libs/xrootd/xrootd-5.3.1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -# Upstream does not support the building of Python bindings -# via CMake for more than one implementation at a time. -inherit cmake python-single-r1 - -DESCRIPTION="Extended ROOT remote file server" -HOMEPAGE="http://xrootd.org/" -SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples fuse http kerberos python readline ssl test" -RESTRICT="!test? ( test )" - -CDEPEND="acct-group/xrootd - acct-user/xrootd - sys-libs/zlib - virtual/libcrypt:= - fuse? ( sys-fs/fuse:= ) - kerberos? ( virtual/krb5 ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - ssl? ( dev-libs/openssl:0= ) -" -DEPEND="${CDEPEND}" -BDEPEND=" - doc? ( - app-doc/doxygen[dot] - python? ( dev-python/sphinx ) - ) - test? ( dev-util/cppunit ) -" -RDEPEND="${CDEPEND} - dev-lang/perl -" -REQUIRED_USE=" - http? ( kerberos ssl ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch ) - -# xrootd plugins are not intended to be linked with, -# they are to be loaded at runtime by xrootd, -# see https://github.com/xrootd/xrootd/issues/447 -QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so - /usr/lib.*/libXrdClTests\.so" - -pkg_setup() { - use python && python_setup -} - -src_configure() { - local mycmakeargs=( - -DENABLE_CRYPTO=$(usex ssl) - -DENABLE_FUSE=$(usex fuse) - -DENABLE_HTTP=$(usex http) - -DENABLE_KRB5=$(usex kerberos) - -DENABLE_PYTHON=$(usex python) - -DENABLE_READLINE=$(usex readline) - -DENABLE_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc; then - doxygen Doxyfile || die - if use python; then - emake -C bindings/python/docs html - fi - fi -} - -src_install() { - use doc && HTML_DOCS=( doxydoc/html/. ) - dodoc docs/ReleaseNotes.txt - cmake_src_install - find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die - - # base configs - insinto /etc/xrootd - doins packaging/common/*.cfg - - fowners root:xrootd /etc/xrootd - keepdir /var/log/xrootd - fowners xrootd:xrootd /var/log/xrootd - - local i - for i in cmsd frm_purged frm_xfrd xrootd; do - newinitd "${FILESDIR}"/${i}.initd ${i} - done - # all daemons MUST use single master config file - newconfd "${FILESDIR}"/xrootd.confd xrootd - - if use python; then - python_optimize "${D}/$(python_get_sitedir)" - - if use doc; then - docinto python - docompress -x "/usr/share/doc/${PF}/python/html" - dodoc -r bindings/python/docs/build/html - fi - if use examples; then - docinto python - dodoc -r bindings/python/examples - fi - fi -} diff --git a/net-libs/xrootd/xrootd-5.5.4-r1.ebuild b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild new file mode 100644 index 000000000000..4857db5da8b7 --- /dev/null +++ b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517="setuptools" +DOCS_BUILDER="doxygen" +DOCS_DEPEND=" + media-gfx/graphviz + virtual/latex-base + python? ( dev-python/sphinx ) +" + +inherit cmake docs distutils-r1 + +DESCRIPTION="Extended ROOT remote file server" +HOMEPAGE="https://xrootd.slac.stanford.edu/" +SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +IUSE="examples fuse http kerberos +libxml2 python readline +server systemd test" + +RESTRICT="!test? ( test )" + +CDEPEND="acct-group/xrootd + acct-user/xrootd + dev-libs/openssl:0= + net-libs/davix + sys-libs/zlib + virtual/libcrypt:= + fuse? ( sys-fs/fuse:0= ) + http? ( net-misc/curl:= ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2:2= ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + systemd? ( sys-apps/systemd:= ) +" +DEPEND="${CDEPEND}" +BDEPEND=" + python? ( + ${PYTHON_DEPS} + ${DISTUTILS_DEPS} + test? ( >=dev-python/pytest-7.1.2[${PYTHON_USEDEP}] ) + ) + test? ( dev-util/cppunit ) +" +RDEPEND="${CDEPEND} + dev-lang/perl +" +REQUIRED_USE=" + http? ( kerberos ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( server ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.8.3-crc32.patch + "${FILESDIR}"/${PN}-5.4.3-cmake_no_python.patch + "${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch +) + +# xrootd plugins are not intended to be linked with, +# they are to be loaded at runtime by xrootd, +# see https://github.com/xrootd/xrootd/issues/447 +QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so + /usr/lib.*/libXrdClTests\.so" + +pkg_setup() { + use python && python_setup +} + +src_prepare() { + cmake_src_prepare + + if use python; then + pushd "${S}"/bindings/python > /dev/null || die + distutils-r1_src_prepare + popd > /dev/null || die + fi +} + +# FIXME: support xrdec - currently only builds against bundled isa-l +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes") + -DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex systemd "no" "yes") + -DENABLE_FUSE=$(usex fuse) + -DENABLE_HTTP=$(usex http) + -DENABLE_KRB5=$(usex kerberos) + -DENABLE_MACAROONS=no + -DENABLE_PYTHON=$(usex python) + -DENABLE_READLINE=$(usex readline) + -DENABLE_SCITOKENS=no + -DENABLE_TESTS=$(usex test) + -DENABLE_VOMS=no + -DFORCE_ENABLED=yes + -DXRDCL_ONLY=$(usex server "no" "yes") + ) + cmake_src_configure + + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_configure + popd > /dev/null || die + fi +} + +src_compile() { + cmake_src_compile + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_compile + popd > /dev/null || die + fi + + docs_compile + # secondary documentation for python bindings + if use python && use doc; then + emake -C bindings/python/docs html + fi +} + +python_test() { + epytest +} + +src_test() { + pushd "${BUILD_DIR}/tests" > /dev/null || die + # There are more tests but since these are ones currently run by upstream in their CI, + # let's follow their example. + ./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/UtilsTest/" || die + ./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/SocketTest/" || die + ./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/PollerTest/" || die + popd > /dev/null || die + + # Python tests currently require manual configuration and start-up of an xrootd server. + # TODO: get this to run properly. + #use python && distutils-r1_src_test +} + +src_install() { + dodoc docs/ReleaseNotes.txt + cmake_src_install + find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die + + # base configs + insinto /etc/xrootd + doins packaging/common/*.cfg + + fowners root:xrootd /etc/xrootd + keepdir /var/log/xrootd + fowners xrootd:xrootd /var/log/xrootd + + if use server; then + local i + for i in cmsd frm_purged frm_xfrd xrootd; do + newinitd "${FILESDIR}"/${i}.initd ${i} + done + # all daemons MUST use single master config file + newconfd "${FILESDIR}"/xrootd.confd xrootd + fi + + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_install + popd > /dev/null || die + + if use doc; then + docinto python + docompress -x "/usr/share/doc/${PF}/python/html" + dodoc -r bindings/python/docs/build/html + fi + if use examples; then + docinto python + dodoc -r bindings/python/examples + fi + fi + + if use test; then + for f in test-runner xrdshmap; do + rm "${ED}"/usr/bin/${f} || die "Failed to remove test helper ${f} from installed tree" + done + rm "${ED}"/usr/$(get_libdir)/libXrdClTest*.so || die "Failed to remove test libraries from installed tree" + fi +} diff --git a/net-libs/xrootd/xrootd-5.6.4.ebuild b/net-libs/xrootd/xrootd-5.6.4.ebuild new file mode 100644 index 000000000000..e8e1fcff1f3d --- /dev/null +++ b/net-libs/xrootd/xrootd-5.6.4.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517="setuptools" +DOCS_BUILDER="doxygen" +DOCS_DEPEND=" + media-gfx/graphviz + virtual/latex-base + python? ( dev-python/sphinx ) +" + +inherit cmake docs distutils-r1 systemd + +DESCRIPTION="Extended ROOT remote file server" +HOMEPAGE="https://xrootd.slac.stanford.edu/" +SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz" +LICENSE="LGPL-3+" + +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="ceph examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + http? ( kerberos ) + macaroons? ( server http ) + python? ( ${PYTHON_REQUIRED_USE} ) + scitokens? ( server ) + test? ( server ) +" + +CDEPEND="acct-group/xrootd + acct-user/xrootd + dev-libs/openssl:0= + sys-libs/zlib + virtual/libcrypt:= + ceph? ( sys-cluster/ceph ) + fuse? ( sys-fs/fuse:0= ) + http? ( + net-misc/curl:= + net-libs/davix + ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2:2= ) + macaroons? ( dev-libs/libmacaroons ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + scitokens? ( dev-cpp/scitokens-cpp ) + systemd? ( sys-apps/systemd:= ) + xrdec? ( dev-libs/isa-l ) +" +DEPEND="${CDEPEND}" +BDEPEND=" + python? ( + ${PYTHON_DEPS} + ${DISTUTILS_DEPS} + test? ( >=dev-python/pytest-7.1.2[${PYTHON_USEDEP}] ) + ) + test? ( + dev-cpp/gtest + dev-util/cppunit + ) +" +RDEPEND="${CDEPEND} + dev-lang/perl +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch +) + +# xrootd plugins are not intended to be linked with, +# they are to be loaded at runtime by xrootd, +# see https://github.com/xrootd/xrootd/issues/447 +QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so + /usr/lib.*/libXrd.*Tests\.so" + +pkg_setup() { + use python && python_setup +} + +src_prepare() { + cmake_src_prepare + + if use python; then + pushd "${S}"/bindings/python > /dev/null || die + distutils-r1_src_prepare + popd > /dev/null || die + fi +} + +src_configure() { + local mycmakeargs=( + -DUSE_SYSTEM_ISAL=TRUE + $(usex python "-DINSTALL_PYTHON_BINDINGS=FALSE" "") + -DXRDCEPH_SUBMODULE=$(usex ceph) + -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes") + -DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex systemd "no" "yes") + -DENABLE_FUSE=$(usex fuse) + -DENABLE_HTTP=$(usex http) + -DENABLE_KRB5=$(usex kerberos) + -DENABLE_MACAROONS=$(usex macaroons) + -DENABLE_PYTHON=$(usex python) + -DENABLE_READLINE=$(usex readline) + -DENABLE_SCITOKENS=$(usex scitokens) + -DENABLE_TESTS=$(usex test) + -DENABLE_VOMS=no + -DENABLE_XRDCL=yes + -DENABLE_XRDCLHTTP=$(usex http) + -DENABLE_XRDEC=$(usex xrdec) + -DFORCE_ENABLED=yes + -DXRDCL_ONLY=$(usex server "no" "yes") + ) + cmake_src_configure + + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_configure + popd > /dev/null || die + fi +} + +src_compile() { + cmake_src_compile + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_compile + popd > /dev/null || die + fi + + docs_compile + # secondary documentation for python bindings + if use python && use doc; then + emake -C bindings/python/docs html + fi +} + +python_test() { + epytest +} + +src_test() { + cmake_src_test + # Python tests currently require manual configuration and start-up of an xrootd server. + # TODO: get this to run properly. + #use python && distutils-r1_src_test +} + +src_install() { + dodoc docs/ReleaseNotes.txt + cmake_src_install + find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die + + if use server; then + local i + for i in cmsd frm_purged frm_xfrd xrootd; do + newinitd "${FILESDIR}"/${i}.initd ${i} + done + # all daemons MUST use single master config file + newconfd "${FILESDIR}"/xrootd.confd xrootd + + if use systemd; then + systemd_dounit packaging/common/*.{service,socket} + fi + fi + + # base configs + insinto /etc/xrootd + doins packaging/common/*.cfg + + keepdir /etc/xrootd/config.d + keepdir /var/log/xrootd + + fowners -R xrootd:xrootd /etc/xrootd + fowners -R xrootd:xrootd /var/log/xrootd + + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_install + popd > /dev/null || die + + if use doc; then + docinto python + docompress -x "/usr/share/doc/${PF}/python/html" + dodoc -r bindings/python/docs/build/html + fi + if use examples; then + docinto python + dodoc -r bindings/python/examples + fi + fi + + if use test; then + for f in test-runner xrdshmap; do + rm "${ED}"/usr/bin/${f} || die "Failed to remove test helper ${f} from installed tree" + done + rm "${ED}"/usr/$(get_libdir)/libXrd*Test*.so || die "Failed to remove test libraries from installed tree" + fi +} diff --git a/net-libs/xrootd/xrootd-5.6.7.ebuild b/net-libs/xrootd/xrootd-5.6.7.ebuild new file mode 100644 index 000000000000..811ec1eac3de --- /dev/null +++ b/net-libs/xrootd/xrootd-5.6.7.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517="setuptools" +DOCS_BUILDER="doxygen" +DOCS_DEPEND=" + media-gfx/graphviz + virtual/latex-base + python? ( dev-python/sphinx ) +" + +inherit cmake docs distutils-r1 systemd + +DESCRIPTION="Extended ROOT remote file server" +HOMEPAGE="https://xrootd.slac.stanford.edu/" +SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz" +LICENSE="LGPL-3+" + +SLOT="0" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +IUSE="ceph examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + http? ( kerberos ) + macaroons? ( server http ) + python? ( ${PYTHON_REQUIRED_USE} ) + scitokens? ( server ) + test? ( server ) +" + +CDEPEND="acct-group/xrootd + acct-user/xrootd + dev-libs/openssl:0= + sys-libs/zlib + virtual/libcrypt:= + ceph? ( sys-cluster/ceph ) + fuse? ( sys-fs/fuse:0= ) + http? ( + net-misc/curl:= + net-libs/davix + ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2:2= ) + macaroons? ( dev-libs/libmacaroons ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + scitokens? ( dev-cpp/scitokens-cpp ) + systemd? ( sys-apps/systemd:= ) + xrdec? ( dev-libs/isa-l ) +" +DEPEND="${CDEPEND}" +BDEPEND=" + python? ( + ${PYTHON_DEPS} + ${DISTUTILS_DEPS} + test? ( >=dev-python/pytest-7.1.2[${PYTHON_USEDEP}] ) + ) + test? ( + dev-cpp/gtest + dev-util/cppunit + ) +" +RDEPEND="${CDEPEND} + dev-lang/perl +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch +) + +# xrootd plugins are not intended to be linked with, +# they are to be loaded at runtime by xrootd, +# see https://github.com/xrootd/xrootd/issues/447 +QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so + /usr/lib.*/libXrd.*Tests\.so" + +pkg_setup() { + use python && python_setup +} + +src_prepare() { + cmake_src_prepare + + if use python; then + pushd "${S}"/bindings/python > /dev/null || die + distutils-r1_src_prepare + popd > /dev/null || die + fi +} + +src_configure() { + local mycmakeargs=( + -DUSE_SYSTEM_ISAL=TRUE + $(usex python "-DINSTALL_PYTHON_BINDINGS=FALSE" "") + -DXRDCEPH_SUBMODULE=$(usex ceph) + -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes") + -DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex systemd "no" "yes") + -DENABLE_FUSE=$(usex fuse) + -DENABLE_HTTP=$(usex http) + -DENABLE_KRB5=$(usex kerberos) + -DENABLE_MACAROONS=$(usex macaroons) + -DENABLE_PYTHON=$(usex python) + -DENABLE_READLINE=$(usex readline) + -DENABLE_SCITOKENS=$(usex scitokens) + -DENABLE_TESTS=$(usex test) + -DENABLE_VOMS=no + -DENABLE_XRDCL=yes + -DENABLE_XRDCLHTTP=$(usex http) + -DENABLE_XRDEC=$(usex xrdec) + -DFORCE_ENABLED=yes + -DXRDCL_ONLY=$(usex server "no" "yes") + ) + cmake_src_configure + + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_configure + popd > /dev/null || die + fi +} + +src_compile() { + cmake_src_compile + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_compile + popd > /dev/null || die + fi + + docs_compile + # secondary documentation for python bindings + if use python && use doc; then + emake -C bindings/python/docs html + fi +} + +python_test() { + epytest +} + +src_test() { + cmake_src_test + # Python tests currently require manual configuration and start-up of an xrootd server. + # TODO: get this to run properly. + #use python && distutils-r1_src_test +} + +src_install() { + dodoc docs/ReleaseNotes.txt + cmake_src_install + find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die + + if use server; then + local i + for i in cmsd frm_purged frm_xfrd xrootd; do + newinitd "${FILESDIR}"/${i}.initd ${i} + done + # all daemons MUST use single master config file + newconfd "${FILESDIR}"/xrootd.confd xrootd + + if use systemd; then + systemd_dounit packaging/common/*.{service,socket} + fi + fi + + # base configs + insinto /etc/xrootd + doins packaging/common/*.cfg + + keepdir /etc/xrootd/config.d + keepdir /var/log/xrootd + + fowners -R xrootd:xrootd /etc/xrootd + fowners -R xrootd:xrootd /var/log/xrootd + + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_install + popd > /dev/null || die + + if use doc; then + docinto python + docompress -x "/usr/share/doc/${PF}/python/html" + dodoc -r bindings/python/docs/build/html + fi + if use examples; then + docinto python + dodoc -r bindings/python/examples + fi + fi + + if use test; then + for f in test-runner xrdshmap; do + rm "${ED}"/usr/bin/${f} || die "Failed to remove test helper ${f} from installed tree" + done + rm "${ED}"/usr/$(get_libdir)/libXrd*Test*.so || die "Failed to remove test libraries from installed tree" + fi +} diff --git a/net-libs/xrootd/xrootd-5.6.9.ebuild b/net-libs/xrootd/xrootd-5.6.9.ebuild new file mode 100644 index 000000000000..e8e1fcff1f3d --- /dev/null +++ b/net-libs/xrootd/xrootd-5.6.9.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517="setuptools" +DOCS_BUILDER="doxygen" +DOCS_DEPEND=" + media-gfx/graphviz + virtual/latex-base + python? ( dev-python/sphinx ) +" + +inherit cmake docs distutils-r1 systemd + +DESCRIPTION="Extended ROOT remote file server" +HOMEPAGE="https://xrootd.slac.stanford.edu/" +SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz" +LICENSE="LGPL-3+" + +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="ceph examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + http? ( kerberos ) + macaroons? ( server http ) + python? ( ${PYTHON_REQUIRED_USE} ) + scitokens? ( server ) + test? ( server ) +" + +CDEPEND="acct-group/xrootd + acct-user/xrootd + dev-libs/openssl:0= + sys-libs/zlib + virtual/libcrypt:= + ceph? ( sys-cluster/ceph ) + fuse? ( sys-fs/fuse:0= ) + http? ( + net-misc/curl:= + net-libs/davix + ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2:2= ) + macaroons? ( dev-libs/libmacaroons ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + scitokens? ( dev-cpp/scitokens-cpp ) + systemd? ( sys-apps/systemd:= ) + xrdec? ( dev-libs/isa-l ) +" +DEPEND="${CDEPEND}" +BDEPEND=" + python? ( + ${PYTHON_DEPS} + ${DISTUTILS_DEPS} + test? ( >=dev-python/pytest-7.1.2[${PYTHON_USEDEP}] ) + ) + test? ( + dev-cpp/gtest + dev-util/cppunit + ) +" +RDEPEND="${CDEPEND} + dev-lang/perl +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch +) + +# xrootd plugins are not intended to be linked with, +# they are to be loaded at runtime by xrootd, +# see https://github.com/xrootd/xrootd/issues/447 +QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so + /usr/lib.*/libXrd.*Tests\.so" + +pkg_setup() { + use python && python_setup +} + +src_prepare() { + cmake_src_prepare + + if use python; then + pushd "${S}"/bindings/python > /dev/null || die + distutils-r1_src_prepare + popd > /dev/null || die + fi +} + +src_configure() { + local mycmakeargs=( + -DUSE_SYSTEM_ISAL=TRUE + $(usex python "-DINSTALL_PYTHON_BINDINGS=FALSE" "") + -DXRDCEPH_SUBMODULE=$(usex ceph) + -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes") + -DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex systemd "no" "yes") + -DENABLE_FUSE=$(usex fuse) + -DENABLE_HTTP=$(usex http) + -DENABLE_KRB5=$(usex kerberos) + -DENABLE_MACAROONS=$(usex macaroons) + -DENABLE_PYTHON=$(usex python) + -DENABLE_READLINE=$(usex readline) + -DENABLE_SCITOKENS=$(usex scitokens) + -DENABLE_TESTS=$(usex test) + -DENABLE_VOMS=no + -DENABLE_XRDCL=yes + -DENABLE_XRDCLHTTP=$(usex http) + -DENABLE_XRDEC=$(usex xrdec) + -DFORCE_ENABLED=yes + -DXRDCL_ONLY=$(usex server "no" "yes") + ) + cmake_src_configure + + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_configure + popd > /dev/null || die + fi +} + +src_compile() { + cmake_src_compile + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_compile + popd > /dev/null || die + fi + + docs_compile + # secondary documentation for python bindings + if use python && use doc; then + emake -C bindings/python/docs html + fi +} + +python_test() { + epytest +} + +src_test() { + cmake_src_test + # Python tests currently require manual configuration and start-up of an xrootd server. + # TODO: get this to run properly. + #use python && distutils-r1_src_test +} + +src_install() { + dodoc docs/ReleaseNotes.txt + cmake_src_install + find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die + + if use server; then + local i + for i in cmsd frm_purged frm_xfrd xrootd; do + newinitd "${FILESDIR}"/${i}.initd ${i} + done + # all daemons MUST use single master config file + newconfd "${FILESDIR}"/xrootd.confd xrootd + + if use systemd; then + systemd_dounit packaging/common/*.{service,socket} + fi + fi + + # base configs + insinto /etc/xrootd + doins packaging/common/*.cfg + + keepdir /etc/xrootd/config.d + keepdir /var/log/xrootd + + fowners -R xrootd:xrootd /etc/xrootd + fowners -R xrootd:xrootd /var/log/xrootd + + if use python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_install + popd > /dev/null || die + + if use doc; then + docinto python + docompress -x "/usr/share/doc/${PF}/python/html" + dodoc -r bindings/python/docs/build/html + fi + if use examples; then + docinto python + dodoc -r bindings/python/examples + fi + fi + + if use test; then + for f in test-runner xrdshmap; do + rm "${ED}"/usr/bin/${f} || die "Failed to remove test helper ${f} from installed tree" + done + rm "${ED}"/usr/$(get_libdir)/libXrd*Test*.so || die "Failed to remove test libraries from installed tree" + fi +} diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest index 59db8d2e153a..277b438efc89 100644 --- a/net-libs/zeromq/Manifest +++ b/net-libs/zeromq/Manifest @@ -1,2 +1,3 @@ DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1 DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e +DIST zeromq-4.3.5.tar.gz 2530237 BLAKE2B 1ece80f4d4f6bba401c9801105cb9adecdde28c619035970a5d8e75ae4617e023c89857ef81179331cbe23b9bb69a0c15904ce9099fa59440829fb5986348d7e SHA512 a71d48aa977ad8941c1609947d8db2679fc7a951e4cd0c3a1127ae026d883c11bd4203cf315de87f95f5031aec459a731aec34e5ce5b667b8d0559b157952541 diff --git a/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch b/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch new file mode 100644 index 000000000000..79deeacc2bd8 --- /dev/null +++ b/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch @@ -0,0 +1,55 @@ +https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d + +From 438d5d88392baffa6c2c5e0737d9de19d6686f0d Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Tue, 20 Dec 2022 21:45:16 +0000 +Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type + +`gcc-13` added an assert to standard headers to make sure custom +allocators have intended implementation of rebind type instead +of inherited rebind. gcc change: + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7 + +Without the fix build fails on this week's `gcc-13` as: + + [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o + In file included from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34, + from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64, + from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/memory:69, + from tests/../src/secure_allocator.hpp:42, + from tests/../src/curve_client_tools.hpp:49, + from tests/test_security_curve.cpp:53: + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<zmq::secure_allocator_t<unsigned char>, unsigned char, void>': + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t<unsigned char>; _Up = unsigned char]' + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t<unsigned char>]' + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits<zmq::secure_allocator_t<unsigned char>, unsigned char>::rebind<unsigned char>' + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base<unsigned char, zmq::secure_allocator_t<unsigned char> >' + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector<unsigned char, zmq::secure_allocator_t<unsigned char> >' + tests/../src/curve_client_tools.hpp:64:76: required from here + /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A + 70 | _Tp>::value, + | ^~~~~ + +The change adds trivial `rebind` definition with expected return type +and satisfies conversion requirements. +--- a/src/secure_allocator.hpp ++++ b/src/secure_allocator.hpp +@@ -99,6 +99,17 @@ bool operator!= (const secure_allocator_t<T> &, const secure_allocator_t<U> &) + #else + template <typename T> struct secure_allocator_t : std::allocator<T> + { ++ secure_allocator_t () ZMQ_DEFAULT; ++ ++ template <class U> ++ secure_allocator_t (const secure_allocator_t<U> &) ZMQ_NOEXCEPT ++ { ++ } ++ ++ template <class U> struct rebind ++ { ++ typedef secure_allocator_t<U> other; ++ }; + }; + #endif + } + diff --git a/net-libs/zeromq/files/zeromq-4.3.4-qemu-user.patch b/net-libs/zeromq/files/zeromq-4.3.4-qemu-user.patch new file mode 100644 index 000000000000..8374496e39e1 --- /dev/null +++ b/net-libs/zeromq/files/zeromq-4.3.4-qemu-user.patch @@ -0,0 +1,52 @@ +UPSTREAM: https://github.com/zeromq/libzmq/pull/4486 +BUG: https://bugs.gentoo.org/899986 +From: Han Gao <gaohan@iscas.ac.cn> + +In qemu-user, CACHELINE_SIZE probe is undefined + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8672d61799..072a6507e9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -481,7 +481,8 @@ execute_process( + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + if(CACHELINE_SIZE STREQUAL "" + OR CACHELINE_SIZE EQUAL 0 +- OR CACHELINE_SIZE EQUAL -1) ++ OR CACHELINE_SIZE EQUAL -1 ++ OR CACHELINE_SIZE EQUAL "undefined") + set(ZMQ_CACHELINE_SIZE 64) + else() + set(ZMQ_CACHELINE_SIZE ${CACHELINE_SIZE}) +diff --git a/RELICENSE/hangao.md b/RELICENSE/hangao.md +new file mode 100644 +index 0000000000..de100bb59a +--- /dev/null ++++ b/RELICENSE/hangao.md +@@ -0,0 +1,13 @@ ++# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL ++ ++This is a statement by Han Gao that grants permission to relicense its copyrights in the libzmq C++ ++library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other ++Open Source Initiative approved license chosen by the current ZeroMQ ++BDFL (Benevolent Dictator for Life). ++ ++A portion of the commits made by the Github handle "Rabenda", with ++commit author "Han Gao <gaohan@iscas.ac.cn>" or "Han Gao <rabenda.cn@gmail.com>", are copyright of Han Gao . ++This document hereby grants the libzmq project team to relicense libzmq, ++including all past, present and future contributions of the author listed above. ++ ++Han Gao 2023/01/10 +diff --git a/acinclude.m4 b/acinclude.m4 +index ac55776e53..f27fc8e831 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1254,7 +1254,7 @@ AC_DEFUN([LIBZMQ_CHECK_CACHELINE], [{ + AC_CHECK_TOOL(libzmq_getconf, getconf) + if ! test "x$libzmq_getconf" = "x"; then + zmq_cacheline_size=$($libzmq_getconf LEVEL1_DCACHE_LINESIZE 2>/dev/null || echo 64) +- if test "x$zmq_cacheline_size" = "x0" -o "x$zmq_cacheline_size" = "x-1"; then ++ if test "x$zmq_cacheline_size" = "x0" -o "x$zmq_cacheline_size" = "x-1" -o "x$zmq_cacheline_size" = "xundefined"; then + # getconf on some architectures does not know the size, try to fallback to + # the value the kernel knows on Linux + zmq_cacheline_size=$(cat /sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size 2>/dev/null || echo 64) diff --git a/net-libs/zeromq/files/zeromq-4.3.5-c99.patch b/net-libs/zeromq/files/zeromq-4.3.5-c99.patch new file mode 100644 index 000000000000..7f15ef6c6981 --- /dev/null +++ b/net-libs/zeromq/files/zeromq-4.3.5-c99.patch @@ -0,0 +1,37 @@ +https://github.com/zeromq/libzmq/pull/4635 +https://github.com/zeromq/libzmq/commit/665d1d46576f9a4eff6fa42a11c54f23b6b11803 + +From 665d1d46576f9a4eff6fa42a11c54f23b6b11803 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Wed, 29 Nov 2023 14:14:30 +0100 +Subject: [PATCH] Build with -D_DEFAULT_SOURCE along with -std=c11 + +On its own, -std=c11 hides POSIX and other extensions from C headers +such as <stdlib.h> when building against glibc. This causes the +posix_memalign probe to fail incorrectly with compilers that do not +accept implicit function declarations. _DEFAULT_SOURCE is ignored by +most non-GNU/Linux systems or not relevant in this context, so there +is no separate check for adding it. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,7 +122,7 @@ if (NOT MSVC) + if(NOT CMAKE_C_FLAGS MATCHES "-std=" AND NOT C_STANDARD AND NOT CMAKE_C_STANDARD) + check_c_compiler_flag("-std=c11" COMPILER_SUPPORTS_C11) + if(COMPILER_SUPPORTS_C11) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DEFAULT_SOURCE -std=c11") + else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") + endif() +--- a/configure.ac ++++ b/configure.ac +@@ -66,7 +66,7 @@ ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}" + + # Checks for programs. + AC_PROG_CC +-AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS+=" -std=c11"], [AC_PROG_CC_C99]) ++AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS+=" -std=c11 -D_DEFAULT_SOURCE"], [AC_PROG_CC_C99]) + AC_PROG_CXX + AX_CODE_COVERAGE + AM_PROG_CC_C_O + diff --git a/net-libs/zeromq/metadata.xml b/net-libs/zeromq/metadata.xml index 1f419dc1559d..06a50dbf3eed 100644 --- a/net-libs/zeromq/metadata.xml +++ b/net-libs/zeromq/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <maintainer> <email>sustrik@fastmq.com</email> diff --git a/net-libs/zeromq/zeromq-4.3.3-r1.ebuild b/net-libs/zeromq/zeromq-4.3.3-r1.ebuild index da4a09e97c25..87f3eeabceb6 100644 --- a/net-libs/zeromq/zeromq-4.3.3-r1.ebuild +++ b/net-libs/zeromq/zeromq-4.3.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0/5" KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind elibc_Darwin" +IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind" RESTRICT="!test? ( test )" RDEPEND=" @@ -46,7 +46,10 @@ src_configure() { $(use_with sodium libsodium) $(use_with doc docs) ) - econf "${myeconfargs[@]}" + # Force bash for configure until the fixes for bug #923922 land in a release + # https://github.com/zeromq/zproject/pull/1336 + # https://github.com/zeromq/libzmq/pull/4651 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" } src_test() { diff --git a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild index a326c9f95e1a..c18331194b3b 100644 --- a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild +++ b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,8 +11,8 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0/5" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind elibc_Darwin" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind" RESTRICT="!test? ( test )" RDEPEND=" @@ -46,7 +46,10 @@ src_configure() { $(use_with sodium libsodium) $(use_with doc docs) ) - econf "${myeconfargs[@]}" + # Force bash for configure until the fixes for bug #923922 land in a release + # https://github.com/zeromq/zproject/pull/1336 + # https://github.com/zeromq/libzmq/pull/4651 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" } src_test() { diff --git a/net-libs/zeromq/zeromq-4.3.4-r2.ebuild b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild new file mode 100644 index 000000000000..e3d18dcd4cb1 --- /dev/null +++ b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools + +DESCRIPTION="A brokerless kernel" +HOMEPAGE="https://zeromq.org/" +SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/5" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind" +RESTRICT="!test? ( test )" + +RDEPEND=" + !elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) + libbsd? ( dev-libs/libbsd:= ) + sodium? ( dev-libs/libsodium:= ) +" +DEPEND=" + ${RDEPEND} + !elibc_Darwin? ( sys-apps/util-linux ) +" +BDEPEND=" + doc? ( + app-text/asciidoc + app-text/xmlto + ) + pgm? ( virtual/pkgconfig ) +" + +PATCHES=( + "${FILESDIR}"/${P}-gcc-13.patch + "${FILESDIR}"/${P}-qemu-user.patch +) + +src_prepare() { + sed \ + -e '/libzmq_werror=/s:yes:no:g' \ + -i configure.ac || die + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-shared + --without-pgm + $(use_enable drafts) + $(use_enable libbsd) + $(use_enable static-libs static) + $(use_enable unwind libunwind) + $(use_with sodium libsodium) + $(use_with doc docs) + ) + # Force bash for configure until the fixes for bug #923922 land in a release + # https://github.com/zeromq/zproject/pull/1336 + # https://github.com/zeromq/libzmq/pull/4651 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Restricting to one job because multiple tests are using the same port. + # Upstream knows the problem and says it doesn't support parallel test + # execution, see ${S}/INSTALL. + emake -j1 check +} + +src_install() { + default + find "${ED}"/usr/lib* -name '*.la' -delete || die +} diff --git a/net-libs/zeromq/zeromq-4.3.5-r1.ebuild b/net-libs/zeromq/zeromq-4.3.5-r1.ebuild new file mode 100644 index 000000000000..6108f439cba7 --- /dev/null +++ b/net-libs/zeromq/zeromq-4.3.5-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="High-performance asynchronous messaging library" +HOMEPAGE="https://zeromq.org/" +SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0/5" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +IUSE="doc drafts +libbsd +sodium static-libs test unwind" +RESTRICT="!test? ( test )" + +RDEPEND=" + !elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) + libbsd? ( dev-libs/libbsd:= ) + sodium? ( dev-libs/libsodium:= ) +" +DEPEND=" + ${RDEPEND} + !elibc_Darwin? ( sys-apps/util-linux ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-text/asciidoc + app-text/xmlto + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.5-c99.patch +) + +src_prepare() { + default + + # Only here for the c99 configure patch + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-Werror + --enable-shared + $(use_enable drafts) + $(use_enable libbsd) + $(use_enable static-libs static) + $(use_enable unwind libunwind) + $(use_with sodium libsodium) + $(use_with doc docs) + ) + + # Force bash for configure until the fixes for bug #923922 land in a release + # https://github.com/zeromq/zproject/pull/1336 + # https://github.com/zeromq/libzmq/pull/4651 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Restricting to one job because multiple tests are using the same port. + # Upstream knows the problem and says it doesn't support parallel test + # execution, see ${S}/INSTALL. + emake -j1 check +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/net-libs/zeromq/zeromq-4.3.5.ebuild b/net-libs/zeromq/zeromq-4.3.5.ebuild new file mode 100644 index 000000000000..09f7ce445d8f --- /dev/null +++ b/net-libs/zeromq/zeromq-4.3.5.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="High-performance asynchronous messaging library" +HOMEPAGE="https://zeromq.org/" +SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0/5" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +IUSE="doc drafts +libbsd +sodium static-libs test unwind" +RESTRICT="!test? ( test )" + +RDEPEND=" + !elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) + libbsd? ( dev-libs/libbsd:= ) + sodium? ( dev-libs/libsodium:= ) +" +DEPEND=" + ${RDEPEND} + !elibc_Darwin? ( sys-apps/util-linux ) +" +BDEPEND=" + doc? ( + app-text/asciidoc + app-text/xmlto + ) +" + +src_configure() { + local myeconfargs=( + --disable-Werror + --enable-shared + $(use_enable drafts) + $(use_enable libbsd) + $(use_enable static-libs static) + $(use_enable unwind libunwind) + $(use_with sodium libsodium) + $(use_with doc docs) + ) + # Force bash for configure until the fixes for bug #923922 land in a release + # https://github.com/zeromq/zproject/pull/1336 + # https://github.com/zeromq/libzmq/pull/4651 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Restricting to one job because multiple tests are using the same port. + # Upstream knows the problem and says it doesn't support parallel test + # execution, see ${S}/INSTALL. + emake -j1 check +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/net-libs/zmqpp/zmqpp-4.2.0.ebuild b/net-libs/zmqpp/zmqpp-4.2.0-r1.ebuild index 1394708a3dff..147cd25d9633 100644 --- a/net-libs/zmqpp/zmqpp-4.2.0.ebuild +++ b/net-libs/zmqpp/zmqpp-4.2.0-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit cmake if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -10,7 +12,6 @@ else SRC_URI="https://github.com/zeromq/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi -inherit cmake-utils DESCRIPTION="ZeroMQ 'highlevel' C++ bindings" HOMEPAGE="https://github.com/zeromq/zmqpp" @@ -31,5 +32,5 @@ src_configure() { -DZMQPP_BUILD_STATIC=$(usex static-libs) ) - cmake-utils_src_configure + cmake_src_configure } |