From b83c514e2e2c0b1706a17c504307d806e159647d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 15 Nov 2009 23:07:47 +0100
Subject: update asterisk, fix aufs2 compile

---
 package/asterisk/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/asterisk')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index b048c823c..d234b8a57 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.26.1
+PKG_VERSION:=		1.4.26.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9b46f8628f43e1d3c275460ceee26646
+PKG_MD5SUM:=		04017dfdc8caeb8f4663b5dc4a9e1019
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
-- 
cgit v1.2.3


From b047da059a1042a27ba68b1bdc50dd187bd362f4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 4 Dec 2009 18:10:24 +0100
Subject: update kernel to 2.6.32

- update some applications
  asterisk, curl, strace, radvd, rpm
- fix allconfig
- /dev for full build seems to need more than 64k
---
 package/asterisk/Makefile                          |  8 ++---
 .../asterisk/patches/patch-channels_chan_iax2_c    | 20 ++++++++++++
 package/asterisk/patches/patch-channels_chan_oss_c | 37 ++++++++++++++++++++++
 package/asterisk/patches/patch-main_astobj2_c      | 11 +++++++
 package/asterisk/patches/patch-main_translate_c    | 11 +++++++
 package/asterisk/patches/patch-menuselect-tree     | 12 +++++++
 package/asterisk/patches/patch-res_res_features_c  | 11 +++++++
 7 files changed, 106 insertions(+), 4 deletions(-)
 create mode 100644 package/asterisk/patches/patch-channels_chan_iax2_c
 create mode 100644 package/asterisk/patches/patch-channels_chan_oss_c
 create mode 100644 package/asterisk/patches/patch-main_astobj2_c
 create mode 100644 package/asterisk/patches/patch-main_translate_c
 create mode 100644 package/asterisk/patches/patch-menuselect-tree
 create mode 100644 package/asterisk/patches/patch-res_res_features_c

(limited to 'package/asterisk')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index d234b8a57..ecb33b52d 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.26.3
+PKG_VERSION:=		1.4.27.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		04017dfdc8caeb8f4663b5dc4a9e1019
+PKG_MD5SUM:=		e09ca163a6e90018c92c65a50b9ec398
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
@@ -121,8 +121,8 @@ pre-configure:
 
 post-build:
 	cd ${WRKBUILD}/sounds ; \
-	tar xzf asterisk-core-sounds-en-gsm-1.4.15.tar.gz ; \
-	rm asterisk-core-sounds-en-gsm-1.4.15.tar.gz
+	tar xzf asterisk-core-sounds-en-gsm-1.4.16.tar.gz ; \
+	rm asterisk-core-sounds-en-gsm-1.4.16.tar.gz
 	@echo
 	@echo "---> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <---"
 	@echo
diff --git a/package/asterisk/patches/patch-channels_chan_iax2_c b/package/asterisk/patches/patch-channels_chan_iax2_c
new file mode 100644
index 000000000..f39c2bf5b
--- /dev/null
+++ b/package/asterisk/patches/patch-channels_chan_iax2_c
@@ -0,0 +1,20 @@
+--- asterisk-1.4.27.1.orig/channels/chan_iax2.c	2009-11-10 18:15:57.000000000 +0100
++++ asterisk-1.4.27.1/channels/chan_iax2.c	2009-12-03 20:57:05.000000000 +0100
+@@ -7076,7 +7076,7 @@ static int try_transfer(struct chan_iax2
+ 	
+ 	memset(&ied, 0, sizeof(ied));
+ 	if (ies->apparent_addr)
+-		bcopy(ies->apparent_addr, &new, sizeof(new));
++		memcpy(&new, ies->apparent_addr, sizeof(new));
+ 	if (ies->callno)
+ 		newcall = ies->callno;
+ 	if (!newcall || !new.sin_addr.s_addr || !new.sin_port) {
+@@ -7235,7 +7235,7 @@ static int iax2_ack_registry(struct iax_
+ 
+ 	memset(&us, 0, sizeof(us));
+ 	if (ies->apparent_addr)
+-		bcopy(ies->apparent_addr, &us, sizeof(us));
++		memcpy(&us, ies->apparent_addr, sizeof(us));
+ 	if (ies->username)
+ 		ast_copy_string(peer, ies->username, sizeof(peer));
+ 	if (ies->refresh)
diff --git a/package/asterisk/patches/patch-channels_chan_oss_c b/package/asterisk/patches/patch-channels_chan_oss_c
new file mode 100644
index 000000000..33e9aaad7
--- /dev/null
+++ b/package/asterisk/patches/patch-channels_chan_oss_c
@@ -0,0 +1,37 @@
+--- asterisk-1.4.27.1.orig/channels/chan_oss.c	2009-08-10 21:15:57.000000000 +0200
++++ asterisk-1.4.27.1/channels/chan_oss.c	2009-12-03 20:58:13.000000000 +0100
+@@ -562,7 +562,7 @@ static void send_sound(struct chan_oss_p
+ 				l = FRAME_SIZE - ofs;
+ 			if (l > s->datalen - start)	/* don't overflow the source */
+ 				l = s->datalen - start;
+-			bcopy(s->data + start, myframe + ofs, l * 2);
++			memcpy(myframe + ofs, s->data + start, l * 2);
+ 			if (0)
+ 				ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs);
+ 			l_sampsent += l;
+@@ -573,14 +573,14 @@ static void send_sound(struct chan_oss_p
+ 			if (l > 0) {
+ 				if (l > FRAME_SIZE - ofs)
+ 					l = FRAME_SIZE - ofs;
+-				bcopy(silence, myframe + ofs, l * 2);
++				memcpy(myframe + ofs, silence, l * 2);
+ 				l_sampsent += l;
+ 			} else {			/* silence is over, restart sound if loop */
+ 				if (s->repeat == 0) {	/* last block */
+ 					o->cursound = -1;
+ 					o->nosound = 0;	/* allow audio data */
+ 					if (ofs < FRAME_SIZE)	/* pad with silence */
+-						bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2);
++						memcpy(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2);
+ 				}
+ 				l_sampsent = 0;
+ 			}
+@@ -905,7 +905,7 @@ static struct ast_frame *oss_read(struct
+ 
+ 	/* XXX can be simplified returning &ast_null_frame */
+ 	/* prepare a NULL frame in case we don't have enough data to return */
+-	bzero(f, sizeof(struct ast_frame));
++	memset(f, 0, sizeof(struct ast_frame));
+ 	f->frametype = AST_FRAME_NULL;
+ 	f->src = oss_tech.type;
+ 
diff --git a/package/asterisk/patches/patch-main_astobj2_c b/package/asterisk/patches/patch-main_astobj2_c
new file mode 100644
index 000000000..d8aaf114b
--- /dev/null
+++ b/package/asterisk/patches/patch-main_astobj2_c
@@ -0,0 +1,11 @@
+--- asterisk-1.4.27.1.orig/main/astobj2.c	2009-10-06 03:16:36.000000000 +0200
++++ asterisk-1.4.27.1/main/astobj2.c	2009-12-03 20:54:12.000000000 +0100
+@@ -236,7 +236,7 @@ int ao2_ref(void *user_data, const int d
+ 		/* for safety, zero-out the astobj2 header and also the
+ 		 * first word of the user-data, which we make sure is always
+ 		 * allocated. */
+-		bzero(obj, sizeof(struct astobj2 *) + sizeof(void *) );
++		memset(obj, 0, sizeof(struct astobj2 *) + sizeof(void *) );
+ 		free(obj);
+ 	}
+ 
diff --git a/package/asterisk/patches/patch-main_translate_c b/package/asterisk/patches/patch-main_translate_c
new file mode 100644
index 000000000..36d7c3058
--- /dev/null
+++ b/package/asterisk/patches/patch-main_translate_c
@@ -0,0 +1,11 @@
+--- asterisk-1.4.27.1.orig/main/translate.c	2009-10-21 18:44:49.000000000 +0200
++++ asterisk-1.4.27.1/main/translate.c	2009-12-03 20:53:36.000000000 +0100
+@@ -442,7 +442,7 @@ static void rebuild_matrix(int samples)
+ 	if (option_debug)
+ 		ast_log(LOG_DEBUG, "Resetting translation matrix\n");
+ 
+-	bzero(tr_matrix, sizeof(tr_matrix));
++	memset(tr_matrix, 0, sizeof(tr_matrix));
+ 
+ 	/* first, compute all direct costs */
+ 	AST_LIST_TRAVERSE(&translators, t, list) {
diff --git a/package/asterisk/patches/patch-menuselect-tree b/package/asterisk/patches/patch-menuselect-tree
new file mode 100644
index 000000000..6bac1894d
--- /dev/null
+++ b/package/asterisk/patches/patch-menuselect-tree
@@ -0,0 +1,12 @@
+--- asterisk-1.4.27.1.orig/menuselect-tree	2009-11-30 19:30:41.000000000 +0100
++++ asterisk-1.4.27.1/menuselect-tree	2009-12-03 20:55:04.000000000 +0100
+@@ -59,9 +59,6 @@
+ <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
+ 	<depend>dahdi</depend>
+ </member>
+-<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
+-        <depend>chan_local</depend>
+-</member>
+ <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
+ </member>
+ <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
diff --git a/package/asterisk/patches/patch-res_res_features_c b/package/asterisk/patches/patch-res_res_features_c
new file mode 100644
index 000000000..a237fbf97
--- /dev/null
+++ b/package/asterisk/patches/patch-res_res_features_c
@@ -0,0 +1,11 @@
+--- asterisk-1.4.27.1.orig/res/res_features.c	2009-10-20 19:46:37.000000000 +0200
++++ asterisk-1.4.27.1/res/res_features.c	2009-12-03 20:53:57.000000000 +0100
+@@ -279,7 +279,7 @@ static void *ast_bridge_call_thread(void
+ 	ast_bridge_call(tobj->peer, tobj->chan, &tobj->bconfig);
+ 	ast_hangup(tobj->chan);
+ 	ast_hangup(tobj->peer);
+-	bzero(tobj, sizeof(*tobj)); /*! \todo XXX for safety */
++	memset(tobj, 0, sizeof(*tobj)); /*! \todo XXX for safety */
+ 	free(tobj);
+ 	return NULL;
+ }
-- 
cgit v1.2.3


From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 19 Dec 2009 22:53:46 +0059
Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all
 Makefiles

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 package/asterisk/Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'package/asterisk')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index ecb33b52d..228707faf 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -6,6 +6,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		asterisk
 PKG_VERSION:=		1.4.27.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses openssl zlib curl popt
+ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),)
+PKG_BUILDDEP+=		speex
+endif
+ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),)
+PKG_BUILDDEP+=		postgresql
+endif
 PKG_MD5SUM:=		e09ca163a6e90018c92c65a50b9ec398
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
-- 
cgit v1.2.3


From 4749aa09f3677a0c92cf8c64bc914887fdde8841 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 20 Dec 2009 18:17:13 +0100
Subject: fix some dependencies and descriptions

