From 1d697f8bfc4ca3f690a13f48b63fdcdadb1d08c7 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 22 Dec 2017 22:59:22 +0100 Subject: [PATCH 1/4] asterisk-13.x: add module dependencies Add some dependencies to select modules. Dependencies confirmed by menuselect. Also fix description of res_monitor. Signed-off-by: Sebastian Kemper --- net/asterisk-13.x/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index 381d88d..32ec934 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -591,7 +591,7 @@ $(eval $(call BuildAsterisk13Module,func-lock,Dialplan mutexes,dialplan mutexes, $(eval $(call BuildAsterisk13Module,func-math,Math functions,Math functions,,,func_math,,)) $(eval $(call BuildAsterisk13Module,func-md5,MD5 digest dialplan functions,MD5 digest related dialplan functions,,,func_md5,,)) $(eval $(call BuildAsterisk13Module,func-module,Simple module check function,Simple module check function,,,func_module,,)) -$(eval $(call BuildAsterisk13Module,func-periodic-hook,Periodic dialplan hooks,Execute a periodic dialplan hook into the audio of a call,,,func_periodic_hook,,)) +$(eval $(call BuildAsterisk13Module,func-periodic-hook,Periodic dialplan hooks,Execute a periodic dialplan hook into the audio of a call,+$(PKG_NAME)-app-chanspy +$(PKG_NAME)-func-cut +$(PKG_NAME)-func-groupcount +$(PKG_NAME)-func-uri,,func_periodic_hook,,)) $(eval $(call BuildAsterisk13Module,func-pitchshift,Audio effects dialplan functions,pitch shift audio effect,,,func_pitchshift,,)) $(eval $(call BuildAsterisk13Module,func-presencestate,Hinted presence state,Gets or sets a presence state in the dialplan,,,func_presencestate,,)) $(eval $(call BuildAsterisk13Module,func-rand,RAND dialplan function,RAND dialplan function,,,func_rand,,)) @@ -609,7 +609,7 @@ $(eval $(call BuildAsterisk13Module,func-version,Get Asterisk version/build info $(eval $(call BuildAsterisk13Module,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,func_vmcount,,)) $(eval $(call BuildAsterisk13Module,func-volume,Technology independent volume control,technology independent volume control,,,func_volume,,)) $(eval $(call BuildAsterisk13Module,odbc,ODBC,ODBC support,+libpthread +libc +unixodbc,cdr_adaptive_odbc.conf cdr_odbc.conf cel_odbc.conf func_odbc.conf res_odbc.conf,cdr_adaptive_odbc cdr_odbc cel_odbc func_odbc res_config_odbc res_odbc res_odbc_transaction,,)) -$(eval $(call BuildAsterisk13Module,pbx-ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic,,extensions.ael,pbx_ael,,)) +$(eval $(call BuildAsterisk13Module,pbx-ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic,+$(PKG_NAME)-res-ael-share,extensions.ael,pbx_ael,,)) $(eval $(call BuildAsterisk13Module,pbx-dundi,Dundi,provides Dundi Lookup service for Asterisk,,dundi.conf,pbx_dundi,,)) $(eval $(call BuildAsterisk13Module,pbx-loopback,Loopback switch,loopback PBX module,,,pbx_loopback,,)) $(eval $(call BuildAsterisk13Module,pbx-lua,Lua,provides Lua resources for Asterisk,+liblua,extensions.lua,pbx_lua,,)) @@ -664,12 +664,12 @@ $(eval $(call BuildAsterisk13Module,res-http-websocket,HTTP websocket support,We $(eval $(call BuildAsterisk13Module,res-limit,Resource limits,resource limits,,,res_limit,,)) $(eval $(call BuildAsterisk13Module,res-manager-devicestate,Device state topic forwarder,list the current known device states,,,res_manager_devicestate,,)) $(eval $(call BuildAsterisk13Module,res-manager-presencestate,Presence state topic forwarder,list the current known presence states,,,res_manager_presencestate,,)) -$(eval $(call BuildAsterisk13Module,res-monitor,Provide Monitor,Cryptographic Signature capability,,,res_monitor,,)) +$(eval $(call BuildAsterisk13Module,res-monitor,PBX channel monitoring,call monitoring resource,+$(PKG_NAME)-func-periodic-hook,,res_monitor,,)) $(eval $(call BuildAsterisk13Module,res-musiconhold,MOH,Music On Hold support,,musiconhold.conf,res_musiconhold,,)) $(eval $(call BuildAsterisk13Module,res-mutestream,Mute audio stream resources,MUTESTREAM audiohooks,,,res_mutestream,,)) $(eval $(call BuildAsterisk13Module,res-mwi-external,Core external MWI resource,core external MWI resource,,,res_mwi_external,,)) $(eval $(call BuildAsterisk13Module,res-mwi-external-ami,AMI for external MWI,AMI wrapper for external MWI,+$(PKG_NAME)-res-mwi-external,,res_mwi_external_ami,,)) -$(eval $(call BuildAsterisk13Module,res-parking,Phone Parking,Phone Parking application,,res_parking.conf,res_parking,,)) +$(eval $(call BuildAsterisk13Module,res-parking,Phone Parking,Phone Parking application,+$(PKG_NAME)-bridge-holding,res_parking.conf,res_parking,,)) $(eval $(call BuildAsterisk13Module,res-phoneprov,Phone Provisioning,Phone provisioning application for the asterisk internal http server,,phoneprov.conf,res_phoneprov,,)) $(eval $(call BuildAsterisk13Module,res-pjsip-phoneprov,PJSIP Phone Provisioning,PJSIP Phone Provisioning,+asterisk13-pjsip +asterisk13-res-phoneprov,,res_pjsip_phoneprov_provider,,)) $(eval $(call BuildAsterisk13Module,res-pjproject,Bridge PJPROJECT to Asterisk logging,,+libpj +libpjlib-util +libpjmedia +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +libpjsua +libpjsua2 +libsrtp2,pjproject.conf,res_pjproject,,)) From 5180bf85761da863b963e3e163a2071c90b5cf54 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 22 Dec 2017 23:02:02 +0100 Subject: [PATCH 2/4] asterisk-13.x: bump to 13.18.4 Signed-off-by: Sebastian Kemper --- net/asterisk-13.x/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index 32ec934..f67cc83 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk13 -PKG_VERSION:=13.18.3 -PKG_RELEASE:=2 +PKG_VERSION:=13.18.4 +PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases -PKG_HASH:=728db9e4ef34e3f0382c77e5eaa8780b52655377a0db395274667b73cf3a6a1d +PKG_HASH:=a14c2132eaa4f581452cd6d4d5094639e67a28eb70102458c796660d704115e4 PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libxml2/host From cd82cbd06b02b2a6068563f3d4c69c8a1bb395be Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 22 Dec 2017 23:04:11 +0100 Subject: [PATCH 3/4] asterisk-15.x: add module dependencies Add some dependencies to select modules. Dependencies confirmed by menuselect. Also fix description of res_monitor. Signed-off-by: Sebastian Kemper --- net/asterisk-15.x/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/asterisk-15.x/Makefile b/net/asterisk-15.x/Makefile index 12c261c..a379159 100644 --- a/net/asterisk-15.x/Makefile +++ b/net/asterisk-15.x/Makefile @@ -602,7 +602,7 @@ $(eval $(call BuildAsterisk15Module,func-lock,Dialplan mutexes,dialplan mutexes, $(eval $(call BuildAsterisk15Module,func-math,Math functions,Math functions,,,func_math,,)) $(eval $(call BuildAsterisk15Module,func-md5,MD5 digest dialplan functions,MD5 digest related dialplan functions,,,func_md5,,)) $(eval $(call BuildAsterisk15Module,func-module,Simple module check function,Simple module check function,,,func_module,,)) -$(eval $(call BuildAsterisk15Module,func-periodic-hook,Periodic dialplan hooks,Execute a periodic dialplan hook into the audio of a call,,,func_periodic_hook,,)) +$(eval $(call BuildAsterisk15Module,func-periodic-hook,Periodic dialplan hooks,Execute a periodic dialplan hook into the audio of a call,+$(PKG_NAME)-app-chanspy +$(PKG_NAME)-func-cut +$(PKG_NAME)-func-groupcount +$(PKG_NAME)-func-uri,,func_periodic_hook,,)) $(eval $(call BuildAsterisk15Module,func-pitchshift,Audio effects dialplan functions,pitch shift audio effect,,,func_pitchshift,,)) $(eval $(call BuildAsterisk15Module,func-presencestate,Hinted presence state,Gets or sets a presence state in the dialplan,,,func_presencestate,,)) $(eval $(call BuildAsterisk15Module,func-rand,RAND dialplan function,RAND dialplan function,,,func_rand,,)) @@ -620,7 +620,7 @@ $(eval $(call BuildAsterisk15Module,func-version,Get Asterisk version/build info $(eval $(call BuildAsterisk15Module,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,func_vmcount,,)) $(eval $(call BuildAsterisk15Module,func-volume,Technology independent volume control,technology independent volume control,,,func_volume,,)) $(eval $(call BuildAsterisk15Module,odbc,ODBC,ODBC support,+libpthread +libc +unixodbc,cdr_adaptive_odbc.conf cdr_odbc.conf cel_odbc.conf func_odbc.conf res_odbc.conf,cdr_adaptive_odbc cdr_odbc cel_odbc func_odbc res_config_odbc res_odbc res_odbc_transaction,,)) -$(eval $(call BuildAsterisk15Module,pbx-ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic,,extensions.ael,pbx_ael,,)) +$(eval $(call BuildAsterisk15Module,pbx-ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic,+$(PKG_NAME)-res-ael-share,extensions.ael,pbx_ael,,)) $(eval $(call BuildAsterisk15Module,pbx-dundi,Dundi,provides Dundi Lookup service for Asterisk,,dundi.conf,pbx_dundi,,)) $(eval $(call BuildAsterisk15Module,pbx-loopback,Loopback switch,loopback PBX module,,,pbx_loopback,,)) $(eval $(call BuildAsterisk15Module,pbx-lua,Lua,provides Lua resources for Asterisk,+liblua,extensions.lua,pbx_lua,,)) @@ -677,12 +677,12 @@ $(eval $(call BuildAsterisk15Module,res-http-websocket,HTTP websocket support,We $(eval $(call BuildAsterisk15Module,res-limit,Resource limits,resource limits,,,res_limit,,)) $(eval $(call BuildAsterisk15Module,res-manager-devicestate,Device state topic forwarder,list the current known device states,,,res_manager_devicestate,,)) $(eval $(call BuildAsterisk15Module,res-manager-presencestate,Presence state topic forwarder,list the current known presence states,,,res_manager_presencestate,,)) -$(eval $(call BuildAsterisk15Module,res-monitor,Provide Monitor,Cryptographic Signature capability,,,res_monitor,,)) +$(eval $(call BuildAsterisk15Module,res-monitor,PBX channel monitoring,call monitoring resource,,,res_monitor,,)) $(eval $(call BuildAsterisk15Module,res-musiconhold,MOH,Music On Hold support,,musiconhold.conf,res_musiconhold,,)) $(eval $(call BuildAsterisk15Module,res-mutestream,Mute audio stream resources,MUTESTREAM audiohooks,,,res_mutestream,,)) $(eval $(call BuildAsterisk15Module,res-mwi-external,Core external MWI resource,core external MWI resource,,,res_mwi_external,,)) $(eval $(call BuildAsterisk15Module,res-mwi-external-ami,AMI for external MWI,AMI wrapper for external MWI,+$(PKG_NAME)-res-mwi-external,,res_mwi_external_ami,,)) -$(eval $(call BuildAsterisk15Module,res-parking,Phone Parking,Phone Parking application,,res_parking.conf,res_parking,,)) +$(eval $(call BuildAsterisk15Module,res-parking,Phone Parking,Phone Parking application,+$(PKG_NAME)-bridge-holding,res_parking.conf,res_parking,,)) $(eval $(call BuildAsterisk15Module,res-phoneprov,Phone Provisioning,Phone provisioning application for the asterisk internal http server,,phoneprov.conf,res_phoneprov,,)) $(eval $(call BuildAsterisk15Module,res-pjsip-phoneprov,PJSIP Phone Provisioning,PJSIP Phone Provisioning,+asterisk15-pjsip +asterisk15-res-phoneprov,,res_pjsip_phoneprov_provider,,)) $(eval $(call BuildAsterisk15Module,res-pjproject,Bridge PJPROJECT to Asterisk logging,,+libpj +libpjlib-util +libpjmedia +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +libpjsua +libpjsua2 +libsrtp2,pjproject.conf,res_pjproject,,)) From b25a6bbf5df91fb0c9ee3fbcbcb7afa005ade6d8 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 22 Dec 2017 23:05:59 +0100 Subject: [PATCH 4/4] asterisk-15.x: bump to 15.1.4 Signed-off-by: Sebastian Kemper --- net/asterisk-15.x/Makefile | 6 +++--- net/asterisk-15.x/patches/100-build-reproducibly.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/asterisk-15.x/Makefile b/net/asterisk-15.x/Makefile index a379159..4540276 100644 --- a/net/asterisk-15.x/Makefile +++ b/net/asterisk-15.x/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk15 -PKG_VERSION:=15.1.3 -PKG_RELEASE:=2 +PKG_VERSION:=15.1.4 +PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases -PKG_HASH:=cfd7c49e42878b4f7de5af7baa9f43d39476f70d1848e5f158409400c31a0c3a +PKG_HASH:=8ce3ffbff473410ae0ed0472adea22b01a20f9ec784ebfec51393282028acc16 PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libxml2/host diff --git a/net/asterisk-15.x/patches/100-build-reproducibly.patch b/net/asterisk-15.x/patches/100-build-reproducibly.patch index 23e1f01..9f07666 100644 --- a/net/asterisk-15.x/patches/100-build-reproducibly.patch +++ b/net/asterisk-15.x/patches/100-build-reproducibly.patch @@ -1,6 +1,6 @@ --- a/build_tools/make_build_h +++ b/build_tools/make_build_h -@@ -5,6 +5,14 @@ +@@ -5,6 +5,14 @@ MACHINE=`uname -m | sed 's/\\\\/\\\\\\\ OS=`uname -s` USER=`id | awk -F")" '{print $1}'| awk -F"(" '{print $2}' | sed 's/\\\\/\\\\\\\\/g'` DATE=`date -u "+%Y-%m-%d %H:%M:%S"` @@ -17,7 +17,7 @@ * build.h --- a/Makefile +++ b/Makefile -@@ -465,7 +465,7 @@ +@@ -464,7 +464,7 @@ doc/core-en_US.xml: makeopts .lastclean @echo "" >> $@ @for x in $(MOD_SUBDIRS); do \ printf "$$x " ; \