CVS commit: pkgsrc/comms/asterisk22

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Mon May  5 12:40:30 UTC 2025

Modified Files:
        pkgsrc/comms/asterisk22: Makefile PLIST distinfo
Removed Files:
        pkgsrc/comms/asterisk22/patches: patch-channels_Makefile
            patch-channels_chan__sip.c

Log Message:
Roll back chan_sip inclusion, as requested by OWNER.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/comms/asterisk22/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/comms/asterisk22/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/comms/asterisk22/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/comms/asterisk22/patches/patch-channels_Makefile \
    pkgsrc/comms/asterisk22/patches/patch-channels_chan__sip.c

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

Modified files:

Index: pkgsrc/comms/asterisk22/Makefile
diff -u pkgsrc/comms/asterisk22/Makefile:1.10 pkgsrc/comms/asterisk22/Makefile:1.11
--- pkgsrc/comms/asterisk22/Makefile:1.10       Thu Apr 24 14:13:23 2025
+++ pkgsrc/comms/asterisk22/Makefile    Mon May  5 12:40:30 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2025/04/24 14:13:23 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2025/05/05 12:40:30 manu Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -6,7 +6,7 @@
 #       Also look in ${WRKSRC}/third-party/versions.mak for pjproject
 
 DISTNAME=      asterisk-22.0.0
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    comms net audio
 MASTER_SITES=  https://downloads.asterisk.org/pub/telephony/asterisk/
 MASTER_SITES+= https://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -148,12 +148,6 @@ SITES.pjproject-${PJPROJ_VERSION}.md5= \
 DISTFILES+=    pjproject-${PJPROJ_VERSION}.tar.bz2 pjproject-${PJPROJ_VERSION}.md5
 ALL_ENV+=      EXTERNALS_CACHE_DIR=${DISTDIR}/${DIST_SUBDIR}
 
-# Plain old chan_sip
-CHAN_SIP_TAG=          86d62097332337da942fa4dd6405f136ae245be3
-DISTFILES+=            ${CHAN_SIP_TAG}
-SITES.${CHAN_SIP_TAG}= ${MASTER_SITE_GITHUB:=InterLinked1}/chan_sip/tarball/
-CHAN_SIP_DIR=          ${WRKDIR}/InterLinked1-chan_sip-86d6209
-
 # Override default paths in config files
 SUBST_CLASSES+=                configs
 SUBST_STAGE.configs=   pre-configure
