Merge pull request #586 from micmac1/ast18

asterisk: add Asterisk 18 LTS

net/asterisk-chan-dongle/Makefile

@@ -13,7 +13,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/wdoekes/asterisk-chan-dongle.git
 PKG_SOURCE_VERSION:=328b2b7ded3b3c59c2e6c7e7afca6b0ac6f146ce
 PKG_SOURCE_DATE=2020-05-28
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 PKG_MIRROR_HASH:=b0af444840340722ecee111a7b1f819de441acf290799ae11bc18e16569c6388
 
 PKG_FIXUP:=autoreconf
@@ -28,40 +28,24 @@ include $(INCLUDE_DIR)/package.mk
 # asterisk-chan-dongle needs iconv
 include $(INCLUDE_DIR)/nls.mk
 
-define Package/asterisk-chan-dongle/Default
+define Package/asterisk-chan-dongle
   SUBMENU:=Telephony
   SECTION:=net
   CATEGORY:=Network
   URL:=https://github.com/wdoekes/asterisk-chan-dongle
-  DEPENDS:=$(ICONV_DEPENDS) +libsqlite3
+  DEPENDS:=asterisk $(ICONV_DEPENDS) +libsqlite3
   TITLE:=Huawei UMTS 3G dongle support
 endef
 
-define Package/asterisk16-chan-dongle
+define Package/asterisk-chan-dongle/description
-$(call Package/asterisk-chan-dongle/Default)
-  DEPENDS+=asterisk16
-  VARIANT:=asterisk16
-endef
-
-define Package/description/Default
  Asterisk channel driver for Huawei UMTS 3G dongle.
 endef
 
-Package/asterisk16-chan-dongle/description = $(Package/description/Default)
-
-ifeq ($(BUILD_VARIANT),asterisk16)
-  CHAN_DONGLE_AST_HEADERS:=$(STAGING_DIR)/usr/include/asterisk-16/include
-  CONFIGURE_ARGS+= \
-	  --with-astversion=16
-endif
-
 CONFIGURE_ARGS+= \
-	--with-asterisk=$(CHAN_DONGLE_AST_HEADERS) \
+	--with-asterisk=$(STAGING_DIR)/usr/include \
+	--with-astversion=18 \
 	--with-iconv=$(ICONV_PREFIX)/include
 
-TARGET_CFLAGS+= \
-	-I$(CHAN_DONGLE_AST_HEADERS)
-
 MAKE_FLAGS+=LD="$(TARGET_CC)"
 
 CONFIGURE_VARS += \
@@ -69,19 +53,15 @@ CONFIGURE_VARS += \
 	ac_cv_type_size_t=yes \
 	ac_cv_type_ssize_t=yes
 
-define Package/conffiles/Default
+define Package/asterisk-chan-dongle/conffiles
 /etc/asterisk/dongle.conf
 endef
 
-Package/asterisk16-chan-dongle/conffiles = $(Package/conffiles/Default)
+define Package/asterisk-chan-dongle/install
-
-define Package/Install/Default
 	$(INSTALL_DIR) $(1)/etc/asterisk
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/dongle.conf $(1)/etc/asterisk
 	$(INSTALL_DIR) $(1)$(MODULES_DIR)
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/chan_dongle.so $(1)$(MODULES_DIR)
 endef
 
-Package/asterisk16-chan-dongle/install = $(Package/Install/Default)
+$(eval $(call BuildPackage,asterisk-chan-dongle))
-
-$(eval $(call BuildPackage,asterisk16-chan-dongle))

net/asterisk-chan-lantiq/Makefile

@@ -7,15 +7,13 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=asterisk16-chan-lantiq
+PKG_NAME:=asterisk-chan-lantiq
-PKG_VERSION:=20190803
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=1d940b38cde0348dfe129d2b764e6faee440c45b
-PKG_MIRROR_HASH:=ff838ff2a4c5353fadd73806e1513f59f224914582b6ba004165712268bc94e5
+PKG_SOURCE_DATE:=2019-08-03
+PKG_MIRROR_HASH:=f8aa4cccc90ad8503c94ddb03c4af7870f3262b99f1dca198c0e8d351aa96588
 PKG_SOURCE_PROTO:=git
 
 PKG_LICENSE:=GPL-2.0
