Update to the 1.6.2 series (specifically 1.6.2.13). This is
a feature update, so users that are upgrading should read UPDATE.txt. pkgsrc changes: - update to 1.6.2.13 - bury the asterisk-sounds-extra inside this one to keep it in sync - handle sound tarballs directly (upstream had changed this to do a download during the install phase and dump files in $HOME) - add new documentation files: - asterisk.txt - building_queues.txt - database_transactions.txt - followme.txt ======== 1.6.2.13 ======== This release resolves an issue where the .version and ChangeLog files were not updated for 1.6.2.12. Asterisk 1.6.2.13 has no additional changes from 1.6.2.12 other than the .version, ChangeLog and summary files. For a full list of changes in the current release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.13 ======== 1.6.2.12 ======== The release of Asterisk 1.6.2.12 resolves several issues reported by the community and would have not been possible without your participation. Thank you! The following is a sample of the issues resolved in this release: * Fix issue where DNID does not get cleared on a new call when using immediate=yes with ISDN signaling. (Closes issue #17568. Reported by wuwu. Patched by rmudgett) * Several updates to res_config_ldap. (Closes issue #13573. Reported by navkumar. Patched by navkumar, bencer. Tested by suretec) * Prevent loss of Caller ID information set on local channel after masquerade. (Closes issue #17138. Reported by kobaz, patched by jpeeler) * Fix SIP peers memory leak. (Closes issue #17774. Reported, patched by kkm) * Add Danish support to say.conf.sample (Closes issue #17836. Reported, patched by RoadKill) * Ensure SSRC is changed when media source is changed to resolve audio delay. (Closes issue #17404. Reported, tested by sdolloff. Patched by jpeeler) * Only do magic pickup when notifycid is enabled. A new way of doing BLF pickup was introduced into 1.6.2. This feature adds a call-id value into the XML of a SIP_NOTIFY message sent to alert a subscriber that a device is ringing. This option should only be enabled when the new 'notifycid' option is set, but this was not the case. Instead the call-id value was included for every RINGING Notify message, which caused a regression for people who used other methods for call pickup. (Closes issue #17633. Reported, patched by urosh. Patched by dvossel. Tested by: dvossel, urosh, okrief, alecdavis) For a full list of changes in the current release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.12 ======== 1.6.2.11 ======== The release of Asterisk 1.6.2.11 resolves several issues reported by the community and would have not been possible without your participation. Thank you! The following are a few of the issues resolved by community developers: * Send DialPlanComplete as a response, not as a separate event. Otherwise, it goes to all manager sessions and may exclude the current session, if the Events mask excludes it. (Closes issue #17504. Reported, patched by rrb3942) * Allow the "useragent" value to be restored into memory from the realtime backend. This value is purely informational. It does not alter configuration at all. (Closes issue #16029. Reported, patched by Guggemand) * Fix rt(c)p set debug ip taking wrong argument Also clean up some coding errors. (Closes issue #17469. Reported, patched by wdoekes) * Ensure channel placed in meetme in ringing state is properly hung up. An outgoing channel placed in meetme while still ringing which was then hung up would not exit meetme and the channel was not properly destroyed. (Closes issue #15871. Reported, patched by Ivan) * Correct how 100, 200, 300, etc. is said. Also add the crazy British numbers. (Closes issue #16102. Reported, patched by Delvar) * cdr_pgsql does not detect when a table is found. This change adds an ERROR message to let you know when a failure exists to get the columns from the pgsql database, which typically means that the table does not exist. (Closes issue #17478. Reported, patched by kobaz) * Avoid crashing when installing a duplicate translation path with a lower cost. (Closes issue #17092. Reported, patched by moy) * Add missing handling for ringing state for use with queue empty options. (Closes issue #17471. Reported, patched by jazzy) * Fix reporting estimated queue hold time. Just say the number of seconds (after minutes) rather than doing some incorrect calculation with respect to minutes. (Closes issue #17498. Reported, patched by corruptor) For a full list of changes in the current release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.11 ======== 1.6.2.10 ======== The release of Asterisk 1.6.2.10 resolves several issues reported by the community and would have not been possible without your participation. Thank you! The following are a few of the issues resolved by community developers: * Allow users to specify a port for DUNDI peers. (Closes issue #17056. Reported, patched by klaus3000) * Decrease the module ref count in sip_hangup when SIP_DEFER_BYE_ON_TRANSFER is set. (Closes issue #16815. Reported, patched by rain) * If there is realtime configuration, it does not get re-read on reload unless the config file also changes. (Closes issue #16982. Reported, patched by dmitri) * Send AgentComplete manager event for attended transfers. (Closes issue #16819. Reported, patched by elbriga) * Correct manager variable 'EventList' case. (Closes issue #17520. Reported, patched by kobaz) In addition, changes to res_timing_pthread that should make it more stable have also been implemented. For a full list of changes in the current release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.10 ======= 1.6.2.9 ======= The release of Asterisk 1.6.2.9 resolves several issues reported by the community, and would have not been possible without your participation. Thank you! The following are a few of the issues resolved by community developers: * Fix the PickupChan() application (Closes issue #16863. Reported, patched by schern. Patched by cjacobsen. Tested by Graber, cjacobsen, lathama, rickead2000, dvossel) * Improve logging by displaying line number (Closes issue #16303. Reported by dant. Patched by pabelanger. Tested by dant, pabelanger, lmadsen) * Notify CLI when modules are loaded/unloaded (Closes issue #17308. Reported, patched by pabelanger. Tested by russell) * Make the Makefile logic more explicit and move the Snow Leopard logic down to where it's not executed on non-Darwin systems (Closes issue #17028. Reported by pabelanger. Patched by seanbright, tilghman. Tested by pabelanger) * Manager cookies are not compatible with RFC2109. Make that no longer true. (Closes issue #17231. Reported, patched by ecarruda) * With IMAP backend, messages in INBOX were counted twice for MWI (Closes issue #17135. Reported by edhorton. Patched by ebroad, tilghman) * Fix possible segfault when logging (Closes issue #17331. Reported, patched by under. Patched by dvossel) * Fix memory hogging behavior of app_queue (Closes issue #17081. Reported by wliegel. Patched by mmichelson) * Allow type=user SIP endpoints to be loaded properly from realtime (Closes issue #16021. Reported, patched by Guggemand) Additionally, the following issue may be of interest: * Fix transcode_via_sln option with SIP calls and improve PLC usage (Review: https://reviewboard.asterisk.org/r/622/) For a full list of changes in the current release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.9 ======= 1.6.2.8 ======= The release of Asterisk 1.6.2.8 resolves several issues reported by the community, and would have not been possible without your participation. Thank you! The following are a few of the issues resolved by community developers: * Enable auto complete for CLI command 'logger set level'. (Closes issue #17152. Reported, patched by pabelanger) * Make the mixmonitor thread process audio frames faster. (Closes issue #17078. Reported, tested by geoff2010. Patched by dhubbard) * Add missing 'useragent' field to sip-friends.sql file. (Closes issue #17171. Reported, patched by thehar) * Add example dialplan for dialing ISN numbers (http://www.freenum.org) (Closes issue #17058. Reported, patched by pprindeville) * Fix issue with double "sip:" in header field. (Closes issue #15847. Reported, patched by ebroad) * Add ability to generate ASCII documentation from the TeX files by running 'make asterisk.txt'. (Closes issue #17220. Reported by lmadsen. Tested, patched by pabelanger) * When StopMonitor() is called, ensure that it will not be restarted by a channel event. (Closes issue #16590. Reported, patched by kkm) * Small error in the T.140 RTP port verbose log. (Closes issue #16998. Reported, patched by frawd. Tested by russell) For a full list of changes in the current release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.8 ======= 1.6.2.7 ======= The release of Asterisk 1.6.2.7 resolves several issues reported by the community, and would have not been possible without your participation. Thank you! The following are a few of the issues resolved by community developers: * Fix building CDR and CEL SQLite3 modules. (Closes issue #17017. Reported by alephlg. Patched by seanbright) * Resolve crash in SLAtrunk when the specified trunk doesn't exist. (Reported in #asterisk-dev by philipp64. Patched by seanbright) * Include an extra newline after "Aliased CLI command" to get back the prompt. (Issue #16978. Reported by jw-asterisk. Tested, patched by seanbright) * Prevent segfault if bad magic number is encountered. (Issue #17037. Reported, patched by alecdavis) * Update code to reflect that handle_speechset has 4 arguments. (Closes issue #17093. Reported, patched by gpatri. Tested by pabelanger, mmichelson) * Resolve a deadlock in chan_local. (Closes issue #16840. Reported, patched by bzing2, russell. Tested by bzing2) For a full list of changes in this releases, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.7 ======= 1.6.2.6 ======= The release of Asterisk 1.6.2.6 resolves several issues reported by the community, and would have not been possible without your participation. Thank you! The following are a few of the issues resolved by community developers: * Make sure to clear red alarm after polarity reversal. (Closes issue #14163. Reported, patched by jedi98. Tested by mattbrown, Chainsaw, mikeeccleston) * Fix problem with duplicate TXREQ packets in chan_iax2 (Closes issue #16904. Reported, patched by rain. Tested by rain, dvossel) * Fix crash in app_voicemail related to message counting. (Closes issue #16921. Reported, tested by whardier. Patched by seanbright) * Overlap receiving: Automatically send CALL PROCEEDING when dialplan starts (Reported, Patched, and Tested by alecdavis) * For T.38 reINVITEs treat a 606 the same as a 488. (Closes issue #16792. Reported, patched by vrban) * Fix ConfBridge crash when no timing module is loaded. (Closes issue #16471. Reported, tested by kjotte. Patched, tested by junky) For a full list of changes in this releases, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.6 ======= 1.6.2.5 ======= The Asterisk Development Team has announced security releases for the following versions of Asterisk: * 1.6.2.5 The releases of Asterisk 1.6.0.25, 1.6.1.17, and 1.6.2.5 resolve an issue with invalid parsing of ACL (Access Control List) rules leading to a possible compromise in security. The issue and resolution are described in the AST-2010-003 security advisory. For more information about the details of this vulnerability, please read the security advisory AST-2010-003, which was released at the same time as this announcement. For a full list of changes in the current releases, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.5 Security advisory AST-2010-003 is available at: http://downloads.asterisk.org/pub/security/AST-2010-003.pdf ======= 1.6.2.4 ======= The Asterisk Development Team has announced security releases for the following versions of Asterisk: * 1.6.2.4 The releases of Asterisk 1.2.40, 1.4.29.1, 1.6.0.24, 1.6.1.16, and 1.6.2.4 include documention describing a possible dialplan string injection with common usage of the ${EXTEN} (and other expansion variables). The issue and resolution are described in the AST-2010-002 security advisory. If you have a channel technology which can accept characters other than numbers and letters (such as SIP) it may be possible to craft an INVITE which sends data such as 300&Zap/g1/4165551212 which would create an additional outgoing channel leg that was not originally intended by the dialplan programmer. Please note that this is not limited to an specific protocol or the Dial() application. The expansion of variables into programmatically-interpreted strings is a common behavior in many script or script-like languages, Asterisk included. The ability for a variable to directly replace components of a command is a feature, not a bug - that is the entire point of string expansion. However, it is often the case due to expediency or design misunderstanding that a developer will not examine and filter string data from external sources before passing it into potentially harmful areas of their dialplan. With the flexibility of the design of Asterisk come these risks if the dialplan designer is not suitably cautious as to how foreign data is allowed to enter the system unchecked. This security release is intended to raise awareness of how it is possible to insert malicious strings into dialplans, and to advise developers to read the best practices documents so that they may easily avoid these dangers. For more information about the details of this vulnerability, please read the security advisory AST-2010-002, which was released at the same time as this announcement. For a full list of changes in the current releases, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.4 Security advisory AST-2010-002 is available at: http://downloads.asterisk.org/pub/security/AST-2010-002.pdf The README-SERIOUSLY.bestpractices.txt document is available in the top-level directory of your Asterisk sources, or available in all Asterisk branches from 1.2 and up. http://svn.asterisk.org/svn/asterisk/trunk/README-SERIOUSLY.bestpractices.txt ======= 1.6.2.3 ======= Was never released. ======= 1.6.2.2 ======= The Asterisk Development Team has announced security releases for Asterisk as the following versions: * 1.6.2.2 The releases of Asterisk 1.6.0.22, 1.6.1.14, and 1.6.2.2 include the fix described in security advisory AST-2010-001. The issue is that an attacker attempting to negotiate T.38 over SIP can remotely crash Asterisk by modifying the FaxMaxDatagram field of the SDP to contain either a negative or exceptionally large value. The same crash will occur when the FaxMaxDatagram field is omitted from the SDP, as well. For more information about the details of this vulnerability, please read the security advisory AST-2009-009, which was released at the same time as this announcement. For a full list of changes in the current releases, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.2 Security advisory AST-2010-001 is available at: http://downloads.asterisk.org/pub/security/AST-2010-001.pdf ======= 1.6.2.1 ======= The release of Asterisk 1.6.2.1 resolved several issues reported by the community, and would have not been possible without your participation. Thank you! * CLI 'queue show' formatting fix. (Closes issue #16078. Reported by RoadKill. Tested by dvossel. Patched by ppyy.) * Fix misreverting from 177158. (Closes issue #15725. Reported, Tested by shanermn. Patched by dimas.) * Fixes subscriptions being lost after 'module reload'. (Closes issue #16093. Reported by jlaroff. Patched by dvossel.) * app_queue segfaults if realtime field uniqueid is NULL (Closes issue #16385. Reported, Tested, Patched by haakon.) * Fix to Monitor which previously assumed the file to write to did not contain pathing. (Closes issue #16377, #16376. Reported by bcnit. Patched by dant. A summary of changes in this release can be found in the release summary: http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-1.6.2.1-summary.txt For a full list of changes in this releases, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.1 ======= 1.6.2.0 ======= The release of Asterisk 1.6.2.0 is the first feature release since Asterisk 1.6.1.0, which was released April 27, 2009. Many new features have been included in this release. For a complete list of changes, please see the CHANGES file. For those upgrading from a previous release, please see UPGRADE.txt It should be explicitly stated that Asterisk 1.6.2.0 is a major upgrade over any previous release, and special care should be taken when upgrading existing systems. Please see the UPGRADE.txt file for more information, available at: http://svn.asterisk.org/svn/asterisk/tags/1.6.2.0/UPGRADE.txt A detailed overview to the new features available in Asterisk 1.6.2.0 are forthcoming within the next few days. Please watch http://blogs.asterisk.org for further information! Below is a summary of several new features available in this release: * chan_dahdi now supports MFC/R2 signaling when Asterisk is compiled with support for LibOpenR2. http://www.libopenr2.org/ * Added a new 'faxdetect=yes|no' configuration option to sip.conf. When this option is enabled, Asterisk will watch for a CNG tone in the incoming audio for a received call. If it is detected, the channel will jump to the 'fax' extension in the dialplan. * A new application, Originate, has been introduced, that allows asynchronous call origination from the dialplan. * Added ConfBridge dialplan application which does conference bridges without DAHDI. For information on its use, please see the output of "core show application ConfBridge" from the CLI. * extensions.conf now allows you to use keyword "same" to define an extension without actually specifying an extension. It uses exactly the same pattern as previously used on the last "exten" line. For example: exten => 123,1,NoOp(something) same => n,SomethingElse() * Asterisk now provides the ability to define custom CLI aliases. For example, if you would like to define short form aliases for frequently used commands, such as "sh ch" for "core show channels", that is now possible. See the cli_aliases.conf configuration file for more information. * Asterisk now has support for subscribing to the state of remote voice mailboxes via SIP. * Asterisk now includes expanded HD codec support. G.722.1 and G.722.1C (Siren7/Siren14) passthrough, recording, and playback is now supported. Transcoding will be made available via add-on modules soon for this version of Asterisk. This is just a subset of the changes available in this release. Please see the CHANGES file for additional information, available at: http://svn.asterisk.org/svn/asterisk/tags/1.6.2.0/CHANGES A summary of changes in this release can be found in the release summary: http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-1.6.2.0-summary.txt For a full list of changes in this releases, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.0
This commit is contained in:
jnemeth
parent
ee572fa14d
commit
72fd43d3b5
11 changed files with 1503 additions and 298 deletions
|
|
@ -1,32 +1,31 @@
|
|||
# $NetBSD: Makefile,v 1.20 2010/06/16 08:04:44 jnemeth Exp $
|
||||
# $NetBSD: Makefile,v 1.21 2010/09/23 23:30:38 jnemeth Exp $
|
||||
#
|
||||
|
||||
DISTNAME= asterisk-1.6.1.20
|
||||
DISTNAME= asterisk-1.6.2.13
|
||||
DIST_SUBDIR= ${PKGNAME_NOREV}
|
||||
PKGREVISION= 1
|
||||
EXTRACT_ONLY= ${DISTNAME}.tar.gz
|
||||
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/asterisk/old-releases/ \
|
||||
http://downloads.asterisk.org/pub/telephony/sounds/releases/
|
||||
|
||||
OWNER= jnemeth@NetBSD.org
|
||||
HOMEPAGE= http://www.asterisk.org/
|
||||
COMMENT= The Asterisk Software PBX
|
||||
LICENSE= gnu-gpl-v2
|
||||
|
||||
CONFLICTS+= asterisk-sounds-extra-[0-9]*
|
||||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
USE_TOOLS+= bash bison gmake perl:run pkg-config
|
||||
USE_TOOLS+= bison gmake perl:run pkg-config tar
|
||||
USE_LANGUAGES= c c++
|
||||
REPLACE_BASH= build_tools/mkpkgconfig
|
||||
REPLACE_PERL+= agi/DialAnMp3.agi agi/agi-test.agi
|
||||
REPLACE_PERL+= agi/fastagi-test agi/jukebox.agi agi/numeralize
|
||||
REPLACE_PERL+= contrib/scripts/vmail.cgi
|
||||
|
||||
PKGCONFIG_OVERRIDE+= menuselect/mxml/mxml.pc.in
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS+= --datarootdir=${PREFIX}/libdata
|
||||
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
|
||||
|
|
@ -35,6 +34,7 @@ CONFIGURE_ARGS+= --without-gtk2
|
|||
INSTALL_TARGET= install samples
|
||||
INSTALLATION_DIRS+= lib/pkgconfig share/doc/${PKGBASE}
|
||||
INSTALLATION_DIRS+= share/examples/asterisk share/examples/rc.d
|
||||
INSTALLATION_DIRS+= ${ASTDATADIR}/sounds/en ${ASTDATADIR}/moh
|
||||
|
||||
BUILD_DEFS+= VARBASE
|
||||
|
||||
|
|
@ -64,10 +64,11 @@ MESSAGE_SUBST+= ASTSPOOLDIR=${ASTSPOOLDIR}
|
|||
MESSAGE_SUBST+= ASTLOGDIR=${ASTLOGDIR}
|
||||
ASTVARRUNDIR= ${VARBASE}/run/asterisk
|
||||
FILES_SUBST+= ASTVARRUNDIR=${ASTVARRUNDIR}
|
||||
ASTDATADIR= ${PREFIX}/libdata/asterisk
|
||||
MAKE_FLAGS+= ASTLIBDIR=${PREFIX}/lib/asterisk
|
||||
MAKE_FLAGS+= ASTVARLIBDIR=${PREFIX}/libdata/asterisk
|
||||
MAKE_FLAGS+= ASTKEYDIR=${PREFIX}/libdata/asterisk
|
||||
MAKE_FLAGS+= ASTDATADIR=${PREFIX}/libdata/asterisk
|
||||
MAKE_FLAGS+= ASTVARLIBDIR=${ASTDATADIR}
|
||||
MAKE_FLAGS+= ASTKEYDIR=${ASTDATADIR}
|
||||
MAKE_FLAGS+= ASTDATADIR=${ASTDATADIR}
|
||||
MAKE_FLAGS+= ASTSPOOLDIR=${ASTSPOOLDIR}
|
||||
MAKE_FLAGS+= ASTLOGDIR=${ASTLOGDIR}
|
||||
MAKE_FLAGS+= ASTHEADERDIR=${PREFIX}/include/asterisk
|
||||
|
|
@ -87,6 +88,9 @@ MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin
|
|||
|
||||
.include "options.mk"
|
||||
|
||||
# check sounds/Makefile for current version when upgrading package
|
||||
DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.11.tar.gz
|
||||
|
||||
# Override default paths in config files
|
||||
SUBST_CLASSES+= configs
|
||||
SUBST_STAGE.configs= pre-configure
|
||||
|
|
@ -140,7 +144,8 @@ CONF_FILES_PERMS+= ${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_U
|
|||
alsa.conf amd.conf asterisk.adsi cdr.conf \
|
||||
cdr_adaptive_odbc.conf cdr_custom.conf cdr_manager.conf \
|
||||
cdr_odbc.conf cdr_pgsql.conf cdr_sqlite3_custom.conf \
|
||||
cdr_tds.conf chan_dahdi.conf cli.conf codecs.conf console.conf \
|
||||
cdr_tds.conf chan_dahdi.conf cli.conf cli_aliases.conf \
|
||||
cli_permissions.conf codecs.conf console.conf \
|
||||
dnsmgr.conf dundi.conf enum.conf extensions.ael extconfig.conf \
|
||||
extensions.conf extensions.lua extensions_minivm.conf \
|
||||
features.conf festival.conf followme.conf func_odbc.conf \
|
||||
|
|
@ -149,7 +154,8 @@ CONF_FILES_PERMS+= ${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_U
|
|||
manager.conf meetme.conf mgcp.conf minivm.conf misdn.conf \
|
||||
modules.conf musiconhold.conf muted.conf osp.conf oss.conf \
|
||||
phone.conf phoneprov.conf queuerules.conf queues.conf \
|
||||
res_ldap.conf res_odbc.conf res_pgsql.conf res_snmp.conf \
|
||||
res_config_sqlite.conf res_ldap.conf res_odbc.conf \
|
||||
res_pgsql.conf res_snmp.conf \
|
||||
rpt.conf rtp.conf say.conf sip.conf sip_notify.conf skinny.conf \
|
||||
sla.conf smdi.conf telcordia-1.adsi udptl.conf unistim.conf \
|
||||
usbradio.conf users.conf voicemail.conf vpb.conf
|
||||
|
|
@ -164,6 +170,9 @@ post-patch:
|
|||
.endif
|
||||
|
||||
post-install:
|
||||
${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.19.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.11.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}
|
||||
|
|
@ -183,13 +192,16 @@ post-install:
|
|||
${INSTALL_DATA} ${WRKSRC}/doc/PEERING ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/asterisk-mib.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/backtrace.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/building_queues.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/callfiles.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/chan_sip-perf-testing.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/cli.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/database_transactions.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/datastores.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/digium-mib.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/distributed_devstate.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/externalivr.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/followme.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/jabber.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/janitor-projects.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/jingle.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
|
|
@ -215,9 +227,11 @@ post-install:
|
|||
${INSTALL_DATA} ${WRKSRC}/doc/video.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/video_console.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/voicemail_odbc_postgresql.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/tex/asterisk.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
|
||||
|
||||
.include "../../devel/zlib/buildlink3.mk"
|
||||
.include "../../security/openssl/buildlink3.mk"
|
||||
.include "../../textproc/libxml2/buildlink3.mk"
|
||||
.include "../../www/curl/buildlink3.mk"
|
||||
.include "../../mk/curses.buildlink3.mk"
|
||||
.include "../../mk/pthread.buildlink3.mk"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,35 +1,44 @@
|
|||
$NetBSD: distinfo,v 1.15 2010/06/16 08:04:44 jnemeth Exp $
|
||||
$NetBSD: distinfo,v 1.16 2010/09/23 23:30:38 jnemeth Exp $
|
||||
|
||||
SHA1 (asterisk-1.6.1.20/asterisk-1.6.1.20.tar.gz) = 7d92f9de5ed6de10e34c8e6039f91b45884e46f8
|
||||
RMD160 (asterisk-1.6.1.20/asterisk-1.6.1.20.tar.gz) = ccb504292e9d5e93d79456ede212b1697e3c213e
|
||||
Size (asterisk-1.6.1.20/asterisk-1.6.1.20.tar.gz) = 23601410 bytes
|
||||
SHA1 (asterisk-1.6.1.20/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8
|
||||
RMD160 (asterisk-1.6.1.20/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4
|
||||
Size (asterisk-1.6.1.20/extract-cfile.awk) = 667 bytes
|
||||
SHA1 (asterisk-1.6.1.20/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
|
||||
RMD160 (asterisk-1.6.1.20/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
|
||||
Size (asterisk-1.6.1.20/rfc3951.txt) = 373442 bytes
|
||||
SHA1 (patch-aa) = 953fcfd1e0da44f9e7e46fed84be9e8b44125ef0
|
||||
SHA1 (asterisk-1.6.2.13/asterisk-1.6.2.13.tar.gz) = b412d4a8589b5b58bd64e2b7f277712b7cbbfabd
|
||||
RMD160 (asterisk-1.6.2.13/asterisk-1.6.2.13.tar.gz) = ebdd776da2e76a247a621748d8aea0c1f0cffc63
|
||||
Size (asterisk-1.6.2.13/asterisk-1.6.2.13.tar.gz) = 23679304 bytes
|
||||
SHA1 (asterisk-1.6.2.13/asterisk-core-sounds-en-gsm-1.4.19.tar.gz) = 719fee72692514fb96a0c619ed1a6b9cabfb5098
|
||||
RMD160 (asterisk-1.6.2.13/asterisk-core-sounds-en-gsm-1.4.19.tar.gz) = 9740ea2e22dfb819b0528ba0ab5b5b6424039442
|
||||
Size (asterisk-1.6.2.13/asterisk-core-sounds-en-gsm-1.4.19.tar.gz) = 1784830 bytes
|
||||
SHA1 (asterisk-1.6.2.13/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
|
||||
RMD160 (asterisk-1.6.2.13/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
|
||||
Size (asterisk-1.6.2.13/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
|
||||
SHA1 (asterisk-1.6.2.13/asterisk-moh-opsound-wav-2.03.tar.gz) = f40fd6ea03dfe8d72ada2540b2288bfdc006381d
|
||||
RMD160 (asterisk-1.6.2.13/asterisk-moh-opsound-wav-2.03.tar.gz) = 9566974a836051e08f51412de508d92bf3be7e02
|
||||
Size (asterisk-1.6.2.13/asterisk-moh-opsound-wav-2.03.tar.gz) = 15359473 bytes
|
||||
SHA1 (asterisk-1.6.2.13/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8
|
||||
RMD160 (asterisk-1.6.2.13/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4
|
||||
Size (asterisk-1.6.2.13/extract-cfile.awk) = 667 bytes
|
||||
SHA1 (asterisk-1.6.2.13/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
|
||||
RMD160 (asterisk-1.6.2.13/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
|
||||
Size (asterisk-1.6.2.13/rfc3951.txt) = 373442 bytes
|
||||
SHA1 (patch-aa) = 8c2a3c75adff34474c8f416bcea5842e771e4631
|
||||
SHA1 (patch-af) = 09860d714281cb4c65d1a087cf5b16647a16e2fa
|
||||
SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
|
||||
SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
|
||||
SHA1 (patch-ak) = adee75b7716a8794de1b8cb054af7a5a8f0e5ffd
|
||||
SHA1 (patch-al) = 44b3efd044b9a49c002ab944372698eec6dd1913
|
||||
SHA1 (patch-al) = b2a1134786d7c3b118ee8c47892f91dd2a4c783a
|
||||
SHA1 (patch-am) = 98aa4648b867d193ec05d8da14434205f369c17b
|
||||
SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
|
||||
SHA1 (patch-ao) = 0663a698469550b22bb97ee1b18980bc2bc67495
|
||||
SHA1 (patch-ap) = d60274a44e10dc4e70235ac97b7ae21f37ce713e
|
||||
SHA1 (patch-aq) = e9966b8893e71183aeabd5b045668a6ae394cbb3
|
||||
SHA1 (patch-aq) = 9020c4327d39276f51215d277c015477ba2cd5bb
|
||||
SHA1 (patch-ar) = 44e46336c0b228ab291e025b8bb5ee505f75345a
|
||||
SHA1 (patch-as) = a887d37f0829c22d115ff08721893da49e4bfda4
|
||||
SHA1 (patch-at) = 7f366ea0075b16c81bb81ba78becc029b3265151
|
||||
SHA1 (patch-au) = 47330b597a484b5d29aeca466243369a121b2b3c
|
||||
SHA1 (patch-au) = 55624a65fcd8277d3e4fc5a2622c2a309b9d8254
|
||||
SHA1 (patch-av) = 632c7f9595ed1575b74d97a323ae53343a416254
|
||||
SHA1 (patch-aw) = 1342176dd34dd68614edf1085c6997013e93c135
|
||||
SHA1 (patch-ax) = 865376102295e1afc316cc12e87965211449b306
|
||||
SHA1 (patch-ax) = b8ff68b628ccadd81b0a2615b610470279d54bf4
|
||||
SHA1 (patch-ay) = 39a2ae198ff2989c501dd4374e1ea57a3d52dda9
|
||||
SHA1 (patch-az) = 917cc8868708ce9c022a0268debd90f51f88bdad
|
||||
SHA1 (patch-ba) = 2ea96529e0187a23d0b640c7cae69904d587c269
|
||||
SHA1 (patch-ba) = 915eb587d36f3a54734c9c88af15f59c98016708
|
||||
SHA1 (patch-bb) = 3b78ed3c8233e2db38d09ca81f1768d018ffd2e2
|
||||
SHA1 (patch-bc) = 0efc99595d1ef82a879361e8bf3b2ef7fd84af62
|
||||
SHA1 (patch-bd) = b275b80e84cf6a34bd9fe064b2b53072f500b760
|
||||
SHA1 (patch-bd) = c827419664f78230556e43607d1abf6b156dcc88
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: options.mk,v 1.7 2010/05/07 23:57:56 jnemeth Exp $
|
||||
# $NetBSD: options.mk,v 1.8 2010/09/23 23:30:38 jnemeth Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk
|
||||
PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap
|
||||
|
|
@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --without-gtk
|
|||
. include "../../databases/unixodbc/buildlink3.mk"
|
||||
. include "../../devel/libltdl/buildlink3.mk"
|
||||
CONFIGURE_ARGS+= --with-ltdl
|
||||
CONFIGURE_ARGS+= --with-odbc
|
||||
CONFIGURE_ARGS+= --with-unixodbc
|
||||
PLIST.unixodbc= yes
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-ltdl
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
||||
$NetBSD: patch-aa,v 1.7 2010/09/23 23:30:38 jnemeth Exp $
|
||||
|
||||
--- Makefile.orig 2010-05-03 17:37:13.000000000 +0000
|
||||
--- Makefile.orig 2010-06-10 20:35:06.000000000 +0000
|
||||
+++ Makefile
|
||||
@@ -123,20 +123,6 @@ DEBUG=-g3
|
||||
@@ -126,19 +126,6 @@ DEBUG=-g3
|
||||
|
||||
# Define standard directories for various platforms
|
||||
# These apply if they are not redefined in asterisk.conf
|
||||
|
|
@ -15,7 +15,6 @@ $NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
|||
- ASTSPOOLDIR=/var/spool/asterisk
|
||||
- ASTLOGDIR=/var/log/asterisk
|
||||
- ASTHEADERDIR=/opt/asterisk/include
|
||||
- ASTBINDIR=/opt/asterisk/bin
|
||||
- ASTSBINDIR=/opt/asterisk/sbin
|
||||
- ASTVARRUNDIR=/var/run/asterisk
|
||||
- ASTMANDIR=/opt/asterisk/man
|
||||
|
|
@ -23,13 +22,13 @@ $NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
|||
ASTETCDIR=$(sysconfdir)/asterisk
|
||||
ASTLIBDIR=$(libdir)/asterisk
|
||||
ASTHEADERDIR=$(includedir)/asterisk
|
||||
@@ -146,19 +132,12 @@ else
|
||||
@@ -147,19 +134,11 @@ else
|
||||
ASTLOGDIR=$(localstatedir)/log/asterisk
|
||||
ASTVARRUNDIR=$(localstatedir)/run
|
||||
ASTVARRUNDIR=$(localstatedir)/run/asterisk
|
||||
ASTMANDIR=$(mandir)
|
||||
-ifneq ($(findstring BSD,$(OSARCH)),)
|
||||
ASTVARLIBDIR=$(prefix)/share/asterisk
|
||||
ASTVARRUNDIR=$(localstatedir)/run/asterisk
|
||||
- ASTVARRUNDIR=$(localstatedir)/run/asterisk
|
||||
ASTDBDIR=$(localstatedir)/db/asterisk
|
||||
-else
|
||||
- ASTVARLIBDIR=$(localstatedir)/lib/asterisk
|
||||
|
|
@ -44,7 +43,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
|||
|
||||
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
|
||||
# when starting Asterisk
|
||||
@@ -244,10 +223,6 @@ ifeq ($(AST_DEVMODE),yes)
|
||||
@@ -245,10 +224,6 @@ ifeq ($(AST_DEVMODE),yes)
|
||||
_ASTCFLAGS+=-Wformat=2
|
||||
endif
|
||||
|
||||
|
|
@ -55,7 +54,15 @@ $NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
|||
ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
|
||||
ifneq ($(PROC),ultrasparc)
|
||||
_ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
|
||||
@@ -508,9 +483,10 @@ NEWHEADERS=$(notdir $(wildcard include/a
|
||||
@@ -493,7 +468,6 @@ datafiles: _all
|
||||
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
|
||||
done
|
||||
mkdir -p $(DESTDIR)$(AGI_DIR)
|
||||
- $(MAKE) -C sounds install
|
||||
|
||||
doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
|
||||
@printf "Building Documentation For: "
|
||||
@@ -539,9 +513,10 @@ NEWHEADERS=$(notdir $(wildcard include/a
|
||||
OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
|
||||
|
||||
installdirs:
|
||||
|
|
@ -64,10 +71,10 @@ $NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
|||
mkdir -p $(DESTDIR)$(ASTSBINDIR)
|
||||
- mkdir -p $(DESTDIR)$(ASTETCDIR)
|
||||
+ mkdir -p $(DESTDIR)$(ASTEXAMPLEDIR)
|
||||
mkdir -p $(DESTDIR)$(ASTBINDIR)
|
||||
mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
|
||||
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
|
||||
@@ -519,6 +495,7 @@ installdirs:
|
||||
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
|
||||
@@ -549,6 +524,7 @@ installdirs:
|
||||
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
|
||||
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
|
||||
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
|
||||
|
|
@ -75,7 +82,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
|||
|
||||
bininstall: _all installdirs $(SUBDIRS_INSTALL)
|
||||
$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
|
||||
@@ -614,22 +591,22 @@ upgrade: bininstall
|
||||
@@ -650,22 +626,22 @@ upgrade: bininstall
|
||||
# XXX why *.adsi is installed first ?
|
||||
adsi:
|
||||
@echo Installing adsi config files...
|
||||
|
|
@ -103,7 +110,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
|||
if [ -f $${dst} ]; then \
|
||||
if [ "$(OVERWRITE)" = "y" ]; then \
|
||||
if cmp -s $${dst} $$x ; then \
|
||||
@@ -645,10 +622,10 @@ samples: adsi
|
||||
@@ -681,10 +657,10 @@ samples: adsi
|
||||
echo "Installing file $$x"; \
|
||||
$(INSTALL) -m 644 $$x $${dst} ;\
|
||||
done
|
||||
|
|
@ -116,7 +123,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
|||
echo "astetcdir => $(ASTETCDIR)" ; \
|
||||
echo "astmoddir => $(MODULES_DIR)" ; \
|
||||
echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
|
||||
@@ -705,7 +682,7 @@ samples: adsi
|
||||
@@ -745,7 +721,7 @@ samples: adsi
|
||||
echo "pbx_realtime=1.6" ; \
|
||||
echo "res_agi=1.6" ; \
|
||||
echo "app_set=1.6" ; \
|
||||
|
|
@ -125,7 +132,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
|||
else \
|
||||
echo "Skipping asterisk.conf creation"; \
|
||||
fi
|
||||
@@ -733,7 +710,7 @@ samples: adsi
|
||||
@@ -773,7 +749,7 @@ samples: adsi
|
||||
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 )
|
||||
|
|
@ -134,7 +141,7 @@ $NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
|||
mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
|
||||
for x in images/*.gif; do \
|
||||
$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
|
||||
@@ -841,7 +818,7 @@ uninstall-all: _uninstall
|
||||
@@ -889,7 +865,7 @@ uninstall-all: _uninstall
|
||||
rm -rf $(DESTDIR)$(ASTVARLIBDIR)
|
||||
rm -rf $(DESTDIR)$(ASTDATADIR)
|
||||
rm -rf $(DESTDIR)$(ASTSPOOLDIR)
|
||||
|
|
@ -143,8 +150,8 @@ $NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
|
|||
rm -rf $(DESTDIR)$(ASTLOGDIR)
|
||||
|
||||
menuconfig: menuselect
|
||||
@@ -912,6 +889,7 @@ asterisk.pdf:
|
||||
$(MAKE) -C doc/tex asterisk.pdf
|
||||
@@ -964,6 +940,7 @@ asterisk.txt:
|
||||
$(MAKE) -C doc/tex asterisk.txt
|
||||
|
||||
.PHONY: menuselect
|
||||
+.PHONY: menuselect.makeopts
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
$NetBSD: patch-al,v 1.2 2010/05/20 17:14:45 jnemeth Exp $
|
||||
$NetBSD: patch-al,v 1.3 2010/09/23 23:30:38 jnemeth Exp $
|
||||
|
||||
--- pbx/pbx_dundi.c.orig 2010-03-30 16:10:41.000000000 +0000
|
||||
--- pbx/pbx_dundi.c.orig 2010-06-22 15:00:11.000000000 +0000
|
||||
+++ pbx/pbx_dundi.c
|
||||
@@ -37,7 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
|
||||
#include <pthread.h>
|
||||
#include <net/if.h>
|
||||
|
||||
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__)
|
||||
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__)
|
||||
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__DragonFly__)
|
||||
#include <net/if_dl.h>
|
||||
#include <ifaddrs.h>
|
||||
|
|
|
|||
|
|
@ -1,144 +1,13 @@
|
|||
$NetBSD: patch-aq,v 1.6 2010/05/20 17:14:45 jnemeth Exp $
|
||||
$NetBSD: patch-aq,v 1.7 2010/09/23 23:30:38 jnemeth Exp $
|
||||
|
||||
--- configure.orig 2010-01-25 21:53:37.000000000 +0000
|
||||
--- configure.orig 2010-07-27 17:54:54.000000000 +0000
|
||||
+++ configure
|
||||
@@ -19494,6 +19494,146 @@ _ACEOF
|
||||
@@ -14946,6 +14946,17 @@ fi
|
||||
|
||||
fi
|
||||
|
||||
+
|
||||
+
|
||||
+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
|
||||
+ { echo "$as_me:$LINENO: checking for sys/atomic.h" >&5
|
||||
+echo $ECHO_N "checking for sys/atomic.h... $ECHO_C" >&6; }
|
||||
+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
|
||||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
+fi
|
||||
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5
|
||||
+echo "${ECHO_T}$ac_cv_header_sys_atomic_h" >&6; }
|
||||
+else
|
||||
+ # Is the header compilable?
|
||||
+{ echo "$as_me:$LINENO: checking sys/atomic.h usability" >&5
|
||||
+echo $ECHO_N "checking sys/atomic.h usability... $ECHO_C" >&6; }
|
||||
+cat >conftest.$ac_ext <<_ACEOF
|
||||
+/* confdefs.h. */
|
||||
+_ACEOF
|
||||
+cat confdefs.h >>conftest.$ac_ext
|
||||
+cat >>conftest.$ac_ext <<_ACEOF
|
||||
+/* end confdefs.h. */
|
||||
+$ac_includes_default
|
||||
+#include <sys/atomic.h>
|
||||
+_ACEOF
|
||||
+rm -f conftest.$ac_objext
|
||||
+if { (ac_try="$ac_compile"
|
||||
+case "(($ac_try" in
|
||||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
+ *) ac_try_echo=$ac_try;;
|
||||
+esac
|
||||
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
+ (eval "$ac_compile") 2>conftest.er1
|
||||
+ ac_status=$?
|
||||
+ grep -v '^ *+' conftest.er1 >conftest.err
|
||||
+ rm -f conftest.er1
|
||||
+ cat conftest.err >&5
|
||||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
+ (exit $ac_status); } && {
|
||||
+ test -z "$ac_c_werror_flag" ||
|
||||
+ test ! -s conftest.err
|
||||
+ } && test -s conftest.$ac_objext; then
|
||||
+ ac_header_compiler=yes
|
||||
+else
|
||||
+ echo "$as_me: failed program was:" >&5
|
||||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||||
+
|
||||
+ ac_header_compiler=no
|
||||
+fi
|
||||
+
|
||||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
+echo "${ECHO_T}$ac_header_compiler" >&6; }
|
||||
+
|
||||
+# Is the header present?
|
||||
+{ echo "$as_me:$LINENO: checking sys/atomic.h presence" >&5
|
||||
+echo $ECHO_N "checking sys/atomic.h presence... $ECHO_C" >&6; }
|
||||
+cat >conftest.$ac_ext <<_ACEOF
|
||||
+/* confdefs.h. */
|
||||
+_ACEOF
|
||||
+cat confdefs.h >>conftest.$ac_ext
|
||||
+cat >>conftest.$ac_ext <<_ACEOF
|
||||
+/* end confdefs.h. */
|
||||
+#include <sys/atomic.h>
|
||||
+_ACEOF
|
||||
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
||||
+case "(($ac_try" in
|
||||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
+ *) ac_try_echo=$ac_try;;
|
||||
+esac
|
||||
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||||
+ ac_status=$?
|
||||
+ grep -v '^ *+' conftest.er1 >conftest.err
|
||||
+ rm -f conftest.er1
|
||||
+ cat conftest.err >&5
|
||||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
+ (exit $ac_status); } >/dev/null && {
|
||||
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||||
+ test ! -s conftest.err
|
||||
+ }; then
|
||||
+ ac_header_preproc=yes
|
||||
+else
|
||||
+ echo "$as_me: failed program was:" >&5
|
||||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||||
+
|
||||
+ ac_header_preproc=no
|
||||
+fi
|
||||
+
|
||||
+rm -f conftest.err conftest.$ac_ext
|
||||
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
+echo "${ECHO_T}$ac_header_preproc" >&6; }
|
||||
+
|
||||
+# So? What about this header?
|
||||
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||||
+ yes:no: )
|
||||
+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
+echo "$as_me: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the compiler's result" >&5
|
||||
+echo "$as_me: WARNING: sys/atomic.h: proceeding with the compiler's result" >&2;}
|
||||
+ ac_header_preproc=yes
|
||||
+ ;;
|
||||
+ no:yes:* )
|
||||
+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: present but cannot be compiled" >&5
|
||||
+echo "$as_me: WARNING: sys/atomic.h: present but cannot be compiled" >&2;}
|
||||
+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: check for missing prerequisite headers?" >&5
|
||||
+echo "$as_me: WARNING: sys/atomic.h: check for missing prerequisite headers?" >&2;}
|
||||
+ { echo "$as_me:$LINENO: WARNING: sys/Atomic.h: see the Autoconf documentation" >&5
|
||||
+echo "$as_me: WARNING: sys/atomic.h: see the Autoconf documentation" >&2;}
|
||||
+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&5
|
||||
+echo "$as_me: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
||||
+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&5
|
||||
+echo "$as_me: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&2;}
|
||||
+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&5
|
||||
+echo "$as_me: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&2;}
|
||||
+ ( cat <<\_ASBOX
|
||||
+## ------------------------------- ##
|
||||
+## Report this to www.asterisk.org ##
|
||||
+## ------------------------------- ##
|
||||
+_ASBOX
|
||||
+ ) | sed "s/^/$as_me: WARNING: /" >&2
|
||||
+ ;;
|
||||
+esac
|
||||
+{ echo "$as_me:$LINENO: checking for sys/atomic.h" >&5
|
||||
+echo $ECHO_N "checking for sys/atomic.h... $ECHO_C" >&6; }
|
||||
+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
|
||||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
+else
|
||||
+ ac_cv_header_sys_atomic_h=$ac_header_preproc
|
||||
+fi
|
||||
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5
|
||||
+echo "${ECHO_T}$ac_cv_header_sys_atomic_h" >&6; }
|
||||
+
|
||||
+fi
|
||||
+if test $ac_cv_header_sys_atomic_h = yes; then
|
||||
|
||||
+ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default"
|
||||
+if test "x$ac_cv_header_sys_atomic_h" = x""yes; then :
|
||||
+
|
||||
+cat >>confdefs.h <<_ACEOF
|
||||
+#define HAVE_SYS_ATOMIC_H 1
|
||||
|
|
@ -146,15 +15,17 @@ $NetBSD: patch-aq,v 1.6 2010/05/20 17:14:45 jnemeth Exp $
|
|||
+
|
||||
+fi
|
||||
+
|
||||
+
|
||||
+
|
||||
# The cast to long int works around a bug in the HP C Compiler
|
||||
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
|
||||
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
|
||||
@@ -15558,6 +15569,8 @@ $as_echo_n "checking if \"struct ifaddrs
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for int" >&5
|
||||
@@ -20769,6 +20909,8 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/socket.h>
|
||||
#include <ifaddrs.h>
|
||||
+ #include <sys/types.h>
|
||||
+ #include <sys/socket.h>
|
||||
#include <ifaddrs.h>
|
||||
int
|
||||
main ()
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: patch-au,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
|
||||
$NetBSD: patch-au,v 1.2 2010/09/23 23:30:38 jnemeth Exp $
|
||||
|
||||
--- sounds/Makefile.orig 2009-01-09 15:17:14.000000000 -0800
|
||||
--- sounds/Makefile.orig 2010-07-28 20:02:27.000000000 +0000
|
||||
+++ sounds/Makefile
|
||||
@@ -60,20 +60,6 @@ endif
|
||||
all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
|
||||
@@ -134,20 +134,6 @@ endif
|
||||
all: $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
|
||||
|
||||
have_download:
|
||||
- @if test "$(DOWNLOAD)" = ":" ; then \
|
||||
|
|
@ -21,5 +21,5 @@ $NetBSD: patch-au,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
|
|||
- exit 1; \
|
||||
- fi
|
||||
|
||||
$(SOUNDS_DIR)/.asterisk-core-sounds-en-%: have_download
|
||||
@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
|
||||
$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en,$(CORE_SOUNDS_VERSION)))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $
|
||||
$NetBSD: patch-ax,v 1.5 2010/09/23 23:30:38 jnemeth Exp $
|
||||
|
||||
--- apps/app_queue.c.orig 2009-11-30 20:58:33.000000000 +0000
|
||||
--- apps/app_queue.c.orig 2010-07-28 16:51:11.000000000 +0000
|
||||
+++ apps/app_queue.c
|
||||
@@ -2571,8 +2571,8 @@ static void record_abandoned(struct queu
|
||||
@@ -2801,8 +2801,8 @@ static void record_abandoned(struct queu
|
||||
"Uniqueid: %s\r\n"
|
||||
"Position: %d\r\n"
|
||||
"OriginalPosition: %d\r\n"
|
||||
|
|
@ -13,32 +13,16 @@ $NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $
|
|||
|
||||
qe->parent->callsabandoned++;
|
||||
ao2_unlock(qe->parent);
|
||||
@@ -3007,7 +3007,7 @@ static int wait_our_turn(struct queue_en
|
||||
@@ -3227,7 +3227,7 @@ static int wait_our_turn(struct queue_en
|
||||
|
||||
if (qe->parent->leavewhenempty && (status == QUEUE_NO_MEMBERS)) {
|
||||
*reason = QUEUE_LEAVEEMPTY;
|
||||
- ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
|
||||
+ ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
|
||||
leave_queue(qe);
|
||||
break;
|
||||
}
|
||||
@@ -3015,13 +3015,13 @@ static int wait_our_turn(struct queue_en
|
||||
/* leave the queue if no reachable agents, if enabled */
|
||||
if ((qe->parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS)) {
|
||||
*reason = QUEUE_LEAVEUNAVAIL;
|
||||
- ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
|
||||
+ ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
|
||||
leave_queue(qe);
|
||||
break;
|
||||
}
|
||||
if ((qe->parent->leavewhenempty == QUEUE_EMPTY_LOOSE) && (status == QUEUE_NO_REACHABLE_MEMBERS)) {
|
||||
*reason = QUEUE_LEAVEUNAVAIL;
|
||||
- ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
|
||||
+ ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
|
||||
leave_queue(qe);
|
||||
break;
|
||||
}
|
||||
@@ -3209,12 +3209,12 @@ static void send_agent_complete(const st
|
||||
if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty))) {
|
||||
*reason = QUEUE_LEAVEEMPTY;
|
||||
- ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
|
||||
+ ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
|
||||
leave_queue(qe);
|
||||
break;
|
||||
}
|
||||
@@ -3421,12 +3421,12 @@ static void send_agent_complete(const st
|
||||
"Channel: %s\r\n"
|
||||
"Member: %s\r\n"
|
||||
"MemberName: %s\r\n"
|
||||
|
|
@ -54,7 +38,7 @@ $NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $
|
|||
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
|
||||
}
|
||||
|
||||
@@ -3257,9 +3257,9 @@ static void queue_transfer_fixup(void *d
|
||||
@@ -3469,9 +3469,9 @@ static void queue_transfer_fixup(void *d
|
||||
int callcompletedinsl = qtds->callcompletedinsl;
|
||||
struct ast_datastore *datastore;
|
||||
|
||||
|
|
@ -65,18 +49,18 @@ $NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $
|
|||
+ new_chan->exten, new_chan->context, (intmax_t) (callstart - qe->start),
|
||||
+ (intmax_t) (time(NULL) - callstart), qe->opos);
|
||||
|
||||
update_queue(qe->parent, member, callcompletedinsl);
|
||||
update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
|
||||
|
||||
@@ -3734,7 +3734,7 @@ static int try_calling(struct queue_ent
|
||||
@@ -3954,7 +3954,7 @@ static int try_calling(struct queue_ent
|
||||
} else if (res2) {
|
||||
/* Caller must have hung up just before being connected*/
|
||||
ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", peer->name);
|
||||
- ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "ABANDON", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
|
||||
+ ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "ABANDON", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
|
||||
record_abandoned(qe);
|
||||
ast_cdr_noanswer(qe->chan->cdr);
|
||||
ast_hangup(peer);
|
||||
@@ -3781,8 +3781,8 @@ static int try_calling(struct queue_ent
|
||||
ao2_ref(member, -1);
|
||||
@@ -4000,8 +4000,8 @@ static int try_calling(struct queue_ent
|
||||
/* if setqueueentryvar is defined, make queue entry (i.e. the caller) variables available to the channel */
|
||||
/* use pbx_builtin_setvar to set a load of variables with one call */
|
||||
if (qe->parent->setqueueentryvar) {
|
||||
|
|
@ -87,7 +71,7 @@ $NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $
|
|||
pbx_builtin_setvar_multiple(qe->chan, interfacevar);
|
||||
pbx_builtin_setvar_multiple(peer, interfacevar);
|
||||
}
|
||||
@@ -4029,8 +4029,8 @@ static int try_calling(struct queue_ent
|
||||
@@ -4248,8 +4248,8 @@ static int try_calling(struct queue_ent
|
||||
ast_log(LOG_WARNING, "Asked to execute an AGI on this channel, but could not find application (agi)!\n");
|
||||
}
|
||||
qe->handled++;
|
||||
|
|
@ -98,7 +82,7 @@ $NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $
|
|||
if (update_cdr && qe->chan->cdr)
|
||||
ast_copy_string(qe->chan->cdr->dstchannel, member->membername, sizeof(qe->chan->cdr->dstchannel));
|
||||
if (qe->parent->eventwhencalled)
|
||||
@@ -4040,12 +4040,12 @@ static int try_calling(struct queue_ent
|
||||
@@ -4259,12 +4259,12 @@ static int try_calling(struct queue_ent
|
||||
"Channel: %s\r\n"
|
||||
"Member: %s\r\n"
|
||||
"MemberName: %s\r\n"
|
||||
|
|
@ -114,7 +98,7 @@ $NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $
|
|||
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
|
||||
ast_copy_string(oldcontext, qe->chan->context, sizeof(oldcontext));
|
||||
ast_copy_string(oldexten, qe->chan->exten, sizeof(oldexten));
|
||||
@@ -4076,17 +4076,17 @@ static int try_calling(struct queue_ent
|
||||
@@ -4296,17 +4296,17 @@ static int try_calling(struct queue_ent
|
||||
|
||||
/* detect a blind transfer */
|
||||
if (!(qe->chan->_softhangup | peer->_softhangup) && (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten))) {
|
||||
|
|
@ -139,8 +123,8 @@ $NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $
|
|||
send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), AGENT);
|
||||
}
|
||||
if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {
|
||||
@@ -4970,8 +4970,8 @@ check_turns:
|
||||
ast_cdr_noanswer(qe.chan->cdr);
|
||||
@@ -5186,8 +5186,8 @@ check_turns:
|
||||
record_abandoned(&qe);
|
||||
reason = QUEUE_TIMEOUT;
|
||||
res = 0;
|
||||
- ast_queue_log(args.queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld",
|
||||
|
|
@ -150,25 +134,16 @@ $NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $
|
|||
break;
|
||||
}
|
||||
|
||||
@@ -5041,7 +5041,7 @@ check_turns:
|
||||
record_abandoned(&qe);
|
||||
ast_cdr_noanswer(qe.chan->cdr);
|
||||
reason = QUEUE_LEAVEEMPTY;
|
||||
- ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start));
|
||||
+ ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe.pos, qe.opos, (intmax_t)(time(NULL) - qe.start));
|
||||
res = 0;
|
||||
break;
|
||||
}
|
||||
@@ -5050,7 +5050,7 @@ check_turns:
|
||||
if ((qe.parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS)) {
|
||||
record_abandoned(&qe);
|
||||
reason = QUEUE_LEAVEUNAVAIL;
|
||||
- ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start));
|
||||
+ ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe.pos, qe.opos, (intmax_t)(time(NULL) - qe.start));
|
||||
res = 0;
|
||||
break;
|
||||
}
|
||||
@@ -5066,7 +5066,7 @@ check_turns:
|
||||
@@ -5229,7 +5229,7 @@ check_turns:
|
||||
if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty))) {
|
||||
record_abandoned(&qe);
|
||||
reason = QUEUE_LEAVEEMPTY;
|
||||
- ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start));
|
||||
+ ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe.pos, qe.opos, (intmax_t)(time(NULL) - qe.start));
|
||||
res = 0;
|
||||
break;
|
||||
}
|
||||
@@ -5251,7 +5251,7 @@ check_turns:
|
||||
record_abandoned(&qe);
|
||||
reason = QUEUE_TIMEOUT;
|
||||
res = 0;
|
||||
|
|
@ -177,9 +152,9 @@ $NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $
|
|||
break;
|
||||
}
|
||||
|
||||
@@ -5094,8 +5094,8 @@ stop:
|
||||
@@ -5278,8 +5278,8 @@ stop:
|
||||
if (!qe.handled) {
|
||||
record_abandoned(&qe);
|
||||
ast_cdr_noanswer(qe.chan->cdr);
|
||||
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",
|
||||
- "%d|%d|%ld", qe.pos, qe.opos,
|
||||
- (long) time(NULL) - qe.start);
|
||||
|
|
@ -188,14 +163,3 @@ $NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $
|
|||
res = -1;
|
||||
} else if (qcontinue) {
|
||||
reason = QUEUE_CONTINUE;
|
||||
@@ -5879,8 +5879,8 @@ static char *__queues_show(struct manses
|
||||
mem->paused ? " (paused)" : "",
|
||||
devstate2str(mem->status));
|
||||
if (mem->calls)
|
||||
- ast_str_append(&out, 0, " has taken %d calls (last was %ld secs ago)",
|
||||
- mem->calls, (long) (time(NULL) - mem->lastcall));
|
||||
+ ast_str_append(&out, 0, " has taken %d calls (last was %jd secs ago)",
|
||||
+ mem->calls, (intmax_t) (time(NULL) - mem->lastcall));
|
||||
else
|
||||
ast_str_append(&out, 0, " has taken no calls yet");
|
||||
do_print(s, fd, out->str);
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
$NetBSD: patch-ba,v 1.2 2009/07/07 08:14:43 jnemeth Exp $
|
||||
$NetBSD: patch-ba,v 1.3 2010/09/23 23:30:38 jnemeth Exp $
|
||||
|
||||
--- main/sched.c.orig 2009-02-15 13:28:55.000000000 -0800
|
||||
--- main/sched.c.orig 2010-08-10 18:04:32.000000000 +0000
|
||||
+++ main/sched.c
|
||||
@@ -435,11 +435,11 @@ void ast_sched_dump(struct sched_context
|
||||
AST_DLLIST_TRAVERSE(&con->schedq, q, list) {
|
||||
struct timeval delta = ast_tvsub(q->when, when);
|
||||
|
||||
@@ -564,12 +564,12 @@ void ast_sched_dump(struct sched_context
|
||||
struct timeval delta;
|
||||
q = ast_heap_peek(con->sched_heap, x);
|
||||
delta = ast_tvsub(q->when, when);
|
||||
- ast_debug(1, "|%.4d | %-15p | %-15p | %.6ld : %.6ld |\n",
|
||||
+ ast_debug(1, "|%.4d | %-15p | %-15p | %.6jd : %.6ld |\n",
|
||||
+ ast_debug(1, "|%.4d | %-15p | %-15p | %.6jd : %.6jd |\n",
|
||||
q->id,
|
||||
q->callback,
|
||||
q->data,
|
||||
- (long)delta.tv_sec,
|
||||
- (long int)delta.tv_usec);
|
||||
+ (intmax_t)delta.tv_sec,
|
||||
(long int)delta.tv_usec);
|
||||
+ (intmax_t)delta.tv_usec);
|
||||
}
|
||||
ast_mutex_unlock(&con->lock);
|
||||
ast_debug(1, "=============================================================\n");
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: patch-bd,v 1.2 2010/06/16 08:04:45 jnemeth Exp $
|
||||
$NetBSD: patch-bd,v 1.3 2010/09/23 23:30:38 jnemeth Exp $
|
||||
|
||||
# reported upstream as https://issues.asterisk.org/view.php?id=17304
|
||||
# revised patch from upstream at https://issues.asterisk.org/file_download.php?file_id=26021&type=bug
|
||||
|
||||
--- cdr/cdr_odbc.c.orig 2010-05-27 21:40:55.000000000 +0000
|
||||
--- cdr/cdr_odbc.c.orig 2009-01-15 20:18:53.000000000 +0000
|
||||
+++ cdr/cdr_odbc.c
|
||||
@@ -55,6 +55,7 @@ enum {
|
||||
CONFIG_LOGUNIQUEID = 1 << 0,
|
||||
|
|
@ -13,7 +13,7 @@ $NetBSD: patch-bd,v 1.2 2010/06/16 08:04:45 jnemeth Exp $
|
|||
};
|
||||
|
||||
static struct ast_flags config = { 0 };
|
||||
@@ -220,14 +221,24 @@ static int odbc_load_module(int reload)
|
||||
@@ -220,13 +221,23 @@ static int odbc_load_module(int reload)
|
||||
ast_verb(3, "cdr_odbc: dsn is %s\n", dsn);
|
||||
ast_verb(3, "cdr_odbc: table is %s\n", table);
|
||||
|
||||
|
|
@ -30,15 +30,13 @@ $NetBSD: patch-bd,v 1.2 2010/06/16 08:04:45 jnemeth Exp $
|
|||
}
|
||||
} while (0);
|
||||
|
||||
- if (cfg && cfg != CONFIG_STATUS_FILEUNCHANGED)
|
||||
if (cfg && cfg != CONFIG_STATUS_FILEUNCHANGED && cfg != CONFIG_STATUS_FILEINVALID)
|
||||
+ if (ast_test_flag(&config, CONFIG_REGISTERED) && (!cfg || dsn == NULL || table == NULL)) {
|
||||
+ ast_cdr_unregister(name);
|
||||
+ ast_clear_flag(&config, CONFIG_REGISTERED);
|
||||
+ }
|
||||
+
|
||||
+ if (cfg && cfg != CONFIG_STATUS_FILEUNCHANGED) {
|
||||
+ if (cfg && cfg != CONFIG_STATUS_FILEUNCHANGED)
|
||||
ast_config_destroy(cfg);
|
||||
+ }
|
||||
return res;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue