diff options
Diffstat (limited to 'net-libs')
-rw-r--r-- | net-libs/Manifest.gz | bin | 30663 -> 30663 bytes | |||
-rw-r--r-- | net-libs/pjproject/Manifest | 8 | ||||
-rw-r--r-- | net-libs/pjproject/files/pjproject-2.12.1-config_site.h | 97 | ||||
-rw-r--r-- | net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch | 95 | ||||
-rw-r--r-- | net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch | 50 | ||||
-rw-r--r-- | net-libs/pjproject/pjproject-2.13-r2.ebuild | 142 | ||||
-rw-r--r-- | net-libs/pjproject/pjproject-2.15.1.ebuild (renamed from net-libs/pjproject/pjproject-2.13.1.ebuild) | 30 | ||||
-rw-r--r-- | net-libs/webkit-gtk/Manifest | 12 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild | 5 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild | 5 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild | 5 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild | 3 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild | 3 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild | 3 |
14 files changed, 38 insertions, 420 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex 36d79980c158..c1bffc588c0e 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest index e01458f69fa6..3012adae2e04 100644 --- a/net-libs/pjproject/Manifest +++ b/net-libs/pjproject/Manifest @@ -1,12 +1,8 @@ -AUX pjproject-2.12.1-config_site.h 3213 BLAKE2B f7e4d26e83591071b8527417a0a2cf4970efff6789bff22df643ce5c350d249973cf830266a6710b3000d46c3638fe5000008efb1fea8fa6d83521cf109fcc21 SHA512 058dbe06adee83f3e288950af8776012e07181aec969f7d0a6104b63f7b3168d4db4a8e18c7f6170b12ec51ce22d4fe0074fd000682bc71a9251937b77f6ea51 -AUX pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch 2895 BLAKE2B 59aa55426eb7ffe90fdbecd5005bed3bfc8f72b4abadb2a48e5bc0c03205005fe73e76d6a4c4640a22c72c1f6f7e201bee29ee426788aa0dd3942d85ebaca1d1 SHA512 2556e9b69ed71324686ca32d7bf7312386ea433af984b929084c44d060989c4631de815f27ef64a7e4082b6a62686bdaf70cbac56df3f81165b2200177d2b95c -AUX pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch 1665 BLAKE2B 6351b770947a5487e8f1c59ab8ae09a9e8e7eb9c3ab25975e58e04349505b26af5a8917e4044f4d48c5d04001a3f276182328505e1976f829a6dab51e0fd0160 SHA512 a3bdf959f199db105eca701d0b8d9f1e6bce495436277670bad0b6cd60f4718b41e35bcad86f338b9b919de7121d5610af0d5a5f33fa48767b761fc2e4b515da AUX pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch 1662 BLAKE2B 48f4b7113ecd0b539b1a8449a3493dbd8459af70566867b5a1c70b794b2ca0136a496f45d24d97602787082cc8bf61c25138fcfe448115bf5215b329888df686 SHA512 de77f0d4f4a6dc2e57ab46727944191fc050fd423b659c26c9d4f4dd7f23ba7cc1d9a55fe63317caaf66b5ea58ac410997bae57a6d3ac28ab7cb6dde47ce9b15 AUX pjproject-2.13.1-fix-ptimesized-wav-input.patch 1331 BLAKE2B bb06858331c9519558dda9431602d92719c5ff23a9a6d62a736ff202bb3d7193be6c8db88e7c1046ce092c0e8856cd15d168260920bd3898563be40049cae892 SHA512 8487201c3b5c3f9dbc65438735a2b9c2b32129f8f55cb61f999d03b330d917f0fe8d37075d56d6477e2052aba3a595de7c63b6517d74e511ae0c066ef405a84a AUX pjproject-2.13.1-r1-config_site.h 2728 BLAKE2B a8edc8377a86c0716003755897fbeec17a5923c97748c42d3b5b7bfdc6a2273a9e98e8d2b59f9f5e52d49472e3e4be53ad3a0dc139c92ddafcf14fd57138cfa1 SHA512 c44c64815586963b6436c0e427aff230314b762d61908bc4182152b6f58e52ecd30369e450e999b1e03614b486455ace25fc759b227724445e7041f30f9106ef DIST pjproject-2.13.1.tar.gz 9746437 BLAKE2B a50278be52df755c5cec08da0c1a604a8c0ad6911853a424596ce05bc423a829818d2e7425b55bdc00fa24a91b9a3e891c54aa2add5cdbf8698173ac44ae2975 SHA512 1cdfaedafa2f42b306eef38174530163db19952c6842d5c96324c7439e2437a17cd96670ac58ae04da221b06d7eb91d612f4347cd421e036be62b27cb9501cda -DIST pjproject-2.13.tar.gz 9744716 BLAKE2B 947fe076089b3cd0826a554db3cda9939e228b9e7bb5ed2d01242e44e5e5b0d9d2ddc52b378f141efb89fcbfbd628fcdff341e54bc3615280e23f30ea58daf56 SHA512 df184511d554e5f77ca1a551bdf6b22c4c8ae2b6ad61be0e7e459e2d7db50f496af66c37e080f178019a509ea25847e70a342ac48c820a6b9302b4cbf174c520 -EBUILD pjproject-2.13-r2.ebuild 4030 BLAKE2B 6eff6a7456727ffd6427b477f48291770aff6395fa69ba849e5106173c5de8768a11de75194b839053d803a659abbe40f089c79dd043c7f3b66d57f109876b70 SHA512 8c1c3f0014bf99173d2161a82dade22fdc29abfa0595f2f3948a59f7958f379af82feba4c6bd9fc4ee48b691b056d2e616b69c9a9f3f6ee718dfc457f8f08892 +DIST pjproject-2.15.1.tar.gz 10425868 BLAKE2B cb4fdeca8559460f5335ffa7723e58fea3cb3f81cb55170ab7694b7828e3179c39c0fc376bebed566a212ec2b102349fc78593e414cb03864e4b111cdbf8b77c SHA512 2f83ed32f16c27808d3b9cc8f3b364c68fe88caae9765012b385a0fea70ba8ef4dcfebe3b130156047546720351a527e17d6a1e967877d6a44a6ff3a1f695599 EBUILD pjproject-2.13.1-r1.ebuild 3990 BLAKE2B 8acee52bca9853692b9772d097e403b435e52a9083229dcc08c91a9ecb8ce7c4b779c5d7bf169363efad91fd2d83b75f7f380d7e313b71d12acb850a828bc948 SHA512 a7ad7fb7e145db344f7832f26f04668896328e3496fb3123c47360542526474346b1eeff9337ef9714dc549e33df094287bd9442bd916b7543912f9f660f315d -EBUILD pjproject-2.13.1.ebuild 3935 BLAKE2B 9c203874d6027b5407e7aa699ceebb0f0132292d4816da4497c1feadd683ee83f3d20436f975d46798db93862592f3891fda9f1108dc5682e18c72d54cacfdfb SHA512 43bbbe44b937125b9b43b49ab62b4ee8f22946e5bfe2430e9db095875a63daa0f2b8083045292bbc7a6f770d08da9810eb4ae571e6b2eb919961bdd258f6a546 +EBUILD pjproject-2.15.1.ebuild 3749 BLAKE2B f4f7a5e5e30341879613b1fae7931f49cc7f46a13b2383127a9ed44c307ce71b1f2bb678859b9d5c3e3a3c51e3d18177c7158ea16d208c147ae6b96d771b6979 SHA512 4c75e5d7859dc958e73d5f08ad2abd956bccd2af8201088081c998976e29d0d04dcf27b617b9c9d940d3d8dc359e3a7874e1334965b5e58ea4b78bd0e3072f67 MISC metadata.xml 1474 BLAKE2B 03649c7dc3b70fd9423a0eba3790b78fc2ffc4fc3cde6ee86ac345aeb145d6ebaec91692a1866471577ec9f906f53bfea8c44b88fb376d48d29b4e97a691b400 SHA512 1d31c93728f0b52a82f2cec0a2eb6e20641808a06619cd62f0323ec5516a229a7acfed9f8982289f22931d22cab6183f7cd7774214cf569567bba684567e2bf1 diff --git a/net-libs/pjproject/files/pjproject-2.12.1-config_site.h b/net-libs/pjproject/files/pjproject-2.12.1-config_site.h deleted file mode 100644 index 37d094e24bbc..000000000000 --- a/net-libs/pjproject/files/pjproject-2.12.1-config_site.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Based off of the Asterisk config_site.h file. - * - * In general it's the same with some removals due to being ebuild-managed. - */ - -#include <sys/select.h> - -#define GENTOO_INVALID (Gentoo compile failure - please report a bug on bugs.gentoo.org) - -/* asterisk_malloc_debug.h is not required ... most of the operations are no-ops regardless - * and I can't see why asterisk is looking to compile this directly into pjproject */ - -/* - * Defining PJMEDIA_HAS_SRTP to 0 does NOT disable Asterisk's ability to use srtp. - * It only disables the pjmedia srtp transport which Asterisk doesn't use. - * The reason for the disable is that while Asterisk works fine with older libsrtp - * versions, newer versions of pjproject won't compile with them. - * - * Disabling this depends on an additional pjproject patch. So just leave it - * enabled for the time being, as it has always been enabled. - */ -#define PJMEDIA_HAS_SRTP 1 - -/* Ability to change this has ABI implications, force it on */ -/* Can be reconsidered in future: https://bugs.gentoo.org/680496 */ -#define PJ_HAS_IPV6 1 - -#define PJ_MAX_HOSTNAME (256) -#define PJSIP_MAX_URL_SIZE (512) -#ifdef PJ_HAS_LINUX_EPOLL -#define PJ_IOQUEUE_MAX_HANDLES (5000) -#else -#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE) -#endif -#define PJ_IOQUEUE_HAS_SAFE_UNREG 1 -#define PJ_IOQUEUE_MAX_EVENTS_IN_SINGLE_POLL (16) - -#define PJ_SCANNER_USE_BITWISE 0 -#define PJ_OS_HAS_CHECK_STACK 0 - -#ifndef PJ_LOG_MAX_LEVEL -#define PJ_LOG_MAX_LEVEL 6 -#endif - -#define PJ_ENABLE_EXTRA_CHECK 1 -#define PJSIP_MAX_TSX_COUNT ((64*1024)-1) -#define PJSIP_MAX_DIALOG_COUNT ((64*1024)-1) -#define PJSIP_UDP_SO_SNDBUF_SIZE (512*1024) -#define PJSIP_UDP_SO_RCVBUF_SIZE (512*1024) -#define PJ_DEBUG 0 -#define PJSIP_SAFE_MODULE 0 -#define PJ_HAS_STRICMP_ALNUM 0 - -/* - * Do not ever enable PJ_HASH_USE_OWN_TOLOWER because the algorithm is - * inconsistently used when calculating the hash value and doesn't - * convert the same characters as pj_tolower()/tolower(). Thus you - * can get different hash values if the string hashed has certain - * characters in it. (ASCII '@', '[', '\\', ']', '^', and '_') - */ -#undef PJ_HASH_USE_OWN_TOLOWER - -/* - It is imperative that PJSIP_UNESCAPE_IN_PLACE remain 0 or undefined. - Enabling it will result in SEGFAULTS when URIs containing escape sequences are encountered. -*/ -#undef PJSIP_UNESCAPE_IN_PLACE -#define PJSIP_MAX_PKT_LEN 65535 - -#undef PJ_TODO -#define PJ_TODO(x) - -/* Defaults too low for WebRTC */ -#define PJ_ICE_MAX_CAND 64 -#define PJ_ICE_MAX_CHECKS (PJ_ICE_MAX_CAND * PJ_ICE_MAX_CAND) - -/* Increase limits to allow more formats */ -#define PJMEDIA_MAX_SDP_FMT 64 -#define PJMEDIA_MAX_SDP_BANDW 4 -#define PJMEDIA_MAX_SDP_ATTR (PJMEDIA_MAX_SDP_FMT*3 + 4) -#define PJMEDIA_MAX_SDP_MEDIA 16 - -/* - * Turn off the periodic sending of CRLNCRLN. Default is on (90 seconds), - * which conflicts with the global section's keep_alive_interval option in - * pjsip.conf. - */ -#define PJSIP_TCP_KEEP_ALIVE_INTERVAL 0 -#define PJSIP_TLS_KEEP_ALIVE_INTERVAL 0 - -#define PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR 0 -#define PJ_SSL_SOCK_OSSL_USE_THREAD_CB 0 -#define PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER 1 - -/* Required to enable things like USE=video. */ -#define PJMEDIA_HAS_VIDEO GENTOO_INVALID diff --git a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch deleted file mode 100644 index bfd1fc05e160..000000000000 --- a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch +++ /dev/null @@ -1,95 +0,0 @@ -From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001 -From: Nanang Izzuddin <nanang@teluu.com> -Date: Tue, 20 Dec 2022 11:39:12 +0700 -Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w - -* Fix buffer overread in STUN message decoder - -* Updates based on comments ---- - pjnath/include/pjnath/stun_msg.h | 4 ++++ - pjnath/src/pjnath/stun_msg.c | 14 +++++++++++--- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h -index b52f95c586..e49f096f3a 100644 ---- a/pjnath/include/pjnath/stun_msg.h -+++ b/pjnath/include/pjnath/stun_msg.h -@@ -442,6 +442,7 @@ typedef enum pj_stun_status - - \endverbatim - */ -+#pragma pack(1) - typedef struct pj_stun_msg_hdr - { - /** -@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr - pj_uint8_t tsx_id[12]; - - } pj_stun_msg_hdr; -+#pragma pack() - - - /** -@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr - - \endverbatim - */ -+#pragma pack(1) - typedef struct pj_stun_attr_hdr - { - /** -@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr - pj_uint16_t length; - - } pj_stun_attr_hdr; -+#pragma pack() - - - /** -diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c -index 3def6b3eac..e904a0ba47 100644 ---- a/pjnath/src/pjnath/stun_msg.c -+++ b/pjnath/src/pjnath/stun_msg.c -@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr) - - #define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \ - (a)->hdr.length=(pj_uint16_t)(l) --#define ATTR_HDR_LEN 4 -+#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr) - - static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) - { -@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, - status = pj_stun_msg_check(pdu, pdu_len, options); - if (status != PJ_SUCCESS) - return status; -+ } else { -+ /* For safety, verify packet length at least */ -+ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20; -+ if (msg_len > pdu_len || -+ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len)) -+ { -+ return PJNATH_EINSTUNMSGLEN; -+ } - } - - /* Create the message, copy the header, and convert to host byte order */ -@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, - p_response = NULL; - - /* Parse attributes */ -- while (pdu_len >= 4) { -+ while (pdu_len >= ATTR_HDR_LEN) { - unsigned attr_type, attr_val_len; - const struct attr_desc *adesc; - -@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, - attr_val_len = (attr_val_len + 3) & (~3); - - /* Check length */ -- if (pdu_len < attr_val_len) { -+ if (pdu_len < attr_val_len + ATTR_HDR_LEN) { - pj_str_t err_msg; - char err_msg_buf[80]; - diff --git a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch deleted file mode 100644 index 499ce4373b56..000000000000 --- a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch +++ /dev/null @@ -1,50 +0,0 @@ -From bc4812d31a67d5e2f973fbfaf950d6118226cf36 Mon Sep 17 00:00:00 2001 -From: sauwming <ming@teluu.com> -Date: Fri, 23 Dec 2022 15:05:28 +0800 -Subject: [PATCH] Merge pull request from GHSA-cxwq-5g9x-x7fr - -* Fixed heap buffer overflow when parsing STUN errcode attribute - -* Also fixed uint parsing ---- - pjnath/src/pjnath/stun_msg.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c -index c6b0bdd284..b55d29849a 100644 ---- a/pjnath/src/pjnath/stun_msg.c -+++ b/pjnath/src/pjnath/stun_msg.c -@@ -1438,12 +1438,12 @@ static pj_status_t decode_uint_attr(pj_pool_t *pool, - attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr); - GETATTRHDR(buf, &attr->hdr); - -- attr->value = GETVAL32H(buf, 4); -- - /* Check that the attribute length is valid */ - if (attr->hdr.length != 4) - return PJNATH_ESTUNINATTRLEN; - -+ attr->value = GETVAL32H(buf, 4); -+ - /* Done */ - *p_attr = attr; - -@@ -1757,14 +1757,15 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool, - attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr); - GETATTRHDR(buf, &attr->hdr); - -+ /* Check that the attribute length is valid */ -+ if (attr->hdr.length < 4) -+ return PJNATH_ESTUNINATTRLEN; -+ - attr->err_code = buf[6] * 100 + buf[7]; - - /* Get pointer to the string in the message */ - value.ptr = ((char*)buf + ATTR_HDR_LEN + 4); - value.slen = attr->hdr.length - 4; -- /* Make sure the length is never negative */ -- if (value.slen < 0) -- value.slen = 0; - - /* Copy the string to the attribute */ - pj_strdup(pool, &attr->reason, &value); diff --git a/net-libs/pjproject/pjproject-2.13-r2.ebuild b/net-libs/pjproject/pjproject-2.13-r2.ebuild deleted file mode 100644 index a252ce354257..000000000000 --- a/net-libs/pjproject/pjproject-2.13-r2.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# TODO: Figure out a way to disable SRTP from pjproject entirely. -EAPI=8 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Open source SIP, Media, and NAT Traversal Library" -HOMEPAGE="https://github.com/pjsip/pjproject https://www.pjsip.org/" -SRC_URI="https://github.com/pjsip/${PN}/archive/${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 opus resample silk ssl static-libs webrtc - ${CODEC_FLAGS} g729 - ${VIDEO_FLAGS} - ${SOUND_FLAGS}" - -RDEPEND=">=net-libs/libsrtp-2.3.0:= - alsa? ( media-libs/alsa-lib ) - amr? ( media-libs/opencore-amr ) - ffmpeg? ( media-video/ffmpeg:= ) - g729? ( media-libs/bcg729 ) - gsm? ( media-sound/gsm ) - ilbc? ( media-libs/libilbc ) - openh264? ( media-libs/openh264 ) - opus? ( media-libs/opus ) - portaudio? ( media-libs/portaudio ) - resample? ( media-libs/libsamplerate ) - sdl? ( media-libs/libsdl2 ) - speex? ( - media-libs/speex - media-libs/speexdsp - ) - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch" - "${FILESDIR}/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch" - "${FILESDIR}/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch" -) - -src_prepare() { - default - rm configure || die "Unable to remove unwanted wrapper" - mv aconfigure.ac configure.ac || die "Unable to rename configure script source" - eautoreconf - - cp "${FILESDIR}/pjproject-2.12.1-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h" -} - -_pj_enable() { - usex "$1" '' "--disable-${2:-$1}" -} - -_pj_get_define() { - local r="$(sed -nre "s/^#define[[:space:]]+$1[[:space:]]+//p" "${S}/pjlib/include/pj/config_site.h")" - [[ -z "${r}" ]] && die "Unable to fine #define $1 in config_site.h" - echo "$r" -} - -_pj_set_define() { - local c=$(_pj_get_define "$1") - [[ "$c" = "$2" ]] && return 0 - sed -re "s/^#define[[:space:]]+$1[[:space:]].*/#define $1 $2/" -i "${S}/pjlib/include/pj/config_site.h" || die "sed failed updating $1 to $2." - [[ "$(_pj_get_define "$1")" != "$2" ]] && die "sed failed to perform update for $1 to $2." -} - -_pj_use_set_define() { - _pj_set_define "$2" $(usex "$1" 1 0) -} - -src_configure() { - local myconf=() - local videnable="--disable-video" - local t - - use debug || append-cflags -DNDEBUG=1 - - for t in ${CODEC_FLAGS}; do - myconf+=( $(_pj_enable ${t} ${t}-codec) ) - done - myconf+=( $(_pj_enable g729 bcg729) ) - - for t in ${VIDEO_FLAGS}; do - myconf+=( $(_pj_enable ${t}) ) - use "${t}" && videnable="--enable-video" - done - - [ "${videnable}" = "--enable-video" ] && _pj_set_define PJMEDIA_HAS_VIDEO 1 || _pj_set_define PJMEDIA_HAS_VIDEO 0 - - LD="$(tc-getCC)" econf \ - --enable-shared \ - --with-external-srtp \ - ${videnable} \ - $(_pj_enable alsa sound) \ - $(_pj_enable amr opencore-amr) \ - $(_pj_enable epoll) \ - $(_pj_enable opus) \ - $(_pj_enable portaudio ext-sound) \ - $(_pj_enable resample libsamplerate) \ - $(_pj_enable resample resample-dll) \ - $(_pj_enable resample) \ - $(_pj_enable silk) \ - $(_pj_enable speex speex-aec) \ - $(_pj_enable ssl) \ - $(_pj_enable webrtc libwebrtc) \ - $(use_with gsm external-gsm) \ - $(use_with portaudio external-pa) \ - $(use_with speex external-speex) \ - "${myconf[@]}" -} - -src_compile() { - emake dep LD="$(tc-getCC)" - emake LD="$(tc-getCC)" -} - -src_install() { - default - - newbin pjsip-apps/bin/pjsua-${CHOST} pjsua - newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest - - if use examples; then - insinto "/usr/share/doc/${PF}/examples" - doins -r pjsip-apps/src/samples - fi - - use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error removing static archives" -} diff --git a/net-libs/pjproject/pjproject-2.13.1.ebuild b/net-libs/pjproject/pjproject-2.15.1.ebuild index ad7121f4bf01..26d8b3e75d42 100644 --- a/net-libs/pjproject/pjproject-2.13.1.ebuild +++ b/net-libs/pjproject/pjproject-2.15.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # TODO: Figure out a way to disable SRTP from pjproject entirely. EAPI=8 @@ -8,21 +8,20 @@ inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Open source SIP, Media, and NAT Traversal Library" HOMEPAGE="https://github.com/pjsip/pjproject https://www.pjsip.org/" SRC_URI="https://github.com/pjsip/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - LICENSE="GPL-2" SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" # g729 not included due to special bcg729 handling. CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16" VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx" SOUND_FLAGS="alsa portaudio" -IUSE="amr debug epoll examples opus resample silk ssl static-libs webrtc +IUSE="amr debug epoll examples opus resample silk srtp ssl static-libs webrtc ${CODEC_FLAGS} g729 ${VIDEO_FLAGS} ${SOUND_FLAGS}" -RDEPEND=">=net-libs/libsrtp-2.3.0:= +RDEPEND=" alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) @@ -38,25 +37,19 @@ RDEPEND=">=net-libs/libsrtp-2.3.0:= media-libs/speex media-libs/speexdsp ) - ssl? ( - dev-libs/openssl:0= - ) + srtp? ( >=net-libs/libsrtp-2.3.0:= ) + ssl? ( dev-libs/openssl:0= ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( - "${FILESDIR}/pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch" - "${FILESDIR}/pjproject-2.13.1-fix-ptimesized-wav-input.patch" -) - src_prepare() { default rm configure || die "Unable to remove unwanted wrapper" mv aconfigure.ac configure.ac || die "Unable to rename configure script source" eautoreconf - cp "${FILESDIR}/pjproject-2.12.1-config_site.h" "${S}/pjlib/include/pj/config_site.h" \ + cp "${FILESDIR}/pjproject-2.13.1-r1-config_site.h" "${S}/pjlib/include/pj/config_site.h" \ || die "Unable to create config_site.h" } @@ -101,9 +94,8 @@ src_configure() { [ "${videnable}" = "--enable-video" ] && _pj_set_define PJMEDIA_HAS_VIDEO 1 || _pj_set_define PJMEDIA_HAS_VIDEO 0 - LD="$(tc-getCC)" econf \ + LD="$(tc-getCXX)" econf \ --enable-shared \ - --with-external-srtp \ ${videnable} \ $(_pj_enable alsa sound) \ $(_pj_enable amr opencore-amr) \ @@ -120,14 +112,10 @@ src_configure() { $(use_with gsm external-gsm) \ $(use_with portaudio external-pa) \ $(use_with speex external-speex) \ + $(usex srtp --with-external-srtp --disable-libsrtp) \ "${myconf[@]}" } -src_compile() { - emake dep LD="$(tc-getCC)" - emake LD="$(tc-getCC)" -} - src_install() { default diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index ced69a5a7e45..08554d3c0f8c 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -2,10 +2,10 @@ AUX 2.44.1-non-unified-build-fixes.patch 11799 BLAKE2B 6928f61428c4bc6594a46f742 AUX 2.44.4-fix-icu76.1.patch 1215 BLAKE2B 0d4aa869b52eb6579ff58421982e80f02077e064988b30887af9d7da5a1c31bb652fdc406fbfe4e0895cd4c4e0e67b2cc4e363e8d8c60aac5d5683808fd52080 SHA512 356051853ce56e040aed620a6cb68dba75c2387ed396cfea85c2fcd5e51998a31ea2e2eca5305d9aa99b66f6f8ea7e8983851c77ca654a97ec3b3ecce8bd651c DIST webkitgtk-2.44.4.tar.xz 35858056 BLAKE2B 9e3d016bfb2b4e80d2ebeda95e75f8ec8b909b41b17a879d3e1119ed66e3bf4d590a22ed814bb1572dac8d8a8838bb37b5ab1372121b276e02ee8925f6c5b00c SHA512 037ef6a9faca68b68dc62927a475134450493129043ea6cc03595cd4a684d590f80a1e9c3ed40a9176874ba43fc9efbc5065a264dfe131ebd72e272756612db9 DIST webkitgtk-2.46.5.tar.xz 42898600 BLAKE2B 04f824f9864749c13810318c06e5da90265025062a706030bece73661cf89b8d972040c508ca5b4267d476f9dac8fcdaa82943409f6ae45ab84801d899a1ed7f SHA512 9a0eb018361d407f13b303f66babcdc9960075bf69b83cf2ee8f708e5396cfa9e0a720f77695aea216072392e0603c2dc8ad50e6d56f962d4a52e9cdadf38275 -EBUILD webkit-gtk-2.44.4-r410.ebuild 7909 BLAKE2B 637ade4977c2abc8806dd6dbe7478ac553dad8afdca52b6462b05fdd55e0541dc7ac009341ce603332c0db99cfd613b23a15ecca33c276ca0e1ea99aa6473b89 SHA512 49bb6abae1f14df378b704539f22807d139221901d896f591e5034f237bcfc19bc23432e3ee84709d25677f9b6d4c5095919d0ddf451020198d69226f324ce18 -EBUILD webkit-gtk-2.44.4-r600.ebuild 8650 BLAKE2B a8fac804c760d959abb0db55d197122023e481423911f59bdfdb702ebd7457eab924ff33f485bc9324ad430dfbaa53b7e21b7a5a83c84bb9083945c6e416cf9d SHA512 1206812c90a0236850bfd2ca0cdb2e45d86df75bb1a275ca27832b7b8fbbd17f8da63ccbf67f17fe76065aea49f39de70adf72f71feadc66aa5429d374a490a2 -EBUILD webkit-gtk-2.44.4.ebuild 7757 BLAKE2B d235cc4dc49fd8bae7930e52a8775096cd7e5517e5adecbf37fdff2a8f6538134fe77398a64f1ba204d605b5137f911eeeeb7ba4ba630ba719b06c6d3d07d512 SHA512 1bc2fde1b201baa0559f0cb5decb6ad63e85fb058965471fc399d83fb7f367ed2d88239a7779a96e1438574f6a075034c68a4ef2026131b877dbfa354db313e6 -EBUILD webkit-gtk-2.46.5-r410.ebuild 7892 BLAKE2B 52f06efd6a196704598721a538246d2f4dffff96dda5307978369db4b8a18d04ae6b017aebedf426476cfdf7affbe89bd6313c438258ef47d996b1f82c0ea184 SHA512 8a0c5da10a47353f91659f4d5eb6684eeaa2a063a3ad1565333029544912f47345d4b58a7f26d1c5ce7f8495ecaf7a46fa6472293dcb8f1baab253c94326ae95 -EBUILD webkit-gtk-2.46.5-r600.ebuild 8636 BLAKE2B fb5c0507d1abfa9ef060a1ae95dfcd6a49d5ca947eebf7377deccee8efe2ad51096a96283c483d7ced25f408ca670d44bbe1571a85d86d18729c52e3ac6b52a3 SHA512 9c8e0b0a9ea2c6239aa1017f90ab5a877d5af551990eb20ef303400d4d776093ac660ba1f8b3532454b669b55df0ab8b143f86ffafc508e3ac0e97e9df450292 -EBUILD webkit-gtk-2.46.5.ebuild 7890 BLAKE2B 60ad0e5ba9c1109612722a18639b71d038820d66edbe8a701803b3bcd09b3e12df1e53fc25a1fbc97dc49b19ebeaf1ba1c2e51e794fcdd6fec6cb9be634e6b82 SHA512 fdc096cee0557b34e8566e4b743217bf9fb324f4e0f88c697aefe7057ca37e0bbbca21d2889190d14f8f2003c3c5a3bdac1b806cbd49e29cf6146fa22e0b9e62 +EBUILD webkit-gtk-2.44.4-r410.ebuild 8038 BLAKE2B b3b04c257255c526efa04cb3ac0239ca52273e081a65503b3a9e963700b91ee7209c1750111a4222c03c520191feebb9ff64db6fe4cd77013e62584fe76fd5cb SHA512 d69b0a682b462dc9f04671138f66e00bd79a97de4f49220fdf619f25a7718bc6284c5019a3f2bc42da469545c61cf02cd2e6184c171db18304a756907f216436 +EBUILD webkit-gtk-2.44.4-r600.ebuild 8779 BLAKE2B c27f231aef21bd7967ccd541eab476d00697768e45f6c3ab3fd6de7490b164f9020e101a999980afdf5f24b94317ab3662785f14442f72659ddb7b111089d12b SHA512 08d51cca0d01087e6511b5556461e6c12d96ed7b47d016b20aade206e2aaaedb437c8ecf1ac6a3bc5cf9910ab2309e5a74429f8486f6d9fdc30cd17afc9bcd03 +EBUILD webkit-gtk-2.44.4.ebuild 7886 BLAKE2B d2da6d6c06b231ba616b199550a208fef3e6f011f0917432b870f192a0000c1d8941d0014917614f067fc6503a39f8f80afad5873f390cdac16ac0552ce4a47f SHA512 8ed6a9267d9f911b08392108c4a579713981f6b76a4c0479fd6fc6e72c592559b9a49304594d7be69151e317d3fbb6ea8a6eeadbbbacc9bb4ed3da5292922a07 +EBUILD webkit-gtk-2.46.5-r410.ebuild 8021 BLAKE2B 4fc39816377dffa9a405b6a524949bd3456d0f05f9f34e58441855e9ba4d380bf0876690d960311d8e5f1dc91a9bd2035b1e0a1f964fa88472dab5b485314f82 SHA512 33934bb7f5798398d59900d0dd768df6aabf989362f23d366aa98df1ff8a2adf8cd4e592fb822c96b558240fca0df3b103ef459f8ed5a1bcd0febe09d45ff230 +EBUILD webkit-gtk-2.46.5-r600.ebuild 8765 BLAKE2B 94c799773396c7086a2d24ba811d05765bf5b3b9f02382177d3546bd9bb9a85464ac5e0a93fcdf6a85752a284cff1214477ada2d7878d4e177aa26a1d82d1df8 SHA512 6c84d25f8ac7a848f26a21bca29064705a580133279e39e13dcdd5ecf400db220bd8da53007dc999002e46069c94c3980facc97943cf2ffe145ff892c3594f6a +EBUILD webkit-gtk-2.46.5.ebuild 8019 BLAKE2B 908dd4ef825d08983b84d1a90f9c3dda12c5d0fa285f5e0085eea5968982d24be7846e31f059eb42eeba4b4a55cb0307801190cc0b36a7d433bc8a46c0c7f2e6 SHA512 eeb75d958dc600b77c4c4d1c9662d77b7ae22e419397fd6a7f121d8b1d7fe0f032cd494ed43bcf906111038d0f7ce7e648b0ea3ea2370d6f35a3ef2d7124e657 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild index 7fb985e7ec4f..c0fc92c763c5 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -150,6 +150,9 @@ src_prepare() { # https://bugs.gentoo.org/943213 eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch + + # We don't want -Werror for gobject-introspection (bug #947761) + sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild index 1e00c03e2eec..e61f3a18a1ad 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -161,6 +161,9 @@ src_prepare() { # https://bugs.gentoo.org/943213 eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch + + # We don't want -Werror for gobject-introspection (bug #947761) + sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild index e91e5f2e0d0a..a1948909e39f 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -148,6 +148,9 @@ src_prepare() { # https://bugs.gentoo.org/943213 eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch + + # We don't want -Werror for gobject-introspection (bug #947761) + sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild index e3bb04a8eb6b..eeef5428ef36 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild @@ -148,6 +148,9 @@ src_prepare() { # https://bugs.gentoo.org/943213 eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch + + # We don't want -Werror for gobject-introspection (bug #947761) + sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild index f9115674d7d8..e40c88689095 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild @@ -159,6 +159,9 @@ src_prepare() { # https://bugs.gentoo.org/943213 eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch + + # We don't want -Werror for gobject-introspection (bug #947761) + sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild index 65c69ce20ad7..55f307785f7a 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild @@ -148,6 +148,9 @@ src_prepare() { # https://bugs.gentoo.org/943213 eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch + + # We don't want -Werror for gobject-introspection (bug #947761) + sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die } src_configure() { |