From b49088575eb777ced2551f484da86317332d6087 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Jul 2021 02:11:45 +0100 Subject: gentoo resync : 24.07.2021 --- net-libs/Manifest.gz | Bin 33379 -> 33389 bytes net-libs/axtls/Manifest | 2 +- net-libs/axtls/axtls-2.1.5-r100.ebuild | 185 ------------- net-libs/axtls/axtls-2.1.5-r101.ebuild | 178 ++++++++++++ net-libs/gssdp/Manifest | 6 +- net-libs/gssdp/gssdp-1.0.3.ebuild | 57 ---- net-libs/gssdp/gssdp-1.2.2.ebuild | 49 ---- net-libs/gssdp/gssdp-1.3.0.ebuild | 61 +++++ net-libs/gupnp-av/Manifest | 2 + net-libs/gupnp-av/gupnp-av-0.13.0.ebuild | 42 +++ net-libs/gupnp-igd/Manifest | 2 + net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild | 44 +++ net-libs/gupnp/Manifest | 2 + net-libs/gupnp/gupnp-1.3.0.ebuild | 71 +++++ net-libs/libasr/Manifest | 2 +- net-libs/libasr/libasr-1.0.4.ebuild | 2 +- net-libs/libnetconf2/Manifest | 2 +- net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild | 2 +- net-libs/libsearpc/Manifest | 2 +- net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild | 6 +- net-libs/libvncserver/Manifest | 2 +- net-libs/libvncserver/libvncserver-0.9.13.ebuild | 2 +- net-libs/libyang/Manifest | 2 +- net-libs/libyang/libyang-2.0.7.ebuild | 2 +- net-libs/miniupnpc/Manifest | 2 +- net-libs/miniupnpc/miniupnpc-2.2.2.ebuild | 2 +- net-libs/nghttp2/Manifest | 6 +- net-libs/nghttp2/nghttp2-1.42.0-r2.ebuild | 76 ------ net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild | 2 +- net-libs/nghttp2/nghttp2-1.44.0.ebuild | 76 ++++++ net-libs/pjproject/Manifest | 2 + ...21-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch | 289 ++++++++++++++++++++ net-libs/pjproject/pjproject-2.10-r2.ebuild | 125 +++++++++ net-libs/webkit-gtk/Manifest | 4 + net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild | 300 +++++++++++++++++++++ net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild | 300 +++++++++++++++++++++ 36 files changed, 1519 insertions(+), 390 deletions(-) delete mode 100644 net-libs/axtls/axtls-2.1.5-r100.ebuild create mode 100644 net-libs/axtls/axtls-2.1.5-r101.ebuild delete mode 100644 net-libs/gssdp/gssdp-1.0.3.ebuild delete mode 100644 net-libs/gssdp/gssdp-1.2.2.ebuild create mode 100644 net-libs/gssdp/gssdp-1.3.0.ebuild create mode 100644 net-libs/gupnp-av/gupnp-av-0.13.0.ebuild create mode 100644 net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild create mode 100644 net-libs/gupnp/gupnp-1.3.0.ebuild delete mode 100644 net-libs/nghttp2/nghttp2-1.42.0-r2.ebuild create mode 100644 net-libs/nghttp2/nghttp2-1.44.0.ebuild create mode 100644 net-libs/pjproject/files/pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch create mode 100644 net-libs/pjproject/pjproject-2.10-r2.ebuild create mode 100644 net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild create mode 100644 net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index df66ff1eaa6f..57c3e91934ec 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest index 311871f03bb3..317d7d74e150 100644 --- a/net-libs/axtls/Manifest +++ b/net-libs/axtls/Manifest @@ -3,5 +3,5 @@ AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb23145674 AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18 -EBUILD axtls-2.1.5-r100.ebuild 4851 BLAKE2B 654527168c497fcfa02adf84c9445dd3d6ba4916fac602bad198f4a5043824e72d32eca8c8ec54ed28139a0fffe894d75ae7d00abe5e590b377976ffb95c0f95 SHA512 54828ed8e13f1f17a51b40369a19488d48e72de03b08fe1623ffdd3b578d6327e7f943d6e42d561c9209971311e1c2f901551e7ed14d711cbb47dc868390e8a3 +EBUILD axtls-2.1.5-r101.ebuild 4706 BLAKE2B a159b0b0e2714cfcd544973708a2cc55027bfdde1d13f3c485beebe253713e20e3cd4c3385fe1e92d146f82fbef21047de59e34de8c60fdcbe68ebaf8f0c65bd SHA512 c11a0b60ac84687d84da047a3ec422a78713b98322cada28a67d0241853a2ef6534da68fef35338a9a27fa2490aac8e340cd1386f18b17c6af18262a13b8e52e MISC metadata.xml 632 BLAKE2B b83cd23e97a4fdd09ea7354c1245dd65e54c50b418538c2ef71ae9054626861b6516268fcd37485ba19d1981024c47d869cdce00b276473200a7352c29072b1a SHA512 bfd387d998bcf2a457ff01752b553307b0de430cb9372115b366ab80a10866ede54b8ee149c726aba6f12c8cc3c5ea089dc5b25083e95594d8912e181a8626b0 diff --git a/net-libs/axtls/axtls-2.1.5-r100.ebuild b/net-libs/axtls/axtls-2.1.5-r100.ebuild deleted file mode 100644 index d9a47694270d..000000000000 --- a/net-libs/axtls/axtls-2.1.5-r100.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2021 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 user - -################################################################################ -# axtls CONFIG MINI-HOWTO -# -# Note: axtls is highly configurable and uses mconf, like the linux kernel. -# You can configure it in a couple of ways: -# -# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features -# you want, and possibly a lot more. -# -# 2) You can create your own configuration file by doing -# -# FEATURES="keepwork" USE="savedconfig -*" emerge axtls -# cd /var/tmp/portage/net-libs/axtls*/work/axTLS -# make menuconfig -# -# Now configure axtls as you want. Finally save your config file: -# -# cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV} -# -# where ${PV} is the current version. You can then run emerge again with -# your configuration by doing -# -# USE="savedconfig" emerge axtls -# -################################################################################ - -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" -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" - -# TODO: add ipv6, and c#, java, lua, perl bindings -# Currently these all have some issue -BDEPEND="doc? ( app-doc/doxygen )" -RDEPEND=" - httpd? ( - cgi-lua? ( ${LUA_DEPS} ) - cgi-php? ( dev-lang/php[cgi] ) - )" - -#Note1: static, cgi-* makes no sense if httpd is not given -REQUIRED_USE=" - static? ( httpd ) - cgi-lua? ( httpd ${LUA_REQUIRED_USE} ) - cgi-php? ( httpd )" - -AXTLS_GROUP="axtls" -AXTLS_USER="axtls" - -pkg_setup() { - use cgi-lua && lua-single_pkg_setup - - use httpd && { - ebegin "Creating axtls user and group" - enewgroup ${AXTLS_GROUP} - enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP} - } -} - -src_prepare() { - tc-export AR CC - - eapply "${FILESDIR}/explicit-libdir-r1.patch" - - #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() { - cp "${FILESDIR}"/config config/.config || die - - #Respect CFLAGS/LDFLAGS - sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \ - config/.config || die - sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDFLAGS}\":" \ - config/.config || die - - #The logic is that the default config file enables everything and we disable - #here with sed unless a USE flags says to keep it - if use httpd; then - if ! use static; then - sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \ - config/.config || die - fi - if ! use cgi-php && ! use cgi-lua; then - sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \ - config/.config || die - fi - if ! use cgi-php; then - sed -i -e 's:,.php::' config/.config || die - fi - if ! use cgi-lua; then - sed -i -e 's:\.lua,::' \ - -e 's:lua:php:' \ - -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \ - config/.config || die - fi - if use cgi-lua; then - sed -i -e "s:/usr/bin/lua:${LUA}:" config/.config || die - fi - else - sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \ - config/.config || die - fi - - emake -j1 oldconfig < <(yes n) > /dev/null -} - -multilib_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 - sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \ - config/Rules.mak || die - - if use savedconfig; then - restore_config config/.config - if [[ -f config/.config ]]; then - ewarn "Using saved config, all other USE flags ignored" - else - ewarn "No saved config, seeding with the default" - cp "${FILESDIR}"/config config/.config || die - fi - emake -j1 oldconfig < <(yes '') > /dev/null - else - use_flag_config - fi -} - -multilib_src_install() { - if multilib_is_native_abi && 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 - - # The build system needs to install before it builds docs - if multilib_is_native_abi && 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 - - if use httpd; then - newinitd "${FILESDIR}"/axhttpd.initd axhttpd - newconfd "${FILESDIR}"/axhttpd.confd axhttpd - fi - - docompress -x /usr/share/doc/${PF}/README - dodoc README -} diff --git a/net-libs/axtls/axtls-2.1.5-r101.ebuild b/net-libs/axtls/axtls-2.1.5-r101.ebuild new file mode 100644 index 000000000000..5f09e2c9f169 --- /dev/null +++ b/net-libs/axtls/axtls-2.1.5-r101.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2021 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 + +################################################################################ +# axtls CONFIG MINI-HOWTO +# +# Note: axtls is highly configurable and uses mconf, like the linux kernel. +# You can configure it in a couple of ways: +# +# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features +# you want, and possibly a lot more. +# +# 2) You can create your own configuration file by doing +# +# FEATURES="keepwork" USE="savedconfig -*" emerge axtls +# cd /var/tmp/portage/net-libs/axtls*/work/axTLS +# make menuconfig +# +# Now configure axtls as you want. Finally save your config file: +# +# cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV} +# +# where ${PV} is the current version. You can then run emerge again with +# your configuration by doing +# +# USE="savedconfig" emerge axtls +# +################################################################################ + +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" +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" + +# TODO: add ipv6, and c#, java, lua, perl bindings +# Currently these all have some issue +BDEPEND="doc? ( app-doc/doxygen )" +RDEPEND=" + httpd? ( + acct-group/axtls + acct-user/axtls + cgi-lua? ( ${LUA_DEPS} ) + cgi-php? ( dev-lang/php[cgi] ) + )" + +#Note1: static, cgi-* makes no sense if httpd is not given +REQUIRED_USE=" + static? ( httpd ) + cgi-lua? ( httpd ${LUA_REQUIRED_USE} ) + cgi-php? ( httpd )" + +pkg_setup() { + use cgi-lua && lua-single_pkg_setup +} + +src_prepare() { + tc-export AR CC + + eapply "${FILESDIR}/explicit-libdir-r1.patch" + + #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() { + cp "${FILESDIR}"/config config/.config || die + + #Respect CFLAGS/LDFLAGS + sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \ + config/.config || die + sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDFLAGS}\":" \ + config/.config || die + + #The logic is that the default config file enables everything and we disable + #here with sed unless a USE flags says to keep it + if use httpd; then + if ! use static; then + sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \ + config/.config || die + fi + if ! use cgi-php && ! use cgi-lua; then + sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \ + config/.config || die + fi + if ! use cgi-php; then + sed -i -e 's:,.php::' config/.config || die + fi + if ! use cgi-lua; then + sed -i -e 's:\.lua,::' \ + -e 's:lua:php:' \ + -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \ + config/.config || die + fi + if use cgi-lua; then + sed -i -e "s:/usr/bin/lua:${LUA}:" config/.config || die + fi + else + sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \ + config/.config || die + fi + + emake -j1 oldconfig < <(yes n) > /dev/null +} + +multilib_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 + sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \ + config/Rules.mak || die + + if use savedconfig; then + restore_config config/.config + if [[ -f config/.config ]]; then + ewarn "Using saved config, all other USE flags ignored" + else + ewarn "No saved config, seeding with the default" + cp "${FILESDIR}"/config config/.config || die + fi + emake -j1 oldconfig < <(yes '') > /dev/null + else + use_flag_config + fi +} + +multilib_src_install() { + if multilib_is_native_abi && 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 + + # The build system needs to install before it builds docs + if multilib_is_native_abi && 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 + + if use httpd; then + newinitd "${FILESDIR}"/axhttpd.initd axhttpd + newconfd "${FILESDIR}"/axhttpd.confd axhttpd + fi + + docompress -x /usr/share/doc/${PF}/README + dodoc README +} diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest index 482820b42033..4ddf740ffa5f 100644 --- a/net-libs/gssdp/Manifest +++ b/net-libs/gssdp/Manifest @@ -1,7 +1,5 @@ -DIST gssdp-1.0.3.tar.xz 316740 BLAKE2B 50293e653ec5596a986770f3ea81a244b8f9772e9d0c13df0e48f00ee34445c2fc7250702d7928e7dba081715e6d4e379d7a899905c35da84915e6b4058a3307 SHA512 ef72335c3f796aff0d3dce1781d5a0b015508f614d4a73699ebce411b0593419b40c09839ffb62e50cf9d77e16ec0e31d0e23f92d35abb4d105dea47c00a0506 -DIST gssdp-1.2.2.tar.xz 61444 BLAKE2B 917936ba61ef6074939a11792ddb4f3baf0bd88475df7e49fd6e598dc2530610f04661a4b5efcb2a024e0d37011bfab32bcffd644d2a3be2eb1325c9020b73bf SHA512 3d962ac5a633492979d49c722bbbbeec88385fdbd063d3b68f6b82edbc62c9e78c556d48a904460dd04328bf7a79668dcf3ee33bf61a271ac926e01e2e645f68 DIST gssdp-1.2.3.tar.xz 62032 BLAKE2B 761a9e0df8289a595d882497bdda6d180f19328d0e97076446286e34e7735d1b1d07fc0299618955f7d92732d11d533a59cf4012f5167c4610c9856583f06770 SHA512 abce2473995a996b0adc74ced77cb2158cc997ed70edb0c25fbddd85fe9e6afc6bf7f996bbba7a6ed5268dfbe9207ae12f2e6989efe2e8e10cc25293df347e82 -EBUILD gssdp-1.0.3.ebuild 1390 BLAKE2B e976444c3ac2fa6dcc4f680abb1715ed4c4c8198f1ff5dd77914380d5cf7fe8a5f592c6cb3eb6d98a6a59d16148dc722dc72905d486aa344bc15d72d1525fd5d SHA512 26a7e121088e3b4293c798b07a83010095eb7b9a7e7e3ccbec774139d3cfa0b93a51dfaf1d5012b79cfd1c254d9659965fa27e3a9893f802bb75019072120311 -EBUILD gssdp-1.2.2.ebuild 1245 BLAKE2B aea2f4019c721dffd34ba8075eb6a7468ea39537a89961cad9bc62bec14df3f9d433d29ab943c5932d5b8d6b33ad2467463aa5248d2700e0cd32821690a8311d SHA512 e265e54e13963bb27eedc65aa74d3733d6754417b48a94874eb2181db9e43238b02a98197638dd4589058117fe0fdbef6a05f52bf687c6955f0cb7e1c6dbd230 +DIST gssdp-1.3.0.tar.xz 1202916 BLAKE2B af771b4163c8671d1496cedabe5845eed0b12a8dd23aa226c61ca19ad1d83bca7d504ea36f9e8b09b5079373261043c121a8ac09a909f4430be0d5a5eaa995f1 SHA512 6004ee73898e5effb98dd78af116bf4b92735712f0237c57302ebbda82d77c1cfe182e0e6ef7a8c6defd7a66ac76531d0bff740d2a41cfba8ed365b88a539c85 EBUILD gssdp-1.2.3.ebuild 1245 BLAKE2B aea2f4019c721dffd34ba8075eb6a7468ea39537a89961cad9bc62bec14df3f9d433d29ab943c5932d5b8d6b33ad2467463aa5248d2700e0cd32821690a8311d SHA512 e265e54e13963bb27eedc65aa74d3733d6754417b48a94874eb2181db9e43238b02a98197638dd4589058117fe0fdbef6a05f52bf687c6955f0cb7e1c6dbd230 +EBUILD gssdp-1.3.0.ebuild 1512 BLAKE2B a2e895b117d895f3dd497ecf95a53a57939f4cfb6076d8e346346105fa12e16622c611a0fa3079a5f70b9802f4c965af683e742cfb2235049db9ff18131e0360 SHA512 cff03653eed4c1b2dde7d5244af720b716b2541a94572710dec7bce1934aa787c20a08efb4b383395a6058c20a243d24adc7cf1408a3d9a92365e213bd8423df MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-libs/gssdp/gssdp-1.0.3.ebuild b/net-libs/gssdp/gssdp-1.0.3.ebuild deleted file mode 100644 index a5f6b160c168..000000000000 --- a/net-libs/gssdp/gssdp-1.0.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 multilib-minimal vala - -DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP" -HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP" - -LICENSE="LGPL-2" -SLOT="0/3" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86" -IUSE="+introspection gtk" - -RDEPEND=" - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=net-libs/libsoup-2.44.2:2.4[${MULTILIB_USEDEP},introspection?] - gtk? ( >=x11-libs/gtk+-3.0:3 ) - introspection? ( - $(vala_depend) - >=dev-libs/gobject-introspection-1.36:= ) - !- -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.0.ebuild b/net-libs/gssdp/gssdp-1.3.0.ebuild new file mode 100644 index 000000000000..a71c9b505b29 --- /dev/null +++ b/net-libs/gssdp/gssdp-1.3.0.ebuild @@ -0,0 +1,61 @@ +# 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 https://gitlab.gnome.org/GNOME/gssdp" + +LICENSE="LGPL-2+" +SLOT="0/1.2-0" # - +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? ( gui-libs/gtk:4 ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + gtk-doc? ( + >=dev-util/gi-docgen-2021.1 + 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=( + # Never use gi-docgen subproject + --wrap-mode nofallback + + $(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 +} + +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 + fi +} diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest index 1081991d69c5..6f499669587f 100644 --- a/net-libs/gupnp-av/Manifest +++ b/net-libs/gupnp-av/Manifest @@ -1,3 +1,5 @@ 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 EBUILD gupnp-av-0.12.11.ebuild 881 BLAKE2B 626f2d855f4b980946a971217c1b5af6896abf4dc4144eaa82f25c411892c49169a762b91589c3a37ebe8944b6d8e0040aea6367ed15d3d55d1505e46ff9b126 SHA512 ce696ef103ec85ffe33384ce66d191c4d3d543463b232739db6079302b95988bb7ff2298a063248291ec284210049f57fa7a89c29f060f94a07d1b3478c1d654 +EBUILD gupnp-av-0.13.0.ebuild 984 BLAKE2B 971c2197e5eea9e4d0bf0cd307f1926f18fee4f071274f88f99fe166347b02d5c132e7a6aa98936e7b6e8bfff51571223860982a2746e584df75e21389051577 SHA512 ac0935987ec127610ded324bfb14bde63ea2933fa21e65dd378e7837887c225fb355c8105aed673154f62ecc0ac147a66846c5a7beb8d2390e5da613b830d890 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild b/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild new file mode 100644 index 000000000000..d8baf6de158b --- /dev/null +++ b/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild @@ -0,0 +1,42 @@ +# 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 vala + +DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles" +HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp-av" + +LICENSE="LGPL-2" +SLOT="0/3" # subslot: soname version +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="gtk-doc +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) ) +" + +src_prepare() { + use introspection && vala_src_prepare + default +} + +src_configure() { + local emesonargs=( + $(meson_use introspection) + $(meson_use introspection vapi) + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest index 0ac49e9e61a4..26e4360db0f3 100644 --- a/net-libs/gupnp-igd/Manifest +++ b/net-libs/gupnp-igd/Manifest @@ -1,4 +1,6 @@ AUX 0.2.5-gupnp-1.2.patch 3485 BLAKE2B 83de24ae98ed70d6e92fec605b17772ea3d86d90fc4f34376f8f5ea2eeeec239159baf0f7364b0be54406cab6833cf47129a08274704d231aa93e00460486238 SHA512 d1577e146b9274fa5e1e9652995c188b9c58d48ef6cd7ea82e08a966e31cbc5f36d27988628645d195c44601d2dc3861c5030dbc4fc4626955e709d74881ed3f 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 EBUILD gupnp-igd-0.2.5-r10.ebuild 1430 BLAKE2B e8ae3e32363644ce7c8f4988ec44b2b9d1aee5df419c344cc00b4c8e6a9611d4db105d59a8cd1598d87451bbf5271e4d419da9d82dfdf76dee0785d0d91acab1 SHA512 f74bda750feb5939a6175c96f689a6baea353ca1c2c16d719835569c2314e0a05c9390ba19cffad973cad1dac2ea9e5fd1ccec6b03bf41965f09dbcf9e58cf6e +EBUILD gupnp-igd-1.2.0.ebuild 1102 BLAKE2B e1d611a561b72a9ac6389b6b5ccc6571e49000b132bb87712ba1338b1ba6eeb6d1e0b784b8229111c0c3e87223dc719e84eaa1c47d552d555ffb4bdba0f34d67 SHA512 297b47cac96cd8b039bf9859ddc90ceacc7b463c622464785e3a1510f79479f9d6e5668f87885cfda5b473f5d9c43422ad640ba1905267f21bd557cac8113193 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild new file mode 100644 index 000000000000..4afadf5e7934 --- /dev/null +++ b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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="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 ~sparc ~x86" +IUSE="gtk-doc +introspection" + +RDEPEND=" + >=dev-libs/glib-2.38.0: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}" +BDEPEND=" + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) +" + +# The only existing test is broken +#RESTRICT="test" + +src_prepare() { + xdg_src_prepare + default +} + +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/Manifest b/net-libs/gupnp/Manifest index ecfe7622ae35..919b40f5e942 100644 --- a/net-libs/gupnp/Manifest +++ b/net-libs/gupnp/Manifest @@ -1,5 +1,7 @@ DIST gupnp-1.2.6.tar.xz 142652 BLAKE2B 12f3fd59b6c8616dcbc32ab4feeeccde864af6da0593d0d51b8a9bab045c39b8e4540bc1470a0758f1a0979e647f9dae67bae544d1457e567264d7408d58e06f SHA512 317ff1f0ea1f03476596db6ce2f6c7c86b7c9962a7ddb00da9f487fe7f7bb70ccf8fe64e485583e4a988d90afdb41128730fef459f4ecb757ff2aef44dc4de9c DIST gupnp-1.2.7.tar.xz 142928 BLAKE2B 094e9569c501ae32def1335c8129d5585a2bec37d86c2317a2c9b2d965db5ce0ae6c19017bd44fb718709cf068f93ed75d08ab7e30c5f265e1ce45a9a9352897 SHA512 83d012989f9aab578c9bdb4dd95d316003938a39cc997949622b56523dd7081e09093c48c0016d738ca0040a00b3e6218ba59cad9e49e05f4106213160e7c409 +DIST gupnp-1.3.0.tar.xz 150160 BLAKE2B 300147881e30300cd2bbff7ffc2666d6281dc165cbfcca46617a59c244bb699d49f26074e07909782038f5a87939ac342fe5ae5468a9c38d8065ceea70293c6b SHA512 6367f3d616acef433a26d2475b4ec3067ced9d09e9e9ccf6400f30abc4202e0dd524aa33beb7bb5f88c9a62ff69fafc0d283dc0cb80220f53bfd027205069763 EBUILD gupnp-1.2.6.ebuild 2065 BLAKE2B 2f76e6584658f65b4bef9beb15c6f39f63204af7aa468955002d6698aba3c00cea9b7d7b468ef4b4fcd7c6688d8693ca1ca4b13178f0cadb3d0f3a97c1364ab2 SHA512 e3add284a70c4d19b9e3978ea5eadfc668f69eddc3128d7f905e85d0609cc444c9a5d5fc46fc16969e0a879004c603f0eba538ddc6a6f59dc3c2f67644e83388 EBUILD gupnp-1.2.7.ebuild 2066 BLAKE2B 0c36906a29505e42bae46c506628da361272981f3ec9f3b4cd1f4eb94a170b374aee3cb8054549e4c53cf693eb19a6e3d89aaf1f76ec20e67982dce5ca28de53 SHA512 623a495d00c395ce02c746b0fbde69f0620c7f257cba3e5b4881b785690210259be874f3aefa38ff159a464a559276b3109e91fd03ac27b1e7b46f454ae5ca0e +EBUILD gupnp-1.3.0.ebuild 2106 BLAKE2B 18dc5285702f075e17d40a683eb764e5d3ea94af0e9f631ea420f494d7c6e0c9bb81729b6d4a50b90c02552de79d07589f13ce651e82761fd21fc31e7f355854 SHA512 588d198c7df6ec981286a6a8cf50370a68a50f767c957606095c7094c9b3f78ba035034c7161eff681a6a539555eaa7bc52f8cd43f4aa9a3e63294ca753bfb88 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-libs/gupnp/gupnp-1.3.0.ebuild b/net-libs/gupnp/gupnp-1.3.0.ebuild new file mode 100644 index 000000000000..e981b8b42e46 --- /dev/null +++ b/net-libs/gupnp/gupnp-1.3.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 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" + +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 https://gitlab.gnome.org/GNOME/gupnp" + +LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+ +SLOT="0/1.2-0" # - +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ?? ( connman networkmanager ) +" + +# 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.3.0:0=[introspection?,${MULTILIB_USEDEP}] + >=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4[${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 ) + 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.3.0:0[vala] + net-libs/libsoup:2.4[vala] + ) +" + +src_prepare() { + use introspection && vala_src_prepare + xdg_src_prepare +} + +multilib_src_configure() { + local backend=system + use kernel_linux && backend=linux + use connman && backend=connman + use networkmanager && backend=network-manager + + local emesonargs=( + -Dcontext_manager=${backend} + $(meson_native_use_bool introspection) + $(meson_native_use_bool vala vapi) + $(meson_native_use_bool gtk-doc gtk_doc) + -Dexamples=false + ) + meson_src_configure +} + +multilib_src_install_all() { + python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2 +} diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest index 764beff7698d..f82192a32d75 100644 --- a/net-libs/libasr/Manifest +++ b/net-libs/libasr/Manifest @@ -1,3 +1,3 @@ DIST libasr-1.0.4.tar.gz 413258 BLAKE2B 971dabb83e322808344c4b53622623556f662c6ada200862469dcfe4f0277ade438b39e0c0e19d372622dfd3c3bc69c2bf1ca22200e6318c062f280f72efc15e SHA512 6f189f9f492da8204396fe1246b4a0162751b2060a881469649ecf987b7ac1cc834193d2052e80a09bf94fedc8fc64123e9dfcfe3a2e4395f9e26d37afc84501 -EBUILD libasr-1.0.4.ebuild 477 BLAKE2B f8aa5f1c201b57d5cb0b78e176eeb5f27da427d3f9142a487a18196e738b9d3b85bd1b900133609aeaeed65d234b7d1a8f29ccac53461248d1848bbf4cfa1c17 SHA512 5b12fa1857b91e6e85a35241648f306c33d7f4ba7382ba597ce6019f838cf531e8efe6827e9894552768d53004b316db50628ab6ab8071d1691247de85c19904 +EBUILD libasr-1.0.4.ebuild 484 BLAKE2B a10c571b9702de489e93e4e5e5081950c2eb5fc59519729b0013c88ef05efaddf23f2ff8e1e84cd1029288a55b205cf5345a9acb828f6db99a99a327dc078b7d SHA512 f1d075dd624b4ceeefd23a72718ae880e87a7c71fdd8a972a9e373a27784854b936971a1c4a8b16acecce7e7114810329f1af1106ccab18474c374f29512b528 MISC metadata.xml 331 BLAKE2B fb0ff46381f7fa14f0fd15ffda08e378a5a88e9771ce464ad813e4c8cf7d2146ca45b2c2cc8c13756bdae2413758f7cba2c68cf4752405359f311eca700c7fbb SHA512 dedfef00a1e0f26438a1e0fbc9b53fc64566bd6def05260410d21aa3ff941ef0c5c9dbc205b3516052b0409943acbfb431e4702c87d1c94e9950ab9492f68850 diff --git a/net-libs/libasr/libasr-1.0.4.ebuild b/net-libs/libasr/libasr-1.0.4.ebuild index 0e9a9e249408..f85a8c9d0ad5 100644 --- a/net-libs/libasr/libasr-1.0.4.ebuild +++ b/net-libs/libasr/libasr-1.0.4.ebuild @@ -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 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86" src_configure() { econf --disable-static diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest index 11f3de110a9d..9c21372b61bf 100644 --- a/net-libs/libnetconf2/Manifest +++ b/net-libs/libnetconf2/Manifest @@ -3,5 +3,5 @@ DIST libnetconf2-1.1.46.tar.gz 295868 BLAKE2B ac20dd66c779b9b509f09c1a45224679e2 DIST libnetconf2-2.0.1.tar.gz 292658 BLAKE2B d2821b4b66773b777764f7a453649a7ea60bacc418a8ff5c33e54b244a1f285b84ec8a1cc6d6285ff280c8631d79dfe9db352ad03781a7694762efd8545462ac SHA512 26f0a900387a8dbf5c12136d29529e7aba973dba4e1e3ff091cb70385a686533f041cfe647e273f6188b9494b67f771564b2e32f10e1fc61586112d88837f5c8 EBUILD libnetconf2-1.1.43-r2.ebuild 898 BLAKE2B 2a64da7fce34e499bc0790687d89fec7d11c5f9b6c0b76a0079f918b619076feb84ca695062abaaf89d46e7adec50fd65de0682bf4810ae9beb0b2119c4679ee SHA512 d8cb9719c0f5051efa69060e01e0397c563a4bd3b03ac364259798039710d2f6191c170c2d3718cc34aa0dee4852b7e8e56f029ff7f43d230eceadd80fe390a8 EBUILD libnetconf2-1.1.46-r1.ebuild 905 BLAKE2B c105df3d6811cce4b1571cecb84dc4561b6fd8a6ac622e67bb22f1f76c2d149798f082962dd18fb3781edc81ceaca454ab2c9a881bdaa0ebd1ae407897985afe SHA512 6c151fc3bd6211c3c6f94d752666d7665f2034e1cc7f97f356b1eea8f299aa2ba99f4e4ca6993cb47fbe0862acf68787e6f78ec077ed3e002a5ae2b933c17e1b -EBUILD libnetconf2-2.0.1-r1.ebuild 871 BLAKE2B b307c6f10b17a0c5d3c64e0d709896346fce387c9c21a5b0f4e826d64e46e34aaa0608a0e23078226a2de8b18b8a368e323cc38a7b079638f48ca18fb1a26e63 SHA512 5901a352c3e85fc2a637e4263ea7fec8b7b1fd27a0a0836dc3b70f96fb9e233f55e6f45afe7b309d9cdfc7a579287d9a082833e9c2ccbfb2065208a680705d36 +EBUILD libnetconf2-2.0.1-r1.ebuild 870 BLAKE2B 8dfb3bace07254a607dd8758840f13031e1181355321c15d9f239f51f3d36b4da68395d1dedfdc0a36dc50a6ebd16ff17c6af895dc038640be6f639f52aaeabb SHA512 bf92dfe163a2cc227ebcaa16e1c0ef6a5ba9bce3c016328bd735aff7b25b75c11df7f7e3efb01f19d22e18849f33c97dd7825034c48ab6d4c67f4d26a7acc230 MISC metadata.xml 451 BLAKE2B 978f667c90ce54ea7919efb05ffdd032f7eb8d4f8360987da83e6f6610d5428afbb0ff8b447e0d82a1399cad2fb2f75bb62a73e98b3342ff7e1c3adf2e6c425f SHA512 9b66e4d2309627dee98cedc5debe1fd0e6079593b1733a5d8eac7af420a23082e86426f742ea10cf0928f730f15127e9808a27bb347488086982b665ea305504 diff --git a/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild b/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild index 6f7150129f7c..af28d77b0ef9 100644 --- a/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild +++ b/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild @@ -11,7 +11,7 @@ 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 )" diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest index 153802f76cec..5d298aef60ac 100644 --- a/net-libs/libsearpc/Manifest +++ b/net-libs/libsearpc/Manifest @@ -1,3 +1,3 @@ DIST libsearpc-3.2.0.tar.gz 52303 BLAKE2B 34707b504b4e63017549e5ed04e8e1e8d1e98b873aebe2ad3f675fe88e209bb73d8b56d1aef137bc4bead2a2fbcf7410dfdf1d02a92a8f37efbaaf0d56d79a4c SHA512 071784b6d34f6ddf947748474c210f0f803e3451373e351b6a768b0cf4a17ddcdaf415ff4ce5f020f1a68df3f6f0a0e53a78ad9e2df286fafea870e303c8f6dd -EBUILD libsearpc-3.2.0-r1.ebuild 914 BLAKE2B 31a23c85cda7d129d3039808bccc99c94304276288870a7e56fe5f9f375d59b23fa85141322835d82454de3c22f2888908ac0ef2f84de1c8aedb7348f4ec2304 SHA512 f75455f6aa5cde44fd11b4e31f36f76cfab9aa2a0cae4d873443509fd4abe07395905466eda0c264b081f24a48a4b3bf52ca26f2250f7cfb24066c80b50c9b20 +EBUILD libsearpc-3.2.0-r1.ebuild 906 BLAKE2B 1c91aa79d7d792d31a31c4aac9cc220924e04696c4bd345ad5fc388c121be1c3385a7bdfb60c09d0abe843e2f048d3fb0e195fcdf2572d1b270c67906ca139af SHA512 7e51fd5640be2a37bb06bc823cbcbf01cb060bebeb7b19e65679979845aff82d62173adbe135c6286db3acd907baac73305b9128b0f2bf5c34c580efd84dcd21 MISC metadata.xml 479 BLAKE2B 52ef362ca8291b0f9cb820c002588448a8db2b68b41a495e9ef4ad6303fb523bc599a94fa8e786d9270cb6920b64011c2a965208d2eaf8e18ca56c5912d2409c SHA512 eeff06104b2ed7fd648c0943149296448ac37123be3bdbfb93f6f63703b18637680220b5d284b7d9679e46e3fd742bbeed93ad55f60ce28f03ae6cb25ffd4aa8 diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild index 5c78c100213c..c3cd310e52b5 100644 --- a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild +++ b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# 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_COMPAT=(python3_{8,9}) WANT_AUTOMAKE=1.16 @@ -24,7 +24,7 @@ DEPEND="${PYTHON_DEPS} >=dev-libs/jansson-2.2.1" RDEPEND="${DEPEND} $(python_gen_cond_dep ' - dev-python/simplejson[${PYTHON_MULTI_USEDEP}] + dev-python/simplejson[${PYTHON_USEDEP}] ')" src_prepare() { diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest index a61a5aceabd4..c3eb7d07307d 100644 --- a/net-libs/libvncserver/Manifest +++ b/net-libs/libvncserver/Manifest @@ -1,5 +1,5 @@ AUX libvncserver-0.9.13-test-fix-includetest.patch 1626 BLAKE2B 1a2bab37cc2716a0c3912a2d1b76329c81bc8c3c6b9a881a0813ab035e05a06683a908cb0ca55af94d8682ef6e0153c25d93dd09381ef1079c93808a0f7d529c SHA512 7cb35e32245152e0fdc10fd6ca80221bfe1d5a75ed9407e9d69a3082bba24cbf8868db5dc36390943e09f0beeb3a366f994ecde62c6f9d7e7688ba749249bf3d AUX libvncserver-0.9.13-test-fix-tjunittest.patch 989 BLAKE2B 2ebe6a5bf1f04bdb188ed9a3ca965a697e995268f2e65fb7de37da663cef91672111ba0eaa1d25c4309e3f600240042e773d342996168b8b9f2dac808004b140 SHA512 6ccee0741778ae7d504acf250bffdc2231556dbc1357fd08bf54fd769e73159c3c27714c512775266f0e1cdd145a61e029645a6676b198dbc8aa6bf7ad0ca04d DIST LibVNCServer-0.9.13.tar.gz 567491 BLAKE2B 138c7ca63f8cd30a21dc1b58aafa744e12a1a9eca503ffec18a63d18791d7a5df4eef176d7e4e797a2aadda1dd04d1b051abfd76bf5c6806d558c09ffee78cce SHA512 18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643 -EBUILD libvncserver-0.9.13.ebuild 2073 BLAKE2B 1583f9e65352b0ac074e5337de2fb23c3b3359e060cabc2943476967300d0a361c50caa6e97a1373df869176ffe32b705ba8143aa559595ccc72798f96738384 SHA512 fc72611b36cc97bca832cc13a532be0a630bb5f2613c0d1dd1b51ae9db8565691713496a1019e7c6fa4b89bdcd56e6f460e9c1868f76deae4e5159d13fee1094 +EBUILD libvncserver-0.9.13.ebuild 2080 BLAKE2B ece08bc97161240f55bfc76bb3709c5bcf4f9e0be117c3565f5ca4e33a9699b7067ff6d13ec66c06fad3ce2f7df847bfd29c1f7be216b6ddde684d6034c6687c SHA512 1734f760558d2e438dd37d821b50b255a8fe6d9ea8e345e41a665868ec7c08a5e3feb9d1025aad5abacb4642ffbb64466949427bef409f9bdf3fe80b3fc54b59 MISC metadata.xml 1077 BLAKE2B 8870ce3ed354e5afd05b3133c4ac69b797a93a773724252a57d7f1fbcce62e66d2f98878a9ec80a629246f9d890151b601a4064ed7473af266b1b2df4a466ea4 SHA512 3aef9425b2bd79ce7c5c8e3708c2f3d670c8bd5a3965c0e2385b1f86468f9f77ca80e213ccb7ed610556866aef87cbc47d933bf07eb4fa87762d6aa66af36b00 diff --git a/net-libs/libvncserver/libvncserver-0.9.13.ebuild b/net-libs/libvncserver/libvncserver-0.9.13.ebuild index b0e0993064f3..c046ad17bcf2 100644 --- a/net-libs/libvncserver/libvncserver-0.9.13.ebuild +++ b/net-libs/libvncserver/libvncserver-0.9.13.ebuild @@ -16,7 +16,7 @@ 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 ~s390 sparc x86 ~amd64-linux ~x86-linux" +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" # https://bugs.gentoo.org/690202 # https://bugs.gentoo.org/435326 diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest index aeaeb38814f5..584534021f69 100644 --- a/net-libs/libyang/Manifest +++ b/net-libs/libyang/Manifest @@ -3,5 +3,5 @@ DIST libyang-1.0.240.tar.gz 1667619 BLAKE2B ec988301ee422cf90fd6d50b31f42f28f5f0 DIST libyang-2.0.7.tar.gz 1031818 BLAKE2B a3ad7dc0bcff14ea5fec0221f11efb2ef61efa8b4b3c8ebd6d58f3184cc1f1979c026985c1782d2f2177227a8aae815c6c4fa7063fb19156af78f65740623318 SHA512 edb1d8d372b25ed820fa312e0dc96d4af7c8cd5ddeb785964de73f64774062ea7a5586bb27e2039ad24189d4a2ba04268921ca86e82423fc48647d1d10a2a0a7 EBUILD libyang-1.0.236.ebuild 988 BLAKE2B 5c426507aa166549c283169f65ac56136fa62857db55dad0d145d5a67c6ad99b9b6a34cf280063b0923c97441bf23625ab35449c14fb7375e27f32dad71c0d5f SHA512 cc300ada4d32f432a88da55eea518748774b7f7642738ac5e9c7b206c46ac0bcad2ae36a2c5af22655796a3ea3183360ca2e410655aa23d86a6849c06ca5125d EBUILD libyang-1.0.240.ebuild 897 BLAKE2B e5d1e73c16e8be086668fb4365205dda0aaf15cf592b47476c0c16fc61a785f1e3789096bac27950886092a567d6be5994058888f616b878fb35454e9846e9aa SHA512 5717df5882cf10a77b3bd57c77fe6981c70b96d7f007532d0a56de2971b816b65b310838178a0186d68f5cb32447efdc6a27dd5312f7031b2ea6e3bc11b61308 -EBUILD libyang-2.0.7.ebuild 861 BLAKE2B d0fd56392c038e0ea9a338fc5b6013c4871d0f463f60acdc6c09c86b3a41a01d6a750c57b8adad1ab305aa39aec4915472e2ea8873347f53230767a72bad8a9e SHA512 114e1c5c874d8c7fe74de3b0808f83c0e625a19e0b82059eda67a2d213208ec988d1f8c5d1e0cfb6bb5a58c90f21e7de0090803090bd8b47ff65bd3496d61340 +EBUILD libyang-2.0.7.ebuild 860 BLAKE2B 045f198f2660e0774d0f6edb071f93f6e5eb5bd3fdc4c6ff38786a3e037af715db23c548c67e9f4f77634f3657ef323869a28bbad951a5d6946fdc7517d23c9e SHA512 d25d0df1a6d1a4313cafe52c9379cf3e9eba375685e1dfb3ef7c483f972cebecce9e13c07be08b2bee8f57b7f8d1e9b321074c9876906500f64a3c04548da568 MISC metadata.xml 585 BLAKE2B b4ee06f08fd3f10d45796cb0b3bde13c0790c4883b3408f3c89f7b0812b49206b741556ad2b28772ff1b18a40ad517f988ff4301c1a4270d127ab6ba0632c752 SHA512 54ccc9ecd6b9981ce5544174a74c8d9d5517e8c56b7a28402cac8af3d854c7e41ab8e2a0ad5a0fbd4d6460f848ee9a31f64b6b74cc1b7a1333e2899ceae9ba6f diff --git a/net-libs/libyang/libyang-2.0.7.ebuild b/net-libs/libyang/libyang-2.0.7.ebuild index 6254659806fa..57f270bd1c08 100644 --- a/net-libs/libyang/libyang-2.0.7.ebuild +++ b/net-libs/libyang/libyang-2.0.7.ebuild @@ -12,7 +12,7 @@ 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 )" diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest index 0bc1c28f2a39..c1560f4e84c7 100644 --- a/net-libs/miniupnpc/Manifest +++ b/net-libs/miniupnpc/Manifest @@ -3,5 +3,5 @@ DIST miniupnpc-2.2.1.tar.gz.sig 543 BLAKE2B 19da35662cf75d47de9cd16d3d8f767119e3 DIST miniupnpc-2.2.2.tar.gz 100008 BLAKE2B 76bd18ad455be91a2b7680f59f59828a592077f3694ea5ed0f42222370d9e3d0e328dac1a6d530abcf28586384369d7c858c32fc3105f79cacad762ac5bc70fc SHA512 d322ae2a99faf01bee52f50a40d4bc2150c67a2f7e15b6078fe92faf2aecfe7ce10bd98cef3d94a77f6f7d1f7d8451cf4cdbf6fe11c9e7c1854ee066300b0116 DIST miniupnpc-2.2.2.tar.gz.sig 543 BLAKE2B e1089a0c3d937cb4e52b511ed0cc7b43a686a6c08df5ce5e008f1f5ec892b6a4f9f1c45ad4eb252c2aa57fd932a5c5dd4300adfdcee145f27cae51469f244179 SHA512 525f4b5c60ca1375df8a05cfffec3cf8e99ae070510621de2871926b6e84faec28cceb4feb983380e12b7271880872083ea4f4080c74572697476bb7ae795cf7 EBUILD miniupnpc-2.2.1.ebuild 1524 BLAKE2B 8b08e48755c0e7a0570630fa7303cdae350fd76b75c9e9db2f7be6afd201f98a080a23c0d5ee61f6681e7a457bd13a2508ec9c28c4e2dec59ad27f1430344830 SHA512 d19c2f2dd2a038cd5d14e4b25f53cf98ad72870bbc421d8329db942f10867b6230b2c43fb13f0affcb5e202fa47f302adab89d77b2b1d1ef2a715e12e3710462 -EBUILD miniupnpc-2.2.2.ebuild 1524 BLAKE2B 8b08e48755c0e7a0570630fa7303cdae350fd76b75c9e9db2f7be6afd201f98a080a23c0d5ee61f6681e7a457bd13a2508ec9c28c4e2dec59ad27f1430344830 SHA512 d19c2f2dd2a038cd5d14e4b25f53cf98ad72870bbc421d8329db942f10867b6230b2c43fb13f0affcb5e202fa47f302adab89d77b2b1d1ef2a715e12e3710462 +EBUILD miniupnpc-2.2.2.ebuild 1531 BLAKE2B d96235e0df9e81ce6bd27acb4a5d392de6f24e4fad6ac294aff7f010210cb195bb45d250d1745500193fd6bf9e9a2eb017347f125e1af746379011e558e77f33 SHA512 75ee602e5778d5fb05d54bb5dc8c449b7c59bc55056ba2ba11474b40e4f3b8317de809a8e25280368314a24ea81d558762d25e3954cdb1fd30711b2a6193feee MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28 diff --git a/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild index 7ac6dc55a8fa..de6ed42db309 100644 --- a/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild +++ b/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz LICENSE="BSD" SLOT="0/17" -KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="ipv6 kernel_linux static-libs" RDEPEND="" diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest index fc9f60bff2f3..8ab16f9a8460 100644 --- a/net-libs/nghttp2/Manifest +++ b/net-libs/nghttp2/Manifest @@ -1,8 +1,8 @@ DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d -DIST nghttp2-1.42.0.tar.xz 3973284 BLAKE2B 39431619bd3c9a66eb217065bb29ceba8f3fda376343687b4774ed5e73c634f51142b407f9515ae5ad4363af5cf57c0199f9bfddf5bc08dc587419ec03cf5b45 SHA512 1d93e6262c5538e26fbf36567230b4a239dbdfee26198b1e1d5862bf4459ae435679674c047407f5c604ddff91d7717d8515532e00bcdb2aa75f27ff97dce60c DIST nghttp2-1.43.0.tar.xz 3973500 BLAKE2B 0e6c674486c484558a55822501a13ac93c4e890cf62749bc8519690f468912701329b7b9e83b0b68c3f35b72442b1ed47a90050cccd3fc05d79622e1e26634dc SHA512 eac69ba356870a1cba420a06771082897be8dd40a68f4e04223f41f3d22626e4f5b3766d3dbcc496dd212be01f64c3ac280a2ebddd31dd88f7350c20f56e5d39 +DIST nghttp2-1.44.0.tar.xz 3972832 BLAKE2B 13afbf6e2e242f5a7a5475c3d0f0380170cc5f50a0fac87951173393e79cb7140ea52e5f4918a8207216cc5826534d8fa550e48c06ee7c61b74a54f2de23727c SHA512 756b78665ef9fe8765332e7f0b249029d845a6b635c00a27f4c3716a1354f98bcc34df4da74179213497f6bfc2647d3773ecff2b192c63427447e37cf6393f6c EBUILD nghttp2-1.41.0-r2.ebuild 1939 BLAKE2B 2f985404d208614eacd79a7688e58b041b2f3f145b68af46c3047b69589c78da368af2a0f3c36c4905475a5f6bdd3ef7004e537a211b0df9cee7884f68ff58a9 SHA512 79afbb367fd0dd6c13216f8c49cbf756e517892dc5e83b1f55a3989f6248324d0987de2e1025b0e85d9ab9b7b9d39e3982c0084b35eb2d8db6f78feddc7e541f -EBUILD nghttp2-1.42.0-r2.ebuild 1999 BLAKE2B 256137c46baa1fb83fb7a77535e9523a3f54f0a86c7e300b4a165462f29819457ba53e668a4ba94cc76b4c64a63350b289c12e3c8c325e61b4a77ca363583e54 SHA512 e980e8ff8c71f664abdb59d5e35ed6245de8c13bf8406e8873fc8f1ae3fb822a8b1bebc84cff29efdd550842a0094d222406f9b24f57810d949f335b3cbbe648 -EBUILD nghttp2-1.43.0-r2.ebuild 2016 BLAKE2B 4ea0fe404a634213b1cdf3e4d8cc32dc66d2b5291bb43c90f797b12c115580f2e68d560822ce5704ee41a9fd6ad50bba5af751305a14f1d9d0b1105b92fdcb4f SHA512 e035d8d74e01e4b67124e3d1612ee48779ef892f058be7c527e7fbdb5af3026f69c267c3dd861e759b433af768d415bae9d7633f44e49899a417df5664f3aefc +EBUILD nghttp2-1.43.0-r2.ebuild 2012 BLAKE2B 6ffcd5b832940b1c42023b834d0ccc7c534f3e59cc7c2df9e4d58f720f75e870b635162c1b1fd1058665735b5daedc10a42d48356afdd9a6433edfacd13f6385 SHA512 0aa726de4eef9bf97a393ce6566562e689b2447feb202f8c9ee12dcaacf0f550b96c05db818aaff2dd271b8af82d051ec67a954a3db61ed85d33d51ea1a2d5c9 +EBUILD nghttp2-1.44.0.ebuild 2016 BLAKE2B 4ea0fe404a634213b1cdf3e4d8cc32dc66d2b5291bb43c90f797b12c115580f2e68d560822ce5704ee41a9fd6ad50bba5af751305a14f1d9d0b1105b92fdcb4f SHA512 e035d8d74e01e4b67124e3d1612ee48779ef892f058be7c527e7fbdb5af3026f69c267c3dd861e759b433af768d415bae9d7633f44e49899a417df5664f3aefc EBUILD nghttp2-9999.ebuild 1979 BLAKE2B accfeb064d7750bb523939d9e9f50dc194455d771e0e22b1a5c7138d826f521faa3b0f830cf320d470803636faaaf38f83a6f84a272d875f04bc6d115780cc64 SHA512 f6ea435254aa3f2d2622eee95739a80d9f9e3d9321413a74ed875d71cba1901d87f225b7ed1086db2dd81295bda21bb72152b7502296ff87296cb37485a8a77b MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf diff --git a/net-libs/nghttp2/nghttp2-1.42.0-r2.ebuild b/net-libs/nghttp2/nghttp2-1.42.0-r2.ebuild deleted file mode 100644 index 0b93e6d962c2..000000000000 --- a/net-libs/nghttp2/nghttp2-1.42.0-r2.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 ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="HTTP/2 C Library" -HOMEPAGE="https://nghttp2.org/" - -LICENSE="MIT" -SLOT="0/1.14" # . 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.43.0-r2.ebuild b/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild index cc514dc2d659..e8c5aa7cef5e 100644 --- a/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild +++ b/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then 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" + 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" diff --git a/net-libs/nghttp2/nghttp2-1.44.0.ebuild b/net-libs/nghttp2/nghttp2-1.44.0.ebuild new file mode 100644 index 000000000000..cc514dc2d659 --- /dev/null +++ b/net-libs/nghttp2/nghttp2-1.44.0.ebuild @@ -0,0 +1,76 @@ +# 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" # . 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/pjproject/Manifest b/net-libs/pjproject/Manifest index dbfb7c5c2bae..2c98bbfc6a75 100644 --- a/net-libs/pjproject/Manifest +++ b/net-libs/pjproject/Manifest @@ -1,8 +1,10 @@ AUX pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch 4724 BLAKE2B a098969ca78f538848a6616d6168dc74dc4d6c09f348e0e6436089341827346f52c3feb43a4de13453df940cad65b02f650c9e3cdfae4b449da0a5140e0fda54 SHA512 49846fd649f664ce29098800d4f9acee95ac4c06ff5499495b5bcc78269a33e9e66e9df126755aba9c48481c3a87040ff0a6bf1e4fc64bdf0492c55d428978f0 AUX pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch 1564 BLAKE2B 30f7af19ae18c071b62e31a6a049e4e67f7b391a65ab52ef8d5270ef504a4057b35679c580ba056c9b1b3e5813fde5ccc8ca863bead4f62156e39f8c2947e4d2 SHA512 9fb5b8961e7c69cf8a902eaa28cb2147faf8f0809467911454758b793832831240992a3c27ecb722a4ea066df909c0cf12b4b1bf139037f647828eb4cc16fee0 +AUX pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch 10321 BLAKE2B 6e69e2476439d2f6ca97cd94376d3ffe924840289abe49bf33ecc10c1b67d33457e4231a47851b1e749600f3d7b4a4980b1e5bada06bfc1df5334f6a51b0e8f1 SHA512 58faf870bae4ec94cfc78ca9397e476b7db26c69bb4de5dd6bdaa63f6a8cca95438a182661b485afb04872899c41a8f8ff72c5cfbad35c41cbdc5e9831813c4a AUX pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch 3929 BLAKE2B fc7e12b7e8e9ff35556aa153496c2f7decd13bc78493d8c6f24449f063fe9c76b1772f6dc2b6cfc279c9731cc08735b27cd990ac6c4648c18e7f08c2c9fc3810 SHA512 e230041cff87d97947ad8caeb80c4858b8a1d435251d79b281fc0035da04aab549d1d5dc085681d98410da7e37359bb2ed721d132b321cce9a7326e4ff52c40f AUX pjproject-2.9-config_site.h 2168 BLAKE2B 39d526e7a2ca79ea2c1e453d95d420a6245e7a93641227a908660fea553a8b66d5dfb6b7108b49dc0686de6522c2485b72a6e7511096cbfe50bdb2800d559e6f SHA512 d6456b7fa36b3256613eea515b78f0884fa6b56705817cd421a962f3c3302bf0efa69006432dffca49400ef75dc99ebc7639d270aebe5bc2d4a9a9515cc56408 AUX pjproject-2.9-ssl-enable.patch 3515 BLAKE2B d68479ba509513828d8488b60358ba00651c87d0b39b9bc800fe0d38294f2afad43fd7f4ee5c260bd62044d17b010112c59363277739f4ae7d20940943437539 SHA512 5fd3e681801e6e2cd56ec177d71a65422ec22b788adfad3920562616c737188f71097a545d9c59bd6a3d876ba143f90f731d165d8c68da25aa93b03c009753e8 DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa SHA512 a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893 EBUILD pjproject-2.10-r1.ebuild 3339 BLAKE2B 7bdb4fd1731d2a32750b73970f06c70188309227b727f50f13819e435adcb897f42bb9408c0ef5c151a12dd6954a01205740b11aea657cb53ead6112a9c9036a SHA512 6b7f60dd30b96d600197d4ed5d1d3002df152c0101c359c644a45787ed7112dc1667065d96ab8001ffa1f8c9de0e8d505be9040aca3cd188b7cb155fa0caeb54 +EBUILD pjproject-2.10-r2.ebuild 3425 BLAKE2B 5e75ed21cdf7da4b13eee7e6db0e9c3aa8af96c8488eb361f90cbe855e08f3d2de815a4bec2d4d26ce51b0a97331de54143f84a372f20c8933f22ebbb74bca9b SHA512 3c3d63692852d7f34dee7345447267da1f72fe42d7e61d3fbc03a2e5b3dbca1b23d4bce5cacd1129231474e1a3177b178da645f0279f6e36a5a610267989c8c8 MISC metadata.xml 1378 BLAKE2B f5445d873e1167362e054d6010d68e515a237481f64ef50bbc18d7bdaf338fea6f5620297ce165c6ad79022ae0a60665d120dad5fffce44f71f7861acf2af878 SHA512 c76ce7cc7885daa1462cb707cc15d8f6ce385db25bd0358ec4ffc7c02134ebebe27c69d20eaa2923cf834863359453593bf52b89315ae5a8386c9fcdafcbb7d6 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 new file mode 100644 index 000000000000..ba31cf19eda7 --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch @@ -0,0 +1,289 @@ +From d5f95aa066f878b0aef6a64e60b61e8626e664cd Mon Sep 17 00:00:00 2001 +From: Nanang Izzuddin +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; iparam.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/pjproject-2.10-r2.ebuild b/net-libs/pjproject/pjproject-2.10-r2.ebuild new file mode 100644 index 000000000000..ee620bea10a9 --- /dev/null +++ b/net-libs/pjproject/pjproject-2.10-r2.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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 ipv6 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:= + 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/libsdl ) + speex? ( + media-libs/speex + media-libs/speexdsp + ) + ssl? ( + dev-libs/openssl:0= + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +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" +} + +src_configure() { + local myconf=() + local videnable="--disable-video" + 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) ) + done + myconf+=( $(use_enable g729 bcg729) ) + + for t in ${VIDEO_FLAGS}; do + myconf+=( $(use_enable ${t}) ) + use "${t}" && videnable="--enable-video" + done + + [ "${videnable}" = "--enable-video" ] && append-cflags -DPJMEDIA_HAS_VIDEO=1 + + 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) \ + $(use_with gsm external-gsm) \ + $(use_with portaudio external-pa) \ + $(use_with speex external-speex) \ + $(usex webrtc '' --disable-libwebrtc) \ + "${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/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index dde09b448e98..a470993fca06 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,5 +1,9 @@ AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd AUX 2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch 1893 BLAKE2B be04d827fee9d17d64230c485add8dd21be6f8c9787c0407973774fd2ced724c00c688476c47bddaccaed3b59dab53dfc4de11f2b96139fe2a74b68cf57eae50 SHA512 3eaff22c9002fde1567331ede3196c733c34986932212954270bb59a5c776d6e4709ee8e366cdcdaeb67e36cd7757d01f4cce84ce4e2d6a1eca3c6ab3fa98f66 DIST webkitgtk-2.32.1.tar.xz 23321600 BLAKE2B a2d0b1cfd1035611427ab23f4723b8ab4c3087b21f3b14716a0bc9b128eba8c74c36dec34709bfc40efa1961416e7b83dceb8c53c1959ce34babb7b5335a5863 SHA512 ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843 +DIST webkitgtk-2.32.2.tar.xz 23321888 BLAKE2B 1201ca423b90a7ba9e7613407e170d367b7b6e11219134dbefb774349b7752f5b498a168594addcb5d6f0d8a7977d3b946fd546583789d6c74cd8d7faf3823f1 SHA512 ca131fef749e5d882cebcf71b4f865511a43fb60b41c917a8a98876dde108a71888e986e40217ff12a43fb395c147e7b6c7a262bc353269498f1dba33e3905f8 +DIST webkitgtk-2.32.3.tar.xz 23323972 BLAKE2B da6f71214935fa13ee4d3214e3c34b636c2894f579539f0de4165e2fa51611cf8f57d40de9e3285a195b7e9f55fb9f5967722e01dcc78f9458b4fb74bc3e7e4a SHA512 473f89c6d56f6718e3e352a023d12188365b67cbe6535025205594729a10d792122275257b81ebe8e504a98814aa4e2a663616ffb13fea445df2b06929d89ebe EBUILD webkit-gtk-2.32.1.ebuild 9219 BLAKE2B f1a1b08374d123ba0d97361dd81fa6fa7d6dd22e8ad02d5cc37b315dadd505d013541c803b30fc3c93d6126934fa9199761305c8ba12eb955947f99ce187b1e4 SHA512 b51d1de9a62f612080bfc7bc470715e3faa4725d5774527c775be399b9811103e0d263b43016b150f19f5d76b6e20db465c8d42abd7466eaab1af67c48b2f911 +EBUILD webkit-gtk-2.32.2.ebuild 9127 BLAKE2B 8f64b27b0d8622086aec726452d99a1b1ca523dbb3f003c28f6ae31a8e460649ae7660fcdb52a6d32c0fad281c46ac180f95d1c7694bd1d2cb8897162079eb25 SHA512 b7803153a17d485dbcb9276986890134a6c560cb56619cc1b848b8eaf5fc9e7546d5bba06e793bdb9965a3ff69dc99212b10e58f39f027286e0d5192cae1c703 +EBUILD webkit-gtk-2.32.3.ebuild 9127 BLAKE2B 8f64b27b0d8622086aec726452d99a1b1ca523dbb3f003c28f6ae31a8e460649ae7660fcdb52a6d32c0fad281c46ac180f95d1c7694bd1d2cb8897162079eb25 SHA512 b7803153a17d485dbcb9276986890134a6c560cb56619cc1b848b8eaf5fc9e7546d5bba06e793bdb9965a3ff69dc99212b10e58f39f027286e0d5192cae1c703 MISC metadata.xml 649 BLAKE2B 29aa977878b9cec915abe8d7ef5c367675fb280c184b3b915714e1aa98e3df442dfb5b06e42bcfab33a4329c3445dd9c6c86db02d6b2b29ffa855fdb18f086eb SHA512 c8bf98f91d4bb229e8561af3d33208b0c6df7b5542243e22f3ca04d1856c7fcc0c36a54e1cb536b6a07510daf329405383990008798db77064d66215843cb7e5 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild new file mode 100644 index 000000000000..b9fb5aa5f700 --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild @@ -0,0 +1,300 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..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 ~ppc64 ~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.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild new file mode 100644 index 000000000000..b9fb5aa5f700 --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild @@ -0,0 +1,300 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..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 ~ppc64 ~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" +} -- cgit v1.2.3