From a12f416baa722b8bda57c0d527fb28b3d06b2aeb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 27 Jul 2023 10:33:45 +0100 Subject: gentoo auto-resync : 27:07:2023 - 10:33:45 --- net-libs/pjproject/Manifest | 3 + ...pjproject-2.13.1-fix-ptimesized-wav-input.patch | 30 +++++ net-libs/pjproject/pjproject-2.13.1.ebuild | 143 +++++++++++++++++++++ 3 files changed, 176 insertions(+) create mode 100644 net-libs/pjproject/files/pjproject-2.13.1-fix-ptimesized-wav-input.patch create mode 100644 net-libs/pjproject/pjproject-2.13.1.ebuild (limited to 'net-libs/pjproject') diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest index f66380370fdb..66b654ee1146 100644 --- a/net-libs/pjproject/Manifest +++ b/net-libs/pjproject/Manifest @@ -2,6 +2,9 @@ AUX pjproject-2.12.1-config_site.h 3213 BLAKE2B f7e4d26e83591071b8527417a0a2cf49 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 +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 +EBUILD pjproject-2.13.1.ebuild 3937 BLAKE2B a3b22490c605e82bd3592ebaa1544c8f400b884f7216ac7bc90aa2650d492d315946ac667666d9dee0fcb0632f7c98c95612ceaadc5d81ee6755b650ee939909 SHA512 d023de6beb126c2c469225429635a09cea0c939c61526d01a0d3cdb6dc5f3e7a14c6ce496d133eb0550c18d636b79576d44e252722622bccbbf7229cec398da9 MISC metadata.xml 1459 BLAKE2B e35f9c8621ea7c1c2670d90f69c341b53b20501ece6fcb41fefdec9f328a6c2b88f2f9d2fd2a77938b802fc74c36f2e3387cad3be7c9126767f28d32b42d19ed SHA512 498a94fb2bf3692b60c644e9d3e341761b20e8a4e0215e1c14c4444a199f9abb085f3421e143e7b944bac54a4f774c0b47af76c6fae5fc2cda4da13d1781a9b0 diff --git a/net-libs/pjproject/files/pjproject-2.13.1-fix-ptimesized-wav-input.patch b/net-libs/pjproject/files/pjproject-2.13.1-fix-ptimesized-wav-input.patch new file mode 100644 index 000000000000..9f1459f68d63 --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.13.1-fix-ptimesized-wav-input.patch @@ -0,0 +1,30 @@ +From dc4d4587cb8abe07513b9ae24cf62eaeeb6e8907 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon +Date: Wed, 14 Jun 2023 16:39:41 +0200 +Subject: [PATCH] Fix wave port creation if the input wave file contains + exactly one frame. + +If for example we try to load a file with ptime=10 and there is exactly +10 ms worth of PCM data in the wave file (160 bytes of PCM data) then +the buff_size will be adjusted down to be of a size that matches exactly +one frame, resulting in the check that the buffer size can hold at least +one frame failing due to comparing >= instead of >. + +Signed-off-by: Jaco Kroon +--- + pjmedia/src/pjmedia/wav_player.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pjmedia/src/pjmedia/wav_player.c b/pjmedia/src/pjmedia/wav_player.c +index 84ba53d50..410cf2627 100644 +--- a/pjmedia/src/pjmedia/wav_player.c ++++ b/pjmedia/src/pjmedia/wav_player.c +@@ -428,7 +428,7 @@ PJ_DEF(pj_status_t) pjmedia_wav_player_port_create( pj_pool_t *pool, + /* samples_per_frame must be smaller than bufsize (because get_frame() + * doesn't handle this case). + */ +- if (samples_per_frame * fport->bytes_per_sample >= fport->bufsize) { ++ if (samples_per_frame * fport->bytes_per_sample > fport->bufsize) { + pj_file_close(fport->fd); + return PJ_EINVAL; + } diff --git a/net-libs/pjproject/pjproject-2.13.1.ebuild b/net-libs/pjproject/pjproject-2.13.1.ebuild new file mode 100644 index 000000000000..3620c5411601 --- /dev/null +++ b/net-libs/pjproject/pjproject-2.13.1.ebuild @@ -0,0 +1,143 @@ +# 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/refs/tags/${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.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" \ + || 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" +} -- cgit v1.2.3