@@ -32,11 +30,11 @@ define Package/$(PKG_NAME)
   CATEGORY:=Network
   TITLE:=Lantiq channel driver
   URL:=https://github.com/kochstefan/asterisk_channel_lantiq
-  DEPENDS:=+asterisk16 +kmod-ltq-vmmc
+  DEPENDS:=+asterisk +kmod-ltq-vmmc
 endef
 
 define Package/$(PKG_NAME)/description
-An implementation of a Lantiq TAPI channel driver for Asterisk 16.
+An implementation of a Lantiq TAPI channel driver for Asterisk.
 endef
 
 define Package/$(PKG_NAME)/conffiles
@@ -48,7 +46,6 @@ define Build/Compile
 	$(TARGET_CC) -o chan_lantiq.o -c chan_lantiq.c -MD -MT chan_lantiq.o \
 		-MF .chan_lantiq.o.d -MP -pthread \
 		$(TARGET_CFLAGS) -DAST_MODULE_SELF_SYM=__internal_chan_lantiq_self \
-		-I$(STAGING_DIR)/usr/include/asterisk-16/include \
 		$(TARGET_CPPFLAGS) \
 		-Wall -Wstrict-prototypes -Wmissing-prototypes \
 		-Wmissing-declarations $(FPIC) -DAST_MODULE=\"chan_lantiq\" && \
@@ -59,7 +56,7 @@ endef
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_CONF) \
+	$(INSTALL_DATA) \
 		$(PKG_BUILD_DIR)/src/configs/samples/lantiq.conf.sample \
 		$(1)/etc/asterisk/lantiq.conf
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules

net/asterisk-chan-sccp/Makefile

@@ -8,15 +8,13 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=chan-sccp
+PKG_NAME:=asterisk-chan-sccp
-PKG_VERSION:=v4.3.2-20190730
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=a61c6d2cecdd149db767307cd71b736e77913251
-PKG_SOURCE_VERSION:=08c9457b131e2e7fea92b2dfea786abfd171a5fe
+PKG_SOURCE_DATE:=2020-10-26
-PKG_MIRROR_HASH:=be86af36c2ba4524d392fab1b88e4f4ceaaea6678dd814443ae5636337ed4c77
+PKG_MIRROR_HASH:=b879a44b855c5a891558781967abff0cb9350d8765c1b4f7774a4fae4cfeda4c
 PKG_SOURCE_PROTO:=git
 
 PKG_FIXUP:=autoreconf
@@ -27,65 +25,47 @@ PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 PKG_INSTALL:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 # chan-sccp needs iconv
 include $(INCLUDE_DIR)/nls.mk
 
-define Package/chan-sccp/Default
+define Package/asterisk-chan-sccp
   SUBMENU:=Telephony
   SECTION:=net
   CATEGORY:=Network
   TITLE:=SCCP channel support
   URL:=https://github.com/chan-sccp/chan-sccp
-  DEPENDS:=$(ICONV_DEPENDS) +libltdl
+  DEPENDS:=asterisk $(ICONV_DEPENDS) +libltdl \
+	  +asterisk-bridge-holding \
+	  +asterisk-bridge-native-rtp \
+	  +asterisk-bridge-simple \
+	  +asterisk-bridge-softmix \
+	  +asterisk-res-stasis-device-state
+  CONFLICTS:=asterisk-chan-skinny
 endef
 
-define Package/asterisk16-chan-sccp
+define Package/asterisk-chan-sccp/description
-$(call Package/chan-sccp/Default)
-  DEPENDS += asterisk16 \
-	  +asterisk16-bridge-holding \
-	  +asterisk16-bridge-native-rtp \
-	  +asterisk16-bridge-simple \
-	  +asterisk16-bridge-softmix \
-	  +asterisk16-res-stasis-device-state \
-	  +asterisk16-voicemail
-  VARIANT:=asterisk16
-  CONFLICTS:=asterisk16-chan-skinny
-endef
-
-define Package/description/Default
 Replacement for the SCCP channel driver (chan_skinny) in Asterisk.
 Extended features include shared lines, presence / BLF, customizable
 feature buttons and custom device state.
 endef
 
-Package/asterisk16-chan-sccp/description = $(Package/description/Default)
-
 CONFIGURE_ARGS += \
 	--disable-debug \
 	--enable-advanced-functions \
 	--enable-conference \