---
 package/asterisk/Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'package/asterisk')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 228707faf..87b47015e 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -21,16 +21,22 @@ PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.asterisk.org
 PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
+PKG_DEPENDS_MAIN:=		asterisk
+PKG_DESCR_CHAN_MGCP:=		Media Gateway Control Protocol implementation
+PKG_DESCR_CHAN_SKINNY:=		Skinny Client Control Protocol implementation
+PKG_DESCR_CHAN_IAX2:=		Support for the Inter Asterisk Protocol
+PKG_DESCR_CODEC_SPEEX:=		Speex/PCM16 Codec Translator
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_MGCP},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_SKINNY},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_IAX2},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_SPEEX},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-- 
cgit v1.2.3


From b11d3a635ac903eb013409aebaec4c9b91026056 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 20 Dec 2009 20:15:51 +0100
Subject: fix all TARGET/HOST dependencies

expand TARGET logic for ! values
---
 package/asterisk/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'package/asterisk')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 87b47015e..7dd463cac 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -21,6 +21,8 @@ PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.asterisk.org
 PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
+PKG_TARGET_DEPENDS:=	!foxboard
+
 PKG_DEPENDS_MAIN:=		asterisk
 PKG_DESCR_CHAN_MGCP:=		Media Gateway Control Protocol implementation
 PKG_DESCR_CHAN_SKINNY:=		Skinny Client Control Protocol implementation
-- 
cgit v1.2.3


From ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 23 Dec 2009 11:37:42 +0100
Subject: remove and ignore autogenerated Config.in files

---
 package/asterisk/Config.in | 97 ----------------------------------------------
 1 file changed, 97 deletions(-)
 delete mode 100644 package/asterisk/Config.in

(limited to 'package/asterisk')

diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in
deleted file mode 100644
index 3cac88628..000000000
--- a/package/asterisk/Config.in
+++ /dev/null
@@ -1,97 +0,0 @@
-config ADK_PACKAGE_ASTERISK
-	bool "asterisk................... Telephony server"
-	depends on !ADK_LINUX_CRIS_FOXBOARD
-        select ADK_PACKAGE_LIBCURL
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-
-menu "asterisk-modules.................. Additional modules for Asterisk"
-depends on ADK_PACKAGE_ASTERISK
-
-config ADK_PACKAGE_ASTERISK_CHAN_MGCP
-	prompt   "asterisk-chan-mgcp.............. Media Gateway Control Protocol implementation"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Media Gateway Control Protocol implementation for Asterisk
-
-config ADK_PACKAGE_ASTERISK_CHAN_SKINNY
-	prompt   "asterisk-chan-skinny............ Skinny Client Control Protocol implementation"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Skinny Client Control Protocol implementation for Asterisk
-
-config ADK_PACKAGE_ASTERISK_CHAN_IAX2
-	prompt   "asterisk-chan-iax2.............. Support for the Inter Asterisk Protocol"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  IAX2 allows trunking communication channels together.
-
-	  Contains:
-	  * chan_iax2.so
-
-config ADK_PACKAGE_ASTERISK_CODEC_SPEEX
-	prompt   "asterisk-codec-speex............ Speex/PCM16 Codec Translator"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	select ADK_PACKAGE_LIBSPEEX
-	help
-	  The Speex speech compression codec for Asterisk
-
-config ADK_PACKAGE_ASTERISK_CODEC_GSM
-	prompt   "asterisk-codec-gsm.............. GSM Codec"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  The GSM codec for Asterisk
-
-config ADK_PACKAGE_ASTERISK_PBX_DUNDI
-	prompt   "asterisk-pbx-dundi.............. Distributed Universal Number Discovery (DUNDi) support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Distributed Universal Number Discovery (DUNDi) support for Asterisk
-
-config ADK_PACKAGE_ASTERISK_RES_AGI
-	prompt   "asterisk-res-agi................ Asterisk Gateway Interface module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Asterisk Gateway Interface module
-
-config ADK_PACKAGE_ASTERISK_PGSQL
-	prompt   "asterisk-pgsql.................. PostgreSQL modules"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	select ADK_PACKAGE_LIBPQ
-	help
-	  PostgreSQL modules for Asterisk
-
-config ADK_PACKAGE_ASTERISK_SOUNDS
-	prompt   "asterisk-sounds................. Sound files"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Sound files for Asterisk
-
-config ADK_PACKAGE_ASTERISK_VOICEMAIL
-	prompt   "asterisk-voicemail.............. Voicemail support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Voicemail related modules for Asterisk
-
-endmenu
-- 
cgit v1.2.3


From dd163e09b582177ce54fae44b63b10579ee0746d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 27 Dec 2009 23:09:19 +0100
Subject: fix make allmodconfig

update several packages, remove snort-wireless.
---
 package/asterisk/Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'package/asterisk')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 7dd463cac..c66f4c7e5 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,8 +4,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.27.1
+PKG_VERSION:=		1.4.28
 PKG_RELEASE:=		1
+PKG_MD5SUM:=		e8006ce319e18ce07ce1335ad583330a
+PKG_DESCR:=		Open Source PBX
+PKG_SECTION:=		net
+PKG_MULTI:=		1
+PKG_NOPARALLEL:=	1
+PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
 PKG_BUILDDEP+=		ncurses openssl zlib curl popt
 ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),)
 PKG_BUILDDEP+=		speex
@@ -13,17 +19,12 @@ endif
 ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),)
 PKG_BUILDDEP+=		postgresql
 endif
-PKG_MD5SUM:=		e09ca163a6e90018c92c65a50b9ec398
-PKG_DESCR:=		Open Source PBX
-PKG_SECTION:=		net
-PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
-PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.asterisk.org
 PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
 PKG_TARGET_DEPENDS:=	!foxboard
 
