Skip to content

Commit ac9d16d

Browse files
committed
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/ users.conf -> phoneprov_users.conf 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>
1 parent ff5f7da commit ac9d16d

3 files changed

Lines changed: 4 additions & 23 deletions

File tree

net/asterisk/Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=asterisk
11-
PKG_VERSION:=22.7.0
11+
PKG_VERSION:=23.1.0
1212
PKG_RELEASE:=1
1313
PKG_CPE_ID:=cpe:/a:digium:asterisk
1414

1515
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
1616
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
17-
PKG_HASH:=5b0e5d276aeb014bf8a08a94d1055a9e97b9dce3375846eea70da5221bf9efe7
17+
PKG_HASH:=04a05b555b27a7f5cc4f86d301190d7ee2cd4621490d262aed8613495b44316a
1818

1919
PKG_BUILD_DEPENDS:=libxml2/host
2020

@@ -323,8 +323,6 @@ MODULES_AVAILABLE:= \
323323
UTILS_AVAILABLE:= \
324324
aelparse \
325325
astcanary \
326-
astdb2sqlite3 \
327-
astdb2bdb \
328326
check_expr \
329327
check_expr2 \
330328
smsq \
@@ -1019,7 +1017,7 @@ $(eval $(call BuildAsteriskModule,res-mwi-devstate,MWI device state subs,This mo
10191017
$(eval $(call BuildAsteriskModule,res-mwi-external,Core external MWI resource,Core external MWI resource.,,,res_mwi_external,,))
10201018
$(eval $(call BuildAsteriskModule,res-mwi-external-ami,AMI for external MWI,AMI support for external MWI.,+$(PKG_NAME)-res-mwi-external,,res_mwi_external_ami,,))
10211019
$(eval $(call BuildAsteriskModule,res-parking,Phone Parking,Call parking resource.,+$(PKG_NAME)-bridge-holding,res_parking.conf,res_parking,,))
1022-
$(eval $(call BuildAsteriskModule,res-phoneprov,Phone Provisioning,HTTP phone provisioning.,,phoneprov.conf,res_phoneprov,,))
1020+
$(eval $(call BuildAsteriskModule,res-phoneprov,Phone Provisioning,HTTP phone provisioning.,,phoneprov.conf phoneprov_users.conf,res_phoneprov,,))
10231021
$(eval $(call BuildAsteriskModule,res-pjsip-aoc,PJSIP AOC,PJSIP AOC Support.,+asterisk-pjsip +asterisk-res-pjproject,,res_pjsip_aoc,,))
10241022
$(eval $(call BuildAsteriskModule,res-pjsip-geolocation,PJSIP Geolocation,PJSIP Geolocation support.,+asterisk-pjsip +asterisk-res-geolocation,,res_pjsip_geolocation,,))
10251023
$(eval $(call BuildAsteriskModule,res-pjsip-phoneprov,PJSIP Phone Provisioning,PJSIP phone provisioning.,+$(PKG_NAME)-pjsip +$(PKG_NAME)-res-phoneprov,,res_pjsip_phoneprov_provider,,))
@@ -1069,8 +1067,6 @@ $(eval $(call BuildAsteriskModule,res-xmpp,XMPP client and component module,Aste
10691067

10701068
$(eval $(call BuildAsteriskUtil,aelparse,Check extensions.ael file.,+$(PKG_NAME)-pbx-ael,))
10711069
$(eval $(call BuildAsteriskUtil,astcanary,Assures Asterisk no threads have gone missing.,,))
1072-
$(eval $(call BuildAsteriskUtil,astdb2sqlite3,Convert astdb to SQLite 3.,,))
1073-
$(eval $(call BuildAsteriskUtil,astdb2bdb,Convert astdb back to Berkeley DB 1.86.,,))
10741070
$(eval $(call BuildAsteriskUtil,check_expr,Expression checker [older version].,,))
10751071
$(eval $(call BuildAsteriskUtil,check_expr2,Expression checker [newer version].,,))
10761072
$(eval $(call BuildAsteriskUtil,smsq,Send messages from command line.,+libpopt,))

net/asterisk/patches/150-musl-12x.patch

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,3 @@
1818
#include <alloca.h>
1919
#include <strings.h>
2020
#include <pthread.h>
21-
--- a/utils/db1-ast/include/db.h
22-
+++ b/utils/db1-ast/include/db.h
23-
@@ -68,8 +68,11 @@ typedef unsigned long long u_int64_t;
24-
#endif /* __FreeBSD__ */
25-
#endif
26-
27-
-#ifdef SOLARIS
28-
+#ifndef __P
29-
#define __P(p) p
30-
+#endif
31-
+
32-
+#ifndef __BEGIN_DECLS
33-
#define __BEGIN_DECLS
34-
#define __END_DECLS
35-
#endif

net/asterisk/patches/180-app_queue_time_t.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/apps/app_queue.c
22
+++ b/apps/app_queue.c
3-
@@ -4803,8 +4803,12 @@ static int is_longest_waiting_caller(str
3+
@@ -4759,8 +4759,12 @@ static int is_longest_waiting_caller(str
44
* will be unused until the first caller is picked up.
55
*/
66
if (ch->start < caller->start && !ch->pending) {

0 commit comments

Comments
 (0)