diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile index 556f441..28cc734 100644 --- a/libs/pjproject/Makefile +++ b/libs/pjproject/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pjproject PKG_VERSION:=2.10 -PKG_RELEASE:=2 +PKG_RELEASE:=3 # download "vX.Y.tar.gz" as "pjproject-vX.Y.tar.gz" PKG_SOURCE_URL_FILE:=$(PKG_VERSION).tar.gz diff --git a/libs/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch b/libs/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch new file mode 100644 index 0000000..c8e4b4c --- /dev/null +++ b/libs/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch @@ -0,0 +1,32 @@ +From ce18018cc17bef8f80c08686e3a7b28384ef3ba5 Mon Sep 17 00:00:00 2001 +From: sauwming +Date: Mon, 12 Oct 2020 13:31:25 +0800 +Subject: [PATCH] Fix incorrect copying of destination info when creating + CANCEL (#2546) + +--- + pjsip/src/pjsip/sip_util.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/pjsip/src/pjsip/sip_util.c ++++ b/pjsip/src/pjsip/sip_util.c +@@ -779,14 +779,14 @@ PJ_DEF(pj_status_t) pjsip_endpt_create_c + pjsip_hdr_clone(cancel_tdata->pool, req_tdata->saved_strict_route); + } + +- /* Copy the destination host name from the original request */ +- pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name, +- &req_tdata->dest_info.name); +- +- /* Finally copy the destination info from the original request */ ++ /* Copy the destination info from the original request */ + pj_memcpy(&cancel_tdata->dest_info, &req_tdata->dest_info, + sizeof(req_tdata->dest_info)); + ++ /* Finally, copy the destination host name from the original request */ ++ pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name, ++ &req_tdata->dest_info.name); ++ + /* Done. + * Return the transmit buffer containing the CANCEL request. + */ diff --git a/libs/pjproject/patches/0070-fix-sdp-neg-modify-local-offer.patch b/libs/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch similarity index 78% rename from libs/pjproject/patches/0070-fix-sdp-neg-modify-local-offer.patch rename to libs/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch index c27a489..889d012 100644 --- a/libs/pjproject/patches/0070-fix-sdp-neg-modify-local-offer.patch +++ b/libs/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch @@ -1,8 +1,6 @@ -diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c -index 3b85b4273..a14009662 100644 --- a/pjmedia/src/pjmedia/sdp_neg.c +++ b/pjmedia/src/pjmedia/sdp_neg.c -@@ -304,7 +304,6 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2( +@@ -304,7 +304,6 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modi { pjmedia_sdp_session *new_offer; pjmedia_sdp_session *old_offer; @@ -10,7 +8,7 @@ index 3b85b4273..a14009662 100644 unsigned oi; /* old offer media index */ pj_status_t status; -@@ -323,8 +322,19 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2( +@@ -323,8 +322,19 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modi /* Change state to STATE_LOCAL_OFFER */ neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER; diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index a9d0721..5bb21b5 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk -PKG_VERSION:=18.1.1 -PKG_RELEASE:=5 +PKG_VERSION:=18.2.2 +PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases -PKG_HASH:=d0c0e90379c680a2803b9ba99d35918f5b9522c51998109bcc1937ee53ebdaa3 +PKG_HASH:=c7a3da64e30d1ac428ae2cf4723d3a2b799ae88768341084ce8a2e3e424ae163 PKG_BUILD_DEPENDS:=libxml2/host diff --git a/net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch b/net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch deleted file mode 100644 index e925416..0000000 --- a/net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1037,15 +1037,18 @@ AC_LINK_IFELSE( - - # Some platforms define sem_init(), but only support sem_open(). joyous. - AC_MSG_CHECKING(for working unnamed semaphores) --AC_RUN_IFELSE( -- [AC_LANG_PROGRAM([#include ], -- [sem_t sem; return sem_init(&sem, 0, 0);])], -+AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [#include ], -+ [#if defined(__UCLIBC__) -+ i_dont_exist sem; -+ #else -+ sem_t sem; -+ #endif -+ return sem_init(&sem, 0, 0);])], - AC_MSG_RESULT(yes) - AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.]), -- AC_MSG_RESULT(no), -- AC_MSG_RESULT(cross-compile) -- AC_MSG_NOTICE([WARNING: result yes guessed because of cross compilation]) -- AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.]) -+ AC_MSG_RESULT(no) - ) - - LIBS="$save_LIBS" diff --git a/net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch b/net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch deleted file mode 100644 index fabf423..0000000 --- a/net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9b4070944578336506cd0a76de6f733c72d0ca74 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sat, 13 Oct 2018 11:11:15 +0200 -Subject: [PATCH] configure: fix detection of re-entrant resolver functions - -Fixes https://issues.asterisk.org/jira/browse/ASTERISK-21795 - -uClibc does not provide res_nsearch: -asterisk-16.0.0/main/dns.c:506: undefined reference to `res_nsearch' - -Patch coded by Yann E. MORIN: -http://lists.busybox.net/pipermail/buildroot/2018-October/232630.html - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -1431,7 +1431,11 @@ AC_LINK_IFELSE( - #include - #endif - #include ], -- [int foo = res_ninit(NULL);])], -+ [ -+ int foo; -+ foo = res_ninit(NULL); -+ foo = res_nsearch(NULL, NULL, 0, 0, NULL, 0); -+ ])], - AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.]) - AC_SEARCH_LIBS(res_9_ndestroy, resolv) diff --git a/net/asterisk/patches/100-build-reproducibly.patch b/net/asterisk/patches/100-build-reproducibly.patch index 736fd5d..7ffa74a 100644 --- a/net/asterisk/patches/100-build-reproducibly.patch +++ b/net/asterisk/patches/100-build-reproducibly.patch @@ -17,7 +17,7 @@ * build.h --- a/Makefile +++ b/Makefile -@@ -488,7 +488,7 @@ doc/core-en_US.xml: makeopts .lastclean +@@ -489,7 +489,7 @@ doc/core-en_US.xml: makeopts .lastclean @echo "" >> $@ @for x in $(MOD_SUBDIRS); do \ printf "$$x " ; \ diff --git a/net/asterisk/patches/140-use-default-lua.patch b/net/asterisk/patches/140-use-default-lua.patch index 52d0249..78ba140 100644 --- a/net/asterisk/patches/140-use-default-lua.patch +++ b/net/asterisk/patches/140-use-default-lua.patch @@ -1,15 +1,11 @@ --- a/configure.ac +++ b/configure.ac -@@ -2564,7 +2564,11 @@ if test -z "$__opus_include" -o x"$__opu +@@ -2560,7 +2560,7 @@ if test -z "$__opus_include" -o x"$__opu fi AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include]) --for ver in 5.4 5.3 5.2 5.1; do -+# This does not work for us. We have both liblua and liblua5.3 in -+# $(STAGING_DIR)/usr. But the headers for liblua5.3 are in -+# (STAGING_DIR)/usr/include/lua5.3. Using the below, Asterisk would -+# use the headers from liblua and link against liblua5.3 :/ -+for ver in ; do +-for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do ++for ver in ${LUA_VERSIONS}; do AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm]) if test "x${PBX_LUA}" = "x1" ; then if test x"${LUA_DIR}" = x; then