summaryrefslogtreecommitdiff
path: root/comms/asterisk13
diff options
context:
space:
mode:
authorjnemeth <jnemeth@pkgsrc.org>2016-05-06 07:41:06 +0000
committerjnemeth <jnemeth@pkgsrc.org>2016-05-06 07:41:06 +0000
commitd68bf74893a2d2205dfaedae9a8b86516e6f313f (patch)
tree8f8562e166fabac63736bf8ae8dd9caa72b77b0d /comms/asterisk13
parent2b287954ca2b250b598c0056f3bd40bdcdd19bf1 (diff)
downloadpkgsrc-d68bf74893a2d2205dfaedae9a8b86516e6f313f.tar.gz
Update to Asterisk 13.8.2: this is mainly a bug fix release. It
also contains fixes for AST-2016-004 and AST-2016-005. However, those issues only affected the pjsip module. Since Asterisk in pkgsrc doesn't (yet) use pjsip, it wasn't affected. ----- 13.8.2 The Asterisk Development Team has announced the release of Asterisk 13.8.2. The release of Asterisk 13.8.2 resolves several issues reported by the community and would have not been possible without your participation. Thank you! The following are the issues resolved in this release: Bugs fixed in this release: ----------------------------------- * ASTERISK-25929 - res_pjsip_registrar: AOR_CONTACT_ADDED events not raised (Reported by Joshua Colp) * ASTERISK-25928 - res_pjsip: URI validation done outside of PJSIP thread (Reported by Joshua Colp) For a full list of changes in this release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-13.8.2 Thank you for your continued support of Asterisk! ----- 13.8.0 The Asterisk Development Team has announced the release of Asterisk 13.8.0. The release of Asterisk 13.8.0 resolves several issues reported by the community and would have not been possible without your participation. Thank you! The following are the issues resolved in this release: New Features made in this release: ----------------------------------- * ASTERISK-24919 - res_pjsip_config_wizard: Ability to write contents to file (Reported by Ray Crumrine) * ASTERISK-25670 - Add regcontext to PJSIP (Reported by Daniel Journo) * ASTERISK-25480 - [patch]Add field PauseReason on QueueMemberStatus (Reported by Rodrigo Ramirez Norambuena) Bugs fixed in this release: ----------------------------------- * ASTERISK-25849 - chan_pjsip: transfers with direct media sometimes drops audio (Reported by Kevin Harwell) * ASTERISK-25113 - install_prereq in Debian 8 without "standard system utilities" (Reported by Rodrigo Ramirez Norambuena) * ASTERISK-25814 - Segfault at f ip in res_pjsip_refer.so (Reported by Sergio Medina Toledo) * ASTERISK-25023 - Deadlock in chan_sip in update_provisional_keepalive (Reported by Arnd Schmitter) * ASTERISK-25321 - [patch]DeadLock ChanSpy with call over Local channel (Reported by Filip Frank) * ASTERISK-25829 - res_pjsip: PJSIP does not accept spaces when separating multiple AORs (Reported by Mateusz Kowalski) * ASTERISK-25771 - ARI:Crash - Attended transfers of channels into Stasis application. (Reported by Javier Riveros ) * ASTERISK-25830 - Revision 2451d4e breaks NAT (Reported by Sean Bright) * ASTERISK-25582 - Testsuite: Reactor timeout error in tests/fax/pjsip/directmedia_reinvite_t38 (Reported by Matt Jordan) * ASTERISK-25811 - Unable to delete object from sorcery cache (Reported by Ross Beer) * ASTERISK-25800 - [patch] Calculate talktime when is first call answered (Reported by Rodrigo Ramirez Norambuena) * ASTERISK-25727 - RPM build requires OPTIONAL_API cflag due to PJSIP requirement (Reported by Gergely Dömsödi) * ASTERISK-25337 - Crash on PJSIP_HEADER Add P-Asserted-Identity when calling from Gosub (Reported by Jacques Peacock) * ASTERISK-25738 - res_pjsip_pubsub: Crash while executing OutboundSubscriptionDetail ami action (Reported by Kevin Harwell) * ASTERISK-25721 - [patch] res_phoneprov: memory leak and heap-use-after-free (Reported by Badalian Vyacheslav) * ASTERISK-25272 - [patch]The ICONV dialplan function sometimes returns garbage (Reported by Etienne Lessard) * ASTERISK-25751 - res_pjsip: Support pjsip_dlg_create_uas_and_inc_lock (Reported by Joshua Colp) * ASTERISK-25606 - Core dump when using transports in sorcery (Reported by Martin Moučka) * ASTERISK-20987 - non-admin users, who join muted conference are not being muted (Reported by hristo) * ASTERISK-25737 - res_pjsip_outbound_registration: line option not in Alembic (Reported by Joshua Colp) * ASTERISK-25603 - [patch]udptl: Uninitialized lengths and bufs in udptl_rx_packet cause ast_frdup crash (Reported by Walter Doekes) * ASTERISK-25742 - Secondary IFP Packets can result in accessing uninitialized pointers and a crash (Reported by Torrey Searle) * ASTERISK-24972 - Transport Layer Security (TLS) Protocol BEAST Vulnerability - Investigate vulnerability of HTTP server (Reported by Alex A. Welzl) * ASTERISK-25397 - [patch]chan_sip: File descriptor leak with non-default timert1 (Reported by Alexander Traud) * ASTERISK-25702 - PjSip realtime DB and Cache Errors since upgrade to asterisk-13.7.0 from asterisk-13.7.0-rc2 (Reported by Nic Colledge) * ASTERISK-25730 - build: make uninstall after make distclean tries to remove root (Reported by George Joseph) * ASTERISK-25725 - core: Incorrect XML documentation may result in weird behavior (Reported by Joshua Colp) * ASTERISK-25722 - ASAN & testsute: stack-buffer-overflow in sip_sipredirect (Reported by Badalian Vyacheslav) * ASTERISK-25709 - ARI: Crash can occur due to race condition when attempting to operate on a hung up channel (Reported by Mark Michelson) * ASTERISK-25714 - ASAN:heap-buffer-overflow in logger.c (Reported by Badalian Vyacheslav) * ASTERISK-25685 - infrastructure: Run alembic in Jenkins build script (Reported by Joshua Colp) * ASTERISK-25712 - Second call to already-on-call phone and Asterisk sends "Ready" (Reported by Richard Mudgett) * ASTERISK-24801 - ASAN: ast_el_read_char stack-buffer-overflow (Reported by Badalian Vyacheslav) * ASTERISK-25179 - CDR(billsec,f) and CDR(duration,f) report incorrect values (Reported by Gianluca Merlo) * ASTERISK-25611 - core: threadpool thread_timeout_thrash unit test sporadically failing (Reported by Joshua Colp) * ASTERISK-24097 - Documentation - CHANNEL function help text missing 'linkedid' argument (Reported by Steven T. Wheeler) * ASTERISK-25700 - main/config: Clean config maps on shutdown. (Reported by Corey Farrell) * ASTERISK-25696 - bridge_basic: don't cache xferfailsound during a transfer (Reported by Kevin Harwell) * ASTERISK-25697 - bridge_basic: don't play an attended transfer fail sound after target hangs up (Reported by Kevin Harwell) * ASTERISK-25683 - res_ari: Asterisk fails to start if compiled with MALLOC_DEBUG (Reported by yaron nahum) * ASTERISK-25686 - PJSIP: qualify_timeout is a double, database schema is an integer (Reported by Marcelo Terres) * ASTERISK-25690 - Hanging up when executing connected line sub does not cause hangup (Reported by Joshua Colp) * ASTERISK-25687 - res_musiconhold: Concurrent invocations of 'moh reload' cause a crash (Reported by Sean Bright) * ASTERISK-25632 - res_pjsip_sdp_rtp: RTP is sent from wrong IP address when multihomed (Reported by Olivier Krief) * ASTERISK-25637 - Multi homed server using wrong IP (Reported by Daniel Journo) * ASTERISK-25394 - pbx: Incorrect device and presence state when changing hint details (Reported by Joshua Colp) * ASTERISK-25640 - pbx: Deadlock on features reload and state change hint. (Reported by Krzysztof Trempala) * ASTERISK-25681 - devicestate: Engine thread is not shut down (Reported by Corey Farrell) * ASTERISK-25680 - manager: manager_channelvars is not cleaned at shutdown (Reported by Corey Farrell) * ASTERISK-25679 - res_calendar leaks scheduler. (Reported by Corey Farrell) * ASTERISK-25675 - Endpoint not listed as Unreachable (Reported by Daniel Journo) * ASTERISK-25677 - pbx_dundi: leaks during failed load. (Reported by Corey Farrell) * ASTERISK-25673 - res_crypto leaks CLI entries (Reported by Corey Farrell) * ASTERISK-25668 - res_pjsip: Deadlock in distributor (Reported by Mark Michelson) * ASTERISK-25664 - ast_format_cap_append_by_type leaks a reference (Reported by Corey Farrell) * ASTERISK-25647 - bug of cel_radius.c: wrong point of ADD_VENDOR_CODE (Reported by Aaron An) * ASTERISK-25317 - asterisk sends too many stun requests (Reported by Stefan Engström) * ASTERISK-25137 - endpoint stasis messages are delivered twice (Reported by Vitezslav Novy) * ASTERISK-25116 - res_pjsip: Two PeerStatus AMI messages are sent for every status change (Reported by George Joseph) * ASTERISK-25641 - bridge: GOTO_ON_BLINDXFR doesn't work on transfer initiated channel (Reported by Dmitry Melekhov) * ASTERISK-25614 - DTLS negotiation delays (Reported by Dade Brandon) * ASTERISK-25442 - using realtime (mysql) queue members are never updated in wait_our_turn function (app_queue.c) (Reported by Carlos Oliva) * ASTERISK-25625 - res_sorcery_memory_cache: Add full backend caching (Reported by Joshua Colp) * ASTERISK-25601 - json: Audit reference usage and thread safety (Reported by Joshua Colp) * ASTERISK-25624 - AMI Event OriginateResponse bug (Reported by sungtae kim) Improvements made in this release: ----------------------------------- * ASTERISK-25495 - [patch] Prevent old-update packages on repository Debian systems (Reported by Rodrigo Ramirez Norambuena) * ASTERISK-25846 - Gracefully deal with Absent Stasis Apps (Reported by Andrew Nagy) * ASTERISK-25791 - res_pjsip_caller_id: Lack of support for Anonymous <anonymous at anonymous.invalid> (Reported by Anthony Messina) * ASTERISK-24813 - asterisk.c: #if statement in listener() confuses code folding editors (Reported by Corey Farrell) * ASTERISK-25767 - [patch] Add check to configure for sanitizes (Reported by Badalian Vyacheslav) * ASTERISK-25068 - Move commonly used FreePBX extra sounds to the core set (Reported by Rusty Newton) For a full list of changes in this release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-13.8.0 Thank you for your continued support of Asterisk!
Diffstat (limited to 'comms/asterisk13')
-rw-r--r--comms/asterisk13/Makefile18
-rw-r--r--comms/asterisk13/PLIST23
-rw-r--r--comms/asterisk13/distinfo25
-rw-r--r--comms/asterisk13/patches/patch-Makefile30
-rw-r--r--comms/asterisk13/patches/patch-main_Makefile40
-rw-r--r--comms/asterisk13/patches/patch-main_pbx.c24
-rw-r--r--comms/asterisk13/patches/patch-main_pbx__builtins.c24
7 files changed, 96 insertions, 88 deletions
diff --git a/comms/asterisk13/Makefile b/comms/asterisk13/Makefile
index ba29d5ba8e2..9cefeaee1ee 100644
--- a/comms/asterisk13/Makefile
+++ b/comms/asterisk13/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2016/04/11 19:01:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2016/05/06 07:41:06 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
-# tarballs need to be checked
+# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
+# to find out the current sound file versions
-DISTNAME= asterisk-13.7.2
-PKGREVISION= 2
+DISTNAME= asterisk-13.8.2
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -126,7 +126,7 @@ PLIST.mgcp= yes
.include "options.mk"
# check sounds/Makefile for current version when upgrading package
-DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.15.tar.gz
+DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.tar.gz
# Override default paths in config files
SUBST_CLASSES+= configs
@@ -205,8 +205,8 @@ CONF_FILES_PERMS+= ${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_U
iaxprov.conf indications.conf logger.conf manager.conf \
meetme.conf mgcp.conf minivm.conf misdn.conf modules.conf \
motif.conf musiconhold.conf muted.conf ooh323.conf osp.conf \
- oss.conf phone.conf phoneprov.conf pjsip.conf pjsip_notify.conf \
- pjsip_wizard.conf queuerules.conf queues.conf \
+ oss.conf phone.conf phoneprov.conf pjproject.conf pjsip.conf \
+ pjsip_notify.conf pjsip_wizard.conf queuerules.conf queues.conf \
res_config_mysql.conf res_config_sqlite.conf \
res_config_sqlite3.conf res_corosync.conf res_curl.conf \
res_fax.conf res_ldap.conf res_odbc.conf res_parking.conf \
@@ -228,9 +228,9 @@ post-patch:
post-install:
# check sounds directory for current versions when upgrading package
- ${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.27.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+ ${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
- ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+ ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.5.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/comms/asterisk13/PLIST b/comms/asterisk13/PLIST
index 3e85da319e2..415b27e272b 100644
--- a/comms/asterisk13/PLIST
+++ b/comms/asterisk13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/02/07 09:13:34 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/05/06 07:41:06 jnemeth Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -134,6 +134,8 @@ include/asterisk/res_fax.h
include/asterisk/res_hep.h
include/asterisk/res_mwi_external.h
include/asterisk/res_odbc.h
+include/asterisk/res_odbc_transaction.h
+include/asterisk/res_pjproject.h
include/asterisk/res_pjsip.h
include/asterisk/res_pjsip_body_generator_types.h
include/asterisk/res_pjsip_cli.h
@@ -426,6 +428,7 @@ lib/asterisk/modules/res_monitor.so
lib/asterisk/modules/res_musiconhold.so
lib/asterisk/modules/res_mutestream.so
${PLIST.unixodbc}lib/asterisk/modules/res_odbc.so
+${PLIST.unixodbc}lib/asterisk/modules/res_odbc_transaction.so
lib/asterisk/modules/res_parking.so
lib/asterisk/modules/res_phoneprov.so
${PLIST.mgcp}lib/asterisk/modules/res_pktccops.so
@@ -488,15 +491,15 @@ libdata/asterisk/rest-api/playbacks.json
libdata/asterisk/rest-api/recordings.json
libdata/asterisk/rest-api/resources.json
libdata/asterisk/rest-api/sounds.json
-libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.27
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.5
libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
libdata/asterisk/sounds/en/1-yes-2-no.gsm
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.27
-libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.27
-libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.27
-libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.5
+libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.5
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.5
+libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.5
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.5
+libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.5
libdata/asterisk/sounds/en/OfficeSpace.gsm
libdata/asterisk/sounds/en/Randulo-allison.gsm
libdata/asterisk/sounds/en/SIP_Test_Failure.gsm
@@ -574,7 +577,6 @@ libdata/asterisk/sounds/en/astcc-account-number-invalid.gsm
libdata/asterisk/sounds/en/astcc-balance-of-account-is.gsm
libdata/asterisk/sounds/en/astcc-card-number-invalid.gsm
libdata/asterisk/sounds/en/astcc-digit-account-number.gsm
-libdata/asterisk/sounds/en/astcc-followed-by-pound.gsm
libdata/asterisk/sounds/en/astcc-followed-by-the-hash-key.gsm
libdata/asterisk/sounds/en/astcc-followed-by-the-pound-key.gsm
libdata/asterisk/sounds/en/astcc-login12pound.gsm
@@ -1710,6 +1712,7 @@ libdata/asterisk/sounds/en/please-hold-minion-connect.gsm
libdata/asterisk/sounds/en/please-hold-while-minion.gsm
libdata/asterisk/sounds/en/please-try-again-later.gsm
libdata/asterisk/sounds/en/please-try-again.gsm
+libdata/asterisk/sounds/en/please-try-call-later.gsm
libdata/asterisk/sounds/en/please-try.gsm
libdata/asterisk/sounds/en/please-wait-connect-oncall-eng.gsm
libdata/asterisk/sounds/en/pls-ent-num-transfer.gsm
@@ -1726,7 +1729,6 @@ libdata/asterisk/sounds/en/pls-rcrd-name-at-tone.gsm
libdata/asterisk/sounds/en/pls-stay-on-line.gsm
libdata/asterisk/sounds/en/pls-try-again.gsm
libdata/asterisk/sounds/en/pls-try-area-code.gsm
-libdata/asterisk/sounds/en/pls-try-call-later.gsm
libdata/asterisk/sounds/en/pls-try-manually.gsm
libdata/asterisk/sounds/en/pls-wait-connect-call.gsm
libdata/asterisk/sounds/en/plugh.gsm
@@ -3294,6 +3296,7 @@ share/examples/asterisk/osp.conf
share/examples/asterisk/oss.conf
share/examples/asterisk/phone.conf
share/examples/asterisk/phoneprov.conf
+share/examples/asterisk/pjproject.conf
share/examples/asterisk/pjsip.conf
share/examples/asterisk/pjsip_notify.conf
share/examples/asterisk/pjsip_wizard.conf
diff --git a/comms/asterisk13/distinfo b/comms/asterisk13/distinfo
index 756366eccd9..22673cf8327 100644
--- a/comms/asterisk13/distinfo
+++ b/comms/asterisk13/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.3 2016/02/07 09:13:34 jnemeth Exp $
+$NetBSD: distinfo,v 1.4 2016/05/06 07:41:06 jnemeth Exp $
-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 (asterisk-13.8.2/asterisk-13.8.2.tar.gz) = a525453a088213190011be4f84cb017a47e3e380
+RMD160 (asterisk-13.8.2/asterisk-13.8.2.tar.gz) = 7d36005dfa6903d9b4eaf0a2efbf009d6eebabbf
+SHA512 (asterisk-13.8.2/asterisk-13.8.2.tar.gz) = 20737656b0e30e9d11bf5cf37ceb4891a1d36fb4d552e3e2c13f425b2e938f3b31cf571e5aa5b0028cbb9f9188a4ca21d625a3c1cccf115ea02001df5b9691ad
+Size (asterisk-13.8.2/asterisk-13.8.2.tar.gz) = 32488570 bytes
+SHA1 (asterisk-13.8.2/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 831ae6442e23cbef1e7d1c84798778ad0b0524d1
+RMD160 (asterisk-13.8.2/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = d52df795201c53fc4cd7d99ed41516e312f6f0f3
+SHA512 (asterisk-13.8.2/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = c7d3c3fd2c854e6776801312d34bf69bbed78a443c16121637f508c5275f18b1d415cbb6e4f6f8c5aa3769cbbfa1a11485b9972053777f3ac39256c2c81729f1
+Size (asterisk-13.8.2/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 4256538 bytes
+SHA1 (patch-Makefile) = 1373ea4cfab46f701cef0f5c61a6a1604e710bf5
SHA1 (patch-addons_chan__ooh323.c) = 9cba619ced6a4449604faebeac33d91a23519c48
SHA1 (patch-apps_app__dumpchan.c) = 127ac02bdc180ad2334cd095aa6e646feb6fba10
SHA1 (patch-apps_app__followme.c) = c6a5790b5e9b34d07dbfdd66a58e2854c8c72695
@@ -32,7 +32,7 @@ SHA1 (patch-include_asterisk_endian.h) = 1fc20d750da7d0a0407c1e1694b8bb21753acdc
SHA1 (patch-include_asterisk_lock.h) = ce636ef6102a2a95600cfc8215305507e08fe8f9
SHA1 (patch-include_asterisk_poll-compat.h) = ff25a81e462cdc37928fddeafe687c650860c746
SHA1 (patch-include_asterisk_strings.h) = d204488d681e39af6fadf9f054c9e402f4cb8657
-SHA1 (patch-main_Makefile) = c9020acd260bebda10c21fc91ff9b8022450bf05
+SHA1 (patch-main_Makefile) = 2b4e2793ea491bd40f2db64a23bac9b81cc1c3ca
SHA1 (patch-main_acl.c) = 06a9d247b19d648e9ff54ac2a234dc8ac8c023bb
SHA1 (patch-main_asterisk.c) = 93ae4e31b4ae279e42b5c3661bb5fdb76d9ea161
SHA1 (patch-main_astmm.c) = 26a98d6fbb567ae619041ebd01a31349a847deab
@@ -42,7 +42,8 @@ SHA1 (patch-main_http.c) = b36f1f3f0da25456a17888d34ea2bf7b61c1acf4
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_pbx.c) = 8e7ced268edb29238f96418e8b21456364c4ae1f
+SHA1 (patch-main_pbx__builtins.c) = fbe673500404438f4c38c1dd45dbadb04c88cf99
SHA1 (patch-main_sched.c) = 5fb08c75cb97398f4dd39cc2dd317190ca472f6c
SHA1 (patch-main_stdtime_localtime.c) = 58910ae9012915d69b31db9b0b41b3f85ce34e36
SHA1 (patch-main_test.c) = f38b370cdb5788304e02c71ef05d2130ead9de98
diff --git a/comms/asterisk13/patches/patch-Makefile b/comms/asterisk13/patches/patch-Makefile
index 60c1f4be7c2..a752ff77b2e 100644
--- a/comms/asterisk13/patches/patch-Makefile
+++ b/comms/asterisk13/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
+$NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
---- Makefile.orig 2016-02-05 20:32:40.000000000 +0000
+--- Makefile.orig 2016-04-20 10:46:18.000000000 +0000
+++ Makefile
-@@ -132,7 +132,7 @@ DEBUG=-g3
+@@ -135,7 +135,7 @@ DEBUG=-g3
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
@@ -11,7 +11,7 @@ $NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
AGI_DIR=$(ASTDATADIR)/agi-bin
# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
-@@ -169,6 +169,9 @@ DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/s
+@@ -172,6 +172,9 @@ DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/s
# supported run:
# menuselect/menuselect --help
@@ -21,7 +21,7 @@ $NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
-@@ -208,10 +211,6 @@ ifeq ($(AST_DEVMODE),yes)
+@@ -211,10 +214,6 @@ ifeq ($(AST_DEVMODE),yes)
ADDL_TARGETS+=validate-docs
endif
@@ -32,7 +32,7 @@ $NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-@@ -339,10 +338,10 @@ makeopts: configure
+@@ -342,10 +341,10 @@ makeopts: configure
@echo "****"
@exit 1
@@ -45,7 +45,7 @@ $NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
endif
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
-@@ -440,7 +439,6 @@ dist-clean: distclean
+@@ -445,7 +444,6 @@ dist-clean: distclean
distclean: $(SUBDIRS_DIST_CLEAN) _clean
@$(MAKE) -C menuselect dist-clean
@@ -53,7 +53,7 @@ $NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
rm -f config.log config.status config.cache
-@@ -556,7 +554,7 @@ update:
+@@ -561,7 +559,7 @@ update:
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
@@ -62,7 +62,7 @@ $NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
"$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \
-@@ -682,7 +680,7 @@ upgrade: bininstall
+@@ -688,7 +686,7 @@ upgrade: bininstall
# (2) the extension to strip off
define INSTALL_CONFIGS
@for x in configs/$(1)/*$(2); do \
@@ -71,7 +71,7 @@ $NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
if cmp -s "$${dst}" "$$x" ; then \
-@@ -711,24 +709,24 @@ define INSTALL_CONFIGS
+@@ -717,24 +715,24 @@ define INSTALL_CONFIGS
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
@@ -102,7 +102,7 @@ $NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
done
samples: adsi
-@@ -761,7 +759,7 @@ basic-pbx:
+@@ -767,7 +765,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 )
@@ -111,7 +111,7 @@ $NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
for x in images/*.gif; do \
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
-@@ -811,11 +809,11 @@ endif
+@@ -817,11 +815,11 @@ endif
endif
install-logrotate:
@@ -126,7 +126,7 @@ $NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
rm -f contrib/scripts/asterisk.logrotate.tmp
config:
-@@ -926,7 +924,7 @@ uninstall-all: _uninstall
+@@ -932,7 +930,7 @@ uninstall-all: _uninstall
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
rm -rf "$(DESTDIR)$(ASTDATADIR)"
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -135,8 +135,8 @@ $NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
menuconfig: menuselect
-@@ -1011,6 +1009,7 @@ else
- endif
+@@ -1021,6 +1019,7 @@ check-alembic: makeopts
+ @ALEMBIC=$(ALEMBIC) build_tools/make_check_alembic config cdr voicemail >&2
.PHONY: menuselect
+.PHONY: menuselect.makeopts
diff --git a/comms/asterisk13/patches/patch-main_Makefile b/comms/asterisk13/patches/patch-main_Makefile
index 8eb172e5850..e9cba39a2a8 100644
--- a/comms/asterisk13/patches/patch-main_Makefile
+++ b/comms/asterisk13/patches/patch-main_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_Makefile,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
+$NetBSD: patch-main_Makefile,v 1.2 2016/05/06 07:41:06 jnemeth Exp $
---- main/Makefile.orig 2015-10-09 21:48:48.000000000 +0000
+--- main/Makefile.orig 2016-04-20 10:46:18.000000000 +0000
+++ main/Makefile
-@@ -93,6 +93,10 @@ ifeq ($(OSARCH),OpenBSD)
+@@ -96,6 +96,10 @@ ifeq ($(OSARCH),OpenBSD)
AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
endif
@@ -13,17 +13,19 @@ $NetBSD: patch-main_Makefile,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
ifeq ($(OSARCH),SunOS)
AST_LIBS+=-lpthread -ldl -lrt -lnsl -lsocket -lresolv
ASTSSL_LIBS+=-L/opt/ssl/lib -L/usr/local/ssl/lib
-@@ -218,9 +222,6 @@ ifeq ($(GNU_LD),1)
- endif
- $(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS)
+@@ -224,11 +228,7 @@ endif
+
+ $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
+ $(ECHO_PREFIX) echo " [LN] $< -> $@"
-ifneq ($(LDCONFIG),)
-- $(LDCONFIG) $(LDCONFIG_FLAGS) .
+- $(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
+-else
+ $(CMD_PREFIX) $(LN) -sf $< $@
-endif
- $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
- $(LN) -sf $< $@
-@@ -260,13 +261,13 @@ bininstall:
+ else # Darwin
+ ASTSSL_LIB:=libasteriskssl.dylib
+@@ -345,10 +345,10 @@ bininstall:
$(INSTALL) -m 755 $(MAIN_TGT) "$(DESTDIR)$(ASTSBINDIR)/"
ifeq ($(AST_ASTERISKSSL),yes)
ifeq ($(findstring darwin,$(OSARCH)),) # not Darwin
@@ -32,19 +34,15 @@ $NetBSD: patch-main_Makefile,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
+ $(INSTALL) -m 755 $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) "$(DESTDIR)$(PREFIX)/lib/"
+ $(LN) -sf $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) "$(DESTDIR)$(PREFIX)/lib/$(ASTSSL_LIB)"
else # Darwin
- $(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/"
+- $(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/"
++ $(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(PREFIX)/lib/"
endif
- ifneq ($(LDCONFIG),)
-- $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
-+ $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(PREFIX)/lib/"
endif
+ ifeq ($(PJPROJECT_BUNDLED),yes)
+@@ -373,9 +373,7 @@ endif
+ ifneq ($(ASTPJ_LIB).$(ASTPJ_SO_VERSION),.)
+ rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB).$(ASTPJ_SO_VERSION)"
endif
- $(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
-@@ -274,10 +275,7 @@ endif
- binuninstall:
- rm -f "$(DESTDIR)$(ASTSBINDIR)/$(MAIN_TGT)"
- rm -f "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
-- rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB).$(ASTSSL_SO_VERSION)"
-ifneq ($(LDCONFIG),)
- $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
-endif
diff --git a/comms/asterisk13/patches/patch-main_pbx.c b/comms/asterisk13/patches/patch-main_pbx.c
index 2445c4bb5ed..1066d896122 100644
--- a/comms/asterisk13/patches/patch-main_pbx.c
+++ b/comms/asterisk13/patches/patch-main_pbx.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_pbx.c,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
+$NetBSD: patch-main_pbx.c,v 1.2 2016/05/06 07:41:06 jnemeth Exp $
---- main/pbx.c.orig 2015-10-09 21:48:48.000000000 +0000
+--- main/pbx.c.orig 2016-04-20 10:46:18.000000000 +0000
+++ main/pbx.c
-@@ -11276,7 +11276,7 @@ static int testtime_write(struct ast_cha
+@@ -7973,7 +7973,7 @@ static int testtime_write(struct ast_cha
sscanf(remainder, "%79s", timezone);
tv = ast_mktime(&tm, S_OR(timezone, NULL));
@@ -11,21 +11,3 @@ $NetBSD: patch-main_pbx.c,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
pbx_builtin_setvar_helper(chan, "__TESTTIME", result);
return 0;
}
-@@ -11295,7 +11295,7 @@ static int pbx_builtin_gotoiftime(struct
- struct ast_timing timing;
- const char *ctime;
- struct timeval tv = ast_tvnow();
-- long timesecs;
-+ intmax_t timesecs;
-
- if (!chan) {
- ast_log(LOG_WARNING, "GotoIfTime requires a channel on which to operate\n");
-@@ -11310,7 +11310,7 @@ static int pbx_builtin_gotoiftime(struct
- ts = s = ast_strdupa(data);
-
- ast_channel_lock(chan);
-- if ((ctime = pbx_builtin_getvar_helper(chan, "TESTTIME")) && sscanf(ctime, "%ld", &timesecs) == 1) {
-+ if ((ctime = pbx_builtin_getvar_helper(chan, "TESTTIME")) && sscanf(ctime, "%jd", &timesecs) == 1) {
- tv.tv_sec = timesecs;
- } else if (ctime) {
- ast_log(LOG_WARNING, "Using current time to evaluate\n");
diff --git a/comms/asterisk13/patches/patch-main_pbx__builtins.c b/comms/asterisk13/patches/patch-main_pbx__builtins.c
new file mode 100644
index 00000000000..6e560dc9f64
--- /dev/null
+++ b/comms/asterisk13/patches/patch-main_pbx__builtins.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-main_pbx__builtins.c,v 1.1 2016/05/06 07:41:06 jnemeth Exp $
+
+--- main/pbx_builtins.c.orig 2016-05-06 02:38:17.000000000 +0000
++++ main/pbx_builtins.c
+@@ -843,7 +843,7 @@ static int pbx_builtin_gotoiftime(struct
+ struct ast_timing timing;
+ const char *ctime;
+ struct timeval tv = ast_tvnow();
+- long timesecs;
++ int64_t timesecs;
+
+ if (!chan) {
+ ast_log(LOG_WARNING, "GotoIfTime requires a channel on which to operate\n");
+@@ -858,8 +858,8 @@ static int pbx_builtin_gotoiftime(struct
+ ts = s = ast_strdupa(data);
+
+ ast_channel_lock(chan);
+- if ((ctime = pbx_builtin_getvar_helper(chan, "TESTTIME")) && sscanf(ctime, "%ld", &timesecs) == 1) {
+- tv.tv_sec = timesecs;
++ if ((ctime = pbx_builtin_getvar_helper(chan, "TESTTIME")) && sscanf(ctime, "%" SCNd64, &timesecs) == 1) {
++ tv.tv_sec = (time_t)timesecs;
+ } else if (ctime) {
+ ast_log(LOG_WARNING, "Using current time to evaluate\n");
+ /* Reset when unparseable */