[Pkg-voip-commits] r1076 - in asterisk/trunk/debian: . patches

Mark Purcell msp at costa.debian.org
Wed Dec 7 21:59:38 UTC 2005


Author: msp
Date: 2005-12-07 21:59:37 +0000 (Wed, 07 Dec 2005)
New Revision: 1076

Removed:
   asterisk/trunk/debian/patches/sip-1.914.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/00list
   asterisk/trunk/debian/patches/30_ast-data-dir.dpatch
Log:
* New upstream release
  - Please package asterisk 1.2.1 (Closes: #342463)
* Temporary disable bristuff for upstream release
* sip-1.914.dpatch merged upstream

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2005-12-07 21:30:52 UTC (rev 1075)
+++ asterisk/trunk/debian/changelog	2005-12-07 21:59:37 UTC (rev 1076)
@@ -1,3 +1,12 @@
+asterisk (1:1.2.1.dfsg-1) unstable; urgency=low
+
+  * New upstream release
+    - Please package asterisk 1.2.1 (Closes: #342463)
+  * Temporary disable bristuff for upstream release
+  * sip-1.914.dpatch merged upstream
+
+ -- Mark Purcell <msp at debian.org>  Wed,  7 Dec 2005 21:59:20 +0000
+
 asterisk (1:1.2.0.dfsg-6) unstable; urgency=low
 
   * Add Build-Depends: libcurl3-dev | libcurl-dev

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2005-12-07 21:30:52 UTC (rev 1075)
+++ asterisk/trunk/debian/patches/00list	2005-12-07 21:59:37 UTC (rev 1076)
@@ -1,4 +1,4 @@
-bristuff
+#bristuff
 #Makefile_install_no1234
 #option_detach_12
 #10_DPIC.dpatch
@@ -20,4 +20,3 @@
 nomarch
 nooptimize
 chanzap_disable_r2.dpatch
-sip-1.914.dpatch

Modified: asterisk/trunk/debian/patches/30_ast-data-dir.dpatch
===================================================================
--- asterisk/trunk/debian/patches/30_ast-data-dir.dpatch	2005-12-07 21:30:52 UTC (rev 1075)
+++ asterisk/trunk/debian/patches/30_ast-data-dir.dpatch	2005-12-07 21:59:37 UTC (rev 1076)
@@ -7,10 +7,10 @@
 ## DP: not /var/lib/asterisk
 
 @DPATCH@
-diff -urNad asterisk-1.2.0-beta2.dfsg~/asterisk.c asterisk-1.2.0-beta2.dfsg/asterisk.c
---- asterisk-1.2.0-beta2.dfsg~/asterisk.c	2005-10-31 21:25:21.000000000 +0000
-+++ asterisk-1.2.0-beta2.dfsg/asterisk.c	2005-11-08 21:54:04.000000000 +0000
-@@ -187,6 +187,7 @@
+diff -urNad asterisk-1.2.1.dfsg~/asterisk.c asterisk-1.2.1.dfsg/asterisk.c
+--- asterisk-1.2.1.dfsg~/asterisk.c	2005-11-29 18:24:39.000000000 +0000
++++ asterisk-1.2.1.dfsg/asterisk.c	2005-12-07 21:52:07.000000000 +0000
+@@ -202,6 +202,7 @@
  char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
  char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
  char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
@@ -18,7 +18,7 @@
  char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
  char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
  char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
-@@ -1771,6 +1772,7 @@
+@@ -1788,6 +1789,7 @@
  	ast_copy_string(ast_config_AST_MODULE_DIR, AST_MODULE_DIR, sizeof(ast_config_AST_VAR_DIR));
   	snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", ast_config_AST_SPOOL_DIR);
  	ast_copy_string(ast_config_AST_VAR_DIR, AST_VAR_DIR, sizeof(ast_config_AST_VAR_DIR));
@@ -26,7 +26,7 @@
  	ast_copy_string(ast_config_AST_LOG_DIR, AST_LOG_DIR, sizeof(ast_config_AST_LOG_DIR));
  	ast_copy_string(ast_config_AST_AGI_DIR, AST_AGI_DIR, sizeof(ast_config_AST_AGI_DIR));
  	ast_copy_string(ast_config_AST_DB, AST_DB, sizeof(ast_config_AST_DB));
-@@ -1806,6 +1808,8 @@
+@@ -1823,6 +1825,8 @@
  		} else if (!strcasecmp(v->name, "astvarlibdir")) {
  			ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR));
  			snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/%s", v->value, "astdb");    