-	--enable-video
+	--enable-video \
+	--with-asterisk=$(STAGING_DIR)/usr
 
-ifeq ($(BUILD_VARIANT),asterisk16)
+define Package/asterisk-chan-sccp/conffiles
-  CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-16
-endif
-
-define Package/conffiles/Default
 /etc/asterisk/sccp.conf
 endef
 
-Package/asterisk16-chan-sccp/conffiles = $(Package/conffiles/Default)
+define Package/asterisk-chan-sccp/install
-
-define Package/Install/Default
 	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/asterisk/sccp.conf $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/sccp.conf $(1)/etc/asterisk
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/
 endef
 
-Package/asterisk16-chan-sccp/install = $(Package/Install/Default)
+$(eval $(call BuildPackage,asterisk-chan-sccp))
-
-$(eval $(call BuildPackage,asterisk16-chan-sccp))

net/asterisk-g72x/Makefile

@@ -15,7 +15,6 @@ PKG_SOURCE:=asterisk-g72x-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://asterisk.hosting.lv/src/
 PKG_HASH:=ffea55374c2134415569b876a68d9a12ce376146a22fad3963c8edc281052adf
 
-PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-g72x-$(PKG_VERSION)
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
@@ -23,47 +22,32 @@ PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=README.md
 PKG_MAINTAINER:=Alex Samorukov <samm@os2.kiev.ua>
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/asterisk-g72x/Default
+define Package/asterisk-codec-g729
   SUBMENU:=Telephony
   SECTION:=net
   CATEGORY:=Network
   TITLE:=G.729 codec support
   URL:=http://asterisk.hosting.lv
-  DEPENDS:=+bcg729
+  DEPENDS:=asterisk +bcg729
 endef
 
-define Package/asterisk16-codec-g729
+define Package/asterisk-codec-g729/description
-$(call Package/asterisk-g72x/Default)
-  DEPENDS+=asterisk16
-  VARIANT:=asterisk16
-endef
-
-define Package/description/Default
  Asterisk G.729 codec based on bcg729 implementation.
 endef
 
-Package/asterisk16-codec-g729/description = $(Package/description/Default)
-
 CONFIGURE_ARGS+= \
 	--with-bcg729 \
-	--enable-shared
+	--enable-shared \
+	--with-asterisk-includes=$(STAGING_DIR)/usr/include
 
-ifeq ($(BUILD_VARIANT),asterisk16)
+define Package/asterisk-codec-g729/install
-CONFIGURE_ARGS+= \
-	--with-asterisk-includes=$(STAGING_DIR)/usr/include/asterisk-16/include \
-	--with-asterisk160
-endif
-
-define Package/Install/Default
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/codec_g729.so \
 		$(1)/usr/lib/asterisk/modules/
 endef
 
-Package/asterisk16-codec-g729/install = $(Package/Install/Default)
+$(eval $(call BuildPackage,asterisk-codec-g729))
-
-$(eval $(call BuildPackage,asterisk16-codec-g729))

net/asterisk-opus/Makefile

@@ -8,46 +8,34 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk-opus
-PKG_VERSION:=20171009
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/traud/asterisk-opus.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_DATE:=2017-10-09
 PKG_SOURCE_VERSION:=83e1b458c77e0e287adeca494eeb79edb077b0ff
-PKG_MIRROR_HASH:=89265ee63bc3cb02ef9e75087f782147db1dec53433f9d6cfc08c7229cd61881
+PKG_MIRROR_HASH:=c71b859db7518cdafff1650e629c5901b290fe68f8af54ef1afd57bc9f15b122
 PKG_SOURCE_PROTO:=git
 
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 TARGET_CFLAGS += \
 	-DAST_MODULE_SELF_SYM=__internal_codec_opus_open_source_self \
 	$(FPIC)
 
-define Package/$(PKG_NAME)/Default
+define Package/asterisk-codec-opus
   SUBMENU:=Telephony
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Opus codec support
   URL:=https://github.com/traud/asterisk-opus
-  DEPENDS:=+libopus
+  DEPENDS:=asterisk +libopus
 endef
 
-define Package/asterisk16-codec-opus
+define Package/asterisk-codec-opus/description
-$(call Package/$(PKG_NAME)/Default)
-  DEPENDS+=asterisk16
-  VARIANT:=asterisk16
-endef
-
-define Package/description/Default
   Opus is the default audio codec in WebRTC. WebRTC is available in
   Asterisk via SIP over WebSockets (WSS). Nevertheless, Opus can be used
   for other transports (UDP, TCP, TLS) as well. Opus supersedes previous
