[Pkg-voip-commits] r4665 - in /asterisk/trunk/debian: ./ patches/ patches/bristuff/
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Fri Oct 5 02:04:16 UTC 2007
Author: paravoid
Date: Fri Oct 5 02:04:15 2007
New Revision: 4665
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4665
Log:
* New upstream release.
- Implemented Dynamic DUNDi peering support (Closes: #439331)
- Removed merged patches: bashism-safeasterisk, ast_key_dir,
h323-add-missing-ptrace-guard, CVE-2007-4521.
- Adapted patches: make-clean-fixes, h323-no-deps-on-asterisk.
- Adapted bristuff 0.4.0-test4 to apply to 1.4.12 (bristuff.notice,
xagi, app-dial-c-callback, app-dial-priority-202)
* When DFSG-ing the tarball, create a fake codecs/ilbc/Makefile so that
make doesn't fail on clean.
Removed:
asterisk/trunk/debian/patches/CVE-2007-4521
asterisk/trunk/debian/patches/ast_key_dir
asterisk/trunk/debian/patches/bashism-safeasterisk
asterisk/trunk/debian/patches/h323-add-missing-ptrace-guard
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/patches/bristuff/app-dial-c-callback
asterisk/trunk/debian/patches/bristuff/app-dial-priority-202
asterisk/trunk/debian/patches/bristuff/bristuff-notice
asterisk/trunk/debian/patches/bristuff/xagi
asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
asterisk/trunk/debian/patches/make-clean-fixes
asterisk/trunk/debian/patches/series
asterisk/trunk/debian/rules
Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=4665&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Fri Oct 5 02:04:15 2007
@@ -1,8 +1,17 @@
-asterisk (1:1.4.11~dfsg-5) UNRELEASED; urgency=low
+asterisk (1:1.4.12~dfsg-1) UNRELEASED; urgency=low
* NOT RELEASED YET
-
- -- Faidon Liambotis <paravoid at debian.org> Mon, 01 Oct 2007 17:25:45 +0300
+ * New upstream release.
+ - Implemented Dynamic DUNDi peering support (Closes: #439331)
+ - Removed merged patches: bashism-safeasterisk, ast_key_dir,
+ h323-add-missing-ptrace-guard, CVE-2007-4521.
+ - Adapted patches: make-clean-fixes, h323-no-deps-on-asterisk.
+ - Adapted bristuff 0.4.0-test4 to apply to 1.4.12 (bristuff.notice,
+ xagi, app-dial-c-callback, app-dial-priority-202)
+ * When DFSG-ing the tarball, create a fake codecs/ilbc/Makefile so that
+ make doesn't fail on clean.
+
+ -- Faidon Liambotis <paravoid at debian.org> Fri, 05 Oct 2007 05:02:26 +0300
asterisk (1:1.4.11~dfsg-4) unstable; urgency=low
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-c-callback
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-c-callback?rev=4665&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-c-callback (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-c-callback Fri Oct 5 02:04:15 2007
@@ -39,7 +39,7 @@
+ if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "%s is ringing\n", c->name);
- /* Setup early media if appropriate */
-- if (single)
+- if (single && CAN_EARLY_BRIDGE(peerflags))
+ /* Setup early media if appropriate */
+ if (single)
ast_rtp_early_bridge(in, c);
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-priority-202
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-priority-202?rev=4665&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 Fri Oct 5 02:04:15 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/apps/app_dial.c
-+++ asterisk-1.4.8~dfsg/apps/app_dial.c
+--- asterisk-1.4.12.orig/apps/app_dial.c
++++ asterisk-1.4.12/apps/app_dial.c
@@ -11,6 +11,10 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -18,10 +18,10 @@
-" j - Jump to priority n+101 if all of the requested channels were busy.\n"
+" j - Jump to priority n+101 if the called party was busy.\n"
+" Jump to priority n+201 if all of the requested channels were busy.\n"
- " L(x[:y][:z]) - Limit the call to 'x' ms. Play a warning when 'y' ms are\n"
- " left. Repeat the warning every 'z' ms. The following special\n"
- " variables can be used with this option:\n"
-@@ -1258,10 +1263,12 @@ static int dial_exec_full(struct ast_cha
+ " k - Allow the called party to enable parking of the call by sending\n"
+ " the DTMF sequence defined for call parking in features.conf.\n"
+ " K - Allow the calling party to enable parking of the call by sending\n"
+@@ -1263,10 +1268,12 @@ static int dial_exec_full(struct ast_cha
}
if (!outgoing) {
Modified: asterisk/trunk/debian/patches/bristuff/bristuff-notice
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/bristuff-notice?rev=4665&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/bristuff-notice (original)
+++ asterisk/trunk/debian/patches/bristuff/bristuff-notice Fri Oct 5 02:04:15 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/README
-+++ asterisk-1.4.8~dfsg/README
+--- asterisk-1.4.12.orig/README
++++ asterisk-1.4.12/README
@@ -4,6 +4,8 @@ and the Asterisk.org developer community
Copyright (C) 2001-2006 Digium, Inc.
@@ -9,13 +9,13 @@
================================================================
* SECURITY
---- asterisk-1.4.8~dfsg.orig/.version
-+++ asterisk-1.4.8~dfsg/.version
+--- asterisk-1.4.12.orig/.version
++++ asterisk-1.4.12/.version
@@ -1 +1 @@
--1.4.11
-+1.4.11-BRIstuffed-0.4.0-test4
---- asterisk-1.4.8~dfsg.orig/LICENSE
-+++ asterisk-1.4.8~dfsg/LICENSE
+-1.4.12
++1.4.12-BRIstuffed-0.4.0-test4
+--- asterisk-1.4.12.orig/LICENSE
++++ asterisk-1.4.12/LICENSE
@@ -1,7 +1,7 @@
-Asterisk is distributed under the GNU General Public License version 2
-and is also available under alternative licenses negotiated directly
@@ -28,8 +28,8 @@
except as defined below. The GPL (version 2) is included in this
source tree in the file COPYING.
---- asterisk-1.4.8~dfsg.orig/doc/hardware.txt
-+++ asterisk-1.4.8~dfsg/doc/hardware.txt
+--- asterisk-1.4.12.orig/doc/hardware.txt
++++ asterisk-1.4.12/doc/hardware.txt
@@ -31,6 +31,19 @@ Zaptel compatible hardware
* Wildcard TE410P - Quad T1/E1 switchable interface. Supports PRI and
RBS signalling, as well as PPP, FR, and HDLC data modes.
Modified: asterisk/trunk/debian/patches/bristuff/xagi
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/xagi?rev=4665&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/xagi (original)
+++ asterisk/trunk/debian/patches/bristuff/xagi Fri Oct 5 02:04:15 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.10.1~dfsg.orig/include/asterisk/agi.h
-+++ asterisk-1.4.10.1~dfsg/include/asterisk/agi.h
+--- asterisk-1.4.12.orig/include/asterisk/agi.h
++++ asterisk-1.4.12/include/asterisk/agi.h
@@ -29,7 +29,8 @@ extern "C" {
typedef struct agi_state {
@@ -8,10 +8,10 @@
+ int audio_out; /* FD for audio output */
+ int audio_in; /* FD for audio output */
int ctrl; /* FD for input control */
+ unsigned int fast:1; /* flag for fast agi or not */
} AGI;
-
---- asterisk-1.4.10.1~dfsg.orig/res/res_agi.c
-+++ asterisk-1.4.10.1~dfsg/res/res_agi.c
+--- asterisk-1.4.12.orig/res/res_agi.c
++++ asterisk-1.4.12/res/res_agi.c
@@ -11,6 +11,9 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -22,7 +22,7 @@
* This program is free software, distributed under the terms of
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
-@@ -73,16 +76,19 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -75,16 +78,19 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
static char *app = "AGI";
@@ -43,7 +43,7 @@
"program on a channel. AGI allows Asterisk to launch external programs\n"
"written in any language to control a telephony channel, play audio,\n"
"read DTMF digits, etc. by communicating with the AGI protocol on stdin\n"
-@@ -95,6 +101,8 @@ static char *descrip =
+@@ -97,6 +103,8 @@ static char *descrip =
"variable to \"no\" before executing the AGI application.\n"
" Using 'EAGI' provides enhanced AGI, with incoming audio available out of band\n"
"on file descriptor 3\n\n"
@@ -52,8 +52,8 @@
" Use the CLI command 'agi show' to list available agi commands\n"
" This application sets the following channel variable upon completion:\n"
" AGISTATUS The status of the attempt to the run the AGI script\n"
-@@ -233,13 +241,14 @@ static enum agi_result launch_netscript(
- return AGI_RESULT_SUCCESS;
+@@ -236,13 +244,14 @@ static enum agi_result launch_netscript(
+ return AGI_RESULT_SUCCESS_FAST;
}
-static enum agi_result launch_script(char *script, char *argv[], int *fds, int *efd, int *opid)
@@ -68,7 +68,7 @@
int x;
int res;
sigset_t signal_set, old_set;
-@@ -284,6 +293,33 @@ static enum agi_result launch_script(cha
+@@ -287,6 +296,33 @@ static enum agi_result launch_script(cha
return AGI_RESULT_FAILURE;
}
}
@@ -102,7 +102,7 @@
/* Block SIGHUP during the fork - prevents a race */
sigfillset(&signal_set);
-@@ -319,6 +355,11 @@ static enum agi_result launch_script(cha
+@@ -322,6 +358,11 @@ static enum agi_result launch_script(cha
} else {
close(STDERR_FILENO + 1);
}
@@ -114,7 +114,7 @@
/* Before we unblock our signals, return our trapped signals back to the defaults */
signal(SIGHUP, SIG_DFL);
-@@ -336,7 +377,7 @@ static enum agi_result launch_script(cha
+@@ -339,7 +380,7 @@ static enum agi_result launch_script(cha
}
/* Close everything but stdin/out/error */
@@ -123,7 +123,7 @@
close(x);
/* Execute script */
-@@ -354,12 +395,19 @@ static enum agi_result launch_script(cha
+@@ -357,12 +398,19 @@ static enum agi_result launch_script(cha
if (efd) {
*efd = audio[1];
}
@@ -144,7 +144,7 @@
*opid = pid;
return AGI_RESULT_SUCCESS;
-@@ -389,7 +437,7 @@ static void setup_env(struct ast_channel
+@@ -392,7 +440,7 @@ static void setup_env(struct ast_channel
fdprintf(fd, "agi_context: %s\n", chan->context);
fdprintf(fd, "agi_extension: %s\n", chan->exten);
fdprintf(fd, "agi_priority: %d\n", chan->priority);
@@ -153,7 +153,7 @@
/* User information */
fdprintf(fd, "agi_accountcode: %s\n", chan->accountcode ? chan->accountcode : "");
-@@ -418,7 +466,7 @@ static int handle_waitfordigit(struct as
+@@ -421,7 +469,7 @@ static int handle_waitfordigit(struct as
return RESULT_SHOWUSAGE;
if (sscanf(argv[3], "%d", &to) != 1)
return RESULT_SHOWUSAGE;
@@ -162,7 +162,7 @@
fdprintf(agi->fd, "200 result=%d\n", res);
return (res >= 0) ? RESULT_SUCCESS : RESULT_FAILURE;
}
-@@ -593,7 +641,7 @@ static int handle_streamfile(struct ast_
+@@ -596,7 +644,7 @@ static int handle_streamfile(struct ast_
if (vfs)
ast_playstream(vfs);
@@ -171,7 +171,7 @@
/* this is to check for if ast_waitstream closed the stream, we probably are at
* the end of the stream, return that amount, else check for the amount */
sample_offset = (chan->stream) ? ast_tellstream(fs) : max_length;
-@@ -654,7 +702,7 @@ static int handle_getoption(struct ast_c
+@@ -657,7 +705,7 @@ static int handle_getoption(struct ast_c
if (vfs)
ast_playstream(vfs);
@@ -180,7 +180,7 @@
/* this is to check for if ast_waitstream closed the stream, we probably are at
* the end of the stream, return that amount, else check for the amount */
sample_offset = (chan->stream)?ast_tellstream(fs):max_length;
-@@ -666,7 +714,7 @@ static int handle_getoption(struct ast_c
+@@ -669,7 +717,7 @@ static int handle_getoption(struct ast_c
/* If the user didnt press a key, wait for digitTimeout*/
if (res == 0 ) {
@@ -189,7 +189,7 @@
/* Make sure the new result is in the escape digits of the GET OPTION */
if ( !strchr(edigits,res) )
res=0;
-@@ -690,7 +738,7 @@ static int handle_saynumber(struct ast_c
+@@ -693,7 +741,7 @@ static int handle_saynumber(struct ast_c
return RESULT_SHOWUSAGE;
if (sscanf(argv[2], "%d", &num) != 1)
return RESULT_SHOWUSAGE;
@@ -198,7 +198,7 @@
if (res == 1)
return RESULT_SUCCESS;
fdprintf(agi->fd, "200 result=%d\n", res);
-@@ -707,7 +755,7 @@ static int handle_saydigits(struct ast_c
+@@ -710,7 +758,7 @@ static int handle_saydigits(struct ast_c
if (sscanf(argv[2], "%d", &num) != 1)
return RESULT_SHOWUSAGE;
@@ -207,7 +207,7 @@
if (res == 1) /* New command */
return RESULT_SUCCESS;
fdprintf(agi->fd, "200 result=%d\n", res);
-@@ -721,7 +769,7 @@ static int handle_sayalpha(struct ast_ch
+@@ -724,7 +772,7 @@ static int handle_sayalpha(struct ast_ch
if (argc != 4)
return RESULT_SHOWUSAGE;
@@ -216,7 +216,7 @@
if (res == 1) /* New command */
return RESULT_SUCCESS;
fdprintf(agi->fd, "200 result=%d\n", res);
-@@ -799,7 +847,7 @@ static int handle_sayphonetic(struct ast
+@@ -802,7 +850,7 @@ static int handle_sayphonetic(struct ast
if (argc != 4)
return RESULT_SHOWUSAGE;
@@ -225,7 +225,7 @@
if (res == 1) /* New command */
return RESULT_SUCCESS;
fdprintf(agi->fd, "200 result=%d\n", res);
-@@ -823,7 +871,7 @@ static int handle_getdata(struct ast_cha
+@@ -826,7 +874,7 @@ static int handle_getdata(struct ast_cha
max = atoi(argv[4]);
else
max = 1024;
@@ -234,20 +234,21 @@
if (res == 2) /* New command */
return RESULT_SUCCESS;
else if (res == 1)
-@@ -1831,7 +1879,12 @@ static enum agi_result run_agi(struct as
+@@ -1833,8 +1881,13 @@ static enum agi_result run_agi(struct as
int ms;
enum agi_result returnstatus = AGI_RESULT_SUCCESS;
struct ast_frame *f;
+ struct ast_frame fr;
- char buf[2048];
-+ char audiobuf[2048];
+ char buf[AGI_BUF_LEN];
++ char audiobuf[AGI_BUF_LEN];
+ char *res = NULL;
+ int audiobytes;
+ int fds[2];
+ int enhanced = 0;
FILE *readf;
/* how many times we'll retry if ast_waitfor_nandfs will return without either
channel or file descriptor in case select is interrupted by a system call (EINTR) */
-@@ -1845,10 +1898,22 @@ static enum agi_result run_agi(struct as
+@@ -1848,10 +1901,22 @@ static enum agi_result run_agi(struct as
return AGI_RESULT_FAILURE;
}
setlinebuf(readf);
@@ -270,9 +271,9 @@
+ c = ast_waitfor_nandfds(&chan, dead ? 0 : 1, &agi->ctrl, 1, NULL, &outfd, &ms);
+ }
if (c) {
- retry = RETRY;
+ retry = AGI_NANDFS_RETRY;
/* Idle the channel until we get a command */
-@@ -1859,13 +1924,24 @@ static enum agi_result run_agi(struct as
+@@ -1862,13 +1927,23 @@ static enum agi_result run_agi(struct as
break;
} else {
/* If it's voice, write it to the audio pipe */
@@ -288,7 +289,6 @@
+ if ((agi->audio_in > -1) && (outfd == agi->audio_in)) {
+ audiobytes = read(agi->audio_in, audiobuf, sizeof(audiobuf));
+ if (audiobytes > 0) {
-+ // ast_log(LOG_NOTICE, "read %d bytes of audio\n", audiobytes);
+ fr.frametype = AST_FRAME_VOICE;
+ fr.subclass = AST_FORMAT_SLINEAR;
+ fr.datalen = audiobytes;
@@ -296,10 +296,10 @@
+ ast_write(chan, &fr);
+ }
+ } else {
- retry = RETRY;
- if (!fgets(buf, sizeof(buf), readf)) {
- /* Program terminated */
-@@ -1889,6 +1965,7 @@ static enum agi_result run_agi(struct as
+ size_t len = sizeof(buf);
+ size_t buflen = 0;
+
+@@ -1914,6 +1989,7 @@ static enum agi_result run_agi(struct as
if ((returnstatus < 0) || (returnstatus == AST_PBX_KEEPALIVE)) {
break;
}
@@ -307,7 +307,7 @@
} else {
if (--retry <= 0) {
ast_log(LOG_WARNING, "No channel, no fd?\n");
-@@ -1997,6 +2074,7 @@ static int agi_exec_full(struct ast_chan
+@@ -2022,6 +2098,7 @@ static int agi_exec_full(struct ast_chan
int argc = 0;
int fds[2];
int efd = -1;
@@ -315,23 +315,23 @@
int pid;
char *stringp;
AGI agi;
-@@ -2022,12 +2100,13 @@ static int agi_exec_full(struct ast_chan
+@@ -2047,12 +2124,13 @@ static int agi_exec_full(struct ast_chan
}
}
#endif
- res = launch_script(argv[0], argv, fds, enhanced ? &efd : NULL, &pid);
+ res = launch_script(argv[0], argv, fds, enhanced ? &efd : NULL, (enhanced == 2) ? &efd2 : NULL, &pid);
- if (res == AGI_RESULT_SUCCESS) {
+ if (res == AGI_RESULT_SUCCESS || res == AGI_RESULT_SUCCESS_FAST) {
int status = 0;
agi.fd = fds[1];
agi.ctrl = fds[0];
- agi.audio = efd;
+ agi.audio_out = efd;
+ agi.audio_in = efd2;
+ agi.fast = (res == AGI_RESULT_SUCCESS_FAST) ? 1 : 0;
res = run_agi(chan, argv[0], &agi, pid, &status, dead);
/* If the fork'd process returns non-zero, set AGISTATUS to FAILURE */
- if (res == AGI_RESULT_SUCCESS && status)
-@@ -2036,6 +2115,8 @@ static int agi_exec_full(struct ast_chan
+@@ -2062,6 +2140,8 @@ static int agi_exec_full(struct ast_chan
close(fds[1]);
if (efd > -1)
close(efd);
@@ -340,7 +340,7 @@
ast_unreplace_sigchld();
}
ast_module_user_remove(u);
-@@ -2083,6 +2164,35 @@ static int eagi_exec(struct ast_channel
+@@ -2110,6 +2190,35 @@ static int eagi_exec(struct ast_channel
return res;
}
@@ -376,7 +376,7 @@
static int deadagi_exec(struct ast_channel *chan, void *data)
{
if (!ast_check_hangup(chan))
-@@ -2138,6 +2248,7 @@ static int unload_module(void)
+@@ -2165,6 +2274,7 @@ static int unload_module(void)
{
ast_module_user_hangup_all();
ast_cli_unregister_multiple(cli_agi, sizeof(cli_agi) / sizeof(struct ast_cli_entry));
@@ -384,7 +384,7 @@
ast_unregister_application(eapp);
ast_unregister_application(deadapp);
return ast_unregister_application(app);
-@@ -2148,6 +2259,7 @@ static int load_module(void)
+@@ -2175,6 +2285,7 @@ static int load_module(void)
ast_cli_register_multiple(cli_agi, sizeof(cli_agi) / sizeof(struct ast_cli_entry));
ast_register_application(deadapp, deadagi_exec, deadsynopsis, descrip);
ast_register_application(eapp, eagi_exec, esynopsis, descrip);
@@ -393,7 +393,7 @@
}
--- /dev/null
-+++ asterisk-1.4.10.1~dfsg/agi/xagi-test.c
++++ asterisk-1.4.12/agi/xagi-test.c
@@ -0,0 +1,175 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
@@ -570,8 +570,8 @@
+ return -1;
+ exit(0);
+}
---- asterisk-1.4.10.1~dfsg.orig/agi/Makefile
-+++ asterisk-1.4.10.1~dfsg/agi/Makefile
+--- asterisk-1.4.12.orig/agi/Makefile
++++ asterisk-1.4.12/agi/Makefile
@@ -13,7 +13,7 @@
.PHONY: clean all uninstall
Modified: asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-no-deps-on-asterisk?rev=4665&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk Fri Oct 5 02:04:15 2007
@@ -7,8 +7,8 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.9~dfsg.orig/main/Makefile
-+++ asterisk-1.4.9~dfsg/main/Makefile
+--- asterisk-1.4.12.orig/main/Makefile
++++ asterisk-1.4.12/main/Makefile
@@ -120,13 +120,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
OBJS:=$(sort $(OBJS))
@@ -23,12 +23,15 @@
asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
@$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp
@if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \
-@@ -135,7 +128,7 @@ asterisk: $(OBJS) editline/libedit.a db1
+@@ -135,11 +128,7 @@ asterisk: $(OBJS) editline/libedit.a db1
@rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
+-ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ 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) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
+-endif
@$(ASTTOPDIR)/build_tools/strip_nonapi $@
clean::
Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=4665&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Fri Oct 5 02:04:15 2007
@@ -1,7 +1,5 @@
-Fix some upstream Makefiles so that make distclean correctly cleans up the
-tree as shipped by Digium.
-
-Forwarded as #10814, except the ilbc "fix".
+Don't remove sounds on dist-clean, upstream tarballs come with
+one of them.
-- Faidon Liambotis <paravoid at debian.org>
@@ -26,45 +24,3 @@
datafiles: _all
if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
# Should static HTTP be installed during make samples or even with its own target ala
---- asterisk-1.4.10.1~dfsg.orig/channels/Makefile
-+++ asterisk-1.4.10.1~dfsg/channels/Makefile
-@@ -68,6 +68,7 @@ ifneq ($(wildcard h323/Makefile.ast),)
- H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
- clean::
- $(MAKE) -C h323 clean
-+ rm -f h323/Makefile
- else
- h323/libchanh323.a h323/Makefile.ast:
- $(CMD_PREFIX) $(MAKE) -C h323
---- asterisk-1.4.10.1~dfsg.orig/codecs/Makefile
-+++ asterisk-1.4.10.1~dfsg/codecs/Makefile
-@@ -38,7 +38,7 @@ endif
- clean::
- $(MAKE) -C gsm clean
- $(MAKE) -C lpc10 clean
-- $(MAKE) -C ilbc clean
-+ -$(MAKE) -C ilbc clean
-
- gsm/lib/libgsm.a:
- @mkdir -p gsm/lib
---- asterisk-1.4.10.1~dfsg.orig/menuselect/Makefile
-+++ asterisk-1.4.10.1~dfsg/menuselect/Makefile
-@@ -79,6 +79,6 @@ clean:
- dist-clean: distclean
-
- distclean: clean
-- @if test -f mxml/Makefile ; then $(MAKE) -C mxml clean ; fi
-+ @if test -f mxml/Makefile ; then $(MAKE) -C mxml distclean ; fi
- rm -f autoconfig.h config.status config.log makeopts
- rm -rf autom4te.cache
---- asterisk-1.4.10.1~dfsg.orig/menuselect/mxml/Makefile.in
-+++ asterisk-1.4.10.1~dfsg/menuselect/mxml/Makefile.in
-@@ -119,6 +119,8 @@ clean:
- $(RM) config.cache config.log config.status config.h
- $(RM) -r autom4te*.cache
-
-+distclean: clean
-+ $(RM) mxml.list Makefile
-
- #
- # Install everything...
Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=4665&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Fri Oct 5 02:04:15 2007
@@ -1,11 +1,8 @@
# upstream fixes
configure-libc-client
-bashism-safeasterisk
astvarrundir
-ast_key_dir
make-clean-fixes
safe_asterisk-nobg
-h323-add-missing-ptrace-guard
h323-no-deps-on-asterisk
h323-workaround-openh323-segfault
@@ -72,6 +69,3 @@
# use /usr/include/bristuffed/libpri.h - /usr/lib/libpri-bristuffed.so.1.0
use-libpri-bristuffed
-
-# fix CVE-2007-4521 (Debian bug #440187)
-CVE-2007-4521
Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=4665&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Fri Oct 5 02:04:15 2007
@@ -213,7 +213,9 @@
tar xfz ../$(UPFILENAME)
@@rm -f $(TMP_TARBALL_TOP)/sounds/fpm-*.mp3
@@rm -f $(TMP_TARBALL_TOP)/sounds/asterisk-moh-freeplay-wav.tar.gz
- @@rm -rf $(TMP_TARBALL_TOP)/codecs/ilbc
+ @@rm -rf $(TMP_TARBALL_TOP)/codecs/ilbc/*
+ @@printf "all:\nclean:\n.PHONY: all clean\n" > \
+ $(TMP_TARBALL_TOP)/codecs/ilbc/Makefile
@@rm -f $(TMP_TARBALL_TOP)/codecs/codec_ilbc.c
@@rm -rf $(TMP_TARBALL_TOP)/contrib/firmware/
@@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
More information about the Pkg-voip-commits
mailing list