Mon Mar 25 03:36:33 2024 UTC (64d)
Update to Asterisk 18.22.0:

pkgsrc changes
- adapt for newer version of pjsip
- adapt for new dependency (required for STIR/SHAKEN):  libjwt

Change Log for Release asterisk-18.22.0
========================================

Summary:
----------------------------------------

- res_pjsip_stir_shaken.c:  Add checks for missing parameters
- app_dial: Add dial time for progress/ringing.
- app_voicemail: Properly reinitialize config after unit tests.
- app_queue.c : fix "queue add member" usage string
- app_voicemail: Allow preventing mark messages as urgent.
- res_pjsip: Use consistent type for boolean columns.
- attestation_config.c: Use ast_free instead of ast_std_free
- Makefile: Add stir_shaken/cache to directories created on install
- Stir/Shaken Refactor
- alembic: Synchronize alembic heads between supported branches.
- translate.c: implement new direct comp table mode
- README.md: Removed outdated link
- strings.h: Ensure ast_str_buffer(…) returns a 0 terminated string.
- res_rtp_asterisk.c: Correct coefficient in MOS calculation.
- dsp.c: Fix and improve potentially inaccurate log message.
- pjsip show channelstats: Prevent possible segfault when faxing
- Reduce startup/shutdown verbose logging
- configure: Rerun bootstrap on modern platform.
- Upgrade bundled pjproject to 2.14.
- app_speech_utils.c: Allow partial speech results.
- utils: Make behavior of ast_strsep* match strsep.
- app_chanspy: Add 'D' option for dual-channel audio
- app_if: Fix next priority calculation.
- res_pjsip_t38.c: Permit IPv6 SDP connection addresses.
- BuildSystem: Bump autotools versions on OpenBSD.
- main/utils: Simplify the FreeBSD ast_get_tid() handling
- res_pjsip_session.c: Correctly format SDP connection addresses.
- rtp_engine.c: Correct sample rate typo for L16/44100.
- manager.c: Fix erroneous reloads in UpdateConfig.
- res_calendar_icalendar: Print iCalendar error on parsing failure.
- app_confbridge: Don't emit warnings on valid configurations.
- app_voicemail: add NoOp alembic script to maintain sync
- chan_dahdi: Allow MWI to be manually toggled on channels.
- chan_rtp.c: MulticastRTP missing refcount without codec option
- chan_rtp.c: Change MulticastRTP nameing to avoid memory leak
- func_frame_trace: Add CLI command to dump frame queue.

User Notes:
----------------------------------------

- ### app_dial: Add dial time for progress/ringing.
  The timeout argument to Dial now allows
  specifying the maximum amount of time to dial if
  early media is not received.

- ### app_voicemail: Allow preventing mark messages as urgent.
  The leaveurgent mailbox option can now be used to
  control whether callers may leave messages marked as 'Urgent'.

- ### Stir/Shaken Refactor
  Asterisk's stir-shaken feature has been refactored to
  correct interoperability, RFC compliance, and performance issues.
  See https://docs.asterisk.org/Deployment/STIR-SHAKEN for more
  information.

- ### Upgrade bundled pjproject to 2.14.
  Bundled pjproject has been upgraded to 2.14. For more
  information on what all is included in this change, check out the
  pjproject Github page: https://github.com/pjsip/pjproject/releases

- ### app_speech_utils.c: Allow partial speech results.
  The SpeechBackground dialplan application now supports a 'p'
  option that will return partial results from speech engines that
  provide them when a timeout occurs.

- ### app_chanspy: Add 'D' option for dual-channel audio
  The ChanSpy application now accepts the 'D' option which
  will interleave the spied audio within the outgoing frames. The
  purpose of this is to allow the audio to be read as a Dual channel
  stream with separate incoming and outgoing audio. Setting both the
  'o' option and the 'D' option and results in the 'D' option being
  ignored.

- ### chan_dahdi: Allow MWI to be manually toggled on channels.
  The 'dahdi set mwi' now allows MWI on channels
  to be manually toggled if needed for troubleshooting.
  Resolves: #440

Upgrade Notes:
----------------------------------------

- ### Stir/Shaken Refactor
  The stir-shaken refactor is a breaking change but since
  it's not working now we don't think it matters. The
  stir_shaken.conf file has changed significantly which means that
  existing ones WILL need to be changed.  The stir_shaken.conf.sample
  file in configs/samples/ has quite a bit more information.  This is
  also an ABI breaking change since some of the existing objects
  needed to be changed or removed, and new ones added.  Additionally,
  if res_stir_shaken is enabled in menuselect, you'll need to either
  have the development package for libjwt v1.15.3 installed or use
  the --with-libjwt-bundled option with ./configure.


(jnemeth)
diff -r1.156 -r1.157 pkgsrc/comms/asterisk18/Makefile
diff -r1.74 -r1.75 pkgsrc/comms/asterisk18/distinfo
diff -r1.4 -r1.5 pkgsrc/comms/asterisk18/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/comms/asterisk18/patches/patch-main_config.c
diff -r1.2 -r1.3 pkgsrc/comms/asterisk18/patches/patch-main_utils.c

cvs diff -r1.156 -r1.157 pkgsrc/comms/asterisk18/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/Makefile 2024/02/19 05:59:51 1.156
+++ pkgsrc/comms/asterisk18/Makefile 2024/03/25 03:36:33 1.157
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.156 2024/02/19 05:59:51 jnemeth Exp $ 1# $NetBSD: Makefile,v 1.157 2024/03/25 03:36:33 jnemeth Exp $
2# 2#
3# NOTE: when updating this package, there are two places that sound 3# NOTE: when updating this package, there are two places that sound
4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile 4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
5# to find out the current sound file versions 5# to find out the current sound file versions
6# Also look in ${WRKSRC}/third-party/versions.mak for pjproject 6# Also look in ${WRKSRC}/third-party/versions.mak for pjproject
 7# and libjwt
7 8
8DISTNAME= asterisk-18.21.0 9DISTNAME= asterisk-18.22.0
9#PKGREVISION= 24 10#PKGREVISION= 24
10CATEGORIES= comms net audio 11CATEGORIES= comms net audio
11MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ 12MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/
12MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ 13MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
13MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/ 14MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/
14DIST_SUBDIR= ${PKGNAME_NOREV} 15DIST_SUBDIR= ${PKGNAME_NOREV}
15DISTFILES= ${DEFAULT_DISTFILES} 16DISTFILES= ${DEFAULT_DISTFILES}
16 17
17COMMENT= The Asterisk Software PBX 18COMMENT= The Asterisk Software PBX
18LICENSE= gnu-gpl-v2 19LICENSE= gnu-gpl-v2
19 20
20EXTRACT_ONLY= ${DISTNAME}.tar.gz 21EXTRACT_ONLY= ${DISTNAME}.tar.gz
21OWNER= jnemeth@NetBSD.org 22OWNER= jnemeth@NetBSD.org
@@ -37,26 +38,27 @@ REPLACE_BASH+= contrib/scripts/ast_core @@ -37,26 +38,27 @@ REPLACE_BASH+= contrib/scripts/ast_core
37REPLACE_BASH+= contrib/scripts/ast_logescalator 38REPLACE_BASH+= contrib/scripts/ast_logescalator
38REPLACE_BASH+= contrib/scripts/ast_loggrabber 39REPLACE_BASH+= contrib/scripts/ast_loggrabber
39REPLACE_PERL+= agi/DialAnMp3.agi agi/agi-test.agi 40REPLACE_PERL+= agi/DialAnMp3.agi agi/agi-test.agi
40REPLACE_PERL+= agi/fastagi-test agi/jukebox.agi agi/numeralize 41REPLACE_PERL+= agi/fastagi-test agi/jukebox.agi agi/numeralize
41REPLACE_PERL+= contrib/scripts/vmail.cgi 42REPLACE_PERL+= contrib/scripts/vmail.cgi
42REPLACE_PYTHON+= contrib/scripts/reflocks.py contrib/scripts/refstats.py 43REPLACE_PYTHON+= contrib/scripts/reflocks.py contrib/scripts/refstats.py
43 44
44CHECK_INTERPRETER_SKIP+= libdata/asterisk/scripts/refcounter.py 45CHECK_INTERPRETER_SKIP+= libdata/asterisk/scripts/refcounter.py
45 46
46GNU_CONFIGURE= yes 47GNU_CONFIGURE= yes
47CONFIGURE_ARGS+= --datarootdir=${PREFIX}/libdata 48CONFIGURE_ARGS+= --datarootdir=${PREFIX}/libdata
48CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 49CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
49CONFIGURE_ARGS+= --without-gtk2 50CONFIGURE_ARGS+= --without-gtk2
 51CONFIGURE_ARGS+= --with-libjwt-bundled=yes
50# XXX remove when lang/lua gets builtin.mk 52# XXX remove when lang/lua gets builtin.mk
51CONFIGURE_ARGS+= --without-lua 53CONFIGURE_ARGS+= --without-lua
52 54
53.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 069900 55.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 069900
54CONFIGURE_ARGS+= --without-srtp 56CONFIGURE_ARGS+= --without-srtp
55.else 57.else
56CONFIGURE_ARGS+= --with-srtp 58CONFIGURE_ARGS+= --with-srtp
57PLIST.srtp= YES 59PLIST.srtp= YES
58.include "../../comms/srtp/buildlink3.mk" 60.include "../../comms/srtp/buildlink3.mk"
59.endif 61.endif
60 62
61INSTALL_TARGET= install samples 63INSTALL_TARGET= install samples
62INSTALLATION_DIRS+= lib/pkgconfig share/doc/${PKGBASE} 64INSTALLATION_DIRS+= lib/pkgconfig share/doc/${PKGBASE}
@@ -150,34 +152,42 @@ PLIST_VARS+= unbound @@ -150,34 +152,42 @@ PLIST_VARS+= unbound
150.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 090000 && \ 152.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 090000 && \
151 exists(/usr/include/unbound.h) 153 exists(/usr/include/unbound.h)
152PLIST.unbound= yes 154PLIST.unbound= yes
153.else 155.else
154CONFIGURE_ARGS+= --without-unbound 156CONFIGURE_ARGS+= --without-unbound
155.endif 157.endif
156 158
157.include "options.mk" 159.include "options.mk"
158 160
159# check sounds/Makefile for current version when upgrading package 161# check sounds/Makefile for current version when upgrading package
160DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.2.tar.gz 162DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.2.tar.gz
161 163
162# pjproject 164# pjproject
163PJPROJ_VERSION= 2.13.1 165PJPROJ_VERSION= 2.14
164SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \ 166SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \
165 -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/pjproject-${PJPROJ_VERSION}.tar.bz2 167 -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/pjproject-${PJPROJ_VERSION}.tar.bz2
166SITES.pjproject-${PJPROJ_VERSION}.md5= \ 168SITES.pjproject-${PJPROJ_VERSION}.md5= \
167 -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/MD5SUM.TXT 169 -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/MD5SUM.TXT
168DISTFILES+= pjproject-${PJPROJ_VERSION}.tar.bz2 pjproject-${PJPROJ_VERSION}.md5 170DISTFILES+= pjproject-${PJPROJ_VERSION}.tar.bz2 pjproject-${PJPROJ_VERSION}.md5
169ALL_ENV+= EXTERNALS_CACHE_DIR=${DISTDIR}/${DIST_SUBDIR} 171ALL_ENV+= EXTERNALS_CACHE_DIR=${DISTDIR}/${DIST_SUBDIR}
170 172
 173# libjwt
 174LIBJWT_VERSION= 1.15.3
 175SITES.libjwt-${LIBJWT_VERSION}.tar.gz= \
 176 -https://raw.githubusercontent.com/asterisk/third-party/master/libjwt/${LIBJWT_VERSION}/libjwt-${LIBJWT_VERSION}.tar.gz
 177SITES.libjwt-${LIBJWT_VERSION}.md5= \
 178 -https://raw.githubusercontent.com/asterisk/third-party/master/libjwt/${LIBJWT_VERSION}/MD5SUM.TXT
 179DISTFILES+= libjwt-${LIBJWT_VERSION}.tar.gz libjwt-${LIBJWT_VERSION}.md5
 180
