diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index 97b3a0d984e7..ffff336b611d 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.155 2023/11/14 18:45:28 nia Exp $
+# $NetBSD: Makefile,v 1.156 2024/02/19 05:59:51 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
 #       to find out the current sound file versions
 #       Also look in ${WRKSRC}/third-party/versions.mak for pjproject
 
-DISTNAME=	asterisk-18.9.0
+DISTNAME=	asterisk-18.21.0
 #PKGREVISION=	24
-PKGREVISION=	14
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/
 MASTER_SITES+=	http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -161,7 +160,7 @@ CONFIGURE_ARGS+=	--without-unbound
 DISTFILES+=	asterisk-extra-sounds-en-gsm-1.5.2.tar.gz
 
 # pjproject
-PJPROJ_VERSION=	2.10
+PJPROJ_VERSION=	2.13.1
 SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \
 	-https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/pjproject-${PJPROJ_VERSION}.tar.bz2
 SITES.pjproject-${PJPROJ_VERSION}.md5= \
@@ -180,7 +179,7 @@ SUBST_FILES.configs+=	configs/samples/musiconhold.conf.sample
 SUBST_FILES.configs+=	configs/samples/osp.conf.sample
 SUBST_FILES.configs+=	configs/samples/phoneprov.conf.sample
 SUBST_FILES.configs+=	configs/samples/res_config_sqlite.conf.sample
-SUBST_FILES.configs+=	configs/samples/sla.conf.sample
+#SUBST_FILES.configs+=	configs/samples/sla.conf.sample
 SUBST_SED.configs+=	-e 's|doc/|${PREFIX}/share/doc/${PKGBASE}/|'
 SUBST_SED.configs+=	-e 's|/etc/asterisk|${ASTETCDIR}|'
 SUBST_SED.configs+=	-e 's|/var/lib/asterisk|${ASTVARLIBDIR}|'
@@ -201,12 +200,12 @@ SUBST_STAGE.pktinfo=	post-configure
 SUBST_FILES.pktinfo=	include/asterisk/autoconfig.h
 SUBST_SED.pktinfo=	-e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|"
 
-# XXX gross hack, gethostbyname_r on NETBSD is for internal use only
-SUBST_CLASSES.NetBSD+=		gethostbyname_r
-SUBST_STAGE.gethostbyname_r=	post-configure
-SUBST_FILES.gethostbyname_r=	include/asterisk/autoconfig.h
-SUBST_SED.gethostbyname_r=	-e "s|^\#define HAVE_GETHOSTBYNAME_R_5 1|\#undef HAVE_GETHOSTBYNAME_R_5|"
-SUBST_SED.gethostbyname_r+=	-e "s|^\#define HAVE_GETHOSTBYNAME_R_6 1|\#undef HAVE_GETHOSTBYNAME_R_6|"
+## XXX gross hack, gethostbyname_r on NETBSD is for internal use only
+#SUBST_CLASSES.NetBSD+=		gethostbyname_r
+#SUBST_STAGE.gethostbyname_r=	post-configure
+#SUBST_FILES.gethostbyname_r=	include/asterisk/autoconfig.h
+#SUBST_SED.gethostbyname_r=	-e "s|^\#define HAVE_GETHOSTBYNAME_R_5 1|\#undef HAVE_GETHOSTBYNAME_R_5|"
+#SUBST_SED.gethostbyname_r+=	-e "s|^\#define HAVE_GETHOSTBYNAME_R_6 1|\#undef HAVE_GETHOSTBYNAME_R_6|"
 
 RCD_SCRIPTS=		asterisk
 OWN_DIRS_PERMS+=	${ASTDBDIR} ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
