From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- .../pjproject/files/pjproject-2.9-config_site.h | 74 +++++++++++++++ .../pjproject/files/pjproject-2.9-ssl-enable.patch | 100 +++++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 net-libs/pjproject/files/pjproject-2.9-config_site.h create mode 100644 net-libs/pjproject/files/pjproject-2.9-ssl-enable.patch (limited to 'net-libs/pjproject/files') diff --git a/net-libs/pjproject/files/pjproject-2.9-config_site.h b/net-libs/pjproject/files/pjproject-2.9-config_site.h new file mode 100644 index 000000000000..d41ac1d1947b --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.9-config_site.h @@ -0,0 +1,74 @@ +/* + * Based off of the Asterisk config_site.h file. + * + * In general it's the same with some removals due to being ebuild-managed. + */ + +#include + +/* handled by ebuild, default to disabled here */ +#ifndef PJMEDIA_HAS_SRTP +#define PJMEDIA_HAS_SRTP 0 +#endif + +#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 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 32000 + +#undef PJ_TODO +#define PJ_TODO(x) + +/* Defaults too low for WebRTC */ +#define PJ_ICE_MAX_CAND 32 +#define PJ_ICE_MAX_CHECKS (PJ_ICE_MAX_CAND * PJ_ICE_MAX_CAND) + +/* Increase limits to allow more formats */ +#define PJMEDIA_MAX_SDP_FMT 64 +#define PJMEDIA_MAX_SDP_BANDW 4 +#define PJMEDIA_MAX_SDP_ATTR (PJMEDIA_MAX_SDP_FMT*2 + 4) +#define PJMEDIA_MAX_SDP_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 diff --git a/net-libs/pjproject/files/pjproject-2.9-ssl-enable.patch b/net-libs/pjproject/files/pjproject-2.9-ssl-enable.patch new file mode 100644 index 000000000000..bb8a11d7f457 --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.9-ssl-enable.patch @@ -0,0 +1,100 @@ +From 2942c73cd3b3389ec1a35258f22ac9d0f0742de1 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon +Date: Thu, 24 May 2018 15:40:33 +0200 +Subject: [PATCH] Fix support for --enable-ssl. + +This change enables the explicit use of --enable-ssl in such a way that +package managers such as portage (Gentoo) that explicitly does +--enable-ssl or --disable-ssl will get the results that it's looking +for. + +Without this specifying --enable-ssl would end up actually disabling it. + +Additionally, if --enable-ssl is specified but the script ends up being +unable to enable ssl it will fail. +--- + aconfigure | 16 ++++++++++++---- + aconfigure.ac | 15 ++++++++++++--- + 2 files changed, 24 insertions(+), 7 deletions(-) + +diff --git a/aconfigure b/aconfigure +index 0cf17faae..57bdfba87 100755 +--- a/aconfigure ++++ b/aconfigure +@@ -8001,8 +8001,9 @@ if test "${enable_ssl+set}" = set; then : + $as_echo "Checking if SSL support is disabled... yes" >&6; } + fi + +-else ++fi + ++if test "x$ac_no_ssl" != "x1"; then + if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then + CFLAGS="$CFLAGS -I$with_ssl/include" + CPPFLAGS="$CPPFLAGS -I$with_ssl/include" +@@ -8317,16 +8318,23 @@ $as_echo "GnuTLS library found, SSL support enabled" >&6; } + + ac_ssl_backend="gnutls" + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** No GnuTLS libraries found, disabling SSL support **" >&5 +-$as_echo "** No GnuTLS libraries found, disabling SSL support **" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** No GnuTLS libraries found **" >&5 ++$as_echo "** No GnuTLS libraries found **" >&6; } + fi + + fi + ++ if test "x$ac_ssl_backend" = "x"; then ++ if test "x$enable_ssl" = "xyes"; then ++ as_fn_error $? "SSL Support requested but neither OpenSSL nor GnuTLS operational" "$LINENO" 5 ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: No SSL detected, disabling SSL support" >&5 ++$as_echo "No SSL detected, disabling SSL support" >&6; } ++ fi ++ fi + fi + + +- + # Check whether --with-opencore-amrnb was given. + if test "${with_opencore_amrnb+set}" = set; then : + withval=$with_opencore_amrnb; as_fn_error $? "This option is obsolete and replaced by --with-opencore-amr=DIR" "$LINENO" 5 +diff --git a/aconfigure.ac b/aconfigure.ac +index 8d7d944a1..45c42756b 100644 +--- a/aconfigure.ac ++++ b/aconfigure.ac +@@ -1607,7 +1607,8 @@ AC_ARG_ENABLE(ssl, + AC_MSG_RESULT([Checking if SSL support is disabled... yes]) + fi + ], +- [ ++ []) ++if test "x$ac_no_ssl" != "x1"; then + if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then + CFLAGS="$CFLAGS -I$with_ssl/include" + CPPFLAGS="$CPPFLAGS -I$with_ssl/include" +@@ -1692,11 +1693,19 @@ AC_ARG_ENABLE(ssl, + AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_GNUTLS) + ac_ssl_backend="gnutls" + else +- AC_MSG_RESULT([** No GnuTLS libraries found, disabling SSL support **]) ++ AC_MSG_RESULT([** No GnuTLS libraries found **]) + fi + + fi +- ]) ++ ++ if test "x$ac_ssl_backend" = "x"; then ++ if test "x$enable_ssl" = "xyes"; then ++ AC_MSG_ERROR([SSL Support requested but neither OpenSSL nor GnuTLS operational]) ++ else ++ AC_MSG_RESULT([No SSL detected, disabling SSL support]) ++ fi ++ fi ++fi + + dnl # Obsolete option --with-opencore-amrnb + AC_ARG_WITH(opencore-amrnb, +-- +2.23.0 + -- cgit v1.2.3