From 72586338be6dc6b8e0b2df88d45760e617d62afe Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Mon, 26 Feb 2018 23:08:01 +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 | 14 +++++++------- .../patches/001-disable-semaphores-check.patch | 3 +-- .../patches/002-undef-res-ninit.patch | 3 +-- .../patches/003-disable-ast-xml-docs.patch | 13 ------------- 4 files changed, 9 insertions(+), 24 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 6c6c2dd..294fcf9 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_RELEASE:=2 +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_MD5SUM:=3906b9fd37d02e93c72f0030fd7919c6 PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libxml2/host @@ -190,6 +190,7 @@ endif TARGET_CFLAGS+=$(TARGET_CPPFLAGS) CONFIGURE_ARGS+= \ + --disable-xmldoc \ --without-execinfo \ --without-bluetooth \ --without-cap \ @@ -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+= \ @@ -413,7 +413,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,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 87eee5e..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 -@@ -927,19 +927,6 @@ AC_LINK_IFELSE( +@@ -965,19 +965,6 @@ AC_LINK_IFELSE( ] ) @@ -20,4 +20,3 @@ LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" if test "${ac_cv_pthread_rwlock_timedwrlock}" = "yes"; then - 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 6ef040a..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 -@@ -1261,7 +1261,6 @@ AC_LINK_IFELSE( +@@ -1299,7 +1299,6 @@ AC_LINK_IFELSE( #include ], [int foo = res_ninit(NULL);])], AC_MSG_RESULT(yes) @@ -8,4 +8,3 @@ AC_SEARCH_LIBS(res_9_ndestroy, resolv) AC_MSG_CHECKING(for res_ndestroy) AC_LINK_IFELSE( - 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 */ - -- 2.30.2