bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update asterisk-1.4.x to 1.4.25

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@16343 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
zandbelt 2009-06-04 20:39:59 +00:00
parent 99adb39991
commit f4194916ae
9 changed files with 54 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/asterisk-1.4.x/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk
PKG_VERSION:=1.4.24.1
PKG_VERSION:=1.4.25
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.digium.com/pub/asterisk/releases/
PKG_MD5SUM:=2b74744350f420b3a94d5323c489426f
PKG_MD5SUM:=260a577330d080cb9f1fa0b942d950a5
PKG_BUILD_DEPENDS:= libopenh323 pwlib

16
net/asterisk-1.4.x/patches/011-Makefile-main.patch
View File

@ -1,12 +1,12 @@
diff -Nru asterisk-1.4.22.org/main/Makefile asterisk-1.4.22/main/Makefile
--- asterisk-1.4.22.org/main/Makefile 2008-07-18 18:15:41.000000000 +0200
+++ asterisk-1.4.22/main/Makefile 2008-11-29 14:58:13.000000000 +0100
@@ -144,7 +144,7 @@
diff -Nru asterisk-1.4.25.org/main/Makefile asterisk-1.4.25/main/Makefile
--- asterisk-1.4.25.org/main/Makefile 2009-04-09 06:31:38.000000000 +0200
+++ asterisk-1.4.25/main/Makefile 2009-06-04 20:58:40.000000000 +0200
@@ -138,7 +138,7 @@
ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
else
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
endif
$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
clean::

8
net/asterisk-1.4.x/patches/013-chan_iax2-tmp_path.patch
View File

@ -1,7 +1,7 @@
diff -Nru asterisk-1.4.22.org/channels/chan_iax2.c asterisk-1.4.22/channels/chan_iax2.c
--- asterisk-1.4.22.org/channels/chan_iax2.c 2008-09-02 20:14:57.000000000 +0200
+++ asterisk-1.4.22/channels/chan_iax2.c 2008-11-29 15:00:00.000000000 +0100
@@ -1815,7 +1815,7 @@
diff -Nru asterisk-1.4.25.org/channels/chan_iax2.c asterisk-1.4.25/channels/chan_iax2.c
--- asterisk-1.4.25.org/channels/chan_iax2.c 2009-05-05 00:37:31.000000000 +0200
+++ asterisk-1.4.25/channels/chan_iax2.c 2009-06-04 21:01:25.000000000 +0200
@@ -1898,7 +1898,7 @@
last++;
else
last = s;

42
net/asterisk-1.4.x/patches/015-spandsp-app_fax.patch
View File

