summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
Diffstat (limited to 'comms')
-rw-r--r--comms/asterisk13/Makefile38
-rw-r--r--comms/asterisk13/PLIST4
-rw-r--r--comms/asterisk13/distinfo22
-rw-r--r--comms/asterisk13/patches/patch-Makefile68
-rw-r--r--comms/asterisk13/patches/patch-main_sched.c14
5 files changed, 83 insertions, 63 deletions
diff --git a/comms/asterisk13/Makefile b/comms/asterisk13/Makefile
index abbba7bb96f..53b2fcad1a1 100644
--- a/comms/asterisk13/Makefile
+++ b/comms/asterisk13/Makefile
@@ -1,21 +1,23 @@
-# $NetBSD: Makefile,v 1.2 2015/12/05 23:42:44 jnemeth Exp $
+# $NetBSD: Makefile,v 1.3 2016/02/07 09:13:34 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
-DISTNAME= asterisk-13.6.0
-DIST_SUBDIR= ${PKGNAME_NOREV}
-DISTFILES= ${DEFAULT_DISTFILES}
-EXTRACT_ONLY= ${DISTNAME}.tar.gz
+DISTNAME= asterisk-13.7.2
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
http://downloads.asterisk.org/pub/telephony/sounds/releases/
+DIST_SUBDIR= ${PKGNAME_NOREV}
+DISTFILES= ${DEFAULT_DISTFILES}
-OWNER= jnemeth@NetBSD.org
-HOMEPAGE= http://www.asterisk.org/
COMMENT= The Asterisk Software PBX
LICENSE= gnu-gpl-v2
+
+EXTRACT_ONLY= ${DISTNAME}.tar.gz
+OWNER= jnemeth@NetBSD.org
+HOMEPAGE= http://www.asterisk.org/
+
MAKE_JOBS_SAFE= NO
# known to have issues on i386, block the package until the bug is fixed
@@ -55,17 +57,17 @@ INSTALLATION_DIRS+= ${ASTDATADIR}/sounds/en ${ASTDATADIR}/moh
BUILD_DEFS+= VARBASE
-ASTERISK_USER?= asterisk
-ASTERISK_GROUP?= asterisk
-PKG_GROUPS= ${ASTERISK_GROUP}
-PKG_USERS= ${ASTERISK_USER}:${ASTERISK_GROUP}
+ASTERISK_USER?= asterisk
+ASTERISK_GROUP?= asterisk
+PKG_GROUPS= ${ASTERISK_GROUP}
+PKG_USERS= ${ASTERISK_USER}:${ASTERISK_GROUP}
PKG_GECOS.${ASTERISK_USER}= Asterisk PBX
-PKG_GROUPS_VARS= ASTERISK_GROUP
-PKG_USERS_VARS= ASTERISK_USER
-FILES_SUBST+= ASTERISK_USER=${ASTERISK_USER}
-FILES_SUBST+= ASTERISK_GROUP=${ASTERISK_GROUP}
-MESSAGE_SUBST+= ASTERISK_USER=${ASTERISK_USER}
-MESSAGE_SUBST+= ASTERISK_GROUP=${ASTERISK_GROUP}
+PKG_GROUPS_VARS= ASTERISK_GROUP
+PKG_USERS_VARS= ASTERISK_USER
+FILES_SUBST+= ASTERISK_USER=${ASTERISK_USER}
+FILES_SUBST+= ASTERISK_GROUP=${ASTERISK_GROUP}
+MESSAGE_SUBST+= ASTERISK_USER=${ASTERISK_USER}
+MESSAGE_SUBST+= ASTERISK_GROUP=${ASTERISK_GROUP}
# Various path settings for Asterisk
PKG_SYSCONFSUBDIR= asterisk
@@ -117,7 +119,7 @@ PLIST_VARS+= mgcp
# if the grep fails
NOSIGPIPE!= ${GREP} SO_NOSIGPIPE /usr/include/sys/socket.h || echo ""
.if ${NOSIGPIPE} != ""
-PLIST.mgcp= yes
+PLIST.mgcp= yes
.endif
.include "options.mk"
diff --git a/comms/asterisk13/PLIST b/comms/asterisk13/PLIST
index c54c0ac5e7b..3e85da319e2 100644
--- a/comms/asterisk13/PLIST
+++ b/comms/asterisk13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/12/05 23:42:44 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/02/07 09:13:34 jnemeth Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -348,6 +348,7 @@ lib/asterisk/modules/func_frame_trace.so
lib/asterisk/modules/func_global.so
lib/asterisk/modules/func_groupcount.so
lib/asterisk/modules/func_hangupcause.so
+lib/asterisk/modules/func_holdintercept.so
lib/asterisk/modules/func_iconv.so
lib/asterisk/modules/func_jitterbuffer.so
lib/asterisk/modules/func_lock.so
@@ -414,6 +415,7 @@ lib/asterisk/modules/res_format_attr_h263.so
lib/asterisk/modules/res_format_attr_h264.so
lib/asterisk/modules/res_format_attr_opus.so
lib/asterisk/modules/res_format_attr_silk.so
+lib/asterisk/modules/res_format_attr_vp8.so
lib/asterisk/modules/res_hep.so
lib/asterisk/modules/res_hep_rtcp.so
lib/asterisk/modules/res_http_websocket.so
diff --git a/comms/asterisk13/distinfo b/comms/asterisk13/distinfo
index 9657b8f6401..756366eccd9 100644
--- a/comms/asterisk13/distinfo
+++ b/comms/asterisk13/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.2 2015/12/05 23:42:44 jnemeth Exp $
+$NetBSD: distinfo,v 1.3 2016/02/07 09:13:34 jnemeth Exp $
-SHA1 (asterisk-13.6.0/asterisk-13.6.0.tar.gz) = 320d3b83f6d4641db76c957738b21a7b8eec938b
-RMD160 (asterisk-13.6.0/asterisk-13.6.0.tar.gz) = c6cdb801c65f3539d16c6db1e10bd75e6807684e
-SHA512 (asterisk-13.6.0/asterisk-13.6.0.tar.gz) = e6ba627d3bdeb8bba75d7b109012d08a8a3873cc63534bc140b5ba183bb1fe8125f6f746f6bdf046ae4751d9e9011dee4f7de91de44abfd7777a834525de178f
-Size (asterisk-13.6.0/asterisk-13.6.0.tar.gz) = 32146107 bytes
-SHA1 (asterisk-13.6.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
-RMD160 (asterisk-13.6.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
-SHA512 (asterisk-13.6.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 3908fcb439fe7d08dc6cba45b7a6aeea9825299871332d30f60535957072521b2f3f60222a49689b6fe1f693f80e3605b91ce395d16e15b15c50025eb086c19b
-Size (asterisk-13.6.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
-SHA1 (patch-Makefile) = 27ec5836a8f07c226032d1a7e0ed3667e46b2406
+SHA1 (asterisk-13.7.2/asterisk-13.7.2.tar.gz) = a513947d71fd4c836a8a313da9e9a4f4eb813b89
+RMD160 (asterisk-13.7.2/asterisk-13.7.2.tar.gz) = 9321bff9f9683adc6fd52a29e8722cba28a45512
+SHA512 (asterisk-13.7.2/asterisk-13.7.2.tar.gz) = 5a0cd2c83e8f3191105fc20f54eb7fbf2fcb015af1fcfd980221aa205fdaf288835c4b76093f15e2abff2b1672f46a383efc2a89b5ae8afdc92353d7fd91d693
+Size (asterisk-13.7.2/asterisk-13.7.2.tar.gz) = 32176731 bytes
+SHA1 (asterisk-13.7.2/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
+RMD160 (asterisk-13.7.2/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
+SHA512 (asterisk-13.7.2/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 3908fcb439fe7d08dc6cba45b7a6aeea9825299871332d30f60535957072521b2f3f60222a49689b6fe1f693f80e3605b91ce395d16e15b15c50025eb086c19b
+Size (asterisk-13.7.2/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
+SHA1 (patch-Makefile) = 78c188c1873d70c2285cf2b7cf9e90052f51be69
SHA1 (patch-addons_chan__ooh323.c) = 9cba619ced6a4449604faebeac33d91a23519c48
SHA1 (patch-apps_app__dumpchan.c) = 127ac02bdc180ad2334cd095aa6e646feb6fba10
SHA1 (patch-apps_app__followme.c) = c6a5790b5e9b34d07dbfdd66a58e2854c8c72695
@@ -43,7 +43,7 @@ SHA1 (patch-main_logger.c) = 321a52b3015af85ea13055953cec5a5d9da05ec8
SHA1 (patch-main_manager.c) = 8cfdac2aed203573d1c426cea1131fca12b9cd9e
SHA1 (patch-main_netsock.c) = 383952a5fd4e1cecf7d1fa304a897d72e52cdf8c
SHA1 (patch-main_pbx.c) = a468fa724971a25c3d645d63aea6c889ebe7ede1
-SHA1 (patch-main_sched.c) = 6cb74d69cc873c2477d37e0cc72d939a78d3e6e3
+SHA1 (patch-main_sched.c) = 5fb08c75cb97398f4dd39cc2dd317190ca472f6c
SHA1 (patch-main_stdtime_localtime.c) = 58910ae9012915d69b31db9b0b41b3f85ce34e36
SHA1 (patch-main_test.c) = f38b370cdb5788304e02c71ef05d2130ead9de98
SHA1 (patch-main_utils.c) = 4b4de6303e8b937fe591a64efcf4d65ef8c56b97
diff --git a/comms/asterisk13/patches/patch-Makefile b/comms/asterisk13/patches/patch-Makefile
index 92fc541e377..60c1f4be7c2 100644
--- a/comms/asterisk13/patches/patch-Makefile
+++ b/comms/asterisk13/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
+$NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
---- Makefile.orig 2015-10-09 21:48:48.000000000 +0000
+--- Makefile.orig 2016-02-05 20:32:40.000000000 +0000
+++ Makefile
@@ -132,7 +132,7 @@ DEBUG=-g3
@@ -62,7 +62,28 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
"$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \
-@@ -673,21 +671,21 @@ upgrade: bininstall
+@@ -682,7 +680,7 @@ upgrade: bininstall
+ # (2) the extension to strip off
+ define INSTALL_CONFIGS
+ @for x in configs/$(1)/*$(2); do \
+- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \
++ dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x $(2)`"; \
+ if [ -f "$${dst}" ]; then \
+ if [ "$(OVERWRITE)" = "y" ]; then \
+ if cmp -s "$${dst}" "$$x" ; then \
+@@ -711,24 +709,24 @@ define INSTALL_CONFIGS
+ -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
+ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
+ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
+- "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
+- $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
+- rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
++ "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" > "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
++ $(INSTALL) -m 644 "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" ; \
++ rm -f "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
+ fi
+ endef
+
# XXX why *.adsi is installed first ?
adsi:
@echo Installing adsi config files...
@@ -81,27 +102,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
done
samples: adsi
- @echo Installing other config files...
- @for x in configs/samples/*.sample; do \
-- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
-+ dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x .sample`" ; \
- if [ -f "$${dst}" ]; then \
- if [ "$(OVERWRITE)" = "y" ]; then \
- if cmp -s "$${dst}" "$$x" ; then \
-@@ -716,9 +714,9 @@ samples: adsi
- -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
- -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
- -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
-- "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
-- $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
-- rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
-+ "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" > "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
-+ $(INSTALL) -m 644 "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" ; \
-+ rm -f "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
- fi ; \
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
- build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
-@@ -744,7 +742,7 @@ samples: adsi
+@@ -761,7 +759,7 @@ basic-pbx:
webvmail:
@[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
@@ -110,7 +111,22 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
for x in images/*.gif; do \
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
-@@ -909,7 +907,7 @@ uninstall-all: _uninstall
+@@ -811,11 +809,11 @@ endif
+ endif
+
+ install-logrotate:
+- if [ ! -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ]; then \
+- $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ; \
++ if [ ! -d "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d" ]; then \
++ $(INSTALL) -d "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d" ; \
+ fi
+ sed 's#__LOGDIR__#$(ASTLOGDIR)#g' < contrib/scripts/asterisk.logrotate | sed 's#__SBINDIR__#$(ASTSBINDIR)#g' > contrib/scripts/asterisk.logrotate.tmp
+- $(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp "$(DESTDIR)$(ASTETCDIR)/../logrotate.d/asterisk"
++ $(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d/asterisk"
+ rm -f contrib/scripts/asterisk.logrotate.tmp
+
+ config:
+@@ -926,7 +924,7 @@ uninstall-all: _uninstall
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
rm -rf "$(DESTDIR)$(ASTDATADIR)"
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -119,7 +135,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
menuconfig: menuselect
-@@ -994,6 +992,7 @@ else
+@@ -1011,6 +1009,7 @@ else
endif
.PHONY: menuselect
diff --git a/comms/asterisk13/patches/patch-main_sched.c b/comms/asterisk13/patches/patch-main_sched.c
index a763088a5a0..201fe1ad7aa 100644
--- a/comms/asterisk13/patches/patch-main_sched.c
+++ b/comms/asterisk13/patches/patch-main_sched.c
@@ -1,17 +1,17 @@
-$NetBSD: patch-main_sched.c,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
+$NetBSD: patch-main_sched.c,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
---- main/sched.c.orig 2015-10-09 21:48:48.000000000 +0000
+--- main/sched.c.orig 2016-02-05 20:32:40.000000000 +0000
+++ main/sched.c
-@@ -450,7 +450,7 @@ static int sched_settime(struct timeval
- {
- struct timeval now = ast_tvnow();
+@@ -468,7 +468,7 @@ static int sched_settime(struct timeval
+ ast_assert(0);
+ }
- /*ast_debug(1, "TV -> %lu,%lu\n", tv->tv_sec, tv->tv_usec);*/
-+ /*ast_debug(1, "TV -> %jd,%jd\n", tv->tv_sec, tv->tv_usec);*/
++ /*ast_debug(1, "TV -> %jd,%lu\n", (intmax_t)tv->tv_sec, tv->tv_usec);*/
if (ast_tvzero(*t)) /* not supplied, default to now */
*t = now;
*t = ast_tvadd(*t, ast_samp2tv(when, 1000));
-@@ -678,11 +678,11 @@ void ast_sched_dump(struct ast_sched_con
+@@ -696,11 +696,11 @@ void ast_sched_dump(struct ast_sched_con
struct timeval delta;
q = ast_heap_peek(con->sched_heap, x);
delta = ast_tvsub(q->when, when);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-08 20:20:31 +0000