From 3a97188f5f9e83a0bc8aeb47bc6b4e65c0bd08e8 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Mon, 26 Feb 2018 22:57:32 +0100 Subject: [PATCH] asterisk-13.x: bump to 13.19.2 No new features in this release. This is a bugfix release. - Fixes: AST-2018-004 AST-2018-005 - Remove res_pjsip_transport_management.so as it got moved into res_pjsip's core as per AST-2018-003. - Change to PKG_HASH. - Remove 003-disable-ast-xml-docs.patch, it doesn't apply anymore. Instead change --enable-xmldoc into --disable-xmldoc in the Makefile. - Refreshed patches. Signed-off-by: Sebastian Kemper --- net/asterisk-13.x/Makefile | 12 ++++++------ .../patches/001-disable-semaphores-check.patch | 2 +- net/asterisk-13.x/patches/002-undef-res-ninit.patch | 2 +- .../patches/003-disable-ast-xml-docs.patch | 13 ------------- .../patches/050-musl-glob-compat.patch | 5 ++--- net/asterisk-13.x/patches/052-musl-libcap.patch | 4 ++-- 6 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 net/asterisk-13.x/patches/003-disable-ast-xml-docs.patch diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index 8f730bc..259c02b 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2016 OpenWrt.org +# Copyright (C) 2016 - 2018 OpenWrt.org # Copyright (C) 2016 Cesnet, z.s.p.o. # # This is free software, licensed under the GNU General Public License v2. @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk13 -PKG_VERSION:=13.18.5 +PKG_VERSION:=13.19.2 PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=4ad2a5ab1dd12cba5f37fca52961aa2a +PKG_HASH:=aab4bf95eea21a3864015d2a49a02e13e9f191f6a68acb0f7b1619da86ce3fb2 PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libxml2/host @@ -189,6 +189,7 @@ endif TARGET_CFLAGS+=$(TARGET_CPPFLAGS) CONFIGURE_ARGS+= \ + --disable-xmldoc \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-chan-alsa),--with-asound="$(STAGING_DIR)/usr",--without-asound) \ --without-execinfo \ --without-bluetooth \ @@ -226,8 +227,7 @@ CONFIGURE_ARGS+= \ --without-vorbis \ --without-vpb \ --with-z="$(STAGING_DIR)/usr" \ - --with-sounds-cache="$(DL_DIR)" \ - --enable-xmldoc + --with-sounds-cache="$(DL_DIR)" ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-res-pjproject)$(CONFIG_PACKAGE_$(PKG_NAME)-res-srtp),) CONFIGURE_ARGS+= \ @@ -416,7 +416,7 @@ $(eval $(call BuildAsterisk13Module,pbx-dundi,Dundi,provides Dundi Lookup servic $(eval $(call BuildAsterisk13Module,pbx-realtime,Realtime Switch,realtime switch support,,,pbx_realtime,,)) $(eval $(call BuildAsterisk13Module,pbx-spool,Call Spool,outgoing call spool support,,,pbx_spool,,)) $(eval $(call BuildAsterisk13Module,pgsql,PostgreSQL,PostgreSQL support,+libpq @!arc,cel_pgsql.conf cdr_pgsql.conf res_pgsql.conf,cel_pgsql cdr_pgsql res_config_pgsql,,)) -$(eval $(call BuildAsterisk13Module,pjsip,pjsip channel,the channel pjsip,+asterisk13-res-sorcery +asterisk13-res-pjproject +libpjsip +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsua +libpjsua2,pjsip.conf pjsip_notify.conf pjsip_wizard.conf,chan_pjsip func_pjsip_aor func_pjsip_contact func_pjsip_endpoint res_pjsip res_pjsip_acl res_pjsip_authenticator_digest res_pjsip_caller_id res_pjsip_config_wizard res_pjsip_dialog_info_body_generator res_pjsip_diversion res_pjsip_dlg_options res_pjsip_dtmf_info res_pjsip_empty_info res_pjsip_endpoint_identifier_anonymous res_pjsip_endpoint_identifier_ip res_pjsip_endpoint_identifier_user res_pjsip_exten_state res_pjsip_header_funcs res_pjsip_history res_pjsip_logger res_pjsip_messaging res_pjsip_mwi res_pjsip_mwi_body_generator res_pjsip_nat res_pjsip_notify res_pjsip_one_touch_record_info res_pjsip_outbound_authenticator_digest res_pjsip_outbound_publish res_pjsip_outbound_registration res_pjsip_path res_pjsip_pidf_body_generator res_pjsip_pidf_digium_body_supplement res_pjsip_pidf_eyebeam_body_supplement res_pjsip_publish_asterisk res_pjsip_pubsub res_pjsip_refer res_pjsip_registrar res_pjsip_registrar_expire res_pjsip_rfc3326 res_pjsip_sdp_rtp res_pjsip_send_to_voicemail res_pjsip_session res_pjsip_sips_contact res_pjsip_t38 res_pjsip_transport_management res_pjsip_transport_websocket res_pjsip_xpidf_body_generator,,)) +$(eval $(call BuildAsterisk13Module,pjsip,pjsip channel,the channel pjsip,+asterisk13-res-sorcery +asterisk13-res-pjproject +libpjsip +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsua +libpjsua2,pjsip.conf pjsip_notify.conf pjsip_wizard.conf,chan_pjsip func_pjsip_aor func_pjsip_contact func_pjsip_endpoint res_pjsip res_pjsip_acl res_pjsip_authenticator_digest res_pjsip_caller_id res_pjsip_config_wizard res_pjsip_dialog_info_body_generator res_pjsip_diversion res_pjsip_dlg_options res_pjsip_dtmf_info res_pjsip_empty_info res_pjsip_endpoint_identifier_anonymous res_pjsip_endpoint_identifier_ip res_pjsip_endpoint_identifier_user res_pjsip_exten_state res_pjsip_header_funcs res_pjsip_history res_pjsip_logger res_pjsip_messaging res_pjsip_mwi res_pjsip_mwi_body_generator res_pjsip_nat res_pjsip_notify res_pjsip_one_touch_record_info res_pjsip_outbound_authenticator_digest res_pjsip_outbound_publish res_pjsip_outbound_registration res_pjsip_path res_pjsip_pidf_body_generator res_pjsip_pidf_digium_body_supplement res_pjsip_pidf_eyebeam_body_supplement res_pjsip_publish_asterisk res_pjsip_pubsub res_pjsip_refer res_pjsip_registrar res_pjsip_registrar_expire res_pjsip_rfc3326 res_pjsip_sdp_rtp res_pjsip_send_to_voicemail res_pjsip_session res_pjsip_sips_contact res_pjsip_t38 res_pjsip_transport_websocket res_pjsip_xpidf_body_generator,,)) $(eval $(call BuildAsterisk13Module,res-adsi,Provide ADSI,Analog Display Services Interface capability,,,res_adsi,,)) $(eval $(call BuildAsterisk13Module,res-ael-share,Shareable AEL code,support for shareable AEL code mainly between internal and external modules,,,res_ael_share,,)) $(eval $(call BuildAsterisk13Module,res-agi,Asterisk Gateway Interface,Support for the Asterisk Gateway Interface extension,+asterisk13-res-speech,,res_agi,,)) diff --git a/net/asterisk-13.x/patches/001-disable-semaphores-check.patch b/net/asterisk-13.x/patches/001-disable-semaphores-check.patch index ba36dc7..277c06c 100644 --- a/net/asterisk-13.x/patches/001-disable-semaphores-check.patch +++ b/net/asterisk-13.x/patches/001-disable-semaphores-check.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -963,19 +963,6 @@ AC_LINK_IFELSE( +@@ -965,19 +965,6 @@ AC_LINK_IFELSE( ] ) diff --git a/net/asterisk-13.x/patches/002-undef-res-ninit.patch b/net/asterisk-13.x/patches/002-undef-res-ninit.patch index 110c07e..014f06f 100644 --- a/net/asterisk-13.x/patches/002-undef-res-ninit.patch +++ b/net/asterisk-13.x/patches/002-undef-res-ninit.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1290,7 +1290,6 @@ AC_LINK_IFELSE( +@@ -1299,7 +1299,6 @@ AC_LINK_IFELSE( #include ], [int foo = res_ninit(NULL);])], AC_MSG_RESULT(yes) diff --git a/net/asterisk-13.x/patches/003-disable-ast-xml-docs.patch b/net/asterisk-13.x/patches/003-disable-ast-xml-docs.patch deleted file mode 100644 index 12b3f73..0000000 --- a/net/asterisk-13.x/patches/003-disable-ast-xml-docs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/include/asterisk/xml.h -+++ b/include/asterisk/xml.h -@@ -246,10 +246,5 @@ struct ast_xml_node *ast_xml_xpath_get_f - */ - struct ast_xml_xpath_results *ast_xml_query(struct ast_xml_doc *doc, const char *xpath_str); - --/* Features using ast_xml_ */ --#ifdef HAVE_LIBXML2 --#define AST_XML_DOCS --#endif -- - #endif /* _ASTERISK_XML_H */ - diff --git a/net/asterisk-13.x/patches/050-musl-glob-compat.patch b/net/asterisk-13.x/patches/050-musl-glob-compat.patch index e7cc2b3..e7d50de 100644 --- a/net/asterisk-13.x/patches/050-musl-glob-compat.patch +++ b/net/asterisk-13.x/patches/050-musl-glob-compat.patch @@ -1,6 +1,6 @@ --- a/res/ael/ael.flex +++ b/res/ael/ael.flex -@@ -79,6 +79,12 @@ +@@ -79,6 +79,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi #if !defined(GLOB_ABORTED) #define GLOB_ABORTED GLOB_ABEND #endif @@ -13,10 +13,9 @@ #include "asterisk/logger.h" #include "asterisk/utils.h" -Only in asterisk-11.7.0: res/ael/ael.tab.o --- a/res/ael/ael_lex.c +++ b/res/ael/ael_lex.c -@@ -838,6 +838,12 @@ +@@ -838,6 +838,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi #if !defined(GLOB_ABORTED) #define GLOB_ABORTED GLOB_ABEND #endif diff --git a/net/asterisk-13.x/patches/052-musl-libcap.patch b/net/asterisk-13.x/patches/052-musl-libcap.patch index c50d24e..f0d6942 100644 --- a/net/asterisk-13.x/patches/052-musl-libcap.patch +++ b/net/asterisk-13.x/patches/052-musl-libcap.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -181,6 +181,9 @@ case "${host_os}" in +@@ -180,6 +180,9 @@ case "${host_os}" in linux-gnu*) OSARCH=linux-gnu ;; @@ -10,7 +10,7 @@ kfreebsd*-gnu) OSARCH=kfreebsd-gnu ;; -@@ -1414,9 +1417,11 @@ if test "${PBX_BFD}" = "0"; then +@@ -1423,9 +1426,11 @@ if test "${PBX_BFD}" = "0"; then AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_check_format], [bfd.h], [-ldl -liberty -lz]) fi -- 2.30.2