net/asterisk18: update to 18.24.3

Announcement (the mailing list is dead): https://community.asterisk.org/t/asterisk-security-release-18-24-3/104293
2025-07-18 09:49:18 -04:00 · 2024-09-21 23:50:25 +02:00 · 2024-09-21 23:50:25 +02:00 · db1c49e2f0
commit db1c49e2f0
parent 3a2c76139f
5 changed files with 51 additions and 45 deletions
--- a/net/asterisk18/Makefile
+++ b/net/asterisk18/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	asterisk
-PORTVERSION=	18.21.0
+PORTVERSION=	18.24.3
 PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
@ -215,7 +215,7 @@ ASTERISK_MOH_G729_SOUNDS=	asterisk-moh-opsound-g729-2.03.tar.gz
 ASTERISK_USER?=		asterisk
 ASTERISK_GROUP?=	asterisk

-PJSIP_VERSION=	2.13.1
+PJSIP_VERSION=	2.14.1

 .include <bsd.port.options.mk>

--- a/net/asterisk18/distinfo
+++ b/net/asterisk18/distinfo
@ -1,11 +1,11 @@
-TIMESTAMP = 1706216570
-SHA256 (asterisk/asterisk-18.21.0.tar.gz) = 31e1b544ece2bb75be93621e358e6765fc095f4b65e061d488d517177aeb9208
-SIZE (asterisk/asterisk-18.21.0.tar.gz) = 28446501
+TIMESTAMP = 1726942894
+SHA256 (asterisk/asterisk-18.24.3.tar.gz) = 70af95d1067a5afec7acbf98a242d853ae5dc8637c8f20d1f30d0dcf96eadb29
+SIZE (asterisk/asterisk-18.24.3.tar.gz) = 28531091
 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
 SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
 SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
 SHA256 (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
 SIZE (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 24044
-SHA256 (asterisk/pjsip-pjproject-2.13.1_GH0.tar.gz) = 32a5ab5bfbb9752cb6a46627e4c410e61939c8dbbd833ac858473cfbd9fb9d7d
-SIZE (asterisk/pjsip-pjproject-2.13.1_GH0.tar.gz) = 9746437
+SHA256 (asterisk/pjsip-pjproject-2.14.1_GH0.tar.gz) = 6140f7a97e318caa89c17e8d5468599671c6eed12d64a7c160dac879ba004c68
+SIZE (asterisk/pjsip-pjproject-2.14.1_GH0.tar.gz) = 10322231
--- a/net/asterisk18/files/patch-Makefile
+++ b/net/asterisk18/files/patch-Makefile
@ -1,11 +1,13 @@
--- Makefile.orig	2022-08-18 15:18:29 UTC
+diff --git Makefile Makefile
+index ca742a94f7..af2655342b 100644
+--- Makefile
 +++ Makefile
@@ -144,7 +144,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
 OVERWRITE=y
 
 # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
 -DEBUG=-g3
-+#DEBUG=-g3
+# DEBUG=-g3
 
 # Asterisk.conf is located in ASTETCDIR or by using the -C flag
 # when starting Asterisk
@ -14,7 +16,7 @@
 
 # Default install directory for DAHDI hooks.
 -DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
-+#DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
+# DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
 
 # If the file .asterisk.makeopts is present in your home directory, you can
 # include all of your favorite menuselect options so that every time you download
@ -45,12 +47,12 @@
 	done
 	$(MAKE) -C sounds install
 	find rest-api -name "*.json" | while read x; do \
-@@ -545,7 +543,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
+@@ -545,7 +543,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTCACHEDIR)" "$(AS
 	"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
 	"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
 	"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
-	"$(ASTDATADIR)/third-party" "${ASTDATADIR}/keys/stir_shaken"
-+	"$(ASTDATADIR)/third-party" "${ASTDATADIR}/keys/stir_shaken" "$(ASTSPOOLDIR)/outgoing"
+-	"$(ASTDATADIR)/third-party" "${ASTDATADIR}/keys/stir_shaken" "${ASTDATADIR}/keys/stir_shaken/cache"
+	"$(ASTDATADIR)/third-party" "${ASTDATADIR}/keys/stir_shaken" "${ASTDATADIR}/keys/stir_shaken/cache" "$(ASTSPOOLDIR)/outgoing"
 
 installdirs:
 	@for i in $(INSTALLDIRS); do \
@ -71,10 +73,10 @@
 -	$(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR)
 -	$(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
 -endif
-+#ifeq ($(HAVE_DAHDI),1)
-+#	$(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR)
-+#	$(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
-+#endif
+# ifeq ($(HAVE_DAHDI),1)
+# 	$(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR)
+# 	$(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
+# endif
 
 $(SUBDIRS_INSTALL):
 	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
@ -109,7 +111,7 @@
 +		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \
 	done ; \
 -	if [ "$(OVERWRITE)" = "y" ]; then \
-+	if true; then \
+	if true ; then \
 		echo "Updating asterisk.conf" ; \
 		sed -e 's|^astcachedir.*$$|astcachedir => $(ASTCACHEDIR)|' \
 			-e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
--- a/net/asterisk18/files/patch-configure
+++ b/net/asterisk18/files/patch-configure
@ -1,6 +1,8 @@
--- configure.orig	2023-03-09 21:54:03 UTC
+diff --git configure configure
+index c498ca7a88..2c3fd551d9 100755
+--- configure
 +++ configure
-@@ -4790,8 +4790,6 @@
+@@ -5193,8 +5193,6 @@ case "${host_os}" in
      ;;
      dragonfly*|freebsd*)
      ac_default_prefix=/usr/local
@ -9,16 +11,16 @@
      ;;
      openbsd*)
      ac_default_prefix=/usr/local
-@@ -19579,8 +19577,6 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
+@@ -21762,8 +21760,6 @@ then :
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_SYSINFO 1" >>confdefs.h
+-printf "%s\n" "#define HAVE_SYSINFO 1" >>confdefs.h
 -
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -21196,6 +21192,8 @@
+ else $as_nop
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+@@ -23408,6 +23404,8 @@ printf %s "checking for getifaddrs() support... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@ -26,8 +28,8 @@
 + #include <sys/socket.h>
  #include <ifaddrs.h>
 int
- main ()
-@@ -30633,6 +30631,8 @@
+ main (void)
+@@ -33024,6 +33022,8 @@ fi
 
 for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
 
@ -36,24 +38,25 @@
 if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
    pbxlibdir=""
    # if --with-LUA=DIR has been specified, use it.
-@@ -30647,13 +30647,13 @@
+@@ -33038,14 +33038,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-       as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5
-$as_echo_n "checking for luaL_newstate in -llua${ver}... " >&6; }
+       as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" | $as_tr_sh`
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5
+-printf %s "checking for luaL_newstate in -llua${ver}... " >&6; }
 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5
 +printf %s "checking for luaL_newstate in -llua-${ver}... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