@@ -246,12 +240,6 @@ CONF_FILES_PERMS+=         ${ASTEXAMPLEDIR}/${f
 
 PTHREAD_OPTS+= require native
 
-post-extract:
-       ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/${CHAN_SIP_TAG} -C ${WRKDIR}
-       ${CP} -r ${CHAN_SIP_DIR}/channels/sip ${WRKSRC}/channels
-       ${CP} ${CHAN_SIP_DIR}/channels/chan_sip.c ${WRKSRC}/channels
-       ${CP} ${CHAN_SIP_DIR}/configs/samples/*.sample ${WRKSRC}/configs/samples
-
 .if (${OPSYS} == "Darwin" && exists(/usr/include/sys/poll.h))
 post-patch:
        ${ECHO} "#include <sys/poll.h>" > ${WRKSRC}/include/asterisk/poll-compat.h

Index: pkgsrc/comms/asterisk22/PLIST
diff -u pkgsrc/comms/asterisk22/PLIST:1.2 pkgsrc/comms/asterisk22/PLIST:1.3
--- pkgsrc/comms/asterisk22/PLIST:1.2   Tue Apr 15 15:35:01 2025
+++ pkgsrc/comms/asterisk22/PLIST       Mon May  5 12:40:30 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2025/04/15 15:35:01 manu Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/05/05 12:40:30 manu Exp $
 lib/asterisk/libasteriskpj.so
 lib/asterisk/libasteriskpj.so.2
 lib/asterisk/modules/app_adsiprog.so
@@ -100,7 +100,6 @@ lib/asterisk/modules/chan_iax2.so
 ${PLIST.jabber}lib/asterisk/modules/chan_motif.so
 lib/asterisk/modules/chan_pjsip.so
 lib/asterisk/modules/chan_rtp.so
-lib/asterisk/modules/chan_sip.so
 lib/asterisk/modules/chan_unistim.so
 lib/asterisk/modules/codec_a_mu.so
 lib/asterisk/modules/codec_adpcm.so
@@ -2413,8 +2412,6 @@ share/examples/asterisk/res_stun_monitor
 share/examples/asterisk/resolver_unbound.conf
 share/examples/asterisk/rtp.conf
 share/examples/asterisk/say.conf
-share/examples/asterisk/sip.conf
-share/examples/asterisk/sip_notify.conf
 share/examples/asterisk/sla.conf
 share/examples/asterisk/smdi.conf
 share/examples/asterisk/sorcery.conf

Index: pkgsrc/comms/asterisk22/distinfo
diff -u pkgsrc/comms/asterisk22/distinfo:1.3 pkgsrc/comms/asterisk22/distinfo:1.4
--- pkgsrc/comms/asterisk22/distinfo:1.3        Tue Apr 15 15:35:01 2025
+++ pkgsrc/comms/asterisk22/distinfo    Mon May  5 12:40:30 2025
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2025/04/15 15:35:01 manu Exp $
+$NetBSD: distinfo,v 1.4 2025/05/05 12:40:30 manu Exp $
 
-BLAKE2s (asterisk-22.0.0/86d62097332337da942fa4dd6405f136ae245be3) = 1f5ff77bc7a80732d66c791d455fcc1a82b643c2e1e23fcec0a4b9398228d8d0
-SHA512 (asterisk-22.0.0/86d62097332337da942fa4dd6405f136ae245be3) = 461765a5be8c386d254571e71d909afe1381c864407bdc16dfce4645c730815de4dfdd6a45caedc593f1903b65ddb4e3934bfdde655f2b8531122bb3d0c72dc2
-Size (asterisk-22.0.0/86d62097332337da942fa4dd6405f136ae245be3) = 960527 bytes
 BLAKE2s (asterisk-22.0.0/asterisk-22.0.0.tar.gz) = 2447fca0966c8d19d71c11a9271c6a4aa28fbba36aaff0afacc0fa778fc643ee
 SHA512 (asterisk-22.0.0/asterisk-22.0.0.tar.gz) = fa2c530a81f7351369229b2a36ac229a75d7a1ce8c3cdae0340be331979246ecee1e4f90c31fb6bc645cc2066280d40e2385027aedc6bd2c205426b2164e1fc5
 Size (asterisk-22.0.0/asterisk-22.0.0.tar.gz) = 26196468 bytes
@@ -30,9 +27,7 @@ SHA1 (patch-build__tools_make__xml__docu
 SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23
 SHA1 (patch-cdr_cdr__pgsql.c) = 82b002a1f5ed3b7361a98e2bffb5cea8833949b8
 SHA1 (patch-cel_cel__pgsql.c) = b280efab2b035ce60be268bac9bc8824910b2b8f
-SHA1 (patch-channels_Makefile) = 938120075aa97ac62951b670b36a463b1fcbf540
 SHA1 (patch-channels_chan__pjsip.c) = efd4cbb82133fc5ddf7de70d01c99e185c585211
-SHA1 (patch-channels_chan__sip.c) = b97f1a805e076c0772e2aae1112b71d57aa31da8
 SHA1 (patch-channels_pjsip_cli__commands.c) = 01baa9d242e3af02a1f3540cfb3064ad68c71d67
 SHA1 (patch-channels_pjsip_dialplan__functions.c) = 2cf8199c4ec9d4894eb922c2703d49ecc06188ef
 SHA1 (patch-configure) = 7bb72c26abe5c362bf8e415821534b83f6241473