[asterisk-commits] oej: branch oej/moremanager r89408 - in /team/oej/moremanager: ./ agi/ apps/ ...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Nov 19 05:13:58 CST 2007
Author: oej
Date: Mon Nov 19 05:13:56 2007
New Revision: 89408
URL: http://svn.digium.com/view/asterisk?view=rev&rev=89408
Log:
Resolved issues with this branch, reset automerge
Added:
team/oej/moremanager/doc/valgrind.txt
- copied unchanged from r88994, branches/1.4/doc/valgrind.txt
team/oej/moremanager/include/asterisk/astobj2.h
- copied unchanged from r88994, branches/1.4/include/asterisk/astobj2.h
team/oej/moremanager/main/astobj2.c
- copied unchanged from r88994, branches/1.4/main/astobj2.c
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/
- copied from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/extensions.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/extensions.ael
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/qq.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/qq.ael
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t1/
- copied from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t1/
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t1/a.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t1/a.ael
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t1/b.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t1/b.ael
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t1/c.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t1/c.ael
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t2/
- copied from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t2/
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t2/d.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t2/d.ael
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t2/e.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t2/e.ael
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t2/f.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t2/f.ael
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t3/
- copied from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t3/
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t3/g.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t3/g.ael
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t3/h.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t3/h.ael
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t3/i.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t3/i.ael
team/oej/moremanager/pbx/ael/ael-test/ael-ntest22/t3/j.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-ntest22/t3/j.ael
team/oej/moremanager/pbx/ael/ael-test/ael-vtest21/
- copied from r88994, branches/1.4/pbx/ael/ael-test/ael-vtest21/
team/oej/moremanager/pbx/ael/ael-test/ael-vtest21/extensions.ael
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ael-vtest21/extensions.ael
team/oej/moremanager/pbx/ael/ael-test/ref.ael-ntest22
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ref.ael-ntest22
team/oej/moremanager/pbx/ael/ael-test/ref.ael-vtest21
- copied unchanged from r88994, branches/1.4/pbx/ael/ael-test/ref.ael-vtest21
Removed:
team/oej/moremanager/configs/modem.conf.sample
Modified:
team/oej/moremanager/ (props changed)
team/oej/moremanager/.cleancount
team/oej/moremanager/LICENSE
team/oej/moremanager/Makefile
team/oej/moremanager/Makefile.moddir_rules
team/oej/moremanager/Makefile.rules
team/oej/moremanager/UPGRADE.txt
team/oej/moremanager/agi/ (props changed)
team/oej/moremanager/agi/Makefile
team/oej/moremanager/apps/ (props changed)
team/oej/moremanager/apps/app_controlplayback.c
team/oej/moremanager/apps/app_dial.c
team/oej/moremanager/apps/app_directory.c
team/oej/moremanager/apps/app_disa.c
team/oej/moremanager/apps/app_flash.c
team/oej/moremanager/apps/app_followme.c
team/oej/moremanager/apps/app_hasnewvoicemail.c
team/oej/moremanager/apps/app_meetme.c
team/oej/moremanager/apps/app_osplookup.c
team/oej/moremanager/apps/app_queue.c
team/oej/moremanager/apps/app_rpt.c
team/oej/moremanager/apps/app_speech_utils.c
team/oej/moremanager/apps/app_stack.c
team/oej/moremanager/apps/app_system.c
team/oej/moremanager/apps/app_voicemail.c
team/oej/moremanager/apps/app_zapateller.c
team/oej/moremanager/build_tools/make_build_h
team/oej/moremanager/build_tools/make_buildopts_h
team/oej/moremanager/build_tools/make_defaults_h
team/oej/moremanager/build_tools/make_version
team/oej/moremanager/build_tools/menuselect-deps.in
team/oej/moremanager/build_tools/mkpkgconfig
team/oej/moremanager/build_tools/prep_moduledeps
team/oej/moremanager/build_tools/prep_tarball
team/oej/moremanager/build_tools/strip_nonapi
team/oej/moremanager/cdr/ (props changed)
team/oej/moremanager/cdr/cdr_csv.c
team/oej/moremanager/channels/ (props changed)
team/oej/moremanager/channels/Makefile
team/oej/moremanager/channels/chan_agent.c
team/oej/moremanager/channels/chan_alsa.c
team/oej/moremanager/channels/chan_gtalk.c
team/oej/moremanager/channels/chan_h323.c
team/oej/moremanager/channels/chan_iax2.c
team/oej/moremanager/channels/chan_local.c
team/oej/moremanager/channels/chan_mgcp.c
team/oej/moremanager/channels/chan_misdn.c
team/oej/moremanager/channels/chan_oss.c
team/oej/moremanager/channels/chan_phone.c
team/oej/moremanager/channels/chan_sip.c
team/oej/moremanager/channels/chan_skinny.c
team/oej/moremanager/channels/chan_zap.c
team/oej/moremanager/channels/h323/ast_h323.cxx
team/oej/moremanager/channels/misdn/chan_misdn_config.h
team/oej/moremanager/channels/misdn/ie.c
team/oej/moremanager/channels/misdn/isdn_lib.c
team/oej/moremanager/channels/misdn/isdn_msg_parser.c
team/oej/moremanager/channels/misdn_config.c
team/oej/moremanager/codecs/ (props changed)
team/oej/moremanager/codecs/codec_zap.c
team/oej/moremanager/codecs/gsm/ (props changed)
team/oej/moremanager/codecs/gsm/src/long_term.c
team/oej/moremanager/codecs/gsm/src/lpc.c
team/oej/moremanager/codecs/ilbc/ (props changed)
team/oej/moremanager/codecs/ilbc/Makefile
team/oej/moremanager/codecs/lpc10/ (props changed)
team/oej/moremanager/codecs/lpc10/Makefile
team/oej/moremanager/configs/cdr.conf.sample
team/oej/moremanager/configs/enum.conf.sample
team/oej/moremanager/configs/extensions.ael.sample
team/oej/moremanager/configs/extensions.conf.sample
team/oej/moremanager/configs/features.conf.sample
team/oej/moremanager/configs/followme.conf.sample
team/oej/moremanager/configs/indications.conf.sample
team/oej/moremanager/configs/misdn.conf.sample
team/oej/moremanager/configs/queues.conf.sample
team/oej/moremanager/configs/sip.conf.sample
team/oej/moremanager/configs/zapata.conf.sample
team/oej/moremanager/configure
team/oej/moremanager/configure.ac
team/oej/moremanager/contrib/scripts/safe_asterisk
team/oej/moremanager/contrib/scripts/vmail.cgi
team/oej/moremanager/doc/CODING-GUIDELINES
team/oej/moremanager/doc/PEERING
team/oej/moremanager/doc/asterisk-mib.txt
team/oej/moremanager/doc/iax.txt
team/oej/moremanager/doc/jabber.txt
team/oej/moremanager/doc/realtime.txt
team/oej/moremanager/formats/ (props changed)
team/oej/moremanager/funcs/ (props changed)
team/oej/moremanager/funcs/func_curl.c
team/oej/moremanager/funcs/func_cut.c
team/oej/moremanager/funcs/func_logic.c
team/oej/moremanager/funcs/func_odbc.c
team/oej/moremanager/funcs/func_realtime.c
team/oej/moremanager/funcs/func_strings.c
team/oej/moremanager/funcs/func_timeout.c
team/oej/moremanager/include/asterisk.h
team/oej/moremanager/include/asterisk/ael_structs.h
team/oej/moremanager/include/asterisk/agi.h
team/oej/moremanager/include/asterisk/autoconfig.h.in
team/oej/moremanager/include/asterisk/channel.h
team/oej/moremanager/include/asterisk/cli.h
team/oej/moremanager/include/asterisk/features.h
team/oej/moremanager/include/asterisk/file.h
team/oej/moremanager/include/asterisk/frame.h
team/oej/moremanager/include/asterisk/jabber.h
team/oej/moremanager/include/asterisk/linkedlists.h
team/oej/moremanager/include/asterisk/localtime.h
team/oej/moremanager/include/asterisk/lock.h
team/oej/moremanager/include/asterisk/logger.h
team/oej/moremanager/include/asterisk/module.h
team/oej/moremanager/include/asterisk/pbx.h
team/oej/moremanager/include/asterisk/sched.h
team/oej/moremanager/include/asterisk/speech.h
team/oej/moremanager/include/asterisk/srv.h
team/oej/moremanager/include/asterisk/stringfields.h
team/oej/moremanager/include/asterisk/strings.h
team/oej/moremanager/main/ (props changed)
team/oej/moremanager/main/Makefile
team/oej/moremanager/main/alaw.c
team/oej/moremanager/main/app.c
team/oej/moremanager/main/ast_expr2.fl
team/oej/moremanager/main/ast_expr2f.c
team/oej/moremanager/main/asterisk.c
team/oej/moremanager/main/astmm.c
team/oej/moremanager/main/cdr.c
team/oej/moremanager/main/channel.c
team/oej/moremanager/main/cli.c
team/oej/moremanager/main/db.c
team/oej/moremanager/main/db1-ast/ (props changed)
team/oej/moremanager/main/db1-ast/Makefile
team/oej/moremanager/main/db1-ast/hash/hash.c
team/oej/moremanager/main/dns.c
team/oej/moremanager/main/dnsmgr.c
team/oej/moremanager/main/dsp.c
team/oej/moremanager/main/editline/ (props changed)
team/oej/moremanager/main/editline/Makefile.in
team/oej/moremanager/main/editline/np/vis.c
team/oej/moremanager/main/file.c
team/oej/moremanager/main/loader.c
team/oej/moremanager/main/manager.c
team/oej/moremanager/main/pbx.c
team/oej/moremanager/main/rtp.c
team/oej/moremanager/main/say.c
team/oej/moremanager/main/sched.c
team/oej/moremanager/main/srv.c
team/oej/moremanager/main/stdtime/localtime.c
team/oej/moremanager/main/stdtime/tzfile.h
team/oej/moremanager/main/threadstorage.c
team/oej/moremanager/main/utils.c
team/oej/moremanager/makeopts.in
team/oej/moremanager/pbx/ (props changed)
team/oej/moremanager/pbx/ael/ael-test/ref.ael-ntest10
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test1
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test11
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test14
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test16
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test18
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test19
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test2
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test3
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test4
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test5
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test6
team/oej/moremanager/pbx/ael/ael-test/ref.ael-test8
team/oej/moremanager/pbx/ael/ael-test/ref.ael-vtest13
team/oej/moremanager/pbx/ael/ael-test/ref.ael-vtest17
team/oej/moremanager/pbx/ael/ael.flex
team/oej/moremanager/pbx/ael/ael.tab.c
team/oej/moremanager/pbx/ael/ael.tab.h
team/oej/moremanager/pbx/ael/ael.y
team/oej/moremanager/pbx/ael/ael_lex.c
team/oej/moremanager/pbx/pbx_ael.c
team/oej/moremanager/pbx/pbx_config.c
team/oej/moremanager/pbx/pbx_dundi.c
team/oej/moremanager/pbx/pbx_realtime.c
team/oej/moremanager/pbx/pbx_spool.c
team/oej/moremanager/res/ (props changed)
team/oej/moremanager/res/res_agi.c
team/oej/moremanager/res/res_config_odbc.c
team/oej/moremanager/res/res_config_pgsql.c
team/oej/moremanager/res/res_features.c
team/oej/moremanager/res/res_jabber.c
team/oej/moremanager/res/res_musiconhold.c
team/oej/moremanager/res/res_odbc.c
team/oej/moremanager/res/res_smdi.c
team/oej/moremanager/res/res_speech.c
team/oej/moremanager/utils/ (props changed)
team/oej/moremanager/utils/Makefile
team/oej/moremanager/utils/ael_main.c
Propchange: team/oej/moremanager/
------------------------------------------------------------------------------
automerge = http://www.codename-pineapple.org/
Propchange: team/oej/moremanager/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/moremanager/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 19 05:13:56 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-78211
+/branches/1.4:1-89030
Modified: team/oej/moremanager/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/.cleancount?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/.cleancount (original)
+++ team/oej/moremanager/.cleancount Mon Nov 19 05:13:56 2007
@@ -1,1 +1,1 @@
-28
+29
Modified: team/oej/moremanager/LICENSE
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/LICENSE?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/LICENSE (original)
+++ team/oej/moremanager/LICENSE Mon Nov 19 05:13:56 2007
@@ -32,7 +32,7 @@
would strongly encourage you to make the same exception that we do).
Specific permission is also granted to link Asterisk with OpenSSL and
-OpenH323.
+OpenH323 and distribute the resulting binary files.
In addition, Asterisk implements two management/control protocols: the
Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface
@@ -56,14 +56,13 @@
If you have any questions regarding our licensing policy, please
contact us:
-+1.877.546.8963 (via telephone in the USA)
++1.877.344.4861 (via telephone in the USA)
+1.256.428.6000 (via telephone outside the USA)
+1.256.864.0464 (via FAX inside or outside the USA)
IAX2/misery.digium.com/6000 (via IAX2)
licensing at digium.com (via email)
Digium, Inc.
-150 West Park Loop
-Suite 100
+445 Jan Davis Drive
Huntsville, AL 35806
USA
Modified: team/oej/moremanager/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/Makefile?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/Makefile (original)
+++ team/oej/moremanager/Makefile Mon Nov 19 05:13:56 2007
@@ -58,6 +58,8 @@
export SOLINK
export STRIP
export DOWNLOAD
+export GREP
+export ID
export OSARCH
export CURSES_DIR
export NCURSES_DIR
@@ -72,6 +74,11 @@
ifneq ($(wildcard makeopts),)
include makeopts
endif
+
+# Some build systems, such as the one in openwrt, like to pass custom target
+# CFLAGS and LDFLAGS in the COPTS and LDOPTS variables.
+ASTCFLAGS+=$(COPTS)
+ASTLDFLAGS+=$(LDOPTS)
#Uncomment this to see all build commands instead of 'quiet' output
#NOISY_BUILD=yes
@@ -187,7 +194,11 @@
endif
endif
-ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
+ASTCFLAGS+=-pipe
+endif
+
+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
@@ -247,6 +258,7 @@
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
+SUBDIRS_DIST_CLEAN:=$(SUBDIRS:%=%-dist-clean)
SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
@@ -280,7 +292,11 @@
@echo " + Asterisk has successfully been built, and +"
@echo " + can be installed by running: +"
@echo " + +"
+ifeq ($(MAKE), gmake)
+ @echo " + $(MAKE) install +"
+else
@echo " + $(MAKE) install +"
+endif
@echo " +-------------------------------------------+"
_all: cleantest $(SUBDIRS)
@@ -349,6 +365,9 @@
$(SUBDIRS_CLEAN):
@$(MAKE) --no-print-directory -C $(@:-clean=) clean
+$(SUBDIRS_DIST_CLEAN):
+ @$(MAKE) --no-print-directory -C $(@:-dist-clean=) dist-clean
+
clean: $(SUBDIRS_CLEAN)
rm -f defaults.h
rm -f include/asterisk/build.h
@@ -358,7 +377,7 @@
dist-clean: distclean
-distclean: clean
+distclean: $(SUBDIRS_DIST_CLEAN) clean
@$(MAKE) -C menuselect dist-clean
@$(MAKE) -C sounds dist-clean
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
@@ -482,14 +501,22 @@
@echo " + configuration files (overwriting any +"
@echo " + existing config files), run: +"
@echo " + +"
+ifeq ($(MAKE), gmake)
+ @echo " + $(MAKE) samples +"
+else
@echo " + $(MAKE) samples +"
+endif
@echo " + +"
@echo " +----------------- or ---------------------+"
@echo " + +"
@echo " + You can go ahead and install the asterisk +"
@echo " + program documentation now or later run: +"
@echo " + +"
+ifeq ($(MAKE), gmake)
+ @echo " + $(MAKE) progdocs +"
+else
@echo " + $(MAKE) progdocs +"
+endif
@echo " + +"
@echo " + **Note** This requires that you have +"
@echo " + doxygen installed on your local system +"
@@ -536,8 +563,31 @@
echo "astlogdir => $(ASTLOGDIR)" ; \
echo "" ; \
echo ";[options]" ; \
+ echo ";verbose = 3" ; \
+ echo ";debug = 3" ; \
+ echo ";alwaysfork = yes ; same as -F at startup" ; \
+ echo ";nofork = yes ; same as -f at startup" ; \
+ echo ";quiet = yes ; same as -q at startup" ; \
+ echo ";timestamp = yes ; same as -T at startup" ; \
+ echo ";execincludes = yes ; support #exec in config files" ; \
+ echo ";console = yes ; Run as console (same as -c at startup)" ; \
+ echo ";highpriority = yes ; Run realtime priority (same as -p at startup)" ; \
+ echo ";initcrypto = yes ; Initialize crypto keys (same as -i at startup)" ; \
+ echo ";nocolor = yes ; Disable console colors" ; \
+ echo ";dontwarn = yes ; Disable some warnings" ; \
+ echo ";dumpcore = yes ; Dump core on crash (same as -g at startup)" ; \
+ echo ";languageprefix = yes ; Use the new sound prefix path syntax" ; \
echo ";internal_timing = yes" ; \
echo ";systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues" ; \
+ echo ";maxcalls = 10 ; Maximum amount of calls allowed" ; \
+ echo ";maxload = 0.9 ; Asterisk stops accepting new calls if the load average exceed this limit" ; \
+ echo ";cache_record_files = yes ; Cache recorded sound files to another directory during recording" ; \
+ echo ";record_cache_dir = /tmp ; Specify cache directory (used in cnjunction with cache_record_files)" ; \
+ echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \
+ echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
+ echo ";runuser = asterisk ; The user to run as" ; \
+ echo ";rungroup = asterisk ; The group to run as" ; \
+ echo "" ; \
echo "; Changing the following lines may compromise your security." ; \
echo ";[files]" ; \
echo ";astctlpermissions = 0660" ; \
@@ -598,20 +648,20 @@
config:
@if [ "${OSARCH}" = "linux-gnu" ]; then \
if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
- $(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
- /sbin/chkconfig --add asterisk; \
+ $(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
+ if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
elif [ -f /etc/debian_version ]; then \
- $(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk /etc/init.d/asterisk; \
- /usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; \
+ $(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk $(DESTDIR)/etc/init.d/asterisk; \
+ if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
elif [ -f /etc/gentoo-release ]; then \
- $(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk /etc/init.d/asterisk; \
- /sbin/rc-update add asterisk default; \
+ $(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk $(DESTDIR)/etc/init.d/asterisk; \
+ if [ -z "$(DESTDIR)" ]; then /sbin/rc-update add asterisk default; fi; \
elif [ -f /etc/mandrake-release ]; then \
- $(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk /etc/rc.d/init.d/asterisk; \
- /sbin/chkconfig --add asterisk; \
+ $(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
+ if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
- $(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk /etc/init.d/asterisk; \
- /sbin/chkconfig --add asterisk; \
+ $(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk $(DESTDIR)/etc/init.d/asterisk; \
+ if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
elif [ -f /etc/slackware-version ]; then \
echo "Slackware is not currently supported, although an init script does exist for it." \
else \
@@ -629,9 +679,7 @@
# last clean count we had
cleantest:
- @if ! cmp -s .cleancount .lastclean ; then \
- $(MAKE) clean;\
- fi
+ @cmp -s .cleancount .lastclean || $(MAKE) clean
$(SUBDIRS_UNINSTALL):
@$(MAKE) --no-print-directory -C $(@:-uninstall=) uninstall
@@ -660,7 +708,11 @@
@echo " + directories, and logs, run the following +"
@echo " + command: +"
@echo " + +"
+ifeq ($(MAKE), gmake)
+ @echo " + $(MAKE) uninstall-all +"
+else
@echo " + $(MAKE) uninstall-all +"
+endif
@echo " +-------------------------------------------+"
uninstall-all: _uninstall
@@ -687,8 +739,8 @@
menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
@CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
-menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml configure
@echo "Generating input for menuselect ..."
@build_tools/prep_moduledeps > $@
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) menuselect.makeopts
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) menuselect.makeopts
Modified: team/oej/moremanager/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/Makefile.moddir_rules?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/Makefile.moddir_rules (original)
+++ team/oej/moremanager/Makefile.moddir_rules Mon Nov 19 05:13:56 2007
@@ -70,7 +70,7 @@
@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
clean::
- rm -f *.so *.o *.oo
+ rm -f *.so *.o *.oo *.s *.i
rm -f .*.o.d .*.oo.d
rm -f modules.link
Modified: team/oej/moremanager/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/Makefile.rules?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/Makefile.rules (original)
+++ team/oej/moremanager/Makefile.rules Mon Nov 19 05:13:56 2007
@@ -16,6 +16,8 @@
# behaviour. ECHO_PREFIX prefixes the comment, CMD_PREFIX prefixes the command.
-include $(ASTTOPDIR)/makeopts
+
+.PHONY: dist-clean
ifeq ($(NOISY_BUILD),)
ECHO_PREFIX=@
@@ -38,27 +40,15 @@
%.o: %.c
$(ECHO_PREFIX) echo " [CC] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
-endif
%.o: %.s
$(ECHO_PREFIX) echo " [AS] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
-endif
%.oo: %.cc
$(ECHO_PREFIX) echo " [CXX] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
- $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS))
-endif
%.c: %.y
$(ECHO_PREFIX) echo " [BISON] $< -> $@"
@@ -79,3 +69,5 @@
%: %.o
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)
+
+dist-clean::
Modified: team/oej/moremanager/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/UPGRADE.txt?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/UPGRADE.txt (original)
+++ team/oej/moremanager/UPGRADE.txt Mon Nov 19 05:13:56 2007
@@ -130,7 +130,9 @@
interpolation falling back to globals when no channel variable is set.
* The application SetVar has been renamed to Set. The syntax SetVar was marked
- deprecated in version 1.2 and is no longer recognized in this version.
+ deprecated in version 1.2 and is no longer recognized in this version. The
+ use of Set with multiple argument pairs has also been deprecated. Please
+ separate each name/value pair into its own dialplan line.
* app_read has been updated to use the newer options codes, using "skip" or
"noanswer" will not work. Use s or n. Also there is a new feature i, for
@@ -189,6 +191,11 @@
provides more 'true' round-robin call delivery. For the Asterisk 1.6 release,
'rrmemory' will be renamed 'roundrobin'.
+* The app_queue application option called 'monitor-join' has been deprecated
+ for this release. Users are encouraged to use 'monitor-type=mixmonitor' instead,
+ since it provides the same functionality but is not dependent on soxmix or some
+ other external program in order to mix the audio.
+
* app_meetme: The 'm' option (monitor) is renamed to 'l' (listen only), and
the 'm' option now provides the functionality of "initially muted".
In practice, most existing dialplans using the 'm' flag should not notice
@@ -313,6 +320,21 @@
QUEUE_MEMBER_COUNT().
The IAX2 channel:
+
+* It is possible that previous configurations depended on the order in which
+ peers and users were specified in iax.conf for forcing the order in which
+ chan_iax2 matched against them. This behavior is going away and is considered
+ deprecated in this version. Avoid having ambiguous peer and user entries and
+ to make things easy on yourself, always set the "username" option for users
+ so that the remote end can match on that exactly instead of trying to infer
+ which user you want based on host.
+
+ If you would like to go ahead and use the new behavior which doesn't use the
+ order in the config file to influence matching order, then change the
+ MAX_PEER_BUCKETS define in chan_iax2.c to a value greater than one. An
+ example is provided there. By changing this, you will get *much* better
+ performance on systems that do a lot of peer and user lookups as they will be
+ stored in memory in a much more efficient manner.
* The "mailboxdetail" option has been deprecated. Previously, if this option
was not enabled, the 2 byte MSGCOUNT information element would be set to all
Propchange: team/oej/moremanager/agi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 19 05:13:56 2007
@@ -1,4 +1,6 @@
eagi-test
eagi-sphinx-test
*.d
+*.s
+*.i
strcompat.c
Modified: team/oej/moremanager/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/agi/Makefile?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/agi/Makefile (original)
+++ team/oej/moremanager/agi/Makefile Mon Nov 19 05:13:56 2007
@@ -39,7 +39,7 @@
clean:
rm -f *.so *.o look eagi-test eagi-sphinx-test
- rm -f .*.o.d .*.oo.d
+ rm -f .*.o.d .*.oo.d *.s *.i
rm -f strcompat.c
ifneq ($(wildcard .*.d),)
Propchange: team/oej/moremanager/apps/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 19 05:13:56 2007
@@ -1,4 +1,6 @@
*.d
*.a
*.so
+*.s
+*.i
modules.link
Modified: team/oej/moremanager/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/apps/app_controlplayback.c?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/apps/app_controlplayback.c (original)
+++ team/oej/moremanager/apps/app_controlplayback.c Mon Nov 19 05:13:56 2007
@@ -132,7 +132,7 @@
res = ast_control_streamfile(chan, argv[arg_file], argv[arg_fwd], argv[arg_rev], argv[arg_stop], argv[arg_pause], argv[arg_restart], skipms);
/* If we stopped on one of our stop keys, return 0 */
- if (argv[arg_stop] && strchr(argv[arg_stop], res)) {
+ if (res > 0 && argv[arg_stop] && strchr(argv[arg_stop], res)) {
res = 0;
pbx_builtin_setvar_helper(chan, "CPLAYBACKSTATUS", "USERSTOPPED");
} else {
Modified: team/oej/moremanager/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/apps/app_dial.c?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/apps/app_dial.c (original)
+++ team/oej/moremanager/apps/app_dial.c Mon Nov 19 05:13:56 2007
@@ -124,6 +124,10 @@
" i - Asterisk will ignore any forwarding requests it may receive on this\n"
" dial attempt.\n"
" j - Jump to priority n+101 if all of the requested channels were busy.\n"
+" k - Allow the called party to enable parking of the call by sending\n"
+" the DTMF sequence defined for call parking in features.conf.\n"
+" K - Allow the calling party to enable parking of the call by sending\n"
+" the DTMF sequence defined for call parking in features.conf.\n"
" L(x[:y][:z]) - Limit the call to 'x' ms. Play a warning when 'y' ms are\n"
" left. Repeat the warning every 'z' ms. The following special\n"
" variables can be used with this option:\n"
@@ -190,11 +194,7 @@
" w - Allow the called party to enable recording of the call by sending\n"
" the DTMF sequence defined for one-touch recording in features.conf.\n"
" W - Allow the calling party to enable recording of the call by sending\n"
-" the DTMF sequence defined for one-touch recording in features.conf.\n"
-" k - Allow the called party to enable parking of the call by sending\n"
-" the DTMF sequence defined for call parking in features.conf.\n"
-" K - Allow the calling party to enable parking of the call by sending\n"
-" the DTMF sequence defined for call parking in features.conf.\n";
+" the DTMF sequence defined for one-touch recording in features.conf.\n";
/* RetryDial App by Anthony Minessale II <anthmct at yahoo.com> Jan/2005 */
static char *rapp = "RetryDial";
@@ -272,13 +272,15 @@
AST_APP_OPTION('H', OPT_CALLER_HANGUP),
AST_APP_OPTION('i', OPT_IGNORE_FORWARDING),
AST_APP_OPTION('j', OPT_PRIORITY_JUMP),
+ AST_APP_OPTION('k', OPT_CALLEE_PARK),
+ AST_APP_OPTION('K', OPT_CALLER_PARK),
AST_APP_OPTION_ARG('L', OPT_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
AST_APP_OPTION_ARG('m', OPT_MUSICBACK, OPT_ARG_MUSICBACK),
AST_APP_OPTION_ARG('M', OPT_CALLEE_MACRO, OPT_ARG_CALLEE_MACRO),
AST_APP_OPTION('n', OPT_SCREEN_NOINTRO),
AST_APP_OPTION('N', OPT_SCREEN_NOCLID),
+ AST_APP_OPTION('o', OPT_ORIGINAL_CLID),
AST_APP_OPTION_ARG('O', OPT_OPERMODE,OPT_ARG_OPERMODE),
- AST_APP_OPTION('o', OPT_ORIGINAL_CLID),
AST_APP_OPTION('p', OPT_SCREENING),
AST_APP_OPTION_ARG('P', OPT_PRIVACY, OPT_ARG_PRIVACY),
AST_APP_OPTION('r', OPT_RINGBACK),
@@ -287,9 +289,11 @@
AST_APP_OPTION('T', OPT_CALLER_TRANSFER),
AST_APP_OPTION('w', OPT_CALLEE_MONITOR),
AST_APP_OPTION('W', OPT_CALLER_MONITOR),
- AST_APP_OPTION('k', OPT_CALLEE_PARK),
- AST_APP_OPTION('K', OPT_CALLER_PARK),
});
+
+#define CAN_EARLY_BRIDGE(flags) (!ast_test_flag(flags, OPT_CALLEE_HANGUP | \
+ OPT_CALLER_HANGUP | OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER | \
+ OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK | OPT_CALLER_PARK))
/* We define a custom "local user" structure because we
use it not only for keeping track of what is in use but
@@ -585,7 +589,8 @@
ast_copy_string(c->dialcontext, "", sizeof(c->dialcontext));
ast_copy_string(c->exten, "", sizeof(c->exten));
/* Setup RTP early bridge if appropriate */
- ast_rtp_early_bridge(in, peer);
+ if (CAN_EARLY_BRIDGE(peerflags))
+ ast_rtp_early_bridge(in, peer);
}
/* If call has been answered, then the eventual hangup is likely to be normal hangup */
in->hangupcause = AST_CAUSE_NORMAL_CLEARING;
@@ -613,7 +618,7 @@
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "%s is ringing\n", c->name);
/* Setup early media if appropriate */
- if (single)
+ if (single && CAN_EARLY_BRIDGE(peerflags))
ast_rtp_early_bridge(in, c);
if (!(*sentringing) && !ast_test_flag(outgoing, OPT_MUSICBACK)) {
ast_indicate(in, AST_CONTROL_RINGING);
@@ -624,7 +629,7 @@
if (option_verbose > 2)
ast_verbose (VERBOSE_PREFIX_3 "%s is making progress passing it to %s\n", c->name, in->name);
/* Setup early media if appropriate */
- if (single)
+ if (single && CAN_EARLY_BRIDGE(peerflags))
ast_rtp_early_bridge(in, c);
if (!ast_test_flag(outgoing, OPT_RINGBACK))
ast_indicate(in, AST_CONTROL_PROGRESS);
@@ -637,7 +642,7 @@
case AST_CONTROL_PROCEEDING:
if (option_verbose > 2)
ast_verbose (VERBOSE_PREFIX_3 "%s is proceeding passing it to %s\n", c->name, in->name);
- if (single)
+ if (single && CAN_EARLY_BRIDGE(peerflags))
ast_rtp_early_bridge(in, c);
if (!ast_test_flag(outgoing, OPT_RINGBACK))
ast_indicate(in, AST_CONTROL_PROCEEDING);
Modified: team/oej/moremanager/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/apps/app_directory.c?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/apps/app_directory.c (original)
+++ team/oej/moremanager/apps/app_directory.c Mon Nov 19 05:13:56 2007
@@ -89,6 +89,36 @@
#ifdef ODBC_STORAGE
+struct generic_prepare_struct {
+ const char *sql;
+ const char *param;
+};
+
+static SQLHSTMT generic_prepare(struct odbc_obj *obj, void *data)
+{
+ struct generic_prepare_struct *gps = data;
+ SQLHSTMT stmt;
+ int res;
+
+ res = SQLAllocHandle(SQL_HANDLE_STMT, obj->con, &stmt);
+ if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
+ ast_log(LOG_WARNING, "SQL Alloc Handle failed!\n");
+ return NULL;
+ }
+
+ res = SQLPrepare(stmt, (unsigned char *)gps->sql, SQL_NTS);
+ if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
+ ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", (char *)gps->sql);
+ SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+ return NULL;
+ }
+
+ if (!ast_strlen_zero(gps->param))
+ SQLBindParameter(stmt, 1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(gps->param), 0, (void *)gps->param, 0, NULL);
+
+ return stmt;
+}
+
static void retrieve_file(char *dir)
{
int x = 0;
@@ -103,6 +133,7 @@
SQLLEN colsize;
char full_fn[256];
struct odbc_obj *obj;
+ struct generic_prepare_struct gps = { .sql = sql, .param = dir };
obj = ast_odbc_request_obj(odbc_database, 1);
if (obj) {
@@ -114,23 +145,11 @@
if (!strcasecmp(fmt, "wav49"))
strcpy(fmt, "WAV");
snprintf(full_fn, sizeof(full_fn), "%s.%s", dir, fmt);
- res = SQLAllocHandle(SQL_HANDLE_STMT, obj->con, &stmt);
- if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
- ast_log(LOG_WARNING, "SQL Alloc Handle failed!\n");
- break;
- }
snprintf(sql, sizeof(sql), "SELECT recording FROM %s WHERE dir=? AND msgnum=-1", odbc_table);
- res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS);
- if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
- ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql);
- SQLFreeHandle(SQL_HANDLE_STMT, stmt);
- break;
- }
- SQLBindParameter(stmt, 1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(dir), 0, (void *)dir, 0, NULL);
- res = ast_odbc_smart_execute(obj, stmt);
- if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
+ stmt = ast_odbc_prepare_and_execute(obj, generic_prepare, &gps);
+
+ if (!stmt) {
ast_log(LOG_WARNING, "SQL Execute error!\n[%s]\n\n", sql);
- SQLFreeHandle(SQL_HANDLE_STMT, stmt);
break;
}
res = SQLFetch(stmt);
Modified: team/oej/moremanager/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/apps/app_disa.c?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/apps/app_disa.c (original)
+++ team/oej/moremanager/apps/app_disa.c Mon Nov 19 05:13:56 2007
@@ -297,6 +297,10 @@
ast_log(LOG_DEBUG,"Successful DISA log-in on chan %s\n", chan->name);
continue;
}
+ } else {
+ if (j == '#') { /* end of extension */
+ break;
+ }
}
exten[i++] = j; /* save digit */
Modified: team/oej/moremanager/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/apps/app_flash.c?view=diff&rev=89408&r1=89407&r2=89408
==============================================================================
--- team/oej/moremanager/apps/app_flash.c (original)
+++ team/oej/moremanager/apps/app_flash.c Mon Nov 19 05:13:56 2007
@@ -55,9 +55,10 @@
static char *synopsis = "Flashes a Zap Trunk";
static char *descrip =
[... 27298 lines stripped ...]
More information about the asterisk-commits
mailing list