update asterisk 1.2.x to 1.2.24, cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/packages@8739 3c298f89-4303-0410-b956-a3cf2f4a3e73

net/asterisk/files/asterisk.default

@@ -1,4 +1,4 @@
 ## startup options for /etc/init.d/asterisk
 
-ENABLE_ASTERISK="no"
+DEST=""
 OPTIONS=""

net/asterisk/files/asterisk.init

@@ -3,18 +3,19 @@
 START=50
 
 DEFAULT=/etc/default/asterisk
-OPTIONS=""
+DEST=
+OPTIONS=
 
 start() {
 	[ -f $DEFAULT ] && . $DEFAULT
-	[ -d /var/run ] || mkdir -p /var/run
-	[ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
-	[ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk
-	[ -f /usr/lib/asterisk/astdb ] && mv /usr/lib/asterisk/astdb /var/spool/asterisk/astdb
-	[ -h /usr/lib/asterisk/astdb ] || ln -sf /var/spool/asterisk/astdb /usr/lib/asterisk/astdb
+	mkdir -p $DEST/var/run
+	mkdir -p $DEST/var/log/asterisk
+	mkdir -p $DEST/var/spool/asterisk
+	[ -f $DEST/usr/lib/asterisk/astdb ] && mv $DEST/usr/lib/asterisk/astdb $DEST/var/spool/asterisk/
+	[ -h $DEST/usr/lib/asterisk/astdb ] || ln -sf $DEST/var/spool/asterisk/astdb $DEST/usr/lib/asterisk/
 	/usr/sbin/asterisk $OPTIONS
 }
 
 stop() {
-	[ -f /var/run/asterisk.pid ] && kill $(cat /var/run/asterisk.pid) >/dev/null 2>&1
+	[ -f $DEST/var/run/asterisk.pid ] && kill $(cat $DEST/var/run/asterisk.pid) >/dev/null 2>&1
 }

net/asterisk/files/modules.conf

@@ -18,12 +18,12 @@ autoload=yes
 ;preload => res_odbc.so
 ;preload => res_config_odbc.so
 ;
-noload => res_config_mysql.so ; 
-;
-; load => res_features.so ; Call Parking Resource 
+noload => res_config_mysql.so ;
+noload => res_crypto.so ; Cryptographic Digital Signatures
+; load => res_features.so ; Call Parking Resource
 noload => res_indications.so ; Indications Configuration
-noload => res_monitor.so ; Call Monitoring Resource 
-; load => res_musiconhold.so ; Music On Hold Resource 
+noload => res_monitor.so ; Call Monitoring Resource
+; load => res_musiconhold.so ; Music On Hold Resource
 noload => cdr_csv.so ; Comma Separated Values CDR Backend
 noload => cdr_custom.so ; Customizable Comma Separated Values CDR Backend
 noload => cdr_manager.so ; Asterisk Call Manager CDR Backend
@@ -33,6 +33,7 @@ noload => cdr_sqlite.so ; SQLite CDR Backend
 noload => chan_agent.so ; Agent Proxy Channel
 ; load => chan_iax2.so ; Inter Asterisk eXchange (Ver 2)
 ; load => chan_local.so ; Local Proxy Channel
+noload => chan_oss.so ; Channel driver for OSS sound cards
 ; load => chan_sip.so ; Session Initiation Protocol (SIP)
 noload => codec_a_mu.so ; A-law and Mulaw direct Coder/Decoder
 noload => codec_adpcm.so ; Adaptive Differential PCM Coder/Decoder
@@ -79,15 +80,16 @@ noload => app_groupcount.so ; Group Management Routines
 noload => app_ices.so ; Encode and Stream via icecast and ices
 noload => app_image.so ; Image Transmission Application
 noload => app_lookupblacklist.so ; Look up Caller*ID name/number from black
-noload => app_lookupcidname.so ; Look up CallerID Name from local databas
+noload => app_lookupcidname.so ; Look up CallerID Name from local database
 ; load => app_macro.so ; Extension Macros
 noload => app_math.so ; A simple math Application
 noload => app_md5.so ; MD5 checksum Application
+noload => app_meetme.so ; MeetMe conferencing
 ; load => app_milliwatt.so ; Digital Milliwatt (mu-law) Test Application
 noload => app_mixmonitor.so ; Record a call and mix the audio during the recording
 noload => app_parkandannounce.so ; Call Parking and Announce Application
 ; load => app_playback.so ; Trivial Playback Application
-noload => app_privacy.so ; Require phone number to be entered, if n
+noload => app_privacy.so ; Require phone number to be entered
 noload => app_queue.so ; True Call Queueing
 noload => app_random.so ; Random goto
 noload => app_read.so ; Read Variable Application
@@ -119,16 +121,16 @@ noload => app_userevent.so ; Custom User Event Application
 noload => app_waitforring.so ; Waits until first ring after time
 noload => app_waitforsilence.so ; Wait For Silence Application
 noload => app_while.so ; While Loops and Conditional Execution
+noload => func_callerid.so ; Caller ID related dialplan functions
+noload => func_enum.so ; ENUM Functions
+noload => func_uri.so ; URI encoding / decoding functions
 noload => pbx_ael.so ; Asterisk Extension Language Compiler
 ; load => pbx_config.so ; Text Extension Configuration
 noload => pbx_functions.so ; Builtin dialplan functions
 noload => pbx_loopback.so ; Loopback Switch
 noload => pbx_realtime.so ; Realtime Switch
 noload => pbx_spool.so ; Outgoing Spool Support
-noload => pbx_wilcalu.so ; Wil Cal U (Auto Dialer) 
-noload => func_callerid.so ; Caller ID related dialplan functions
-noload => func_enum.so ; ENUM Functions
-noload => func_uri.so ; URI encoding / decoding functions
+noload => pbx_wilcalu.so ; Wil Cal U (Auto Dialer)
 
 ;
 ; Module names listed in "global" section will have symbols globally

net/asterisk/patches/002-dns.patch

@@ -1,10 +1,10 @@
-diff -Nru asterisk-1.2.14.org/dns.c asterisk-1.2.14/dns.c
---- asterisk-1.2.14.org/dns.c	2005-11-29 19:24:39.000000000 +0100
-+++ asterisk-1.2.14/dns.c	2006-12-27 08:50:05.000000000 +0100
-@@ -175,7 +175,13 @@
- 
- #if defined(res_ninit)
- #define HAS_RES_NINIT
+diff -Nru asterisk-1.2.24.org/dns.c asterisk-1.2.24/dns.c
+--- asterisk-1.2.24.org/dns.c	2007-07-16 22:46:58.000000000 +0200
++++ asterisk-1.2.24/dns.c	2007-09-04 18:53:32.000000000 +0200
+@@ -237,7 +237,13 @@
+ #if defined(res_ndestroy)
+ #define HAS_RES_NDESTROY
+ #endif
 -#else
 +#endif
 +

net/asterisk/patches/020-chan_h323.patch

@@ -1,15 +1,26 @@
-diff -Nru asterisk-1.2.14.org/channels/h323/Makefile asterisk-1.2.14/channels/h323/Makefile
---- asterisk-1.2.14.org/channels/h323/Makefile	2005-11-29 19:24:39.000000000 +0100
-+++ asterisk-1.2.14/channels/h323/Makefile	2006-12-27 09:22:09.000000000 +0100
-@@ -30,7 +30,7 @@
+diff -Nru asterisk-1.2.24.org/channels/Makefile asterisk-1.2.24/channels/Makefile
+--- asterisk-1.2.24.org/channels/h323/Makefile	2007-03-06 16:17:16.000000000 +0100
++++ asterisk-1.2.24/channels/h323/Makefile	2007-09-04 18:37:58.000000000 +0200
+@@ -21,9 +21,8 @@
+ OPENH323DIR=$(HOME)/openh323
+ endif
+ 
+-clean:
+-	rm -f *.so *.o .depend
+-
++include $(OPENH323DIR)/openh323u.mak
++
+ $(SOURCES)::	$(SOURCES:.cxx=.cpp)
+ 	ln -f $< $@
+ 
+@@ -31,7 +30,6 @@
  	touch $(SOURCES)
  
  libchanh323.a:	$(OBJS)
--	ar crv $@ $(OBJS)
-+	$(AR) crv $@ $(OBJS)
+-	include $(OPENH323DIR)/openh323u.mak
+ 	ar crv $@ $(OBJS)
  
  Makefile.ast:	FORCE
- 	@echo H323CFLAGS  = $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) >$@.tmp
 diff -Nru asterisk-1.2.14.org/channels/Makefile asterisk-1.2.14/channels/Makefile
 --- asterisk-1.2.14.org/channels/Makefile	2006-08-17 23:57:19.000000000 +0200
 +++ asterisk-1.2.14/channels/Makefile	2006-12-27 09:22:09.000000000 +0100