summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2018-12-12 20:48:30 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2018-12-12 20:48:30 +0000
commit98eeedd0083c4b86e70519436ffe3133d52781dc (patch)
tree83a1dc6f05bb778a379436f038899cd7f7d79f53
parentdevel/ptlib builds fine with OpenSSL 1.1.1 after r484518 (diff)
- Update asterisk13 to 13.24.0
- Update asterisk15 to 15.7.0 - Update asterisk16 to 16.1.0 - Update pjsip to 2.8 - Remove upstreamed patches from pjsip port - Add USES=gnome to asterisk ports - Silence portlint warnings
Notes
Notes: svn path=/head/; revision=487324
Diffstat
-rw-r--r--net/asterisk13/Makefile5
-rw-r--r--net/asterisk13/distinfo6
-rw-r--r--net/asterisk15/Makefile5
-rw-r--r--net/asterisk15/distinfo6
-rw-r--r--net/asterisk16/Makefile5
-rw-r--r--net/asterisk16/distinfo6
-rw-r--r--net/asterisk16/files/patch-Makefile8
-rw-r--r--net/asterisk16/files/patch-contrib_Makefile12
-rw-r--r--net/pjsip/Makefile8
-rw-r--r--net/pjsip/distinfo6
-rw-r--r--net/pjsip/files/patch-aconfigure29
-rw-r--r--net/pjsip/files/patch-build.mak.in20
-rw-r--r--net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c117
-rw-r--r--net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c20
-rw-r--r--net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c25
-rw-r--r--net/pjsip/pkg-plist2
16 files changed, 44 insertions, 236 deletions
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index 7406e7753cee..d602470aad28 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asterisk
-PORTVERSION= 13.23.1
-PORTREVISION= 1
+PORTVERSION= 13.24.0
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
@@ -24,7 +23,7 @@ ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc sparc64
EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX}
-USES= bison cpe gmake iconv libedit localbase \
+USES= bison cpe gmake gnome iconv libedit localbase \
shebangfix sqlite ssl ncurses
USE_CSTD= gnu89
USE_GNOME= libxml2
diff --git a/net/asterisk13/distinfo b/net/asterisk13/distinfo
index 52ac8a753850..cb717797811d 100644
--- a/net/asterisk13/distinfo
+++ b/net/asterisk13/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1537517931
-SHA256 (asterisk-13.23.1.tar.gz) = c772acbfdddb9250bfe07f7e20a7efb6a79a6c123832727429486c78d44fc78c
-SIZE (asterisk-13.23.1.tar.gz) = 33064056
+TIMESTAMP = 1544602387
+SHA256 (asterisk-13.24.0.tar.gz) = 0ad7761acec4deaf8f157a33f8636995b9179b8462022f42577978ae31383fd8
+SIZE (asterisk-13.24.0.tar.gz) = 33001274
SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk15/Makefile b/net/asterisk15/Makefile
index b17947dd1c54..27c25ac87e5a 100644
--- a/net/asterisk15/Makefile
+++ b/net/asterisk15/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asterisk
-PORTVERSION= 15.6.2
-PORTREVISION= 1
+PORTVERSION= 15.7.0
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
@@ -27,7 +26,7 @@ ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc sparc64
EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX}
-USES= bison cpe gmake iconv libedit localbase \
+USES= bison cpe gmake gnome iconv libedit localbase \
shebangfix sqlite ssl ncurses
USE_CSTD= gnu89
USE_GNOME= libxml2
diff --git a/net/asterisk15/distinfo b/net/asterisk15/distinfo
index 9628cb93104f..b80decd397c8 100644
--- a/net/asterisk15/distinfo
+++ b/net/asterisk15/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1542217735
-SHA256 (asterisk-15.6.2.tar.gz) = 4de2751a84e27a0f2750ec76269673e5d182c53c887f605206fe07e21c5390da
-SIZE (asterisk-15.6.2.tar.gz) = 27693393
+TIMESTAMP = 1544602480
+SHA256 (asterisk-15.7.0.tar.gz) = dbd33860b82fc36883eaa110f707f8c06345cbf2c1433d1c59247d4ae038fad9
+SIZE (asterisk-15.7.0.tar.gz) = 27605582
SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 930bd3a8c4a6..efd58ff6a9e1 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asterisk
-PORTVERSION= 16.0.1
-PORTREVISION= 1
+PORTVERSION= 16.1.0
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
@@ -24,7 +23,7 @@ ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc sparc64
EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX}
-USES= bison cpe gmake iconv libedit localbase \
+USES= bison cpe gmake gnome iconv libedit localbase \
shebangfix sqlite ssl ncurses
USE_CSTD= gnu89
USE_GNOME= libxml2
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index 49acdc874c69..e45a6f981d5f 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1542217787
-SHA256 (asterisk-16.0.1.tar.gz) = dec416e8fa830ef242dbd25139d94c2e6e64bf95af7ea5c9eb2a006746650d99
-SIZE (asterisk-16.0.1.tar.gz) = 27553005
+TIMESTAMP = 1544602608
+SHA256 (asterisk-16.1.0.tar.gz) = d19e25ccc822e7f7825de96b7b9cf26d85cb3888edf61d8d12a724240758dedf
+SIZE (asterisk-16.1.0.tar.gz) = 27528156
SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
index e6a1050cfc17..9f4abb6de701 100644
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig 2018-08-08 16:02:31 UTC
+--- Makefile.orig 2018-12-04 00:03:56 UTC
+++ Makefile
@@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
@@ -77,7 +77,7 @@
@@ -764,23 +768,10 @@ upgrade: bininstall
# (2) the extension to strip off
define INSTALL_CONFIGS
- @for x in configs/$(1)/*$(2); do \
+ @for x in $(1)/*$(2); do \
- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \
- if [ -f "$${dst}" ]; then \
- if [ "$(OVERWRITE)" = "y" ]; then \
@@ -93,7 +93,7 @@
- fi ; \
echo "Installing file $$x"; \
- $(INSTALL) -m 644 "$$x" "$${dst}" ;\
-+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \
++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \
done ; \
- if [ "$(OVERWRITE)" = "y" ]; then \
+ if true; then \
@@ -111,7 +111,7 @@
rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
fi
endef
-@@ -810,7 +801,7 @@ adsi:
+@@ -818,7 +809,7 @@ adsi:
else \
echo "Installing $$x" ; \
fi ; \
diff --git a/net/asterisk16/files/patch-contrib_Makefile b/net/asterisk16/files/patch-contrib_Makefile
index 1b2e67909406..a0f23c3eef2e 100644
--- a/net/asterisk16/files/patch-contrib_Makefile
+++ b/net/asterisk16/files/patch-contrib_Makefile
@@ -1,15 +1,23 @@
---- contrib/Makefile.orig 2017-04-12 21:47:53 UTC
+--- contrib/Makefile.orig 2018-12-04 00:03:56 UTC
+++ contrib/Makefile
-@@ -24,10 +24,10 @@ install:
+@@ -24,14 +24,14 @@ install:
$(INSTALL) -m 755 scripts/ast_logescalator "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator"
$(INSTALL) -m 755 scripts/ast_loggrabber "$(DESTDIR)$(ASTDATADIR)/scripts/ast_loggrabber"
$(INSTALL) -m 755 scripts/ast_coredumper "$(DESTDIR)$(ASTDATADIR)/scripts/ast_coredumper"
- $(INSTALL) -m 755 scripts/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
+- $(INSTALL) -m 755 scripts/refstats.py "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py"
+- $(INSTALL) -m 755 scripts/reflocks.py "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py"
+# $(INSTALL) -m 755 scripts/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
++# $(INSTALL) -m 755 scripts/refstats.py "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py"
++# $(INSTALL) -m 755 scripts/reflocks.py "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py"
uninstall:
-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator"
-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_loggrabber"
-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_coredumper"
- -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
+- -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py"
+- -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py"
+# -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
++# -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py"
++# -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py"
diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile
index 12078469b2c0..7b52e54d2ab6 100644
--- a/net/pjsip/Makefile
+++ b/net/pjsip/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pjsip
-PORTVERSION= 2.7.2
-PORTREVISION= 4
+PORTVERSION= 2.8
CATEGORIES= net
MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/
DISTNAME= pjproject-${DISTVERSION}
@@ -14,14 +13,15 @@ LICENSE= GPLv2+
LIB_DEPENDS= libportaudio.so:audio/portaudio
+USES= gmake localbase pathfix ssl tar:bz2
+USE_LDCONFIG= yes
+
CONFLICTS?= pjsip-extsrtp
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-external-pa \
--disable-silk
-USES= gmake localbase pathfix ssl tar:bz2
PATHFIX_MAKEFILEIN= Makefile
-USE_LDCONFIG= yes
PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}"
MAKE_JOBS_UNSAFE= yes
diff --git a/net/pjsip/distinfo b/net/pjsip/distinfo
index e88493062579..3988b77ed7f3 100644
--- a/net/pjsip/distinfo
+++ b/net/pjsip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519204408
-SHA256 (pjproject-2.7.2.tar.bz2) = 9c2c828abab7626edf18e04b041ef274bfaa86f99adf2c25ff56f1509e813772
-SIZE (pjproject-2.7.2.tar.bz2) = 4994233
+TIMESTAMP = 1544602652
+SHA256 (pjproject-2.8.tar.bz2) = 503d0bd7f9f13dc1492ac9b71b761b1089851fbb608b9a13996edc3c42006f79
+SIZE (pjproject-2.8.tar.bz2) = 4976501
diff --git a/net/pjsip/files/patch-aconfigure b/net/pjsip/files/patch-aconfigure
index 51c87ce365dc..0acdaa5a2288 100644
--- a/net/pjsip/files/patch-aconfigure
+++ b/net/pjsip/files/patch-aconfigure
@@ -1,21 +1,6 @@
---- aconfigure.orig 2017-11-01 05:23:36 UTC
+--- aconfigure.orig 2018-07-05 11:16:11 UTC
+++ aconfigure
-@@ -6362,14 +6362,7 @@ $as_echo "Checking sound device backend... null sound"
- ;;
- *)
- ac_pjmedia_snd=alsa
-- ac_pa_use_alsa=1
--
-- ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default"
--if test "x$ac_cv_header_alsa_version_h" = xyes; then :
-- LIBS="$LIBS -lasound"
--else
- ac_pa_use_alsa=0
--fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5
-@@ -7022,7 +7015,7 @@ else
+@@ -7085,7 +7085,7 @@ else
FFMPEG_PREFIX=$with_ffmpeg
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
$as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
@@ -24,12 +9,12 @@
fi
for ac_prog in pkg-config "python pkgconfig.py"
-@@ -8669,7 +8662,7 @@ $as_echo "Checking if libwebrtc is disabled...no" >&6;
+@@ -8884,7 +8884,7 @@ $as_echo "Checking if libwebrtc is disabled...no" >&6;
ac_webrtc_instset=sse2
ac_webrtc_cflags="-msse2"
;;
- *win32* | *w32* | *darwin* | *linux*)
-+ *win32* | *w32* | *darwin* | *linux* | *amd64*freebsd* )
- ac_webrtc_instset=sse2
- ;;
- *)
++ *win32* | *w32* | *darwin* | *linux* | *amd64*freebsd*)
+ case $target in
+ armv7l*gnueabihf)
+ ac_webrtc_instset=neon
diff --git a/net/pjsip/files/patch-build.mak.in b/net/pjsip/files/patch-build.mak.in
deleted file mode 100644
index ce1ab0ea4bd7..000000000000
--- a/net/pjsip/files/patch-build.mak.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- build.mak.in.orig 2016-08-25 01:36:33 UTC
-+++ build.mak.in
-@@ -106,7 +106,7 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib
- endif
- endif
-
--ifneq ($(findstring pa,@ac_pjmedia_snd@),)
-+#ifneq ($(findstring pa,@ac_pjmedia_snd@),)
- ifeq (@ac_external_pa@,1)
- # External PA
- APP_THIRD_PARTY_EXT += -lportaudio
-@@ -119,7 +119,7 @@ APP_THIRD_PARTY_LIBS += -lportaudio
- APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX)
- endif
- endif
--endif
-+#endif
-
- ifneq (@ac_no_yuv@,1)
- ifeq (@ac_external_yuv@,1)
diff --git a/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c b/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c
deleted file mode 100644
index 742b0fdcad72..000000000000
--- a/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c
+++ /dev/null
@@ -1,117 +0,0 @@
---- pjlib/src/pj/ssl_sock_ossl.c.orig 2017-09-14 05:03:45 UTC
-+++ pjlib/src/pj/ssl_sock_ossl.c
-@@ -53,7 +53,7 @@
- #include <openssl/rand.h>
- #include <openssl/opensslconf.h>
-
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER)
-
- # include <openssl/obj_mac.h>
-
-@@ -111,7 +111,7 @@ static unsigned get_nid_from_cid(unsigned cid)
- #endif
-
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- # define OPENSSL_NO_SSL2 /* seems to be removed in 1.1.0 */
- # define M_ASN1_STRING_data(x) ASN1_STRING_get0_data(x)
- # define M_ASN1_STRING_length(x) ASN1_STRING_length(x)
-@@ -126,7 +126,7 @@ static unsigned get_nid_from_cid(unsigned cid)
-
-
- #ifdef _MSC_VER
--# if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- # pragma comment(lib, "libcrypto")
- # pragma comment(lib, "libssl")
- # pragma comment(lib, "crypt32")
-@@ -535,13 +535,13 @@ static pj_status_t init_openssl(void)
- pj_assert(status == PJ_SUCCESS);
-
- /* Init OpenSSL lib */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- SSL_library_init();
- SSL_load_error_strings();
- #else
- OPENSSL_init_ssl(0, NULL);
- #endif
--#if OPENSSL_VERSION_NUMBER < 0x009080ffL
-+#if OPENSSL_VERSION_NUMBER < 0x009080ffL || defined(LIBRESSL_VERSION_NUMBER)
- /* This is now synonym of SSL_library_init() */
- OpenSSL_add_all_algorithms();
- #endif
-@@ -556,7 +556,7 @@ static pj_status_t init_openssl(void)
- int nid;
- const char *cname;
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- meth = (SSL_METHOD*)SSLv23_server_method();
- if (!meth)
- meth = (SSL_METHOD*)TLSv1_server_method();
-@@ -599,7 +599,7 @@ static pj_status_t init_openssl(void)
-
- SSL_set_session(ssl, SSL_SESSION_new());
-
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER)
- openssl_curves_num = SSL_get_shared_curve(ssl,-1);
- if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves))
- openssl_curves_num = PJ_ARRAY_SIZE(openssl_curves);
-@@ -768,7 +768,7 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock)
- BIO *bio;
- DH *dh;
- long options;
--#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
- EC_KEY *ecdh;
- #endif
- SSL_METHOD *ssl_method = NULL;
-@@ -791,7 +791,7 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock)
- ssock->param.proto = PJ_SSL_SOCK_PROTO_SSL23;
-
- /* Determine SSL method to use */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- switch (ssock->param.proto) {
- case PJ_SSL_SOCK_PROTO_TLS1:
- ssl_method = (SSL_METHOD*)TLSv1_method();
-@@ -927,7 +927,7 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock)
- if (dh != NULL) {
- if (SSL_CTX_set_tmp_dh(ctx, dh)) {
- options = SSL_OP_CIPHER_SERVER_PREFERENCE |
-- #if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ #if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_OP_SINGLE_ECDH_USE |
- #endif
- SSL_OP_SINGLE_DH_USE;
-@@ -995,7 +995,7 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock)
- if (SSL_CTX_ctrl(ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL)) {
- PJ_LOG(4,(ssock->pool->obj_name, "SSL ECDH initialized "
- "(automatic), faster PFS ciphers enabled"));
-- #if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ #if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
- } else {
- /* enables AES-128 ciphers, to get AES-256 use NID_secp384r1 */
- ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-@@ -1228,7 +1228,7 @@ static pj_status_t set_cipher_list(pj_ssl_sock_t *ssoc
-
- static pj_status_t set_curves_list(pj_ssl_sock_t *ssock)
- {
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER)
- int ret;
- int curves[PJ_SSL_SOCK_MAX_CURVES];
- unsigned cnt;
-@@ -1259,7 +1259,7 @@ static pj_status_t set_curves_list(pj_ssl_sock_t *ssoc
-
- static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER)
- int ret;
-
- if (ssock->param.sigalgs.ptr && ssock->param.sigalgs.slen) {
diff --git a/net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c b/net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c
deleted file mode 100644
index 083bcd064fc6..000000000000
--- a/net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- pjsip/src/pjsip/sip_parser.c.orig 2017-11-08 02:58:18 UTC
-+++ pjsip/src/pjsip/sip_parser.c
-@@ -834,13 +834,13 @@ PJ_DEF(pj_status_t) pjsip_find_msg( const char *buf, p
- pj_bool_t is_datagram, pj_size_t *msg_size)
- {
- #if PJ_HAS_TCP
-- const char *hdr_end;
-- const char *body_start;
-+ const char *volatile hdr_end;
-+ const char *volatile body_start;
- const char *pos;
-- const char *line;
-+ const char *volatile line;
- int content_length = -1;
- pj_str_t cur_msg;
-- pj_status_t status = PJ_SUCCESS;
-+ volatile pj_status_t status = PJSIP_EMISSINGHDR;
- const pj_str_t end_hdr = { "\n\r\n", 3};
-
- *msg_size = size;
diff --git a/net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c b/net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c
deleted file mode 100644
index 16723c204671..000000000000
--- a/net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- pjsip/src/pjsip/sip_transport.c.orig 2017-11-08 02:58:18 UTC
-+++ pjsip/src/pjsip/sip_transport.c
-@@ -974,7 +974,21 @@ static pj_bool_t is_transport_valid(pjsip_transport *t
- const pjsip_transport_key *key,
- int key_len)
- {
-- return (pj_hash_get(tpmgr->table, key, key_len, NULL) == (void*)tp);
-+ transport *tp_iter;
-+
-+ if (pj_hash_get(tpmgr->table, key, key_len, NULL) == (void*)tp) {
-+ return PJ_TRUE;
-+ }
-+
-+ tp_iter = tpmgr->tp_list.next;
-+ while (tp_iter != &tpmgr->tp_list) {
-+ if (tp_iter->tp == tp) {
-+ return PJ_TRUE;
-+ }
-+ tp_iter = tp_iter->next;
-+ }
-+
-+ return PJ_FALSE;
- }
-
- /*
diff --git a/net/pjsip/pkg-plist b/net/pjsip/pkg-plist
index f7ebff6a78c7..81ffbae082aa 100644
--- a/net/pjsip/pkg-plist
+++ b/net/pjsip/pkg-plist
@@ -28,7 +28,6 @@ include/pj/compat/malloc.h
include/pj/compat/os_auto.h
include/pj/compat/os_auto.h.in
include/pj/compat/os_darwinos.h
-include/pj/compat/os_linux_kernel.h
include/pj/compat/os_linux.h
include/pj/compat/os_palmos.h
include/pj/compat/os_rtems.h
@@ -195,6 +194,7 @@ include/pjmedia/null_port.h
include/pjmedia/plc.h
include/pjmedia/port.h
include/pjmedia/resample.h
+include/pjmedia/rtcp_fb.h
include/pjmedia/rtcp_xr.h
include/pjmedia/rtcp.h
include/pjmedia/rtp.h
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-18 20:11:18 +0000