171# Override default paths in config files 181# Override default paths in config files
172SUBST_CLASSES+= configs 182SUBST_CLASSES+= configs
173SUBST_STAGE.configs= pre-configure 183SUBST_STAGE.configs= pre-configure
174SUBST_FILES.configs= configs/samples/cli_aliases.conf.sample 184SUBST_FILES.configs= configs/samples/cli_aliases.conf.sample
175SUBST_FILES.configs+= configs/samples/festival.conf.sample 185SUBST_FILES.configs+= configs/samples/festival.conf.sample
176SUBST_FILES.configs+= configs/samples/http.conf.sample 186SUBST_FILES.configs+= configs/samples/http.conf.sample
177SUBST_FILES.configs+= configs/samples/iax.conf.sample 187SUBST_FILES.configs+= configs/samples/iax.conf.sample
178SUBST_FILES.configs+= configs/samples/musiconhold.conf.sample 188SUBST_FILES.configs+= configs/samples/musiconhold.conf.sample
179SUBST_FILES.configs+= configs/samples/osp.conf.sample 189SUBST_FILES.configs+= configs/samples/osp.conf.sample
180SUBST_FILES.configs+= configs/samples/phoneprov.conf.sample 190SUBST_FILES.configs+= configs/samples/phoneprov.conf.sample
181SUBST_FILES.configs+= configs/samples/res_config_sqlite.conf.sample 191SUBST_FILES.configs+= configs/samples/res_config_sqlite.conf.sample
182#SUBST_FILES.configs+= configs/samples/sla.conf.sample 192#SUBST_FILES.configs+= configs/samples/sla.conf.sample
183SUBST_SED.configs+= -e 's|doc/|${PREFIX}/share/doc/${PKGBASE}/|' 193SUBST_SED.configs+= -e 's|doc/|${PREFIX}/share/doc/${PKGBASE}/|'