@@ -35,9 +35,9 @@
  		} else if (!strcasecmp(v->name, "astlogdir")) {
  			ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR));
  		} else if (!strcasecmp(v->name, "astagidir")) {
-diff -urNad asterisk-1.2.0-beta2.dfsg~/build_tools/make_defaults_h asterisk-1.2.0-beta2.dfsg/build_tools/make_defaults_h
---- asterisk-1.2.0-beta2.dfsg~/build_tools/make_defaults_h	2005-06-20 18:26:07.000000000 +0100
-+++ asterisk-1.2.0-beta2.dfsg/build_tools/make_defaults_h	2005-11-08 21:54:04.000000000 +0000
+diff -urNad asterisk-1.2.1.dfsg~/build_tools/make_defaults_h asterisk-1.2.1.dfsg/build_tools/make_defaults_h
+--- asterisk-1.2.1.dfsg~/build_tools/make_defaults_h	2005-06-20 18:26:08.000000000 +0100
++++ asterisk-1.2.1.dfsg/build_tools/make_defaults_h	2005-12-07 21:52:07.000000000 +0000
 @@ -11,6 +11,7 @@
  #define AST_MODULE_DIR "${INSTALL_PATH}${MODULES_DIR}"
  #define AST_SPOOL_DIR  "${INSTALL_PATH}${ASTSPOOLDIR}"
@@ -56,9 +56,9 @@
 +#define AST_IMAGES     "${INSTALL_PATH}${ASTDATADIR}/images"
  
  END
-diff -urNad asterisk-1.2.0-beta2.dfsg~/configs/musiconhold.conf.sample asterisk-1.2.0-beta2.dfsg/configs/musiconhold.conf.sample
---- asterisk-1.2.0-beta2.dfsg~/configs/musiconhold.conf.sample	2005-10-04 23:51:59.000000000 +0100
-+++ asterisk-1.2.0-beta2.dfsg/configs/musiconhold.conf.sample	2005-11-08 21:54:04.000000000 +0000
+diff -urNad asterisk-1.2.1.dfsg~/configs/musiconhold.conf.sample asterisk-1.2.1.dfsg/configs/musiconhold.conf.sample
+--- asterisk-1.2.1.dfsg~/configs/musiconhold.conf.sample	2005-11-29 18:24:39.000000000 +0000
++++ asterisk-1.2.1.dfsg/configs/musiconhold.conf.sample	2005-12-07 21:52:07.000000000 +0000
 @@ -4,7 +4,7 @@
  
  [default]
@@ -68,9 +68,9 @@
  
  ; valid mode options:
  ; quietmp3 	-- default
-diff -urNad asterisk-1.2.0-beta2.dfsg~/file.c asterisk-1.2.0-beta2.dfsg/file.c
---- asterisk-1.2.0-beta2.dfsg~/file.c	2005-10-26 19:54:24.000000000 +0100
-+++ asterisk-1.2.0-beta2.dfsg/file.c	2005-11-08 21:54:04.000000000 +0000
+diff -urNad asterisk-1.2.1.dfsg~/file.c asterisk-1.2.1.dfsg/file.c
+--- asterisk-1.2.1.dfsg~/file.c	2005-11-29 18:24:39.000000000 +0000
++++ asterisk-1.2.1.dfsg/file.c	2005-12-07 21:52:07.000000000 +0000
 @@ -312,7 +312,7 @@
  	} else {
  		char tmp[AST_CONFIG_MAX_PATH] = "";
@@ -80,9 +80,9 @@
  		fnsize = strlen(tmp) + strlen(filename) + strlen(type) + 3;
  		fn = malloc(fnsize);
  		if (fn)
-diff -urNad asterisk-1.2.0-beta2.dfsg~/image.c asterisk-1.2.0-beta2.dfsg/image.c
---- asterisk-1.2.0-beta2.dfsg~/image.c	2005-10-24 21:12:05.000000000 +0100
-+++ asterisk-1.2.0-beta2.dfsg/image.c	2005-11-08 21:54:04.000000000 +0000
+diff -urNad asterisk-1.2.1.dfsg~/image.c asterisk-1.2.1.dfsg/image.c
+--- asterisk-1.2.1.dfsg~/image.c	2005-11-29 18:24:39.000000000 +0000
++++ asterisk-1.2.1.dfsg/image.c	2005-12-07 21:52:07.000000000 +0000
 @@ -108,9 +108,9 @@
  			snprintf(buf, len, "%s.%s", filename, ext);
  	} else {
@@ -95,9 +95,9 @@
  	}
  }
  
-diff -urNad asterisk-1.2.0-beta2.dfsg~/include/asterisk.h asterisk-1.2.0-beta2.dfsg/include/asterisk.h
---- asterisk-1.2.0-beta2.dfsg~/include/asterisk.h	2005-10-26 14:03:17.000000000 +0100
-+++ asterisk-1.2.0-beta2.dfsg/include/asterisk.h	2005-11-08 21:54:04.000000000 +0000
+diff -urNad asterisk-1.2.1.dfsg~/include/asterisk.h asterisk-1.2.1.dfsg/include/asterisk.h
+--- asterisk-1.2.1.dfsg~/include/asterisk.h	2005-11-30 03:37:37.000000000 +0000
++++ asterisk-1.2.1.dfsg/include/asterisk.h	2005-12-07 21:52:07.000000000 +0000
 @@ -29,6 +29,7 @@
  extern char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
  extern char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
@@ -106,18 +106,18 @@
  extern char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
  extern char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
  extern char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
-diff -urNad asterisk-1.2.0-beta2.dfsg~/Makefile asterisk-1.2.0-beta2.dfsg/Makefile
---- asterisk-1.2.0-beta2.dfsg~/Makefile	2005-10-25 13:47:54.000000000 +0100
-+++ asterisk-1.2.0-beta2.dfsg/Makefile	2005-11-08 21:54:41.000000000 +0000
-@@ -104,6 +104,7 @@
- ifneq (${OSARCH},SunOS)
+diff -urNad asterisk-1.2.1.dfsg~/Makefile asterisk-1.2.1.dfsg/Makefile
+--- asterisk-1.2.1.dfsg~/Makefile	2005-12-05 06:47:51.000000000 +0000
++++ asterisk-1.2.1.dfsg/Makefile	2005-12-07 21:57:47.000000000 +0000
+@@ -108,6 +108,7 @@
+ ifneq ($(OSARCH),SunOS)
    ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
    ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
 +  ASTDATADIR=$(INSTALL_PREFIX)/usr/share/asterisk
    ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
    ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
    ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
