Merge branch 'master' of ssh://openadk.org/git/openadk

resolve conflicts

Conflicts:

	mk/pkg-bottom.mk
	package/ctorrent/Makefile
	package/gcc/Makefile
	package/gmp/Makefile
	package/id3lib/Makefile
	package/libelf/Makefile
	package/libnl/patches/patch-include_netlink-local_h
	package/mpd/Makefile
	package/nmap/Makefile
	package/rrs/Makefile
	package/weechat/Makefile
	scripts/rstrip.sh
	target/Config.in

12 files changed, 36 insertions, 1 deletions

diff --git a/package/asterisk/files/asterisk-chan-bluetooth.conffiles b/package/asterisk/files/asterisk-chan-bluetooth.conffiles
new file mode 100644
index 000000000..40a085235
--- /dev/null
+++ b/package/asterisk/files/asterisk-chan-bluetooth.conffiles
@@ -0,0 +1 @@
+/etc/asterisk/bluetooth.conf
diff --git a/package/asterisk/files/asterisk-chan-h323.conffiles b/package/asterisk/files/asterisk-chan-h323.conffiles
new file mode 100644
index 000000000..fc0858a61
--- /dev/null
+++ b/package/asterisk/files/asterisk-chan-h323.conffiles
@@ -0,0 +1 @@
+/etc/asterisk/h323.conf
diff --git a/package/asterisk/files/asterisk-chan-iax2.conffiles b/package/asterisk/files/asterisk-chan-iax2.conffiles
new file mode 100644
index 000000000..f46a87327
--- /dev/null
+++ b/package/asterisk/files/asterisk-chan-iax2.conffiles
@@ -0,0 +1,2 @@
+/etc/asterisk/iax.conf
+/etc/asterisk/iaxprov.conf
diff --git a/package/asterisk/files/asterisk-chan-mgcp.conffiles b/package/asterisk/files/asterisk-chan-mgcp.conffiles
new file mode 100644
index 000000000..40a81df8e
--- /dev/null
+++ b/package/asterisk/files/asterisk-chan-mgcp.conffiles
@@ -0,0 +1 @@
+/etc/asterisk/mgcp.conf
diff --git a/package/asterisk/files/asterisk-chan-skinny.conffiles b/package/asterisk/files/asterisk-chan-skinny.conffiles
new file mode 100644
index 000000000..eaf9b6def
--- /dev/null
+++ b/package/asterisk/files/asterisk-chan-skinny.conffiles
@@ -0,0 +1 @@
+/etc/asterisk/skinny.conf
diff --git a/package/asterisk/files/asterisk-meetme.conffiles b/package/asterisk/files/asterisk-meetme.conffiles
new file mode 100644
index 000000000..1caab1d4d
--- /dev/null
+++ b/package/asterisk/files/asterisk-meetme.conffiles
@@ -0,0 +1 @@
+/etc/asterisk/meetme.conf
diff --git a/package/asterisk/files/asterisk-pbx-dundi.conffiles b/package/asterisk/files/asterisk-pbx-dundi.conffiles
new file mode 100644
index 000000000..ab116b5d1
--- /dev/null
+++ b/package/asterisk/files/asterisk-pbx-dundi.conffiles
@@ -0,0 +1 @@
+/etc/asterisk/dundi.conf
diff --git a/package/asterisk/files/asterisk-pgsql.conffiles b/package/asterisk/files/asterisk-pgsql.conffiles
new file mode 100644
index 000000000..8b5cffe40
--- /dev/null
+++ b/package/asterisk/files/asterisk-pgsql.conffiles
@@ -0,0 +1 @@
+/etc/asterisk/cdr_pgsql.conf
diff --git a/package/asterisk/files/asterisk-voicemail.conffiles b/package/asterisk/files/asterisk-voicemail.conffiles
new file mode 100644
index 000000000..1c80f057a
--- /dev/null
+++ b/package/asterisk/files/asterisk-voicemail.conffiles
@@ -0,0 +1 @@
+/etc/asterisk/voicemail.conf
diff --git a/package/asterisk/files/asterisk.conffiles b/package/asterisk/files/asterisk.conffiles
new file mode 100644
index 000000000..5f805dedb
--- /dev/null
+++ b/package/asterisk/files/asterisk.conffiles
@@ -0,0 +1,21 @@
+/etc/asterisk/asterisk.conf
+/etc/asterisk/agents.conf
+/etc/asterisk/alarmreceiver.conf
+/etc/asterisk/cdr_manager.conf
+/etc/asterisk/codecs.conf
+/etc/asterisk/enum.conf
+/etc/asterisk/extconfig.conf
+/etc/asterisk/extensions.conf
+/etc/asterisk/features.conf
+/etc/asterisk/iax.conf
+/etc/asterisk/iaxprov.conf
+/etc/asterisk/indications.conf
+/etc/asterisk/logger.conf
+/etc/asterisk/manager.conf
+/etc/asterisk/modules.conf
+/etc/asterisk/musiconhold.conf
+/etc/asterisk/osp.conf
+/etc/asterisk/privacy.conf
+/etc/asterisk/queues.conf
+/etc/asterisk/rtp.conf
+/etc/asterisk/sip.conf
diff --git a/package/asterisk/files/asterisk.init b/package/asterisk/files/asterisk.init
index fcbb52612..01a4edd51 100644
--- a/package/asterisk/files/asterisk.init
+++ b/package/asterisk/files/asterisk.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG asterisk
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/asterisk/files/asterisk.postinst b/package/asterisk/files/asterisk.postinst
new file mode 100644
index 000000000..1186b2645
--- /dev/null
+++ b/package/asterisk/files/asterisk.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf asterisk asterisk NO