cvs diff -r1.74 -r1.75 pkgsrc/comms/asterisk18/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/distinfo 2024/02/19 05:59:51 1.74
+++ pkgsrc/comms/asterisk18/distinfo 2024/03/25 03:36:33 1.75
@@ -1,91 +1,97 @@ @@ -1,91 +1,97 @@
1$NetBSD: distinfo,v 1.74 2024/02/19 05:59:51 jnemeth Exp $ 1$NetBSD: distinfo,v 1.75 2024/03/25 03:36:33 jnemeth Exp $
2 2
3BLAKE2s (asterisk-18.21.0/asterisk-18.21.0.tar.gz) = dee2f2c4205d419c30a7d35dafc8dbaf42889cb1879288521a4789302640458b 3BLAKE2s (asterisk-18.22.0/asterisk-18.22.0.tar.gz) = b888fb15642994382ba95a80c54cc38d2c54e855edc66b2e3e0842b712b21e2c
4SHA512 (asterisk-18.21.0/asterisk-18.21.0.tar.gz) = 4a3c57af70b74918b61e1c67423667a876fcc519376f1795054a55700acb5d05da8e4e0a3e3187760203bc262678a6c29eae07ed2a5e2df84a9a555ec79cb48f 4SHA512 (asterisk-18.22.0/asterisk-18.22.0.tar.gz) = 539cd347400c6402462164b53dc75ec8953bb32398d30b0b3e2b4020490e26188c02def2ac1a225f8e52ddb4a1e28aac75de5f25c68ad5e012165771e9519452
5Size (asterisk-18.21.0/asterisk-18.21.0.tar.gz) = 28446501 bytes 5Size (asterisk-18.22.0/asterisk-18.22.0.tar.gz) = 28489141 bytes
6BLAKE2s (asterisk-18.21.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f7e5fe212d7e7cdca14c52527a2552311ab7762c3f1464b09ddedc7c66aebde 6BLAKE2s (asterisk-18.22.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f7e5fe212d7e7cdca14c52527a2552311ab7762c3f1464b09ddedc7c66aebde
7SHA512 (asterisk-18.21.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d 7SHA512 (asterisk-18.22.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
8Size (asterisk-18.21.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes 8Size (asterisk-18.22.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes
9BLAKE2s (asterisk-18.21.0/pjproject-2.13.1.md5) = 933be89ea03bc24a3a965d37a8985a2af3ea404e24a8fdd296a2be07d5390de0 9BLAKE2s (asterisk-18.22.0/libjwt-1.15.3.md5) = de87f03f88ad834e26bba2159f5d8ed14637377eba58c48ed0701f44994ae1a2
10SHA512 (asterisk-18.21.0/pjproject-2.13.1.md5) = 5a8c35e79d10760f74d02332f35aad3517fc3c72e62e2b1c35fcb1d613bbad4d96fa07f1cea89514dba2d237a36a698e94b1242be938d492d20b76a130c0d0f1 10SHA512 (asterisk-18.22.0/libjwt-1.15.3.md5) = d24818362ec5537c4db58421078c7dc0f8509b89a2802d1e2e6cef6d4c1e817f8304dda486e96187c375b7d1084a1400ac4647ea635f3c9703fa0fadb1c33b44
11Size (asterisk-18.21.0/pjproject-2.13.1.md5) = 172 bytes 11Size (asterisk-18.22.0/libjwt-1.15.3.md5) = 55 bytes
12BLAKE2s (asterisk-18.21.0/pjproject-2.13.1.tar.bz2) = 7c04ae740c66f92502684de834b4055e7f4842bcb35f0efc12f183c8d8c37f7f 12BLAKE2s (asterisk-18.22.0/libjwt-1.15.3.tar.gz) = 45de6898eeef8791e63469ea1a13157e425e6f9f47cb49d2bcd7e3f5c046ab68
13SHA512 (asterisk-18.21.0/pjproject-2.13.1.tar.bz2) = 2f1eb3cb8f52a5536c355b02b1abfa24c7d2263b5338568a7cd8167d349e007c34afafcdd7ed510bfc4fc859494383fac05e8325e46fd66219dbead86c5c3562 13SHA512 (asterisk-18.22.0/libjwt-1.15.3.tar.gz) = 6a99c81258c5302f7dd908f639676d7cfbe09599812cd97ead871cd5962f15e5248b935e1ef643c4dd43bd1ee66d0e12be1b599a6d3b26d461c4b15216a93774
14Size (asterisk-18.21.0/pjproject-2.13.1.tar.bz2) = 7825201 bytes 14Size (asterisk-18.22.0/libjwt-1.15.3.tar.gz) = 489246 bytes
 15BLAKE2s (asterisk-18.22.0/pjproject-2.14.md5) = 8cbd12b39e930e684607202c7cff8036d1fa10c0070f8d5b50c1850095b8b28d
 16SHA512 (asterisk-18.22.0/pjproject-2.14.md5) = ea4c33f75a0cc4afcd7a1f7fd2a53423a182ef16a7abfe2189bce0ef0e6b956c6eb4f89aeabee714dfed0616bfd8f4aa98602b1faeda1671e00ff21a150283d2
 17Size (asterisk-18.22.0/pjproject-2.14.md5) = 166 bytes
 18BLAKE2s (asterisk-18.22.0/pjproject-2.14.tar.bz2) = 1e76da2fa893451c66f41e5c3dd2a7594494c0852947ef2146d6b642550604d0
 19SHA512 (asterisk-18.22.0/pjproject-2.14.tar.bz2) = 5b60a1033c9f09c0fbb5b132229fa99fdc103f8864a7cdeadf217ec47ff6bc784827826f595c4bc76816bc0fbf5cc6e9751cc4f6307eeecb7c7d8f5d0413d4ac
 20Size (asterisk-18.22.0/pjproject-2.14.tar.bz2) = 8376462 bytes
15SHA1 (patch-Makefile) = 676687f298151dbe548ae26a4f6f3fe8bf1f174e 21SHA1 (patch-Makefile) = 676687f298151dbe548ae26a4f6f3fe8bf1f174e
16SHA1 (patch-addons_chan__ooh323.c) = 1775da7ca2129a962ed460bd1e78ba3ce6afa62c 22SHA1 (patch-addons_chan__ooh323.c) = 1775da7ca2129a962ed460bd1e78ba3ce6afa62c
17SHA1 (patch-apps_app__adsiprog.c) = 031139e5cd1ef6bb2afb0a74fee3d752eded0a2c 23SHA1 (patch-apps_app__adsiprog.c) = 031139e5cd1ef6bb2afb0a74fee3d752eded0a2c
18SHA1 (patch-apps_app__chanspy.c) = 29a807909645c1ad0c8f81b6513a284b978e7c47 24SHA1 (patch-apps_app__chanspy.c) = 29a807909645c1ad0c8f81b6513a284b978e7c47
19SHA1 (patch-apps_app__directory.c) = 889a78123033709d28b0b805f2a379242ccd7dcc 25SHA1 (patch-apps_app__directory.c) = 889a78123033709d28b0b805f2a379242ccd7dcc
20SHA1 (patch-apps_app__dumpchan.c) = 127ac02bdc180ad2334cd095aa6e646feb6fba10 26SHA1 (patch-apps_app__dumpchan.c) = 127ac02bdc180ad2334cd095aa6e646feb6fba10
21SHA1 (patch-apps_app__followme.c) = c6a5790b5e9b34d07dbfdd66a58e2854c8c72695 27SHA1 (patch-apps_app__followme.c) = c6a5790b5e9b34d07dbfdd66a58e2854c8c72695
22SHA1 (patch-apps_app__minivm.c) = 22ee6ebfbe205baf0acf46ab16c94fea1750f2fb 28SHA1 (patch-apps_app__minivm.c) = 22ee6ebfbe205baf0acf46ab16c94fea1750f2fb
23SHA1 (patch-apps_app__queue.c) = fdf7cf202b60e24cd9227f7e461bbd541565d602 29SHA1 (patch-apps_app__queue.c) = fdf7cf202b60e24cd9227f7e461bbd541565d602
24SHA1 (patch-apps_app__sms.c) = ad65b3cb2a30489551101f7534c691cd1155d18f 30SHA1 (patch-apps_app__sms.c) = ad65b3cb2a30489551101f7534c691cd1155d18f
25SHA1 (patch-apps_app__voicemail.c) = bee10453a86039a99db9df644585800f347aaace 31SHA1 (patch-apps_app__voicemail.c) = bee10453a86039a99db9df644585800f347aaace
26SHA1 (patch-build__tools_make__xml__documentation) = 5a3f332cc5f982b37cfb328837cc7515776fb283 32SHA1 (patch-build__tools_make__xml__documentation) = 5a3f332cc5f982b37cfb328837cc7515776fb283
27SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23 33SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23
28SHA1 (patch-cdr_cdr__pgsql.c) = 82b002a1f5ed3b7361a98e2bffb5cea8833949b8 34SHA1 (patch-cdr_cdr__pgsql.c) = 82b002a1f5ed3b7361a98e2bffb5cea8833949b8
29SHA1 (patch-cel_cel__pgsql.c) = b280efab2b035ce60be268bac9bc8824910b2b8f 35SHA1 (patch-cel_cel__pgsql.c) = b280efab2b035ce60be268bac9bc8824910b2b8f
30SHA1 (patch-channels_chan__oss.c) = 70b4a549b21e39dc45474d0104edf69edd725eef 36SHA1 (patch-channels_chan__oss.c) = 70b4a549b21e39dc45474d0104edf69edd725eef
31SHA1 (patch-channels_chan__pjsip.c) = efd4cbb82133fc5ddf7de70d01c99e185c585211 37SHA1 (patch-channels_chan__pjsip.c) = efd4cbb82133fc5ddf7de70d01c99e185c585211
32SHA1 (patch-channels_chan__sip.c) = ed285612eae6cbfde19ded87db9360c0bca153c7 38SHA1 (patch-channels_chan__sip.c) = ed285612eae6cbfde19ded87db9360c0bca153c7
33SHA1 (patch-channels_pjsip_cli__commands.c) = 01baa9d242e3af02a1f3540cfb3064ad68c71d67 39SHA1 (patch-channels_pjsip_cli__commands.c) = 01baa9d242e3af02a1f3540cfb3064ad68c71d67
34SHA1 (patch-channels_pjsip_dialplan__functions.c) = 2cf8199c4ec9d4894eb922c2703d49ecc06188ef 40SHA1 (patch-channels_pjsip_dialplan__functions.c) = 2cf8199c4ec9d4894eb922c2703d49ecc06188ef
35SHA1 (patch-configure) = d04ab000b8472b997816069c57fa5cd271e9ef90 41SHA1 (patch-configure) = 5936f59ed9834ee18ea198c0f6ecf2db7ed38656
36SHA1 (patch-configure.ac) = b972730a2be3bf54502116f1f7e03afee76a02cc 42SHA1 (patch-configure.ac) = b972730a2be3bf54502116f1f7e03afee76a02cc
37SHA1 (patch-contrib_scripts_vmail.cgi) = 7935ce96ea319eb19cc2ce999813eb837d5357c0 43SHA1 (patch-contrib_scripts_vmail.cgi) = 7935ce96ea319eb19cc2ce999813eb837d5357c0
38SHA1 (patch-funcs_func__cdr.c) = 79c743df264948e5ea9e1c292012a1f6362d0c1e 44SHA1 (patch-funcs_func__cdr.c) = 79c743df264948e5ea9e1c292012a1f6362d0c1e
39SHA1 (patch-funcs_func__channel.c) = 9d6ed8a2431fbde6879782d8228030467aabe7eb 45SHA1 (patch-funcs_func__channel.c) = 9d6ed8a2431fbde6879782d8228030467aabe7eb
40SHA1 (patch-funcs_func__env.c) = 9305d4dde2509f689e676295d3eb06bf5a74b3cb 46SHA1 (patch-funcs_func__env.c) = 9305d4dde2509f689e676295d3eb06bf5a74b3cb
41SHA1 (patch-funcs_func__pjsip__aor.c) = 9874f8d66a8afd26ae1669aa727cb5fa2a788334 47SHA1 (patch-funcs_func__pjsip__aor.c) = 9874f8d66a8afd26ae1669aa727cb5fa2a788334
42SHA1 (patch-funcs_func__pjsip__contact.c) = 9b1fa54ee31a549be40d487c650cc79d625c8092 48SHA1 (patch-funcs_func__pjsip__contact.c) = 9b1fa54ee31a549be40d487c650cc79d625c8092
43SHA1 (patch-funcs_func__pjsip__endpoint.c) = 263a4bdb6365bcc9f6392d25a5aef5c607e59d04 49SHA1 (patch-funcs_func__pjsip__endpoint.c) = 263a4bdb6365bcc9f6392d25a5aef5c607e59d04
44SHA1 (patch-funcs_func__strings.c) = 08d313add57c5be822a19311fc70a7555bd63877 50SHA1 (patch-funcs_func__strings.c) = 08d313add57c5be822a19311fc70a7555bd63877
45SHA1 (patch-include_asterisk_autoconfig.h.in) = 23807b08b94f5cf9c2de76c2928f7ae38997d006 51SHA1 (patch-include_asterisk_autoconfig.h.in) = 23807b08b94f5cf9c2de76c2928f7ae38997d006
46SHA1 (patch-include_asterisk_lock.h) = 85418bcd20f3ed7eb0310f46f3b2d334980bdcef 52SHA1 (patch-include_asterisk_lock.h) = 85418bcd20f3ed7eb0310f46f3b2d334980bdcef
47SHA1 (patch-include_asterisk_strings.h) = 9ace78a13131bcb411eda79a98264b5cfcc7789c 53SHA1 (patch-include_asterisk_strings.h) = 9ace78a13131bcb411eda79a98264b5cfcc7789c
48SHA1 (patch-main_Makefile) = e3b5d261fd15ffd23d81060ff3aafba6b0300e7c 54SHA1 (patch-main_Makefile) = e3b5d261fd15ffd23d81060ff3aafba6b0300e7c
49SHA1 (patch-main_acl.c) = 06a9d247b19d648e9ff54ac2a234dc8ac8c023bb 55SHA1 (patch-main_acl.c) = 06a9d247b19d648e9ff54ac2a234dc8ac8c023bb
50SHA1 (patch-main_app.c) = 1c12bb207dcb0060017d63ba4f11fcf63d60a45e 56SHA1 (patch-main_app.c) = 1c12bb207dcb0060017d63ba4f11fcf63d60a45e
51SHA1 (patch-main_ast__expr2.c) = bad644eb956645e889344810ec315afd430853be 57SHA1 (patch-main_ast__expr2.c) = bad644eb956645e889344810ec315afd430853be
52SHA1 (patch-main_ast__expr2.y) = 56ac74b5a3ae47bd5bec798e549ec43bd085e0e8 58SHA1 (patch-main_ast__expr2.y) = 56ac74b5a3ae47bd5bec798e549ec43bd085e0e8
53SHA1 (patch-main_asterisk.c) = 1262d792f330fe8a1bb1d1f7ba51bc502d65be42 59SHA1 (patch-main_asterisk.c) = 1262d792f330fe8a1bb1d1f7ba51bc502d65be42
54SHA1 (patch-main_astmm.c) = 26a98d6fbb567ae619041ebd01a31349a847deab 60SHA1 (patch-main_astmm.c) = 26a98d6fbb567ae619041ebd01a31349a847deab
55SHA1 (patch-main_bridge__basic.c) = b48627e563e20544017fdfcfb4559e868badf41d 61SHA1 (patch-main_bridge__basic.c) = b48627e563e20544017fdfcfb4559e868badf41d
56SHA1 (patch-main_bridge__channel.c) = 545f496cc402119664eeb638f79628bcb3513683 62SHA1 (patch-main_bridge__channel.c) = 545f496cc402119664eeb638f79628bcb3513683
57SHA1 (patch-main_callerid.c) = 0ea1b3df8aaf3969fcd9e06055c8e6184d50d3d3 63SHA1 (patch-main_callerid.c) = 0ea1b3df8aaf3969fcd9e06055c8e6184d50d3d3
58SHA1 (patch-main_cdr.c) = 540fbdb354aba100fa37392b879b92a85d1d8620 64SHA1 (patch-main_cdr.c) = 540fbdb354aba100fa37392b879b92a85d1d8620
59SHA1 (patch-main_cel.c) = 22fa21db8e0afa0958d34014f52e2c4fe9c73ba2 65SHA1 (patch-main_cel.c) = 22fa21db8e0afa0958d34014f52e2c4fe9c73ba2
60SHA1 (patch-main_cli.c) = ee72bcaac7dce397354cbc09af4ed7441dbb4650 66SHA1 (patch-main_cli.c) = ee72bcaac7dce397354cbc09af4ed7441dbb4650
61SHA1 (patch-main_config.c) = d5159f2c16cc6324b79f51cfc797d26c64995a6f 67SHA1 (patch-main_config.c) = f4b5fd991a755d6b5429d1ecd33e3525b65d6a02
62SHA1 (patch-main_conversions.c) = a516ef4f706fabbd250f66a3159825a2a6085344 68SHA1 (patch-main_conversions.c) = a516ef4f706fabbd250f66a3159825a2a6085344
63SHA1 (patch-main_dns__naptr.c) = 4fa3fe5d2acf7bcd84ca2044280c644e4bd15d7f 69SHA1 (patch-main_dns__naptr.c) = 4fa3fe5d2acf7bcd84ca2044280c644e4bd15d7f
64SHA1 (patch-main_enum.c) = c5f620297cf98f95ce74aa0d98eddc697946a77b 70SHA1 (patch-main_enum.c) = c5f620297cf98f95ce74aa0d98eddc697946a77b
65SHA1 (patch-main_features.c) = 6e50ea4c6ee26f56edca22611aeed44787459968 71SHA1 (patch-main_features.c) = 6e50ea4c6ee26f56edca22611aeed44787459968
66SHA1 (patch-main_http.c) = b36f1f3f0da25456a17888d34ea2bf7b61c1acf4 72SHA1 (patch-main_http.c) = b36f1f3f0da25456a17888d34ea2bf7b61c1acf4
67SHA1 (patch-main_indications.c) = 511b4c270e4a4a71517109f959121777caf2aa36 73SHA1 (patch-main_indications.c) = 511b4c270e4a4a71517109f959121777caf2aa36
68SHA1 (patch-main_logger.c) = 321a52b3015af85ea13055953cec5a5d9da05ec8 74SHA1 (patch-main_logger.c) = 321a52b3015af85ea13055953cec5a5d9da05ec8
69SHA1 (patch-main_manager.c) = 661e01ff509721d6b6c15d803d0b3ce71bb48442 75SHA1 (patch-main_manager.c) = 661e01ff509721d6b6c15d803d0b3ce71bb48442
70SHA1 (patch-main_pbx.c) = 8e7ced268edb29238f96418e8b21456364c4ae1f 76SHA1 (patch-main_pbx.c) = 8e7ced268edb29238f96418e8b21456364c4ae1f
71SHA1 (patch-main_pbx__builtins.c) = f53aadc04fd489f6725911537007af4f4076ee56 77SHA1 (patch-main_pbx__builtins.c) = f53aadc04fd489f6725911537007af4f4076ee56
72SHA1 (patch-main_pbx__timing.c) = a4657330086c5b0e8fd271d5676fb897badea452 78SHA1 (patch-main_pbx__timing.c) = a4657330086c5b0e8fd271d5676fb897badea452
73SHA1 (patch-main_sched.c) = 4219ac1561e8c4fbc5b1facdf38b3e8b764d5def 79SHA1 (patch-main_sched.c) = 4219ac1561e8c4fbc5b1facdf38b3e8b764d5def
74SHA1 (patch-main_stdtime_localtime.c) = 1e3c62d70eab62c46ac29e03e842229cf7587d2b 80SHA1 (patch-main_stdtime_localtime.c) = 1e3c62d70eab62c46ac29e03e842229cf7587d2b
75SHA1 (patch-main_taskprocessor.c) = f90805bd78fd4096beb9ee1cf9c794c50b87481a 81SHA1 (patch-main_taskprocessor.c) = f90805bd78fd4096beb9ee1cf9c794c50b87481a
76SHA1 (patch-main_tdd.c) = 9f525971938dd4f222622cb3e78a35822bd08389 82SHA1 (patch-main_tdd.c) = 9f525971938dd4f222622cb3e78a35822bd08389
77SHA1 (patch-main_test.c) = f38b370cdb5788304e02c71ef05d2130ead9de98 83SHA1 (patch-main_test.c) = f38b370cdb5788304e02c71ef05d2130ead9de98
78SHA1 (patch-main_utils.c) = 2762f982f7a66979e363e984b0948364e1b03b7e 84SHA1 (patch-main_utils.c) = 07584ece44df8c5041e9c0a21b735e1fcf8c21cc
79SHA1 (patch-menuselect_menuselect.c) = 8bae3a2c6b8c6e7927b35bd83147a55e380efd7f 85SHA1 (patch-menuselect_menuselect.c) = 8bae3a2c6b8c6e7927b35bd83147a55e380efd7f
80SHA1 (patch-pbx_pbx__config.c) = cc5e6d2b383f86abfb354c9bf14fc93374fba0a3 86SHA1 (patch-pbx_pbx__config.c) = cc5e6d2b383f86abfb354c9bf14fc93374fba0a3
81SHA1 (patch-pbx_pbx__dundi.c) = 1bc28ff2412da569f139f245c5223845a2f6cebe 87SHA1 (patch-pbx_pbx__dundi.c) = 1bc28ff2412da569f139f245c5223845a2f6cebe
82SHA1 (patch-res_ael_pval.c) = 8a238c78403d3098bf8be8ae266162bc05e586f3 88SHA1 (patch-res_ael_pval.c) = 8a238c78403d3098bf8be8ae266162bc05e586f3
83SHA1 (patch-res_res__calendar.c) = 45211a3baf8fbd8b201ba0167f8c56fb35728c4a 89SHA1 (patch-res_res__calendar.c) = 45211a3baf8fbd8b201ba0167f8c56fb35728c4a
84SHA1 (patch-res_res__format__attr__celt.c) = 62d5e3e83e8d62dffcb0672073a2694f5a5c754c 90SHA1 (patch-res_res__format__attr__celt.c) = 62d5e3e83e8d62dffcb0672073a2694f5a5c754c
85SHA1 (patch-res_res__format__attr__h263.c) = 4445303b43f107251c54a8eaf3e69a89ee26ca27 91SHA1 (patch-res_res__format__attr__h263.c) = 4445303b43f107251c54a8eaf3e69a89ee26ca27
86SHA1 (patch-res_res__format__attr__ilbc.c) = 29a4b324e91b0e30a5bed3da3e6828b959429883 92SHA1 (patch-res_res__format__attr__ilbc.c) = 29a4b324e91b0e30a5bed3da3e6828b959429883
87SHA1 (patch-res_res__format__attr__opus.c) = 1a8b3c93f32d41841ab5ea38bdfc83eb9599ed5f 93SHA1 (patch-res_res__format__attr__opus.c) = 1a8b3c93f32d41841ab5ea38bdfc83eb9599ed5f
88SHA1 (patch-res_res__format__attr__silk.c) = 5b9579e5086cd804f43774c4ae8a892eb5ec95b7 94SHA1 (patch-res_res__format__attr__silk.c) = 5b9579e5086cd804f43774c4ae8a892eb5ec95b7
89SHA1 (patch-res_res__format__attr__siren14.c) = d024ca11b0e2641d2f36b90423737bd2c7781da7 95SHA1 (patch-res_res__format__attr__siren14.c) = d024ca11b0e2641d2f36b90423737bd2c7781da7
90SHA1 (patch-res_res__format__attr__siren7.c) = 450a173dfb29724853db3183d36759549a5243e4 96SHA1 (patch-res_res__format__attr__siren7.c) = 450a173dfb29724853db3183d36759549a5243e4
91SHA1 (patch-res_res__format__attr__vp8.c) = 2ca03467ccb1a3657546dfa4f768ab0a463d67e3 97SHA1 (patch-res_res__format__attr__vp8.c) = 2ca03467ccb1a3657546dfa4f768ab0a463d67e3

cvs diff -r1.4 -r1.5 pkgsrc/comms/asterisk18/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/patches/patch-configure 2024/02/19 05:59:52 1.4
+++ pkgsrc/comms/asterisk18/patches/patch-configure 2024/03/25 03:36:33 1.5
@@ -1,60 +1,33 @@ @@ -1,60 +1,33 @@
1$NetBSD: patch-configure,v 1.4 2024/02/19 05:59:52 jnemeth Exp $ 1$NetBSD: patch-configure,v 1.5 2024/03/25 03:36:33 jnemeth Exp $
2 2
3--- configure.orig 2023-07-20 13:04:41.000000000 +0000 3--- configure.orig 2024-03-18 13:18:36.000000000 +0000
4+++ configure 4+++ configure
5@@ -9303,12 +9303,12 @@ else 5@@ -10230,12 +10230,12 @@ else $as_nop
6  6
7 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang -fblocks" >&5 7 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang -fblocks" >&5
8 $as_echo_n "checking for clang -fblocks... " >&6; } 8 printf %s "checking for clang -fblocks... " >&6; }
9- if test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c - 2>&1`" = ""; then 9- if test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c - 2>&1`" = ""; then
10+ if test "`echo 'int main(){return ^{return 42;}();}' | ${CC} ${LDFLAGS} -o /dev/null -fblocks -x c - 2>&1`" = ""; then 10+ if test "`echo 'int main(){return ^{return 42;}();}' | ${CC} ${LDFLAGS} -o /dev/null -fblocks -x c - 2>&1`" = ""; then
11 AST_CLANG_BLOCKS_LIBS="" 11 AST_CLANG_BLOCKS_LIBS=""
12 AST_CLANG_BLOCKS="-Wno-unknown-warning-option -fblocks" 12 AST_CLANG_BLOCKS="-Wno-unknown-warning-option -fblocks"
13 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 13 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14 $as_echo "yes" >&6; } 14 printf "%s\n" "yes" >&6; }
15- elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then 15- elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then
16+ elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} ${LDFLAGS} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then 16+ elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} ${LDFLAGS} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then
17 AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime" 17 AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime"
18 AST_CLANG_BLOCKS="-fblocks" 18 AST_CLANG_BLOCKS="-fblocks"
19 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 19 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
20@@ -15580,7 +15580,7 @@ fi 20@@ -22295,6 +22295,148 @@ rm -f core conftest.err conftest.$ac_obj
21 done 
22  
23  
24-ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" 
25+ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" 
26 if test "x$ac_cv_header_sys_poll_h" = xyes; then : 
27  
28 else 
29@@ -17562,7 +17562,7 @@ fi 
30 done 
31  
32  
33-for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale pipe2 ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv uselocale utime vasprintf getpeereid sysctl swapctl malloc_trim 
34+for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale pipe2 ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strftime_l strlcat strlcpy strncasecmp strndup strnlen strptime_l strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv uselocale utime vasprintf getpeereid sysctl swapctl malloc_trim 
35 do : 
36 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 
37 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 
38@@ -17797,7 +17797,7 @@ rm -f core conftest.err conftest.$ac_obj 
39 LDFLAGS=${old_LDFLAGS} 
40 rm -f conftest.dynamics 
41  
42-ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" 
43+ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" 
44 if test "x$ac_cv_header_sys_poll_h" = xyes; then : 
45 HAS_POLL=1 
46  
47@@ -20126,6 +20126,148 @@ rm -f core conftest.err conftest.$ac_obj 
48  21
49  22
50  23
51+if test "${ac_cv_header_sys_atomic_h+set}" = set; then 24+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
52+ { $as_echo "$as_me:$LINENO: checking for sys/atomic.h" >&5 25+ { $as_echo "$as_me:$LINENO: checking for sys/atomic.h" >&5
53+$as_echo_n "checking for sys/atomic.h... " >&6; } 26+$as_echo_n "checking for sys/atomic.h... " >&6; }
54+if test "${ac_cv_header_sys_atomic_h+set}" = set; then 27+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
55+ $as_echo_n "(cached) " >&6 28+ $as_echo_n "(cached) " >&6
56+fi 29+fi
57+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5 30+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5
58+$as_echo "$ac_cv_header_sys_atomic_h" >&6; } 31+$as_echo "$ac_cv_header_sys_atomic_h" >&6; }
59+else 32+else
60+ # Is the header compilable? 33+ # Is the header compilable?