@@ -61,21 +49,13 @@ define Package/description/Default
   well.
 endef
 
-Package/asterisk16-codec-opus/description = $(Package/description/Default)
+define Package/asterisk-codec-opus/install
-
-ifeq ($(BUILD_VARIANT),asterisk16)
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/asterisk-16/include
-endif
-
-define Package/Install/Default
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/codecs/codec_opus_open_source.so \
 		$(1)/usr/lib/asterisk/modules
 endef
 
-Package/asterisk16-codec-opus/install = $(Package/Install/Default)
-
 define Build/Configure
 endef
 
-$(eval $(call BuildPackage,asterisk16-codec-opus))
+$(eval $(call BuildPackage,asterisk-codec-opus))

net/asterisk/Makefile

@@ -7,16 +7,14 @@
 
 include $(TOPDIR)/rules.mk
 
-AST_MAJOR_VERSION:=16
+PKG_NAME:=asterisk
-PKG_NAME:=asterisk$(AST_MAJOR_VERSION)
+PKG_VERSION:=18.1.0
-PKG_VERSION:=$(AST_MAJOR_VERSION).13.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
-PKG_HASH:=e95238c355f5ef837009659e7422dcd7100ac7675b30ae8c49614ad32052d206
+PKG_HASH:=cc12f6c228243fb736d0aa23f3ce11adf7be5c5b02ed1ca080db76605cb602df
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=libxml2/host
 
 PKG_LICENSE:=GPL-2.0
@@ -44,6 +42,7 @@ MODULES_AVAILABLE:= \
 	app-alarmreceiver \
 	app-amd \
 	app-attended-transfer \
+	app-audiosocket \
 	app-authenticate \
 	app-blind-transfer \
 	app-bridgeaddchan \
@@ -101,6 +100,9 @@ MODULES_AVAILABLE:= \
 	app-url \
 	app-userevent \
 	app-verbose \
+	app-voicemail \
+	app-voicemail-imap \
+	app-voicemail-odbc \
 	app-waitforring \
 	app-waitforsilence \
 	app-waituntil \
@@ -119,6 +121,7 @@ MODULES_AVAILABLE:= \
 	cel-manager \
 	cel-sqlite3-custom \
 	chan-alsa \
+	chan-audiosocket \
 	chan-bridge-media \
 	chan-console \
 	chan-dahdi \
@@ -230,6 +233,7 @@ MODULES_AVAILABLE:= \
 	res-ari-playbacks \
 	res-ari-recordings \
 	res-ari-sounds \
+	res-audiosocket \
 	res-calendar \
 	res-calendar-caldav \
 	res-calendar-ews \
@@ -272,8 +276,10 @@ MODULES_AVAILABLE:= \
 	res-parking \
 	res-phoneprov \
 	res-pjsip-phoneprov \
+	res-pjsip-stir-shaken \
 	res-pjproject \
 	res-pktccops \
+	res-prometheus \
 	res-realtime \
 	res-remb-modifier \
 	res-resolver-unbound \
@@ -294,12 +300,12 @@ MODULES_AVAILABLE:= \
 	res-stasis-recording \
 	res-stasis-snoop \
 	res-statsd \
+	res-stir-shaken \
 	res-stun-monitor \
 	res-timing-dahdi \
 	res-timing-pthread \
 	res-timing-timerfd \
-	res-xmpp \
+	res-xmpp
-	voicemail
 
 UTILS_AVAILABLE:= \
 	aelparse \
@@ -319,7 +325,7 @@ AST_ENABLE:=
 PKG_CONFIG_DEPENDS:= \
 	$(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-%,$(MODULES_AVAILABLE)) \
 	$(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-util-%,$(subst _,-,$(UTILS_AVAILABLE))) \
-	CONFIG_ASTERISK$(AST_MAJOR_VERSION)_LOW_MEMORY
+	CONFIG_ASTERISK_LOW_MEMORY
 
 include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
@@ -359,10 +365,10 @@ endef
 
 define Package/$(PKG_NAME)/config
 	menu "Advanced configuration"
-		depends on PACKAGE_asterisk$(AST_MAJOR_VERSION)
+		depends on PACKAGE_asterisk
 
