From: Paul Donald <newtwen+github@gmail.com>
Date: Wed, 3 Dec 2025 03:28:05 +0000 (+0100)
Subject: asterisk: bump to 23.1.0
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=00f56ba48a4cbb88eff4750203905c083e321dee;p=feed%2Ftelephony.git

asterisk: bump to 23.1.0

remove deprecated modules from 22-23

See https://docs.asterisk.org/Asterisk_23_Documentation/Upgrading/
and https://docs.asterisk.org/Asterisk_23_Documentation/WhatsNew/

starting in v23, astdb2sqlite3 is removed. Users still running on v10 Berkley DB
must have upgraded DB prior to v23. Similarly, all Berkley DB functionality is
removed.

patch 150 refreshed to remove Berkley DB stuff.
other patches refreshed.

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
---

diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 5afd75e..a810c2f 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk
-PKG_VERSION:=22.7.0
+PKG_VERSION:=23.1.0
 PKG_RELEASE:=1
 PKG_CPE_ID:=cpe:/a:digium:asterisk
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
-PKG_HASH:=5b0e5d276aeb014bf8a08a94d1055a9e97b9dce3375846eea70da5221bf9efe7
+PKG_HASH:=04a05b555b27a7f5cc4f86d301190d7ee2cd4621490d262aed8613495b44316a
 
 PKG_BUILD_DEPENDS:=libxml2/host
 
@@ -323,8 +323,6 @@ MODULES_AVAILABLE:= \
 UTILS_AVAILABLE:= \
 	aelparse \
 	astcanary \
-	astdb2sqlite3 \
-	astdb2bdb \
 	check_expr \
 	check_expr2 \
 	smsq \
@@ -1068,8 +1066,6 @@ $(eval $(call BuildAsteriskModule,res-xmpp,XMPP client and component module,Aste
 
 $(eval $(call BuildAsteriskUtil,aelparse,Check extensions.ael file.,+$(PKG_NAME)-pbx-ael,))
 $(eval $(call BuildAsteriskUtil,astcanary,Assures Asterisk no threads have gone missing.,,))
-$(eval $(call BuildAsteriskUtil,astdb2sqlite3,Convert astdb to SQLite 3.,,))
-$(eval $(call BuildAsteriskUtil,astdb2bdb,Convert astdb back to Berkeley DB 1.86.,,))
 $(eval $(call BuildAsteriskUtil,check_expr,Expression checker [older version].,,))
 $(eval $(call BuildAsteriskUtil,check_expr2,Expression checker [newer version].,,))
 $(eval $(call BuildAsteriskUtil,smsq,Send messages from command line.,+libpopt,))
diff --git a/net/asterisk/patches/150-musl-12x.patch b/net/asterisk/patches/150-musl-12x.patch
index 08441be..ebfb820 100644
--- a/net/asterisk/patches/150-musl-12x.patch
+++ b/net/asterisk/patches/150-musl-12x.patch
@@ -18,18 +18,3 @@
  #include <alloca.h>
  #include <strings.h>
  #include <pthread.h>
---- a/utils/db1-ast/include/db.h
-+++ b/utils/db1-ast/include/db.h
-@@ -68,8 +68,11 @@ typedef	unsigned long long	u_int64_t;
- #endif /* __FreeBSD__ */
- #endif
- 
--#ifdef SOLARIS
-+#ifndef __P
- #define	__P(p) p
-+#endif
-+
-+#ifndef __BEGIN_DECLS
- #define __BEGIN_DECLS
- #define __END_DECLS
- #endif
diff --git a/net/asterisk/patches/180-app_queue_time_t.patch b/net/asterisk/patches/180-app_queue_time_t.patch
index 92305ed..fc8c69f 100644
--- a/net/asterisk/patches/180-app_queue_time_t.patch
+++ b/net/asterisk/patches/180-app_queue_time_t.patch
@@ -1,6 +1,6 @@
 --- a/apps/app_queue.c
 +++ b/apps/app_queue.c
-@@ -4803,8 +4803,12 @@ static int is_longest_waiting_caller(str
+@@ -4759,8 +4759,12 @@ static int is_longest_waiting_caller(str
  					 * will be unused until the first caller is picked up.
  					 */
  					if (ch->start < caller->start && !ch->pending) {