-PKG_DEPENDS_MAIN:=		asterisk
+#PKG_DEPENDS_MAIN:=		asterisk
 PKG_DESCR_CHAN_MGCP:=		Media Gateway Control Protocol implementation
 PKG_DESCR_CHAN_SKINNY:=		Skinny Client Control Protocol implementation
 PKG_DESCR_CHAN_IAX2:=		Support for the Inter Asterisk Protocol
@@ -38,7 +39,7 @@ $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_
 $(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_MGCP},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_SKINNY},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_IAX2},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_SPEEX},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CODEC_SPEEX},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-- 
cgit v1.2.3


From 0d9e15f4338505fa10d67aa995a00b2a45d201ce Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 Jan 2010 11:29:04 +0100
Subject: reworking startup using devtmpfs

After this change it is not needed to create
console, tty and null device nodes for nfsroot boot.
---
 package/asterisk/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'package/asterisk')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index c66f4c7e5..2a9fa679e 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -24,7 +24,6 @@ PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
 PKG_TARGET_DEPENDS:=	!foxboard
 
-#PKG_DEPENDS_MAIN:=		asterisk
 PKG_DESCR_CHAN_MGCP:=		Media Gateway Control Protocol implementation
 PKG_DESCR_CHAN_SKINNY:=		Skinny Client Control Protocol implementation
 PKG_DESCR_CHAN_IAX2:=		Support for the Inter Asterisk Protocol
-- 
cgit v1.2.3


From f5b49128645669ad0bb2a73a47d76003ab4d5dc8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 Jan 2010 15:30:33 +0100
Subject: update asterisk to latest upstream

unfortunately asterisk 1.4.x just segfaults on startup
on mips board. 1.6.x works out of the box, so update
to latest version.
---
 package/asterisk/Makefile                          | 119 ++++++++++++---------
 package/asterisk/files/asterisk.init               |   5 +-
 package/asterisk/patches/patch-apps__moduleinfo    |  13 ---
 .../asterisk/patches/patch-channels_chan_iax2_c    |  20 ----
 package/asterisk/patches/patch-channels_chan_oss_c |  37 -------
 package/asterisk/patches/patch-codecs_gsm_Makefile |  66 ------------
 package/asterisk/patches/patch-main_astobj2_c      |  11 --
 package/asterisk/patches/patch-main_translate_c    |  11 --
 package/asterisk/patches/patch-menuselect-tree     |  12 ---
 package/asterisk/patches/patch-res_res_features_c  |  11 --
 10 files changed, 73 insertions(+), 232 deletions(-)
 delete mode 100644 package/asterisk/patches/patch-apps__moduleinfo
 delete mode 100644 package/asterisk/patches/patch-channels_chan_iax2_c
 delete mode 100644 package/asterisk/patches/patch-channels_chan_oss_c
 delete mode 100644 package/asterisk/patches/patch-codecs_gsm_Makefile
 delete mode 100644 package/asterisk/patches/patch-main_astobj2_c
 delete mode 100644 package/asterisk/patches/patch-main_translate_c
 delete mode 100644 package/asterisk/patches/patch-menuselect-tree
 delete mode 100644 package/asterisk/patches/patch-res_res_features_c

(limited to 'package/asterisk')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 2a9fa679e..86d311c83 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.28
+PKG_VERSION:=		1.6.2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e8006ce319e18ce07ce1335ad583330a
+PKG_MD5SUM:=		8fbc60f9d80e686c749ae95292e225d8
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_MULTI:=		1
@@ -24,10 +24,10 @@ PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
 PKG_TARGET_DEPENDS:=	!foxboard
 
-PKG_DESCR_CHAN_MGCP:=		Media Gateway Control Protocol implementation
-PKG_DESCR_CHAN_SKINNY:=		Skinny Client Control Protocol implementation
-PKG_DESCR_CHAN_IAX2:=		Support for the Inter Asterisk Protocol
-PKG_DESCR_CODEC_SPEEX:=		Speex/PCM16 Codec Translator
+PKG_DESCR_CHAN_MGCP:=	Media Gateway Control Protocol implementation
+PKG_DESCR_CHAN_SKINNY:=	Skinny Client Control Protocol implementation
+PKG_DESCR_CHAN_IAX2:=	Support for the Inter Asterisk Protocol
+PKG_DESCR_CODEC_SPEEX:=	Speex/PCM16 Codec Translator
 
 include $(TOPDIR)/mk/package.mk
 
@@ -64,27 +64,31 @@ endif
 CONFIGURE_ARGS=		--with-z=${STAGING_DIR}/usr \
 			--with-ncurses=${STAGING_DIR}/usr \
 			--with-ssl=${STAGING_DIR}/usr \
-			--without-zaptel \
+			--disable-xmldoc \
 			--without-tonezone \
 			--without-asound \
 			--without-curses \
-			--without-gnutls \
+			--without-gtk \
+			--without-gtk2 \
 			--without-h323 \
 			--without-iksemel \
 			--without-imap \
-			--without-kde \
 			--without-nbs \
 			--without-netsnmp \
 			--without-newt \
-			--without-odbc \
 			--without-osptk \
 			--without-oss \
+			--without-popt \
 			--without-pri \
 			--without-pwlib \
 			--without-tds \
 			--without-termcap \
 			--without-tinfo \
-			--without-vpb
+			--without-vpb \
+			--without-misdn \
+			--without-isdnnet \
+			--without-suppserv
+
 ifneq (${ADK_PACKAGE_ASTERISK_CODEC_GSM},)
 CONFIGURE_ARGS+=	--with-gsm=internal
 else