-	config ASTERISK$(AST_MAJOR_VERSION)_LOW_MEMORY
+	config ASTERISK_LOW_MEMORY
-		bool "Optimize Asterisk $(AST_MAJOR_VERSION) for low memory usage"
+		bool "Optimize Asterisk for low memory usage"
 		default n
 		help
 		  Warning: this feature is known to cause problems with some modules.
@@ -513,7 +519,7 @@ $(call Package/$(PKG_NAME)/Default)
 endef
 
 define Package/$(PKG_NAME)-sounds/description
-This package provides the sound-files for Asterisk $(AST_MAJOR_VERSION).
+This package provides the sound-files for Asterisk.
 endef
 
 define Package/$(PKG_NAME)-sounds/install
@@ -575,6 +581,7 @@ CONFIGURE_ARGS+= \
 	--without-tds \
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-res-resolver-unbound),--with-unbound="$(STAGING_DIR)/usr",--without-unbound) \
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-format-ogg-vorbis),--with-vorbis="$(STAGING_DIR)/usr",--without-vorbis) \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-app-voicemail-imap),--with-imap=system,--without-imap) \
 	--without-vpb \
 	--with-z="$(STAGING_DIR)/usr"
 
@@ -715,7 +722,7 @@ define Build/Compile
 	cd "$(PKG_BUILD_DIR)" && \
 		./menuselect/menuselect \
 			--disable BUILD_NATIVE \
-			$(if $(CONFIG_ASTERISK$(AST_MAJOR_VERSION)_LOW_MEMORY),--enable LOW_MEMORY) \
+			$(if $(CONFIG_ASTERISK_LOW_MEMORY),--enable LOW_MEMORY) \
 			menuselect.makeopts
 
 	# When changing anything in MENUSELECT_CFLAGS the file ".lastclean"
@@ -726,13 +733,13 @@ define Build/Compile
 	$(call Build/Compile/Default,.lastclean)
 	$(call Build/menuselect)
 
