merge of '0e26ba58720a1849aa7900d3994580287bca5ac9'

     and '308da270e0ec4f56bfc763e5a9961617e8f09c92'

6 files changed, 134 insertions, 0 deletions

diff --git a/packages/asterisk/asterisk-1.4.11/.mtn2git_empty b/packages/asterisk/asterisk-1.4.11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.11/.mtn2git_empty
diff --git a/packages/asterisk/asterisk-1.4.11/Makefile.patch b/packages/asterisk/asterisk-1.4.11/Makefile.patch
new file mode 100644
index 0000000000..a6d630949e
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.11/Makefile.patch
@@ -0,0 +1,20 @@
+--- asterisk-1.4.5/Makefile	2007-05-24 15:05:08.000000000 -0400
++++ asterisk-1.4.5/Makefile.new	2007-06-17 05:36:44.000000000 -0400
+@@ -115,7 +115,7 @@ else
+   ASTSBINDIR=$(sbindir)
+   ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+   ASTLOGDIR=$(localstatedir)/log/asterisk
+-  ASTVARRUNDIR=$(localstatedir)/run
++  ASTVARRUNDIR=$(localstatedir)/run/asterisk
+   ASTMANDIR=$(mandir)
+ ifeq ($(OSARCH),FreeBSD)
+   ASTVARLIBDIR=$(prefix)/share/asterisk
+@@ -468,7 +468,7 @@ oldmodcheck:
+ 		echo " WARNING WARNING WARNING" ;\
+ 	fi
+ 
+-install: datafiles bininstall $(SUBDIRS_INSTALL)
++install: datafiles bininstall $(SUBDIRS_INSTALL) samples
+ 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
+ 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ 	fi
diff --git a/packages/asterisk/asterisk-1.4.11/init b/packages/asterisk/asterisk-1.4.11/init
new file mode 100644
index 0000000000..f26ad38db3
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.11/init
@@ -0,0 +1,77 @@
+#! /bin/sh 
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/openpbx and type
+# > update-rc.d asterisk defaults 60
+#
+asterisk=/usr/sbin/asterisk
+pidfile=/var/run/asterisk/asterisk.pid
+asterisk_args="-npqT -U asterisk -G asterisk"
+
+test -x "$asterisk" || exit 0
+
+case "$1" in
+  start)
+    echo -n "Starting Asterisk"
+    start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping Asterisk"
+    $asterisk -rx "stop gracefully"
+    sleep 4
+    if [ -f $pidfile ]; then
+      start-stop-daemon --stop --quiet --pidfile $pidfile
+    fi
+    echo "."
+    ;;
+  force-stop)
+    echo -n "Stopping Asterisk"
+    $asterisk -rx "stop now"
+    sleep 2
+    if [ -f $pidfile ]; then
+      start-stop-daemon --stop --quiet --pidfile $pidfile
+    fi
+    echo "."
+    ;;
+  restart)
+    echo -n "Restarting Asterisk"
+    if [ -f $pidfile ]; then
+      $asterisk -rx "restart gracefully"
+      sleep 2
+    else
+      start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+    fi
+    echo "."
+    ;;
+  force-restart)
+    echo -n "Forcibly Restarting Asterisk"
+    if [ -f $pidfile ]; then
+      $asterisk -rx "restart now"
+      sleep 2
+    else
+      start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+    fi
+    echo "."
+    ;;
+  reload)
+    echo -n "Reloading Asterisk Configuration"
+    if [ -f $pidfile ]; then
+      $asterisk -rx "reload"
+    else
+      start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+    fi
+    echo "."
+    ;;
+  logger-reload)
+    if [ -f $pidfile ]; then
+      $asterisk -rx "logger reload"
+    fi
+    ;;
+  *)
+    echo "Usage: /etc/init.d/asterisk {start|stop|force-stop|restart|force-restart|reload|logger-reload}"
+    exit 1
+esac
+
+exit 0
+
diff --git a/packages/asterisk/asterisk-1.4.11/logrotate b/packages/asterisk/asterisk-1.4.11/logrotate
new file mode 100644
index 0000000000..dfd25ee55c
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.11/logrotate
@@ -0,0 +1,12 @@
+/var/log/asterisk/cdr-csv/Master.csv /var/log/asterisk/cdr-custom/Master.csv /var/log/asterisk/queue_log /var/log/asterisk/event_log /var/log/asterisk/messages {
+    daily
+    missingok
+    compress
+    delaycompress
+    rotate 30
+    sharedscripts
+    postrotate
+      /etc/init.d/asterisk logger-reload
+    endscript
+}
+
diff --git a/packages/asterisk/asterisk-1.4.11/sounds.xml.patch b/packages/asterisk/asterisk-1.4.11/sounds.xml.patch
new file mode 100644
index 0000000000..b549fea132
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.11/sounds.xml.patch
@@ -0,0 +1,18 @@
+--- asterisk-1.4.4/sounds/sounds.xml	2007-05-24 17:00:45.000000000 -0400
++++ asterisk-1.4.4/sounds/sounds.xml.new	2007-05-25 13:23:41.000000000 -0400
+@@ -6,7 +6,6 @@
+ 		<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
+ 		</member>
+ 		<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
+-			<defaultenabled>yes</defaultenabled>
+ 		</member>
+ 		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
+ 		</member>
+@@ -39,7 +38,6 @@
+ 	</category>
+ 	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
+ 		<member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" >
+-			<defaultenabled>yes</defaultenabled>
+ 		</member>
+ 		<member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" >
+ 		</member>
diff --git a/packages/asterisk/asterisk-1.4.11/volatiles b/packages/asterisk/asterisk-1.4.11/volatiles
new file mode 100644
index 0000000000..c68e786c90
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.11/volatiles
@@ -0,0 +1,7 @@
+d asterisk asterisk 0775 /var/run/asterisk none
+d asterisk asterisk 0775 /var/lib/asterisk none
+d asterisk asterisk 0775 /var/log/asterisk none
+d asterisk asterisk 0775 /var/log/asterisk/cdr-csv none
+d asterisk asterisk 0775 /var/log/asterisk/cdr-custom none
+d asterisk asterisk 0775 /var/spool/asterisk/outgoing none
+d asterisk asterisk 0775 /var/spool/asterisk/voicemail none