From c98918c6c31b5d961b8195d398b666a7d57325b0 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Fri, 16 Jul 2010 14:41:11 +0000 Subject: [PATCH] asterisk-1.4.x: refresh patches SVN-Revision: 22236 --- .../patches/011-Makefile-main.patch | 7 ++- .../patches/013-chan_iax2-tmp_path.patch | 7 ++- .../patches/014-openssl-configure_ac.patch | 7 ++- .../patches/015-spandsp-app_fax.patch | 46 ++++++++----------- .../patches/016-iksemel-configure_ac.patch | 7 ++- .../patches/017-Makefile-no_march.patch | 7 ++- .../patches/023-autoconf-chan_h323.patch | 14 +++--- .../patches/030-acinclude.patch | 7 ++- 8 files changed, 44 insertions(+), 58 deletions(-) diff --git a/net/asterisk-1.4.x/patches/011-Makefile-main.patch b/net/asterisk-1.4.x/patches/011-Makefile-main.patch index e979da4ab..4082bc5c0 100644 --- a/net/asterisk-1.4.x/patches/011-Makefile-main.patch +++ b/net/asterisk-1.4.x/patches/011-Makefile-main.patch @@ -1,7 +1,6 @@ -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 @@ +--- a/main/Makefile ++++ b/main/Makefile +@@ -138,7 +138,7 @@ asterisk: $(OBJS) editline/libedit.a db1 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) $(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 diff --git a/net/asterisk-1.4.x/patches/013-chan_iax2-tmp_path.patch b/net/asterisk-1.4.x/patches/013-chan_iax2-tmp_path.patch index 974c2d363..d9c7bd37c 100644 --- a/net/asterisk-1.4.x/patches/013-chan_iax2-tmp_path.patch +++ b/net/asterisk-1.4.x/patches/013-chan_iax2-tmp_path.patch @@ -1,7 +1,6 @@ -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 @@ +--- a/channels/chan_iax2.c ++++ b/channels/chan_iax2.c +@@ -1898,7 +1898,7 @@ static int try_firmware(char *s) last++; else last = s; diff --git a/net/asterisk-1.4.x/patches/014-openssl-configure_ac.patch b/net/asterisk-1.4.x/patches/014-openssl-configure_ac.patch index 9f3d9cd92..c17d15333 100644 --- a/net/asterisk-1.4.x/patches/014-openssl-configure_ac.patch +++ b/net/asterisk-1.4.x/patches/014-openssl-configure_ac.patch @@ -1,7 +1,6 @@ -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:01:13.000000000 +0100 -@@ -1319,7 +1319,7 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1376,7 +1376,7 @@ AC_SUBST(PBX_SPEEX_PREPROCESS) AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h]) diff --git a/net/asterisk-1.4.x/patches/015-spandsp-app_fax.patch b/net/asterisk-1.4.x/patches/015-spandsp-app_fax.patch index 63be86940..7ef059157 100644 --- a/net/asterisk-1.4.x/patches/015-spandsp-app_fax.patch +++ b/net/asterisk-1.4.x/patches/015-spandsp-app_fax.patch @@ -1,6 +1,5 @@ -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 +--- /dev/null ++++ b/apps/app_rxfax.c @@ -0,0 +1,376 @@ +/* + * Asterisk -- A telephony toolkit for Linux. @@ -378,9 +377,8 @@ diff -Nru asterisk-1.4.25.org/apps/app_rxfax.c asterisk-1.4.25/apps/app_rxfax.c +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Trivial FAX Receive Application"); + +/*- End of file ------------------------------------------------------------*/ -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 +--- /dev/null ++++ b/apps/app_txfax.c @@ -0,0 +1,303 @@ +/* + * Asterisk -- A telephony toolkit for Linux. @@ -685,10 +683,9 @@ diff -Nru asterisk-1.4.25.org/apps/app_txfax.c asterisk-1.4.25/apps/app_txfax.c +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Trivial FAX Transmit Application"); + +/*- End of file ------------------------------------------------------------*/ -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 @@ +--- a/build_tools/menuselect-deps.in ++++ b/build_tools/menuselect-deps.in +@@ -23,6 +23,7 @@ PGSQL=@PBX_PGSQL@ POPT=@PBX_POPT@ PRI=@PBX_PRI@ RADIUS=@PBX_RADIUS@ @@ -696,10 +693,9 @@ diff -Nru asterisk-1.4.25.org/build_tools/menuselect-deps.in asterisk-1.4.25/bui SPEEX=@PBX_SPEEX@ SPEEXDSP=@PBX_SPEEXDSP@ SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@ -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 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -205,6 +205,7 @@ AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pr AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib]) AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius]) @@ -707,7 +703,7 @@ diff -Nru asterisk-1.4.25.org/configure.ac asterisk-1.4.25/configure.ac AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex]) AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp]) AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite]) -@@ -1359,6 +1360,8 @@ +@@ -1359,6 +1360,8 @@ fi AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) @@ -716,9 +712,8 @@ diff -Nru asterisk-1.4.25.org/configure.ac asterisk-1.4.25/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.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 +--- a/include/asterisk/plc.h ++++ b/include/asterisk/plc.h @@ -1,18 +1,17 @@ -/*! \file - * \brief SpanDSP - a series of DSP components for telephony @@ -800,7 +795,7 @@ diff -Nru asterisk-1.4.25.org/include/asterisk/plc.h asterisk-1.4.25/include/ast \section plc_page_sec_2 How does it work? While good packets are being received, the plc_rx() routine keeps a record of the trailing section of the known speech signal. If a packet is missed, plc_fillin() is called to produce -@@ -83,7 +81,7 @@ +@@ -83,7 +81,7 @@ are needed to obtain smooth pleasant sou correct steadily fall. Therefore, the volume of the synthesized signal is made to decay linearly, such that after 50ms of missing audio it is reduced to silence. @@ -809,7 +804,7 @@ diff -Nru asterisk-1.4.25.org/include/asterisk/plc.h asterisk-1.4.25/include/ast start of the real speech. If the erasure is small, this smoothes the transition. If the erasure is long, and the synthetic signal has faded to zero, the blending softens the start up of the real signal, avoiding a kind of "click" or "pop" effect that might occur with a sudden onset. -@@ -110,6 +108,9 @@ +@@ -110,6 +108,9 @@ That's it! the pitch assessment. */ #define PLC_HISTORY_LEN (CORRELATION_SPAN + PLC_PITCH_MIN) @@ -819,7 +814,7 @@ diff -Nru asterisk-1.4.25.org/include/asterisk/plc.h asterisk-1.4.25/include/ast typedef struct { /*! Consecutive erased samples */ -@@ -127,12 +128,13 @@ +@@ -127,12 +128,13 @@ typedef struct } plc_state_t; @@ -837,7 +832,7 @@ diff -Nru asterisk-1.4.25.org/include/asterisk/plc.h asterisk-1.4.25/include/ast \param s The packet loss concealer context. \param amp The audio sample buffer. \param len The number of samples in the buffer. -@@ -147,13 +149,18 @@ +@@ -147,13 +149,18 @@ int plc_rx(plc_state_t *s, int16_t amp[] \return The number of samples synthesized. */ int plc_fillin(plc_state_t *s, int16_t amp[], int len); @@ -860,10 +855,9 @@ diff -Nru asterisk-1.4.25.org/include/asterisk/plc.h asterisk-1.4.25/include/ast } #endif -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 @@ +--- a/makeopts.in ++++ b/makeopts.in +@@ -141,6 +141,9 @@ PWLIB_LIB=@PWLIB_LIB@ RADIUS_INCLUDE=@RADIUS_INCLUDE@ RADIUS_LIB=@RADIUS_LIB@ diff --git a/net/asterisk-1.4.x/patches/016-iksemel-configure_ac.patch b/net/asterisk-1.4.x/patches/016-iksemel-configure_ac.patch index 3303e29cd..92007ff29 100644 --- a/net/asterisk-1.4.x/patches/016-iksemel-configure_ac.patch +++ b/net/asterisk-1.4.x/patches/016-iksemel-configure_ac.patch @@ -1,7 +1,6 @@ -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 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -572,7 +572,7 @@ if test "${USE_GSM}" != "no"; then fi fi diff --git a/net/asterisk-1.4.x/patches/017-Makefile-no_march.patch b/net/asterisk-1.4.x/patches/017-Makefile-no_march.patch index ad12deb29..7d8f8858f 100644 --- a/net/asterisk-1.4.x/patches/017-Makefile-no_march.patch +++ b/net/asterisk-1.4.x/patches/017-Makefile-no_march.patch @@ -1,7 +1,6 @@ -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 @@ +--- a/Makefile ++++ b/Makefile +@@ -220,7 +220,7 @@ ifneq ($(findstring BSD,$(OSARCH)),) endif ifneq ($(PROC),ultrasparc) diff --git a/net/asterisk-1.4.x/patches/023-autoconf-chan_h323.patch b/net/asterisk-1.4.x/patches/023-autoconf-chan_h323.patch index 7c41faf5d..9c388af69 100644 --- a/net/asterisk-1.4.x/patches/023-autoconf-chan_h323.patch +++ b/net/asterisk-1.4.x/patches/023-autoconf-chan_h323.patch @@ -1,7 +1,6 @@ -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 @@ +--- a/autoconf/ast_check_openh323.m4 ++++ b/autoconf/ast_check_openh323.m4 +@@ -123,6 +123,7 @@ AC_DEFUN([AST_CHECK_OPENH323_BUILD], [ ;; esac AC_MSG_RESULT(${OPENH323_BUILD}) @@ -9,10 +8,9 @@ diff -Nru asterisk-1.4.25.org/autoconf/ast_check_openh323.m4 asterisk-1.4.25/aut AC_SUBST([OPENH323_SUFFIX]) AC_SUBST([OPENH323_BUILD]) -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 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1317,7 +1317,7 @@ if test "${USE_PWLIB}" != "no"; then if test "${HAS_PWLIB:-unset}" != "unset"; then AST_CHECK_PWLIB_PLATFORM() diff --git a/net/asterisk-1.4.x/patches/030-acinclude.patch b/net/asterisk-1.4.x/patches/030-acinclude.patch index 7f1c2ce9f..2b46e9939 100644 --- a/net/asterisk-1.4.x/patches/030-acinclude.patch +++ b/net/asterisk-1.4.x/patches/030-acinclude.patch @@ -1,7 +1,6 @@ -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 @@ +--- a/autoconf/ast_prog_ld.m4 ++++ b/autoconf/ast_prog_ld.m4 +@@ -7,7 +7,7 @@ AC_DEFUN([AST_PROG_LD], [assume the C compiler uses GNU ld @<:@default=no@:>@])], [test "$withval" = no || with_gnu_ld=yes], [with_gnu_ld=no]) -- 2.30.2