[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: d500d5f4e087a6c4e540e0d247d08b1555e3b8c7
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Jan 12 08:30:16 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Jan 12 08:30:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d500d5f4
net-libs/pjproject: Keyword 2.13.1-r1 sparc, #919424
Signed-off-by: Arthur Zamarin gentoo.org>
net-libs/pjproject/pjproject-2.13.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.13.1-r1.ebuild
b/net-libs/pjproject/pjproject-2.13.1-r1.ebuild
index 536c98527bac..3f1be2aecabd 100644
--- a/net-libs/pjproject/pjproject-2.13.1-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.13.1-r1.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/, net-libs/pjproject/files/, profiles/arch/sparc/
commit: df890705fe818409c024387376e289ead06077f8 Author: Jaco Kroon uls co za> AuthorDate: Tue Jan 9 11:56:02 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jan 10 15:49:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df890705 net-libs/pjproject: bump to 2.13.1-r1 to add IUSE=srtp Bump to make linking in libsrtp optional so we can keyword asterisk for sparc. There are no known project in gentoo other than asterisk, which don't care for pjproject having (or not having) srtp. Thus in order to enable pjproject to be used on sparc we need to be able to not depend on libsrtp. Bug: https://bugs.gentoo.org/919424 Signed-off-by: Jaco Kroon uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/34719 Signed-off-by: Sam James gentoo.org> .../files/pjproject-2.13.1-r1-config_site.h| 86 + net-libs/pjproject/metadata.xml| 1 + net-libs/pjproject/pjproject-2.13.1-r1.ebuild | 142 + profiles/arch/sparc/package.use.mask | 4 +- 4 files changed, 232 insertions(+), 1 deletion(-) diff --git a/net-libs/pjproject/files/pjproject-2.13.1-r1-config_site.h b/net-libs/pjproject/files/pjproject-2.13.1-r1-config_site.h new file mode 100644 index ..c2dd59149e9f --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.13.1-r1-config_site.h @@ -0,0 +1,86 @@ +/* + * Based off of the Asterisk config_site.h file. + * + * In general it's the same with some removals due to being ebuild-managed. + */ + +#include + +#define GENTOO_INVALID (Gentoo compile failure - please report a bug on bugs.gentoo.org) + +/* asterisk_malloc_debug.h is not required ... most of the operations are no-ops regardless + * and I can't see why asterisk is looking to compile this directly into pjproject */ + +/* Ability to change this has ABI implications, force it on */ +/* Can be reconsidered in future: https://bugs.gentoo.org/680496 */ +#define PJ_HAS_IPV6 1 + +#define PJ_MAX_HOSTNAME (256) +#define PJSIP_MAX_URL_SIZE (512) +#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 */ +#definePJMEDIA_MAX_SDP_FMT 64 +#definePJMEDIA_MAX_SDP_BANDW 4 +#definePJMEDIA_MAX_SDP_ATTR (PJMEDIA_MAX_SDP_FMT*3 + 4) +#definePJMEDIA_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/metadata.xml b/net-libs/pjproject/metadata.xml index 526020157e7d..b7d5dd9a9604 100644 --- a/net-libs/pjproject/metadata.xml +++ b/net-libs/pjproject/metadata.xml @@ -22,6 +22,7 @@ Include Open H.264 support in the build Include resampling implementations in the build Include SILK support in the build + Enable support for encrypted voice transmission (secure RTP) Include Video4Linux v2 support in the build Include VP8 and VP9 codec support in the build Enable WebRTC support diff --git
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 2da3b9957674134fa383f656a6b5475c0e31158e
Author: Joonas Niilola gentoo org>
AuthorDate: Wed Nov 22 07:20:13 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Nov 22 07:20:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da3b995
net-libs/pjproject: Stabilize 2.13.1 amd64, #917659
Signed-off-by: Joonas Niilola gentoo.org>
net-libs/pjproject/pjproject-2.13.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.13.1.ebuild
b/net-libs/pjproject/pjproject-2.13.1.ebuild
index 3620c5411601..c9d8853f34c1 100644
--- a/net-libs/pjproject/pjproject-2.13.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.13.1.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 917d1903e4e8c2218f51231fe76d6e148d94e262
Author: Joonas Niilola gentoo org>
AuthorDate: Wed Nov 22 07:20:34 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Nov 22 07:20:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917d1903
net-libs/pjproject: Stabilize 2.13.1 x86, #917659
Signed-off-by: Joonas Niilola gentoo.org>
net-libs/pjproject/pjproject-2.13.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.13.1.ebuild
b/net-libs/pjproject/pjproject-2.13.1.ebuild
index c9d8853f34c1..ad7121f4bf01 100644
--- a/net-libs/pjproject/pjproject-2.13.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.13.1.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/, net-libs/pjproject/
commit: 45426048c79dff064f62206e01827d63798e39be
Author: Jaco Kroon uls co za>
AuthorDate: Sun Jul 9 19:18:49 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Jul 27 06:48:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45426048
net-libs/pjproject: add 2.13.1
Signed-off-by: Jaco Kroon uls.co.za>
Signed-off-by: Joonas Niilola gentoo.org>
net-libs/pjproject/Manifest| 1 +
...pjproject-2.13.1-fix-ptimesized-wav-input.patch | 30 +
net-libs/pjproject/pjproject-2.13.1.ebuild | 143 +
3 files changed, 174 insertions(+)
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index c081c0e1aeb2..0082f1020d94 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1 +1,2 @@
+DIST pjproject-2.13.1.tar.gz 9746437 BLAKE2B
a50278be52df755c5cec08da0c1a604a8c0ad6911853a424596ce05bc423a829818d2e7425b55bdc00fa24a91b9a3e891c54aa2add5cdbf8698173ac44ae2975
SHA512
1cdfaedafa2f42b306eef38174530163db19952c6842d5c96324c7439e2437a17cd96670ac58ae04da221b06d7eb91d612f4347cd421e036be62b27cb9501cda
DIST pjproject-2.13.tar.gz 9744716 BLAKE2B
947fe076089b3cd0826a554db3cda9939e228b9e7bb5ed2d01242e44e5e5b0d9d2ddc52b378f141efb89fcbfbd628fcdff341e54bc3615280e23f30ea58daf56
SHA512
df184511d554e5f77ca1a551bdf6b22c4c8ae2b6ad61be0e7e459e2d7db50f496af66c37e080f178019a509ea25847e70a342ac48c820a6b9302b4cbf174c520
diff --git
a/net-libs/pjproject/files/pjproject-2.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 ..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 ..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=(
+
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/
commit: 871c0d7f0cc4fca68f961233adca4e301ade6669
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri May 19 14:31:10 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Mon May 22 21:26:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871c0d7f
net-libs/pjproject: remove unused patches
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31097
Signed-off-by: Conrad Kostecki gentoo.org>
.../files/pjproject-2.12.1-CVE-2022-31031.patch| 41 ---
.../files/pjproject-2.12.1-r2-CVE-2022-39244.patch | 306 -
.../files/pjproject-2.12.1-r2-CVE-2022-39269.patch | 33 ---
.../files/pjproject-2.12.1-r2-bashism.patch| 44 ---
.../pjproject/files/pjproject-2.12.1-r2-musl.patch | 102 ---
5 files changed, 526 deletions(-)
diff --git a/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch
b/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch
deleted file mode 100644
index 637b7f374ffc..
--- a/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 450baca94f475345542c6953832650c390889202 Mon Sep 17 00:00:00 2001
-From: sauwming
-Date: Tue, 7 Jun 2022 12:00:13 +0800
-Subject: [PATCH] Merge pull request from GHSA-26j7-ww69-c4qj
-
- pjlib-util/src/pjlib-util/stun_simple.c | 7 ++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/pjlib-util/src/pjlib-util/stun_simple.c
b/pjlib-util/src/pjlib-util/stun_simple.c
-index 722519584..d0549176d 100644
a/pjlib-util/src/pjlib-util/stun_simple.c
-+++ b/pjlib-util/src/pjlib-util/stun_simple.c
-@@ -54,6 +54,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t
buf_len,
- {
- pj_uint16_t msg_type, msg_len;
- char *p_attr;
-+int attr_max_cnt = PJ_ARRAY_SIZE(msg->attr);
-
- PJ_CHECK_STACK();
-
-@@ -83,7 +84,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t
buf_len,
- msg->attr_count = 0;
- p_attr = (char*)buf + sizeof(pjstun_msg_hdr);
-
--while (msg_len > 0) {
-+while (msg_len > 0 && msg->attr_count < attr_max_cnt) {
- pjstun_attr_hdr **attr = >attr[msg->attr_count];
- pj_uint32_t len;
- pj_uint16_t attr_type;
-@@ -111,6 +112,10 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf,
pj_size_t buf_len,
- p_attr += len;
- ++msg->attr_count;
- }
-+if (msg->attr_count == attr_max_cnt) {
-+ PJ_LOG(4, (THIS_FILE, "Warning: max number attribute %d reached.",
-+ attr_max_cnt));
-+}
-
- return PJ_SUCCESS;
- }
diff --git a/net-libs/pjproject/files/pjproject-2.12.1-r2-CVE-2022-39244.patch
b/net-libs/pjproject/files/pjproject-2.12.1-r2-CVE-2022-39244.patch
deleted file mode 100644
index a0995fb92957..
--- a/net-libs/pjproject/files/pjproject-2.12.1-r2-CVE-2022-39244.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-https://bugs.gentoo.org/875863
-https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae
-
-From c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae Mon Sep 17 00:00:00 2001
-From: sauwming
-Date: Mon, 3 Oct 2022 08:07:22 +0800
-Subject: [PATCH] Merge pull request from GHSA-fq45-m3f7-3mhj
-
-* Initial patch
-
-* Use 'pj_scan_is_eof(scanner)'
-
-Co-authored-by: Aaron Lichtman
-
-* Use 'pj_scan_is_eof(scanner)'
-
-Co-authored-by: Aaron Lichtman
-
-* Use 'pj_scan_is_eof(scanner)'
-
-Co-authored-by: Aaron Lichtman
-
-* Use `!pj_scan_is_eof` instead of manually checking `scanner->curptr <
scanner->end`
-
-Co-authored-by: Maksim Mukosey
-
-* Update pjlib-util/src/pjlib-util/scanner.c
-
-Co-authored-by: Aaron Lichtman
-
-* Update pjlib-util/src/pjlib-util/scanner.c
-
-Co-authored-by: Aaron Lichtman
-
-* Update pjlib-util/src/pjlib-util/scanner.c
-
-Co-authored-by: Aaron Lichtman
-
-* Revert '>=' back to '>' in pj_scan_stricmp_alnum()
-
-* Fix error compiles.
-
-Co-authored-by: Nanang Izzuddin
-Co-authored-by: Aaron Lichtman
-Co-authored-by: Maksim Mukosey
- pjlib-util/src/pjlib-util/scanner.c | 41 +++--
- pjmedia/src/pjmedia/rtp.c | 11 +---
- pjmedia/src/pjmedia/sdp.c | 24 ++---
- 3 files changed, 48 insertions(+), 28 deletions(-)
-
-diff --git a/pjlib-util/src/pjlib-util/scanner.c
b/pjlib-util/src/pjlib-util/scanner.c
-index a54edf2d8e..6541bbae31 100644
a/pjlib-util/src/pjlib-util/scanner.c
-+++ b/pjlib-util/src/pjlib-util/scanner.c
-@@ -195,7 +195,13 @@ PJ_DEF(void) pj_scan_skip_whitespace( pj_scanner *scanner
)
-
- PJ_DEF(void) pj_scan_skip_line( pj_scanner *scanner )
- {
--char *s = pj_memchr(scanner->curptr, '\n', scanner->end -
scanner->curptr);
-+char *s;
-+
-+if (pj_scan_is_eof(scanner)) {
-+return;
-+}
-+
-+s = pj_memchr(scanner->curptr, '\n', scanner->end - scanner->curptr);
- if (!s) {
- scanner->curptr = scanner->end;
- } else {
-@@ -264,8 +270,7 @@
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: a07cec3e110d5a87ae91c785c8b42220b153c9b6
Author: John Helmert III gentoo org>
AuthorDate: Thu May 18 05:06:16 2023 +
Commit: John Helmert III gentoo org>
CommitDate: Thu May 18 05:06:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a07cec3e
net-libs/pjproject: revbump 2.13 to propagate RDEPEND change
Signed-off-by: John Helmert III gentoo.org>
net-libs/pjproject/{pjproject-2.13-r1.ebuild => pjproject-2.13-r2.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-libs/pjproject/pjproject-2.13-r1.ebuild
b/net-libs/pjproject/pjproject-2.13-r2.ebuild
similarity index 100%
rename from net-libs/pjproject/pjproject-2.13-r1.ebuild
rename to net-libs/pjproject/pjproject-2.13-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: e5e12640cc45f155ede76c5501a331824f13784b Author: Jaco Kroon uls co za> AuthorDate: Tue May 16 10:32:58 2023 + Commit: John Helmert III gentoo org> CommitDate: Thu May 18 04:56:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e12640 net-libs/pjproject: fix libsdl dependency. Closes: https://bugs.gentoo.org/886151 Signed-off-by: Jaco Kroon uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/31056 Signed-off-by: John Helmert III gentoo.org> net-libs/pjproject/pjproject-2.13-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-libs/pjproject/pjproject-2.13-r1.ebuild b/net-libs/pjproject/pjproject-2.13-r1.ebuild index a1e87c86eca9..a252ce354257 100644 --- a/net-libs/pjproject/pjproject-2.13-r1.ebuild +++ b/net-libs/pjproject/pjproject-2.13-r1.ebuild @@ -33,7 +33,7 @@ RDEPEND=">=net-libs/libsrtp-2.3.0:= opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) - sdl? ( media-libs/libsdl ) + sdl? ( media-libs/libsdl2 ) speex? ( media-libs/speex media-libs/speexdsp
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 8686b210bccaafa6e98ee6a4e4578d82bb47ff97
Author: Jaco Kroon uls co za>
AuthorDate: Tue May 16 10:27:52 2023 +
Commit: John Helmert III gentoo org>
CommitDate: Thu May 18 04:56:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8686b210
net-libs/pjproject: drop 2.12.1-r2, 2.13
Bug: https://bugs.gentoo.org/887559
Signed-off-by: Jaco Kroon uls.co.za>
Signed-off-by: John Helmert III gentoo.org>
net-libs/pjproject/Manifest | 1 -
net-libs/pjproject/pjproject-2.12.1-r2.ebuild | 144 --
net-libs/pjproject/pjproject-2.13.ebuild | 139 -
3 files changed, 284 deletions(-)
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 10063228d714..c081c0e1aeb2 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,2 +1 @@
-DIST pjproject-2.12.1.tar.gz 9660659 BLAKE2B
d893f22d995c9570e4003f80adf15144cf39e09d5843a88e3a616a529a91164ec7b012ea66ede8d55bfe4ec0dc4eca7d230f07fc66f06dfafaea9d5ff72910fa
SHA512
9087456024b8886e56660cebc45c7093b3b91cd6b08a3926fa2c0de452989ac84ceb4e27413c0311bde95f271341ee44d9681f81f83602a4e16151f1831d773b
DIST pjproject-2.13.tar.gz 9744716 BLAKE2B
947fe076089b3cd0826a554db3cda9939e228b9e7bb5ed2d01242e44e5e5b0d9d2ddc52b378f141efb89fcbfbd628fcdff341e54bc3615280e23f30ea58daf56
SHA512
df184511d554e5f77ca1a551bdf6b22c4c8ae2b6ad61be0e7e459e2d7db50f496af66c37e080f178019a509ea25847e70a342ac48c820a6b9302b4cbf174c520
diff --git a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
b/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
deleted file mode 100644
index 5d6d6c7a9b1f..
--- a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 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://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/libsdl )
- speex? (
- media-libs/speex
- media-libs/speexdsp
- )
- ssl? (
- 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/libsdl )
- speex? (
- media-libs/speex
- media-libs/speexdsp
- )
- ssl? (
- dev-libs/openssl:0=
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-)
-
-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")"
- [[
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 90fcd764354ec3b0ccf393abdf73420740469e7a
Author: Joonas Niilola gentoo org>
AuthorDate: Tue May 16 06:11:44 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue May 16 06:16:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90fcd764
net-libs/pjproject: Stabilize 2.13-r1 x86, #906057
Signed-off-by: Joonas Niilola gentoo.org>
net-libs/pjproject/pjproject-2.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.13-r1.ebuild
b/net-libs/pjproject/pjproject-2.13-r1.ebuild
index 7391ed9bc2b9..a1e87c86eca9 100644
--- a/net-libs/pjproject/pjproject-2.13-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.13-r1.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 1067e9951208957ddbb68139603a51573deb7b4c
Author: Sam James gentoo org>
AuthorDate: Wed May 10 09:40:40 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed May 10 09:40:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1067e995
net-libs/pjproject: Stabilize 2.13-r1 amd64, #906057
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/pjproject-2.13-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.13-r1.ebuild
b/net-libs/pjproject/pjproject-2.13-r1.ebuild
index 5fc988110f6f..7391ed9bc2b9 100644
--- a/net-libs/pjproject/pjproject-2.13-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.13-r1.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: d0e7fce2fe2f4739410a7865d406f040ca25
Author: Sam James gentoo org>
AuthorDate: Thu Apr 20 21:49:49 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Apr 20 21:49:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e7fce2
net-libs/pjproject: Stabilize 2.13 x86, #885831
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/pjproject-2.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.13.ebuild
b/net-libs/pjproject/pjproject-2.13.ebuild
index 89be423125e1..67e6269fd001 100644
--- a/net-libs/pjproject/pjproject-2.13.ebuild
+++ b/net-libs/pjproject/pjproject-2.13.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: daa8e10690452ed73abbf026f5b5eb424a0b189e
Author: Sam James gentoo org>
AuthorDate: Thu Apr 20 21:49:42 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Apr 20 21:49:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daa8e106
net-libs/pjproject: Stabilize 2.13 amd64, #885831
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/pjproject-2.13.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-libs/pjproject/pjproject-2.13.ebuild
b/net-libs/pjproject/pjproject-2.13.ebuild
index 74ae06aea18c..89be423125e1 100644
--- a/net-libs/pjproject/pjproject-2.13.ebuild
+++ b/net-libs/pjproject/pjproject-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# 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
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/, net-libs/pjproject/
commit: 0697e55a6fa27051a99aa59fde8b5716c022696e
Author: Jaco Kroon uls co za>
AuthorDate: Mon Mar 13 06:54:28 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Apr 5 11:56:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0697e55a
net-libs/pjproject: Add 2.13-r1
Bug: https://bugs.gentoo.org/887559
Closes: https://bugs.gentoo.org/79
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/30088
Signed-off-by: Joonas Niilola gentoo.org>
...3537-buffer-overread-on-STUN-error-decode.patch | 95 ++
...2022-23547-buffer-overread-on-STUN-decode.patch | 50
...NOTIFY-tdata-is-set-before-sending-it_new.patch | 46 +++
net-libs/pjproject/pjproject-2.13-r1.ebuild| 142 +
4 files changed, 333 insertions(+)
diff --git
a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch
b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch
new file mode 100644
index ..bfd1fc05e160
--- /dev/null
+++
b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch
@@ -0,0 +1,95 @@
+From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001
+From: Nanang Izzuddin
+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_LEN4
++#define ATTR_HDR_LENsizeof(pj_stun_attr_hdr)
+
+ static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos)
+ {
+@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool,
+ status = pj_stun_msg_check(pdu, pdu_len, options);
+ if (status != PJ_SUCCESS)
+ return status;
++} else {
++/* For safety, verify packet length at least */
++pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20;
++if (msg_len > pdu_len ||
++((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len))
++{
++return PJNATH_EINSTUNMSGLEN;
++}
+ }
+
+ /* Create the message, copy the header, and convert to host byte order */
+@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool,
+ p_response = NULL;
+
+ /* Parse attributes */
+-while (pdu_len >= 4) {
++while (pdu_len >= ATTR_HDR_LEN) {
+ unsigned attr_type, attr_val_len;
+ const struct attr_desc *adesc;
+
+@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool,
+ attr_val_len = (attr_val_len + 3) & (~3);
+
+ /* Check length */
+-if (pdu_len < attr_val_len) {
++if (pdu_len < attr_val_len + ATTR_HDR_LEN) {
+ pj_str_t err_msg;
+ char err_msg_buf[80];
+
diff --git
a/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch
b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch
new file mode 100644
index ..499ce4373b56
--- /dev/null
+++
b/net-libs/pjproject/files/pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch
@@ -0,0 +1,50 @@
+From bc4812d31a67d5e2f973fbfaf950d6118226cf36 Mon Sep 17 00:00:00 2001
+From: sauwming
+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
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: b83840744f3a35b21569e2237624c4d6cecafbc8 Author: Jaco Kroon uls co za> AuthorDate: Sun Dec 4 22:01:07 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 13 05:24:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8384074 net-libs/pjproject: 2.12-r2 - restrict openssl compatibility. Bug: https://bugs.gentoo.org/882785 Signed-off-by: Jaco Kroon uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/28541 Signed-off-by: Sam James gentoo.org> net-libs/pjproject/pjproject-2.12.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild b/net-libs/pjproject/pjproject-2.12.1-r2.ebuild index 260c38c99f5f..5d6d6c7a9b1f 100644 --- a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild +++ b/net-libs/pjproject/pjproject-2.12.1-r2.ebuild @@ -39,7 +39,7 @@ RDEPEND=">=net-libs/libsrtp-2.3.0:= media-libs/speexdsp ) ssl? ( - dev-libs/openssl:0= +
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 3aff73d53bb063556a8339f32c6af447a430d660
Author: Jaco Kroon uls co za>
AuthorDate: Sun Dec 4 22:00:23 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 13 05:24:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aff73d5
net-libs/pjproject: add 2.13
Bug: https://bugs.gentoo.org/884797
Closes: https://bugs.gentoo.org/882785
Signed-off-by: Jaco Kroon uls.co.za>
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/Manifest | 1 +
net-libs/pjproject/pjproject-2.13.ebuild | 139 +++
2 files changed, 140 insertions(+)
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 7c848864dc10..10063228d714 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1 +1,2 @@
DIST pjproject-2.12.1.tar.gz 9660659 BLAKE2B
d893f22d995c9570e4003f80adf15144cf39e09d5843a88e3a616a529a91164ec7b012ea66ede8d55bfe4ec0dc4eca7d230f07fc66f06dfafaea9d5ff72910fa
SHA512
9087456024b8886e56660cebc45c7093b3b91cd6b08a3926fa2c0de452989ac84ceb4e27413c0311bde95f271341ee44d9681f81f83602a4e16151f1831d773b
+DIST pjproject-2.13.tar.gz 9744716 BLAKE2B
947fe076089b3cd0826a554db3cda9939e228b9e7bb5ed2d01242e44e5e5b0d9d2ddc52b378f141efb89fcbfbd628fcdff341e54bc3615280e23f30ea58daf56
SHA512
df184511d554e5f77ca1a551bdf6b22c4c8ae2b6ad61be0e7e459e2d7db50f496af66c37e080f178019a509ea25847e70a342ac48c820a6b9302b4cbf174c520
diff --git a/net-libs/pjproject/pjproject-2.13.ebuild
b/net-libs/pjproject/pjproject-2.13.ebuild
new file mode 100644
index ..74ae06aea18c
--- /dev/null
+++ b/net-libs/pjproject/pjproject-2.13.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 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/libsdl )
+ speex? (
+ media-libs/speex
+ media-libs/speexdsp
+ )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+)
+
+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 \
+
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 2f0a8066cec1e9356367684a5dffb808f0be6ac8
Author: Jaco Kroon uls co za>
AuthorDate: Thu Oct 27 19:44:42 2022 +
Commit: John Helmert III gentoo org>
CommitDate: Sun Oct 30 02:57:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0a8066
net-libs/pjproject: drop 2.12.1-r1
Bug: https://bugs.gentoo.org/875863
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/27992
Signed-off-by: John Helmert III gentoo.org>
net-libs/pjproject/pjproject-2.12.1-r1.ebuild | 140 --
1 file changed, 140 deletions(-)
diff --git a/net-libs/pjproject/pjproject-2.12.1-r1.ebuild
b/net-libs/pjproject/pjproject-2.12.1-r1.ebuild
deleted file mode 100644
index e93be1690889..
--- a/net-libs/pjproject/pjproject-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2022 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://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/libsdl )
- speex? (
- media-libs/speex
- media-libs/speexdsp
- )
- ssl? (
- dev-libs/openssl:0=
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/pjproject-2.12.1-CVE-2022-31031.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
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 203a6a44c75fdd4eb760c02ba3aac153ece0acc7
Author: Joonas Niilola gentoo org>
AuthorDate: Thu Oct 27 07:59:48 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Oct 27 07:59:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203a6a44
net-libs/pjproject: Stabilize 2.12.1-r2 x86, #878241
Signed-off-by: Joonas Niilola gentoo.org>
net-libs/pjproject/pjproject-2.12.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
b/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
index b990527753f7..260c38c99f5f 100644
--- a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
@@ -8,7 +8,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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 8757cb92a0e8a859fdc2571bf6579d295bf9d1a0
Author: Sam James gentoo org>
AuthorDate: Tue Oct 25 17:54:44 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 25 17:54:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8757cb92
net-libs/pjproject: Stabilize 2.12.1-r2 amd64, #878241
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/pjproject-2.12.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
b/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
index 846b53806406..b990527753f7 100644
--- a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
@@ -8,7 +8,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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/, net-libs/pjproject/
commit: 9190173b8ee7cf9ee818ad61aebc841f11fa834f
Author: orbea riseup net>
AuthorDate: Fri Oct 7 19:10:13 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Oct 12 23:22:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9190173b
net-libs/pjproject: Add 2.12.1-r2
* Fixes the build with musl
* Fixes a bashism
* Backports two CVE fix patches
Closes: https://bugs.gentoo.org/865719
Upstream-PR: https://github.com/pjsip/pjproject/pull/3220
Upstream-Commit:
https://github.com/pjsip/pjproject/commit/bae7e5f4ff9047170e7e160ab52f6d9993aeae80
Bug: https://bugs.gentoo.org/875863
Upstream-Commit:
https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc
Upstream-Commit:
https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae
Closes: https://bugs.gentoo.org/867343
Upstream-PR: https://github.com/pjsip/pjproject/pull/3263
Signed-off-by: orbea riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/27677
Signed-off-by: Sam James gentoo.org>
.../files/pjproject-2.12.1-r2-CVE-2022-39244.patch | 306 +
.../files/pjproject-2.12.1-r2-CVE-2022-39269.patch | 33 +++
.../files/pjproject-2.12.1-r2-bashism.patch| 44 +++
.../pjproject/files/pjproject-2.12.1-r2-musl.patch | 102 +++
net-libs/pjproject/pjproject-2.12.1-r2.ebuild | 144 ++
5 files changed, 629 insertions(+)
diff --git a/net-libs/pjproject/files/pjproject-2.12.1-r2-CVE-2022-39244.patch
b/net-libs/pjproject/files/pjproject-2.12.1-r2-CVE-2022-39244.patch
new file mode 100644
index ..a0995fb92957
--- /dev/null
+++ b/net-libs/pjproject/files/pjproject-2.12.1-r2-CVE-2022-39244.patch
@@ -0,0 +1,306 @@
+https://bugs.gentoo.org/875863
+https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae
+
+From c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae Mon Sep 17 00:00:00 2001
+From: sauwming
+Date: Mon, 3 Oct 2022 08:07:22 +0800
+Subject: [PATCH] Merge pull request from GHSA-fq45-m3f7-3mhj
+
+* Initial patch
+
+* Use 'pj_scan_is_eof(scanner)'
+
+Co-authored-by: Aaron Lichtman
+
+* Use 'pj_scan_is_eof(scanner)'
+
+Co-authored-by: Aaron Lichtman
+
+* Use 'pj_scan_is_eof(scanner)'
+
+Co-authored-by: Aaron Lichtman
+
+* Use `!pj_scan_is_eof` instead of manually checking `scanner->curptr <
scanner->end`
+
+Co-authored-by: Maksim Mukosey
+
+* Update pjlib-util/src/pjlib-util/scanner.c
+
+Co-authored-by: Aaron Lichtman
+
+* Update pjlib-util/src/pjlib-util/scanner.c
+
+Co-authored-by: Aaron Lichtman
+
+* Update pjlib-util/src/pjlib-util/scanner.c
+
+Co-authored-by: Aaron Lichtman
+
+* Revert '>=' back to '>' in pj_scan_stricmp_alnum()
+
+* Fix error compiles.
+
+Co-authored-by: Nanang Izzuddin
+Co-authored-by: Aaron Lichtman
+Co-authored-by: Maksim Mukosey
+---
+ pjlib-util/src/pjlib-util/scanner.c | 41 +++--
+ pjmedia/src/pjmedia/rtp.c | 11 +---
+ pjmedia/src/pjmedia/sdp.c | 24 ++---
+ 3 files changed, 48 insertions(+), 28 deletions(-)
+
+diff --git a/pjlib-util/src/pjlib-util/scanner.c
b/pjlib-util/src/pjlib-util/scanner.c
+index a54edf2d8e..6541bbae31 100644
+--- a/pjlib-util/src/pjlib-util/scanner.c
b/pjlib-util/src/pjlib-util/scanner.c
+@@ -195,7 +195,13 @@ PJ_DEF(void) pj_scan_skip_whitespace( pj_scanner *scanner
)
+
+ PJ_DEF(void) pj_scan_skip_line( pj_scanner *scanner )
+ {
+-char *s = pj_memchr(scanner->curptr, '\n', scanner->end -
scanner->curptr);
++char *s;
++
++if (pj_scan_is_eof(scanner)) {
++return;
++}
++
++s = pj_memchr(scanner->curptr, '\n', scanner->end - scanner->curptr);
+ if (!s) {
+ scanner->curptr = scanner->end;
+ } else {
+@@ -264,8 +270,7 @@ PJ_DEF(void) pj_scan_get( pj_scanner *scanner,
+
+ pj_assert(pj_cis_match(spec,0)==0);
+
+-/* EOF is detected implicitly */
+-if (!pj_cis_match(spec, *s)) {
++if (pj_scan_is_eof(scanner) || !pj_cis_match(spec, *s)) {
+ pj_scan_syntax_err(scanner);
+ return;
+ }
+@@ -299,8 +304,7 @@ PJ_DEF(void) pj_scan_get_unescape( pj_scanner *scanner,
+ /* Must not match character '%' */
+ pj_assert(pj_cis_match(spec,'%')==0);
+
+-/* EOF is detected implicitly */
+-if (!pj_cis_match(spec, *s) && *s != '%') {
++if (pj_scan_is_eof(scanner) || !pj_cis_match(spec, *s) && *s != '%') {
+ pj_scan_syntax_err(scanner);
+ return;
+ }
+@@ -436,7 +440,9 @@ PJ_DEF(void) pj_scan_get_n( pj_scanner *scanner,
+
+ scanner->curptr += N;
+
+-if (PJ_SCAN_IS_PROBABLY_SPACE(*scanner->curptr) && scanner->skip_ws) {
++if (!pj_scan_is_eof(scanner) &&
++ PJ_SCAN_IS_PROBABLY_SPACE(*scanner->curptr) && scanner->skip_ws)
++{
+ pj_scan_skip_whitespace(scanner);
+ }
+ }
+@@ -467,15 +473,16 @@ PJ_DEF(int) pj_scan_get_char( pj_scanner *scanner )
+
+ PJ_DEF(void) pj_scan_get_newline( pj_scanner *scanner )
+ {
+-if
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 9a2cbe5f09a37029cbcb78b34eeb971c4be89569 Author: Sam James gentoo org> AuthorDate: Fri Aug 19 03:40:14 2022 + Commit: Sam James gentoo org> CommitDate: Fri Aug 19 03:46:26 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a2cbe5f net-libs/pjproject: add github upstream metadata Signed-off-by: Sam James gentoo.org> net-libs/pjproject/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml index 6e8f87fab911..526020157e7d 100644 --- a/net-libs/pjproject/metadata.xml +++ b/net-libs/pjproject/metadata.xml @@ -26,4 +26,7 @@ Include VP8 and VP9 codec support in the build Enable WebRTC support + + pjsip/pjproject +
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: c41ef397340f400643056a2e87a3060c1ff892e1
Author: Jaco Kroon uls co za>
AuthorDate: Tue Jul 19 09:45:30 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Aug 4 06:37:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41ef397
net-libs/pjproject: Add minimum version to libsrtp.
If you already have this successfully installed you already have a new
enough libsrtp, which negates the need for a bump, fixing in-place.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/26473
Signed-off-by: Joonas Niilola gentoo.org>
net-libs/pjproject/pjproject-2.12.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.12.1-r1.ebuild
b/net-libs/pjproject/pjproject-2.12.1-r1.ebuild
index bbf767978443..e93be1690889 100644
--- a/net-libs/pjproject/pjproject-2.12.1-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.12.1-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="amr debug epoll examples opus resample silk ssl
static-libs webrtc
${VIDEO_FLAGS}
${SOUND_FLAGS}"
-RDEPEND="net-libs/libsrtp:=
+RDEPEND=">=net-libs/libsrtp-2.3.0:=
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
ffmpeg? ( media-video/ffmpeg:= )
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/, net-libs/pjproject/
commit: 5e62ae9d029796011f7cb56f80fdf3281d30a2c9
Author: Jaco Kroon uls co za>
AuthorDate: Mon Jul 11 09:53:03 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 13 08:00:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e62ae9d
net-libs/pjproject: Remove old (broken) versions.
USE=ipv6 causes the ABIs here to be broken for all consumers
(net-misc/asterisk).
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/26230
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/Manifest| 1 -
...ct-2.10-CVE-2020-15260-tls-hostname-check.patch | 125 -
...-CVE-2021-21375-negotiation-failure-crash.patch | 45
...21-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch | 289 -
...ion-between-transport-destroy-and-acquire.patch | 108
.../pjproject/files/pjproject-2.9-config_site.h| 74 --
.../pjproject/files/pjproject-2.9-ssl-enable.patch | 100 ---
net-libs/pjproject/pjproject-2.10-r1.ebuild| 124 -
net-libs/pjproject/pjproject-2.10-r2.ebuild| 125 -
9 files changed, 991 deletions(-)
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index b0c9fcafc2b1..7c848864dc10 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,2 +1 @@
-DIST pjproject-2.10.tar.gz 8768705 BLAKE2B
42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa
SHA512
a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
DIST pjproject-2.12.1.tar.gz 9660659 BLAKE2B
d893f22d995c9570e4003f80adf15144cf39e09d5843a88e3a616a529a91164ec7b012ea66ede8d55bfe4ec0dc4eca7d230f07fc66f06dfafaea9d5ff72910fa
SHA512
9087456024b8886e56660cebc45c7093b3b91cd6b08a3926fa2c0de452989ac84ceb4e27413c0311bde95f271341ee44d9681f81f83602a4e16151f1831d773b
diff --git
a/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch
b/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch
deleted file mode 100644
index 0d7df686a157..
---
a/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 67e46c1ac45ad784db5b9080f5ed8b133c122872 Mon Sep 17 00:00:00 2001
-From: sauwming
-Date: Mon, 8 Mar 2021 17:39:36 +0800
-Subject: [PATCH] Merge pull request from GHSA-8hcp-hm38-mfph
-
-* Check hostname during TLS transport selection
-
-* revision based on feedback
-
-* remove the code in create_request that has been moved
- pjsip/include/pjsip/sip_dialog.h | 1 +
- pjsip/src/pjsip/sip_dialog.c | 15 +++
- pjsip/src/pjsip/sip_transport.c | 13 +
- pjsip/src/pjsip/sip_util.c | 11 ---
- 4 files changed, 37 insertions(+), 3 deletions(-)
-
-diff --git a/pjsip/include/pjsip/sip_dialog.h
b/pjsip/include/pjsip/sip_dialog.h
-index a0214d28c..e314c2ece 100644
a/pjsip/include/pjsip/sip_dialog.h
-+++ b/pjsip/include/pjsip/sip_dialog.h
-@@ -165,6 +165,7 @@ struct pjsip_dialog
- pjsip_route_hdr route_set; /**< Route set. */
- pj_bool_t route_set_frozen; /**< Route set has been set. */
- pjsip_auth_clt_sess auth_sess; /**< Client authentication session.
*/
-+pj_str_t initial_dest;/**< Initial destination host. */
-
- /** Session counter. */
- int sess_count; /**< Number of sessions.
*/
-diff --git a/pjsip/src/pjsip/sip_dialog.c b/pjsip/src/pjsip/sip_dialog.c
-index 27530e4f2..9571b5a35 100644
a/pjsip/src/pjsip/sip_dialog.c
-+++ b/pjsip/src/pjsip/sip_dialog.c
-@@ -467,6 +467,10 @@ pj_status_t create_uas_dialog( pjsip_user_agent *ua,
-
- /* Save the remote info. */
- pj_strdup(dlg->pool, >remote.info_str, );
-+
-+/* Save initial destination host from transport's info */
-+pj_strdup(dlg->pool, >initial_dest,
-+>tp_info.transport->remote_name.host);
-
-
- /* Init remote's contact from Contact header.
-@@ -1192,6 +1196,12 @@ static pj_status_t dlg_create_request_throw(
pjsip_dialog *dlg,
- return status;
- }
-
-+/* Copy the initial destination host to tdata. This information can be
-+ * used later by transport for transport selection.
-+ */
-+if (dlg->initial_dest.slen)
-+ pj_strdup(tdata->pool, >dest_info.name, >initial_dest);
-+
- /* Done. */
- *p_tdata = tdata;
-
-@@ -1822,6 +1832,11 @@ static void dlg_update_routeset(pjsip_dialog *dlg,
const pjsip_rx_data *rdata)
- * transaction as the initial transaction that establishes dialog.
- */
- if (dlg->role == PJSIP_ROLE_UAC) {
-+ /* Save initial destination host from transport's info. */
-+ if
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/, net-libs/pjproject/
commit: 9a59fa196adc0c98fbb19d56533e107ef1625b43 Author: Jaco Kroon uls co za> AuthorDate: Mon Jun 27 21:42:02 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jul 13 08:00:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a59fa19 net-libs/pjproject: rev bump to update config_site.h. Straight to stable: This fixes major usability problems in 2.10 revisions of pjproject, and asterisk 18.* depends on this (already stable). This brings in updates from newer versions of asterisk. Note that USE=ipv6 gets dropped as flipping this causes ABI breakage, and the way in which this was done could cause ABI issues as it was. Since there are no extra dependencies, just remove the USE flag completely. Also introduce _pj_ functions in the ebuild itself to manipulate the way in which ./configure is used (pjproject generally enables everything it can find dependencies for, and passing --enable-XXX generally ends up having the same effect as --disable ...). PENDING: ISUE=srtp. Asterisk has patches but I don't want to figure that out at this stage. Bug: https://bugs.gentoo.org/834491 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jaco Kroon uls.co.za> Signed-off-by: Sam James gentoo.org> .../pjproject/files/pjproject-2.12.1-config_site.h | 97 ++ ...ct-2.12.1.ebuild => pjproject-2.12.1-r1.ebuild} | 29 +-- 2 files changed, 119 insertions(+), 7 deletions(-) diff --git a/net-libs/pjproject/files/pjproject-2.12.1-config_site.h b/net-libs/pjproject/files/pjproject-2.12.1-config_site.h new file mode 100644 index ..37d094e24bbc --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.12.1-config_site.h @@ -0,0 +1,97 @@ +/* + * Based off of the Asterisk config_site.h file. + * + * In general it's the same with some removals due to being ebuild-managed. + */ + +#include + +#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 */ +#definePJMEDIA_MAX_SDP_FMT 64 +#definePJMEDIA_MAX_SDP_BANDW 4 +#definePJMEDIA_MAX_SDP_ATTR (PJMEDIA_MAX_SDP_FMT*3 + 4) +#definePJMEDIA_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
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: b1af9c9e6a2502a10dfd66787c126f5b96c04a6d Author: Joonas Niilola gentoo org> AuthorDate: Wed Jun 15 13:31:52 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Jun 15 13:32:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1af9c9e net-libs/pjproject: update EAPI 7 -> 8 on 2.12.1 Signed-off-by: Joonas Niilola gentoo.org> net-libs/pjproject/pjproject-2.12.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-libs/pjproject/pjproject-2.12.1.ebuild b/net-libs/pjproject/pjproject-2.12.1.ebuild index 7571fc933d02..e4b5b281a448 100644 --- a/net-libs/pjproject/pjproject-2.12.1.ebuild +++ b/net-libs/pjproject/pjproject-2.12.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/, net-libs/pjproject/
commit: 74bc4476b50218718af7c43038176f1d69c50e61
Author: Jaco Kroon uls co za>
AuthorDate: Sat Jul 24 08:36:57 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Jun 15 13:32:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74bc4476
net-libs/pjproject: Version 2.12.1.
Upstream release.
Remove the need for custom patches (which is still required but no
longer applies, instead, rely on ./configure detecting openssl, we do
depend on it, and only --disable-ssl works, passing --enable-ssl also
effectively disables ssl).
Compile tested asterisk 13, 16 and 18 (in-tree versions) against this.
Would appreciate a double-check on this one. One version from each is
sufficient.
Since the two libraries that were the target of parallel build failures
are now one, I believe the parallel build issue is fixed too.
Included patch for CVE-2022-31031
Closes: https://bugs.gentoo.org/833765
Closes: https://bugs.gentoo.org/817803
Closes: https://bugs.gentoo.org/808099
Closes: https://bugs.gentoo.org/834491
Bug: https://bugs.gentoo.org/803614
Bug: https://bugs.gentoo.org/765799
Bug: https://bugs.gentoo.org/829894
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/21761
Signed-off-by: Joonas Niilola gentoo.org>
net-libs/pjproject/Manifest| 1 +
.../files/pjproject-2.12.1-CVE-2022-31031.patch| 41 +++
net-libs/pjproject/pjproject-2.12.1.ebuild | 125 +
3 files changed, 167 insertions(+)
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 048f8a59e96f..b0c9fcafc2b1 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1 +1,2 @@
DIST pjproject-2.10.tar.gz 8768705 BLAKE2B
42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa
SHA512
a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
+DIST pjproject-2.12.1.tar.gz 9660659 BLAKE2B
d893f22d995c9570e4003f80adf15144cf39e09d5843a88e3a616a529a91164ec7b012ea66ede8d55bfe4ec0dc4eca7d230f07fc66f06dfafaea9d5ff72910fa
SHA512
9087456024b8886e56660cebc45c7093b3b91cd6b08a3926fa2c0de452989ac84ceb4e27413c0311bde95f271341ee44d9681f81f83602a4e16151f1831d773b
diff --git a/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch
b/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch
new file mode 100644
index ..637b7f374ffc
--- /dev/null
+++ b/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch
@@ -0,0 +1,41 @@
+From 450baca94f475345542c6953832650c390889202 Mon Sep 17 00:00:00 2001
+From: sauwming
+Date: Tue, 7 Jun 2022 12:00:13 +0800
+Subject: [PATCH] Merge pull request from GHSA-26j7-ww69-c4qj
+
+---
+ pjlib-util/src/pjlib-util/stun_simple.c | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/pjlib-util/src/pjlib-util/stun_simple.c
b/pjlib-util/src/pjlib-util/stun_simple.c
+index 722519584..d0549176d 100644
+--- a/pjlib-util/src/pjlib-util/stun_simple.c
b/pjlib-util/src/pjlib-util/stun_simple.c
+@@ -54,6 +54,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t
buf_len,
+ {
+ pj_uint16_t msg_type, msg_len;
+ char *p_attr;
++int attr_max_cnt = PJ_ARRAY_SIZE(msg->attr);
+
+ PJ_CHECK_STACK();
+
+@@ -83,7 +84,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t
buf_len,
+ msg->attr_count = 0;
+ p_attr = (char*)buf + sizeof(pjstun_msg_hdr);
+
+-while (msg_len > 0) {
++while (msg_len > 0 && msg->attr_count < attr_max_cnt) {
+ pjstun_attr_hdr **attr = >attr[msg->attr_count];
+ pj_uint32_t len;
+ pj_uint16_t attr_type;
+@@ -111,6 +112,10 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf,
pj_size_t buf_len,
+ p_attr += len;
+ ++msg->attr_count;
+ }
++if (msg->attr_count == attr_max_cnt) {
++ PJ_LOG(4, (THIS_FILE, "Warning: max number attribute %d reached.",
++ attr_max_cnt));
++}
+
+ return PJ_SUCCESS;
+ }
diff --git a/net-libs/pjproject/pjproject-2.12.1.ebuild
b/net-libs/pjproject/pjproject-2.12.1.ebuild
new file mode 100644
index ..7571fc933d02
--- /dev/null
+++ b/net-libs/pjproject/pjproject-2.12.1.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
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 47b6cfb4f0036c2c91158d080f7f7ba9b98daae7
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Jul 24 07:58:29 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Jul 24 07:58:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47b6cfb4
net-libs/pjproject: x86 stable wrt bug #803440
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-libs/pjproject/pjproject-2.10-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.10-r2.ebuild
b/net-libs/pjproject/pjproject-2.10-r2.ebuild
index 515ad854dac..c4474ea9745 100644
--- a/net-libs/pjproject/pjproject-2.10-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.10-r2.ebuild
@@ -8,7 +8,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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 4b62ba701bf2078969f7d74b06eab1db559ea208
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Jul 24 07:56:50 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Jul 24 07:56:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b62ba70
net-libs/pjproject: amd64 stable wrt bug #803440
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-libs/pjproject/pjproject-2.10-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.10-r2.ebuild
b/net-libs/pjproject/pjproject-2.10-r2.ebuild
index ee620bea10a..515ad854dac 100644
--- a/net-libs/pjproject/pjproject-2.10-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.10-r2.ebuild
@@ -8,7 +8,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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/, net-libs/pjproject/
commit: 93f6d97e4bd66daa168e1790f8cb3b8086854bd1
Author: Jaco Kroon uls co za>
AuthorDate: Fri Jul 23 05:10:18 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Jul 23 07:24:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93f6d97e
net-libs/pjproject: sec bump
Upstream not releasing new version, so just bring in the patch to -r2.
This addresses AST-2021-009 for
Closes: https://bugs.gentoo.org/803440
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/21752
Signed-off-by: Joonas Niilola gentoo.org>
...21-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch | 289 +
net-libs/pjproject/pjproject-2.10-r2.ebuild| 125 +
2 files changed, 414 insertions(+)
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 000..ba31cf19eda
--- /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*)>rem_addr,
+ pj_sockaddr_get_len((pj_sockaddr_t*)>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*)>rem_addr,
+ pj_sockaddr_get_len((pj_sockaddr_t*)>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);
++
+
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 7b41c1465dd5870ca5e202ee0bade93ea46217c3
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun May 2 10:51:29 2021 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun May 2 10:51:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b41c146
net-libs/pjproject: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada gentoo.org>
net-libs/pjproject/pjproject-2.10-r1.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net-libs/pjproject/pjproject-2.10-r1.ebuild
b/net-libs/pjproject/pjproject-2.10-r1.ebuild
index 8552abb9daf..3db743937f4 100644
--- a/net-libs/pjproject/pjproject-2.10-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.10-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx"
SOUND_FLAGS="alsa portaudio"
-IUSE="amr debug epoll examples ipv6 libressl opus resample silk ssl
static-libs webrtc
+IUSE="amr debug epoll examples ipv6 opus resample silk ssl static-libs webrtc
${CODEC_FLAGS} g729
${VIDEO_FLAGS}
${SOUND_FLAGS}"
@@ -46,8 +46,7 @@ RDEPEND="net-libs/libsrtp:=
media-libs/speexdsp
)
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
"
DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/
commit: af2f59d44940bf6003439830f1ee36f57a1d6363
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri Mar 26 16:10:24 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Mar 26 18:32:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af2f59d4
net-libs/pjproject: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/20129
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
.../pjproject/files/pjproject-2.7.2-libressl.patch | 98
.../files/pjproject-2.7.2-ssl-flipflop.patch | 103 -
2 files changed, 201 deletions(-)
diff --git a/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch
b/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch
deleted file mode 100644
index 07efa9ccb8f..000
--- a/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: /third_party/srtp/crypto/hash/hmac_ossl.c
-===
/third_party/srtp/crypto/hash/hmac_ossl.c (revision 5725)
-+++ /third_party/srtp/crypto/hash/hmac_ossl.c (revision 5726)
-@@ -52,6 +52,8 @@
- #include
- #include
-+#include
-
- #define SHA1_DIGEST_SIZE 20
-+#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
-
- /* the debug module for authentiation */
-@@ -77,5 +79,5 @@
- /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated
-using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x1010L
- {
- /* allocate memory for auth and HMAC_CTX structures */
-@@ -122,5 +124,5 @@
- hmac_ctx = (HMAC_CTX*)a->state;
-
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x1010L
- HMAC_CTX_cleanup(hmac_ctx);
-
-Index: /pjlib/src/pj/ssl_sock_ossl.c
-===
/pjlib/src/pj/ssl_sock_ossl.c (revision 5725)
-+++ /pjlib/src/pj/ssl_sock_ossl.c (revision 5726)
-@@ -56,6 +56,10 @@
- #include
- #include
--
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#include
-+
-+#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
-+
-+#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
-+ && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-
- # include
-@@ -115,5 +119,5 @@
-
-
--#if OPENSSL_VERSION_NUMBER >= 0x1010L
-+#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x1010L
- # define OPENSSL_NO_SSL2 /* seems to be removed in 1.1.0 */
- # define M_ASN1_STRING_data(x) ASN1_STRING_get0_data(x)
-@@ -539,5 +543,5 @@
-
- /* Init OpenSSL lib */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x1010L
- SSL_library_init();
- SSL_load_error_strings();
-@@ -560,5 +564,7 @@
- const char *cname;
-
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
-+|| OPENSSL_VERSION_NUMBER < 0x1010L
-+
- meth = (SSL_METHOD*)SSLv23_server_method();
- if (!meth)
-@@ -603,5 +609,6 @@
- SSL_set_session(ssl, SSL_SESSION_new());
-
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
-+&& OPENSSL_VERSION_NUMBER >= 0x1000200fL
- openssl_curves_num = SSL_get_shared_curve(ssl,-1);
- if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves))
-@@ -795,5 +802,6 @@
-
- /* Determine SSL method to use */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
-+|| OPENSSL_VERSION_NUMBER < 0x1010L
- switch (ssock->param.proto) {
- case PJ_SSL_SOCK_PROTO_TLS1:
-@@ -1232,5 +1240,6 @@
- static pj_status_t set_curves_list(pj_ssl_sock_t *ssock)
- {
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
-+&& OPENSSL_VERSION_NUMBER >= 0x1000200fL
- int ret;
- int curves[PJ_SSL_SOCK_MAX_CURVES];
-@@ -1263,5 +1272,5 @@
- static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x1000200fL
- int ret;
-
diff --git a/net-libs/pjproject/files/pjproject-2.7.2-ssl-flipflop.patch
b/net-libs/pjproject/files/pjproject-2.7.2-ssl-flipflop.patch
deleted file mode 100644
index c984bc62962..000
--- a/net-libs/pjproject/files/pjproject-2.7.2-ssl-flipflop.patch
+++ /dev/null
@@ -1,103 +0,0 @@
pjproject-2.7.1.ORIG/aconfigure.ac 2018-02-06 11:34:20.973411193 +
-+++ pjproject-2.7.1/aconfigure.ac 2018-02-06 13:33:31.525015674 +
-@@ -1551,57 +1551,56 @@
- enable_ssl=no
- fi
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 627a5846c40c46660578365824ff1c3fedd161d0
Author: Jaco Kroon uls co za>
AuthorDate: Mon Mar 15 19:20:05 2021 +
Commit: John Helmert III gentoo org>
CommitDate: Mon Mar 15 19:20:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=627a5846
net-libs/pjproject: security cleanup
Bug: https://bugs.gentoo.org/775359
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/19939
Signed-off-by: John Helmert III gentoo.org>
net-libs/pjproject/Manifest | 2 -
net-libs/pjproject/metadata.xml | 4 +-
net-libs/pjproject/pjproject-2.10.ebuild | 123 ---
net-libs/pjproject/pjproject-2.7.2-r2.ebuild | 117 -
net-libs/pjproject/pjproject-2.9-r2.ebuild | 123 ---
5 files changed, 2 insertions(+), 367 deletions(-)
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 5d10ffe7549..048f8a59e96 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,3 +1 @@
DIST pjproject-2.10.tar.gz 8768705 BLAKE2B
42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa
SHA512
a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
-DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B
44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7
SHA512
3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
-DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B
853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772
SHA512
a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml
index ebb6d87617b..12a42585bb4 100644
--- a/net-libs/pjproject/metadata.xml
+++ b/net-libs/pjproject/metadata.xml
@@ -1,11 +1,11 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
+
j...@uls.co.za
Jaco Kroon
-
+
proxy-ma...@gentoo.org
Proxy Maintainers
diff --git a/net-libs/pjproject/pjproject-2.10.ebuild
b/net-libs/pjproject/pjproject-2.10.ebuild
deleted file mode 100644
index f2e015618ea..000
--- a/net-libs/pjproject/pjproject-2.10.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic 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"
-
-# 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 libressl opus resample silk ssl
static-libs webrtc
- ${CODEC_FLAGS} g729
- ${VIDEO_FLAGS}
- ${SOUND_FLAGS}"
-
-PATCHES=(
- "${FILESDIR}/pjproject-2.9-ssl-enable.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? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl: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+=(
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 151ce326c09cecfee668a6971014d5e9d07dc8c5
Author: Sam James gentoo org>
AuthorDate: Sun Mar 14 01:28:26 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 14 01:28:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=151ce326
net-libs/pjproject: Stabilize 2.10-r1 x86, #775359
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/pjproject-2.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.10-r1.ebuild
b/net-libs/pjproject/pjproject-2.10-r1.ebuild
index ec03d01c4a6..8552abb9daf 100644
--- a/net-libs/pjproject/pjproject-2.10-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.10-r1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 00890030ca75a5930d4cf7a6a6a8a40f9f56edd5
Author: Sam James gentoo org>
AuthorDate: Fri Mar 12 18:30:10 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Mar 12 18:30:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00890030
net-libs/pjproject: Stabilize 2.10-r1 amd64, #775359
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/pjproject-2.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.10-r1.ebuild
b/net-libs/pjproject/pjproject-2.10-r1.ebuild
index 7731f052e47..ec03d01c4a6 100644
--- a/net-libs/pjproject/pjproject-2.10-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.10-r1.ebuild
@@ -8,7 +8,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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
LICENSE="GPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/, net-libs/pjproject/
commit: 69e63f7c831f2a585cd34cb74a3f8bbff901f798
Author: Jaco Kroon uls co za>
AuthorDate: Thu Mar 11 07:34:54 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 11 08:19:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69e63f7c
net-libs/pjproject: security rev bump to 2.10-r1
Upstream didn't release a new version as one would expect. Instead
patches are applied locally.
Also add subslot because they are equally good at maintaining ABI
compatibility, and SONAME is never updated, thus we need to be able to
depend on subslots to rebuild (preserved-rebuild is no good).
Bug: https://bugs.gentoo.org/775359
Bug: https://bugs.gentoo.org/775353
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/19876
Signed-off-by: Sam James gentoo.org>
...ct-2.10-CVE-2020-15260-tls-hostname-check.patch | 125 +
...-CVE-2021-21375-negotiation-failure-crash.patch | 45
...ion-between-transport-destroy-and-acquire.patch | 108 ++
net-libs/pjproject/pjproject-2.10-r1.ebuild| 125 +
4 files changed, 403 insertions(+)
diff --git
a/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch
b/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch
new file mode 100644
index 000..0d7df686a15
--- /dev/null
+++
b/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch
@@ -0,0 +1,125 @@
+From 67e46c1ac45ad784db5b9080f5ed8b133c122872 Mon Sep 17 00:00:00 2001
+From: sauwming
+Date: Mon, 8 Mar 2021 17:39:36 +0800
+Subject: [PATCH] Merge pull request from GHSA-8hcp-hm38-mfph
+
+* Check hostname during TLS transport selection
+
+* revision based on feedback
+
+* remove the code in create_request that has been moved
+---
+ pjsip/include/pjsip/sip_dialog.h | 1 +
+ pjsip/src/pjsip/sip_dialog.c | 15 +++
+ pjsip/src/pjsip/sip_transport.c | 13 +
+ pjsip/src/pjsip/sip_util.c | 11 ---
+ 4 files changed, 37 insertions(+), 3 deletions(-)
+
+diff --git a/pjsip/include/pjsip/sip_dialog.h
b/pjsip/include/pjsip/sip_dialog.h
+index a0214d28c..e314c2ece 100644
+--- a/pjsip/include/pjsip/sip_dialog.h
b/pjsip/include/pjsip/sip_dialog.h
+@@ -165,6 +165,7 @@ struct pjsip_dialog
+ pjsip_route_hdr route_set; /**< Route set. */
+ pj_bool_t route_set_frozen; /**< Route set has been set. */
+ pjsip_auth_clt_sess auth_sess; /**< Client authentication session.
*/
++pj_str_t initial_dest;/**< Initial destination host. */
+
+ /** Session counter. */
+ int sess_count; /**< Number of sessions.
*/
+diff --git a/pjsip/src/pjsip/sip_dialog.c b/pjsip/src/pjsip/sip_dialog.c
+index 27530e4f2..9571b5a35 100644
+--- a/pjsip/src/pjsip/sip_dialog.c
b/pjsip/src/pjsip/sip_dialog.c
+@@ -467,6 +467,10 @@ pj_status_t create_uas_dialog( pjsip_user_agent *ua,
+
+ /* Save the remote info. */
+ pj_strdup(dlg->pool, >remote.info_str, );
++
++/* Save initial destination host from transport's info */
++pj_strdup(dlg->pool, >initial_dest,
++>tp_info.transport->remote_name.host);
+
+
+ /* Init remote's contact from Contact header.
+@@ -1192,6 +1196,12 @@ static pj_status_t dlg_create_request_throw(
pjsip_dialog *dlg,
+ return status;
+ }
+
++/* Copy the initial destination host to tdata. This information can be
++ * used later by transport for transport selection.
++ */
++if (dlg->initial_dest.slen)
++ pj_strdup(tdata->pool, >dest_info.name, >initial_dest);
++
+ /* Done. */
+ *p_tdata = tdata;
+
+@@ -1822,6 +1832,11 @@ static void dlg_update_routeset(pjsip_dialog *dlg,
const pjsip_rx_data *rdata)
+ * transaction as the initial transaction that establishes dialog.
+ */
+ if (dlg->role == PJSIP_ROLE_UAC) {
++ /* Save initial destination host from transport's info. */
++ if (!dlg->initial_dest.slen) {
++ pj_strdup(dlg->pool, >initial_dest,
++>tp_info.transport->remote_name.host);
++ }
+
+ /* Ignore subsequent request from remote */
+ if (msg->type != PJSIP_RESPONSE_MSG)
+diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c
+index bef6d24fe..177274b08 100644
+--- a/pjsip/src/pjsip/sip_transport.c
b/pjsip/src/pjsip/sip_transport.c
+@@ -2335,6 +2335,19 @@ PJ_DEF(pj_status_t)
pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr,
+ if (!tp_iter->tp->is_shutdown &&
+ !tp_iter->tp->is_destroying)
+ {
++ if ((type & PJSIP_TRANSPORT_SECURE) && tdata) {
++ /* For secure transport, make sure tdata's
++ * destination host
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: c9b836b68d22da655bea5cbb338fc48ac1729ef0
Author: Sam James gentoo org>
AuthorDate: Fri Feb 19 16:12:20 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 19 16:12:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b836b6
net-libs/pjproject: Stabilize 2.10 x86, #770157
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/pjproject-2.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.10.ebuild
b/net-libs/pjproject/pjproject-2.10.ebuild
index 4e8d2fd29af..f2e015618ea 100644
--- a/net-libs/pjproject/pjproject-2.10.ebuild
+++ b/net-libs/pjproject/pjproject-2.10.ebuild
@@ -8,7 +8,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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 8ffd88339aa61a47ebab134a6b800de425b75bfd
Author: Sam James gentoo org>
AuthorDate: Fri Feb 12 14:14:51 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 12 14:14:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ffd8833
net-libs/pjproject: Stabilize 2.10 amd64, #770157
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/pjproject-2.10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-libs/pjproject/pjproject-2.10.ebuild
b/net-libs/pjproject/pjproject-2.10.ebuild
index 5c724042f61..4e8d2fd29af 100644
--- a/net-libs/pjproject/pjproject-2.10.ebuild
+++ b/net-libs/pjproject/pjproject-2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/, net-libs/pjproject/
commit: 6bc5649ec449bd87fb1be521cd55ce273c6f2c02 Author: Jaco Kroon uls co za> AuthorDate: Tue Dec 29 05:44:55 2020 + Commit: Sam James gentoo org> CommitDate: Mon Jan 4 16:32:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bc5649e net-libs/pjproject: drop old versions. Bug: https://bugs.gentoo.org/70 Signed-off-by: Jaco Kroon uls.co.za> Signed-off-by: Sam James gentoo.org> net-libs/pjproject/Manifest| 1 - .../files/pjproject-2.7.1-ssl-flipflop.patch | 103 --- net-libs/pjproject/pjproject-2.7.1-r1.ebuild | 110 - 3 files changed, 214 deletions(-) diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest index 3f48fc752d5..5d10ffe7549 100644 --- a/net-libs/pjproject/Manifest +++ b/net-libs/pjproject/Manifest @@ -1,4 +1,3 @@ DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa SHA512 a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893 -DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b diff --git a/net-libs/pjproject/files/pjproject-2.7.1-ssl-flipflop.patch b/net-libs/pjproject/files/pjproject-2.7.1-ssl-flipflop.patch deleted file mode 100644 index fd1dc5caa1e..000 --- a/net-libs/pjproject/files/pjproject-2.7.1-ssl-flipflop.patch +++ /dev/null @@ -1,103 +0,0 @@ pjproject-2.7.1.ORIG/aconfigure.ac 2018-02-06 11:34:20.973411193 + -+++ pjproject-2.7.1/aconfigure.ac 2018-02-06 13:33:31.525015674 + -@@ -1551,57 +1551,56 @@ - enable_ssl=no - fi - --dnl # Include SSL support -+dnl # Correct --enable vs --disable SSL flipflop logic - AC_SUBST(ac_no_ssl) - AC_SUBST(ac_ssl_has_aes_gcm,0) - AC_ARG_ENABLE(ssl, - AS_HELP_STRING([--disable-ssl], -[Exclude SSL support the build (default: autodetect)]) --, --[ -- if test "$enable_ssl" = "no"; then -- [ac_no_ssl=1] -- AC_MSG_RESULT([Checking if SSL support is disabled... yes]) -- fi --], --[ -- AC_MSG_RESULT([checking for OpenSSL installations..]) --if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then --CFLAGS="$CFLAGS -I$with_ssl/include" --LDFLAGS="$LDFLAGS -L$with_ssl/lib" --AC_MSG_RESULT([Using SSL prefix... $with_ssl]) --fi -- AC_SUBST(openssl_h_present) -- AC_SUBST(libssl_present) -- AC_SUBST(libcrypto_present) -- AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1]) -- AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"]) -- AC_CHECK_LIB(ssl,SSL_CTX_new,[libssl_present=1 && LIBS="-lssl $LIBS"]) -- if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then -- AC_MSG_RESULT([OpenSSL library found, SSL support enabled]) -- -- # Check if SRTP should be compiled with OpenSSL -- # support, to enable cryptos such as AES GCM. -- -- # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type. -- # Update 2.7: our bundled libsrtp has been upgraded to 2.1.0, -- # so we can omit EVP_CIPHER_CTX definition check now. -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], --[EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm();])], -- [AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1])]) -- if test "x$ac_ssl_has_aes_gcm" = "x1"; then --
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 9c7fdab8aa3119101050cb0b735c6fb0461a204b Author: Jaco Kroon uls co za> AuthorDate: Tue Dec 29 07:05:23 2020 + Commit: Sam James gentoo org> CommitDate: Tue Dec 29 20:45:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7fdab8 media-libs/pjproject: inherit toolchain-funcs Fixes: IndirectInherits: version 2.9-r2: toolchain-funcs: indirect inherit usage: 'tc-getCC', line 84 IndirectInherits: version 2.10: toolchain-funcs: indirect inherit usage: 'tc-getCC', line 84 Signed-off-by: Jaco Kroon uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/18864 Signed-off-by: Sam James gentoo.org> net-libs/pjproject/pjproject-2.10.ebuild | 2 +- net-libs/pjproject/pjproject-2.9-r2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-libs/pjproject/pjproject-2.10.ebuild b/net-libs/pjproject/pjproject-2.10.ebuild index ffbd5925409..5c724042f61 100644 --- a/net-libs/pjproject/pjproject-2.10.ebuild +++ b/net-libs/pjproject/pjproject-2.10.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools flag-o-matic +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Open source SIP, Media, and NAT Traversal Library" HOMEPAGE="https://www.pjsip.org/; diff --git a/net-libs/pjproject/pjproject-2.9-r2.ebuild b/net-libs/pjproject/pjproject-2.9-r2.ebuild index de54ebdfa60..74665390b36 100644 --- a/net-libs/pjproject/pjproject-2.9-r2.ebuild +++ b/net-libs/pjproject/pjproject-2.9-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools flag-o-matic +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Open source SIP, Media, and NAT Traversal Library" HOMEPAGE="https://www.pjsip.org/;
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 3c982cebe3bcb93eb4f7787d77e23efbe3b7e029
Author: Jaco Kroon uls co za>
AuthorDate: Fri Sep 25 21:30:16 2020 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 6 21:44:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c982ceb
net-libs/pjproject: version bump to 2.10
Closes: https://bugs.gentoo.org/744613
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/17667
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/Manifest | 1 +
net-libs/pjproject/metadata.xml | 1 +
net-libs/pjproject/pjproject-2.10.ebuild | 123 +++
3 files changed, 125 insertions(+)
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 3131fb359e1..3f48fc752d5 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,3 +1,4 @@
+DIST pjproject-2.10.tar.gz 8768705 BLAKE2B
42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa
SHA512
a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B
33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e
SHA512
cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979
DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B
44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7
SHA512
3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B
853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772
SHA512
a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml
index 6d51c770dce..ebb6d87617b 100644
--- a/net-libs/pjproject/metadata.xml
+++ b/net-libs/pjproject/metadata.xml
@@ -23,6 +23,7 @@
Include resampling implementations in the
build
Include SILK support in the build
Include Video4Linux v2 support in the
build
+ Include VP8 and VP9 codec support in the
build
Enable WebRTC support
diff --git a/net-libs/pjproject/pjproject-2.10.ebuild
b/net-libs/pjproject/pjproject-2.10.ebuild
new file mode 100644
index 000..ffbd5925409
--- /dev/null
+++ b/net-libs/pjproject/pjproject-2.10.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+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"
+
+# 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 libressl opus resample silk ssl
static-libs webrtc
+ ${CODEC_FLAGS} g729
+ ${VIDEO_FLAGS}
+ ${SOUND_FLAGS}"
+
+PATCHES=(
+ "${FILESDIR}/pjproject-2.9-ssl-enable.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? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl: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
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 8229ba0bc55796692fd469fa5a05e24a79e135be Author: Jaco Kroon uls co za> AuthorDate: Thu Aug 27 18:31:46 2020 + Commit: Sam James gentoo org> CommitDate: Sat Sep 12 01:49:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8229ba0b net-libs/pjproject: add dependency on media-libs/speex with USE=speex. Signed-off-by: Jaco Kroon uls.co.za> Closes: https://bugs.gentoo.org/739242 Closes: https://github.com/gentoo/gentoo/pull/17286 Signed-off-by: Sam James gentoo.org> net-libs/pjproject/pjproject-2.9-r2.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-libs/pjproject/pjproject-2.9-r2.ebuild b/net-libs/pjproject/pjproject-2.9-r2.ebuild index 14cf482e263..de54ebdfa60 100644 --- a/net-libs/pjproject/pjproject-2.9-r2.ebuild +++ b/net-libs/pjproject/pjproject-2.9-r2.ebuild @@ -39,7 +39,10 @@ RDEPEND="net-libs/libsrtp:= portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) - speex? ( media-libs/speexdsp ) + speex? ( + media-libs/speex + media-libs/speexdsp + ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 874ab97d5014d9a8f0770f9c5f24569be104e5f3
Author: Sam James gentoo org>
AuthorDate: Mon Jul 20 12:20:29 2020 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 20 12:20:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874ab97d
net-libs/pjproject: arm keyworded (bug #716426)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/pjproject-2.9-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.9-r2.ebuild
b/net-libs/pjproject/pjproject-2.9-r2.ebuild
index 93f9598c5b0..14cf482e263 100644
--- a/net-libs/pjproject/pjproject-2.9-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.9-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
HOMEPAGE="https://www.pjsip.org/;
SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2;
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: e60793bb055448f0933c709034185fc45d5cb363
Author: Jaco Kroon uls co za>
AuthorDate: Tue Jul 7 20:19:45 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Jul 20 09:01:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e60793bb
net-libs/pjproject: fix invalid LD build issue.
Closes: https://bugs.gentoo.org/725090
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/16630
Signed-off-by: Joonas Niilola gentoo.org>
net-libs/pjproject/pjproject-2.9-r2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-libs/pjproject/pjproject-2.9-r2.ebuild
b/net-libs/pjproject/pjproject-2.9-r2.ebuild
index abce401573e..93f9598c5b0 100644
--- a/net-libs/pjproject/pjproject-2.9-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.9-r2.ebuild
@@ -78,7 +78,7 @@ src_configure() {
[ "${videnable}" = "--enable-video" ] && append-cflags
-DPJMEDIA_HAS_VIDEO=1
- econf \
+ LD="$(tc-getCC)" econf \
--enable-shared \
--with-external-srtp \
${videnable} \
@@ -101,8 +101,8 @@ src_configure() {
}
src_compile() {
- emake dep
- emake
+ emake dep LD="$(tc-getCC)"
+ emake LD="$(tc-getCC)"
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 3b1fa84442e3a5d5d9df38701f21a41012434fec
Author: Sam James gentoo org>
AuthorDate: Thu Jul 16 17:44:09 2020 +
Commit: Sam James gentoo org>
CommitDate: Thu Jul 16 17:45:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1fa844
net-libs/pjproject: arm64 keyworded (bug #716426)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
net-libs/pjproject/pjproject-2.9-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.9-r2.ebuild
b/net-libs/pjproject/pjproject-2.9-r2.ebuild
index da65c705508..abce401573e 100644
--- a/net-libs/pjproject/pjproject-2.9-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.9-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
HOMEPAGE="https://www.pjsip.org/;
SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2;
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 3010f86a34dec614d9cf516f3f3bf22dd7c823c4
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed May 6 06:43:21 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed May 6 06:43:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3010f86a
net-libs/pjproject: keyworded 2.9-r2 for ppc64, bug #716426
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
net-libs/pjproject/pjproject-2.9-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.9-r2.ebuild
b/net-libs/pjproject/pjproject-2.9-r2.ebuild
index e2ec02af2a3..da65c705508 100644
--- a/net-libs/pjproject/pjproject-2.9-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.9-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
HOMEPAGE="https://www.pjsip.org/;
SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2;
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 5cf15fe97a22e9a5b6ad3c0d1f9ff2e5413b665f
Author: David Seifert gentoo org>
AuthorDate: Sun Apr 26 10:59:00 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sun Apr 26 10:59:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf15fe9
net-libs/pjproject: Replace virtual/ffmpeg
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert gentoo.org>
.../pjproject/{pjproject-2.7.1.ebuild => pjproject-2.7.1-r1.ebuild} | 4 ++--
.../{pjproject-2.7.2-r1.ebuild => pjproject-2.7.2-r2.ebuild} | 2 +-
.../pjproject/{pjproject-2.9-r1.ebuild => pjproject-2.9-r2.ebuild}| 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-libs/pjproject/pjproject-2.7.1.ebuild
b/net-libs/pjproject/pjproject-2.7.1-r1.ebuild
similarity index 97%
rename from net-libs/pjproject/pjproject-2.7.1.ebuild
rename to net-libs/pjproject/pjproject-2.7.1-r1.ebuild
index 2c434a83d12..a9e3fdf624d 100644
--- a/net-libs/pjproject/pjproject-2.7.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -29,7 +29,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
opus? ( media-libs/opus )
speex? ( media-libs/speexdsp )
- ffmpeg? ( virtual/ffmpeg:= )
+ ffmpeg? ( media-video/ffmpeg:= )
sdl? ( media-libs/libsdl )
openh264? ( media-libs/openh264 )
resample? ( media-libs/libsamplerate )
diff --git a/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
b/net-libs/pjproject/pjproject-2.7.2-r2.ebuild
similarity index 98%
rename from net-libs/pjproject/pjproject-2.7.2-r1.ebuild
rename to net-libs/pjproject/pjproject-2.7.2-r2.ebuild
index e272ba0b04f..ec4e011b9c8 100644
--- a/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2-r2.ebuild
@@ -32,7 +32,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
opus? ( media-libs/opus )
speex? ( media-libs/speexdsp )
- ffmpeg? ( virtual/ffmpeg:= )
+ ffmpeg? ( media-video/ffmpeg:= )
sdl? ( media-libs/libsdl )
openh264? ( media-libs/openh264 )
resample? ( media-libs/libsamplerate )
diff --git a/net-libs/pjproject/pjproject-2.9-r1.ebuild
b/net-libs/pjproject/pjproject-2.9-r2.ebuild
similarity index 98%
rename from net-libs/pjproject/pjproject-2.9-r1.ebuild
rename to net-libs/pjproject/pjproject-2.9-r2.ebuild
index b5d5bbcf318..e2ec02af2a3 100644
--- a/net-libs/pjproject/pjproject-2.9-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.9-r2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="net-libs/libsrtp:=
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
- ffmpeg? ( virtual/ffmpeg:= )
+ ffmpeg? ( media-video/ffmpeg:= )
g729? ( media-libs/bcg729 )
gsm? ( media-sound/gsm )
ilbc? ( media-libs/libilbc )
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: f1900716c8f09686c899063fae94eb0a516dae53
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Apr 14 12:30:58 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Apr 14 12:30:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1900716
net-libs/pjproject: x86 stable wrt bug #689796
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-libs/pjproject/pjproject-2.7.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
b/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
index 75aeb487eb5..e272ba0b04f 100644
--- a/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
HOMEPAGE="https://www.pjsip.org/;
SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2;
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: afb0868946297860aeea736b42c990f3d6a7
Author: Mikle Kolyada gentoo org>
AuthorDate: Tue Mar 31 08:24:33 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Tue Mar 31 08:24:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb08689
net-libs/pjproject: amd64 stable wrt bug #689796
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada gentoo.org>
net-libs/pjproject/pjproject-2.7.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
b/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
index 3b320d329fc..75aeb487eb5 100644
--- a/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
HOMEPAGE="https://www.pjsip.org/;
SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2;
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: fcdc5b98db423a0403eff714dd16452ed4996a20
Author: Jaco Kroon uls co za>
AuthorDate: Mon Jan 6 09:10:56 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Jan 8 17:53:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcdc5b98
net-libs/pjproject: Update deps for libilbc
Bug: https://bugs.gentoo.org/70
Bug: https://bugs.gentoo.org/634912
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Jaco Kroon uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/14260
Signed-off-by: Joonas Niilola gentoo.org>
.../pjproject/{pjproject-2.7.2.ebuild => pjproject-2.7.2-r1.ebuild} | 4 ++--
net-libs/pjproject/{pjproject-2.9.ebuild => pjproject-2.9-r1.ebuild} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-libs/pjproject/pjproject-2.7.2.ebuild
b/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
similarity index 97%
rename from net-libs/pjproject/pjproject-2.7.2.ebuild
rename to net-libs/pjproject/pjproject-2.7.2-r1.ebuild
index 141fa9edf64..3b320d329fc 100644
--- a/net-libs/pjproject/pjproject-2.7.2.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -28,7 +28,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
gsm? ( media-sound/gsm )
- ilbc? ( dev-libs/ilbc-rfc3951 )
+ ilbc? ( media-libs/libilbc )
opus? ( media-libs/opus )
speex? ( media-libs/speexdsp )
diff --git a/net-libs/pjproject/pjproject-2.9.ebuild
b/net-libs/pjproject/pjproject-2.9-r1.ebuild
similarity index 97%
rename from net-libs/pjproject/pjproject-2.9.ebuild
rename to net-libs/pjproject/pjproject-2.9-r1.ebuild
index 5a4d582b1e2..b5d5bbcf318 100644
--- a/net-libs/pjproject/pjproject-2.9.ebuild
+++ b/net-libs/pjproject/pjproject-2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,7 +33,7 @@ RDEPEND="net-libs/libsrtp:=
ffmpeg? ( virtual/ffmpeg:= )
g729? ( media-libs/bcg729 )
gsm? ( media-sound/gsm )
- ilbc? ( dev-libs/ilbc-rfc3951 )
+ ilbc? ( media-libs/libilbc )
openh264? ( media-libs/openh264 )
opus? ( media-libs/opus )
portaudio? ( media-libs/portaudio )
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 8b3b0d4f248a28f3d5ff21de5a2bd399da9b7df8 Author: Jaco Kroon uls co za> AuthorDate: Sat Nov 16 17:29:57 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Nov 30 07:48:56 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b3b0d4f net-libs/pjproject: take maintainership. Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Jaco Kroon uls.co.za> Signed-off-by: Joonas Niilola gentoo.org> net-libs/pjproject/metadata.xml | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml index 3d82a0d2376..d5f49d1aa55 100644 --- a/net-libs/pjproject/metadata.xml +++ b/net-libs/pjproject/metadata.xml @@ -2,8 +2,12 @@ http://www.gentoo.org/dtd/metadata.dtd;> - chain...@gentoo.org - Tony Vroon + j...@uls.co.za + Jaco Kroon + + + proxy-ma...@gentoo.org + Proxy Maintainers Inlcude AMR codec in the build
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: bf0a4cc60890dc1b8f93f66be9b073c180ec9381
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Mar 17 16:19:31 2019 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Mar 18 22:52:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf0a4cc6
net-libs/pjproject: use HTTPS.
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11392
Signed-off-by: Patrice Clement gentoo.org>
net-libs/pjproject/pjproject-2.7.1.ebuild | 6 +++---
net-libs/pjproject/pjproject-2.7.2.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net-libs/pjproject/pjproject-2.7.1.ebuild
b/net-libs/pjproject/pjproject-2.7.1.ebuild
index b245f2b754b..2c434a83d12 100644
--- a/net-libs/pjproject/pjproject-2.7.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
inherit autotools flag-o-matic
DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
-HOMEPAGE="http://www.pjsip.org/;
-SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2;
+HOMEPAGE="https://www.pjsip.org/;
+SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2;
KEYWORDS="amd64 ~ppc x86"
LICENSE="GPL-2"
diff --git a/net-libs/pjproject/pjproject-2.7.2.ebuild
b/net-libs/pjproject/pjproject-2.7.2.ebuild
index 2b77f3de1c3..141fa9edf64 100644
--- a/net-libs/pjproject/pjproject-2.7.2.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
inherit autotools flag-o-matic
DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
-HOMEPAGE="http://www.pjsip.org/;
-SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2;
+HOMEPAGE="https://www.pjsip.org/;
+SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2;
KEYWORDS="~amd64 ~ppc ~x86"
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 6f6f5bff9191ead9777b3c14d02078fbbe6cd91e
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Oct 6 18:35:45 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Oct 6 18:40:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f6f5bff
net-libs/pjproject: keyworded 2.7.1 for ppc, bug #658732
Tested-by: ernsteiswuerfel
Signed-off-by: Sergei Trofimovich gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"
net-libs/pjproject/pjproject-2.7.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-libs/pjproject/pjproject-2.7.1.ebuild
b/net-libs/pjproject/pjproject-2.7.1.ebuild
index c19d6042cf6..b245f2b754b 100644
--- a/net-libs/pjproject/pjproject-2.7.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
HOMEPAGE="http://www.pjsip.org/;
SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2;
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 76a17d969620701dae6caa9e77cccaf5f51695fc
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Oct 6 18:37:45 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Oct 6 18:40:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76a17d96
net-libs/pjproject: keyworded 2.7.2 for ppc, bug #658732
Tested-by: ernsteiswuerfel
Signed-off-by: Sergei Trofimovich gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"
net-libs/pjproject/pjproject-2.7.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-libs/pjproject/pjproject-2.7.2.ebuild
b/net-libs/pjproject/pjproject-2.7.2.ebuild
index 8f9962b2e27..2b77f3de1c3 100644
--- a/net-libs/pjproject/pjproject-2.7.2.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
HOMEPAGE="http://www.pjsip.org/;
SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2;
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 062697027374733e80e6bab2d5fa7789e61cd994
Author: Tony Vroon gentoo org>
AuthorDate: Fri Aug 31 17:12:55 2018 +
Commit: Tony Vroon gentoo org>
CommitDate: Fri Aug 31 17:13:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06269702
net-libs/pjproject: Block media-plugins/mediastreamer-bcg729
This breaks the build process in a way that is not yet fully understood.
Annoying, but better to flag it up than to explode without warning.
Suggested-by: Jaco Kroon uls.co.za>
Acked-by: Mart Raudsepp gentoo.org>
Fixes: https://bugs.gentoo.org/609702
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-libs/pjproject/pjproject-2.7.2.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.7.2.ebuild
b/net-libs/pjproject/pjproject-2.7.2.ebuild
index ee569db2b4e..8f9962b2e27 100644
--- a/net-libs/pjproject/pjproject-2.7.2.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2.ebuild
@@ -44,7 +44,8 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
net-libs/libsrtp:0"
DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ virtual/pkgconfig
+ !!media-plugins/mediastreamer-bcg729"
REQUIRED_USE="?? ( ${SOUND_FLAGS} )"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/files/, net-libs/pjproject/
commit: 32c60bef3d0f71430417a985ce11ba3a1108ece4 Author: Tony Vroon gentoo org> AuthorDate: Wed Mar 14 09:17:32 2018 + Commit: Tony Vroon gentoo org> CommitDate: Wed Mar 14 09:17:32 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c60bef net-libs/pjproject: Version bump to 2.7.2 Fixed SSL flipflop logic by Felix Janda replaces my own failed first attempt. Upstream has two security fixes around malformed SDP, a crash due to an invalid ftmp attribute and a crash due to an invalid media format description. Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-libs/pjproject/Manifest| 1 + .../files/pjproject-2.7.2-ssl-flipflop.patch | 103 +++ net-libs/pjproject/pjproject-2.7.2.ebuild | 110 + 3 files changed, 214 insertions(+) diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest index f4403851ca6..12e01535ff4 100644 --- a/net-libs/pjproject/Manifest +++ b/net-libs/pjproject/Manifest @@ -1 +1,2 @@ DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979 +DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd diff --git a/net-libs/pjproject/files/pjproject-2.7.2-ssl-flipflop.patch b/net-libs/pjproject/files/pjproject-2.7.2-ssl-flipflop.patch new file mode 100644 index 000..c984bc62962 --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.7.2-ssl-flipflop.patch @@ -0,0 +1,103 @@ +--- pjproject-2.7.1.ORIG/aconfigure.ac 2018-02-06 11:34:20.973411193 + pjproject-2.7.1/aconfigure.ac 2018-02-06 13:33:31.525015674 + +@@ -1551,57 +1551,56 @@ + enable_ssl=no + fi + +-dnl # Include SSL support ++dnl # Correct --enable vs --disable SSL flipflop logic + AC_SUBST(ac_no_ssl) + AC_SUBST(ac_ssl_has_aes_gcm,0) + AC_ARG_ENABLE(ssl, + AS_HELP_STRING([--disable-ssl], +[Exclude SSL support the build (default: autodetect)]) +-, +-[ +- if test "$enable_ssl" = "no"; then +- [ac_no_ssl=1] +- AC_MSG_RESULT([Checking if SSL support is disabled... yes]) +- fi +-], +-[ +- AC_MSG_RESULT([checking for OpenSSL installations..]) +-if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then +-CFLAGS="$CFLAGS -I$with_ssl/include" +-LDFLAGS="$LDFLAGS -L$with_ssl/lib" +-AC_MSG_RESULT([Using SSL prefix... $with_ssl]) +-fi +- AC_SUBST(openssl_h_present) +- AC_SUBST(libssl_present) +- AC_SUBST(libcrypto_present) +- AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1]) +- AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"]) +- AC_CHECK_LIB(ssl,SSL_CTX_new,[libssl_present=1 && LIBS="-lssl $LIBS"]) +- if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then +- AC_MSG_RESULT([OpenSSL library found, SSL support enabled]) +- +- # Check if SRTP should be compiled with OpenSSL +- # support, to enable cryptos such as AES GCM. +- +- # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type. +- # Update 2.7: our bundled libsrtp has been upgraded to 2.1.0, +- # so we can omit EVP_CIPHER_CTX definition check now. +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], +-[EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm();])], +- [AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1])]) +- if test "x$ac_ssl_has_aes_gcm" = "x1"; then +- AC_MSG_RESULT([OpenSSL has AES GCM support, SRTP will use OpenSSL]) +- else +- AC_MSG_RESULT([OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos]) +- fi +- +- # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK +- #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) +- AC_DEFINE(PJ_HAS_SSL_SOCK, 1) ++) ++ ++dnl # OpenSSL
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 57be13c3d5c68519968f9eb575a8d8e9d4a91e28
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Mar 12 10:51:02 2018 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Mar 12 10:51:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57be13c3
net-libs/pjproject: amd64 stable wrt bug #650008
Signed-off-by: Agostino Sarubbo gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"
net-libs/pjproject/pjproject-2.7.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/pjproject/pjproject-2.7.1.ebuild
b/net-libs/pjproject/pjproject-2.7.1.ebuild
index e4d25565824..ce4a363c501 100644
--- a/net-libs/pjproject/pjproject-2.7.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
HOMEPAGE="http://www.pjsip.org/;
SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2;
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: c1a2081df6f82c07aa8c90391bee03a234327d18
Author: Tony Vroon gentoo org>
AuthorDate: Wed Feb 7 09:17:01 2018 +
Commit: Tony Vroon gentoo org>
CommitDate: Wed Feb 7 09:17:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1a2081d
net-libs/pjproject: Deal with Speex moving goalposts
Apparently we now want speexdsp instead, but this is a recent
development. Also remove older releases which do not have the
SSL configure logic override, as they will break with Asterisk.
Closes: https://bugs.gentoo.org/641810
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-libs/pjproject/Manifest | 2 -
net-libs/pjproject/pjproject-2.5.1.ebuild | 101 --
net-libs/pjproject/pjproject-2.6.ebuild | 101 --
net-libs/pjproject/pjproject-2.7.1.ebuild | 2 +-
4 files changed, 1 insertion(+), 205 deletions(-)
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index ee5cb59e30f..f4403851ca6 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,3 +1 @@
-DIST pjproject-2.5.1.tar.bz2 4180967 BLAKE2B
1c7d00ad1eddd0b2b53591927a2cdd9dedfdf61b6e9ab88dba41d3916a3adc5e889ebc2e3e2518368378990929ced580917d990b4b8649e137e03953a7d77ee9
SHA512
7722980e5afa4b541614c4117462b0df3fff2bfec45ca5da18a7c3fce2a5dd6c628ed0bb2412da6086abd59c5ba2844bea9466f49737dbc9ca85d32ef67a2628
-DIST pjproject-2.6.tar.bz2 4933273 BLAKE2B
cb41f00b81da5069a85a8facde14e77a3cf13b50d9f5131fe04e15a4538cbc2bac026429d386938501b4715c584cd497d31a9ba4f3579f96b7b1b8cf363c99e1
SHA512
48be9a80f90b1cb292c6eb0d071d889f6027f56bdd75095c510d9be2d6b5f1df5a6371617009371525ac5797dc61f5814dcc1cc11d14105e5a2576539f89293f
DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B
33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e
SHA512
cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979
diff --git a/net-libs/pjproject/pjproject-2.5.1.ebuild
b/net-libs/pjproject/pjproject-2.5.1.ebuild
deleted file mode 100644
index d47ae1c5b9b..000
--- a/net-libs/pjproject/pjproject-2.5.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
-HOMEPAGE="http://www.pjsip.org/;
-SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2;
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
-VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv"
-SOUND_FLAGS="alsa oss portaudio"
-IUSE="amr debug doc epoll examples ipv6 opus resample silk ssl static-libs
webrtc ${CODEC_FLAGS} ${VIDEO_FLAGS} ${SOUND_FLAGS}"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
- oss? ( media-libs/portaudio[oss] )
- portaudio? ( media-libs/portaudio )
-
- amr? ( media-libs/opencore-amr )
- gsm? ( media-sound/gsm )
- ilbc? ( dev-libs/ilbc-rfc3951 )
- opus? ( media-libs/opus )
- speex? ( media-libs/speex )
-
- ffmpeg? ( virtual/ffmpeg:= )
- sdl? ( media-libs/libsdl )
- openh264? ( media-libs/openh264 )
- resample? ( media-libs/libsamplerate )
-
- ssl? ( dev-libs/openssl:= )
-
- net-libs/libsrtp:0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="?? ( ${SOUND_FLAGS} )"
-
-src_configure() {
- local myconf=()
- local videnable="--disable-video"
- local t
-
- use ipv6 && append-flags -DPJ_HAS_IPV6=1
- use debug || append-flags -DNDEBUG=1
-
- for t in ${CODEC_FLAGS}; do
- myconf+=( $(use_enable ${t} ${t}-codec) )
- done
-
- for t in ${VIDEO_FLAGS}; do
- myconf+=( $(use_enable ${t}) )
- use "${t}" && videnable="--enable-video"
- done
-
- econf \
- --enable-shared \
- --with-external-srtp \
- ${videnable} \
- $(use_enable epoll) \
- $(use_with gsm external-gsm) \
- $(use_with speex external-speex) \
- $(use_enable speex speex-aec) \
- $(use_enable resample) \
- $(use_enable resample libsamplerate) \
- $(use_enable resample resample-dll) \
- $(use_enable alsa sound) \
- $(use_enable oss) \
- $(use_with portaudio external-pa) \
- $(use_enable portaudio ext-sound) \
- $(use_enable amr opencore-amr) \
- $(use_enable silk) \
- $(use_enable opus) \
- $(use_enable ssl) \
- $(use_enable webrtc) \
- "${myconf[@]}"
-}
-
-src_compile() {
- emake dep
- emake
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
-
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/, net-libs/pjproject/files/
commit: 647c7328cecb9d4296f5e7b346152cacb32fc615 Author: Tony Vroon gentoo org> AuthorDate: Tue Feb 6 13:59:14 2018 + Commit: Tony Vroon gentoo org> CommitDate: Tue Feb 6 13:59:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=647c7328 net-libs/pjproject: Add 2.7.1 release As pointed out by Alexander Wetzel, the --enable-ssl vs --disable-ssl logic in the upstream configure script leaves to be desired. If we delete the silly wrapper and move some files, we can even use eautoreconf. Closes: https://bugs.gentoo.org/609702 Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-libs/pjproject/Manifest| 1 + .../files/pjproject-2.7.1-ssl-flipflop.patch | 103 +++ net-libs/pjproject/pjproject-2.7.1.ebuild | 110 + 3 files changed, 214 insertions(+) diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest index 635b8513252..ee5cb59e30f 100644 --- a/net-libs/pjproject/Manifest +++ b/net-libs/pjproject/Manifest @@ -1,2 +1,3 @@ DIST pjproject-2.5.1.tar.bz2 4180967 BLAKE2B 1c7d00ad1eddd0b2b53591927a2cdd9dedfdf61b6e9ab88dba41d3916a3adc5e889ebc2e3e2518368378990929ced580917d990b4b8649e137e03953a7d77ee9 SHA512 7722980e5afa4b541614c4117462b0df3fff2bfec45ca5da18a7c3fce2a5dd6c628ed0bb2412da6086abd59c5ba2844bea9466f49737dbc9ca85d32ef67a2628 DIST pjproject-2.6.tar.bz2 4933273 BLAKE2B cb41f00b81da5069a85a8facde14e77a3cf13b50d9f5131fe04e15a4538cbc2bac026429d386938501b4715c584cd497d31a9ba4f3579f96b7b1b8cf363c99e1 SHA512 48be9a80f90b1cb292c6eb0d071d889f6027f56bdd75095c510d9be2d6b5f1df5a6371617009371525ac5797dc61f5814dcc1cc11d14105e5a2576539f89293f +DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979 diff --git a/net-libs/pjproject/files/pjproject-2.7.1-ssl-flipflop.patch b/net-libs/pjproject/files/pjproject-2.7.1-ssl-flipflop.patch new file mode 100644 index 000..fd1dc5caa1e --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.7.1-ssl-flipflop.patch @@ -0,0 +1,103 @@ +--- pjproject-2.7.1.ORIG/aconfigure.ac 2018-02-06 11:34:20.973411193 + pjproject-2.7.1/aconfigure.ac 2018-02-06 13:33:31.525015674 + +@@ -1551,57 +1551,56 @@ + enable_ssl=no + fi + +-dnl # Include SSL support ++dnl # Correct --enable vs --disable SSL flipflop logic + AC_SUBST(ac_no_ssl) + AC_SUBST(ac_ssl_has_aes_gcm,0) + AC_ARG_ENABLE(ssl, + AS_HELP_STRING([--disable-ssl], +[Exclude SSL support the build (default: autodetect)]) +-, +-[ +- if test "$enable_ssl" = "no"; then +- [ac_no_ssl=1] +- AC_MSG_RESULT([Checking if SSL support is disabled... yes]) +- fi +-], +-[ +- AC_MSG_RESULT([checking for OpenSSL installations..]) +-if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then +-CFLAGS="$CFLAGS -I$with_ssl/include" +-LDFLAGS="$LDFLAGS -L$with_ssl/lib" +-AC_MSG_RESULT([Using SSL prefix... $with_ssl]) +-fi +- AC_SUBST(openssl_h_present) +- AC_SUBST(libssl_present) +- AC_SUBST(libcrypto_present) +- AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1]) +- AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"]) +- AC_CHECK_LIB(ssl,SSL_CTX_new,[libssl_present=1 && LIBS="-lssl $LIBS"]) +- if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then +- AC_MSG_RESULT([OpenSSL library found, SSL support enabled]) +- +- # Check if SRTP should be compiled with OpenSSL +- # support, to enable cryptos such as AES GCM. +- +- # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type. +- # Update 2.7: our bundled libsrtp has been upgraded to 2.1.0, +- # so we can omit EVP_CIPHER_CTX definition check now. +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], +-[EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm();])], +- [AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1])]) +- if test "x$ac_ssl_has_aes_gcm" = "x1"; then +- AC_MSG_RESULT([OpenSSL has AES GCM support, SRTP will use OpenSSL]) +- else +-
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/
commit: 43af551179dfe6ce89c1047b21f680607b132148
Author: Tony Vroon gentoo org>
AuthorDate: Mon Sep 18 23:42:26 2017 +
Commit: Tony Vroon gentoo org>
CommitDate: Mon Sep 18 23:42:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43af5511
net-libs/pjproject: Version bump to 2.6.0
Package-Manager: portage-2.3.8
net-libs/pjproject/Manifest | 1 +
net-libs/pjproject/pjproject-2.5.1.ebuild | 4 ++--
net-libs/pjproject/{pjproject-2.5.1.ebuild => pjproject-2.6.ebuild} | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 53dd3f26279..3d775ce2cc0 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1 +1,2 @@
DIST pjproject-2.5.1.tar.bz2 4180967 SHA256
c5a63bed7a0832ff53ddcd69612cf43148019d0f320b22beb5ca2223bc857dcb SHA512
7722980e5afa4b541614c4117462b0df3fff2bfec45ca5da18a7c3fce2a5dd6c628ed0bb2412da6086abd59c5ba2844bea9466f49737dbc9ca85d32ef67a2628
WHIRLPOOL
5b7845a31a3da765358f0a1b28805e39dadae06b01f94fb84809f01bddec8e5d3bfa3c0ef19be6a5dbb7519e3f5948c4bf1c73eebf3efeb609c6a3bf4598585f
+DIST pjproject-2.6.tar.bz2 4933273 SHA256
2f5a1da1c174d845871c758bd80fbb580fca7799d3cfaa0d3c4e082b5161c7b4 SHA512
48be9a80f90b1cb292c6eb0d071d889f6027f56bdd75095c510d9be2d6b5f1df5a6371617009371525ac5797dc61f5814dcc1cc11d14105e5a2576539f89293f
WHIRLPOOL
a7cc5fe528bc24b9f0563170297539530089202280d7640f84863ae07194c0fe1b81be8c46fb493574350e43dcfcc0f90aeb939ef2eda7940babff955c445f04
diff --git a/net-libs/pjproject/pjproject-2.5.1.ebuild
b/net-libs/pjproject/pjproject-2.5.1.ebuild
index 5e24af2ecd3..d47ae1c5b9b 100644
--- a/net-libs/pjproject/pjproject-2.5.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -34,7 +34,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
ssl? ( dev-libs/openssl:= )
- net-libs/libsrtp"
+ net-libs/libsrtp:0"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/net-libs/pjproject/pjproject-2.5.1.ebuild
b/net-libs/pjproject/pjproject-2.6.ebuild
similarity index 97%
copy from net-libs/pjproject/pjproject-2.5.1.ebuild
copy to net-libs/pjproject/pjproject-2.6.ebuild
index 5e24af2ecd3..d47ae1c5b9b 100644
--- a/net-libs/pjproject/pjproject-2.5.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -34,7 +34,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
ssl? ( dev-libs/openssl:= )
- net-libs/libsrtp"
+ net-libs/libsrtp:0"
DEPEND="${RDEPEND}
virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: net-libs/pjproject/, net-misc/asterisk/
commit: c635eec3da5b371e9a218503e5d132a0a01d8950
Author: Jaco Kroon uls co za>
AuthorDate: Wed Jun 1 09:04:47 2016 +
Commit: Tony Vroon gentoo org>
CommitDate: Thu Jun 30 10:30:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c635eec3
asterisk pjsip (pjprotect) support.
net-libs/pjproject/Manifest | 1 +
net-libs/pjproject/metadata.xml | 24 +++
net-libs/pjproject/pjproject-2.5.1.ebuild | 102 ++
net-misc/asterisk/asterisk-13.8.2.ebuild | 6 +-
net-misc/asterisk/metadata.xml| 1 +
5 files changed, 132 insertions(+), 2 deletions(-)
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
new file mode 100644
index 000..53dd3f2
--- /dev/null
+++ b/net-libs/pjproject/Manifest
@@ -0,0 +1 @@
+DIST pjproject-2.5.1.tar.bz2 4180967 SHA256
c5a63bed7a0832ff53ddcd69612cf43148019d0f320b22beb5ca2223bc857dcb SHA512
7722980e5afa4b541614c4117462b0df3fff2bfec45ca5da18a7c3fce2a5dd6c628ed0bb2412da6086abd59c5ba2844bea9466f49737dbc9ca85d32ef67a2628
WHIRLPOOL
5b7845a31a3da765358f0a1b28805e39dadae06b01f94fb84809f01bddec8e5d3bfa3c0ef19be6a5dbb7519e3f5948c4bf1c73eebf3efeb609c6a3bf4598585f
diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml
new file mode 100644
index 000..42ac90f
--- /dev/null
+++ b/net-libs/pjproject/metadata.xml
@@ -0,0 +1,24 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+chain...@gentoo.org
+Tony Vroon
+
+
+ Inlcude AMR codec in the build
+ Include Video4Linux v2 support in the build
+Use /dev/epoll ioqueue on Linux (experimental)
+Include G.711 codecs in the build
+Include G.722 codec in the build
+Include G.722.1 codec in the build
+Include iLBC codec in the build
+Include Linear/L16 codec family in the build
+Include libyuv in the build
+Include Open H.264 support in the build
+Include OPUS support in the build
+Include resampling implementations in the
build
+Include SILK support in the build
+Enable WebRTC support
+
+
diff --git a/net-libs/pjproject/pjproject-2.5.1.ebuild
b/net-libs/pjproject/pjproject-2.5.1.ebuild
new file mode 100644
index 000..80c52cd
--- /dev/null
+++ b/net-libs/pjproject/pjproject-2.5.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
+HOMEPAGE="http://www.pjsip.org/;
+SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2;
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
+VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv"
+SOUND_FLAGS="alsa oss portaudio"
+IUSE="amr debug doc epoll examples ipv6 opus resample silk ssl static-libs
webrtc ${CODEC_FLAGS} ${VIDEO_FLAGS} ${SOUND_FLAGS}"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+ oss? ( media-libs/portaudio[oss] )
+ portaudio? ( media-libs/portaudio )
+
+ amr? ( media-libs/opencore-amr )
+ gsm? ( media-sound/gsm )
+ ilbc? ( dev-libs/ilbc-rfc3951 )
+ opus? ( media-libs/opus )
+ speex? ( media-libs/speex )
+
+ ffmpeg? ( virtual/ffmpeg:= )
+ sdl? ( media-libs/libsdl )
+ openh264? ( media-libs/openh264 )
+ resample? ( media-libs/libsamplerate )
+
+ ssl? ( dev-libs/openssl:= )
+
+ net-libs/libsrtp"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+REQUIRED_USE="?? ( ${SOUND_FLAGS} )"
+
+src_configure() {
+ local myconf=()
+ local videnable="--disable-video"
+ local t
+
+ use ipv6 && append-flags -DPJ_HAS_IPV6=1
+ use debug || append-flags -DNDEBUG=1
+
+ for t in ${CODEC_FLAGS}; do
+ myconf+=( $(use_enable ${t} ${t}-codec) )
+ done
+
+ for t in ${VIDEO_FLAGS}; do
+ myconf+=( $(use_enable ${t}) )
+ use "${t}" && videnable="--enable-video"
+ done
+
+ econf \
+ --enable-shared \
+ --with-external-srtp \
+ ${videnable} \
+ $(use_enable epoll) \
+ $(use_with gsm external-gsm) \
+ $(use_with speex external-speex) \
+ $(use_enable speex speex-aec) \
+ $(use_enable resample) \
+ $(use_enable resample libsamplerate) \
+ $(use_enable resample resample-dll) \
+ $(use_enable alsa sound) \
+ $(use_enable oss) \
+ $(use_with portaudio external-pa) \
+ $(use_enable portaudio ext-sound) \
+ $(use_enable amr opencore-amr) \
+ $(use_enable silk) \
+ $(use_enable opus) \
+ $(use_enable ssl) \
+ $(use_enable webrtc) \
+ "${myconf[@]}"
+}
+
+src_compile() {
+ emake dep
+ emake
+}
+