-@@ -111,7 +112,7 @@
+@@ -115,7 +116,7 @@
    ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
    ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
    ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
@@ -126,10 +126,10 @@
    ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
    MODULES_DIR=$(ASTLIBDIR)/modules
    AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-@@ -494,38 +495,38 @@
+@@ -539,38 +540,38 @@
  
  datafiles: all
- 	if test $$(id -u) = 0; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ 	if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
 +	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
@@ -174,7 +174,7 @@
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -533,16 +534,16 @@
+@@ -578,16 +579,16 @@
  	done
  	for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
  		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
@@ -195,7 +195,7 @@
  	done
  	mkdir -p $(DESTDIR)$(AGI_DIR)
  
-@@ -590,6 +591,7 @@
+@@ -623,6 +624,7 @@
  	mkdir -p $(DESTDIR)$(ASTETCDIR)
  	mkdir -p $(DESTDIR)$(ASTBINDIR)
  	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
@@ -203,7 +203,7 @@
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
-@@ -609,8 +611,8 @@
+@@ -645,8 +647,8 @@
  	if [ -n "$(OLDHEADERS)" ]; then \
  		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
  	fi
@@ -214,7 +214,7 @@
  	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
  	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
  	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
-@@ -628,7 +630,7 @@
+@@ -664,7 +666,7 @@
  	else \
  		echo "You need to do cvs update -d not just cvs update" ; \
  	fi 
@@ -223,7 +223,7 @@
  	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
  	@echo " +---- Asterisk Installation Complete -------+"  
  	@echo " +                                           +"
-@@ -725,10 +727,10 @@
+@@ -763,10 +765,10 @@
  	else \
  		echo "Skipping asterisk.conf creation"; \
  	fi
@@ -236,7 +236,7 @@
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -742,11 +744,11 @@
+@@ -780,11 +782,11 @@
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
  	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
  	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
@@ -250,3 +250,910 @@
  	done
  
  webvmail:
