git: b91ba3195882 - 2025Q2 - net/asterisk22: Update 22.3.0 → 22.4.0

The branch 2025Q2 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b91ba3195882cac294e9b2c430831492a810a269

commit b91ba3195882cac294e9b2c430831492a810a269
Author:     Oleksandr Kryvulia <o.kryvulia@flex-it.com.ua>
AuthorDate: 2025-05-09 12:46:51 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-05-09 12:50:52 +0000

    net/asterisk22: Update 22.3.0 → 22.4.0
    
    ChangeLog:
    https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-22.4.0.html
    
    Fix loading pjsip modules on CURRENT
    
    PR:             286693 285736
    Sponsored by:   FLEX-IT LLC
    MFH:            2025Q2
    
    (cherry picked from commit c320ebd915d1bb1f4366031cbe4ef15c8fd92f29)
---
 net/asterisk22/Makefile                                       |  6 +++++-
 net/asterisk22/distinfo                                       |  6 +++---
 .../files/extra-patch-third-party_pjproject_Makefile          | 11 +++++++++++
 net/asterisk22/files/patch-third-party_pjproject_Makefile     |  9 ---------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/net/asterisk22/Makefile b/net/asterisk22/Makefile
index e6f7ef90f2fa..41826adfd475 100644
--- a/net/asterisk22/Makefile
+++ b/net/asterisk22/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	asterisk
-DISTVERSION=	22.3.0
+DISTVERSION=	22.4.0
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
@@ -218,6 +218,10 @@ PJSIP_VERSION=	2.15.1
 
 .include <bsd.port.pre.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500026
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-third-party_pjproject_Makefile
+.endif
+
 .if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base) || \
 	${SSL_DEFAULT:Mopenssl3*}
 LIB_DEPENDS+=	libgnutls.so:security/gnutls
diff --git a/net/asterisk22/distinfo b/net/asterisk22/distinfo
index 1296018e5df5..8d20afcdf021 100644
--- a/net/asterisk22/distinfo
+++ b/net/asterisk22/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1743221604
-SHA256 (asterisk/asterisk-22.3.0.tar.gz) = 9cd9a29db5ebff861431f85b317a1f8263d49587f596886df1fcd298bd545593
-SIZE (asterisk/asterisk-22.3.0.tar.gz) = 26299340
+TIMESTAMP = 1746767807
+SHA256 (asterisk/asterisk-22.4.0.tar.gz) = 7fb2a95769de30b9d5c672ff071b64d939c2f62576a302033caf9e4c3b6996b7
+SIZE (asterisk/asterisk-22.4.0.tar.gz) = 26323494
 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.6.tar.gz) = b49dec15e07bb9bff6af0da3a07180651a38ef54d3ea54a3f20c35f081ed8714
 SIZE (asterisk/asterisk-core-sounds-en-g729-1.6.tar.gz) = 1557798
 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk22/files/extra-patch-third-party_pjproject_Makefile b/net/asterisk22/files/extra-patch-third-party_pjproject_Makefile
new file mode 100644
index 000000000000..87eef1e94182
--- /dev/null
+++ b/net/asterisk22/files/extra-patch-third-party_pjproject_Makefile
@@ -0,0 +1,11 @@
+--- third-party/pjproject/Makefile.orig	2022-02-03 12:25:09 UTC
++++ third-party/pjproject/Makefile
+@@ -212,7 +208,7 @@ $(ALL_LIB_FILES): source/build.mak source/pjlib/includ
+ 
+ pjproject.symbols: $(ALL_LIB_FILES)
+ 	$(ECHO_PREFIX) Generating symbols
+-	$(CMD_PREFIX) $(NM) -Pog $(ALL_LIB_FILES) | $(SED) -n -E -e "s/.+: ([_]?[pP][jJ][^ ]+) .+/\1/gp" | sort -u > pjproject.symbols
++	$(CMD_PREFIX) $(NM) -Pog $(ALL_LIB_FILES) | $(SED) -n -r -e "s/^([pP][jJ][^ ]+) .+/\1/gp" | sort -u > pjproject.symbols
+ 
+ source/pjsip-apps/src/asterisk_malloc_debug.c: patches/asterisk_malloc_debug.c
+ 	$(ECHO_PREFIX) Copying $< to $@
diff --git a/net/asterisk22/files/patch-third-party_pjproject_Makefile b/net/asterisk22/files/patch-third-party_pjproject_Makefile
index dcfd4d618e80..c9a1732c0d27 100644
--- a/net/asterisk22/files/patch-third-party_pjproject_Makefile
+++ b/net/asterisk22/files/patch-third-party_pjproject_Makefile
@@ -19,12 +19,3 @@
  		rm -rf source pjproject-*/ $(REALLY_QUIET) || : ;\
  		$(TAR) -xjf $< ;\
  		mv pjproject-$(PJPROJECT_VERSION) source
-@@ -212,7 +208,7 @@ $(ALL_LIB_FILES): source/build.mak source/pjlib/includ
- 
- pjproject.symbols: $(ALL_LIB_FILES)
- 	$(ECHO_PREFIX) Generating symbols
--	$(CMD_PREFIX) $(NM) -Pog $(ALL_LIB_FILES) | $(SED) -n -E -e "s/.+: ([_]?[pP][jJ][^ ]+) .+/\1/gp" | sort -u > pjproject.symbols
-+	$(CMD_PREFIX) $(NM) -Pog $(ALL_LIB_FILES) | $(SED) -n -r -e "s/^([pP][jJ][^ ]+) .+/\1/gp" | sort -u > pjproject.symbols
- 
- source/pjsip-apps/src/asterisk_malloc_debug.c: patches/asterisk_malloc_debug.c
- 	$(ECHO_PREFIX) Copying $< to $@