@@ -109,17 +113,9 @@ CONFIGURE_ARGS+=	--with-postgres=${STAGING_DIR}/usr
 else
 CONFIGURE_ARGS+=	--without-postgres
 endif
-ifneq (${ADK_PACKAGE_LIBPOPT},)
-CONFIGURE_ARGS+=	--with-popt=${STAGING_DIR}/usr
-else
-CONFIGURE_ARGS+=	--without-popt
-endif
-CONFIGURE_ARGS+=	--without-misdn \
-			--without-isdnnet \
-			--without-suppserv
 
+TLDFLAGS+=		-lm
 CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		STRIP=${STRIP}
 BUILD_STYLE:=		auto
 MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TLDFLAGS}"
@@ -131,13 +127,12 @@ MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 ALL_TARGET:=		all install samples
 
 pre-configure:
-	rm ${WRKBUILD}/apps/app_followme.c
 	cd "$(WRKBUILD)/menuselect"; ./configure 
 
 post-build:
 	cd ${WRKBUILD}/sounds ; \
-	tar xzf asterisk-core-sounds-en-gsm-1.4.16.tar.gz ; \
-	rm asterisk-core-sounds-en-gsm-1.4.16.tar.gz
+	tar xzf asterisk-core-sounds-en-gsm-1.4.17.tar.gz ; \
+	rm asterisk-core-sounds-en-gsm-1.4.17.tar.gz
 	@echo
 	@echo "---> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <---"
 	@echo