+diff -urNad asterisk-1.2.1.dfsg~/Makefile~ asterisk-1.2.1.dfsg/Makefile~
+--- asterisk-1.2.1.dfsg~/Makefile~	1970-01-01 01:00:00.000000000 +0100
++++ asterisk-1.2.1.dfsg/Makefile~	2005-12-07 21:52:07.000000000 +0000
+@@ -0,0 +1,903 @@
++#
++# Asterisk -- A telephony toolkit for Linux.
++# 
++# Top level Makefile
++#
++# Copyright (C) 1999-2005, Mark Spencer
++#
++# Mark Spencer <markster at digium.com>
++#
++# This program is free software, distributed under the terms of
++# the GNU General Public License
++#
++
++.EXPORT_ALL_VARIABLES:
++
++# Create OPTIONS variable
++OPTIONS=
++# If cross compiling, define these to suit
++# CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
++# CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
++# CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
++CC=$(CROSS_COMPILE)gcc
++HOST_CC=gcc
++# CROSS_ARCH=Linux
++# CROSS_PROC=arm
++# SUB_PROC=xscale # or maverick
++
++ifeq ($(CROSS_COMPILE),)
++  OSARCH=$(shell uname -s)
++  OSREV=$(shell uname -r)
++else
++  OSARCH=$(CROSS_ARCH)
++  OSREV=$(CROSS_REV)
++endif
++
++# Remember the MAKELEVEL at the top
++MAKETOPLEVEL?=$(MAKELEVEL)
++
++ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
++######### More GSM codec optimization
++######### Uncomment to enable MMXTM optimizations for x86 architecture CPU's
++######### which support MMX instructions.  This should be newer pentiums,
++######### ppro's, etc, as well as the AMD K6 and K7.  
++#K6OPT  = -DK6OPT
++
++#Tell gcc to optimize the code
++OPTIMIZE+=-O6
++endif
++
++#Overwite config files on "make samples"
++OVERWRITE=y
++
++#Include debug and macro symbols in the executables (-g) and profiling info (-pg)
++DEBUG=-g3 #-pg
++
++#Set NOCRYPTO to yes if you do not want to have crypto support or 
++#dependencies
++#NOCRYPTO=yes
++
++# If you are running a radio application, define RADIO_RELAX so that the DTMF
++# will be received more reliably
++#OPTIONS += -DRADIO_RELAX
++
++# If you don't have a lot of memory (e.g. embedded Asterisk), define LOW_MEMORY
++# to reduce the size of certain static buffers
++
++#ifneq ($(CROSS_COMPILE),)
++#OPTIONS += -DLOW_MEMORY
++#endif
++
++# Optional debugging parameters
++DEBUG_THREADS = #-DDUMP_SCHEDULER #-DDEBUG_SCHEDULER #-DDEBUG_THREADS #-DDO_CRASH #-DDETECT_DEADLOCKS
++
++# Uncomment next one to enable ast_frame tracing (for debugging)
++TRACE_FRAMES = #-DTRACE_FRAMES
++
++# Uncomment next one to enable malloc debugging
++# You can view malloc debugging with:
++#   *CLI> show memory allocations [filename]
++#   *CLI> show memory summary [filename]
++#
++MALLOC_DEBUG = #-include $(PWD)/include/asterisk/astmm.h
++
++# Where to install asterisk after compiling
++# Default -> leave empty
++INSTALL_PREFIX?=
++
++# Staging directory
++# Files are copied here temporarily during the install process
++# For example, make DESTDIR=/tmp/asterisk woud put things in
++# /tmp/asterisk/etc/asterisk
++# XXX watch out, put no spaces or comments after the value
++DESTDIR?=
++#DESTDIR?=/tmp/asterisk
++
++# Original busydetect routine
++BUSYDETECT = #-DBUSYDETECT
++
++# Improved busydetect routine, comment the previous one if you use this one
++BUSYDETECT+= #-DBUSYDETECT_MARTIN 
++# Detect the busy signal looking only at tone lengths
++# For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
++BUSYDETECT+= #-DBUSYDETECT_TONEONLY
++# Inforce the detection of busy singal (get rid of false hangups)
++# Don't use together with -DBUSYDETECT_TONEONLY
++BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
++
++ifneq ($(OSARCH),SunOS)
++  ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
++  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
++  ASTDATADIR=$(INSTALL_PREFIX)/usr/share/asterisk
++  ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
++  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
++  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
++  ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
++  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
++  ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
++  ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
++  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run/asterisk
++  ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
++  MODULES_DIR=$(ASTLIBDIR)/modules
++  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
++else
++  ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
++  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
++  ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
++  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
++  ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
++  ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
++  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
++  ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
++  ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
++  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
++  ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
++  MODULES_DIR=$(ASTLIBDIR)/modules
++  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
++endif
++
++ASTCFLAGS=
++
++# Pentium Pro Optimize
++#PROC=i686
++
++# Pentium & VIA processors optimize
++#PROC=i586
++
++#PROC=k6
++#PROC=ppc
++
++#Uncomment this to use the older DSP routines
++#ASTCFLAGS+=-DOLD_DSP_ROUTINES
++
++# Determine by a grep 'DocumentRoot' of your httpd.conf file
++HTTP_DOCSDIR=/var/www/html
++# Determine by a grep 'ScriptAlias' of your httpd.conf file
++HTTP_CGIDIR=/var/www/cgi-bin
++
++# If the file .asterisk.makeopts is present in your home directory, you can
++# include all of your favorite Makefile options so that every time you download
++# a new version of Asterisk, you don't have to edit the makefile to set them. 
++# The file, /etc/asterisk.makeopts will also be included, but can be overridden
++# by the file in your home directory.
++
++ifneq ($(wildcard /etc/asterisk.makeopts),)
++  include /etc/asterisk.makeopts
++endif
++
++ifneq ($(wildcard ~/.asterisk.makeopts),)
++  include ~/.asterisk.makeopts
++endif
++
++ifeq ($(OSARCH),Linux)
++  ifeq ($(CROSS_COMPILE),)
++    PROC?=$(shell uname -m)
++  else
++    PROC=$(CROSS_PROC)
++  endif
++
++  ifeq ($(PROC),x86_64)
++    # You must have GCC 3.4 to use k8, otherwise use athlon
++    PROC=k8
++    #PROC=athlon
++    OPTIONS+=-m64
++  endif
++
++  ifeq ($(PROC),sparc64)
++    #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
++    #This works for even old (2.96) versions of gcc and provides a small boost either way.
++    #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
++    #So we go lowest common available by gcc and go a step down, still a step up from
++    #the default as we now have a better instruction set to work with. - Belgarath
++    PROC=ultrasparc
++    OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi)
++    OPTIONS+=$(shell if $(CC) -mcpu=v8 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v8"; fi)
++    OPTIONS+=-fomit-frame-pointer
++  endif
++
++  ifeq ($(PROC),arm)
++    # The Cirrus logic is the only heavily shipping arm processor with a real floating point unit
++    ifeq ($(SUB_PROC),maverick)
++      OPTIONS+=-fsigned-char -mcpu=ep9312
++    else
++      ifeq ($(SUB_PROC),xscale)
++        OPTIONS+=-fsigned-char -msoft-float -mcpu=xscale
++      else
++        OPTIONS+=-fsigned-char -msoft-float 
++      endif
++    endif
++  endif
++  MPG123TARG=linux
++endif
++
++PWD=$(shell pwd)
++GREP=grep
++
++ifeq ($(OSARCH),SunOS)
++  GREP=/usr/xpg4/bin/grep
++  M4=/usr/local/bin/m4
++endif
++
++INCLUDE+=-Iinclude -I../include
++ASTCFLAGS+=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
++ASTCFLAGS+=$(OPTIMIZE)
++ASTOBJ=-o asterisk
++
++ifeq ($(findstring BSD,$(OSARCH)),BSD)
++  PROC=$(shell uname -m)
++  ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
++endif
++
++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)
++endif
++
++ifeq ($(PROC),ppc)
++  ASTCFLAGS+=-fsigned-char
++endif
++
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
++  ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp
++else
++  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
++    ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
++  endif
++endif
++
++ifeq ($(OSARCH),FreeBSD)
++  BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
++  ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
++  LIBS+=$(shell if test  $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
++  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),)
++    ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
++  endif
++  MPG123TARG=freebsd
++
++  # XXX FreeBSD paths
++  PREFIX?=/usr/local
++  ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
++  ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
++  ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
++  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
++  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
++  ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
++  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
++  ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
++  ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
++  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
++  ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
++  # XXX end FreeBSD paths
++
++endif # FreeBSD
++
++ifeq ($(OSARCH),NetBSD)
++  ASTCFLAGS+=-pthread
++  INCLUDE+=-I$(CROSS_COMPILE_TARGET)/usr/pkg/include
++  MPG123TARG=netbsd
++endif
++
++ifeq ($(OSARCH),OpenBSD)
++  ASTCFLAGS+=-pthread
++endif
++
++ifeq ($(OSARCH),SunOS)
++  ASTCFLAGS+=-Wcast-align -DSOLARIS
++  INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
++endif
++
++ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
++  CYGLOADER=cygwin_a
++  OSARCH=CYGWIN
++  ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
++  ASTLINK=
++  LIBS+=-lpthread -lncurses -lm -lresolv
++  ASTSBINDIR=$(MODULES_DIR)
++  PROC=$(shell uname -m)
++endif
++
++ifndef WITHOUT_ZAPTEL
++
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
++  ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
++endif
++
++endif # WITHOUT_ZAPTEL
++
++LIBEDIT=editline/libedit.a
++
++ifneq ($(wildcard .version),)
++  ASTERISKVERSION:=$(shell cat .version)
++  ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
++  RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
++else
++  RPMVERSION=unknown
++endif
++
++# CVS mirrors of SVN have .svnrevision files showing
++# which SVN revision they are based on, and .svnbranch
++# showing the branch they are made from
++ifneq ($(wildcard .svnrevision),)
++  ASTERISKVERSIONNUM=999999
++  ASTERISKVERSION:=SVN-$(shell cat .svnbranch)-r$(shell cat .svnrevision)
++else
++  ifneq ($(wildcard .svn),)
++    ASTERISKVERSIONNUM=999999
++    ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
++  else
++    ASTERISKVERSIONNUM=000000
++  endif
++endif
++
++ASTCFLAGS+= $(DEBUG_THREADS)
++ASTCFLAGS+= $(TRACE_FRAMES)
++ASTCFLAGS+= $(MALLOC_DEBUG)
++ASTCFLAGS+= $(BUSYDETECT)
++ASTCFLAGS+= $(OPTIONS)
++ASTCFLAGS+= -fomit-frame-pointer 
++SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
++
++OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
++	translate.o file.o say.o pbx.o cli.o md5.o term.o \
++	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
++	cdr.o tdd.o acl.o rtp.o manager.o asterisk.o \
++	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
++	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
++	utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
++	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
++	cryptostub.o
++
++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
++  OBJS+= poll.o
++  ASTCFLAGS+=-DPOLLCOMPAT
++endif
++
++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
++  OBJS+= dlfcn.o
++  ASTCFLAGS+=-DDLFCNCOMPAT
++endif
++
++ifeq ($(OSARCH),Linux)
++  LIBS+=-ldl -lpthread -lncurses -lm -lresolv  #-lnjamd
++else
++  LIBS+=-lncurses -lm
++endif
++
++ifeq ($(OSARCH),Darwin)
++  LIBS+=-lresolv
++  ASTCFLAGS+=-D__Darwin__
++  AUDIO_LIBS=-framework CoreAudio
++  ASTLINK=-Wl,-dynamic
++  SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
++  OBJS+= poll.o
++  ASTCFLAGS+=-DPOLLCOMPAT
++else
++#These are used for all but Darwin
++  ASTLINK=-Wl,-E 
++  SOLINK=-shared -Xlinker -x
++endif
++
++ifeq ($(OSARCH),FreeBSD)
++  LIBS+=-lcrypto
++endif
++
++ifeq ($(OSARCH),NetBSD)
++  LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib -lncurses
++endif
++
++ifeq ($(OSARCH),OpenBSD)
++  LIBS+=-lcrypto -lpthread -lm -lncurses
++endif
++
++ifeq ($(OSARCH),SunOS)
++  LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
++  OBJS+=strcompat.o
++  ASTLINK=
++  SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
++endif
++
++ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
++  CFLAGS+=$(ASTCFLAGS)
++endif
++
++# This is used when generating the doxygen documentation
++ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),)
++  HAVEDOT=yes
++else
++  HAVEDOT=no
++endif
++
++LIBS+=-lssl
++
++INSTALL=install
++
++_all: all
++	@echo " +--------- Asterisk Build Complete ---------+"  
++	@echo " + Asterisk has successfully been built, but +"  
++	@echo " + cannot be run before being installed by   +"  
++	@echo " + running:                                  +"  
++	@echo " +                                           +"
++	@echo " +               $(MAKE) install                +"  
++	@echo " +-------------------------------------------+"  
++
++all: cleantest depend asterisk subdirs 
++
++#ifneq ($(wildcard tags),)
++ctags: tags
++#endif
++
++ifneq ($(wildcard TAGS),)
++all: TAGS
++endif
++
++noclean: depend asterisk subdirs
++
++editline/config.h:
++	cd editline && unset CFLAGS LIBS && ./configure ; \
++
++editline/libedit.a: FORCE
++	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
++	$(MAKE) -C editline libedit.a
++
++db1-ast/libdb1.a: FORCE
++	@if [ -d db1-ast ]; then \
++		$(MAKE) -C db1-ast libdb1.a ; \
++	else \
++		echo "You need to do a cvs update -d not just cvs update"; \
++		exit 1; \
++	fi
++
++ifneq ($(wildcard .depend),)
++  include .depend
++endif
++
++ifneq ($(wildcard .tags-depend),)
++  include .tags-depend
++endif
++
++ast_expr2.c:
++	bison -d --name-prefix=ast_yy ast_expr2.y -o ast_expr2.c
++
++ast_expr2f.c:
++	flex --full ast_expr2.fl
++
++testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
++	gcc -g -c -DSTANDALONE ast_expr2f.c
++	gcc -g -c -DSTANDALONE ast_expr2.c
++	gcc -g -o testexpr2 ast_expr2f.o ast_expr2.o
++	rm ast_expr2.o ast_expr2f.o 
++
++manpage: asterisk.8
++
++asterisk.8: asterisk.sgml
++	rm -f asterisk.8
++	docbook2man asterisk.sgml
++	mv ./*.8 asterisk.8
++
++asterisk.pdf: asterisk.sgml
++	docbook2pdf asterisk.sgml
++
++asterisk.ps: asterisk.sgml
++	docbook2ps asterisk.sgml
++
++asterisk.html: asterisk.sgml
++	docbook2html asterisk.sgml
++	mv r1.html asterisk.html
++
++asterisk.txt: asterisk.sgml
++	docbook2txt asterisk.sgml
++
++defaults.h: FORCE
++	build_tools/make_defaults_h > $@.tmp
++	if cmp -s $@.tmp $@ ; then echo ; else \
++		mv $@.tmp $@ ; \
++	fi
++	rm -f $@.tmp
++
++include/asterisk/version.h: FORCE
++	build_tools/make_version_h > $@.tmp
++	if cmp -s $@.tmp $@ ; then echo; else \
++		mv $@.tmp $@ ; \
++	fi
++	rm -f $@.tmp
++
++stdtime/libtime.a: FORCE
++	@if [ -d stdtime ]; then \
++		$(MAKE) -C stdtime libtime.a ; \
++	else \
++		echo "You need to do a cvs update -d not just cvs update"; \
++		exit 1; \
++	fi
++
++cygwin_a:
++	$(MAKE) -C cygwin all
++
++asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
++	build_tools/make_build_h > include/asterisk/build.h.tmp
++	if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
++		mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
++	fi
++	rm -f include/asterisk/build.h.tmp
++	$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
++	$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
++
++muted: muted.o
++	$(CC) $(AUDIO_LIBS) -o muted muted.o
++
++subdirs: 
++	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
++
++clean:
++	for x in $(SUBDIRS); do $(MAKE) -C $$x clean || exit 1 ; done
++	rm -f *.o *.so asterisk .depend
++	rm -f defaults.h
++	rm -f include/asterisk/build.h
++	rm -f include/asterisk/version.h
++	rm -f .tags-depend .tags-sources tags TAGS
++	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
++	@if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
++	$(MAKE) -C db1-ast clean
++	$(MAKE) -C stdtime clean
++
++datafiles: all
++	if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
++	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
++	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
++	for x in sounds/digits/*.gsm; do \
++		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
++			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
++		else \
++			echo "No description for $$x"; \
++			exit 1; \
++		fi; \
++	done
++	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
++	for x in sounds/dictate/*.gsm; do \
++		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
++			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
++		else \
++			echo "No description for $$x"; \
++			exit 1; \
++		fi; \
++	done
++	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
++	for x in sounds/letters/*.gsm; do \
++		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
++			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
++		else \
++			echo "No description for $$x"; \
++			exit 1; \
++		fi; \
++	done
++	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
++	for x in sounds/phonetic/*.gsm; do \
++		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
++			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
++		else \
++			echo "No description for $$x"; \
++			exit 1; \
++		fi; \
++	done
++	for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
++		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
++			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
++		else \
++			echo "No description for $$x"; \
++			exit 1; \
++		fi; \
++	done
++	mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3
++	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
++	for x in images/*.jpg; do \
++		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
++	done
++	mkdir -p $(DESTDIR)$(AGI_DIR)
++
++update: 
++	@if [ -d .svn ]; then \
++		echo "Updating from Subversion..." ; \
++		svn update | tee update.out; \
++		rm -f .version; \
++		if [ `grep -c ^C update.out` -gt 0 ]; then \
++			echo ; echo "The following files have conflicts:" ; \
++			grep ^C update.out | cut -b4- ; \
++		fi ; \
++		rm -f update.out; \
++	elif [ -d CVS ]; then \
++		echo "Updating from CVS..." ; \
++		cvs -q -z3 update -Pd | tee update.out; \
++		rm -f .version; \
++		if [ `grep -c ^C update.out` -gt 0 ]; then \
++			echo ; echo "The following files have conflicts:" ; \
++			grep ^C update.out | cut -d' ' -f2- ; \
++		fi ; \
++		rm -f update.out; \
++	else \
++		echo "Not under version control";  \
++	fi
++
++NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
++OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
++
++bininstall: all
++	mkdir -p $(DESTDIR)$(MODULES_DIR)
++	mkdir -p $(DESTDIR)$(ASTSBINDIR)
++	mkdir -p $(DESTDIR)$(ASTETCDIR)
++	mkdir -p $(DESTDIR)$(ASTBINDIR)
++	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
++	mkdir -p $(DESTDIR)$(ASTDATADIR)
++	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
++	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
++	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
++	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
++	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
++	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
++	if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
++	if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
++	if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
++	ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
++	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
++	$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/	
++	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
++		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
++		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
++	fi
++	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
++	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
++	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
++	if [ -n "$(OLDHEADERS)" ]; then \
++		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
++	fi
++	rm -f $(DESTDIR)$(ASTDATADIR)/sounds/voicemail
++	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds
++	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
++	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
++	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
++	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
++	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
++	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
++	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++	$(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
++	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
++	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
++	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
++	if [ -d contrib/firmware/iax ]; then \
++		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
++	else \
++		echo "You need to do cvs update -d not just cvs update" ; \
++	fi 
++	( cd $(DESTDIR)$(ASTDATADIR)/sounds  ; ln -s /var/spool/asterisk/voicemail . )
++	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
++	@echo " +---- Asterisk Installation Complete -------+"  
++	@echo " +                                           +"
++	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
++	@echo " +                                           +"
++	@echo " + Asterisk has successfully been installed. +"  
++	@echo " + If you would like to install the sample   +"  
++	@echo " + configuration files (overwriting any      +"
++	@echo " + existing config files), run:              +"  
++	@echo " +                                           +"
++	@echo " +               $(MAKE) samples                +"
++	@echo " +                                           +"
++	@echo " +-----------------  or ---------------------+"
++	@echo " +                                           +"
++	@echo " + You can go ahead and install the asterisk +"
++	@echo " + program documentation now or later run:   +"
++	@echo " +                                           +"
++	@echo " +              $(MAKE) progdocs                +"
++	@echo " +                                           +"
++	@echo " + **Note** This requires that you have      +"
++	@echo " + doxygen installed on your local system    +"
++	@echo " +-------------------------------------------+"
++	@$(MAKE) -s oldmodcheck
++
++NEWMODS=$(notdir $(wildcard */*.so))
++OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
++
++oldmodcheck:
++	@if [ -n "$(OLDMODS)" ]; then \
++		echo " WARNING WARNING WARNING" ;\
++		echo "" ;\
++		echo " Your Asterisk modules directory, located at" ;\
++		echo " $(DESTDIR)$(MODULES_DIR)" ;\
++		echo " contains modules that were not installed by this " ;\
++		echo " version of Asterisk. Please ensure that these" ;\
++		echo " modules are compatible with this version before" ;\
++		echo " attempting to run Asterisk." ;\
++		echo "" ;\
++		for f in $(OLDMODS); do \
++			echo "    $$f" ;\
++		done ;\
++		echo "" ;\
++		echo " WARNING WARNING WARNING" ;\
++	fi
++
++install: all datafiles bininstall
++	@if [ -x /usr/sbin/asterisk-post-install ]; then \
++		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
++	fi
++
++upgrade: all bininstall
++
++adsi:
++	mkdir -p $(DESTDIR)$(ASTETCDIR)
++	for x in configs/*.adsi; do \
++		if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
++			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
++		fi ; \
++	done
++
++samples: adsi
++	mkdir -p $(DESTDIR)$(ASTETCDIR)
++	for x in configs/*.sample; do \
++		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
++			if [ "$(OVERWRITE)" = "y" ]; then \
++				if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
++					echo "Config file $$x is unchanged"; \
++					continue; \
++				fi ; \
++				mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
++			else \
++				echo "Skipping config file $$x"; \
++				continue; \
++			fi ;\
++		fi ; \
++		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
++	done
++	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
++		( \
++		echo "[directories]" ; \
++		echo "astetcdir => $(ASTETCDIR)" ; \
++		echo "astmoddir => $(MODULES_DIR)" ; \
++		echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
++		echo "astagidir => $(AGI_DIR)" ; \
++		echo "astspooldir => $(ASTSPOOLDIR)" ; \
++		echo "astrundir => $(ASTVARRUNDIR)" ; \
++		echo "astlogdir => $(ASTLOGDIR)" ; \
++		echo "" ; \
++		echo "; Changing the following lines may compromise your security." ; \
++		echo ";[files]" ; \
++		echo ";astctlpermissions = 0660" ; \
++		echo ";astctlowner = root" ; \
++		echo ";astctlgroup = apache" ; \
++		echo ";astctl = asterisk.ctl" ; \
++		) > $(DESTDIR)$(ASTCONFPATH) ; \
++	else \
++		echo "Skipping asterisk.conf creation"; \
++	fi
++	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds ; \
++	for x in sounds/demo-*; do \
++		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
++			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
++		else \
++			echo "No description for $$x"; \
++			exit 1; \
++		fi; \
++	done
++	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
++	for x in sounds/*.mp3; do \
++		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
++	done
++	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
++	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
++	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
++	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
++		cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
++	done
++	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
++	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
++		cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
++	done
++
++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 )
++	$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
++	mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
++	for x in images/*.gif; do \
++		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
++	done
++	@echo " +--------- Asterisk Web Voicemail ----------+"  
++	@echo " +                                           +"
++	@echo " + Asterisk Web Voicemail is installed in    +"
++	@echo " + your cgi-bin directory:                   +"
++	@echo " + $(DESTDIR)$(HTTP_CGIDIR)"
++	@echo " + IT USES A SETUID ROOT PERL SCRIPT, SO     +"
++	@echo " + IF YOU DON'T LIKE THAT, UNINSTALL IT!     +"
++	@echo " +                                           +"
++	@echo " + Other static items have been stored in:   +"
++	@echo " + $(DESTDIR)$(HTTP_DOCSDIR)"
++	@echo " +                                           +"
++	@echo " + If these paths do not match your httpd    +"
++	@echo " + installation, correct the definitions     +"
++	@echo " + in your Makefile of HTTP_CGIDIR and       +"
++	@echo " + HTTP_DOCSDIR                              +"
++	@echo " +                                           +"
++	@echo " +-------------------------------------------+"  
++
++spec: 
++	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
++
++rpm: __rpm
++
++__rpm: include/asterisk/version.h spec
++	rm -rf /tmp/asterisk ; \
++	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
++	$(MAKE) DESTDIR=/tmp/asterisk install ; \
++	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
++	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
++	cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \
++	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
++
++progdocs:
++	(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
++	echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen - 
++
++mpg123:
++	@wget -V >/dev/null || (echo "You need wget" ; false )
++	[ -f mpg123-0.59r.tar.gz ] || wget http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz
++	[ -d mpg123-0.59r ] || tar xfz mpg123-0.59r.tar.gz
++	$(MAKE) -C mpg123-0.59r $(MPG123TARG)
++
++config:
++	if [ -d /etc/rc.d/init.d ]; then \
++		$(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
++		/sbin/chkconfig --add asterisk; \
++	elif [ -d /etc/init.d ]; then \
++		$(INSTALL) -m 755 init.asterisk /etc/init.d/asterisk; \
++	fi 
++
++dont-optimize: install
++
++valgrind: dont-optimize
++
++depend: include/asterisk/version.h .depend defaults.h 
++	for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
++
++.depend: include/asterisk/version.h
++	build_tools/mkdep $(CFLAGS) $(wildcard *.c)
++
++.tags-depend:
++	@echo -n ".tags-depend: " > $@
++	@find . -maxdepth 1 -name \*.c -printf "\t%p \\\\\n" >> $@
++	@find . -maxdepth 1 -name \*.h -printf "\t%p \\\\\n" >> $@
++	@find $(SUBDIRS) -name \*.c -printf "\t%p \\\\\n" >> $@
++	@find $(SUBDIRS) -name \*.h -printf "\t%p \\\\\n" >> $@
++	@find include -name \*.h -printf "\t%p \\\\\n" >> $@
++	@echo >> $@
++
++.tags-sources:
++	@rm -f $@
++	@find . -maxdepth 1 -name \*.c -print >> $@
++	@find . -maxdepth 1 -name \*.h -print >> $@
++	@find $(SUBDIRS) -name \*.c -print >> $@
++	@find $(SUBDIRS) -name \*.h -print >> $@
++	@find include -name \*.h -print >> $@
++
++tags: .tags-depend .tags-sources
++	ctags -L .tags-sources -o $@
++
++ctags: tags
++
++TAGS: .tags-depend .tags-sources
++	etags -o $@ `cat .tags-sources`
++
++etags: TAGS
++
++FORCE:
++
++%_env:
++	$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
++
++env:
++	env
++
++# If the cleancount has been changed, force a make clean.
++# .cleancount is the global clean count, and .lastclean is the 
++# last clean count we had
++# We can avoid this by making noclean
++
++cleantest:
++	if cmp -s .cleancount .lastclean ; then echo ; else \
++		$(MAKE) clean; cp -f .cleancount .lastclean;\
++	fi

Deleted: asterisk/trunk/debian/patches/sip-1.914.dpatch
===================================================================
--- asterisk/trunk/debian/patches/sip-1.914.dpatch	2005-12-07 21:30:52 UTC (rev 1075)
+++ asterisk/trunk/debian/patches/sip-1.914.dpatch	2005-12-07 21:59:37 UTC (rev 1076)
@@ -1,44 +0,0 @@
-#! /bin/sh -e
-##
-## All lines beginning with `## DP:' are a description of the patch.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad asterisk-1.2.0.dfsg~/channels/chan_sip.c asterisk-1.2.0.dfsg/channels/chan_sip.c
---- asterisk-1.2.0.dfsg~/channels/chan_sip.c	2005-12-05 23:57:46.000000000 +0000
-+++ asterisk-1.2.0.dfsg/channels/chan_sip.c	2005-12-05 23:59:49.000000000 +0000
-@@ -50,7 +50,7 @@
- 
- #include "asterisk.h"
- 
--ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.913 $")
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.914 $")
- 
- #include "asterisk/lock.h"
- #include "asterisk/channel.h"
-@@ -4267,7 +4267,7 @@
- 			 sample_rate);
- 	if (codec == AST_FORMAT_G729A)
- 		/* Indicate that we don't support VAD (G.729 annex B) */
--		ast_build_string(a_buf, a_size, "a=fmtp:%d annexb=no", rtp_code);
-+		ast_build_string(a_buf, a_size, "a=fmtp:%d annexb=no\r\n", rtp_code);
- }
- 
- static void add_noncodec_to_sdp(const struct sip_pvt *p, int format, int sample_rate,




More information about the Pkg-voip-commits mailing list