? asterisk-freebsd.diff ? codecs/gsm/lib Index: Makefile =================================================================== RCS file: /usr/cvsroot/asterisk/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- Makefile 23 Apr 2003 16:23:12 -0000 1.2 +++ Makefile 27 Apr 2003 00:54:23 -0000 @@ -85,7 +85,7 @@ CFLAGS+= $(TRACE_FRAMES) CFLAGS+=# -fomit-frame-pointer SUBDIRS=res channels pbx apps codecs formats agi cdr astman -LIBS=-ldl -lpthread -lncurses -lm #-lnjamd +LIBS=-pthread -lncurses -lm #-lnjamd OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \ translate.o file.o say.o pbx.o cli.o md5.o term.o \ ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \ @@ -146,8 +146,8 @@ ./make_build_h endif -asterisk: .version build.h editline/libedit.a db1-ast/libdb1.a $(OBJS) - gcc -o asterisk -rdynamic $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a +asterisk: .version build.h editline/libedit.a $(OBJS) + gcc -o asterisk -rdynamic $(OBJS) $(LIBS) $(LIBEDIT) subdirs: for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done Index: db.c =================================================================== RCS file: /usr/cvsroot/asterisk/db.c,v retrieving revision 1.2 diff -u -r1.2 db.c --- db.c 13 Apr 2003 04:17:45 -0000 1.2 +++ db.c 27 Apr 2003 00:54:23 -0000 @@ -32,9 +32,10 @@ #include #include #include -#include "db1-ast/include/db.h" #include "asterisk.h" #include "astconf.h" +#include +#include static DB *astdb; static pthread_mutex_t dblock = AST_MUTEX_INITIALIZER; Index: indications.c =================================================================== RCS file: /usr/cvsroot/asterisk/indications.c,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 indications.c --- indications.c 16 Mar 2003 22:37:29 -0000 1.1.1.2 +++ indications.c 27 Apr 2003 00:54:23 -0000 @@ -140,11 +140,14 @@ int ast_playtones_start(struct ast_channel *chan, int vol, const char *playlst, int interruptible) { - char *s, *data = strdupa(playlst); /* cute */ + char *s, *data; /* cute */ struct playtones_def d = { vol, -1, 0, 1, NULL}; char *stringp=NULL; + data = alloca(strlen(playlst)); + if (!data) return -1; + strcpy(data,playlst); if (vol < 1) d.vol = 8192; Index: apps/Makefile =================================================================== RCS file: /usr/cvsroot/asterisk/apps/Makefile,v retrieving revision 1.1.1.8 diff -u -r1.1.1.8 Makefile --- apps/Makefile 16 Mar 2003 06:00:09 -0000 1.1.1.8 +++ apps/Makefile 27 Apr 2003 00:54:23 -0000 @@ -12,7 +12,7 @@ # #APPS=app_dial.so app_playback.so app_directory.so app_intercom.so app_mp3.so -APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_intercom.so app_mp3.so \ +APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_mp3.so \ app_system.so app_echo.so app_record.so app_image.so app_url.so app_disa.so \ app_agi.so app_qcall.so app_adsiprog.so app_getcpeid.so app_milliwatt.so \ app_zapateller.so app_datetime.so app_setcallerid.so app_festival.so \ Index: channels/Makefile =================================================================== RCS file: /usr/cvsroot/asterisk/channels/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- channels/Makefile 18 Apr 2003 14:34:46 -0000 1.4 +++ channels/Makefile 27 Apr 2003 00:54:24 -0000 @@ -12,8 +12,6 @@ # CHANNEL_LIBS=chan_modem.so chan_iax.so chan_sip.so \ - chan_modem_aopen.so chan_oss.so \ - chan_modem_bestdata.so chan_modem_i4l.so \ chan_agent.so chan_mgcp.so chan_iax2.so \ chan_local.so Index: codecs/Makefile =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- codecs/Makefile 23 Apr 2003 16:23:12 -0000 1.3 +++ codecs/Makefile 27 Apr 2003 00:54:24 -0000 @@ -21,7 +21,7 @@ MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so") MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so") MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so") -CFLAGS+= +CFLAGS+=-I/usr/local/include -L/usr/local/lib LIBG723=g723.1/libg723.a LIBG723B=g723.1b/libg723b.a @@ -30,7 +30,7 @@ LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi) LIBMP3=mp3/libmp3.a LIBLPC10=lpc10/liblpc10.a -LIBSPEEX=-lspeex -lm +LIBSPEEX=-L/usr/local/lib -lspeex -lm LIBILBC=ilbc/libilbc.a CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so \ Index: codecs/mp3/include/L3.h =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/mp3/include/L3.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 L3.h --- codecs/mp3/include/L3.h 12 Feb 2003 13:59:14 -0000 1.1.1.1 +++ codecs/mp3/include/L3.h 27 Apr 2003 00:54:24 -0000 @@ -36,6 +36,7 @@ #define GLOBAL_GAIN_SCALE (4*15) /* #define GLOBAL_GAIN_SCALE 0 */ +#define LITTLE_ENDIAN 1 #ifdef _M_IX86 #define LITTLE_ENDIAN 1 Index: editline/np/unvis.c =================================================================== RCS file: /usr/cvsroot/asterisk/editline/np/unvis.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 unvis.c --- editline/np/unvis.c 12 Feb 2003 13:59:15 -0000 1.1.1.1 +++ editline/np/unvis.c 27 Apr 2003 00:54:25 -0000 @@ -58,7 +58,7 @@ #ifdef __warn_references __warn_references(unvis, - "warning: reference to compatibility unvis(); include for correct reference") + "warning: reference to compatibility unvis(); include for correct reference"); #endif #if !HAVE_VIS_H Index: pbx/pbx_wilcalu.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_wilcalu.c,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 pbx_wilcalu.c --- pbx/pbx_wilcalu.c 16 Mar 2003 22:37:31 -0000 1.1.1.2 +++ pbx/pbx_wilcalu.c 27 Apr 2003 00:54:25 -0000 @@ -58,7 +58,9 @@ { pthread_t dialstring_thread; char * sendbufptr=sendbuf; - int fd=open(dialfile,O_RDONLY); + int fd=open(dialfile,O_RDONLY|O_NONBLOCK); + int flags = fcntl(fd, F_GETFL); + fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); printf("Entered Wil-Calu fd=%d\n",fd); if(fd<0) { printf("Autodial: Unable to open file\n"); Index: res/res_indications.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_indications.c,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 res_indications.c --- res/res_indications.c 16 Mar 2003 22:37:31 -0000 1.1.1.2 +++ res/res_indications.c 27 Apr 2003 00:54:26 -0000 @@ -248,7 +248,9 @@ if (!strcasecmp(v->name, "description")) { strncpy(tones->description, v->value, sizeof(tones->description)-1); } else if (!strcasecmp(v->name,"ringcadance")) { - char *ring,*rings = strdupa(v->value); + char *ring,*rings; + rings = alloca(strlen(v->value)); + strcpy(rings,v->value); c = rings; ring = strsep(&c,","); while (ring) { @@ -270,7 +272,8 @@ ring = strsep(&c,","); } } else if (!strcasecmp(v->name,"alias")) { - char *countries = strdupa(v->value); + char *countries = alloca(strlen(v->value)); + strcpy(countries,v->value); c = countries; country = strsep(&c,","); while (country) { Index: res/res_musiconhold.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v retrieving revision 1.1.1.5 diff -u -r1.1.1.5 res_musiconhold.c --- res/res_musiconhold.c 18 Mar 2003 06:00:18 -0000 1.1.1.5 +++ res/res_musiconhold.c 27 Apr 2003 00:54:27 -0000 @@ -34,6 +34,8 @@ #include #include #include +#include +#include #ifdef ZAPATA_MOH #include #endif Index: res/res_parking.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_parking.c,v retrieving revision 1.2 diff -u -r1.2 res_parking.c --- res/res_parking.c 9 Apr 2003 04:00:43 -0000 1.2 +++ res/res_parking.c 27 Apr 2003 00:54:27 -0000 @@ -611,11 +611,12 @@ char *c=NULL; int start=0, finish=0,x; unsigned int group = 0; - copy = strdupa(s); + copy = alloca(strlen(s)); if (!copy) { ast_log(LOG_ERROR, "Out of memory\n"); return 0; } + strcpy(copy,s); c = copy; while((piece = strsep(&c, ","))) {