update asterisk-addons-1.4.x to 1.4.8

git-svn-id: svn://svn.openwrt.org/openwrt/packages@16344 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
zandbelt 2009-06-04 20:40:31 +00:00
parent f4194916ae
commit 39ce43d5c6
4 changed files with 22 additions and 41 deletions

View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk-addons
PKG_VERSION:=1.4.7
PKG_RELEASE:=2
PKG_VERSION:=1.4.8
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.digium.com/pub/asterisk/releases/
PKG_MD5SUM:=3b14c147101c13ca6146c41870bad97a
PKG_MD5SUM:=d4e75c39f737b5ba2a75a4420e1a5a78
PKG_FIXUP = libtool

View File

@ -1,13 +1,13 @@
diff -Nru asterisk-addons-1.4.7.org/build_tools/menuselect-deps.in asterisk-addons-1.4.7/build_tools/menuselect-deps.in
--- asterisk-addons-1.4.7.org/build_tools/menuselect-deps.in 2007-05-14 18:22:44.000000000 +0200
+++ asterisk-addons-1.4.7/build_tools/menuselect-deps.in 2009-02-01 08:45:32.000000000 +0100
diff -Nru asterisk-addons-1.4.8.org/build_tools/menuselect-deps.in asterisk-addons-1.4.8/build_tools/menuselect-deps.in
--- asterisk-addons-1.4.8.org/build_tools/menuselect-deps.in 2007-05-14 18:22:44.000000000 +0200
+++ asterisk-addons-1.4.8/build_tools/menuselect-deps.in 2009-06-04 22:20:03.000000000 +0200
@@ -1,2 +1,3 @@
+BLUETOOTH=@PBX_BLUETOOTH@
MYSQLCLIENT=@PBX_MYSQLCLIENT@
ASTERISK=@PBX_ASTERISK@
diff -Nru asterisk-addons-1.4.7.org/channels/chan_mobile.c asterisk-addons-1.4.7/channels/chan_mobile.c
--- asterisk-addons-1.4.7.org/channels/chan_mobile.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-addons-1.4.7/channels/chan_mobile.c 2009-02-01 08:44:17.000000000 +0100
diff -Nru asterisk-addons-1.4.8.org/channels/chan_mobile.c asterisk-addons-1.4.8/channels/chan_mobile.c
--- asterisk-addons-1.4.8.org/channels/chan_mobile.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-addons-1.4.8/channels/chan_mobile.c 2009-06-04 22:20:03.000000000 +0200
@@ -0,0 +1,2150 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
@ -2159,9 +2159,9 @@ diff -Nru asterisk-addons-1.4.7.org/channels/chan_mobile.c asterisk-addons-1.4.7
+ .load = load_module,
+ .unload = unload_module,
+);
diff -Nru asterisk-addons-1.4.7.org/configs/mobile.conf.sample asterisk-addons-1.4.7/configs/mobile.conf.sample
--- asterisk-addons-1.4.7.org/configs/mobile.conf.sample 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-addons-1.4.7/configs/mobile.conf.sample 2009-02-01 08:46:24.000000000 +0100
diff -Nru asterisk-addons-1.4.8.org/configs/mobile.conf.sample asterisk-addons-1.4.8/configs/mobile.conf.sample
--- asterisk-addons-1.4.8.org/configs/mobile.conf.sample 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-addons-1.4.8/configs/mobile.conf.sample 2009-06-04 22:20:03.000000000 +0200
@@ -0,0 +1,68 @@
+;
+; mobile.conf
@ -2231,9 +2231,9 @@ diff -Nru asterisk-addons-1.4.7.org/configs/mobile.conf.sample asterisk-addons-1
+port=1
+type=headset
+adapter=dlink
diff -Nru asterisk-addons-1.4.7.org/configure.ac asterisk-addons-1.4.7/configure.ac
--- asterisk-addons-1.4.7.org/configure.ac 2008-02-13 23:58:11.000000000 +0100
+++ asterisk-addons-1.4.7/configure.ac 2009-02-01 08:48:08.000000000 +0100
diff -Nru asterisk-addons-1.4.8.org/configure.ac asterisk-addons-1.4.8/configure.ac
--- asterisk-addons-1.4.8.org/configure.ac 2008-02-13 23:58:11.000000000 +0100
+++ asterisk-addons-1.4.8/configure.ac 2009-06-04 22:20:03.000000000 +0200
@@ -161,11 +161,13 @@
# from here on down, library checking should be done in alphabetical order
# by the --with option name, to make things easier for the users :-)
@ -2248,9 +2248,9 @@ diff -Nru asterisk-addons-1.4.7.org/configure.ac asterisk-addons-1.4.7/configure
AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
diff -Nru asterisk-addons-1.4.7.org/makeopts.in asterisk-addons-1.4.7/makeopts.in
--- asterisk-addons-1.4.7.org/makeopts.in 2008-02-13 23:58:11.000000000 +0100
+++ asterisk-addons-1.4.7/makeopts.in 2009-02-01 08:49:46.000000000 +0100
diff -Nru asterisk-addons-1.4.8.org/makeopts.in asterisk-addons-1.4.8/makeopts.in
--- asterisk-addons-1.4.8.org/makeopts.in 2008-02-13 23:58:11.000000000 +0100
+++ asterisk-addons-1.4.8/makeopts.in 2009-06-04 22:20:03.000000000 +0200
@@ -34,6 +34,9 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@

View File

@ -1,7 +1,7 @@
diff -Nru asterisk-addons-1.4.5.org/menuselect/Makefile asterisk-addons-1.4.5/menuselect/Makefile
--- asterisk-addons-1.4.5.org/menuselect/Makefile 2007-11-21 01:17:33.000000000 +0100
+++ asterisk-addons-1.4.5/menuselect/Makefile 2007-12-20 22:47:17.000000000 +0100
@@ -51,7 +51,7 @@
diff -Nru asterisk-addons-1.4.8.org/menuselect/Makefile asterisk-addons-1.4.8/menuselect/Makefile
--- asterisk-addons-1.4.8.org/menuselect/Makefile 2009-01-08 22:31:41.000000000 +0100
+++ asterisk-addons-1.4.8/menuselect/Makefile 2009-06-04 22:21:23.000000000 +0200
@@ -52,7 +52,7 @@
$(OBJS) menuselect_gtk.o menuselect_curses.o menuselect_stub.o: autoconfig.h menuselect.h
makeopts autoconfig.h: autoconfig.h.in makeopts.in

View File

@ -1,19 +0,0 @@
*** asterisk-addons-1.4.7/channels/ooh323c/src/ooCmdChannel.c.orig 2008-06-27 18:12:50.000000000 +0800
--- asterisk-addons-1.4.7/channels/ooh323c/src/ooCmdChannel.c 2008-06-27 18:12:11.000000000 +0800
***************
*** 37,43 ****
if ((ret = pipe(thePipe)) == -1) {
return OO_FAILED;
}
! pthread_mutex_init(&gCmdChanLock);
gH323ep.cmdSock = dup(thePipe[0]);
close(thePipe[0]);
--- 37,43 ----
if ((ret = pipe(thePipe)) == -1) {
return OO_FAILED;
}
! pthread_mutex_init(&gCmdChanLock, NULL);
gH323ep.cmdSock = dup(thePipe[0]);
close(thePipe[0]);