cvs diff -r1.1 -r1.2 pkgsrc/comms/asterisk18/patches/patch-main_config.c (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/patches/patch-main_config.c 2024/02/19 05:59:52 1.1
+++ pkgsrc/comms/asterisk18/patches/patch-main_config.c 2024/03/25 03:36:33 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-main_config.c,v 1.1 2024/02/19 05:59:52 jnemeth Exp $ 1$NetBSD: patch-main_config.c,v 1.2 2024/03/25 03:36:33 jnemeth Exp $
2 2
3--- main/config.c.orig 2024-02-12 05:14:56.251989318 +0000 3--- main/config.c.orig 2024-03-18 13:18:36.000000000 +0000
4+++ main/config.c 4+++ main/config.c
5@@ -44,6 +44,9 @@ 5@@ -44,6 +44,9 @@
6 #include <libgen.h> 6 #include <libgen.h>
7 #include <time.h> 7 #include <time.h>
8 #include <sys/stat.h> 8 #include <sys/stat.h>
9+#if HAVE_SYS_WAIT_H 9+#if HAVE_SYS_WAIT_H
10+#include <sys/wait.h> 10+#include <sys/wait.h>
11+#endif 11+#endif
12  12
13 #include <math.h> /* HUGE_VAL */ 13 #include <math.h> /* HUGE_VAL */
14 #include <regex.h> 14 #include <regex.h>

cvs diff -r1.2 -r1.3 pkgsrc/comms/asterisk18/patches/patch-main_utils.c (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/patches/patch-main_utils.c 2021/06/13 07:57:53 1.2
+++ pkgsrc/comms/asterisk18/patches/patch-main_utils.c 2024/03/25 03:36:33 1.3
@@ -1,60 +1,60 @@ @@ -1,60 +1,60 @@
1$NetBSD: patch-main_utils.c,v 1.2 2021/06/13 07:57:53 jnemeth Exp $ 1$NetBSD: patch-main_utils.c,v 1.3 2024/03/25 03:36:33 jnemeth Exp $
2 2
3--- main/utils.c.orig 2018-05-01 20:12:26.000000000 +0000 3--- main/utils.c.orig 2024-03-18 13:18:36.000000000 +0000
4+++ main/utils.c 4+++ main/utils.c
5@@ -39,6 +39,10 @@ 5@@ -41,6 +41,10 @@
6 #elif defined(HAVE_SYS_THR_H) 6 #elif defined(__NetBSD__)
7 #include <sys/thr.h> 7 #include <lwp.h>
8 #endif 8 #endif
9+#if defined(HAVE_GETIFADDRS) 9+#if defined(HAVE_GETIFADDRS)
10+#include <ifaddrs.h> 10+#include <ifaddrs.h>
11+#include <net/if_dl.h> 11+#include <net/if_dl.h>
12+#endif 12+#endif
13  13
14 #include "asterisk/network.h" 14 #include "asterisk/network.h"
15 #include "asterisk/ast_version.h" 15 #include "asterisk/ast_version.h"
16@@ -204,7 +208,7 @@ struct hostent *ast_gethostbyname(const  16@@ -213,7 +217,7 @@ struct hostent *ast_gethostbyname(const
17 while (s && *s) { 17 while (s && *s) {
18 if (*s == '.') 18 if (*s == '.')
19 dots++; 19 dots++;
20- else if (!isdigit(*s)) 20- else if (!isdigit(*s))
21+ else if (!isdigit((unsigned char)*s)) 21+ else if (!isdigit((unsigned char)*s))
22 break; 22 break;
23 s++; 23 s++;
24 } 24 }
25@@ -612,7 +616,7 @@ const char *ast_inet_ntoa(struct in_addr 25@@ -937,7 +941,7 @@ const char *ast_inet_ntoa(struct in_addr
26  26
27 static int dev_urandom_fd = -1; 27 static int dev_urandom_fd = -1;
28  28
29-#ifndef __linux__ 29-#ifndef __linux__
30+#if !defined(__linux__) && !defined(__DragonFly__) 30+#if !defined(__linux__) && !defined(__DragonFly__)
31 #undef pthread_create /* For ast_pthread_create function only */ 31 #undef pthread_create /* For ast_pthread_create function only */
32 #endif /* !__linux__ */ 32 #endif /* !__linux__ */
33  33
34@@ -1820,13 +1824,13 @@ int ast_false(const char *s) 34@@ -2238,13 +2242,13 @@ int ast_false(const char *s)
35 static struct timeval tvfix(struct timeval a) 35 static struct timeval tvfix(struct timeval a)
36 { 36 {
37 if (a.tv_usec >= ONE_MILLION) { 37 if (a.tv_usec >= ONE_MILLION) {
38- ast_log(LOG_WARNING, "warning too large timestamp %ld.%ld\n", 38- ast_log(LOG_WARNING, "warning too large timestamp %ld.%ld\n",
39- (long)a.tv_sec, (long int) a.tv_usec); 39- (long)a.tv_sec, (long int) a.tv_usec);
40+ ast_log(LOG_WARNING, "warning too large timestamp %jd.%ld\n", 40+ ast_log(LOG_WARNING, "warning too large timestamp %jd.%ld\n",
41+ (intmax_t)a.tv_sec, (long int) a.tv_usec); 41+ (intmax_t)a.tv_sec, (long int) a.tv_usec);
42 a.tv_sec += a.tv_usec / ONE_MILLION; 42 a.tv_sec += a.tv_usec / ONE_MILLION;
43 a.tv_usec %= ONE_MILLION; 43 a.tv_usec %= ONE_MILLION;
44 } else if (a.tv_usec < 0) { 44 } else if (a.tv_usec < 0) {
45- ast_log(LOG_WARNING, "warning negative timestamp %ld.%ld\n", 45- ast_log(LOG_WARNING, "warning negative timestamp %ld.%ld\n",
46- (long)a.tv_sec, (long int) a.tv_usec); 46- (long)a.tv_sec, (long int) a.tv_usec);
47+ ast_log(LOG_WARNING, "warning negative timestamp %jd.%ld\n", 47+ ast_log(LOG_WARNING, "warning negative timestamp %jd.%ld\n",
48+ (intmax_t)a.tv_sec, (long int) a.tv_usec); 48+ (intmax_t)a.tv_sec, (long int) a.tv_usec);
49 a.tv_usec = 0; 49 a.tv_usec = 0;
50 } 50 }
51 return a; 51 return a;
52@@ -1986,7 +1990,7 @@ char *ast_to_camel_case_delim(const char 52@@ -2404,7 +2408,7 @@ char *ast_to_camel_case_delim(const char
53  53
54 while (front) { 54 while (front) {
55 size = strlen(front); 55 size = strlen(front);
56- *front = toupper(*front); 56- *front = toupper(*front);
57+ *front = toupper((unsigned char)*front); 57+ *front = toupper((unsigned char)*front);
58 ast_copy_string(buf, front, size + 1); 58 ast_copy_string(buf, front, size + 1);
59 buf += size; 59 buf += size;
60 front = strtok_r(NULL, delim, &back); 60 front = strtok_r(NULL, delim, &back);