+ if eval test \${$as_ac_Lib+y}
+ then :
+   printf %s "(cached) " >&6
+ else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-llua${ver} ${pbxlibdir} -lm $LIBS"
 +LIBS="-llua-${ver} ${pbxlibdir} -lm $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-@@ -30695,7 +30695,7 @@
+@@ -33086,7 +33086,7 @@ fi
 
    # now check for the header.
    if test "${AST_LUA_FOUND}" = "yes"; then
@ -62,18 +65,18 @@
       # if --with-LUA=DIR has been specified, use it.
       if test "x${LUA_DIR}" != "x"; then
          LUA_INCLUDE="-I${LUA_DIR}/include"
-@@ -30705,8 +30705,8 @@
+@@ -33096,8 +33096,8 @@ fi
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
-         as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"
-+        as_ac_Header=`printf "%s\n" "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh`
+-         as_ac_Header=`printf "%s\n" "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`
+-ac_fn_c_check_header_compile "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"
+         as_ac_Header=`printf "%s\n" "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh`
 +ac_fn_c_check_header_compile "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default"
- if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ if eval test \"x\$"$as_ac_Header"\" = x"yes"
+ then :
   LUA_HEADER_FOUND=1
- else
-@@ -30733,9 +30733,9 @@
+@@ -33124,9 +33124,9 @@ fi
 
 	if test "x${PBX_LUA}" = "x1" ; then
 		if test x"${LUA_DIR}" = x; then
--- a/net/asterisk18/pkg-plist
+++ b/net/asterisk18/pkg-plist
@ -410,6 +410,7 @@ sbin/safe_asterisk
@dir %%DATADIR%%/documentation/thirdparty
@dir %%DATADIR%%/firmware/iax
@dir %%DATADIR%%/images
+@dir %%DATADIR%%/keys/stir_shaken/cache
@dir %%DATADIR%%/keys/stir_shaken
@dir %%DATADIR%%/keys
@dir %%DATADIR%%/moh