Hello, can everybody update the feed/telephony.git to the newest Asterisk and Libpri libary version ? For security reason it should be always the newest version.
I have attach a patch where i have do it. (some Asterisk patches are no more requiered, i add the stun-monitor module and i put all not used modules and config i a rest module for config and modules) Can everbody explain how the BuildAsterisk13Module work ? ... $(eval $(call BuildAsterisk13Module,subname,title,module description,module dependencies,conf files,module files,sound files,binary files)) ... my goal is it to build the Asterisk modules as until now ... $(eval $(call BuildAsterisk13Module,res-timing-pthread,pthread Timing Interface,,,,res_timing_pthread,,)) $(eval $(call BuildAsterisk13Module,res-timing-timerfd,Timerfd Timing Interface,,,,res_timing_timerfd,,)) $(eval $(call BuildAsterisk13Module,voicemail,Voicemail,voicemail related modules,+asterisk13-res-adsi +asterisk13-res-smdi,voicemail.conf,app_voicemail,vm-*,)) $(eval $(call BuildAsterisk13Module,res-stun-monitor,STUN monitoring,resource STUN Monitor,,res_stun_monitor.conf,res_stun_monitor,,)) ... after this procedure all *.so that are in ipkg-install but not inside ipkg-mips_24kc should put to a rest module Additional the mail Address: plonk-lede...@yandex.com can be deleted because i get no access to it.
From a658e6cd7e02f7b7c89d77bf0bac1464829a06be Mon Sep 17 00:00:00 2001 From: Plonk Bong <plonk-lede...@yandex.com> Date: Tue, 18 Apr 2017 23:43:36 +0000 Subject: [PATCH] update-asterisk-to-current-version --- net/asterisk-11.x/Makefile | 16 +++- net/asterisk-11.x/patches/051-musl-includes.patch | 42 --------- net/asterisk-13.x/Makefile | 8 +- .../patches/004-ifdef-missing-execinfo.patch | 101 --------------------- .../patches/040-fix-config-options.patch | 12 --- net/asterisk-13.x/patches/051-musl-includes.patch | 42 --------- 6 files changed, 18 insertions(+), 203 deletions(-) delete mode 100644 net/asterisk-11.x/patches/051-musl-includes.patch delete mode 100644 net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch delete mode 100644 net/asterisk-13.x/patches/040-fix-config-options.patch delete mode 100644 net/asterisk-13.x/patches/051-musl-includes.patch diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index 14d8aa5..d53e5e1 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11 -PKG_VERSION:=11.22.0 -PKG_RELEASE:=2 +PKG_VERSION:=11.25.1 +PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=35870c34fadbd2bcb284bd8521c6e689 +PKG_MD5SUM:=1b023b3b6230e8d7dac49afdc85a934e PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libxml2/host @@ -467,4 +467,12 @@ $(eval $(call BuildAsterisk11Module,res-timing-pthread,pthread Timing Interface, $(eval $(call BuildAsterisk11Module,res-timing-timerfd,Timerfd Timing Interface,,,,,res_timing_timerfd,)) $(eval $(call BuildAsterisk11Module,res-xmpp,XMPP client and component module,reference module for interfacting Asterisk directly as a client or component with XMPP server,+libiksemel +libopenssl,/etc/asterisk/xmpp.conf,xmpp.conf,res_xmpp,)) $(eval $(call BuildAsterisk11Module,res-realtime,Realtime Interface,,,,,res_realtime,)) -$(eval $(call BuildAsterisk11Module,voicemail,Voicemail,voicemail related modules,+asterisk11-res-adsi +asterisk11-res-smdi,/etc/asterisk/voicemail.conf,voicemail.conf,*voicemail,vm-*)) +$(eval $(call BuildAsterisk11Module,voicemail,Voicemail,voicemail related modules,+asterisk11-res-adsi +asterisk11-res-smdi,/etc/asterisk/voicemail.conf,voicemail.conf,*voicemail,vm-*)) + + + +$(eval $(call BuildAsterisk11Module,res-stun-monitor,STUN monitoring,resource STUN Monitor,,/etc/asterisk/res_stun_monitor.conf,res_stun_monitor.conf,res_stun_monitor,)) + +$(eval $(call BuildAsterisk11Module,rest-configs,rest configs,All config files that are not in any package,,/etc/asterisk/res_snmp.conf /etc/asterisk/dbsep.conf /etc/asterisk/muted.conf /etc/asterisk/osp.conf /etc/asterisk/cli.conf /etc/asterisk/vpb.conf /etc/asterisk/res_config_sqlite.conf /etc/asterisk/sla.conf /etc/asterisk/festival.conf /etc/asterisk/misdn.conf /etc/asterisk/say.conf /etc/asterisk/cli_aliases.conf /etc/asterisk/res_ldap.conf /etc/asterisk/res_curl.conf /etc/asterisk/app_skel.conf /etc/asterisk/res_corosync.conf /etc/asterisk/codecs.conf /etc/asterisk/gtalk.conf /etc/asterisk/phone.conf /etc/asterisk/followme.conf /etc/asterisk/cel_sqlite3_custom.conf /etc/asterisk/chan_mobile.conf /etc/asterisk/adsi.conf /etc/asterisk/config_test.conf /etc/asterisk/jabber.conf /etc/asterisk/amd.conf /etc/asterisk/dsp.conf /etc/asterisk/cli_permissions.conf /etc/asterisk/cel_custom.conf /etc/asterisk/console.conf /etc/asterisk/meetme.conf /etc/asterisk/agents.conf /etc/asterisk/alarmreceiver.conf /etc/asterisk/cel_tds.conf /etc/asterisk/app_mysql.conf /etc/asterisk/dnsmgr.conf /etc/asterisk/res_fax.conf,res_snmp.conf dbsep.conf muted.conf osp.conf cli.conf vpb.conf res_config_sqlite.conf sla.conf festival.conf misdn.conf say.conf cli_aliases.conf res_ldap.conf res_curl.conf app_skel.conf res_corosync.conf codecs.conf gtalk.conf phone.conf followme.conf cel_sqlite3_custom.conf chan_mobile.conf adsi.conf config_test.conf jabber.conf amd.conf dsp.conf cli_permissions.conf cel_custom.conf console.conf meetme.conf agents.conf alarmreceiver.conf cel_tds.conf app_mysql.conf dnsmgr.conf res_fax.conf,,)) + +$(eval $(call BuildAsterisk11Module,rest-modules,rest modules,All Asteriskmodules that are not in any package,+libpolarssl +libcurl,,,app_milliwatt func_md5 cel_manager func_sysinfo format_g719 res_format_attr_h263 cel_sqlite3_custom func_lock app_parkandannounce res_convert app_dumpchan func_iconv func_version app_getcpeid format_g723 cel_custom app_ices res_format_attr_silk func_rand func_sha1 app_zapateller app_mp3 app_waitforring app_test app_page res_security_log app_controlplayback format_jpeg func_sprintf app_flash app_amd func_hangupcause res_clialiases app_festival format_siren7 app_followme app_transfer func_dialgroup res_config_sqlite3 res_format_attr_h264 chan_phone app_userevent app_adsiprog app_channelredirect app_speech_utils app_celgenuserevent app_morsecode func_audiohookinherit app_softhangup res_mutestream func_aes func_dialplan app_image res_config_curl func_pitchshift app_dictate chan_multicast_rtp func_srv res_format_attr_celt func_config app_externalivr app_sendtext pbx_loopback res_fax func_callcompletion app_waitforsilence app_privacy res_limit func_jitterbuffer func_volume app_url func_frame_trace app_nbscat format_siren14,)) diff --git a/net/asterisk-11.x/patches/051-musl-includes.patch b/net/asterisk-11.x/patches/051-musl-includes.patch deleted file mode 100644 index 6bee31c..0000000 --- a/net/asterisk-11.x/patches/051-musl-includes.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/include/asterisk/compat.h -+++ b/include/asterisk/compat.h -@@ -68,7 +68,7 @@ - #endif - - #ifndef AST_POLL_COMPAT --#include <sys/poll.h> -+#include <poll.h> - #else - #include "asterisk/poll-compat.h" - #endif ---- a/include/asterisk/poll-compat.h -+++ b/include/asterisk/poll-compat.h -@@ -83,7 +83,7 @@ - - #ifndef AST_POLL_COMPAT - --#include <sys/poll.h> -+#include <poll.h> - - #define ast_poll(a, b, c) poll(a, b, c) - ---- a/main/ast_expr2.c -+++ b/main/ast_expr2.c -@@ -93,6 +93,7 @@ - - #include "asterisk.h" - -+#include <sys/cdefs.h> - #include <sys/types.h> - #include <stdio.h> - ---- a/main/ast_expr2.y -+++ b/main/ast_expr2.y -@@ -14,6 +14,7 @@ - - #include "asterisk.h" - -+#include <sys/cdefs.h> - #include <sys/types.h> - #include <stdio.h> - diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index b2d1275..1eca87c 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk13 -PKG_VERSION:=13.9.1 +PKG_VERSION:=13.15.0 PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=76c42992a79f41ec467ed20500e8b249 +PKG_MD5SUM:=9f72e200b01e7ccc7e8d44bb5d9ff3c7 PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libxml2/host @@ -418,4 +418,8 @@ $(eval $(call BuildAsterisk13Module,res-timing-dahdi,DAHDI Timing Interface,,+as $(eval $(call BuildAsterisk13Module,res-timing-pthread,pthread Timing Interface,,,,res_timing_pthread,,)) $(eval $(call BuildAsterisk13Module,res-timing-timerfd,Timerfd Timing Interface,,,,res_timing_timerfd,,)) $(eval $(call BuildAsterisk13Module,voicemail,Voicemail,voicemail related modules,+asterisk13-res-adsi +asterisk13-res-smdi,voicemail.conf,app_voicemail,vm-*,)) +$(eval $(call BuildAsterisk13Module,res-stun-monitor,STUN monitoring,resource STUN Monitor,,res_stun_monitor.conf,res_stun_monitor,,)) +$(eval $(call BuildAsterisk13Module,rest-configs,rest configs,All config files that are not in any package,, pjsip_wizard.conf xmpp.conf res_snmp.conf dbsep.conf res_config_mysql.conf mgcp.conf cdr_tds.conf cdr_mysql.conf muted.conf statsd.conf osp.conf cli.conf vpb.conf res_pktccops.conf res_config_sqlite.conf sla.conf festival.conf misdn.conf say.conf cli_aliases.conf res_ldap.conf res_curl.conf test_sorcery.conf pjproject.conf app_skel.conf ooh323.conf cdr_sqlite3_custom.conf res_corosync.conf codecs.conf stasis.conf phone.conf hep.conf followme.conf cel_sqlite3_custom.conf chan_mobile.conf adsi.conf config_test.conf sorcery.conf amd.conf dsp.conf cli_permissions.conf cel_custom.conf motif.conf console.conf meetme.conf agents.conf alarmreceiver.conf cel_tds.conf ari.conf app_mysql.conf dnsmgr.conf res_fax.conf,,,)) + +$(eval $(call BuildAsterisk13Module,rest-modules,rest modules,All Asteriskmodules that are not in any package,+libpjsip +libpolarssl +libcurl +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsua +libpjsua2 +unixodbc,, app_bridgewait app_milliwatt func_md5 func_pjsip_aor cel_manager func_sysinfo res_stasis_playback format_g719 res_format_attr_h263 cel_sqlite3_custom func_pjsip_contact res_statsd func_lock res_ari_device_states res_pjsip_history res_convert res_stasis_recording res_ari_asterisk app_dumpchan res_ari_endpoints res_hep_rtcp chan_mgcp func_iconv res_pjsip_empty_info func_version func_talkdetect chan_bridge_media res_pjproject func_holdintercept app_getcpeid format_g723 cel_custom res_stasis res_manager_devicestate app_ices res_format_attr_silk res_pjsip_phoneprov_provider func_rand func_sha1 app_zapateller app_mp3 res_hep_pjsip app_waitforring app_test res_stasis_snoop app_directory app_page res_security_log app_controlplayback res_format_attr_siren14 format_jpeg res_format_attr_siren7 res_pjsip_dlg_options res_ari_playbacks func_sprintf app_flash app_amd func_hangupcause res_clialiases res_ari_sounds app_festival format_siren7 app_followme app_transfer func_dialgroup res_pjsip_config_wizard res_config_sqlite3 res_format_attr_h264 chan_phone res_ari app_userevent res_pjsip_sips_contact func_periodic_hook app_adsiprog app_channelredirect app_speech_utils app_celgenuserevent app_morsecode func_audiohookinherit res_manager_presencestate app_softhangup res_mutestream func_aes res_format_attr_opus res_ari_events func_dialplan res_sorcery_memory_cache app_image res_config_curl func_pitchshift res_pjsip_transport_management res_format_attr_vp8 app_dictate chan_rtp res_ari_applications func_srv res_ari_bridges res_format_attr_celt res_format_attr_g729 res_ari_model app_stasis func_config app_externalivr app_sendtext res_ari_channels func_sorcery app_agent_pool pbx_loopback res_stasis_device_state res_fax res_odbc_transaction func_callcompletion app_waitforsilence res_ari_recordings app_privacy res_limit func_jitterbuffer func_volume app_url func_frame_trace res_stasis_answer app_nbscat format_siren14,,)) \ No newline at end of file diff --git a/net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch b/net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch deleted file mode 100644 index 264eb41..0000000 --- a/net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- a/include/asterisk/lock.h -+++ b/include/asterisk/lock.h -@@ -51,9 +51,11 @@ - #include <pthread.h> - #include <time.h> - #include <sys/param.h> -+#ifndef __UCLIBC__ - #ifdef HAVE_BKTR - #include <execinfo.h> - #endif -+#endif - - #ifndef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK - #include "asterisk/time.h" -@@ -86,11 +88,15 @@ - #define __AST_RWLOCK_INIT_VALUE {0} - #endif /* HAVE_PTHREAD_RWLOCK_INITIALIZER */ - -+#ifndef __UCLIBC__ - #ifdef HAVE_BKTR - #define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, {{{ 0 }}}, PTHREAD_MUTEX_INIT_VALUE } - #else - #define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, PTHREAD_MUTEX_INIT_VALUE } - #endif -+#else -+#define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, PTHREAD_MUTEX_INIT_VALUE } -+#endif - - #define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, NULL, 1 } - #define AST_MUTEX_INIT_VALUE_NOTRACKING { PTHREAD_MUTEX_INIT_VALUE, NULL, 0 } -@@ -114,9 +120,11 @@ struct ast_lock_track { - int reentrancy; - const char *func[AST_MAX_REENTRANCY]; - pthread_t thread[AST_MAX_REENTRANCY]; -+#ifndef __UCLIBC__ - #ifdef HAVE_BKTR - struct ast_bt backtrace[AST_MAX_REENTRANCY]; - #endif -+#endif - pthread_mutex_t reentr_mutex; - }; - -@@ -241,6 +249,7 @@ enum ast_lock_type { - * on the lock. ast_mark_lock_acquired() will mark it as held by this thread. - */ - #if !defined(LOW_MEMORY) -+#ifndef HAVE_BKTR - #ifdef HAVE_BKTR - void ast_store_lock_info(enum ast_lock_type type, const char *filename, - int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt); -@@ -248,14 +257,22 @@ void ast_store_lock_info(enum ast_lock_t - void ast_store_lock_info(enum ast_lock_type type, const char *filename, - int line_num, const char *func, const char *lock_name, void *lock_addr); - #endif /* HAVE_BKTR */ -+#else -+void ast_store_lock_info(enum ast_lock_type type, const char *filename, -+ int line_num, const char *func, const char *lock_name, void *lock_addr); -+#endif - - #else - -+#ifndef __UCLIBC__ - #ifdef HAVE_BKTR - #define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS,BUD) - #else - #define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS) - #endif /* HAVE_BKTR */ -+#else -+#define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS) -+#endif - #endif /* !defined(LOW_MEMORY) */ - - /*! -@@ -283,19 +300,27 @@ void ast_mark_lock_failed(void *lock_add - * be removed from the current thread's lock info struct. - */ - #if !defined(LOW_MEMORY) -+#ifndef __UCLIBC__ - #ifdef HAVE_BKTR - void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt); - #else - void ast_remove_lock_info(void *lock_addr); - #endif /* HAVE_BKTR */ -+#else -+void ast_remove_lock_info(void *lock_addr); -+#endif - void ast_suspend_lock_info(void *lock_addr); - void ast_restore_lock_info(void *lock_addr); - #else -+#ifndef __UCLIBC - #ifdef HAVE_BKTR - #define ast_remove_lock_info(ignore,me) - #else - #define ast_remove_lock_info(ignore) - #endif /* HAVE_BKTR */ -+#else -+#define ast_remove_lock_info(ignore) -+#endif - #define ast_suspend_lock_info(ignore); - #define ast_restore_lock_info(ignore); - #endif /* !defined(LOW_MEMORY) */ diff --git a/net/asterisk-13.x/patches/040-fix-config-options.patch b/net/asterisk-13.x/patches/040-fix-config-options.patch deleted file mode 100644 index e3ed33a..0000000 --- a/net/asterisk-13.x/patches/040-fix-config-options.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/main/config_options.c -+++ b/main/config_options.c -@@ -198,8 +198,8 @@ static int link_option_to_types(struct a - #ifdef AST_DEVMODE - opt->doc_unavailable = 1; - #endif --#endif - } -+#endif - } - /* The container(s) should hold the only ref to opt */ - ao2_ref(opt, -1); diff --git a/net/asterisk-13.x/patches/051-musl-includes.patch b/net/asterisk-13.x/patches/051-musl-includes.patch deleted file mode 100644 index 6bee31c..0000000 --- a/net/asterisk-13.x/patches/051-musl-includes.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/include/asterisk/compat.h -+++ b/include/asterisk/compat.h -@@ -68,7 +68,7 @@ - #endif - - #ifndef AST_POLL_COMPAT --#include <sys/poll.h> -+#include <poll.h> - #else - #include "asterisk/poll-compat.h" - #endif ---- a/include/asterisk/poll-compat.h -+++ b/include/asterisk/poll-compat.h -@@ -83,7 +83,7 @@ - - #ifndef AST_POLL_COMPAT - --#include <sys/poll.h> -+#include <poll.h> - - #define ast_poll(a, b, c) poll(a, b, c) - ---- a/main/ast_expr2.c -+++ b/main/ast_expr2.c -@@ -93,6 +93,7 @@ - - #include "asterisk.h" - -+#include <sys/cdefs.h> - #include <sys/types.h> - #include <stdio.h> - ---- a/main/ast_expr2.y -+++ b/main/ast_expr2.y -@@ -14,6 +14,7 @@ - - #include "asterisk.h" - -+#include <sys/cdefs.h> - #include <sys/types.h> - #include <stdio.h> - -- 2.7.4
_______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