@ -1,6 +1,6 @@
diff -Nru asterisk-1.4.22.org/apps/app_rxfax.c asterisk-1.4.22/apps/app_rxfax.c
--- asterisk-1.4.22.org/apps/app_rxfax.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.4.22/apps/app_rxfax.c 2008-11-29 15:02:27.000000000 +0100
diff -Nru asterisk-1.4.25.org/apps/app_rxfax.c asterisk-1.4.25/apps/app_rxfax.c
--- asterisk-1.4.25.org/apps/app_rxfax.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.4.25/apps/app_rxfax.c 2009-06-04 21:04:59.000000000 +0200
@@ -0,0 +1,376 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
@ -378,9 +378,9 @@ diff -Nru asterisk-1.4.22.org/apps/app_rxfax.c asterisk-1.4.22/apps/app_rxfax.c
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Trivial FAX Receive Application");
+
+/*- End of file ------------------------------------------------------------*/
diff -Nru asterisk-1.4.22.org/apps/app_txfax.c asterisk-1.4.22/apps/app_txfax.c
--- asterisk-1.4.22.org/apps/app_txfax.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.4.22/apps/app_txfax.c 2008-11-29 15:02:27.000000000 +0100
diff -Nru asterisk-1.4.25.org/apps/app_txfax.c asterisk-1.4.25/apps/app_txfax.c
--- asterisk-1.4.25.org/apps/app_txfax.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.4.25/apps/app_txfax.c 2009-06-04 21:04:59.000000000 +0200
@@ -0,0 +1,303 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
@ -685,9 +685,9 @@ diff -Nru asterisk-1.4.22.org/apps/app_txfax.c asterisk-1.4.22/apps/app_txfax.c
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Trivial FAX Transmit Application");
+
+/*- End of file ------------------------------------------------------------*/
diff -Nru asterisk-1.4.22.org/build_tools/menuselect-deps.in asterisk-1.4.22/build_tools/menuselect-deps.in
--- asterisk-1.4.22.org/build_tools/menuselect-deps.in 2008-08-14 04:02:15.000000000 +0200
+++ asterisk-1.4.22/build_tools/menuselect-deps.in 2008-11-29 15:02:27.000000000 +0100
diff -Nru asterisk-1.4.25.org/build_tools/menuselect-deps.in asterisk-1.4.25/build_tools/menuselect-deps.in
--- asterisk-1.4.25.org/build_tools/menuselect-deps.in 2009-01-29 23:54:29.000000000 +0100
+++ asterisk-1.4.25/build_tools/menuselect-deps.in 2009-06-04 21:04:59.000000000 +0200
@@ -23,6 +23,7 @@
POPT=@PBX_POPT@
PRI=@PBX_PRI@
@ -696,10 +696,10 @@ diff -Nru asterisk-1.4.22.org/build_tools/menuselect-deps.in asterisk-1.4.22/bui
SPEEX=@PBX_SPEEX@
SPEEXDSP=@PBX_SPEEXDSP@
SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@
diff -Nru asterisk-1.4.22.org/configure.ac asterisk-1.4.22/configure.ac
--- asterisk-1.4.22.org/configure.ac 2008-09-08 18:26:00.000000000 +0200
+++ asterisk-1.4.22/configure.ac 2008-11-29 15:02:27.000000000 +0100
@@ -201,6 +201,7 @@
diff -Nru asterisk-1.4.25.org/configure.ac asterisk-1.4.25/configure.ac
--- asterisk-1.4.25.org/configure.ac 2009-04-22 23:35:03.000000000 +0200
+++ asterisk-1.4.25/configure.ac 2009-06-04 21:04:59.000000000 +0200
@@ -205,6 +205,7 @@
AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
@ -707,7 +707,7 @@ diff -Nru asterisk-1.4.22.org/configure.ac asterisk-1.4.22/configure.ac
AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp])
AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
@@ -1302,6 +1303,8 @@
@@ -1359,6 +1360,8 @@
AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
@ -716,9 +716,9 @@ diff -Nru asterisk-1.4.22.org/configure.ac asterisk-1.4.22/configure.ac
AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])
# See if the main speex library contains the preprocess functions
diff -Nru asterisk-1.4.22.org/include/asterisk/plc.h asterisk-1.4.22/include/asterisk/plc.h
--- asterisk-1.4.22.org/include/asterisk/plc.h 2006-06-14 16:12:56.000000000 +0200
+++ asterisk-1.4.22/include/asterisk/plc.h 2008-11-29 15:02:27.000000000 +0100
diff -Nru asterisk-1.4.25.org/include/asterisk/plc.h asterisk-1.4.25/include/asterisk/plc.h
--- asterisk-1.4.25.org/include/asterisk/plc.h 2006-06-14 16:12:56.000000000 +0200
+++ asterisk-1.4.25/include/asterisk/plc.h 2009-06-04 21:04:59.000000000 +0200
@@ -1,18 +1,17 @@
-/*! \file
- * \brief SpanDSP - a series of DSP components for telephony
@ -860,10 +860,10 @@ diff -Nru asterisk-1.4.22.org/include/asterisk/plc.h asterisk-1.4.22/include/ast
}
#endif
diff -Nru asterisk-1.4.22.org/makeopts.in asterisk-1.4.22/makeopts.in
--- asterisk-1.4.22.org/makeopts.in 2008-06-12 21:08:20.000000000 +0200
+++ asterisk-1.4.22/makeopts.in 2008-11-29 15:02:27.000000000 +0100
@@ -138,6 +138,9 @@
diff -Nru asterisk-1.4.25.org/makeopts.in asterisk-1.4.25/makeopts.in
--- asterisk-1.4.25.org/makeopts.in 2009-03-18 02:55:22.000000000 +0100
+++ asterisk-1.4.25/makeopts.in 2009-06-04 21:04:59.000000000 +0200
@@ -141,6 +141,9 @@
RADIUS_INCLUDE=@RADIUS_INCLUDE@
RADIUS_LIB=@RADIUS_LIB@

8
net/asterisk-1.4.x/patches/016-iksemel-configure_ac.patch
View File

@ -1,7 +1,7 @@
diff -Nru asterisk-1.4.22.org/configure.ac asterisk-1.4.22/configure.ac
--- asterisk-1.4.22.org/configure.ac 2008-09-08 18:26:00.000000000 +0200
+++ asterisk-1.4.22/configure.ac 2008-11-29 15:04:09.000000000 +0100
@@ -514,7 +514,7 @@
diff -Nru asterisk-1.4.25.org/configure.ac asterisk-1.4.25/configure.ac
--- asterisk-1.4.25.org/configure.ac 2009-04-22 23:35:03.000000000 +0200
+++ asterisk-1.4.25/configure.ac 2009-06-04 21:06:09.000000000 +0200
@@ -571,7 +571,7 @@
fi
fi

8
net/asterisk-1.4.x/patches/017-Makefile-no_march.patch
View File

@ -1,7 +1,7 @@
diff -Nru asterisk-1.4.22.org/Makefile asterisk-1.4.22/Makefile
--- asterisk-1.4.22.org/Makefile 2008-09-08 22:15:42.000000000 +0200
+++ asterisk-1.4.22/Makefile 2008-11-29 15:05:12.000000000 +0100
@@ -215,7 +215,7 @@
diff -Nru asterisk-1.4.25.org/Makefile asterisk-1.4.25/Makefile
--- asterisk-1.4.25.org/Makefile 2008-11-29 17:58:29.000000000 +0100
+++ asterisk-1.4.25/Makefile 2009-06-04 21:07:13.000000000 +0200
@@ -220,7 +220,7 @@
endif
ifneq ($(PROC),ultrasparc)

16
net/asterisk-1.4.x/patches/023-autoconf-chan_h323.patch
View File

@ -1,7 +1,7 @@
diff -Nru asterisk-1.4.23.1.org/autoconf/ast_check_openh323.m4 asterisk-1.4.23.1/autoconf/ast_check_openh323.m4
--- asterisk-1.4.23.1.org/autoconf/ast_check_openh323.m4 2008-10-20 06:57:33.000000000 +0200
+++ asterisk-1.4.23.1/autoconf/ast_check_openh323.m4 2009-01-31 15:30:03.000000000 +0100
@@ -119,6 +119,7 @@
diff -Nru asterisk-1.4.25.org/autoconf/ast_check_openh323.m4 asterisk-1.4.25/autoconf/ast_check_openh323.m4
--- asterisk-1.4.25.org/autoconf/ast_check_openh323.m4 2009-03-18 21:02:40.000000000 +0100
+++ asterisk-1.4.25/autoconf/ast_check_openh323.m4 2009-06-04 21:07:59.000000000 +0200
@@ -123,6 +123,7 @@
;;
esac
AC_MSG_RESULT(${OPENH323_BUILD})
@ -9,10 +9,10 @@ diff -Nru asterisk-1.4.23.1.org/autoconf/ast_check_openh323.m4 asterisk-1.4.23.1
AC_SUBST([OPENH323_SUFFIX])
AC_SUBST([OPENH323_BUILD])
diff -Nru asterisk-1.4.23.1.org/configure.ac asterisk-1.4.23.1/configure.ac
--- asterisk-1.4.23.1.org/configure.ac 2008-12-15 18:43:59.000000000 +0100
+++ asterisk-1.4.23.1/configure.ac 2009-01-31 15:29:14.000000000 +0100
@@ -1278,7 +1278,7 @@
diff -Nru asterisk-1.4.25.org/configure.ac asterisk-1.4.25/configure.ac
--- asterisk-1.4.25.org/configure.ac 2009-04-22 23:35:03.000000000 +0200
+++ asterisk-1.4.25/configure.ac 2009-06-04 21:07:59.000000000 +0200
@@ -1316,7 +1316,7 @@
if test "${HAS_PWLIB:-unset}" != "unset"; then
AST_CHECK_PWLIB_PLATFORM()

6
net/asterisk-1.4.x/patches/030-acinclude.patch
View File

@ -1,6 +1,6 @@
diff -Nru asterisk-1.4.23.1.org/autoconf/ast_prog_ld.m4 asterisk-1.4.23.1/autoconf/ast_prog_ld.m4
--- asterisk-1.4.23.1.org/autoconf/ast_prog_ld.m4 2008-10-20 06:45:56.000000000 +0200
+++ asterisk-1.4.23.1/autoconf/ast_prog_ld.m4 2009-01-31 15:46:48.000000000 +0100
diff -Nru asterisk-1.4.25.org/autoconf/ast_prog_ld.m4 asterisk-1.4.25/autoconf/ast_prog_ld.m4
--- asterisk-1.4.25.org/autoconf/ast_prog_ld.m4 2008-10-20 06:45:56.000000000 +0200
+++ asterisk-1.4.25/autoconf/ast_prog_ld.m4 2009-06-04 21:09:45.000000000 +0200
@@ -7,7 +7,7 @@
[assume the C compiler uses GNU ld @<:@default=no@:>@])],
[test "$withval" = no || with_gnu_ld=yes],

44
net/asterisk-1.4.x/patches/035-main-asterisk-uclibc-daemon.patch
View File

@ -1,44 +0,0 @@
diff -Nru asterisk-1.4.23.1.org/main/asterisk.c asterisk-1.4.23.1/main/asterisk.c
--- asterisk-1.4.23.1.org/main/asterisk.c 2008-12-23 16:35:38.000000000 +0100
+++ asterisk-1.4.23.1/main/asterisk.c 2009-01-31 15:41:40.000000000 +0100
@@ -2986,9 +2986,40 @@
#if HAVE_WORKING_FORK
if (ast_opt_always_fork || !ast_opt_no_fork) {
#ifndef HAVE_SBIN_LAUNCHD
+#ifndef __UCLIBC__
if (daemon(1, 0) < 0) {
ast_log(LOG_ERROR, "daemon() failed: %s\n", strerror(errno));
}
+#else
+/*
+ workaround for uClibc-0.9.29 mipsel bug:
+ recursive mutexes do not work if uClibc daemon() function has been called,
+ if parent thread locks a mutex
+ the child thread cannot acquire a lock with the same name
+ (same code works if daemon() is not called)
+ but duplication of uClibc daemon.c code in here does work.
+*/
+ int fd;
+ switch (fork()) {
+ case -1:
+ exit(1);
+ case 0:
+ break;
+ default:
+ _exit(0);
+ }
+ if (setsid() == -1)
+ exit(1);
+ if (fork())
+ _exit(0);
+ if ((fd = open("/dev/null", O_RDWR, 0)) != -1) {
+ dup2(fd, STDIN_FILENO);
+ dup2(fd, STDOUT_FILENO);
+ dup2(fd, STDERR_FILENO);
+ if (fd > 2)
+ close(fd);
+ }
+#endif
ast_mainpid = getpid();
/* Blindly re-write pid file since we are forking */
unlink(ast_config_AST_PID);