@@ -156,8 +151,9 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 		rm -rf mohmp3/*.mp3; \
 		rm -rf sounds/*; \
 		cd modules; \
-		rm -rf	*adsi* *festival* *modem* *meetme* *oss* *phone* *intercom* \
-			*mp3* *nbscat* *mysql* *postgres* *pgsql* *voicemail* *speex* \
+		rm -rf	*adsi* *festival* *modem* *meetme* *oss* \
+			*phone* *intercom* *mp3* *nbscat* *mysql* \
+			*postgres* *pgsql* *voicemail* *speex* \
 			*zapateller* *jpeg*; \
 		rm -f chan_bluetooth.so ; \
 		rm -f chan_h323.so ; \
@@ -171,80 +167,105 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 		rm -f res_agi.so ; \
 	)
 	(cd $(IDIR_ASTERISK)/etc/asterisk; \
-		rm -f 	*iax* *odbc* *mysql* *postgres* *pgsql* *voicemail* *adsi* *oss* *alsa* \
-			*festival* *modem* *meetme* *phone* *tds* *vofr* *rpt* *vpb* \
+		rm -f 	*iax* *odbc* *mysql* *postgres* *pgsql* \
+			*voicemail* *adsi* *oss* *alsa* \
+			*festival* *modem* *meetme* *phone* *tds* \
+			*vofr* *rpt* *vpb* \
 			*zapata*; \
 		rm -f bluetooth.conf ; \
 		rm -f mgcp.conf ; \
+		rm -f gtalk.conf ; \
 		rm -f skinny.conf ; \
 		rm -f dundi.conf ; \
 	)
 	${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/
-	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(WRKINST)/etc/asterisk/musiconhold.conf
+	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' \
+		$(WRKINST)/etc/asterisk/musiconhold.conf
 
 asterisk-pgsql-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample $(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample \
+		$(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so \
+		$(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
 
 asterisk-sounds-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds
-	$(CP) $(WRKBUILD)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/
+	$(CP) $(WRKBUILD)/sounds/* \
+		$(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/
 	rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/*.mp3
 	rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/vm-*
 
 asterisk-voicemail-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk
 	${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules
-	${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
-	${CP} $(WRKBUILD)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
-	${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
+	${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample \
+		$(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
+	${CP} $(WRKBUILD)/apps/*voicemail.so \
+		$(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so \
+		$(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
 	${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds
-	$(CP) $(WRKBUILD)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/
+	$(CP) $(WRKBUILD)/sounds/vm-*.gsm \
+		$(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/
 
 asterisk-chan-mgcp-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/mgcp.conf.sample $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk/mgcp.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/mgcp.conf.sample \
+		$(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk/mgcp.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/channels/chan_mgcp.so $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/channels/chan_mgcp.so \
+		$(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules/
 
 asterisk-chan-skinny-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/skinny.conf.sample $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/skinny.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/skinny.conf.sample \
+		$(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/skinny.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/channels/chan_skinny.so $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/channels/chan_skinny.so \
+		$(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/
 
 asterisk-chan-iax2-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules
-	${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iax.conf
-	${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iaxprov.conf
-	${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/
+	${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample \
+		$(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iax.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample \
+		$(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iaxprov.conf
+	${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so \
+		$(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/
 
 asterisk-codec-speex-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so \
+		$(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
 
 asterisk-codec-gsm-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
-	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_gsm.so $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_gsm.so \
+		$(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
 
 asterisk-pbx-dundi-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/dundi.conf.sample $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/dundi.conf.sample \
+		$(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/pbx/pbx_dundi.so $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/pbx/pbx_dundi.so \
+		$(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules/
 
 asterisk-res-agi-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/agi-bin
 	${INSTALL_DIR} $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/res/res_agi.so $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/res/res_agi.so \
+		$(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules/
 
 asterisk-meetme-install:
 	${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/etc/asterisk/
 	${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
-	${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample ${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf
-	${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
+	${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample \
+		${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf
+	${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so \
+		${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/asterisk/files/asterisk.init b/package/asterisk/files/asterisk.init
index 01a4edd51..d11a1f1b1 100644
--- a/package/asterisk/files/asterisk.init
+++ b/package/asterisk/files/asterisk.init
@@ -10,13 +10,14 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	[ -d /var/run ] || mkdir -p /var/run
+	[ -d /var/run/asterisk ] || mkdir -p /var/run/asterisk
 	[ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
 	[ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk
 	/usr/sbin/asterisk 
 	;;
 stop)
-	[ -f /var/run/asterisk.pid ] && kill $(cat /var/run/asterisk.pid) >/dev/null 2>&1
+	[ -f /var/run/asterisk/asterisk.pid ] && \
+		kill $(cat /var/run/asterisk/asterisk.pid) >/dev/null 2>&1
 	;;
 restart)
 	sh $0 stop
diff --git a/package/asterisk/patches/patch-apps__moduleinfo b/package/asterisk/patches/patch-apps__moduleinfo
deleted file mode 100644
index efbdcae4a..000000000
--- a/package/asterisk/patches/patch-apps__moduleinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- asterisk-1.4.24.1.orig/apps/.moduleinfo	2009-04-02 19:44:22.000000000 +0200
-+++ asterisk-1.4.24.1/apps/.moduleinfo	2009-05-12 16:07:52.000000000 +0200
-@@ -56,9 +56,6 @@
- <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- 	<depend>dahdi</depend>
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--        <depend>chan_local</depend>
--</member>
- <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
- <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
diff --git a/package/asterisk/patches/patch-channels_chan_iax2_c b/package/asterisk/patches/patch-channels_chan_iax2_c
deleted file mode 100644
index f39c2bf5b..000000000
--- a/package/asterisk/patches/patch-channels_chan_iax2_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- asterisk-1.4.27.1.orig/channels/chan_iax2.c	2009-11-10 18:15:57.000000000 +0100
-+++ asterisk-1.4.27.1/channels/chan_iax2.c	2009-12-03 20:57:05.000000000 +0100
-@@ -7076,7 +7076,7 @@ static int try_transfer(struct chan_iax2
- 	
- 	memset(&ied, 0, sizeof(ied));
- 	if (ies->apparent_addr)
--		bcopy(ies->apparent_addr, &new, sizeof(new));
-+		memcpy(&new, ies->apparent_addr, sizeof(new));
- 	if (ies->callno)
- 		newcall = ies->callno;
- 	if (!newcall || !new.sin_addr.s_addr || !new.sin_port) {
-@@ -7235,7 +7235,7 @@ static int iax2_ack_registry(struct iax_
- 
- 	memset(&us, 0, sizeof(us));
- 	if (ies->apparent_addr)
--		bcopy(ies->apparent_addr, &us, sizeof(us));
-+		memcpy(&us, ies->apparent_addr, sizeof(us));
- 	if (ies->username)
- 		ast_copy_string(peer, ies->username, sizeof(peer));
- 	if (ies->refresh)
diff --git a/package/asterisk/patches/patch-channels_chan_oss_c b/package/asterisk/patches/patch-channels_chan_oss_c
deleted file mode 100644
index 33e9aaad7..000000000
--- a/package/asterisk/patches/patch-channels_chan_oss_c
+++ /dev/null
@@ -1,37 +0,0 @@
---- asterisk-1.4.27.1.orig/channels/chan_oss.c	2009-08-10 21:15:57.000000000 +0200
-+++ asterisk-1.4.27.1/channels/chan_oss.c	2009-12-03 20:58:13.000000000 +0100
-@@ -562,7 +562,7 @@ static void send_sound(struct chan_oss_p
- 				l = FRAME_SIZE - ofs;
- 			if (l > s->datalen - start)	/* don't overflow the source */
- 				l = s->datalen - start;
--			bcopy(s->data + start, myframe + ofs, l * 2);
-+			memcpy(myframe + ofs, s->data + start, l * 2);
- 			if (0)
- 				ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs);
- 			l_sampsent += l;
-@@ -573,14 +573,14 @@ static void send_sound(struct chan_oss_p
- 			if (l > 0) {
- 				if (l > FRAME_SIZE - ofs)
- 					l = FRAME_SIZE - ofs;
--				bcopy(silence, myframe + ofs, l * 2);
-+				memcpy(myframe + ofs, silence, l * 2);
- 				l_sampsent += l;
- 			} else {			/* silence is over, restart sound if loop */
- 				if (s->repeat == 0) {	/* last block */
- 					o->cursound = -1;
- 					o->nosound = 0;	/* allow audio data */
- 					if (ofs < FRAME_SIZE)	/* pad with silence */
--						bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2);
-+						memcpy(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2);
- 				}
- 				l_sampsent = 0;
- 			}
-@@ -905,7 +905,7 @@ static struct ast_frame *oss_read(struct
- 
- 	/* XXX can be simplified returning &ast_null_frame */
- 	/* prepare a NULL frame in case we don't have enough data to return */
--	bzero(f, sizeof(struct ast_frame));
-+	memset(f, 0, sizeof(struct ast_frame));
- 	f->frametype = AST_FRAME_NULL;
- 	f->src = oss_tech.type;
- 
diff --git a/package/asterisk/patches/patch-codecs_gsm_Makefile b/package/asterisk/patches/patch-codecs_gsm_Makefile
deleted file mode 100644
index 82653cc9b..000000000
--- a/package/asterisk/patches/patch-codecs_gsm_Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-disable uname -m checks 
---- asterisk-1.4.26.orig/codecs/gsm/Makefile	2008-11-19 22:34:47.000000000 +0100
-+++ asterisk-1.4.26/codecs/gsm/Makefile	2009-08-21 12:29:21.450418652 +0200
-@@ -37,13 +37,13 @@ WAV49	= -DWAV49
- ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
- ######### probably require gcc. 
- 
--ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
--ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
--ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
--OPTIMIZE+=-march=$(PROC)
--endif
--endif
--endif
-+#ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
-+#ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
-+#ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
-+#OPTIMIZE+=-march=$(PROC)
-+#endif
-+#endif
-+#endif
- 
- #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.
-@@ -207,13 +207,13 @@ GSM_SOURCES =	$(SRC)/add.c		\
- # add k6-specific code only if not on a non-k6 hardware or proc.
- # XXX Keep a space after each findstring argument
- # XXX should merge with GSM_OBJECTS
--ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
--GSM_SOURCES+= $(SRC)/k6opt.s
--endif
--endif
--endif
-+#ifeq ($(OSARCH),linux-gnu)
-+#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-+#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
-+#GSM_SOURCES+= $(SRC)/k6opt.s
-+#endif
-+#endif
-+#endif
- 
- TOAST_SOURCES = $(SRC)/toast.c 		\
- 		$(SRC)/toast_lin.c	\
-@@ -259,13 +259,13 @@ GSM_OBJECTS =	$(SRC)/add.o		\
- 		$(SRC)/short_term.o	\
- 		$(SRC)/table.o
- 
--ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
--GSM_OBJECTS+= $(SRC)/k6opt.o
--endif
--endif
--endif
-+#ifeq ($(OSARCH),linux-gnu)
-+#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
-+#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
-+#GSM_OBJECTS+= $(SRC)/k6opt.o
-+#endif
-+#endif
-+#endif
- 
- TOAST_OBJECTS =	$(SRC)/toast.o 		\
- 		$(SRC)/toast_lin.o	\
diff --git a/package/asterisk/patches/patch-main_astobj2_c b/package/asterisk/patches/patch-main_astobj2_c
deleted file mode 100644
index d8aaf114b..000000000
--- a/package/asterisk/patches/patch-main_astobj2_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- asterisk-1.4.27.1.orig/main/astobj2.c	2009-10-06 03:16:36.000000000 +0200
-+++ asterisk-1.4.27.1/main/astobj2.c	2009-12-03 20:54:12.000000000 +0100
-@@ -236,7 +236,7 @@ int ao2_ref(void *user_data, const int d
- 		/* for safety, zero-out the astobj2 header and also the
- 		 * first word of the user-data, which we make sure is always
- 		 * allocated. */
--		bzero(obj, sizeof(struct astobj2 *) + sizeof(void *) );
-+		memset(obj, 0, sizeof(struct astobj2 *) + sizeof(void *) );
- 		free(obj);
- 	}
- 
diff --git a/package/asterisk/patches/patch-main_translate_c b/package/asterisk/patches/patch-main_translate_c
deleted file mode 100644
index 36d7c3058..000000000
--- a/package/asterisk/patches/patch-main_translate_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- asterisk-1.4.27.1.orig/main/translate.c	2009-10-21 18:44:49.000000000 +0200
-+++ asterisk-1.4.27.1/main/translate.c	2009-12-03 20:53:36.000000000 +0100
-@@ -442,7 +442,7 @@ static void rebuild_matrix(int samples)
- 	if (option_debug)
- 		ast_log(LOG_DEBUG, "Resetting translation matrix\n");
- 
--	bzero(tr_matrix, sizeof(tr_matrix));
-+	memset(tr_matrix, 0, sizeof(tr_matrix));
- 
- 	/* first, compute all direct costs */
- 	AST_LIST_TRAVERSE(&translators, t, list) {
diff --git a/package/asterisk/patches/patch-menuselect-tree b/package/asterisk/patches/patch-menuselect-tree
deleted file mode 100644
index 6bac1894d..000000000
--- a/package/asterisk/patches/patch-menuselect-tree
+++ /dev/null
@@ -1,12 +0,0 @@
---- asterisk-1.4.27.1.orig/menuselect-tree	2009-11-30 19:30:41.000000000 +0100
-+++ asterisk-1.4.27.1/menuselect-tree	2009-12-03 20:55:04.000000000 +0100
-@@ -59,9 +59,6 @@
- <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- 	<depend>dahdi</depend>
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--        <depend>chan_local</depend>
--</member>
- <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
- <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
diff --git a/package/asterisk/patches/patch-res_res_features_c b/package/asterisk/patches/patch-res_res_features_c
deleted file mode 100644
index a237fbf97..000000000
--- a/package/asterisk/patches/patch-res_res_features_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- asterisk-1.4.27.1.orig/res/res_features.c	2009-10-20 19:46:37.000000000 +0200
-+++ asterisk-1.4.27.1/res/res_features.c	2009-12-03 20:53:57.000000000 +0100
-@@ -279,7 +279,7 @@ static void *ast_bridge_call_thread(void
- 	ast_bridge_call(tobj->peer, tobj->chan, &tobj->bconfig);
- 	ast_hangup(tobj->chan);
- 	ast_hangup(tobj->peer);
--	bzero(tobj, sizeof(*tobj)); /*! \todo XXX for safety */
-+	memset(tobj, 0, sizeof(*tobj)); /*! \todo XXX for safety */
- 	free(tobj);
- 	return NULL;
- }
-- 
cgit v1.2.3


From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Feb 2010 20:03:20 +0100
Subject: change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
---
 package/asterisk/Makefile               |  8 +++++---
 package/asterisk/patches/patch-Makefile | 13 +++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 package/asterisk/patches/patch-Makefile

(limited to 'package/asterisk')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 86d311c83..7f042b7f4 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -114,14 +114,13 @@ else
 CONFIGURE_ARGS+=	--without-postgres
 endif
 
+INSTALL_STYLE:=		manual
+
 TLDFLAGS+=		-lm
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
 MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TLDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 			OPTIMIZE="${TARGET_OPTIMIZATION}" \
-			CXX="${TARGET_CC}" \
 			STRIP="${TARGET_CROSS}strip" \
 			NOISY_BUILD=1
 ALL_TARGET:=		all install samples
@@ -129,6 +128,9 @@ ALL_TARGET:=		all install samples
 pre-configure:
 	cd "$(WRKBUILD)/menuselect"; ./configure 
 
+pre-build:
+	$(MAKE) -C $(WRKBUILD)/menuselect
+
 post-build:
 	cd ${WRKBUILD}/sounds ; \
 	tar xzf asterisk-core-sounds-en-gsm-1.4.17.tar.gz ; \
diff --git a/package/asterisk/patches/patch-Makefile b/package/asterisk/patches/patch-Makefile
new file mode 100644
index 000000000..1ba02c900
--- /dev/null
+++ b/package/asterisk/patches/patch-Makefile
@@ -0,0 +1,13 @@
+--- asterisk-1.6.2.1.orig/Makefile	2009-12-10 22:04:20.000000000 +0100
++++ asterisk-1.6.2.1/Makefile	2010-02-05 21:05:41.313084404 +0100
+@@ -366,8 +366,8 @@ makeopts: configure
+ 	@exit 1
+ 
+ menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+-	menuselect/menuselect --check-deps $@
+-	menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
++	./menuselect/menuselect --check-deps $@
++	./menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+ 
+ $(MOD_SUBDIRS_EMBED_LDSCRIPT):
+ 	+@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
-- 
cgit v1.2.3


From c094aedfa1298a823b0f88045c30509596454081 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 14 Feb 2010 11:22:49 +0100
Subject: fix compile for foxboard

---
 package/asterisk/patches/patch-apps_app_followme_c | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/asterisk/patches/patch-apps_app_followme_c

(limited to 'package/asterisk')

diff --git a/package/asterisk/patches/patch-apps_app_followme_c b/package/asterisk/patches/patch-apps_app_followme_c
new file mode 100644
index 000000000..8ecfa9226
--- /dev/null
+++ b/package/asterisk/patches/patch-apps_app_followme_c
@@ -0,0 +1,26 @@
+--- asterisk-1.6.2.1.orig/apps/app_followme.c	2009-09-15 18:06:24.000000000 +0200
++++ asterisk-1.6.2.1/apps/app_followme.c	2010-02-14 10:33:51.540422962 +0100
+@@ -172,7 +172,9 @@ static int ynlongest = 0;
+ 
+ static const char *featuredigittostr;
+ static int featuredigittimeout = 5000;		/*!< Feature Digit Timeout */
+-static const char *defaultmoh = "default";    	/*!< Default Music-On-Hold Class */
++static const char *defaultmoh;		    	/*!< Default Music-On-Hold Class */
++
++
+ 
+ static char takecall[20] = "1", nextindp[20] = "2";
+ static char callfromprompt[PATH_MAX] = "followme/call-from";
+@@ -236,6 +238,7 @@ static struct call_followme *alloc_profi
+ 
+ static void init_profile(struct call_followme *f)
+ {
++	defaultmoh = "default";
+ 	f->active = 1;
+ 	ast_copy_string(f->moh, defaultmoh, sizeof(f->moh));
+ }
+@@ -1195,3 +1198,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MO
+ 		.unload = unload_module,
+ 		.reload = reload,
+ 	       );
++
-- 
cgit v1.2.3


From db449d89ef9220149a16dbee5ea3074e6bef0a79 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 14 Feb 2010 11:23:59 +0100
Subject: remove unused workaround

---
 package/asterisk/Makefile | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'package/asterisk')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 7f042b7f4..bebd71ef9 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -22,8 +22,6 @@ endif
 PKG_URL:=		http://www.asterisk.org
 PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
