From nobody Sat Sep 21 21:51:07 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XB2y36w3Zz5WldR; Sat, 21 Sep 2024 21:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XB2y33j8Rz4pPL; Sat, 21 Sep 2024 21:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726955467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nw5QyAki7HYMJ0QNhkWSp1uo5ENqa9Tc5S14iCdEgvE=; b=uM9cJgqRqSqR11u9dn+TQPRA0rcVzO2C+0TIj3KaUMtN5hzm/0iEgS/xSfaKznGWjQXiyp //z4B7xL/9L0QK17/pfnNp1Nz00ghlaRL+rfSpk8EHY1Kj4JIpOx+pmEdZxuRxJVzRcY/F gUH8rXlp5oRvK3BNXgi6g9m9NYtVL2g71ofbtQKsuKh90bSAr9WcrDo/77AVm4OdSIHBsX 8LSr6PZJFMN9rBofycMr+n6VMStHOvj2/86m8hTrySTziVGKWYsBvxQDKEN2DFVqbWuDu3 8hoaOd/s3mwUIR3tvj7+xrs0EyJ/frYG1oSdZ7jTxMx+mN6BFcB2fDlnQ6s5Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726955467; a=rsa-sha256; cv=none; b=Dv7N8yfQVOfOwK6sydKrKJ/1UghHdIZbI6YIqX124Hwd6HVTrZnaMDn7BNoWxjph+d/gEn 8Kold9j2KkfWUzyC6JJ0bHD+ecFYY14ywolSbkPsFrFtO8Wr6LeeCJc24oPLR8+KBEZk20 bSoZkYCueiPOSjWVuW2Rx1henAZGioy9Wn11FZPOyL/Wnt6N2IA5msxyAq4v9G21jAGi1h H25lN89aa2bW9qVoGpArlTZZaKOPUnbkZi9kZgtAijvzrMv8dCHVGcTijsftk6DvsfddT2 Gqxc0Y1OEv3NekmOjoCn8aQmdCBalV1YolY0kAJwuvlbecUom3V6QZIfAJkzCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726955467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nw5QyAki7HYMJ0QNhkWSp1uo5ENqa9Tc5S14iCdEgvE=; b=B5BcaQCRb4dCtPzb770kTjplYSWzX3jgZDL5jMG7QbaN+truzf5+2qSHppbpG3nXXJiphJ ZdVQ40E6Fhmkoy9Jp5mFoVVWkMNZOkS/EJpWRPt6fEVEjWqw01BTKHqDBtw+BDcsEykj4r L5bywrn3q6g/IIMLzUO42ttEbqhSx26zwSDJ56xvENlMU+/u8IH/YMUIVKeL2e1bnVI65M 87U+oGlVoWxQj+atxKVmaq9NFURt+JBgseLseNx+FDb8tb378BMN6jSBBWTco/eml2P6qB oqai+TSiANSGLa/Ht7TVQvBev5v/uMyEfLfIat/vIhkj9N2F/srltFZ5lSHtsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XB2y33K1KzqJx; Sat, 21 Sep 2024 21:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48LLp7Cv002858; Sat, 21 Sep 2024 21:51:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48LLp7r1002855; Sat, 21 Sep 2024 21:51:07 GMT (envelope-from git) Date: Sat, 21 Sep 2024 21:51:07 GMT Message-Id: <202409212151.48LLp7r1002855@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: db1c49e2f0ca - main - net/asterisk18: update to 18.24.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db1c49e2f0cac098f1a93d9331497ff4d8288a2f Auto-Submitted: auto-generated The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=db1c49e2f0cac098f1a93d9331497ff4d8288a2f commit db1c49e2f0cac098f1a93d9331497ff4d8288a2f Author: Christoph Moench-Tegeder AuthorDate: 2024-09-21 21:50:25 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-09-21 21:50:25 +0000 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 --- net/asterisk18/Makefile | 4 +-- net/asterisk18/distinfo | 10 +++---- net/asterisk18/files/patch-Makefile | 24 ++++++++------- net/asterisk18/files/patch-configure | 57 +++++++++++++++++++----------------- net/asterisk18/pkg-plist | 1 + 5 files changed, 51 insertions(+), 45 deletions(-) diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile index 3829ad8a6aa3..5ab1584427dc 100644 --- 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 diff --git a/net/asterisk18/distinfo b/net/asterisk18/distinfo index 7ddde7fa9054..1835a7a58467 100644 --- 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 diff --git a/net/asterisk18/files/patch-Makefile b/net/asterisk18/files/patch-Makefile index 051f9509b8ab..f95d5e731c28 100644 --- 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)|' \ diff --git a/net/asterisk18/files/patch-configure b/net/asterisk18/files/patch-configure index 755ab0f298ff..0e4e4fa8b72b 100644 --- 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 #include 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 diff --git a/net/asterisk18/pkg-plist b/net/asterisk18/pkg-plist index 9e4a56e0fa2a..38b357b97e64 100644 --- 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