CVS commit: pkgsrc/comms/asterisk21

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/comms/asterisk21
From: "John Nemeth" <jnemeth%netbsd.org@localhost>
Date: Mon, 2 Jun 2025 04:37:03 +0000

Module Name:    pkgsrc
Committed By:   jnemeth
Date:           Mon Jun  2 04:37:03 UTC 2025

Modified Files:
        pkgsrc/comms/asterisk21: Makefile PLIST distinfo
        pkgsrc/comms/asterisk21/patches: patch-configure patch-configure.ac

Log Message:
Upgrade to Asterisk 21.9.1:

pkgsrc changes:
- add gsed to USE_TOOLS
- appease pkglint somewhat
- PR/58978 -- comms/asterisk build fails if prefix is not /usr/pkg

## Change Log for Release asterisk-21.9.1

### Links:

 - [Full ChangeLog](https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-21.9.1.html)
 - [GitHub Diff](https://github.com/asterisk/asterisk/compare/21.9.0...21.9.1)

### Summary:

- Commits: 2
- Commit Authors: 1
- Issues Resolved: 0
- Security Advisories Resolved: 2
  - [GHSA-2grh-7mhv-fcfw](https://github.com/asterisk/asterisk/security/advisories/GHSA-2grh-7mhv-fcfw): Using malformed From header can forge identity with ";" or NULL in name portion
  - [GHSA-c7p6-7mvq-8jq2](https://github.com/asterisk/asterisk/security/advisories/GHSA-c7p6-7mvq-8jq2): cli_permissions.conf: deny option does not work for disallowing shell commands

### User Notes:

- #### asterisk.c: Add option to restrict shell access from remote consoles.
  A new asterisk.conf option 'disable_remote_console_shell' has
  been added that, when set, will prevent remote consoles from executing
  shell commands using the '!' prefix.
  Resolves: #GHSA-c7p6-7mvq-8jq2

### Commit Authors:

- George Joseph: (2)

## Issue and Commit Detail:

### Closed Issues:

  - !GHSA-2grh-7mhv-fcfw: Using malformed From header can forge identity with ";" or NULL in name portion
  - !GHSA-c7p6-7mvq-8jq2: cli_permissions.conf: deny option does not work for disallowing shell commands

### Commits By Author:

- #### George Joseph (2):
  - res_pjsip_messaging.c: Mask control characters in received From display name
  - asterisk.c: Add option to restrict shell access from remote consoles.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/comms/asterisk21/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/comms/asterisk21/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/comms/asterisk21/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/comms/asterisk21/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/asterisk21/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/comms/asterisk21/Makefile
diff -u pkgsrc/comms/asterisk21/Makefile:1.14 pkgsrc/comms/asterisk21/Makefile:1.15
--- pkgsrc/comms/asterisk21/Makefile:1.14       Mon May 19 06:57:34 2025
+++ pkgsrc/comms/asterisk21/Makefile    Mon Jun  2 04:37:03 2025
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2025/05/19 06:57:34 jnemeth Exp $
+# $NetBSD: Makefile,v 1.15 2025/06/02 04:37:03 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-21.9.0
+DISTNAME=      asterisk-21.9.1
 CATEGORIES=    comms net audio
 MASTER_SITES=  https://downloads.asterisk.org/pub/telephony/asterisk/
 MASTER_SITES+= https://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -29,7 +29,7 @@ CONFLICTS+=   asterisk-sounds-extra-[0-9]*
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=            bison gmake perl:run pkg-config tar bash:run
+USE_TOOLS+=            bison gmake perl:run pkg-config tar bash:run gsed
 USE_LANGUAGES=         c c++
 REPLACE_BASH+=         contrib/scripts/astversion
 REPLACE_BASH+=         contrib/scripts/ast_coredumper
@@ -239,7 +239,7 @@ CONF_FILES_PERMS+=          ${ASTEXAMPLEDIR}/${f
 
 PTHREAD_OPTS+= require native
 
-.if (${OPSYS} == "Darwin" && exists(/usr/include/sys/poll.h))
+.if ${OPSYS} == "Darwin" && exists(/usr/include/sys/poll.h)
 post-patch:
        ${ECHO} "#include <sys/poll.h>" > ${WRKSRC}/include/asterisk/poll-compat.h
 .endif
@@ -269,8 +269,10 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-21.7.0.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
        ${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-21.8.0.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
        ${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-21.9.0.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+       ${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-21.9.1.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
        ${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-21.8.0.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
        ${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-21.9.0.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+       ${INSTALL_DATA} ${WRKSRC}/ChangeLogs/ChangeLog-21.9.1.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
        ${INSTALL_DATA} ${WRKSRC}/ChangeLogs/historical/CHANGES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
        ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
        ${INSTALL_DATA} ${WRKSRC}/README-SERIOUSLY.bestpractices.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}

Index: pkgsrc/comms/asterisk21/PLIST
diff -u pkgsrc/comms/asterisk21/PLIST:1.4 pkgsrc/comms/asterisk21/PLIST:1.5
--- pkgsrc/comms/asterisk21/PLIST:1.4   Mon May 19 06:57:34 2025
+++ pkgsrc/comms/asterisk21/PLIST       Mon Jun  2 04:37:03 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2025/05/19 06:57:34 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/06/02 04:37:03 jnemeth Exp $
 lib/asterisk/libasteriskpj.so
 lib/asterisk/libasteriskpj.so.2
 lib/asterisk/modules/app_adsiprog.so
@@ -2334,6 +2334,8 @@ share/doc/asterisk/ChangeLog-21.8.0.html
 share/doc/asterisk/ChangeLog-21.8.0.md
 share/doc/asterisk/ChangeLog-21.9.0.html
 share/doc/asterisk/ChangeLog-21.9.0.md
+share/doc/asterisk/ChangeLog-21.9.1.html
+share/doc/asterisk/ChangeLog-21.9.1.md
 share/doc/asterisk/IAX2-security.pdf
 share/doc/asterisk/IAX2-security.txt
 share/doc/asterisk/LICENSE

Index: pkgsrc/comms/asterisk21/distinfo
diff -u pkgsrc/comms/asterisk21/distinfo:1.5 pkgsrc/comms/asterisk21/distinfo:1.6
--- pkgsrc/comms/asterisk21/distinfo:1.5        Mon May 19 06:57:34 2025
+++ pkgsrc/comms/asterisk21/distinfo    Mon Jun  2 04:37:03 2025
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.5 2025/05/19 06:57:34 jnemeth Exp $
+$NetBSD: distinfo,v 1.6 2025/06/02 04:37:03 jnemeth Exp $
 
-BLAKE2s (asterisk-21.9.0/asterisk-21.9.0.tar.gz) = 6e8c4ed63d421541a7a230645984be397287a7e4c4a85da2e1f95bfc74237511
-SHA512 (asterisk-21.9.0/asterisk-21.9.0.tar.gz) = ec9659589897361cfd4c4b8d55c197a6c0b06fe1c2afbf7687a098b04265bc88d9a4f4df08676ef0bc364e7629e0096e528e78a3967510a7ab22c7fdfdcb62b1
-Size (asterisk-21.9.0/asterisk-21.9.0.tar.gz) = 26492636 bytes
-BLAKE2s (asterisk-21.9.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f7e5fe212d7e7cdca14c52527a2552311ab7762c3f1464b09ddedc7c66aebde
-SHA512 (asterisk-21.9.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
-Size (asterisk-21.9.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes
-BLAKE2s (asterisk-21.9.0/pjproject-2.15.1.md5) = 1bdb00828816aff69f43eaacd084bd7d0a48670af33110bd0cd6325ead45aa48
-SHA512 (asterisk-21.9.0/pjproject-2.15.1.md5) = 75963b64e702a5810fd5b8b574a07396cab1a87543d806135e7a9b9762d35129354f99283252f40ad75a6a94cd1921f164ed8e63174de0c5430e5c6913d21744
-Size (asterisk-21.9.0/pjproject-2.15.1.md5) = 172 bytes
-BLAKE2s (asterisk-21.9.0/pjproject-2.15.1.tar.bz2) = 2bcb38884531f0be966c78b6bac45ac63d8c612c060da91c584d192fe0fdf9cd
-SHA512 (asterisk-21.9.0/pjproject-2.15.1.tar.bz2) = c080eb44b49fccadb1c76ff2b3221935b0d531a1e2087b47c21b4ec2cdd8ee0e62b13c334495c9c759b348a0792204611987089a6aa6264999f0116aec8dbdfd
-Size (asterisk-21.9.0/pjproject-2.15.1.tar.bz2) = 8492214 bytes
+BLAKE2s (asterisk-21.9.1/asterisk-21.9.1.tar.gz) = c60af39bfa030808cef5752b7443d78ffc74e832929a906432b2978f44d06005
+SHA512 (asterisk-21.9.1/asterisk-21.9.1.tar.gz) = 7212be039a16602a333c623b76b5f3c829bd058825eec6151b59338bc405f43ae535d92fddcf9e5f2f9f1c0745ceacabda6549580f2d265e44ce088f7fe331e1
+Size (asterisk-21.9.1/asterisk-21.9.1.tar.gz) = 26493632 bytes
+BLAKE2s (asterisk-21.9.1/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f7e5fe212d7e7cdca14c52527a2552311ab7762c3f1464b09ddedc7c66aebde
+SHA512 (asterisk-21.9.1/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
+Size (asterisk-21.9.1/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes
+BLAKE2s (asterisk-21.9.1/pjproject-2.15.1.md5) = 1bdb00828816aff69f43eaacd084bd7d0a48670af33110bd0cd6325ead45aa48
+SHA512 (asterisk-21.9.1/pjproject-2.15.1.md5) = 75963b64e702a5810fd5b8b574a07396cab1a87543d806135e7a9b9762d35129354f99283252f40ad75a6a94cd1921f164ed8e63174de0c5430e5c6913d21744
+Size (asterisk-21.9.1/pjproject-2.15.1.md5) = 172 bytes
+BLAKE2s (asterisk-21.9.1/pjproject-2.15.1.tar.bz2) = 2bcb38884531f0be966c78b6bac45ac63d8c612c060da91c584d192fe0fdf9cd
+SHA512 (asterisk-21.9.1/pjproject-2.15.1.tar.bz2) = c080eb44b49fccadb1c76ff2b3221935b0d531a1e2087b47c21b4ec2cdd8ee0e62b13c334495c9c759b348a0792204611987089a6aa6264999f0116aec8dbdfd
+Size (asterisk-21.9.1/pjproject-2.15.1.tar.bz2) = 8492214 bytes
 SHA1 (patch-Makefile) = 5cf3b6937ec23a82e4d056b91e493a36bc1089b9
 SHA1 (patch-addons_chan__ooh323.c) = 1775da7ca2129a962ed460bd1e78ba3ce6afa62c
 SHA1 (patch-apps_app__adsiprog.c) = 031139e5cd1ef6bb2afb0a74fee3d752eded0a2c
@@ -30,8 +30,8 @@ SHA1 (patch-cel_cel__pgsql.c) = b280efab
 SHA1 (patch-channels_chan__pjsip.c) = efd4cbb82133fc5ddf7de70d01c99e185c585211
 SHA1 (patch-channels_pjsip_cli__commands.c) = 01baa9d242e3af02a1f3540cfb3064ad68c71d67
 SHA1 (patch-channels_pjsip_dialplan__functions.c) = 2cf8199c4ec9d4894eb922c2703d49ecc06188ef
-SHA1 (patch-configure) = 03e0de2aef9ba3143c0c457d9ec658483a2570ab
-SHA1 (patch-configure.ac) = b972730a2be3bf54502116f1f7e03afee76a02cc
+SHA1 (patch-configure) = a73d5466342c79be9dac3a46796684cebed5ea10
+SHA1 (patch-configure.ac) = 511a3ecbbb404263d4d6c4773b0a0ad44c9adf6e
 SHA1 (patch-contrib_scripts_vmail.cgi) = 7935ce96ea319eb19cc2ce999813eb837d5357c0
 SHA1 (patch-funcs_func__cdr.c) = 79c743df264948e5ea9e1c292012a1f6362d0c1e
 SHA1 (patch-funcs_func__channel.c) = 9d6ed8a2431fbde6879782d8228030467aabe7eb

Index: pkgsrc/comms/asterisk21/patches/patch-configure
diff -u pkgsrc/comms/asterisk21/patches/patch-configure:1.2 pkgsrc/comms/asterisk21/patches/patch-configure:1.3
--- pkgsrc/comms/asterisk21/patches/patch-configure:1.2 Mon May 19 06:57:35 2025
+++ pkgsrc/comms/asterisk21/patches/patch-configure     Mon Jun  2 04:37:03 2025
@@ -1,8 +1,33 @@
-$NetBSD: patch-configure,v 1.2 2025/05/19 06:57:35 jnemeth Exp $
+$NetBSD: patch-configure,v 1.3 2025/06/02 04:37:03 jnemeth Exp $
 
---- configure.orig     2025-05-08 12:34:42.000000000 +0000
+regen from configure.ac
+
+--- configure.orig     2025-05-22 15:57:26.000000000 +0000
 +++ configure
-@@ -20890,12 +20890,12 @@ else case e in #(
+@@ -5169,13 +5169,9 @@ esac
+ case "${host_os}" in
+      netbsd*)
+      ac_default_prefix=/usr/pkg
+-     CPPFLAGS=-I/usr/pkg/include
+-     LDFLAGS=-L/usr/pkg/lib
+      ;;
+      dragonfly*|freebsd*)
+      ac_default_prefix=/usr/local
+-     CPPFLAGS=-I/usr/local/include
+-     LDFLAGS=-L/usr/local/lib
+      ;;
+      openbsd*)
+      ac_default_prefix=/usr/local
+@@ -5187,8 +5183,6 @@ case "${host_os}" in
+            astmandir=/usr/share/man
+         fi
+      fi
+-     CPPFLAGS=-I/usr/local/include
+-     LDFLAGS=-L/usr/local/lib
+      ;;
+      darwin*)
+      ac_default_prefix=/usr/local
+@@ -20890,12 +20884,12 @@ else case e in #(
    e)
                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang -fblocks" >&5
  printf %s "checking for clang -fblocks... " >&6; }
@@ -17,7 +42,7 @@ $NetBSD: patch-configure,v 1.2 2025/05/1
                                AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime"
                                AST_CLANG_BLOCKS="-fblocks"
                                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -32921,6 +32921,145 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -32921,6 +32915,145 @@ rm -f core conftest.err conftest.$ac_obj
        CPPFLAGS="${saved_cppflags}"
      fi
  

Index: pkgsrc/comms/asterisk21/patches/patch-configure.ac
diff -u pkgsrc/comms/asterisk21/patches/patch-configure.ac:1.1 pkgsrc/comms/asterisk21/patches/patch-configure.ac:1.2
--- pkgsrc/comms/asterisk21/patches/patch-configure.ac:1.1      Mon Apr  8 03:20:07 2024
+++ pkgsrc/comms/asterisk21/patches/patch-configure.ac  Mon Jun  2 04:37:03 2025
@@ -1,8 +1,39 @@
-$NetBSD: patch-configure.ac,v 1.1 2024/04/08 03:20:07 jnemeth Exp $
+$NetBSD: patch-configure.ac,v 1.2 2025/06/02 04:37:03 jnemeth Exp $
 
---- configure.ac.orig  2021-03-04 16:46:08.000000000 +0000
+1. Don't clear CPPFLAGS/LDFLAGS and impose /usr/pkg or /usr/local;
+   pkgsrc will handle its own prefix, which may not be /usr/pkg in
+   which case asterisk should absolutely never look at /usr/pkg.
+2. Ditto.
+3. Standard poll is in <poll.h> -- check for that, not <sys/poll.h>.
+4. Check for strftime_l.
+5. Standard poll is in <poll.h> -- check for that, not <sys/poll.h>.
+
+--- configure.ac.orig  2025-05-22 15:57:26.000000000 +0000
 +++ configure.ac
-@@ -751,7 +751,7 @@ AC_CHECK_HEADERS([xlocale.h])
+@@ -65,13 +65,9 @@ esac
+ case "${host_os}" in
+      netbsd*)
+      ac_default_prefix=/usr/pkg
+-     CPPFLAGS=-I/usr/pkg/include
+-     LDFLAGS=-L/usr/pkg/lib
+      ;;
+      dragonfly*|freebsd*)
+      ac_default_prefix=/usr/local
+-     CPPFLAGS=-I/usr/local/include
+-     LDFLAGS=-L/usr/local/lib
+      ;;
+      openbsd*)
+      ac_default_prefix=/usr/local
+@@ -83,8 +79,6 @@ case "${host_os}" in
+            astmandir=/usr/share/man
+         fi
+      fi
+-     CPPFLAGS=-I/usr/local/include
+-     LDFLAGS=-L/usr/local/lib
+      ;;
+      darwin*)
+      ac_default_prefix=/usr/local
+@@ -828,7 +822,7 @@ AC_CHECK_HEADERS([xlocale.h])
  
  AC_CHECK_HEADERS([winsock.h winsock2.h])
  
@@ -11,7 +42,7 @@ $NetBSD: patch-configure.ac,v 1.1 2024/0
         [],
       AC_DEFINE([AST_POLL_COMPAT], 1, [Define to 1 if internal poll should be used.]))
  
-@@ -803,7 +803,7 @@ AC_FUNC_STRNLEN
+@@ -880,7 +874,7 @@ AC_FUNC_STRNLEN
  AC_FUNC_STRTOD
  AC_FUNC_UTIME_NULL
  AC_FUNC_VPRINTF
@@ -20,7 +51,7 @@ $NetBSD: patch-configure.ac,v 1.1 2024/0
  
  AC_MSG_CHECKING(for htonll)
  AC_LINK_IFELSE(
-@@ -872,9 +872,9 @@ AC_SUBST(PBX_DYNAMIC_LIST)
+@@ -949,9 +943,9 @@ AC_SUBST(PBX_DYNAMIC_LIST)
  LDFLAGS=${old_LDFLAGS}
  rm -f conftest.dynamics

Prev by Date: CVS commit: pkgsrc/comms/asterisk18
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/comms/asterisk18
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index