-PKG_TARGET_DEPENDS:=	!foxboard
-
 PKG_DESCR_CHAN_MGCP:=	Media Gateway Control Protocol implementation
 PKG_DESCR_CHAN_SKINNY:=	Skinny Client Control Protocol implementation
 PKG_DESCR_CHAN_IAX2:=	Support for the Inter Asterisk Protocol
@@ -56,11 +54,6 @@ SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+=	asterisk-codec-gsm-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+=	asterisk-pbx-dundi-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+=		asterisk-res-agi-install
 
-#workaround for cris and gcc 4.4, where -Os generates ICE
-ifeq ($(ARCH),cris)
-TARGET_OPTIMIZATION:=$(subst Os,O2,$(TARGET_OPTIMIZATION))
-endif
-
 CONFIGURE_ARGS=		--with-z=${STAGING_DIR}/usr \
 			--with-ncurses=${STAGING_DIR}/usr \
 			--with-ssl=${STAGING_DIR}/usr \
-- 
cgit v1.2.3


From 9427b30b394ab907009007aeb415db0f1eeaab03 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:15:44 +0100
Subject: update to latest upstream version

---
 package/asterisk/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/asterisk')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index bebd71ef9..595bae027 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.6.2.1
+PKG_VERSION:=		1.6.2.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8fbc60f9d80e686c749ae95292e225d8
+PKG_MD5SUM:=		9d1f7bcf6833605ced4b2740d14bd576
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_MULTI:=		1
-- 
cgit v1.2.3