@@ -237,8 +236,8 @@ CONF_FILES_PERMS+=	${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_U
 
 .if !empty(PKG_OPTIONS:Masterisk-config)
 # if we put all the files in $CONF_FILES, the message is _way_ too long.
-.  for f in acl.conf adsi.conf agents.conf alarmreceiver.conf alsa.conf	\
-	amd.conf app_mysql.conf app_skel.conf ari.conf			\
+.  for f in acl.conf adsi.conf aeap.conf agents.conf alarmreceiver.conf	\
+	alsa.conf amd.conf app_mysql.conf app_skel.conf ari.conf	\
 	ast_debug_tools.conf asterisk.adsi calendar.conf ccss.conf	\
 	cdr.conf cdr_adaptive_odbc.conf cdr_custom.conf			\
 	cdr_manager.conf cdr_mysql.conf cdr_odbc.conf cdr_pgsql.conf	\
@@ -250,18 +249,20 @@ CONF_FILES_PERMS+=	${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_U
 	dsp.conf dundi.conf enum.conf extconfig.conf extensions.ael	\
 	extensions.conf extensions.lua	extensions_minivm.conf		\
 	features.conf festival.conf followme.conf func_odbc.conf	\
-	hep.conf http.conf iax.conf iaxprov.conf indications.conf	\
-	logger.conf manager.conf meetme.conf mgcp.conf minivm.conf	\
-	misdn.conf modules.conf	motif.conf musiconhold.conf muted.conf	\
-	ooh323.conf osp.conf oss.conf phone.conf phoneprov.conf		\
-	pjproject.conf pjsip.conf pjsip_notify.conf pjsip_wizard.conf	\
-	queuerules.conf queues.conf res_config_mysql.conf		\
+	geolocation.conf hep.conf http.conf iax.conf iaxprov.conf	\
+	indications.conf logger.conf manager.conf meetme.conf mgcp.conf	\
+	minivm.conf misdn.conf modules.conf motif.conf musiconhold.conf	\
+	muted.conf ooh323.conf osp.conf oss.conf phone.conf		\
+	phoneprov.conf pjproject.conf pjsip.conf pjsip_notify.conf	\
+	pjsip_wizard.conf queuerules.conf queues.conf			\
+	res_config_mysql.conf res_config_odbc.conf			\
 	res_config_sqlite.conf res_config_sqlite3.conf			\
-	res_corosync.conf res_curl.conf	 res_fax.conf res_ldap.conf	\
-	res_odbc.conf res_parking.conf res_pgsql.conf res_pktccops.conf	\
-	res_snmp.conf res_stun_monitor.conf resolver_unbound.conf	\
-	rtp.conf say.conf sip.conf sip_notify.conf skinny.conf sla.conf	\
-	smdi.conf sorcery.conf ss7.timers stasis.conf statsd.conf	\
+	res_corosync.conf res_curl.conf res_fax.conf			\
+	res_http_media_cache.conf res_ldap.conf res_odbc.conf		\
+	res_parking.conf res_pgsql.conf res_pktccops.conf res_snmp.conf	\
+	res_stun_monitor.conf resolver_unbound.conf rtp.conf say.conf	\
+	sip.conf sip_notify.conf skinny.conf sla.conf smdi.conf		\
+	sorcery.conf ss7.timers stasis.conf statsd.conf			\
 	stir_shaken.conf telcordia-1.adsi udptl.conf unistim.conf	\
 	users.conf voicemail.conf vpb.conf xmpp.conf
 CONF_FILES_PERMS+=		${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_USER} ${ASTERISK_GROUP} 0644
@@ -281,15 +282,22 @@ post-install:
 	${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
 	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/CREDITS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/README-SERIOUSLY.bestpractices.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/UPGRADE.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/SECURITY.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/Zaptel-to-DAHDI.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-18.18.0.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-18.18.1.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-18.19.0.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-18.20.0.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-18.20.1.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-18.20.2.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-18.21.0.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLogs/historical/CHANGES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLogs/historical/ChangeLog ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/README.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
@@ -300,6 +308,7 @@ LDFLAGS+= -L${PREFIX}/lib
 .endif
 
 .include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/editline/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/comms/asterisk18/PLIST b/comms/asterisk18/PLIST
index 648f0512ed4d..b2add62ffb83 100644
--- a/comms/asterisk18/PLIST
+++ b/comms/asterisk18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2021/10/09 07:52:15 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.30 2024/02/19 05:59:51 jnemeth Exp $
 lib/asterisk/libasteriskpj.so
 lib/asterisk/libasteriskpj.so.2
 lib/asterisk/modules/app_adsiprog.so
@@ -11,6 +11,7 @@ lib/asterisk/modules/app_authenticate.so
 lib/asterisk/modules/app_blind_transfer.so
 lib/asterisk/modules/app_bridgeaddchan.so
 lib/asterisk/modules/app_bridgewait.so
+lib/asterisk/modules/app_broadcast.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_celgenuserevent.so
 lib/asterisk/modules/app_chanisavail.so
@@ -34,6 +35,7 @@ lib/asterisk/modules/app_followme.so
 lib/asterisk/modules/app_forkcdr.so
 lib/asterisk/modules/app_getcpeid.so
 lib/asterisk/modules/app_ices.so
+lib/asterisk/modules/app_if.so
 lib/asterisk/modules/app_image.so
 lib/asterisk/modules/app_mf.so
 lib/asterisk/modules/app_milliwatt.so
@@ -55,6 +57,8 @@ lib/asterisk/modules/app_reload.so
 lib/asterisk/modules/app_sayunixtime.so
 lib/asterisk/modules/app_senddtmf.so
 lib/asterisk/modules/app_sendtext.so
+lib/asterisk/modules/app_sf.so
+lib/asterisk/modules/app_signal.so
 lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
 lib/asterisk/modules/app_speech_utils.so
@@ -147,6 +151,8 @@ lib/asterisk/modules/func_dialgroup.so
 lib/asterisk/modules/func_dialplan.so
 lib/asterisk/modules/func_enum.so
 lib/asterisk/modules/func_env.so
+lib/asterisk/modules/func_evalexten.so
+lib/asterisk/modules/func_export.so
 lib/asterisk/modules/func_extstate.so
 lib/asterisk/modules/func_frame_drop.so
 lib/asterisk/modules/func_frame_trace.so
@@ -156,6 +162,7 @@ lib/asterisk/modules/func_hangupcause.so
 lib/asterisk/modules/func_holdintercept.so
 lib/asterisk/modules/func_iconv.so
 lib/asterisk/modules/func_jitterbuffer.so
+lib/asterisk/modules/func_json.so
 lib/asterisk/modules/func_lock.so
 lib/asterisk/modules/func_logic.so
 lib/asterisk/modules/func_math.so
@@ -193,6 +200,7 @@ lib/asterisk/modules/pbx_loopback.so
 lib/asterisk/modules/pbx_realtime.so
 lib/asterisk/modules/pbx_spool.so
 lib/asterisk/modules/res_adsi.so
+lib/asterisk/modules/res_aeap.so
 lib/asterisk/modules/res_ael_share.so
 lib/asterisk/modules/res_agi.so
 lib/asterisk/modules/res_ari.so
@@ -250,6 +258,7 @@ lib/asterisk/modules/res_phoneprov.so
 lib/asterisk/modules/res_pjproject.so
 lib/asterisk/modules/res_pjsip.so
 lib/asterisk/modules/res_pjsip_acl.so
+lib/asterisk/modules/res_pjsip_aoc.so
 lib/asterisk/modules/res_pjsip_authenticator_digest.so
 lib/asterisk/modules/res_pjsip_caller_id.so
 lib/asterisk/modules/res_pjsip_config_wizard.so
@@ -284,6 +293,7 @@ lib/asterisk/modules/res_pjsip_pubsub.so
 lib/asterisk/modules/res_pjsip_refer.so
 lib/asterisk/modules/res_pjsip_registrar.so
 lib/asterisk/modules/res_pjsip_rfc3326.so
+lib/asterisk/modules/res_pjsip_rfc3329.so
 lib/asterisk/modules/res_pjsip_sdp_rtp.so
 lib/asterisk/modules/res_pjsip_send_to_voicemail.so
 lib/asterisk/modules/res_pjsip_session.so
@@ -292,7 +302,6 @@ lib/asterisk/modules/res_pjsip_stir_shaken.so
 lib/asterisk/modules/res_pjsip_t38.so
 lib/asterisk/modules/res_pjsip_transport_websocket.so
 lib/asterisk/modules/res_pjsip_xpidf_body_generator.so
-${PLIST.mgcp}lib/asterisk/modules/res_pktccops.so
 lib/asterisk/modules/res_prometheus.so
 lib/asterisk/modules/res_realtime.so
 ${PLIST.unbound}lib/asterisk/modules/res_resolver_unbound.so
@@ -307,6 +316,7 @@ lib/asterisk/modules/res_sorcery_memory.so
 lib/asterisk/modules/res_sorcery_memory_cache.so
 lib/asterisk/modules/res_sorcery_realtime.so
 lib/asterisk/modules/res_speech.so
+lib/asterisk/modules/res_speech_aeap.so
 ${PLIST.srtp}lib/asterisk/modules/res_srtp.so
 lib/asterisk/modules/res_stasis.so
 lib/asterisk/modules/res_stasis_answer.so
@@ -2316,16 +2326,24 @@ share/doc/asterisk/CHANGES
 share/doc/asterisk/COPYING
 share/doc/asterisk/CREDITS
 share/doc/asterisk/ChangeLog
+share/doc/asterisk/ChangeLog-18.18.0.md
+share/doc/asterisk/ChangeLog-18.18.1.md
+share/doc/asterisk/ChangeLog-18.19.0.md
+share/doc/asterisk/ChangeLog-18.20.0.md
+share/doc/asterisk/ChangeLog-18.20.1.md
+share/doc/asterisk/ChangeLog-18.20.2.md
+share/doc/asterisk/ChangeLog-18.21.0.md
 share/doc/asterisk/IAX2-security.pdf
 share/doc/asterisk/IAX2-security.txt
 share/doc/asterisk/LICENSE
 share/doc/asterisk/README-SERIOUSLY.bestpractices.md
 share/doc/asterisk/README.md
 share/doc/asterisk/README.txt
-share/doc/asterisk/UPGRADE.txt
+share/doc/asterisk/SECURITY.md
 share/doc/asterisk/Zaptel-to-DAHDI.txt
 share/examples/asterisk/acl.conf
 share/examples/asterisk/adsi.conf
+share/examples/asterisk/aeap.conf
 share/examples/asterisk/agents.conf
 share/examples/asterisk/alarmreceiver.conf
 share/examples/asterisk/alsa.conf
@@ -2379,6 +2397,7 @@ share/examples/asterisk/features.conf
 share/examples/asterisk/festival.conf
 share/examples/asterisk/followme.conf
 share/examples/asterisk/func_odbc.conf
+share/examples/asterisk/geolocation.conf
 share/examples/asterisk/hep.conf
 share/examples/asterisk/http.conf
 share/examples/asterisk/iax.conf
@@ -2407,11 +2426,13 @@ share/examples/asterisk/prometheus.conf
 share/examples/asterisk/queuerules.conf
 share/examples/asterisk/queues.conf
 share/examples/asterisk/res_config_mysql.conf
+share/examples/asterisk/res_config_odbc.conf
 share/examples/asterisk/res_config_sqlite.conf
 share/examples/asterisk/res_config_sqlite3.conf
 share/examples/asterisk/res_corosync.conf
 share/examples/asterisk/res_curl.conf
 share/examples/asterisk/res_fax.conf
+share/examples/asterisk/res_http_media_cache.conf
 share/examples/asterisk/res_ldap.conf
 share/examples/asterisk/res_odbc.conf
 share/examples/asterisk/res_parking.conf
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index d340fe4e4c35..a6c2769503e7 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.73 2021/12/17 08:07:06 jnemeth Exp $
+$NetBSD: distinfo,v 1.74 2024/02/19 05:59:51 jnemeth Exp $
 
-BLAKE2s (asterisk-18.9.0/asterisk-18.9.0.tar.gz) = 2b4d261411510ddc0a134b811e1d62753a9517da1024a3dc07839d4b21f25595
-SHA512 (asterisk-18.9.0/asterisk-18.9.0.tar.gz) = 514f806ac93c2975101133e897c20e4483ad97141b125de5b6fcb96b8acd3248bd0d4fc638381fe9e9be7b504a35ddae24d8437c33ed10c88a37565577af52b6
-Size (asterisk-18.9.0/asterisk-18.9.0.tar.gz) = 28045278 bytes
-BLAKE2s (asterisk-18.9.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f7e5fe212d7e7cdca14c52527a2552311ab7762c3f1464b09ddedc7c66aebde
-SHA512 (asterisk-18.9.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
-Size (asterisk-18.9.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes
-BLAKE2s (asterisk-18.9.0/pjproject-2.10.md5) = 6739f51daf24d0567304f773bd49648c1be3a7a4a33c0f3353279fb349168e7e
-SHA512 (asterisk-18.9.0/pjproject-2.10.md5) = bd24048c9c2fdaf06468e44bceca92bd02848d759ef98285d20b50174f865b1aec2928f1ce6c092862397ba83dd1a74da4a7e479eca881df1e9f9d1c211a7054
-Size (asterisk-18.9.0/pjproject-2.10.md5) = 110 bytes
-BLAKE2s (asterisk-18.9.0/pjproject-2.10.tar.bz2) = fac6400fa94cde09a848314b754062364c021e8c13d3fe28493634d4415959f7
-SHA512 (asterisk-18.9.0/pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e
-Size (asterisk-18.9.0/pjproject-2.10.tar.bz2) = 7339188 bytes
+BLAKE2s (asterisk-18.21.0/asterisk-18.21.0.tar.gz) = dee2f2c4205d419c30a7d35dafc8dbaf42889cb1879288521a4789302640458b
+SHA512 (asterisk-18.21.0/asterisk-18.21.0.tar.gz) = 4a3c57af70b74918b61e1c67423667a876fcc519376f1795054a55700acb5d05da8e4e0a3e3187760203bc262678a6c29eae07ed2a5e2df84a9a555ec79cb48f
+Size (asterisk-18.21.0/asterisk-18.21.0.tar.gz) = 28446501 bytes
+BLAKE2s (asterisk-18.21.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f7e5fe212d7e7cdca14c52527a2552311ab7762c3f1464b09ddedc7c66aebde
+SHA512 (asterisk-18.21.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
+Size (asterisk-18.21.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes
+BLAKE2s (asterisk-18.21.0/pjproject-2.13.1.md5) = 933be89ea03bc24a3a965d37a8985a2af3ea404e24a8fdd296a2be07d5390de0
+SHA512 (asterisk-18.21.0/pjproject-2.13.1.md5) = 5a8c35e79d10760f74d02332f35aad3517fc3c72e62e2b1c35fcb1d613bbad4d96fa07f1cea89514dba2d237a36a698e94b1242be938d492d20b76a130c0d0f1
+Size (asterisk-18.21.0/pjproject-2.13.1.md5) = 172 bytes
+BLAKE2s (asterisk-18.21.0/pjproject-2.13.1.tar.bz2) = 7c04ae740c66f92502684de834b4055e7f4842bcb35f0efc12f183c8d8c37f7f
+SHA512 (asterisk-18.21.0/pjproject-2.13.1.tar.bz2) = 2f1eb3cb8f52a5536c355b02b1abfa24c7d2263b5338568a7cd8167d349e007c34afafcdd7ed510bfc4fc859494383fac05e8325e46fd66219dbead86c5c3562
+Size (asterisk-18.21.0/pjproject-2.13.1.tar.bz2) = 7825201 bytes
 SHA1 (patch-Makefile) = 676687f298151dbe548ae26a4f6f3fe8bf1f174e
 SHA1 (patch-addons_chan__ooh323.c) = 1775da7ca2129a962ed460bd1e78ba3ce6afa62c
 SHA1 (patch-apps_app__adsiprog.c) = 031139e5cd1ef6bb2afb0a74fee3d752eded0a2c
@@ -23,14 +23,16 @@ SHA1 (patch-apps_app__minivm.c) = 22ee6ebfbe205baf0acf46ab16c94fea1750f2fb
 SHA1 (patch-apps_app__queue.c) = fdf7cf202b60e24cd9227f7e461bbd541565d602
 SHA1 (patch-apps_app__sms.c) = ad65b3cb2a30489551101f7534c691cd1155d18f
 SHA1 (patch-apps_app__voicemail.c) = bee10453a86039a99db9df644585800f347aaace
+SHA1 (patch-build__tools_make__xml__documentation) = 5a3f332cc5f982b37cfb328837cc7515776fb283
 SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23
 SHA1 (patch-cdr_cdr__pgsql.c) = 82b002a1f5ed3b7361a98e2bffb5cea8833949b8
 SHA1 (patch-cel_cel__pgsql.c) = b280efab2b035ce60be268bac9bc8824910b2b8f
+SHA1 (patch-channels_chan__oss.c) = 70b4a549b21e39dc45474d0104edf69edd725eef
 SHA1 (patch-channels_chan__pjsip.c) = efd4cbb82133fc5ddf7de70d01c99e185c585211
 SHA1 (patch-channels_chan__sip.c) = ed285612eae6cbfde19ded87db9360c0bca153c7
 SHA1 (patch-channels_pjsip_cli__commands.c) = 01baa9d242e3af02a1f3540cfb3064ad68c71d67
 SHA1 (patch-channels_pjsip_dialplan__functions.c) = 2cf8199c4ec9d4894eb922c2703d49ecc06188ef
-SHA1 (patch-configure) = 7bd4d4dd2fc922591de685f6aa5be078e8cb2c64
+SHA1 (patch-configure) = d04ab000b8472b997816069c57fa5cd271e9ef90
 SHA1 (patch-configure.ac) = b972730a2be3bf54502116f1f7e03afee76a02cc
 SHA1 (patch-contrib_scripts_vmail.cgi) = 7935ce96ea319eb19cc2ce999813eb837d5357c0
 SHA1 (patch-funcs_func__cdr.c) = 79c743df264948e5ea9e1c292012a1f6362d0c1e
@@ -42,7 +44,6 @@ SHA1 (patch-funcs_func__pjsip__endpoint.c) = 263a4bdb6365bcc9f6392d25a5aef5c607e
 SHA1 (patch-funcs_func__strings.c) = 08d313add57c5be822a19311fc70a7555bd63877
 SHA1 (patch-include_asterisk_autoconfig.h.in) = 23807b08b94f5cf9c2de76c2928f7ae38997d006
 SHA1 (patch-include_asterisk_lock.h) = 85418bcd20f3ed7eb0310f46f3b2d334980bdcef
-SHA1 (patch-include_asterisk_sha1.h) = 9b233ef82b50b8d94177616e1382991656ce1ebf
 SHA1 (patch-include_asterisk_strings.h) = 9ace78a13131bcb411eda79a98264b5cfcc7789c
 SHA1 (patch-main_Makefile) = e3b5d261fd15ffd23d81060ff3aafba6b0300e7c
 SHA1 (patch-main_acl.c) = 06a9d247b19d648e9ff54ac2a234dc8ac8c023bb
@@ -57,6 +58,7 @@ SHA1 (patch-main_callerid.c) = 0ea1b3df8aaf3969fcd9e06055c8e6184d50d3d3
 SHA1 (patch-main_cdr.c) = 540fbdb354aba100fa37392b879b92a85d1d8620
 SHA1 (patch-main_cel.c) = 22fa21db8e0afa0958d34014f52e2c4fe9c73ba2
 SHA1 (patch-main_cli.c) = ee72bcaac7dce397354cbc09af4ed7441dbb4650
+SHA1 (patch-main_config.c) = d5159f2c16cc6324b79f51cfc797d26c64995a6f
 SHA1 (patch-main_conversions.c) = a516ef4f706fabbd250f66a3159825a2a6085344
 SHA1 (patch-main_dns__naptr.c) = 4fa3fe5d2acf7bcd84ca2044280c644e4bd15d7f
 SHA1 (patch-main_enum.c) = c5f620297cf98f95ce74aa0d98eddc697946a77b
@@ -64,7 +66,7 @@ SHA1 (patch-main_features.c) = 6e50ea4c6ee26f56edca22611aeed44787459968
 SHA1 (patch-main_http.c) = b36f1f3f0da25456a17888d34ea2bf7b61c1acf4
 SHA1 (patch-main_indications.c) = 511b4c270e4a4a71517109f959121777caf2aa36
 SHA1 (patch-main_logger.c) = 321a52b3015af85ea13055953cec5a5d9da05ec8
-SHA1 (patch-main_manager.c) = cb87e72e630a5f192b614d203a8cd81190ba1424
+SHA1 (patch-main_manager.c) = 661e01ff509721d6b6c15d803d0b3ce71bb48442
 SHA1 (patch-main_pbx.c) = 8e7ced268edb29238f96418e8b21456364c4ae1f
 SHA1 (patch-main_pbx__builtins.c) = f53aadc04fd489f6725911537007af4f4076ee56
 SHA1 (patch-main_pbx__timing.c) = a4657330086c5b0e8fd271d5676fb897badea452
@@ -79,16 +81,25 @@ SHA1 (patch-pbx_pbx__config.c) = cc5e6d2b383f86abfb354c9bf14fc93374fba0a3
 SHA1 (patch-pbx_pbx__dundi.c) = 1bc28ff2412da569f139f245c5223845a2f6cebe
 SHA1 (patch-res_ael_pval.c) = 8a238c78403d3098bf8be8ae266162bc05e586f3
 SHA1 (patch-res_res__calendar.c) = 45211a3baf8fbd8b201ba0167f8c56fb35728c4a
-SHA1 (patch-res_res__calendar__caldav.c) = afe2f4806dd57148dde11baeefaa7897fce4d485
-SHA1 (patch-res_res__calendar__icalendar.c) = ed34b7147d8834ebadac9b1b8488a4c645f90a5b
+SHA1 (patch-res_res__format__attr__celt.c) = 62d5e3e83e8d62dffcb0672073a2694f5a5c754c
+SHA1 (patch-res_res__format__attr__h263.c) = 4445303b43f107251c54a8eaf3e69a89ee26ca27
+SHA1 (patch-res_res__format__attr__ilbc.c) = 29a4b324e91b0e30a5bed3da3e6828b959429883
+SHA1 (patch-res_res__format__attr__opus.c) = 1a8b3c93f32d41841ab5ea38bdfc83eb9599ed5f
+SHA1 (patch-res_res__format__attr__silk.c) = 5b9579e5086cd804f43774c4ae8a892eb5ec95b7
+SHA1 (patch-res_res__format__attr__siren14.c) = d024ca11b0e2641d2f36b90423737bd2c7781da7
+SHA1 (patch-res_res__format__attr__siren7.c) = 450a173dfb29724853db3183d36759549a5243e4
+SHA1 (patch-res_res__format__attr__vp8.c) = 2ca03467ccb1a3657546dfa4f768ab0a463d67e3
 SHA1 (patch-res_res__hep__pjsip.c) = b0c8fed52451ec31a2c77d4abd28640631bb708c
 SHA1 (patch-res_res__limit.c) = e80f370fe5b84dcdc2f38e2137d5ed6f75ba35a4
 SHA1 (patch-res_res__musiconhold.c) = 401999cefa3805f63df33424c635ad18a7d00748
 SHA1 (patch-res_res__pjproject.c) = 0326bf12d9f798c8eae2eff4fad8b86d4bbc0589
+SHA1 (patch-res_res__pjsip__diversion.c) = 3f527faaf069d5e303dce75bc8a6dbd7be9d85a0
+SHA1 (patch-res_res__pjsip_pjsip__configuration.c) = 9864e8bf5cfad03c5e1ef62b33c89514aaeaba19
 SHA1 (patch-res_res__xmpp.c) = 390376180d1fb11a41c16f59dd44f506006a8e5d
 SHA1 (patch-sounds_Makefile) = acc15088ae2545f2822246466bfe783b5215fc54
 SHA1 (patch-tests_test__locale.c) = f3f1edc86356f2a7b4d3493433c772e164c77f66
 SHA1 (patch-tests_test__voicemail__api.c) = c600f726136581e47cf34da2c0bb485b8a5912eb
+SHA1 (patch-third-party_pjproject_patches_0030-pjlib-src-pj-os__core__unix.c.patch) = 69b6b4795f5616cbbf0daa190fd79e0ada92e7a8
 SHA1 (patch-utils_Makefile) = 4b4be483c20768d640efae5c18fc6f6770eb8c0c
 SHA1 (patch-utils_db1-ast_include_db.h) = 03b43353b7967f999ace3eb160828c530e2e8fae
 SHA1 (patch-utils_extconf.c) = f35d079c4801fe20132ff52d63d951d9e1658902
diff --git a/comms/asterisk18/options.mk b/comms/asterisk18/options.mk
index 196cc78536bd..d40acdc0e622 100644
--- a/comms/asterisk18/options.mk
+++ b/comms/asterisk18/options.mk
@@ -1,9 +1,8 @@
-# $NetBSD: options.mk,v 1.15 2021/06/13 07:57:52 jnemeth Exp $
+# $NetBSD: options.mk,v 1.16 2024/02/19 05:59:51 jnemeth Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
-PKG_SUPPORTED_OPTIONS=		x11 unixodbc ilbc webvmail ldap spandsp
+PKG_SUPPORTED_OPTIONS=		unixodbc ilbc webvmail ldap spandsp
 PKG_SUPPORTED_OPTIONS+=		jabber speex snmp pgsql asterisk-config
-PKG_OPTIONS_LEGACY_OPTS+=	gtk:x11
 PKG_SUGGESTED_OPTIONS=		ldap jabber speex asterisk-config
 
 .include "../../mk/bsd.options.mk"
@@ -20,18 +19,6 @@ PLIST_VARS+=		speex snmp pgsql srtp
 #MAKE_FLAGS+=		WITHOUT_ZAPTEL=1
 #.endif
 
-# gtkconsole depends on GTK 2.x
-.if !empty(PKG_OPTIONS:Mx11)
-.  include "../../x11/gtk2/buildlink3.mk"
-.  include "../../devel/SDL/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-sdl
-CONFIGURE_ARGS+=	--with-gtk2
-PLIST.x11=		yes
-.else
-CONFIGURE_ARGS+=	--without-sdl
-CONFIGURE_ARGS+=	--without-gtk2
-.endif
-
 .if !empty(PKG_OPTIONS:Munixodbc)
 .  include "../../databases/unixodbc/buildlink3.mk"
 .  include "../../devel/libltdl/buildlink3.mk"
@@ -59,18 +46,16 @@ CONFIGURE_ARGS+=	--without-iksemel
 
 MAKE_FLAGS+=	GLOBAL_MAKEOPTS=${WRKSRC}/pkgsrc.makeopts
 post-configure:
-.if !empty(PKG_OPTIONS:Mx11)
-	${ECHO} "MENUSELECT_PBX=-pbx_gtkconsole" >> ${WRKSRC}/pkgsrc.makeopts
-.endif
 .if !empty(PKG_OPTIONS:Munixodbc)
 	${ECHO} "MENUSELECT_OPTS_app_voicemail=ODBC_STORAGE" >> ${WRKSRC}/pkgsrc.makeopts
 .endif
-.if defined(PLIST.mgcp)
-	${ECHO} "MENUSELECT_RES=-res_pktccops" >> ${WRKSRC}/pkgsrc.makeopts
-	${ECHO} "MENUSELECT_CHANNELS=-chan_mgcp" >> ${WRKSRC}/pkgsrc.makeopts
-.endif
+#.if defined(PLIST.mgcp)
+#	${ECHO} "MENUSELECT_RES=-res_pktccops" >> ${WRKSRC}/pkgsrc.makeopts
+#	${ECHO} "MENUSELECT_CHANNELS=-chan_mgcp" >> ${WRKSRC}/pkgsrc.makeopts
+#.endif
 	${ECHO} "MENUSELECT_AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi" >> ${WRKSRC}/pkgsrc.makeopts
 	${ECHO} "MENUSELECT_CFLAGS=-BUILD_NATIVE" >> ${WRKSRC}/pkgsrc.makeopts
+	${ECHO} "MENUSELECT_RES=-res_mwi_external_ami -res_ari_mailboxes -res_pjsip_geolocation -res_stasis_mailbox" >> ${WRKSRC}/pkgsrc.makeopts
 	# this is a hack to work around a bug in menuselect
 	cd ${WRKSRC} && make menuselect.makeopts
 
diff --git a/comms/asterisk18/patches/patch-build__tools_make__xml__documentation b/comms/asterisk18/patches/patch-build__tools_make__xml__documentation
new file mode 100644
index 000000000000..7be40c93332f
--- /dev/null
+++ b/comms/asterisk18/patches/patch-build__tools_make__xml__documentation
@@ -0,0 +1,13 @@
+$NetBSD: patch-build__tools_make__xml__documentation,v 1.1 2024/02/19 05:59:51 jnemeth Exp $
+
+--- build_tools/make_xml_documentation.orig	2022-04-14 21:53:34.000000000 +0000
++++ build_tools/make_xml_documentation
+@@ -214,7 +214,7 @@ for subdir in ${mod_subdirs} ; do
+ 					${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${i}" || { echo "" ; exit 1 ; }
+ 			fi
+ 		fi
+-		${SED} -r "/^\s*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
++		${SED} -r "/^[[:space:]]*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
+ 	done
+ done
+ echo "</docs>" >> "${output_file}"
diff --git a/comms/asterisk18/patches/patch-channels_chan__oss.c b/comms/asterisk18/patches/patch-channels_chan__oss.c
new file mode 100644
index 000000000000..cc3ff8c8aaec
--- /dev/null
+++ b/comms/asterisk18/patches/patch-channels_chan__oss.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-channels_chan__oss.c,v 1.1 2024/02/19 05:59:51 jnemeth Exp $
+
+--- channels/chan_oss.c.orig	2022-04-14 21:53:34.000000000 +0000
++++ channels/chan_oss.c
+@@ -1317,7 +1317,7 @@ static void store_mixer(struct chan_oss_
+ 	int i;
+ 
+ 	for (i = 0; i < strlen(s); i++) {
+-		if (!isalnum(s[i]) && strchr(" \t-/", s[i]) == NULL) {
++		if (!isalnum((unsigned char)s[i]) && strchr(" \t-/", s[i]) == NULL) {
+ 			ast_log(LOG_WARNING, "Suspect char %c in mixer cmd, ignoring:\n\t%s\n", s[i], s);
+ 			return;
+ 		}
diff --git a/comms/asterisk18/patches/patch-configure b/comms/asterisk18/patches/patch-configure
index 75a895eb887c..0abc94c025b8 100644
--- a/comms/asterisk18/patches/patch-configure
+++ b/comms/asterisk18/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.3 2021/12/17 08:07:06 jnemeth Exp $
+$NetBSD: patch-configure,v 1.4 2024/02/19 05:59:52 jnemeth Exp $
 
---- configure.orig	2021-12-09 16:44:54.000000000 +0000
+--- configure.orig	2023-07-20 13:04:41.000000000 +0000
 +++ configure
-@@ -9116,12 +9116,12 @@ else
+@@ -9303,12 +9303,12 @@ else
  
  			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang -fblocks" >&5
  $as_echo_n "checking for clang -fblocks... " >&6; }
@@ -17,7 +17,7 @@ $NetBSD: patch-configure,v 1.3 2021/12/17 08:07:06 jnemeth Exp $
  				AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime"
  				AST_CLANG_BLOCKS="-fblocks"
  				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -15264,7 +15264,7 @@ fi
+@@ -15580,7 +15580,7 @@ fi
  done
  
  
@@ -26,7 +26,7 @@ $NetBSD: patch-configure,v 1.3 2021/12/17 08:07:06 jnemeth Exp $
  if test "x$ac_cv_header_sys_poll_h" = xyes; then :
  
  else
-@@ -17279,7 +17279,7 @@ fi
+@@ -17562,7 +17562,7 @@ fi
  done
  
  
@@ -35,7 +35,7 @@ $NetBSD: patch-configure,v 1.3 2021/12/17 08:07:06 jnemeth Exp $
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -17514,7 +17514,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -17797,7 +17797,7 @@ rm -f core conftest.err conftest.$ac_obj
  LDFLAGS=${old_LDFLAGS}
  rm -f conftest.dynamics
  
@@ -44,7 +44,7 @@ $NetBSD: patch-configure,v 1.3 2021/12/17 08:07:06 jnemeth Exp $
  if test "x$ac_cv_header_sys_poll_h" = xyes; then :
    HAS_POLL=1
  
-@@ -19803,6 +19803,148 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -20126,6 +20126,148 @@ rm -f core conftest.err conftest.$ac_obj
  
  
  
@@ -193,12 +193,3 @@ $NetBSD: patch-configure,v 1.3 2021/12/17 08:07:06 jnemeth Exp $
  # The cast to long int works around a bug in the HP C Compiler
  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-@@ -20907,6 +21049,8 @@ $as_echo_n "checking for getifaddrs() su
- 
- 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-  #include <ifaddrs.h>
- int
- main ()
diff --git a/comms/asterisk18/patches/patch-include_asterisk_sha1.h b/comms/asterisk18/patches/patch-include_asterisk_sha1.h
deleted file mode 100644
index 854406de3f0a..000000000000
--- a/comms/asterisk18/patches/patch-include_asterisk_sha1.h
+++ /dev/null
@@ -1,131 +0,0 @@
-$NetBSD: patch-include_asterisk_sha1.h,v 1.2 2021/06/13 07:57:53 jnemeth Exp $
-
---- include/asterisk/sha1.h.orig	2016-09-09 16:14:37.000000000 +0000
-+++ include/asterisk/sha1.h
-@@ -191,49 +191,6 @@ typedef struct SHA256Context SHA224Conte
- typedef struct SHA512Context SHA384Context;
- 
- /*
-- *  This structure holds context information for all SHA
-- *  hashing operations.
-- */
--typedef struct USHAContext {
--	int whichSha;               /* which SHA is being used */
--	union {
--		SHA1Context sha1Context;
--		SHA224Context sha224Context; SHA256Context sha256Context;
--		SHA384Context sha384Context; SHA512Context sha512Context;
--	} ctx;
--} USHAContext;
--
--/*
-- *  This structure will hold context information for the HMAC
-- *  keyed-hashing operation.
-- */
--typedef struct HMACContext {
--	int whichSha;               /* which SHA is being used */
--	int hashSize;               /* hash size of SHA being used */
--	int blockSize;              /* block size of SHA being used */
--	USHAContext shaContext;     /* SHA context */
--	unsigned char k_opad[USHA_Max_Message_Block_Size];
--	/* outer padding - key XORd with opad */
--	int Computed;               /* Is the MAC computed? */
--	int Corrupted;              /* Cumulative corruption code */
--
--} HMACContext;
--
--/*
-- *  This structure will hold context information for the HKDF
-- *  extract-and-expand Key Derivation Functions.
-- */
--typedef struct HKDFContext {
--	int whichSha;               /* which SHA is being used */
--	HMACContext hmacContext;
--	int hashSize;               /* hash size of SHA being used */
--	unsigned char prk[USHAMaxHashSize];
--	/* pseudo-random key - output of hkdfInput */
--	int Computed;               /* Is the key material computed? */
--	int Corrupted;              /* Cumulative corruption code */
--} HKDFContext;
--
--/*
-  *  Function Prototypes
-  */
- 
-@@ -281,76 +238,6 @@ extern int SHA512FinalBits(SHA512Context
- extern int SHA512Result(SHA512Context *,
-                         uint8_t Message_Digest[SHA512HashSize]);
- 
--/* Unified SHA functions, chosen by whichSha */
--extern int USHAReset(USHAContext *context, SHAversion whichSha);
--extern int USHAInput(USHAContext *context,
--                     const uint8_t *bytes, unsigned int bytecount);
--extern int USHAFinalBits(USHAContext *context,
--                         uint8_t bits, unsigned int bit_count);
--extern int USHAResult(USHAContext *context,
--                      uint8_t Message_Digest[USHAMaxHashSize]);
--extern int USHABlockSize(enum SHAversion whichSha);
--extern int USHAHashSize(enum SHAversion whichSha);
--extern int USHAHashSizeBits(enum SHAversion whichSha);
--extern const char *USHAHashName(enum SHAversion whichSha);
--
--/*
-- * HMAC Keyed-Hashing for Message Authentication, RFC 2104,
-- * for all SHAs.
-- * This interface allows a fixed-length text input to be used.
-- */
--extern int hmac(SHAversion whichSha, /* which SHA algorithm to use */
--    const unsigned char *text,     /* pointer to data stream */
--    int text_len,                  /* length of data stream */
--    const unsigned char *key,      /* pointer to authentication key */
--    int key_len,                   /* length of authentication key */
--    uint8_t digest[USHAMaxHashSize]); /* caller digest to fill in */
--
--/*
-- * HMAC Keyed-Hashing for Message Authentication, RFC 2104,
-- * for all SHAs.
-- * This interface allows any length of text input to be used.
-- */
--extern int hmacReset(HMACContext *context, enum SHAversion whichSha,
--                     const unsigned char *key, int key_len);
--extern int hmacInput(HMACContext *context, const unsigned char *text,
--                     int text_len);
--extern int hmacFinalBits(HMACContext *context, uint8_t bits,
--                         unsigned int bit_count);
--extern int hmacResult(HMACContext *context,
--                      uint8_t digest[USHAMaxHashSize]);
--
--/*
-- * HKDF HMAC-based Extract-and-Expand Key Derivation Function,
-- * RFC 5869, for all SHAs.
-- */
--extern int hkdf(SHAversion whichSha, const unsigned char *salt,
--                int salt_len, const unsigned char *ikm, int ikm_len,
--                const unsigned char *info, int info_len,
--                uint8_t okm[ ], int okm_len);
--extern int hkdfExtract(SHAversion whichSha, const unsigned char *salt,
--                       int salt_len, const unsigned char *ikm,
--                       int ikm_len, uint8_t prk[USHAMaxHashSize]);
--extern int hkdfExpand(SHAversion whichSha, const uint8_t prk[ ],
--                      int prk_len, const unsigned char *info,
--                      int info_len, uint8_t okm[ ], int okm_len);
--
--/*
-- * HKDF HMAC-based Extract-and-Expand Key Derivation Function,
-- * RFC 5869, for all SHAs.
-- * This interface allows any length of text input to be used.
-- */
--extern int hkdfReset(HKDFContext *context, enum SHAversion whichSha,
--                     const unsigned char *salt, int salt_len);
--extern int hkdfInput(HKDFContext *context, const unsigned char *ikm,
--                     int ikm_len);
--extern int hkdfFinalBits(HKDFContext *context, uint8_t ikm_bits,
--                         unsigned int ikm_bit_count);
--extern int hkdfResult(HKDFContext *context,
--                      uint8_t prk[USHAMaxHashSize],
--                      const unsigned char *info, int info_len,
--                      uint8_t okm[USHAMaxHashSize], int okm_len);
--
- /************************ sha-private.h ************************/
- /***************** See RFC 6234 for details. *******************/
- /*
diff --git a/comms/asterisk18/patches/patch-main_config.c b/comms/asterisk18/patches/patch-main_config.c
new file mode 100644
index 000000000000..4273b5aadd25
--- /dev/null
+++ b/comms/asterisk18/patches/patch-main_config.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-main_config.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- main/config.c.orig	2024-02-12 05:14:56.251989318 +0000
++++ main/config.c
+@@ -44,6 +44,9 @@
+ #include <libgen.h>
+ #include <time.h>
+ #include <sys/stat.h>
++#if HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
+ 
+ #include <math.h>	/* HUGE_VAL */
+ #include <regex.h>
diff --git a/comms/asterisk18/patches/patch-main_manager.c b/comms/asterisk18/patches/patch-main_manager.c
index 71017f40c571..f16a33109ba4 100644
--- a/comms/asterisk18/patches/patch-main_manager.c
+++ b/comms/asterisk18/patches/patch-main_manager.c
@@ -1,17 +1,17 @@
-$NetBSD: patch-main_manager.c,v 1.2 2021/06/13 07:57:53 jnemeth Exp $
+$NetBSD: patch-main_manager.c,v 1.3 2024/02/19 05:59:52 jnemeth Exp $
 
---- main/manager.c.orig	2018-05-01 20:12:26.000000000 +0000
+--- main/manager.c.orig	2024-01-25 16:17:00.000000000 +0000
 +++ main/manager.c
-@@ -2639,7 +2639,7 @@ static char *handle_showmanconn(struct a
+@@ -2779,7 +2779,7 @@ static char *handle_showmanconn(struct a
  	struct mansession_session *session;
  	time_t now = time(NULL);
- #define HSMCONN_FORMAT1 "  %-15.15s  %-55.55s  %-10.10s  %-10.10s  %-8.8s  %-8.8s  %-5.5s  %-5.5s\n"
--#define HSMCONN_FORMAT2 "  %-15.15s  %-55.55s  %-10d  %-10d  %-8d  %-8d  %-5.5d  %-5.5d\n"
-+#define HSMCONN_FORMAT2 "  %-15.15s  %-55.55s  %-10jd  %-10jd  %-8d  %-8d  %-5.5d  %-5.5d\n"
+ #define HSMCONN_FORMAT1 "  %-15.15s  %-55.55s  %-10.10s  %-10.10s  %-8.8s  %-8.8s  %-10.10s  %-10.10s\n"
+-#define HSMCONN_FORMAT2 "  %-15.15s  %-55.55s  %-10d  %-10d  %-8d  %-8d  %-10.10d  %-10.10d\n"
++#define HSMCONN_FORMAT2 "  %-15.15s  %-55.55s  %-10jd  %-10jd  %-8d  %-8d  %-10.10d  %-10.10d\n"
  	int count = 0;
  	struct ao2_iterator i;
  
-@@ -2665,8 +2665,8 @@ static char *handle_showmanconn(struct a
+@@ -2805,8 +2805,8 @@ static char *handle_showmanconn(struct a
  			ao2_lock(session);
  			ast_cli(a->fd, HSMCONN_FORMAT2, session->username,
  				ast_sockaddr_stringify_addr(&session->addr),
@@ -22,7 +22,7 @@
  				session->stream ? ast_iostream_get_fd(session->stream) : -1,
  				session->inuse,
  				session->readperm,
-@@ -3510,9 +3510,9 @@ static int action_ping(struct mansession
+@@ -3732,9 +3732,9 @@ static int action_ping(struct mansession
  	astman_append(
  		s,
  		"Ping: Pong\r\n"
@@ -34,7 +34,7 @@
  	return 0;
  }
  
-@@ -4621,7 +4621,7 @@ static void generate_status(struct manse
+@@ -4936,7 +4936,7 @@ static void generate_status(struct manse
  		"DNID: %s\r\n"
  		"EffectiveConnectedLineNum: %s\r\n"
  		"EffectiveConnectedLineName: %s\r\n"
@@ -43,7 +43,7 @@
  		"BridgeID: %s\r\n"
  		"Application: %s\r\n"
  		"Data: %s\r\n"
-@@ -4641,7 +4641,7 @@ static void generate_status(struct manse
+@@ -4956,7 +4956,7 @@ static void generate_status(struct manse
  		S_OR(ast_channel_dialed(chan)->number.str, ""),
  		S_COR(effective_id.number.valid, effective_id.number.str, "<unknown>"),
  		S_COR(effective_id.name.valid, effective_id.name.str, "<unknown>"),
@@ -52,7 +52,7 @@
  		bridge ? bridge->uniqueid : "",
  		ast_channel_appl(chan),
  		ast_channel_data(chan),
-@@ -6920,8 +6920,8 @@ static int __attribute__((format(printf,
+@@ -7816,8 +7816,8 @@ static int __attribute__((format(printf,
  	if (timestampevents) {
  		now = ast_tvnow();
  		ast_str_append(&buf, 0,
@@ -63,16 +63,23 @@
  	}
  	if (manager_debug) {
  		static int seq;
-@@ -7433,7 +7433,7 @@ static void xml_copy_escape(struct ast_s
- 			}
+@@ -8329,13 +8329,13 @@ static void xml_copy_escape(struct ast_s
  		}
  
--		if ( (mode & 2) && !isalnum(*src)) {
-+		if ( (mode & 2) && !isalnum((unsigned char)*src)) {
- 			*dst++ = '_';
- 			space--;
- 			continue;
-@@ -7466,7 +7466,7 @@ static void xml_copy_escape(struct ast_s
+ 		if (mode & 2) {
+-			if (save == src && isdigit(*src)) {
++			if (save == src && isdigit((unsigned char)*src)) {
+ 				/* The first character of an XML attribute cannot be a digit */
+ 				*dst++ = '_';
+ 				*dst++ = *src;
+ 				space -= 2;
+ 				continue;
+-			} else if (!isalnum(*src)) {
++			} else if (!isalnum((unsigned char)*src)) {
+ 				/* Replace non-alphanumeric with an underscore */
+ 				*dst++ = '_';
+ 				space--;
+@@ -8370,7 +8370,7 @@ static void xml_copy_escape(struct ast_s
  			break;
  
  		default:
diff --git a/comms/asterisk18/patches/patch-res_res__calendar__caldav.c b/comms/asterisk18/patches/patch-res_res__calendar__caldav.c
deleted file mode 100644
index c25f96bf8401..000000000000
--- a/comms/asterisk18/patches/patch-res_res__calendar__caldav.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-res_res__calendar__caldav.c,v 1.2 2021/06/13 07:57:53 jnemeth Exp $
-
---- res/res_calendar_caldav.c.orig	2015-10-09 21:48:48.000000000 +0000
-+++ res/res_calendar_caldav.c
-@@ -404,7 +404,7 @@ static void caldav_add_event(icalcompone
- 			ast_string_field_set(event, uid, event->summary);
- 		} else {
- 			char tmp[100];
--			snprintf(tmp, sizeof(tmp), "%ld", event->start);
-+			snprintf(tmp, sizeof(tmp), "%jd", (intmax_t)event->start);
- 			ast_string_field_set(event, uid, tmp);
- 		}
- 	}
diff --git a/comms/asterisk18/patches/patch-res_res__calendar__icalendar.c b/comms/asterisk18/patches/patch-res_res__calendar__icalendar.c
deleted file mode 100644
index 258ba194b3b7..000000000000
--- a/comms/asterisk18/patches/patch-res_res__calendar__icalendar.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-res_res__calendar__icalendar.c,v 1.2 2021/06/13 07:57:53 jnemeth Exp $
-
---- res/res_calendar_icalendar.c.orig	2015-10-09 21:48:48.000000000 +0000
-+++ res/res_calendar_icalendar.c
-@@ -246,7 +246,7 @@ static void icalendar_add_event(icalcomp
- 			ast_string_field_set(event, uid, event->summary);
- 		} else {
- 			char tmp[100];
--			snprintf(tmp, sizeof(tmp), "%ld", event->start);
-+			snprintf(tmp, sizeof(tmp), "%jd", (intmax_t)event->start);
- 			ast_string_field_set(event, uid, tmp);
- 		}
- 	}
diff --git a/comms/asterisk18/patches/patch-res_res__format__attr__celt.c b/comms/asterisk18/patches/patch-res_res__format__attr__celt.c
new file mode 100644
index 000000000000..98afcd63e5a5
--- /dev/null
+++ b/comms/asterisk18/patches/patch-res_res__format__attr__celt.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-res_res__format__attr__celt.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- res/res_format_attr_celt.c.orig	2022-04-14 21:53:34.000000000 +0000
++++ res/res_format_attr_celt.c
+@@ -89,7 +89,7 @@ static struct ast_format *celt_parse_sdp
+ 
+ 	/* lower-case everything, so we are case-insensitive */
+ 	for (attrib = attribs; *attrib; ++attrib) {
+-		*attrib = tolower(*attrib);
++		*attrib = tolower((unsigned char)*attrib);
+ 	} /* based on channels/chan_sip.c:process_a_sdp_image() */
+ 
+ 	if (sscanf(attribs, "framesize=%30u", &val) == 1) {
diff --git a/comms/asterisk18/patches/patch-res_res__format__attr__h263.c b/comms/asterisk18/patches/patch-res_res__format__attr__h263.c
new file mode 100644
index 000000000000..67506847ac67
--- /dev/null
+++ b/comms/asterisk18/patches/patch-res_res__format__attr__h263.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-res_res__format__attr__h263.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- res/res_format_attr_h263.c.orig	2022-04-14 21:53:34.000000000 +0000
++++ res/res_format_attr_h263.c
+@@ -180,7 +180,7 @@ static struct ast_format *h263_parse_sdp
+ 
+ 	/* upper-case everything, so we are case-insensitive */
+ 	for (attrib = attribs; *attrib; ++attrib) {
+-		*attrib = toupper(*attrib);
++		*attrib = toupper((unsigned char)*attrib);
+ 	} /* based on channels/chan_sip.c:process_a_sdp_image() */
+ 
+ 	attr->BPP = H263_ATTR_KEY_UNSET;
diff --git a/comms/asterisk18/patches/patch-res_res__format__attr__ilbc.c b/comms/asterisk18/patches/patch-res_res__format__attr__ilbc.c
new file mode 100644
index 000000000000..4973ce4dd2d0
--- /dev/null
+++ b/comms/asterisk18/patches/patch-res_res__format__attr__ilbc.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-res_res__format__attr__ilbc.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- res/res_format_attr_ilbc.c.orig	2022-04-14 21:53:34.000000000 +0000
++++ res/res_format_attr_ilbc.c
+@@ -87,7 +87,7 @@ static struct ast_format *ilbc_parse_sdp
+ 
+ 	/* lower-case everything, so we are case-insensitive */
+ 	for (attrib = attribs; *attrib; ++attrib) {
+-		*attrib = tolower(*attrib);
++		*attrib = tolower((unsigned char)*attrib);
+ 	} /* based on channels/chan_sip.c:process_a_sdp_image() */
+ 
+ 	if ((kvp = strstr(attribs, "mode")) && sscanf(kvp, "mode=%30u", &val) == 1) {
diff --git a/comms/asterisk18/patches/patch-res_res__format__attr__opus.c b/comms/asterisk18/patches/patch-res_res__format__attr__opus.c
new file mode 100644
index 000000000000..e05b8a715f44
--- /dev/null
+++ b/comms/asterisk18/patches/patch-res_res__format__attr__opus.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-res_res__format__attr__opus.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- res/res_format_attr_opus.c.orig	2022-04-14 21:53:34.000000000 +0000
++++ res/res_format_attr_opus.c
+@@ -151,7 +151,7 @@ static struct ast_format *opus_parse_sdp
+ 
+ 	/* lower-case everything, so we are case-insensitive */
+ 	for (attrib = attribs; *attrib; ++attrib) {
+-		*attrib = tolower(*attrib);
++		*attrib = tolower((unsigned char)*attrib);
+ 	} /* based on channels/chan_sip.c:process_a_sdp_image() */
+ 
+ 	sdp_fmtp_get(attribs, CODEC_OPUS_ATTR_MAX_PLAYBACK_RATE, &attr->maxplayrate);
diff --git a/comms/asterisk18/patches/patch-res_res__format__attr__silk.c b/comms/asterisk18/patches/patch-res_res__format__attr__silk.c
new file mode 100644
index 000000000000..cfc558f9fcb2
--- /dev/null
+++ b/comms/asterisk18/patches/patch-res_res__format__attr__silk.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-res_res__format__attr__silk.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- res/res_format_attr_silk.c.orig	2022-04-14 21:53:34.000000000 +0000
++++ res/res_format_attr_silk.c
+@@ -96,7 +96,7 @@ static struct ast_format *silk_parse_sdp
+ 
+ 	/* lower-case everything, so we are case-insensitive */
+ 	for (attrib = attribs; *attrib; ++attrib) {
+-		*attrib = tolower(*attrib);
++		*attrib = tolower((unsigned char)*attrib);
+ 	} /* based on channels/chan_sip.c:process_a_sdp_image() */
+ 
+ 	if (sscanf(attribs, "maxaveragebitrate=%30u", &val) == 1) {
diff --git a/comms/asterisk18/patches/patch-res_res__format__attr__siren14.c b/comms/asterisk18/patches/patch-res_res__format__attr__siren14.c
new file mode 100644
index 000000000000..7ee59115047e
--- /dev/null
+++ b/comms/asterisk18/patches/patch-res_res__format__attr__siren14.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-res_res__format__attr__siren14.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- res/res_format_attr_siren14.c.orig	2022-04-14 21:53:34.000000000 +0000
++++ res/res_format_attr_siren14.c
+@@ -55,7 +55,7 @@ static struct ast_format *siren14_parse_
+ 
+ 	/* lower-case everything, so we are case-insensitive */
+ 	for (attrib = attribs; *attrib; ++attrib) {
+-		*attrib = tolower(*attrib);
++		*attrib = tolower((unsigned char)*attrib);
+ 	} /* based on channels/chan_sip.c:process_a_sdp_image() */
+ 
+ 	if (sscanf(attribs, "bitrate=%30u", &val) == 1) {
diff --git a/comms/asterisk18/patches/patch-res_res__format__attr__siren7.c b/comms/asterisk18/patches/patch-res_res__format__attr__siren7.c
new file mode 100644
index 000000000000..b9d44e36d268
--- /dev/null
+++ b/comms/asterisk18/patches/patch-res_res__format__attr__siren7.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-res_res__format__attr__siren7.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- res/res_format_attr_siren7.c.orig	2022-04-14 21:53:34.000000000 +0000
++++ res/res_format_attr_siren7.c
+@@ -55,7 +55,7 @@ static struct ast_format *siren7_parse_s
+ 
+ 	/* lower-case everything, so we are case-insensitive */
+ 	for (attrib = attribs; *attrib; ++attrib) {
+-		*attrib = tolower(*attrib);
++		*attrib = tolower((unsigned char)*attrib);
+ 	} /* based on channels/chan_sip.c:process_a_sdp_image() */
+ 
+ 	if (sscanf(attribs, "bitrate=%30u", &val) == 1) {
diff --git a/comms/asterisk18/patches/patch-res_res__format__attr__vp8.c b/comms/asterisk18/patches/patch-res_res__format__attr__vp8.c
new file mode 100644
index 000000000000..71ad5e90ac1d
--- /dev/null
+++ b/comms/asterisk18/patches/patch-res_res__format__attr__vp8.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-res_res__format__attr__vp8.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- res/res_format_attr_vp8.c.orig	2022-04-14 21:53:34.000000000 +0000
++++ res/res_format_attr_vp8.c
+@@ -92,7 +92,7 @@ static struct ast_format *vp8_parse_sdp_
+ 
+ 	/* lower-case everything, so we are case-insensitive */
+ 	for (attrib = attribs; *attrib; ++attrib) {
+-		*attrib = tolower(*attrib);
++		*attrib = tolower((unsigned char)*attrib);
+ 	} /* based on channels/chan_sip.c:process_a_sdp_image() */
+ 
+ 	if ((kvp = strstr(attribs, "max-fr")) && sscanf(kvp, "max-fr=%30u", &val) == 1) {
diff --git a/comms/asterisk18/patches/patch-res_res__pjsip__diversion.c b/comms/asterisk18/patches/patch-res_res__pjsip__diversion.c
new file mode 100644
index 000000000000..e2e52811f32d
--- /dev/null
+++ b/comms/asterisk18/patches/patch-res_res__pjsip__diversion.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-res_res__pjsip__diversion.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- res/res_pjsip_diversion.c.orig	2022-04-14 21:53:34.000000000 +0000
++++ res/res_pjsip_diversion.c
+@@ -61,7 +61,7 @@ static int sip_is_token(const char *str)
+ 
+ 	is_token = 1;
+ 	do {
+-		if (!isalnum(*str)
++		if (!isalnum((unsigned char)*str)
+ 			&& !strchr("-.!%*_+`'~", *str)) {
+ 			/* The character is not allowed in a token. */
+ 			is_token = 0;
diff --git a/comms/asterisk18/patches/patch-res_res__pjsip_pjsip__configuration.c b/comms/asterisk18/patches/patch-res_res__pjsip_pjsip__configuration.c
new file mode 100644
index 000000000000..ab6ee027d5b9
--- /dev/null
+++ b/comms/asterisk18/patches/patch-res_res__pjsip_pjsip__configuration.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-res_res__pjsip_pjsip__configuration.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- res/res_pjsip/pjsip_configuration.c.orig	2022-04-14 21:53:34.000000000 +0000
++++ res/res_pjsip/pjsip_configuration.c
+@@ -1039,7 +1039,7 @@ static int from_user_handler(const struc
+ 	const char *val;
+ 
+ 	for (val = var->value; *val; val++) {
+-		if (!isalpha(*val) && !isdigit(*val) && !strchr(valid_uri_marks, *val)) {
++		if (!isalpha((unsigned char)*val) && !isdigit((unsigned char)*val) && !strchr(valid_uri_marks, *val)) {
+ 			ast_log(LOG_ERROR, "Error configuring endpoint '%s' - '%s' field "
+ 			"contains invalid character '%c'\n",
+ 			ast_sorcery_object_get_id(endpoint), var->name, *val);
diff --git a/comms/asterisk18/patches/patch-third-party_pjproject_patches_0030-pjlib-src-pj-os__core__unix.c.patch b/comms/asterisk18/patches/patch-third-party_pjproject_patches_0030-pjlib-src-pj-os__core__unix.c.patch
new file mode 100644
index 000000000000..dbe822052bff
--- /dev/null
+++ b/comms/asterisk18/patches/patch-third-party_pjproject_patches_0030-pjlib-src-pj-os__core__unix.c.patch
@@ -0,0 +1,20 @@
+$NetBSD: patch-third-party_pjproject_patches_0030-pjlib-src-pj-os__core__unix.c.patch,v 1.1 2024/02/19 05:59:52 jnemeth Exp $
+
+--- third-party/pjproject/patches/0030-pjlib-src-pj-os_core_unix.c.patch.orig	2024-01-22 05:51:30.584710770 +0000
++++ third-party/pjproject/patches/0030-pjlib-src-pj-os_core_unix.c.patch
+@@ -0,0 +1,15 @@
++--- source/pjlib/src/pj/os_core_unix.c.orig	2024-01-22 05:44:17.920342932 +0000
+++++ source/pjlib/src/pj/os_core_unix.c
++@@ -640,7 +640,11 @@ static void set_thread_display_name(cons
++ #   if defined(PJ_DARWINOS) && PJ_DARWINOS != 0
++     pthread_setname_np(name);
++ #   else
++-    pthread_setname_np(pthread_self(), name);
+++#       if defined(__NetBSD__)
+++            pthread_setname_np(pthread_self(), name, NULL);
+++#       else
+++            pthread_setname_np(pthread_self(), name);
+++#       endif
++ #   endif
++ #elif defined(PJ_HAS_PTHREAD_SET_NAME_NP) && PJ_HAS_PTHREAD_SET_NAME_NP != 0
++     pthread_set_name_np(pthread_self(), name);