-	$(call Build/Compile/Default,all install samples)
+	$(call Build/Compile/Default,all install install-headers samples)
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/asterisk-$(AST_MAJOR_VERSION)/include/asterisk/
+	$(INSTALL_DIR) $(1)/usr/include/asterisk
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk-$(AST_MAJOR_VERSION)/include/asterisk/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-$(AST_MAJOR_VERSION)/include/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
@@ -758,6 +765,7 @@ $(eval $(call BuildAsteriskModule,app-agent-pool,Call center agent pool,Call cen
 $(eval $(call BuildAsteriskModule,app-alarmreceiver,Alarm receiver,Alarm receiver for Asterisk.,,,app_alarmreceiver,,))
 $(eval $(call BuildAsteriskModule,app-amd,Answering machine detection,Answering Machine Detection application.,,amd.conf,app_amd,,))
 $(eval $(call BuildAsteriskModule,app-attended-transfer,Attended transfer,Queues up an attended transfer to a given extension.,,,app_attended_transfer,,))
+$(eval $(call BuildAsteriskModule,app-audiosocket,Audiosocket app,Audiosocket app.,+$(PKG_NAME)-res-audiosocket,,app_audiosocket,,))
 $(eval $(call BuildAsteriskModule,app-authenticate,Authenticate commands,Authentication application.,,,app_authenticate,,))
 $(eval $(call BuildAsteriskModule,app-blind-transfer,Blind transfer,Redirects all channels currently bridged to the caller channel to a specified destination.,,,app_blind_transfer,,))
 $(eval $(call BuildAsteriskModule,app-bridgeaddchan,Bridge add channel,Bridge-add-channel application.,,,app_bridgeaddchan,,))
@@ -815,6 +823,9 @@ $(eval $(call BuildAsteriskModule,app-transfer,Transfers caller to other ext,Tra
 $(eval $(call BuildAsteriskModule,app-url,Send URL,Send URL applications.,,,app_url,,))
 $(eval $(call BuildAsteriskModule,app-userevent,Custom user event,Custom user event application.,,,app_userevent,,))
 $(eval $(call BuildAsteriskModule,app-verbose,Verbose logging,Send verbose output.,,,app_verbose,,))
+$(eval $(call BuildAsteriskModule,app-voicemail,Voicemail,Voicemail module.,,voicemail.conf,app_voicemail,vm-*,))
+$(eval $(call BuildAsteriskModule,app-voicemail-imap,Voicemail IMAP,Voicemail module.,+uw-imap,,app_voicemail_imap,,))
+$(eval $(call BuildAsteriskModule,app-voicemail-odbc,Voicemail ODBC,Voicemail module.,+unixodbc,,app_voicemail_odbc,,))
 $(eval $(call BuildAsteriskModule,app-waitforring,Wait for first ring,Waits until first ring after time.,,,app_waitforring,,))
 $(eval $(call BuildAsteriskModule,app-waitforsilence,Wait for silence/noise,Wait for silence/noise.,,,app_waitforsilence,,))
 $(eval $(call BuildAsteriskModule,app-waituntil,Sleep,Wait until specified time.,,,app_waituntil,,))
@@ -833,6 +844,7 @@ $(eval $(call BuildAsteriskModule,cel-custom,Customizable CSV CEL backend,Custom
 $(eval $(call BuildAsteriskModule,cel-manager,AMI CEL backend,Asterisk Manager Interface CEL backend.,,,cel_manager,,))
 $(eval $(call BuildAsteriskModule,cel-sqlite3-custom,SQLite3 custom CEL,SQLite3 custom CEL module.,,cel_sqlite3_custom.conf,cel_sqlite3_custom,,))
 $(eval $(call BuildAsteriskModule,chan-alsa,ALSA channel,ALSA console channel driver.,+alsa-lib,alsa.conf,chan_alsa,,))
+$(eval $(call BuildAsteriskModule,chan-audiosocket,Audiosocket channel,Audiosocket channel.,+$(PKG_NAME)-res-audiosocket,,chan_audiosocket,,))
 $(eval $(call BuildAsteriskModule,chan-bridge-media,Bridge media channel driver,Bridge media channel driver.,,,chan_bridge_media,,))
 $(eval $(call BuildAsteriskModule,chan-console,Console channel driver,Console channel driver.,+portaudio,console.conf,chan_console,,))
 $(eval $(call BuildAsteriskModule,chan-dahdi,DAHDI channel,DAHDI telephony.,+dahdi-tools-libtonezone +kmod-dahdi +libpri @!aarch64,chan_dahdi.conf,chan_dahdi,,))
@@ -944,6 +956,7 @@ $(eval $(call BuildAsteriskModule,res-ari-model,ARI model validators,ARI model v
 $(eval $(call BuildAsteriskModule,res-ari-playbacks,RESTful playback control resources,RESTful API module - playback control resources.,+$(PKG_NAME)-res-ari +$(PKG_NAME)-res-ari-model +$(PKG_NAME)-res-stasis-playback,,res_ari_playbacks,,))
 $(eval $(call BuildAsteriskModule,res-ari-recordings,RESTful recording resources,RESTful API module - recording resources.,+$(PKG_NAME)-res-ari +$(PKG_NAME)-res-ari-model +$(PKG_NAME)-res-stasis-recording,,res_ari_recordings,,))
 $(eval $(call BuildAsteriskModule,res-ari-sounds,RESTful sound resources,RESTful API module - sound resources.,+$(PKG_NAME)-res-ari +$(PKG_NAME)-res-ari-model +$(PKG_NAME)-res-stasis,,res_ari_sounds,))
+$(eval $(call BuildAsteriskModule,res-audiosocket,Audiosocket resource module,Audiosocket resource module.,,,res_audiosocket,))
 $(eval $(call BuildAsteriskModule,res-calendar,Calendar API,Asterisk calendar integration.,,calendar.conf,res_calendar,,))
 $(eval $(call BuildAsteriskModule,res-calendar-caldav,CalDAV calendar,Asterisk CalDAV calendar integration.,+$(PKG_NAME)-res-calendar +libical +libneon,,res_calendar_caldav,,))
 $(eval $(call BuildAsteriskModule,res-calendar-ews,EWS calendar,Asterisk MS Exchange Web Service calendar integration.,+$(PKG_NAME)-res-calendar +libneon,,res_calendar_ews,,))
@@ -986,8 +999,10 @@ $(eval $(call BuildAsteriskModule,res-mwi-external-ami,AMI for external MWI,AMI
 $(eval $(call BuildAsteriskModule,res-parking,Phone Parking,Call parking resource.,+$(PKG_NAME)-bridge-holding,res_parking.conf,res_parking,,))
 $(eval $(call BuildAsteriskModule,res-phoneprov,Phone Provisioning,HTTP phone provisioning.,,phoneprov.conf,res_phoneprov,,))
 $(eval $(call BuildAsteriskModule,res-pjsip-phoneprov,PJSIP Phone Provisioning,PJSIP phone provisioning.,+$(PKG_NAME)-pjsip +$(PKG_NAME)-res-phoneprov,,res_pjsip_phoneprov_provider,,))
+$(eval $(call BuildAsteriskModule,res-pjsip-stir-shaken,PJSIP STIR/SHAKEN resource module,PJSIP STIR/SHAKEN resource module.,+$(PKG_NAME)-pjsip +$(PKG_NAME)-res-stir-shaken,,res_pjsip_stir_shaken,,))
 $(eval $(call BuildAsteriskModule,res-pjproject,Bridge PJPROJECT to Asterisk logging,PJProject log and utility support.,+libpj +libpjlib-util +libpjmedia +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +libpjsua +libpjsua2 +libsrtp2,pjproject.conf,res_pjproject,,))
 $(eval $(call BuildAsteriskModule,res-pktccops,PktcCOPS manager for MGCP,PktcCOPS manager for MGCP.,,res_pktccops.conf,res_pktccops,,))
+$(eval $(call BuildAsteriskModule,res-prometheus,Prometheus resource module,Prometheus resource module.,+libpjsip +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsua +libpjsua2,prometheus.conf,res_prometheus,,))
 $(eval $(call BuildAsteriskModule,res-realtime,RealTime CLI,Realtime data lookup/rewrite.,,,res_realtime,,))
 $(eval $(call BuildAsteriskModule,res-remb-modifier,REMB modifier,REMB modifier module.,,,res_remb_modifier,,))
 $(eval $(call BuildAsteriskModule,res-resolver-unbound,Unbound DNS resolver,Unbound DNS resolver support.,+libunbound,resolver_unbound.conf,res_resolver_unbound,,))
@@ -1008,12 +1023,12 @@ $(eval $(call BuildAsteriskModule,res-stasis-playback,Stasis application playbac
 $(eval $(call BuildAsteriskModule,res-stasis-recording,Stasis application recording,Stasis application recording support.,+$(PKG_NAME)-res-stasis,,res_stasis_recording,,))
 $(eval $(call BuildAsteriskModule,res-stasis-snoop,Stasis application snoop,Stasis application snoop support.,+$(PKG_NAME)-res-stasis-recording,,res_stasis_snoop,,))
 $(eval $(call BuildAsteriskModule,res-statsd,statsd client,Statsd client support.,,statsd.conf,res_statsd,,))
+$(eval $(call BuildAsteriskModule,res-stir-shaken,STIR/SHAKEN resource module,STIR/SHAKEN resource module.,+$(PKG_NAME)-curl,stir_shaken.conf,res_stir_shaken,,))
 $(eval $(call BuildAsteriskModule,res-stun-monitor,STUN monitoring,STUN network monitor.,,res_stun_monitor.conf,res_stun_monitor,,))
 $(eval $(call BuildAsteriskModule,res-timing-dahdi,DAHDI Timing Interface,DAHDI timing interface.,+$(PKG_NAME)-chan-dahdi,,res_timing_dahdi,,))
 $(eval $(call BuildAsteriskModule,res-timing-pthread,pthread Timing Interface,pthread timing interface.,,,res_timing_pthread,,))
 $(eval $(call BuildAsteriskModule,res-timing-timerfd,Timerfd Timing Interface,Timerfd timing interface.,,,res_timing_timerfd,,))
 $(eval $(call BuildAsteriskModule,res-xmpp,XMPP client and component module,Asterisk XMPP interface.,+libiksemel +libopenssl,xmpp.conf,res_xmpp,,))
-$(eval $(call BuildAsteriskModule,voicemail,Voicemail,Voicemail modules.,+$(PKG_NAME)-res-adsi +$(PKG_NAME)-res-smdi,voicemail.conf,app_voicemail,vm-*,))
 
 ################################
 # AST utils

net/asterisk/patches/140-use-default-lua.patch

@@ -4,7 +4,7 @@
  fi
  AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
  
--for ver in 5.3 5.2 5.1; do
+-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