head 1.53; access; symbols OPENPKG_E1_MP_HEAD:1.23 OPENPKG_E1_MP:1.23 OPENPKG_E1_MP_2_STABLE:1.19.2.3 OPENPKG_E1_FP:1.19.2.3 OPENPKG_2_STABLE_MP:1.20 OPENPKG_2_STABLE_20061018:1.19 OPENPKG_2_STABLE:1.19.0.2; locks; strict; comment @# @; 1.53 date 2009.12.20.10.34.20; author rse; state Exp; branches; next 1.52; commitid Gu7sEXpoW7efh6gu; 1.52 date 2009.08.30.20.29.00; author rse; state Exp; branches; next 1.51; commitid BpokqCJ7rODtaL1u; 1.51 date 2009.08.16.15.57.36; author rse; state Exp; branches; next 1.50; commitid iyygtxBbV1zg7WZt; 1.50 date 2009.08.05.18.54.14; author rse; state Exp; branches; next 1.49; commitid AS0dR9jHorIMrxYt; 1.49 date 2009.07.25.08.33.53; author rse; state Exp; branches; next 1.48; commitid neo0VwVPLWiRm4Xt; 1.48 date 2009.05.04.12.08.45; author rse; state Exp; branches; next 1.47; commitid 3tkb48Ar3cd1cyMt; 1.47 date 2009.04.03.07.53.24; author rse; state Exp; branches; next 1.46; commitid x0bp4CTCqHAbMxIt; 1.46 date 2009.03.28.19.14.52; author rse; state Exp; branches; next 1.45; commitid hY8kCJ4O6stWJPHt; 1.45 date 2009.02.23.21.47.43; author rse; state Exp; branches; next 1.44; commitid XVG5ioGOamo8EBDt; 1.44 date 2009.01.08.20.14.40; author rse; state Exp; branches; next 1.43; commitid p2A5Pjpwm3zTBGxt; 1.43 date 2008.12.14.10.35.25; author rse; state Exp; branches; next 1.42; commitid Vp9aObjbU310dqut; 1.42 date 2008.09.05.19.05.54; author rse; state Exp; branches; next 1.41; commitid 1NzPf32SVAApfCht; 1.41 date 2008.07.04.17.52.47; author rse; state Exp; branches; next 1.40; commitid V6fQGT8GhJWSRv9t; 1.40 date 2008.05.07.07.06.56; author rse; state Exp; branches; next 1.39; commitid AwvFRApiiWpU902t; 1.39 date 2008.03.25.21.04.30; author rse; state Exp; branches; next 1.38; commitid nNy5rpQGJs7WayWs; 1.38 date 2008.03.24.20.11.27; author rse; state Exp; branches; next 1.37; commitid JZds8IQLbYiJUpWs; 1.37 date 2008.03.23.10.41.00; author rse; state Exp; branches; next 1.36; commitid loL8mUyLnGE1NeWs; 1.36 date 2008.03.22.18.37.24; author rse; state Exp; branches; next 1.35; commitid 2QfhAErUDnbss9Ws; 1.35 date 2008.03.22.15.58.06; author rse; state Exp; branches; next 1.34; commitid p7dQNU4hM0XNz8Ws; 1.34 date 2008.03.20.19.40.26; author rse; state Exp; branches; next 1.33; commitid 1OYCk2mQykl4STVs; 1.33 date 2008.03.20.19.21.16; author rse; state Exp; branches; next 1.32; commitid X7qHoyLBAehuLTVs; 1.32 date 2008.03.19.20.18.27; author rse; state Exp; branches; next 1.31; commitid gnIVOTak1v957MVs; 1.31 date 2008.03.19.08.37.59; author rse; state Exp; branches; next 1.30; commitid 0JGtKbVydEzNeIVs; 1.30 date 2008.03.18.22.04.57; author rse; state Exp; branches; next 1.29; commitid 7vz69GjUoqaCJEVs; 1.29 date 2008.03.18.20.58.14; author rse; state Exp; branches; next 1.28; commitid DMDl5e8CDwIJmEVs; 1.28 date 2008.03.17.09.08.11; author rse; state Exp; branches; next 1.27; commitid dakIsz7ewWV8tsVs; 1.27 date 2008.03.09.20.28.30; author rse; state Exp; branches; next 1.26; commitid LZEAKjbS1wxtuuUs; 1.26 date 2008.03.09.20.15.19; author rse; state Exp; branches; next 1.25; commitid UDRNaaxorwRWpuUs; 1.25 date 2008.03.09.12.41.04; author rse; state Exp; branches; next 1.24; commitid Kl1KiixwmzV6UrUs; 1.24 date 2008.03.09.09.11.32; author rse; state Exp; branches; next 1.23; commitid qLeR9cYdnKreKqUs; 1.23 date 2006.12.23.10.47.27; author rse; state Exp; branches; next 1.22; commitid pMya2JJMzfXZtDZr; 1.22 date 2006.12.16.11.30.21; author rse; state Exp; branches; next 1.21; commitid OIbsvpqY0IPFWJYr; 1.21 date 2006.10.22.13.13.00; author rse; state Exp; branches; next 1.20; commitid JlWWvYHFWlsuhGRr; 1.20 date 2006.10.19.05.45.13; author rse; state Exp; branches; next 1.19; commitid NUp24Jyfk0YQTfRr; 1.19 date 2006.10.13.20.56.30; author rse; state Exp; branches 1.19.2.1; next 1.18; commitid AJF3s1l9VCdr8zQr; 1.18 date 2006.09.17.18.03.33; author rse; state Exp; branches; next 1.17; commitid YkjEVx1a8DfU0dNr; 1.17 date 2006.09.16.21.39.20; author rse; state Exp; branches; next 1.16; commitid N89YYSu1ocjWe6Nr; 1.16 date 2006.09.16.15.32.24; author rse; state Exp; branches; next 1.15; commitid CskaCSTqG3U2d4Nr; 1.15 date 2006.09.16.07.53.32; author rse; state Exp; branches; next 1.14; commitid 4672E7bolUFDF1Nr; 1.14 date 2006.09.15.05.58.26; author rse; state Exp; branches; next 1.13; commitid LN7eV8gkoO894TMr; 1.13 date 2006.09.13.05.58.09; author rse; state Exp; branches; next 1.12; commitid sogBsDQt8ye28DMr; 1.12 date 2006.09.13.05.39.29; author rse; state Exp; branches; next 1.11; commitid 4Wt0vU36GliD1DMr; 1.11 date 2006.09.11.08.32.18; author rse; state Exp; branches; next 1.10; commitid OUIeeXXKiewT2oMr; 1.10 date 2006.09.09.17.35.53; author rse; state Exp; branches; next 1.9; commitid s6Y4CTttbM1n7bMr; 1.9 date 2006.09.08.06.59.15; author rse; state Exp; branches; next 1.8; commitid 36woPW9ajKIXCZLr; 1.8 date 2006.09.08.06.45.40; author rse; state Exp; branches; next 1.7; commitid Dqpf20WJkzJiyZLr; 1.7 date 2006.09.06.06.38.31; author rse; state Exp; branches; next 1.6; commitid LSP71OBOWACPzJLr; 1.6 date 2006.09.05.20.56.15; author rse; state Exp; branches; next 1.5; commitid MAUGguyNksk5mGLr; 1.5 date 2006.09.05.20.52.40; author rse; state Exp; branches; next 1.4; commitid ZiuZEfpvnAOQkGLr; 1.4 date 2006.09.05.20.26.47; author rse; state Exp; branches; next 1.3; commitid K0XVGWTjY5iYbGLr; 1.3 date 2006.09.05.13.08.37; author rse; state Exp; branches; next 1.2; commitid ayfDmQyyYkvELDLr; 1.2 date 2006.09.05.10.08.40; author rse; state Exp; branches; next 1.1; commitid D90VXmUDjBZULCLr; 1.1 date 2006.09.05.07.39.33; author rse; state Exp; branches; next ; commitid Ui8unFFXgAWKWBLr; 1.19.2.1 date 2006.10.13.20.56.30; author rse; state dead; branches; next 1.19.2.2; commitid iZxwRSmmWscPXUQr; 1.19.2.2 date 2006.10.16.14.48.09; author rse; state Exp; branches; next 1.19.2.3; commitid iZxwRSmmWscPXUQr; 1.19.2.3 date 2006.10.19.05.46.18; author rse; state Exp; branches; next ; commitid 4zC5mlUsdcWdUfRr; desc @@ 1.53 log @upgrading package: asterisk 1.6.1.11 -> 1.6.2.0 @ text @Index: Makefile --- Makefile.orig 2009-11-03 21:01:30 +0100 +++ Makefile 2009-12-20 11:05:32 +0100 @@@@ -126,42 +126,19 @@@@ # Define standard directories for various platforms # These apply if they are not redefined in asterisk.conf -ifeq ($(OSARCH),SunOS) - ASTETCDIR=/var/etc/asterisk - ASTLIBDIR=/opt/asterisk/lib - ASTVARLIBDIR=/var/opt/asterisk - ASTDBDIR=$(ASTVARLIBDIR) - ASTKEYDIR=$(ASTVARLIBDIR) - ASTSPOOLDIR=/var/spool/asterisk - ASTLOGDIR=/var/log/asterisk - ASTHEADERDIR=/opt/asterisk/include - ASTBINDIR=/opt/asterisk/bin - ASTSBINDIR=/opt/asterisk/sbin - ASTVARRUNDIR=/var/run/asterisk - ASTMANDIR=/opt/asterisk/man -else ASTETCDIR=$(sysconfdir)/asterisk ASTLIBDIR=$(libdir)/asterisk ASTHEADERDIR=$(includedir)/asterisk ASTBINDIR=$(bindir) ASTSBINDIR=$(sbindir) - ASTSPOOLDIR=$(localstatedir)/spool/asterisk - ASTLOGDIR=$(localstatedir)/log/asterisk - ASTVARRUNDIR=$(localstatedir)/run/asterisk + ASTSPOOLDIR=$(localstatedir)/spool + ASTLOGDIR=$(localstatedir)/log + ASTVARRUNDIR=$(localstatedir)/run ASTMANDIR=$(mandir) -ifneq ($(findstring BSD,$(OSARCH)),) ASTVARLIBDIR=$(prefix)/share/asterisk - ASTVARRUNDIR=$(localstatedir)/run/asterisk - ASTDBDIR=$(localstatedir)/db/asterisk -else - ASTVARLIBDIR=$(localstatedir)/lib/asterisk - ASTDBDIR=$(ASTVARLIBDIR) -endif + ASTDBDIR=$(localstatedir)/db ASTKEYDIR=$(ASTVARLIBDIR) -endif -ifeq ($(ASTDATADIR),) ASTDATADIR:=$(ASTVARLIBDIR) -endif # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk @@@@ -261,12 +238,6 @@@@ _ASTCFLAGS+=-fsigned-char endif -ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. - BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) - _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) -endif - ifeq ($(OSARCH),NetBSD) _ASTCFLAGS+=-pthread -I/usr/pkg/include endif @@@@ -566,8 +537,7 @@@@ fi mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty - mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv - mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom + mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr mkdir -p $(DESTDIR)$(ASTDATADIR)/keys mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax Index: apps/app_backticks.c --- /dev/null 2009-12-20 11:05:01 +0100 +++ apps/app_backticks.c 2009-12-20 11:01:03 +0100 @@@@ -0,0 +1,129 @@@@ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.52 $") + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static char *app = "BackTicks"; +static char *synopsis = "Execute a shell command and save the result as a variable."; +static char *desc = " Backticks(|)\n\n" + "Be sure to include a full path to the command!\n"; + +static char *do_backticks(char *command, char *buf, size_t len) +{ + int fds[2], pid = 0; + char *ret = NULL; + + memset(buf, 0, len); + if (pipe(fds)) { + ast_log(LOG_WARNING, "Pipe/Exec failed\n"); + } else { + pid = fork(); + if (pid < 0) { + ast_log(LOG_WARNING, "Fork failed\n"); + close(fds[0]); + close(fds[1]); + } else if (pid) { + /* parent */ + close(fds[1]); + read(fds[0], buf, len); + close(fds[0]); + ret = buf; + } else { + /* child */ + char *argv[255] = {0}; + int argc = 0; + char *p; + char *mycmd = ast_strdupa(command); + close(fds[0]); + dup2(fds[1], STDOUT_FILENO); + argv[argc++] = mycmd; + do { + if ((p = strchr(mycmd, ' '))) { + *p = '\0'; + mycmd = ++p; + argv[argc++] = mycmd; + } + } while (p != NULL); + close(fds[1]); + execv(argv[0], argv); + ast_log(LOG_ERROR, "exec of %s failed\n", argv[0]); + exit(0); + } + } + return ret; +} + +static int backticks_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + const char *usage = "Usage: Backticks(|)"; + char buf[1024], *argv[2], *mydata; + int argc = 0; + + if (!data) { + ast_log(LOG_WARNING, "%s\n", usage); + return -1; + } + ast_autoservice_start(chan); + if (!(mydata = ast_strdupa(data))) { + ast_log(LOG_ERROR, "Memory Error!\n"); + res = -1; + } else { + if((argc = ast_app_separate_args(mydata, '|', argv, sizeof(argv) / sizeof(argv[0]))) < 2) { + ast_log(LOG_WARNING, "%s\n", usage); + res = -1; + } + if (do_backticks(argv[1], buf, sizeof(buf))) + pbx_builtin_setvar_helper(chan, argv[0], buf); + else { + ast_log(LOG_WARNING, "No Data!\n"); + res = -1; + } + } + ast_autoservice_stop(chan); + return res; +} + +static int function_backticks(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) +{ + if (!do_backticks(data, buf, len)) { + ast_log(LOG_WARNING, "No Data!\n"); + return -1; + } + return 0; +} + +static struct ast_custom_function backticks_function = { + .name = "BACKTICKS", + .desc = "Executes a shell command and evaluates to the result.", + .syntax = "BACKTICKS()", + .synopsis = "Executes a shell command.", + .read = function_backticks +}; + +static int unload_module(void) +{ + ast_custom_function_unregister(&backticks_function); + return ast_unregister_application(app); +} + +static int load_module(void) +{ + ast_custom_function_register(&backticks_function); + return ast_register_application(app, backticks_exec, synopsis, desc); +} + +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function"); + Index: apps/app_meetme.c --- apps/app_meetme.c.orig 2009-11-05 23:13:45 +0100 +++ apps/app_meetme.c 2009-12-20 11:01:03 +0100 @@@@ -522,6 +522,7 @@@@ CONFFLAG_DURATION_LIMIT = (1 << 30), /*! Do not write any audio to this channel until the state is up. */ CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31), + CONFFLAG_USERNAME = (1 << 31), }; enum { @@@@ -531,6 +532,7 @@@@ OPT_ARG_DURATION_LIMIT = 3, OPT_ARG_MOH_CLASS = 4, OPT_ARG_ARRAY_SIZE = 5, + OPT_ARG_USERNAME = 6, }; AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS @@@@ -563,6 +565,7 @@@@ AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ), AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP), AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT), + AST_APP_OPTION_ARG('n', CONFFLAG_USERNAME, OPT_ARG_USERNAME), END_OPTIONS ); static const char *app = "MeetMe"; @@@@ -2211,6 +2214,12 @@@@ if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER) || (confflags & CONFFLAG_INTROUSERNOREVIEW))) { char destdir[PATH_MAX]; + if ( (confflags & CONFFLAG_USERNAME) + && !ast_strlen_zero(optargs[OPT_ARG_USERNAME]) + && ast_fileexists(optargs[OPT_ARG_USERNAME], NULL, NULL)) + snprintf(destdir, sizeof(destdir), "%s", optargs[OPT_ARG_USERNAME]); + else { + snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR); if (ast_mkdir(destdir, 0777) != 0) { @@@@ -2227,6 +2236,7 @@@@ res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL); if (res == -1) goto outrun; + } } ast_mutex_lock(&conf->playlock); Index: build_tools/make_defaults_h --- build_tools/make_defaults_h.orig 2008-01-24 23:58:10 +0100 +++ build_tools/make_defaults_h 2009-12-20 11:01:03 +0100 @@@@ -17,7 +17,7 @@@@ #define DEFAULT_PID "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid" #define DEFAULT_VAR_DIR "${INSTALL_PATH}${ASTVARLIBDIR}" -#define DEFAULT_DB "${INSTALL_PATH}${ASTDBDIR}/astdb" +#define DEFAULT_DB "${INSTALL_PATH}${ASTDBDIR}/asterisk.db" #define DEFAULT_DATA_DIR "${INSTALL_PATH}${ASTDATADIR}" #define DEFAULT_KEY_DIR "${INSTALL_PATH}${ASTDATADIR}/keys" Index: cdr/cdr_custom.c --- cdr/cdr_custom.c.orig 2008-11-20 18:48:58 +0100 +++ cdr/cdr_custom.c 2009-12-20 11:01:03 +0100 @@@@ -83,7 +83,7 @@@@ ast_log(LOG_WARNING, "Format string too long, will be truncated, at line %d\n", var->lineno); ast_copy_string(format, var->value, sizeof(format) - 1); strcat(format,"\n"); - snprintf(master, sizeof(master),"%s/%s/%s", ast_config_AST_LOG_DIR, name, var->name); + snprintf(master, sizeof(master),"%s/cdr/%s", ast_config_AST_LOG_DIR, var->name); if (var->next) { ast_log(LOG_NOTICE, "Sorry, only one mapping is supported at this time, mapping '%s' will be ignored at line %d.\n", var->next->name, var->next->lineno); break; Index: cdr/cdr_sqlite3_custom.c --- cdr/cdr_sqlite3_custom.c.orig 2009-10-09 19:27:48 +0200 +++ cdr/cdr_sqlite3_custom.c 2009-12-20 11:01:03 +0100 @@@@ -296,7 +296,7 @@@@ } /* is the database there? */ - snprintf(filename, sizeof(filename), "%s/master.db", ast_config_AST_LOG_DIR); + snprintf(filename, sizeof(filename), "%s/cdr/master.db", ast_config_AST_LOG_DIR); res = sqlite3_open(filename, &db); if (res != SQLITE_OK) { ast_log(LOG_ERROR, "Could not open database %s.\n", filename); Index: chan_capi-1.1.4/Makefile --- chan_capi-1.1.4/Makefile.orig 2009-07-23 16:11:08 +0200 +++ chan_capi-1.1.4/Makefile 2009-12-20 11:01:03 +0100 @@@@ -90,6 +90,9 @@@@ CFLAGS+=-O6 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi) +ifeq (${USE_OWN_LIBCAPI},yes) +CFLAGS+=-DUSE_OWN_LIBCAPI +endif LIBS=-ldl -lpthread -lm CC=gcc Index: chan_capi-1.1.4/chan_capi20.h --- chan_capi-1.1.4/chan_capi20.h.orig 2005-09-20 20:33:40 +0200 +++ chan_capi-1.1.4/chan_capi20.h 2009-12-20 11:01:03 +0100 @@@@ -8,6 +8,8 @@@@ #undef CAPI_OS_HINT +#ifndef USE_OWN_LIBCAPI + #if (defined(__FreeBSD__) || defined(__OpenBSD__) || \ defined(__NetBSD__) || defined(__APPLE__)) @@@@ -29,6 +31,8 @@@@ #include #endif /* BSD */ +#endif + #ifndef HEADER_CID #define HEADER_CID(x) ((x)->adr.adrNCCI) #endif Index: chan_capi-1.1.4/chan_capi_utils.c --- chan_capi-1.1.4/chan_capi_utils.c.orig 2009-07-23 16:11:08 +0200 +++ chan_capi-1.1.4/chan_capi_utils.c 2009-12-20 11:01:03 +0100 @@@@ -1087,6 +1087,9 @@@@ { MESSAGE_EXCHANGE_ERROR error; int waitcount = 50; +#ifndef CAPI_MANUFACTURER_LEN +#define CAPI_MANUFACTURER_LEN 64 +#endif unsigned char manbuf[CAPI_MANUFACTURER_LEN]; _cmsg CMSG; Index: chan_capi-1.1.4/libcapi20/capi20.c --- chan_capi-1.1.4/libcapi20/capi20.c.orig 2009-07-23 16:11:08 +0200 +++ chan_capi-1.1.4/libcapi20/capi20.c 2009-12-20 11:01:03 +0100 @@@@ -19,8 +19,10 @@@@ #include #include #include +#ifdef __linux__ #define _LINUX_LIST_H #include +#endif #include #include @@@@ -48,17 +50,23 @@@@ #define SEND_BUFSIZ (128+2048) +#if 0 static char capidevname[] = "/dev/capi20"; static char capidevnamenew[] = "/dev/isdn/capi20"; +#endif static int capi_fd = -1; +#if 0 static capi_ioctl_struct ioctl_data; +#endif static int remote_capi; +#if 0 static char *globalconfigfilename = "/etc/capi20.conf"; static char *userconfigfilename = ".capi20rc"; static unsigned short int port; static char hostname[1024]; +#endif static int tracelevel; static char *tracefile; @@@@ -77,17 +85,21 @@@@ #define RCAPI_AUTH_USER_REQ CAPICMD(0xff, 0x00) #define RCAPI_AUTH_USER_CONF CAPICMD(0xff, 0x01) +#if 0 static char *skip_whitespace(char *s) { while (*s && isspace(*s)) s++; return s; } +#endif +#if 0 static char *skip_nonwhitespace(char *s) { while (*s && !isspace(*s)) s++; return s; } +#endif static unsigned char get_byte(unsigned char **p) { @@@@ -95,10 +107,12 @@@@ return((unsigned char)*(*p - 1)); } +#if 0 static unsigned short get_word(unsigned char **p) { return(get_byte(p) | (get_byte(p) << 8)); } +#endif static unsigned short get_netword(unsigned char **p) { @@@@ -144,6 +158,7 @@@@ * read config file */ +#if 0 static int read_config(void) { FILE *fp = NULL; @@@@ -197,11 +212,13 @@@@ fclose(fp); return(1); } +#endif /* * socket function */ +#if 0 static int open_socket(void) { int fd; @@@@ -225,6 +242,7 @@@@ close(fd); return(-1); } +#endif static int socket_read(int fd, unsigned char *buf, int l) { @@@@ -326,6 +344,8 @@@@ if (likely(capi_fd >= 0)) return CapiNoError; +#if 0 + /*----- open managment link -----*/ if (read_config() && (remote_capi)) { capi_fd = open_socket(); @@@@ -345,6 +365,8 @@@@ if (ioctl(capi_fd, CAPI_INSTALLED, 0) == 0) return CapiNoError; +#endif + return CapiRegNotInstalled; } @@@@ -419,6 +441,7 @@@@ unsigned char *bufferstart; }; +#if 0 static struct applinfo *alloc_buffers( unsigned MaxB3Connection, unsigned MaxB3Blks, @@@@ -457,6 +480,7 @@@@ ap->lastfree->next = 0; return ap; } +#endif static void free_buffers(struct applinfo *ap) { @@@@ -574,14 +598,17 @@@@ unsigned MaxSizeB3, unsigned *ApplID) { +#if 0 int applid = 0; char buf[PATH_MAX]; int i, fd = -1; *ApplID = 0; +#endif if (capi20_isinstalled() != CapiNoError) return CapiRegNotInstalled; +#if 0 if ((!remote_capi) || ((remote_capi) && ((fd = open_socket()) < 0))) { if ((fd = open(capidevname, O_RDWR|O_NONBLOCK, 0666)) < 0 && (errno == ENOENT)) { @@@@ -619,6 +646,8 @@@@ close(fd); return(errcode); } + } +#if 0 } else if ((applid = ioctl(fd, CAPI_REGISTER, &ioctl_data)) < 0) { if (errno == EIO) { if (ioctl(fd, CAPI_GET_ERRCODE, &ioctl_data) < 0) { @@@@ -664,6 +693,7 @@@@ applid = alloc_applid(fd); } // end old driver compatibility } +#endif if (remember_applid(applid, fd) < 0) { close(fd); return CapiRegOSResourceErr; @@@@ -674,6 +704,7 @@@@ return CapiRegOSResourceErr; } *ApplID = applid; +#endif return CapiNoError; } @@@@ -782,11 +813,15 @@@@ ret = CapiIllAppNr; break; case EIO: +#if 0 if (ioctl(fd, CAPI_GET_ERRCODE, &ioctl_data) < 0) { +#endif ret = CapiMsgOSResourceErr; +#if 0 } else { ret = (unsigned)ioctl_data.errcode; } +#endif break; default: ret = CapiMsgOSResourceErr; @@@@ -840,7 +875,7 @@@@ rcvbuf[15] = (data >> 24) & 0xff; } else { u_int64_t data; - ulong radr = (ulong)rcvbuf; + unsigned long radr = (unsigned long)rcvbuf; if (CAPIMSG_LEN(rcvbuf) < 30) { /* * grr, 64bit arch, but no data64 included, @@@@ -897,6 +932,9 @@@@ { if (capi20_isinstalled() != CapiNoError) return 0; +#ifndef CAPI_MANUFACTURER_LEN +#define CAPI_MANUFACTURER_LEN 64 +#endif if (remote_capi) { unsigned char buf[100]; @@@@ -909,15 +947,19 @@@@ return Buf; } +#if 0 ioctl_data.contr = Ctrl; if (ioctl(capi_fd, CAPI_GET_MANUFACTURER, &ioctl_data) < 0) +#endif return 0; +#if 0 memcpy(Buf, ioctl_data.manufacturer, CAPI_MANUFACTURER_LEN); Buf[CAPI_MANUFACTURER_LEN-1] = 0; return Buf; +#endif } unsigned char * @@@@ -932,16 +974,20 @@@@ set_rcapicmd_header(&p, 14, RCAPI_GET_VERSION_REQ, Ctrl); if(!(remote_command(capi_fd, buf, 14, RCAPI_GET_VERSION_CONF))) return 0; - memcpy(Buf, buf + 1, sizeof(capi_version)); + memcpy(Buf, buf + 1, 128 /* sizeof(capi_version) */); return Buf; } +#if 0 ioctl_data.contr = Ctrl; if (ioctl(capi_fd, CAPI_GET_VERSION, &ioctl_data) < 0) { +#endif return 0; +#if 0 } memcpy(Buf, &ioctl_data.version, sizeof(capi_version)); return Buf; +#endif } unsigned char * @@@@ -950,6 +996,10 @@@@ if (capi20_isinstalled() != CapiNoError) return 0; +#ifndef CAPI_SERIAL_LEN +#define CAPI_SERIAL_LEN 8 +#endif + if (remote_capi) { unsigned char buf[100]; unsigned char *p = buf; @@@@ -961,15 +1011,19 @@@@ return Buf; } +#if 0 ioctl_data.contr = Ctrl; if (ioctl(capi_fd, CAPI_GET_SERIAL, &ioctl_data) < 0) +#endif return 0; +#if 0 memcpy(Buf, &ioctl_data.serial, CAPI_SERIAL_LEN); Buf[CAPI_SERIAL_LEN-1] = 0; return Buf; +#endif } unsigned @@@@ -985,11 +1039,14 @@@@ if(!(remote_command(capi_fd, buf, 14, RCAPI_GET_PROFILE_CONF))) return CapiMsgOSResourceErr; if(*(unsigned short *)buf == CapiNoError) { - memcpy(Buf, buf + 2, (Ctrl) ? sizeof(struct capi_profile) : 2); + memcpy(Buf, buf + 2, (Ctrl) ? 224 /* sizeof(struct capi_profile) */ : 2); } return (*(unsigned short *)buf); } +#if 1 + return CapiMsgOSResourceErr; +#else ioctl_data.contr = Ctrl; if (ioctl(capi_fd, CAPI_GET_PROFILE, &ioctl_data) < 0) { @@@@ -1006,6 +1063,7 @@@@ sizeof(ioctl_data.profile.ncontroller)); } return CapiNoError; +#endif } /* * functions added to the CAPI2.0 spec Index: chan_capi-1.1.4/libcapi20/convert.c --- chan_capi-1.1.4/libcapi20/convert.c.orig 2009-07-23 16:11:08 +0200 +++ chan_capi-1.1.4/libcapi20/convert.c 2009-12-20 11:01:03 +0100 @@@@ -11,7 +11,14 @@@@ #include #include #include +#ifdef __FreeBSD__ +#include +#define bswap_16 bswap16 +#define bswap_32 bswap32 +#define bswap_64 bswap64 +#else #include +#endif #include "capi20.h" Index: channels/console_video.h --- channels/console_video.h.orig 2008-06-30 17:45:15 +0200 +++ channels/console_video.h 2009-12-20 11:01:03 +0100 @@@@ -28,10 +28,7 @@@@ "console {device}" #else -#include -#ifndef OLD_FFMPEG -#include /* requires a recent ffmpeg */ -#endif +#include #define CONSOLE_VIDEO_CMDS \ "console {videodevice|videocodec" \ Index: configure --- configure.orig 2009-10-27 01:16:39 +0100 +++ configure 2009-12-20 11:02:57 +0100 @@@@ -4105,11 +4105,6 @@@@ # note- does not work on FreeBSD case "${host_os}" in - freebsd*) - ac_default_prefix=/usr/local - CPPFLAGS=-I/usr/local/include - LDFLAGS=-L/usr/local/lib - ;; openbsd*) ac_default_prefix=/usr/local if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then Index: main/Makefile --- main/Makefile.orig 2009-11-03 21:01:30 +0100 +++ main/Makefile 2009-12-20 11:01:03 +0100 @@@@ -75,10 +75,7 @@@@ endif ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. - BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) - AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) - AST_LIBS+=-lcrypto + AST_LIBS+=-lpthread -lcrypto endif ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) Index: main/file.c --- main/file.c.orig 2009-12-02 00:36:12 +0100 +++ main/file.c 2009-12-20 11:01:03 +0100 @@@@ -254,7 +254,7 @@@@ char *fn = NULL; if (!strcmp(ext, "wav49")) - ext = "WAV"; + ext = "wav"; if (filename[0] == '/') { if (asprintf(&fn, "%s.%s", filename, ext) < 0) { Index: main/tcptls.c --- main/tcptls.c.orig 2009-10-22 23:55:48 +0200 +++ main/tcptls.c 2009-12-20 11:01:03 +0100 @@@@ -319,6 +319,7 @@@@ if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) { if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0) ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath); + SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL)); } ast_verb(0, "SSL certificate ok\n"); Index: menuselect-tree --- menuselect-tree.orig 2009-12-17 21:31:44 +0100 +++ menuselect-tree 2009-12-20 11:01:03 +0100 @@@@ -153,6 +153,8 @@@@ + + @@@@ -684,9 +686,9 @@@@ + yes - yes @@@@ -762,6 +764,7 @@@@ + yes Index: res/res_http_post.c --- res/res_http_post.c.orig 2009-10-27 18:12:09 +0100 +++ res/res_http_post.c 2009-12-20 11:01:03 +0100 @@@@ -122,14 +122,8 @@@@ ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n"); return; } else if (GMIME_IS_MULTIPART(part)) { - GList *l; - - ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n"); - l = GMIME_MULTIPART(part)->subparts; - while (l) { - process_message_callback(l->data, cbinfo); - l = l->next; - } + ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n"); + g_mime_multipart_foreach(GMIME_MULTIPART(part), process_message_callback, cbinfo); } else if (GMIME_IS_PART(part)) { const char *filename; Index: sounds/sounds.xml --- sounds/sounds.xml.orig 2009-08-18 22:31:40 +0200 +++ sounds/sounds.xml 2009-12-20 11:01:03 +0100 @@@@ -4,9 +4,9 @@@@ + yes - yes @@@@ -82,6 +82,7 @@@@ + yes Index: asterisk-addons-1.6.2.0/Makefile --- asterisk-addons-1.6.2.0/Makefile.orig 2008-11-06 18:44:05 +0100 +++ asterisk-addons-1.6.2.0/Makefile 2009-12-20 11:23:47 +0100 @@@@ -185,7 +185,7 @@@@ install-xmldoc: doc/addons-en_US.xml @@echo "Installing XML documentation" - @@$(INSTALL) -m 644 doc/addons-*.xml $(ASTDATADIR)/documentation + @@$(INSTALL) -m 644 doc/addons-*.xml $(DESTDIR)$(ASTDATADIR)/documentation cleantest: @ 1.52 log @upgrading package: asterisk 1.6.1.4 -> 1.6.1.5 @ text @d2 3 a4 3 --- Makefile.orig 2009-08-04 16:54:45 +0200 +++ Makefile 2009-08-30 22:11:17 +0200 @@@@ -116,42 +116,20 @@@@ d29 1 d32 1 a32 1 ASTVARRUNDIR=$(localstatedir)/run a41 1 + ASTVARRUNDIR=$(localstatedir)/run d51 1 a51 1 @@@@ -251,12 +229,6 @@@@ d64 1 a64 3 @@@@ -525,8 +497,7 @@@@ if [ -n "$(OLDHEADERS)" ]; then \ rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ d66 2 d75 2 a76 2 --- /dev/null 2009-08-30 22:11:23 +0200 +++ apps/app_backticks.c 2009-08-30 22:08:00 +0200 d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.51 $") d208 3 a210 3 --- apps/app_meetme.c.orig 2009-08-10 21:30:55 +0200 +++ apps/app_meetme.c 2009-08-30 22:08:00 +0200 @@@@ -163,6 +163,7 @@@@ d218 1 a218 1 @@@@ -172,6 +173,7 @@@@ d226 1 a226 1 @@@@ -204,6 +206,7 @@@@ d234 1 a234 1 @@@@ -1876,6 +1879,12 @@@@ d247 1 a247 1 @@@@ -1892,6 +1901,7 @@@@ d257 1 a257 1 +++ build_tools/make_defaults_h 2009-08-30 22:08:00 +0200 d268 3 a270 3 --- cdr/cdr_custom.c.orig 2008-11-20 19:23:03 +0100 +++ cdr/cdr_custom.c 2009-08-30 22:08:00 +0200 @@@@ -78,7 +78,7 @@@@ d280 3 a282 3 --- cdr/cdr_sqlite3_custom.c.orig 2009-06-22 18:31:02 +0200 +++ cdr/cdr_sqlite3_custom.c 2009-08-30 22:08:00 +0200 @@@@ -304,7 +304,7 @@@@ d293 1 a293 1 +++ chan_capi-1.1.4/Makefile 2009-08-30 22:08:00 +0200 d306 1 a306 1 +++ chan_capi-1.1.4/chan_capi20.h 2009-08-30 22:08:00 +0200 d327 1 a327 1 +++ chan_capi-1.1.4/chan_capi_utils.c 2009-08-30 22:08:00 +0200 d340 1 a340 1 +++ chan_capi-1.1.4/libcapi20/capi20.c 2009-08-30 22:08:00 +0200 d652 1 a652 1 +++ chan_capi-1.1.4/libcapi20/convert.c 2009-08-30 22:08:00 +0200 d670 1 a670 1 +++ channels/console_video.h 2009-08-30 22:08:00 +0200 d684 3 a686 3 --- configure.orig 2009-06-16 21:28:00 +0200 +++ configure 2009-08-30 22:08:00 +0200 @@@@ -4179,12 +4179,6 @@@@ d695 3 a697 4 - darwin*) cat >>confdefs.h <<\_ACEOF d699 3 a701 3 --- main/Makefile.orig 2009-08-01 03:25:04 +0200 +++ main/Makefile 2009-08-30 22:08:00 +0200 @@@@ -72,10 +72,7 @@@@ d714 2 a715 2 --- main/file.c.orig 2009-06-26 23:26:50 +0200 +++ main/file.c 2009-08-30 22:08:00 +0200 d726 3 a728 3 --- main/tcptls.c.orig 2009-03-09 22:22:42 +0100 +++ main/tcptls.c 2009-08-30 22:08:00 +0200 @@@@ -314,6 +314,7 @@@@ d737 3 a739 3 --- menuselect-tree.orig 2009-08-28 17:49:18 +0200 +++ menuselect-tree 2009-08-30 22:08:00 +0200 @@@@ -148,6 +148,8 @@@@ d748 1 a748 1 @@@@ -654,9 +656,9 @@@@ d759 1 a759 1 @@@@ -716,6 +718,7 @@@@ d768 3 a770 3 --- res/res_http_post.c.orig 2009-08-10 21:30:55 +0200 +++ res/res_http_post.c 2009-08-30 22:08:00 +0200 @@@@ -119,14 +119,8 @@@@ d788 2 a789 2 --- sounds/sounds.xml.orig 2009-08-18 22:42:51 +0200 +++ sounds/sounds.xml 2009-08-30 22:08:00 +0200 d801 1 a801 1 @@@@ -66,6 +66,7 @@@@ d809 12 @ 1.51 log @modifying package: asterisk-1.6.1.4 20090811 -> 20090816 @ text @d2 3 a4 3 --- Makefile.orig 2009-02-24 21:44:50 +0100 +++ Makefile 2009-08-05 20:40:23 +0200 @@@@ -122,42 +122,20 @@@@ d51 2 a52 2 @@@@ -258,12 +236,6 @@@@ ASTCFLAGS+=-fsigned-char d58 1 a58 1 - ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) d62 1 a62 1 ASTCFLAGS+=-pthread -I/usr/pkg/include d64 1 a64 1 @@@@ -534,8 +506,7 @@@@ d75 2 a76 2 --- /dev/null 2009-08-05 20:40:27 +0200 +++ apps/app_backticks.c 2009-08-05 20:40:23 +0200 d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.50 $") d208 2 a209 2 --- apps/app_meetme.c.orig 2009-03-03 00:39:56 +0100 +++ apps/app_meetme.c 2009-08-05 20:40:23 +0200 d257 1 a257 1 +++ build_tools/make_defaults_h 2009-08-05 20:40:23 +0200 d269 1 a269 1 +++ cdr/cdr_custom.c 2009-08-05 20:40:23 +0200 d280 4 a283 4 --- cdr/cdr_sqlite3_custom.c.orig 2009-03-02 18:19:41 +0100 +++ cdr/cdr_sqlite3_custom.c 2009-08-05 20:40:23 +0200 @@@@ -322,7 +322,7 @@@@ return AST_MODULE_LOAD_DECLINE; d293 1 a293 1 +++ chan_capi-1.1.4/Makefile 2009-08-05 20:40:23 +0200 d306 1 a306 1 +++ chan_capi-1.1.4/chan_capi20.h 2009-08-05 20:40:23 +0200 d327 1 a327 1 +++ chan_capi-1.1.4/chan_capi_utils.c 2009-08-05 20:41:26 +0200 d340 1 a340 1 +++ chan_capi-1.1.4/libcapi20/capi20.c 2009-08-05 20:40:23 +0200 d652 1 a652 1 +++ chan_capi-1.1.4/libcapi20/convert.c 2009-08-05 20:40:23 +0200 d670 1 a670 1 +++ channels/console_video.h 2009-08-05 20:40:23 +0200 d684 3 a686 3 --- configure.orig 2009-03-19 19:14:55 +0100 +++ configure 2009-08-05 20:40:23 +0200 @@@@ -4053,12 +4053,6 @@@@ d700 2 a701 2 --- main/Makefile.orig 2009-04-09 07:16:25 +0200 +++ main/Makefile 2009-08-05 20:40:23 +0200 d715 3 a717 3 --- main/file.c.orig 2009-04-15 22:20:23 +0200 +++ main/file.c 2009-08-05 20:40:23 +0200 @@@@ -248,7 +248,7 @@@@ d728 1 a728 1 +++ main/tcptls.c 2009-08-05 20:40:23 +0200 d738 2 a739 2 --- menuselect-tree.orig 2009-07-27 23:05:03 +0200 +++ menuselect-tree 2009-08-05 20:40:23 +0200 d749 1 a749 1 @@@@ -647,9 +649,9 @@@@ d760 1 a760 1 @@@@ -709,6 +711,7 @@@@ d769 2 a770 2 --- res/res_http_post.c.orig 2009-01-14 00:14:29 +0100 +++ res/res_http_post.c 2009-08-05 20:40:23 +0200 d789 2 a790 2 --- sounds/sounds.xml.orig 2008-10-09 22:01:38 +0200 +++ sounds/sounds.xml 2009-08-05 20:40:23 +0200 @ 1.50 log @modifying package: asterisk-1.6.1.2 20090801 -> 20090805 @ text @d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.49 $") d291 3 a293 3 Index: chan_capi-1.1.3/Makefile --- chan_capi-1.1.3/Makefile.orig 2009-07-23 16:11:08 +0200 +++ chan_capi-1.1.3/Makefile 2009-08-05 20:40:23 +0200 d304 3 a306 3 Index: chan_capi-1.1.3/chan_capi20.h --- chan_capi-1.1.3/chan_capi20.h.orig 2005-09-20 20:33:40 +0200 +++ chan_capi-1.1.3/chan_capi20.h 2009-08-05 20:40:23 +0200 d325 3 a327 3 Index: chan_capi-1.1.3/chan_capi_utils.c --- chan_capi-1.1.3/chan_capi_utils.c.orig 2009-07-23 16:11:08 +0200 +++ chan_capi-1.1.3/chan_capi_utils.c 2009-08-05 20:41:26 +0200 d338 3 a340 3 Index: chan_capi-1.1.3/libcapi20/capi20.c --- chan_capi-1.1.3/libcapi20/capi20.c.orig 2009-07-23 16:11:08 +0200 +++ chan_capi-1.1.3/libcapi20/capi20.c 2009-08-05 20:40:23 +0200 d650 3 a652 3 Index: chan_capi-1.1.3/libcapi20/convert.c --- chan_capi-1.1.3/libcapi20/convert.c.orig 2009-07-23 16:11:08 +0200 +++ chan_capi-1.1.3/libcapi20/convert.c 2009-08-05 20:40:23 +0200 @ 1.49 log @modifying package: asterisk-1.6.1.1 20090606 -> 20090725 @ text @d3 1 a3 1 +++ Makefile 2009-05-04 12:48:53 +0200 d75 2 a76 2 --- /dev/null 2009-05-04 12:48:56 +0200 +++ apps/app_backticks.c 2009-05-04 12:48:53 +0200 d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.48 $") d209 1 a209 1 +++ apps/app_meetme.c 2009-05-04 12:48:53 +0200 d257 1 a257 1 +++ build_tools/make_defaults_h 2009-05-04 12:48:53 +0200 d269 1 a269 1 +++ cdr/cdr_custom.c 2009-05-04 12:48:53 +0200 d281 1 a281 1 +++ cdr/cdr_sqlite3_custom.c 2009-05-04 12:48:53 +0200 d291 3 a293 3 Index: chan_capi-1.1.2/Makefile --- chan_capi-1.1.2/Makefile.orig 2009-01-17 18:36:50 +0100 +++ chan_capi-1.1.2/Makefile 2009-05-04 12:48:53 +0200 d304 3 a306 3 Index: chan_capi-1.1.2/chan_capi20.h --- chan_capi-1.1.2/chan_capi20.h.orig 2005-09-20 20:33:40 +0200 +++ chan_capi-1.1.2/chan_capi20.h 2009-05-04 12:48:53 +0200 d325 16 a340 3 Index: chan_capi-1.1.2/libcapi20/capi20.c --- chan_capi-1.1.2/libcapi20/capi20.c.orig 2008-12-31 17:29:36 +0100 +++ chan_capi-1.1.2/libcapi20/capi20.c 2009-05-04 12:48:53 +0200 d352 1 a352 1 @@@@ -46,17 +48,23 @@@@ d376 1 a376 1 @@@@ -75,17 +83,21 @@@@ d398 1 a398 1 @@@@ -93,10 +105,12 @@@@ d411 1 a411 1 @@@@ -142,6 +156,7 @@@@ d419 1 a419 1 @@@@ -195,11 +210,13 @@@@ d433 1 a433 1 @@@@ -223,6 +240,7 @@@@ d441 2 a442 2 @@@@ -316,6 +334,8 @@@@ if (capi_fd >= 0) d450 1 a450 1 @@@@ -335,6 +355,8 @@@@ d459 1 a459 1 @@@@ -409,6 +431,7 @@@@ d467 1 a467 1 @@@@ -447,6 +470,7 @@@@ d475 1 a475 1 @@@@ -564,14 +588,17 @@@@ d493 1 a493 1 @@@@ -609,6 +636,8 @@@@ d502 1 a502 1 @@@@ -654,6 +683,7 @@@@ d510 1 a510 1 @@@@ -664,6 +694,7 @@@@ d518 1 a518 1 @@@@ -772,11 +803,15 @@@@ d534 1 a534 1 @@@@ -830,7 +865,7 @@@@ d543 1 a543 1 @@@@ -887,6 +922,9 @@@@ d553 1 a553 1 @@@@ -899,15 +937,19 @@@@ d573 1 a573 1 @@@@ -922,16 +964,20 @@@@ d595 1 a595 1 @@@@ -940,6 +986,10 @@@@ d606 1 a606 1 @@@@ -951,15 +1001,19 @@@@ d626 1 a626 1 @@@@ -975,11 +1029,14 @@@@ d642 1 a642 1 @@@@ -996,6 +1053,7 @@@@ d650 3 a652 3 Index: chan_capi-1.1.2/libcapi20/convert.c --- chan_capi-1.1.2/libcapi20/convert.c.orig 2008-03-13 12:02:41 +0100 +++ chan_capi-1.1.2/libcapi20/convert.c 2009-05-04 12:48:53 +0200 d670 1 a670 1 +++ channels/console_video.h 2009-05-04 12:48:53 +0200 d685 1 a685 1 +++ configure 2009-05-04 12:48:53 +0200 d701 1 a701 1 +++ main/Makefile 2009-05-04 12:48:53 +0200 d716 1 a716 1 +++ main/file.c 2009-05-04 12:48:53 +0200 d728 1 a728 1 +++ main/tcptls.c 2009-05-04 12:48:53 +0200 d738 2 a739 2 --- menuselect-tree.orig 2009-04-27 21:45:53 +0200 +++ menuselect-tree 2009-05-04 12:48:53 +0200 d770 1 a770 1 +++ res/res_http_post.c 2009-05-04 12:48:53 +0200 d790 1 a790 1 +++ sounds/sounds.xml 2009-05-04 12:48:53 +0200 @ 1.48 log @upgrading package: asterisk 1.6.0.9 -> 1.6.1.0 @ text @d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.47 $") a254 12 Index: asterisk-addons-1.6.1.0/Makefile --- asterisk-addons-1.6.1.0/Makefile.orig 2008-11-06 18:44:05 +0100 +++ asterisk-addons-1.6.1.0/Makefile 2009-05-04 12:48:53 +0200 @@@@ -185,7 +185,7 @@@@ install-xmldoc: doc/addons-en_US.xml @@echo "Installing XML documentation" - @@$(INSTALL) -m 644 doc/addons-*.xml $(ASTDATADIR)/documentation + @@$(INSTALL) -m 644 doc/addons-*.xml $(DESTDIR)$(ASTDATADIR)/documentation cleantest: @ 1.47 log @upgrading package: asterisk 1.6.0.6 -> 1.6.0.8 @ text @d2 2 a3 2 --- Makefile.orig 2008-12-03 01:53:56 +0100 +++ Makefile 2009-04-03 09:41:24 +0200 d51 1 a51 1 @@@@ -250,12 +228,6 @@@@ d64 1 a64 1 @@@@ -526,8 +498,7 @@@@ d75 2 a76 2 --- /dev/null 2009-04-03 09:41:48 +0200 +++ apps/app_backticks.c 2009-04-03 09:41:24 +0200 d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.46 $") d208 3 a210 3 --- apps/app_meetme.c.orig 2009-03-03 00:38:23 +0100 +++ apps/app_meetme.c 2009-04-03 09:41:24 +0200 @@@@ -165,6 +165,7 @@@@ d218 1 a218 1 @@@@ -174,6 +175,7 @@@@ d226 1 a226 1 @@@@ -206,6 +208,7 @@@@ d234 1 a234 1 @@@@ -1832,6 +1835,12 @@@@ d247 1 a247 1 @@@@ -1848,6 +1857,7 @@@@ d255 12 d269 1 a269 1 +++ build_tools/make_defaults_h 2009-04-03 09:41:24 +0200 d280 2 a281 2 --- cdr/cdr_custom.c.orig 2008-03-25 23:52:24 +0100 +++ cdr/cdr_custom.c 2009-04-03 09:41:24 +0200 d289 1 a289 1 ast_log(LOG_NOTICE, "Sorry, only one mapping is supported at this time, mapping '%s' will be ignored at line %d.\n", var->next->name, var->next->lineno); d292 2 a293 2 --- cdr/cdr_sqlite3_custom.c.orig 2009-03-02 18:16:57 +0100 +++ cdr/cdr_sqlite3_custom.c 2009-04-03 09:41:24 +0200 d305 1 a305 1 +++ chan_capi-1.1.2/Makefile 2009-04-03 09:41:24 +0200 d318 1 a318 1 +++ chan_capi-1.1.2/chan_capi20.h 2009-04-03 09:41:24 +0200 d339 1 a339 1 +++ chan_capi-1.1.2/libcapi20/capi20.c 2009-04-03 09:41:24 +0200 d651 1 a651 1 +++ chan_capi-1.1.2/libcapi20/convert.c 2009-04-03 09:41:24 +0200 d668 2 a669 2 --- channels/console_video.h.orig 2008-01-09 19:03:40 +0100 +++ channels/console_video.h 2009-04-03 09:41:24 +0200 d683 3 a685 3 --- configure.orig 2009-03-18 15:24:27 +0100 +++ configure 2009-04-03 09:42:04 +0200 @@@@ -4040,12 +4040,6 @@@@ a697 12 Index: include/asterisk/module.h --- include/asterisk/module.h.orig 2008-11-29 19:37:55 +0100 +++ include/asterisk/module.h 2009-04-03 09:41:24 +0200 @@@@ -271,7 +271,7 @@@@ /* forward declare this pointer in modules, so that macro/function calls that need it can get it, since it will actually be declared and populated at the end of the module's source file... */ -const static __attribute__((unused)) struct ast_module_info *ast_module_info; +static const __attribute__((unused)) struct ast_module_info *ast_module_info; #if !defined(EMBEDDED_MODULE) #define __MODULE_INFO_SECTION d699 2 a700 2 --- main/Makefile.orig 2009-03-18 15:24:27 +0100 +++ main/Makefile 2009-04-03 09:41:24 +0200 d714 3 a716 3 --- main/file.c.orig 2009-02-04 16:30:54 +0100 +++ main/file.c 2009-04-03 09:41:24 +0200 @@@@ -247,7 +247,7 @@@@ a724 19 Index: main/http.c --- main/http.c.orig 2009-01-14 00:11:19 +0100 +++ main/http.c 2009-04-03 09:41:24 +0200 @@@@ -435,14 +435,8 @@@@ ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n"); return; } else if (GMIME_IS_MULTIPART(part)) { - GList *l; - ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n"); - l = GMIME_MULTIPART (part)->subparts; - while (l) { - process_message_callback(l->data, cbinfo); - l = l->next; - } + g_mime_multipart_foreach(GMIME_MULTIPART(part), process_message_callback, cbinfo); } else if (GMIME_IS_PART(part)) { const char *filename; d726 3 a728 3 --- main/tcptls.c.orig 2009-02-04 19:55:32 +0100 +++ main/tcptls.c 2009-04-03 09:41:24 +0200 @@@@ -210,6 +210,7 @@@@ d737 3 a739 3 --- menuselect-tree.orig 2009-04-02 19:47:58 +0200 +++ menuselect-tree 2009-04-03 09:41:24 +0200 @@@@ -155,6 +155,8 @@@@ d748 1 a748 1 @@@@ -617,9 +619,9 @@@@ d759 1 a759 1 @@@@ -677,6 +679,7 @@@@ d767 20 d788 2 a789 2 --- sounds/sounds.xml.orig 2008-03-06 05:46:17 +0100 +++ sounds/sounds.xml 2009-04-03 09:41:24 +0200 d801 1 a801 1 @@@@ -64,6 +64,7 @@@@ @ 1.46 log @modifying package: asterisk-1.6.0.6 20090223 -> 20090328 @ text @d3 1 a3 1 +++ Makefile 2009-02-23 22:08:08 +0100 d75 2 a76 2 --- /dev/null 2009-02-23 22:11:56 +0100 +++ apps/app_backticks.c 2009-02-23 22:08:08 +0100 d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.45 $") d208 3 a210 3 --- apps/app_meetme.c.orig 2009-01-22 17:53:12 +0100 +++ apps/app_meetme.c 2009-02-23 22:11:46 +0100 @@@@ -163,6 +163,7 @@@@ d218 1 a218 1 @@@@ -172,6 +173,7 @@@@ d226 1 a226 1 @@@@ -203,6 +205,7 @@@@ d234 1 a234 1 @@@@ -1830,6 +1833,12 @@@@ d247 1 a247 1 @@@@ -1846,6 +1855,7 @@@@ d257 1 a257 1 +++ build_tools/make_defaults_h 2009-02-23 22:08:08 +0100 d269 1 a269 1 +++ cdr/cdr_custom.c 2009-02-23 22:08:08 +0100 d280 3 a282 3 --- cdr/cdr_sqlite3_custom.c.orig 2008-08-14 20:48:39 +0200 +++ cdr/cdr_sqlite3_custom.c 2009-02-23 22:08:08 +0100 @@@@ -317,7 +317,7 @@@@ a290 153 Index: channels/console_video.h --- channels/console_video.h.orig 2008-01-09 19:03:40 +0100 +++ channels/console_video.h 2009-02-23 22:08:08 +0100 @@@@ -28,10 +28,7 @@@@ "console {device}" #else -#include -#ifndef OLD_FFMPEG -#include /* requires a recent ffmpeg */ -#endif +#include #define CONSOLE_VIDEO_CMDS \ "console {videodevice|videocodec" \ Index: configure --- configure.orig 2009-01-30 00:47:00 +0100 +++ configure 2009-02-23 22:08:08 +0100 @@@@ -4040,12 +4040,6 @@@@ # note- does not work on FreeBSD case "${host_os}" in - freebsd*) - ac_default_prefix=/usr/local - CPPFLAGS=-I/usr/local/include - LDFLAGS=-L/usr/local/lib - ;; - *) ac_default_prefix=/usr if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then Index: include/asterisk/module.h --- include/asterisk/module.h.orig 2008-11-29 19:37:55 +0100 +++ include/asterisk/module.h 2009-02-23 22:08:08 +0100 @@@@ -271,7 +271,7 @@@@ /* forward declare this pointer in modules, so that macro/function calls that need it can get it, since it will actually be declared and populated at the end of the module's source file... */ -const static __attribute__((unused)) struct ast_module_info *ast_module_info; +static const __attribute__((unused)) struct ast_module_info *ast_module_info; #if !defined(EMBEDDED_MODULE) #define __MODULE_INFO_SECTION Index: main/Makefile --- main/Makefile.orig 2008-11-29 19:37:55 +0100 +++ main/Makefile 2009-02-23 22:08:08 +0100 @@@@ -81,10 +81,7 @@@@ endif ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. - BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) - AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) - AST_LIBS+=-lcrypto + AST_LIBS+=-lpthread -lcrypto endif ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) Index: main/file.c --- main/file.c.orig 2009-02-04 16:30:54 +0100 +++ main/file.c 2009-02-23 22:08:08 +0100 @@@@ -247,7 +247,7 @@@@ char *fn = NULL; if (!strcmp(ext, "wav49")) - ext = "WAV"; + ext = "wav"; if (filename[0] == '/') { if (asprintf(&fn, "%s.%s", filename, ext) < 0) { Index: main/http.c --- main/http.c.orig 2009-01-14 00:11:19 +0100 +++ main/http.c 2009-02-23 22:08:08 +0100 @@@@ -435,14 +435,8 @@@@ ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n"); return; } else if (GMIME_IS_MULTIPART(part)) { - GList *l; - ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n"); - l = GMIME_MULTIPART (part)->subparts; - while (l) { - process_message_callback(l->data, cbinfo); - l = l->next; - } + g_mime_multipart_foreach(GMIME_MULTIPART(part), process_message_callback, cbinfo); } else if (GMIME_IS_PART(part)) { const char *filename; Index: main/tcptls.c --- main/tcptls.c.orig 2009-02-04 19:55:32 +0100 +++ main/tcptls.c 2009-02-23 22:08:08 +0100 @@@@ -210,6 +210,7 @@@@ if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) { if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0) ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath); + SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL)); } ast_verb(0, "SSL certificate ok\n"); Index: menuselect-tree --- menuselect-tree.orig 2009-02-23 18:32:38 +0100 +++ menuselect-tree 2009-02-23 22:08:08 +0100 @@@@ -155,6 +155,8 @@@@ + + @@@@ -617,9 +619,9 @@@@ + yes - yes @@@@ -677,6 +679,7 @@@@ + yes Index: sounds/sounds.xml --- sounds/sounds.xml.orig 2008-03-06 05:46:17 +0100 +++ sounds/sounds.xml 2009-02-23 22:08:08 +0100 @@@@ -4,9 +4,9 @@@@ + yes - yes @@@@ -64,6 +64,7 @@@@ + yes d293 1 a293 1 +++ chan_capi-1.1.2/Makefile 2009-03-28 18:27:10 +0100 d306 1 a306 1 +++ chan_capi-1.1.2/chan_capi20.h 2009-03-28 18:28:02 +0100 d327 1 a327 1 +++ chan_capi-1.1.2/libcapi20/capi20.c 2009-03-28 19:25:29 +0100 d639 1 a639 1 +++ chan_capi-1.1.2/libcapi20/convert.c 2009-03-28 18:34:40 +0100 d655 153 @ 1.45 log @upgrading package: asterisk 1.6.0.5 -> 1.6.0.6 @ text @d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.44 $") d444 364 @ 1.44 log @upgrading package: asterisk 1.6.0.2 -> 1.6.0.3 @ text @d3 1 a3 1 +++ Makefile 2009-01-08 08:25:58 +0100 d75 2 a76 2 --- /dev/null 2009-01-08 20:47:46 +0100 +++ apps/app_backticks.c 2009-01-08 08:25:58 +0100 d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.43 $") d208 3 a210 5 --- apps/app_meetme.c.orig 2008-12-03 00:10:07 +0100 +++ apps/app_meetme.c 2009-01-08 08:25:58 +0100 @@@@ -161,6 +161,7 @@@@ CONFFLAG_KICK_CONTINUE = (1 << 28), CONFFLAG_DURATION_STOP = (1 << 29), d212 2 d218 1 a218 1 @@@@ -170,6 +171,7 @@@@ d226 1 a226 1 @@@@ -201,6 +203,7 @@@@ d234 1 a234 1 @@@@ -1817,6 +1820,12 @@@@ d247 1 a247 1 @@@@ -1833,6 +1842,7 @@@@ d257 1 a257 1 +++ build_tools/make_defaults_h 2009-01-08 08:25:58 +0100 d269 1 a269 1 +++ cdr/cdr_custom.c 2009-01-08 08:25:58 +0100 d281 1 a281 1 +++ cdr/cdr_sqlite3_custom.c 2009-01-08 08:25:58 +0100 d293 1 a293 1 +++ channels/console_video.h 2009-01-08 08:25:58 +0100 d307 3 a309 3 --- configure.orig 2008-12-01 22:45:00 +0100 +++ configure 2009-01-08 08:25:58 +0100 @@@@ -4039,12 +4039,6 @@@@ d324 1 a324 1 +++ include/asterisk/module.h 2009-01-08 08:25:58 +0100 d336 1 a336 1 +++ main/Makefile 2009-01-08 08:25:58 +0100 d350 3 a352 3 --- main/file.c.orig 2008-11-03 01:39:04 +0100 +++ main/file.c 2009-01-08 08:25:58 +0100 @@@@ -246,7 +246,7 @@@@ d362 2 a363 2 --- main/http.c.orig 2008-11-03 01:39:04 +0100 +++ main/http.c 2009-01-08 08:25:58 +0100 d381 2 a382 2 --- main/tcptls.c.orig 2008-06-18 22:08:45 +0200 +++ main/tcptls.c 2009-01-08 08:25:58 +0100 d392 3 a394 3 --- menuselect-tree.orig 2009-01-06 22:54:50 +0100 +++ menuselect-tree 2009-01-08 08:25:58 +0100 @@@@ -149,6 +149,8 @@@@ d403 1 a403 1 @@@@ -608,9 +610,9 @@@@ d414 1 a414 1 @@@@ -668,6 +670,7 @@@@ d424 1 a424 1 +++ sounds/sounds.xml 2009-01-08 08:25:58 +0100 @ 1.43 log @upgrading package: asterisk 1.6.0.1 -> 1.6.0.2 @ text @d2 3 a4 3 --- Makefile.orig 2008-08-26 20:12:08 +0200 +++ Makefile 2008-09-05 20:50:40 +0200 @@@@ -121,42 +121,20 @@@@ d51 1 a51 1 @@@@ -245,12 +223,6 @@@@ d64 1 a64 1 @@@@ -522,8 +494,7 @@@@ d75 2 a76 2 --- /dev/null 2008-09-05 20:51:23 +0200 +++ apps/app_backticks.c 2008-09-05 20:50:40 +0200 d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.42 $") d208 3 a210 3 --- apps/app_meetme.c.orig 2008-07-30 00:29:11 +0200 +++ apps/app_meetme.c 2008-09-05 20:50:40 +0200 @@@@ -160,6 +160,7 @@@@ d218 1 a218 1 @@@@ -169,6 +170,7 @@@@ d226 1 a226 1 @@@@ -200,6 +202,7 @@@@ d234 1 a234 1 @@@@ -1698,6 +1701,12 @@@@ d247 1 a247 1 @@@@ -1714,6 +1723,7 @@@@ d257 1 a257 1 +++ build_tools/make_defaults_h 2008-09-05 20:50:40 +0200 d269 1 a269 1 +++ cdr/cdr_custom.c 2008-09-05 20:50:40 +0200 d281 1 a281 1 +++ cdr/cdr_sqlite3_custom.c 2008-09-05 20:50:40 +0200 d293 1 a293 1 +++ channels/console_video.h 2008-09-05 20:50:40 +0200 d307 3 a309 3 --- configure.orig 2008-07-30 23:41:23 +0200 +++ configure 2008-09-05 20:50:40 +0200 @@@@ -4033,12 +4033,6 @@@@ d323 2 a324 2 --- include/asterisk/module.h.orig 2008-02-27 09:20:15 +0100 +++ include/asterisk/module.h 2008-09-05 20:50:40 +0200 d335 2 a336 2 --- main/Makefile.orig 2008-07-28 21:55:44 +0200 +++ main/Makefile 2008-09-05 20:50:40 +0200 d350 2 a351 2 --- main/file.c.orig 2008-07-28 18:49:18 +0200 +++ main/file.c 2008-09-05 20:50:40 +0200 d359 2 a360 2 if (filename[0] == '/') asprintf(&fn, "%s.%s", filename, ext); d362 3 a364 3 --- main/http.c.orig 2008-08-01 00:34:44 +0200 +++ main/http.c 2008-09-05 20:50:40 +0200 @@@@ -433,14 +433,8 @@@@ d382 1 a382 1 +++ main/tcptls.c 2008-09-05 20:50:40 +0200 d392 3 a394 3 --- menuselect-tree.orig 2008-09-03 17:04:40 +0200 +++ menuselect-tree 2008-09-05 20:50:40 +0200 @@@@ -148,6 +148,8 @@@@ d403 1 a403 1 @@@@ -607,9 +609,9 @@@@ d414 1 a414 1 @@@@ -667,6 +669,7 @@@@ d424 1 a424 1 +++ sounds/sounds.xml 2008-09-05 20:50:40 +0200 a443 20 Index: main/manager.c --- main/manager.c.orig 2008-12-01 17:04:31 +0100 +++ main/manager.c 2008-07-31 23:58:26 +0200 @@@@ -1728,15 +1719,7 @@@@ } if (varname[strlen(varname) - 1] == ')') { - if (!c) { - c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", SENTINEL); - if (c) { - ast_func_read(c, (char *) varname, workspace, sizeof(workspace)); - ast_channel_free(c); - } else - ast_log(LOG_ERROR, "Unable to allocate bogus channel for variable substitution. Function results may be blank.\n"); - } else - ast_func_read(c, (char *) varname, workspace, sizeof(workspace)); + ast_func_read(c, (char *) varname, workspace, sizeof(workspace)); varval = workspace; } else { pbx_retrieve_variable(c, varname, &varval, workspace, sizeof(workspace), NULL); @ 1.42 log @upgrading package: asterisk 1.6.0b9 -> 1.6.0rc4 @ text @d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.41 $") d444 20 @ 1.41 log @fix building against GMIME 2.3.x @ text @d2 2 a3 2 --- Makefile.orig 2008-04-18 22:02:05 +0200 +++ Makefile 2008-05-07 08:25:13 +0200 d64 1 a64 1 @@@@ -526,8 +498,7 @@@@ d75 2 a76 2 --- /dev/null 2008-05-07 08:38:19 +0200 +++ apps/app_backticks.c 2008-05-07 08:25:13 +0200 d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.40 $") d208 3 a210 3 --- apps/app_meetme.c.orig 2008-04-13 16:38:35 +0200 +++ apps/app_meetme.c 2008-05-07 08:40:11 +0200 @@@@ -159,6 +159,7 @@@@ d218 1 a218 1 @@@@ -168,6 +169,7 @@@@ d226 1 a226 1 @@@@ -199,6 +201,7 @@@@ d234 1 a234 1 @@@@ -1697,6 +1700,12 @@@@ d247 1 a247 1 @@@@ -1713,6 +1722,7 @@@@ d257 1 a257 1 +++ build_tools/make_defaults_h 2008-05-07 08:25:13 +0200 d269 1 a269 1 +++ cdr/cdr_custom.c 2008-05-07 08:25:13 +0200 d280 2 a281 2 --- cdr/cdr_sqlite3_custom.c.orig 2008-03-18 16:58:50 +0100 +++ cdr/cdr_sqlite3_custom.c 2008-05-07 08:25:13 +0200 d293 1 a293 1 +++ channels/console_video.h 2008-05-07 08:25:13 +0200 d307 3 a309 3 --- configure.orig 2008-03-18 16:50:53 +0100 +++ configure 2008-05-07 08:25:13 +0200 @@@@ -4026,12 +4026,6 @@@@ d321 1 a321 1 if test ${sysconfdir} = '${prefix}/etc'; then d324 1 a324 1 +++ include/asterisk/module.h 2008-05-07 08:25:13 +0200 d335 3 a337 3 --- main/Makefile.orig 2008-04-04 02:54:22 +0200 +++ main/Makefile 2008-05-07 08:25:13 +0200 @@@@ -82,10 +82,7 @@@@ d350 2 a351 2 --- main/file.c.orig 2008-04-10 19:27:35 +0200 +++ main/file.c 2008-05-07 08:25:13 +0200 d361 19 d381 3 a383 3 --- main/tcptls.c.orig 2008-03-12 23:50:14 +0100 +++ main/tcptls.c 2008-05-07 08:25:13 +0200 @@@@ -189,6 +189,7 @@@@ d392 3 a394 3 --- menuselect-tree.orig 2008-04-23 00:30:52 +0200 +++ menuselect-tree 2008-05-07 08:25:13 +0200 @@@@ -134,6 +134,8 @@@@ d403 1 a403 9 @@@@ -262,7 +264,6 @@@@ res_smdi - zaptel_vldtmf zaptel tonezone pri @@@@ -598,9 +599,9 @@@@ d414 1 a414 1 @@@@ -658,6 +659,7 @@@@ d424 1 a424 1 +++ sounds/sounds.xml 2008-05-07 08:25:13 +0200 a443 19 Index: main/http.c --- main/http.c.orig 2008-04-24 00:54:41 +0200 +++ main/http.c 2008-07-04 19:41:01 +0200 @@@@ -417,14 +417,8 @@@@ ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n"); return; } else if (GMIME_IS_MULTIPART(part)) { - GList *l; - ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n"); - l = GMIME_MULTIPART (part)->subparts; - while (l) { - process_message_callback(l->data, cbinfo); - l = l->next; - } + g_mime_multipart_foreach(GMIME_MULTIPART(part), process_message_callback, cbinfo); } else if (GMIME_IS_PART(part)) { const char *filename; @ 1.40 log @upgrading package: asterisk 1.6.0b6 -> 1.6.0b8 @ text @d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.39 $") d433 19 @ 1.39 log @add initial cut for a MeetMe addition to pass an audio file containing the user name (conference introduction) @ text @d2 2 a3 2 --- Makefile.orig 2008-03-18 16:58:50 +0100 +++ Makefile 2008-03-24 20:45:38 +0100 d64 1 a64 1 @@@@ -524,8 +496,7 @@@@ d75 2 a76 2 --- /dev/null 2008-03-24 20:46:16 +0100 +++ apps/app_backticks.c 2008-03-24 20:45:38 +0100 d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.38 $") d207 48 d257 1 a257 1 +++ build_tools/make_defaults_h 2008-03-24 20:45:38 +0100 d268 2 a269 2 --- cdr/cdr_custom.c.orig 2007-11-21 00:16:15 +0100 +++ cdr/cdr_custom.c 2008-03-24 20:45:38 +0100 d281 1 a281 1 +++ cdr/cdr_sqlite3_custom.c 2008-03-24 20:45:38 +0100 d293 1 a293 1 +++ channels/console_video.h 2008-03-24 20:45:38 +0100 d308 1 a308 1 +++ configure 2008-03-24 20:45:38 +0100 d324 1 a324 1 +++ include/asterisk/module.h 2008-03-24 20:45:38 +0100 d335 2 a336 2 --- main/Makefile.orig 2008-03-17 23:24:46 +0100 +++ main/Makefile 2008-03-24 20:45:38 +0100 d350 2 a351 2 --- main/file.c.orig 2008-03-07 01:25:48 +0100 +++ main/file.c 2008-03-24 20:45:38 +0100 d363 1 a363 1 +++ main/tcptls.c 2008-03-24 20:45:38 +0100 d373 2 a374 2 --- menuselect-tree.orig 2008-03-18 18:05:36 +0100 +++ menuselect-tree 2008-03-24 20:45:38 +0100 d392 1 a392 1 @@@@ -616,9 +617,9 @@@@ d403 1 a403 1 @@@@ -676,6 +677,7 @@@@ d413 1 a413 1 +++ sounds/sounds.xml 2008-03-24 20:45:38 +0100 a432 47 Index: apps/app_meetme.c --- apps/app_meetme.c.orig 2008-03-18 16:58:50 +0100 +++ apps/app_meetme.c 2008-03-25 21:41:52 +0100 @@@@ -159,6 +159,7 @@@@ CONFFLAG_KICK_CONTINUE = (1 << 28), CONFFLAG_DURATION_STOP = (1 << 29), CONFFLAG_DURATION_LIMIT = (1 << 30), + CONFFLAG_USERNAME = (1 << 31), }; enum { @@@@ -168,6 +169,7 @@@@ OPT_ARG_DURATION_LIMIT = 3, OPT_ARG_MOH_CLASS = 4, OPT_ARG_ARRAY_SIZE = 5, + OPT_ARG_USERNAME = 6, }; AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS @@@@ -199,6 +201,7 @@@@ AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ), AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP), AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT), + AST_APP_OPTION_ARG('n', CONFFLAG_USERNAME, OPT_ARG_USERNAME), END_OPTIONS ); static const char *app = "MeetMe"; @@@@ -1695,6 +1698,11 @@@@ ast_mutex_unlock(&conf->playlock); if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER) || (confflags & CONFFLAG_INTROUSERNOREVIEW))) { + if ( (confflags & CONFFLAG_USERNAME) + && !ast_strlen_zero(optargs[OPT_ARG_USERNAME]) + && ast_fileexists(optargs[OPT_ARG_USERNAME], NULL, NULL)) + snprintf(user->namerecloc, sizeof(user->namerecloc), "%s", optargs[OPT_ARG_USERNAME]); + else { snprintf(user->namerecloc, sizeof(user->namerecloc), "%s/meetme/meetme-username-%s-%d", ast_config_AST_SPOOL_DIR, conf->confno, user->user_no); @@@@ -1704,6 +1712,7 @@@@ res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL); if (res == -1) goto outrun; + } } ast_mutex_lock(&conf->playlock); @ 1.38 log @move AGI directory; add some SIP notify settings and use lower case extension @ text @d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.37 $") d385 47 @ 1.37 log @unify the AstDB filenames and regen the patch to be in sort order @ text @d3 1 a3 1 +++ Makefile 2008-03-23 11:34:24 +0100 d75 2 a76 2 --- /dev/null 2008-03-23 11:34:42 +0100 +++ apps/app_backticks.c 2008-03-23 11:34:24 +0100 d81 1 a81 1 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.36 $") d209 1 a209 1 +++ build_tools/make_defaults_h 2008-03-23 11:35:27 +0100 d221 1 a221 1 +++ cdr/cdr_custom.c 2008-03-23 11:34:24 +0100 d233 1 a233 1 +++ cdr/cdr_sqlite3_custom.c 2008-03-23 11:34:24 +0100 d245 1 a245 1 +++ channels/console_video.h 2008-03-23 11:34:24 +0100 d260 1 a260 1 +++ configure 2008-03-23 11:34:24 +0100 d276 1 a276 1 +++ include/asterisk/module.h 2008-03-23 11:34:24 +0100 d288 1 a288 1 +++ main/Makefile 2008-03-23 11:34:24 +0100 d301 12 d315 1 a315 1 +++ main/tcptls.c 2008-03-23 11:34:24 +0100 d326 1 a326 1 +++ menuselect-tree 2008-03-23 11:34:24 +0100 d365 1 a365 1 +++ sounds/sounds.xml 2008-03-23 11:34:24 +0100 @ 1.36 log @add an Asterisk 1.6 port of app_backticks.c from me @ text @d3 1 a3 1 +++ Makefile 2008-03-22 17:34:52 +0100 d74 145 d221 1 a221 1 +++ cdr/cdr_custom.c 2008-03-22 17:34:52 +0100 d233 1 a233 1 +++ cdr/cdr_sqlite3_custom.c 2008-03-22 17:34:52 +0100 d245 1 a245 1 +++ channels/console_video.h 2008-03-22 17:34:52 +0100 d260 1 a260 1 +++ configure 2008-03-22 17:34:52 +0100 d276 1 a276 1 +++ include/asterisk/module.h 2008-03-22 17:34:52 +0100 d288 1 a288 1 +++ main/Makefile 2008-03-22 17:34:52 +0100 d303 1 a303 1 +++ main/tcptls.c 2008-03-22 17:34:52 +0100 d314 1 a314 1 +++ menuselect-tree 2008-03-22 17:35:02 +0100 d353 1 a353 1 +++ sounds/sounds.xml 2008-03-22 17:34:52 +0100 a372 133 Index: apps/app_backticks.c --- apps/app_backticks.c.orig 2008-03-22 19:24:28 +0100 +++ apps/app_backticks.c 2008-03-22 19:29:01 +0100 @@@@ -0,0 +1,129 @@@@ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 0 $") + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static char *app = "BackTicks"; +static char *synopsis = "Execute a shell command and save the result as a variable."; +static char *desc = " Backticks(|)\n\n" + "Be sure to include a full path to the command!\n"; + +static char *do_backticks(char *command, char *buf, size_t len) +{ + int fds[2], pid = 0; + char *ret = NULL; + + memset(buf, 0, len); + if (pipe(fds)) { + ast_log(LOG_WARNING, "Pipe/Exec failed\n"); + } else { + pid = fork(); + if (pid < 0) { + ast_log(LOG_WARNING, "Fork failed\n"); + close(fds[0]); + close(fds[1]); + } else if (pid) { + /* parent */ + close(fds[1]); + read(fds[0], buf, len); + close(fds[0]); + ret = buf; + } else { + /* child */ + char *argv[255] = {0}; + int argc = 0; + char *p; + char *mycmd = ast_strdupa(command); + close(fds[0]); + dup2(fds[1], STDOUT_FILENO); + argv[argc++] = mycmd; + do { + if ((p = strchr(mycmd, ' '))) { + *p = '\0'; + mycmd = ++p; + argv[argc++] = mycmd; + } + } while (p != NULL); + close(fds[1]); + execv(argv[0], argv); + ast_log(LOG_ERROR, "exec of %s failed\n", argv[0]); + exit(0); + } + } + return ret; +} + +static int backticks_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + const char *usage = "Usage: Backticks(|)"; + char buf[1024], *argv[2], *mydata; + int argc = 0; + + if (!data) { + ast_log(LOG_WARNING, "%s\n", usage); + return -1; + } + ast_autoservice_start(chan); + if (!(mydata = ast_strdupa(data))) { + ast_log(LOG_ERROR, "Memory Error!\n"); + res = -1; + } else { + if((argc = ast_app_separate_args(mydata, '|', argv, sizeof(argv) / sizeof(argv[0]))) < 2) { + ast_log(LOG_WARNING, "%s\n", usage); + res = -1; + } + if (do_backticks(argv[1], buf, sizeof(buf))) + pbx_builtin_setvar_helper(chan, argv[0], buf); + else { + ast_log(LOG_WARNING, "No Data!\n"); + res = -1; + } + } + ast_autoservice_stop(chan); + return res; +} + +static int function_backticks(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) +{ + if (!do_backticks(data, buf, len)) { + ast_log(LOG_WARNING, "No Data!\n"); + return -1; + } + return 0; +} + +static struct ast_custom_function backticks_function = { + .name = "BACKTICKS", + .desc = "Executes a shell command and evaluates to the result.", + .syntax = "BACKTICKS()", + .synopsis = "Executes a shell command.", + .read = function_backticks +}; + +static int unload_module(void) +{ + ast_custom_function_unregister(&backticks_function); + return ast_unregister_application(app); +} + +static int load_module(void) +{ + ast_custom_function_register(&backticks_function); + return ast_register_application(app, backticks_exec, synopsis, desc); +} + +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function"); + @ 1.35 log @add HTTP upload support (via gmime) to AMI and add CDR support @ text @d3 1 a3 1 +++ Makefile 2008-03-22 16:56:21 +0100 d76 1 a76 1 +++ cdr/cdr_custom.c 2008-03-22 16:56:03 +0100 d88 1 a88 1 +++ cdr/cdr_sqlite3_custom.c 2008-03-22 16:56:03 +0100 d100 1 a100 1 +++ channels/console_video.h 2008-03-22 16:56:03 +0100 d115 1 a115 1 +++ configure 2008-03-22 16:56:03 +0100 d131 1 a131 1 +++ include/asterisk/module.h 2008-03-22 16:56:03 +0100 d143 1 a143 1 +++ main/Makefile 2008-03-22 16:56:03 +0100 d158 1 a158 1 +++ main/tcptls.c 2008-03-22 16:56:03 +0100 d169 11 a179 2 +++ menuselect-tree 2008-03-22 16:56:03 +0100 @@@@ -262,7 +262,6 @@@@ d187 1 a187 1 @@@@ -616,9 +615,9 @@@@ d198 1 a198 1 @@@@ -676,6 +675,7 @@@@ d208 1 a208 1 +++ sounds/sounds.xml 2008-03-22 16:56:03 +0100 d228 133 @ 1.34 log @the Perl AGI module is now packaged as perl-asterisk @ text @d2 2 a3 2 --- Makefile.orig 2008-02-26 21:19:03 +0100 +++ Makefile 2008-03-18 22:06:58 +0100 d64 34 d100 1 a100 1 +++ channels/console_video.h 2008-03-18 22:06:58 +0100 d114 3 a116 3 --- configure.orig 2008-02-23 00:56:55 +0100 +++ configure 2008-03-18 22:06:58 +0100 @@@@ -4049,12 +4049,6 @@@@ d129 12 d142 2 a143 2 --- main/Makefile.orig 2008-02-28 01:11:31 +0100 +++ main/Makefile 2008-03-18 22:06:58 +0100 d157 2 a158 2 --- main/tcptls.c.orig 2008-02-06 00:00:15 +0100 +++ main/tcptls.c 2008-03-18 22:06:58 +0100 d169 1 a169 1 +++ menuselect-tree 2008-03-19 21:04:40 +0100 d198 2 a199 2 --- sounds/sounds.xml.orig 2006-10-25 19:12:59 +0200 +++ sounds/sounds.xml 2008-03-18 22:07:44 +0100 d211 1 a211 1 @@@@ -58,6 +58,7 @@@@ a218 12 Index: include/asterisk/module.h --- include/asterisk/module.h.orig 2008-02-27 09:20:15 +0100 +++ include/asterisk/module.h 2008-03-18 23:31:42 +0100 @@@@ -271,7 +271,7 @@@@ /* forward declare this pointer in modules, so that macro/function calls that need it can get it, since it will actually be declared and populated at the end of the module's source file... */ -const static __attribute__((unused)) struct ast_module_info *ast_module_info; +static const __attribute__((unused)) struct ast_module_info *ast_module_info; #if !defined(EMBEDDED_MODULE) #define __MODULE_INFO_SECTION @ 1.33 log @libiax is now packaged in asterisk-libiax @ text @a63 8 Index: asterisk-perl-0.10/Makefile.PL --- asterisk-perl-0.10/Makefile.PL.orig 2003-06-13 07:52:12 +0200 +++ asterisk-perl-0.10/Makefile.PL 2008-03-18 22:06:58 +0100 @@@@ -14,3 +14,4 @@@@ }, ); + @ 1.32 log @finally get Zaptel support working @ text @a102 47 Index: iax-0.2.2/src/Makefile.in --- iax-0.2.2/src/Makefile.in.orig 2001-11-13 18:45:14 +0100 +++ iax-0.2.2/src/Makefile.in 2008-03-18 22:06:58 +0100 @@@@ -71,7 +71,7 @@@@ PACKAGE = @@PACKAGE@@ RANLIB = @@RANLIB@@ VERSION = @@VERSION@@ -CFLAGS = -g -Wall -Wstrict-prototypes -I . -DDEBUG_SUPPORT -DDEBUG_DEFAULT $(UCFLAGS) +CFLAGS = -I . -DDEBUG_SUPPORT -DDEBUG_DEFAULT $(UCFLAGS) pkgdir = $(libdir) pkg_LTLIBRARIES = libiax.la @@@@ -304,12 +304,11 @@@@ install: - mkdir -p $(includedir)/iax - install -m 644 md5.h $(includedir)/iax - install -m 644 frame.h $(includedir)/iax - install -m 644 iax.h $(includedir)/iax - install -m 644 iax-client.h $(includedir)/iax - /sbin/ldconfig + mkdir -p $(DESTDIR)$(includedir)/iax + install -m 644 md5.h $(DESTDIR)$(includedir)/iax + install -m 644 frame.h $(DESTDIR)$(includedir)/iax + install -m 644 iax.h $(DESTDIR)$(includedir)/iax + install -m 644 iax-client.h $(DESTDIR)$(includedir)/iax # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: iax-0.2.2/src/iax.c --- iax-0.2.2/src/iax.c.orig 2001-11-07 00:10:41 +0100 +++ iax-0.2.2/src/iax.c 2008-03-18 22:06:58 +0100 @@@@ -33,13 +33,11 @@@@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include @ 1.31 log @apply Fedora mega patch for getting app_conference to work @ text @d177 11 a187 3 --- menuselect-tree.orig 2008-03-04 18:52:08 +0100 +++ menuselect-tree 2008-03-18 22:07:33 +0100 @@@@ -612,9 +612,9 @@@@ d198 1 a198 1 @@@@ -666,6 +666,7 @@@@ @ 1.30 log @use ALAW format only as the GSM sound would be downloaded and it of lower quality anyway @ text @a63 38 Index: appconference-2.0.1/Makefile --- appconference-2.0.1/Makefile.orig 2008-02-26 17:05:57 +0100 +++ appconference-2.0.1/Makefile 2008-03-18 22:06:58 +0100 @@@@ -18,11 +18,11 @@@@ # INSTALL_PREFIX := -INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/usr/lib/asterisk/modules +INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules -ASTERISK_INCLUDE_DIR ?= ../asterisk/include +ASTERISK_INCLUDE_DIR ?= ../include -REVISION = $(shell svnversion -n .) +REVISION = 2.0.1 # turn app_conference debugging on or off ( 0 == OFF, 1 == ON ) APP_CONFERENCE_DEBUG ?= 0 @@@@ -48,7 +48,7 @@@@ INCLUDE = -I$(ASTERISK_INCLUDE_DIR) DEBUG := -g -CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations -MD -MP $(DEBUG) +CFLAGS = -pipe -MD -MP $(DEBUG) CPPFLAGS = $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE -DREVISION=\"$(REVISION)\" #CFLAGS += -O2 #CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math Index: appconference-2.0.1/app_conference.h --- appconference-2.0.1/app_conference.h.orig 2008-02-26 17:05:57 +0100 +++ appconference-2.0.1/app_conference.h 2008-03-18 22:06:58 +0100 @@@@ -44,6 +44,7 @@@@ #include /* asterisk includes */ +#include #include #include #include d220 12 @ 1.29 log @try to let Asterisk pass out the CA certificate if possible @ text @d3 1 a3 1 +++ Makefile 2008-03-17 09:31:15 +0100 d66 1 a66 1 +++ appconference-2.0.1/Makefile 2008-03-17 09:31:15 +0100 d93 1 a93 1 +++ appconference-2.0.1/app_conference.h 2008-03-17 09:31:15 +0100 d104 1 a104 1 +++ asterisk-perl-0.10/Makefile.PL 2008-03-17 09:31:15 +0100 d112 1 a112 1 +++ channels/console_video.h 2008-03-17 09:31:15 +0100 d127 1 a127 1 +++ configure 2008-03-17 09:31:15 +0100 d143 1 a143 1 +++ iax-0.2.2/src/Makefile.in 2008-03-17 09:31:15 +0100 d173 1 a173 1 +++ iax-0.2.2/src/iax.c 2008-03-17 09:31:15 +0100 d190 1 a190 1 +++ main/Makefile 2008-03-17 09:31:15 +0100 d203 11 d216 2 a217 2 +++ menuselect-tree 2008-03-17 09:31:31 +0100 @@@@ -612,6 +612,7 @@@@ d224 5 a228 2 yes @@@@ -666,8 +667,10 @@@@ a234 3 + yes d238 2 a239 2 +++ sounds/sounds.xml 2008-03-17 09:31:41 +0100 @@@@ -4,6 +4,7 @@@@ d246 5 a250 2 yes @@@@ -58,8 +59,10 @@@@ a256 3 + yes a257 11 Index: main/tcptls.c --- main/tcptls.c.orig 2008-02-06 00:00:15 +0100 +++ main/tcptls.c 2008-03-18 21:29:51 +0100 @@@@ -189,6 +189,7 @@@@ if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) { if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0) ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath); + SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL)); } ast_verb(0, "SSL certificate ok\n"); @ 1.28 log @provide sounds in both GSM (low quality) and ALAW (higher quality) format @ text @d247 11 @ 1.27 log @do not try to fetch any information via SVN @ text @d3 1 a3 1 +++ Makefile 2008-03-09 20:35:44 +0100 d66 1 a66 1 +++ appconference-2.0.1/Makefile 2008-03-09 21:22:16 +0100 d93 1 a93 1 +++ appconference-2.0.1/app_conference.h 2008-03-09 20:33:38 +0100 d104 1 a104 1 +++ asterisk-perl-0.10/Makefile.PL 2008-03-09 20:33:38 +0100 d112 1 a112 1 +++ channels/console_video.h 2008-03-09 20:33:38 +0100 d127 1 a127 1 +++ configure 2008-03-09 20:33:38 +0100 d143 1 a143 1 +++ iax-0.2.2/src/Makefile.in 2008-03-09 20:33:38 +0100 d173 1 a173 1 +++ iax-0.2.2/src/iax.c 2008-03-09 20:33:38 +0100 d190 1 a190 1 +++ main/Makefile 2008-03-09 20:33:38 +0100 d205 12 a216 2 +++ menuselect-tree 2008-03-09 20:33:38 +0100 @@@@ -668,6 +668,7 @@@@ d218 23 @ 1.26 log @provide more clean out-of-the-box configuration @ text @d66 2 a67 2 +++ appconference-2.0.1/Makefile 2008-03-09 20:33:38 +0100 @@@@ -18,9 +18,9 @@@@ d77 2 a78 1 REVISION = $(shell svnversion -n .) d80 2 @ 1.25 log @upgrade to beta 5 and the Asterisk 1.4 sounds, including the extra sounds @ text @d3 49 a51 2 +++ Makefile 2008-03-09 13:27:48 +0100 @@@@ -245,12 +245,6 @@@@ d66 1 a66 1 +++ appconference-2.0.1/Makefile 2008-03-09 13:27:48 +0100 d90 1 a90 1 +++ appconference-2.0.1/app_conference.h 2008-03-09 13:27:48 +0100 d101 1 a101 1 +++ asterisk-perl-0.10/Makefile.PL 2008-03-09 13:27:48 +0100 d109 1 a109 1 +++ channels/console_video.h 2008-03-09 13:27:48 +0100 d124 1 a124 1 +++ configure 2008-03-09 13:27:48 +0100 d140 1 a140 1 +++ iax-0.2.2/src/Makefile.in 2008-03-09 13:27:48 +0100 d170 1 a170 1 +++ iax-0.2.2/src/iax.c 2008-03-09 13:27:48 +0100 d187 1 a187 1 +++ main/Makefile 2008-03-09 13:27:48 +0100 d202 1 a202 1 +++ menuselect-tree 2008-03-09 13:28:44 +0100 @ 1.24 log @upgrade to Asterisk 1.6 @ text @d2 2 a3 2 --- Makefile.orig 2008-01-29 18:22:47 +0100 +++ Makefile 2008-03-08 19:36:45 +0100 d19 1 a19 1 +++ appconference-2.0.1/Makefile 2008-03-08 21:10:48 +0100 d43 1 a43 1 +++ appconference-2.0.1/app_conference.h 2008-03-08 19:36:45 +0100 d53 2 a54 2 --- asterisk-perl-0.10/Makefile.PL.orig 2008-03-08 19:41:19 +0100 +++ asterisk-perl-0.10/Makefile.PL 2008-03-08 19:41:19 +0100 d60 15 d76 3 a78 3 --- configure.orig 2008-02-19 18:33:55 +0100 +++ configure 2008-03-08 19:36:45 +0100 @@@@ -4043,12 +4043,6 @@@@ d93 1 a93 1 +++ iax-0.2.2/src/Makefile.in 2008-03-08 19:36:45 +0100 d123 1 a123 1 +++ iax-0.2.2/src/iax.c 2008-03-08 19:36:45 +0100 d139 2 a140 2 --- main/Makefile.orig 2008-01-29 18:44:05 +0100 +++ main/Makefile 2008-03-08 19:36:45 +0100 d153 11 a163 15 Index: channels/console_video.h --- channels/console_video.h.orig 2008-01-09 19:03:40 +0100 +++ channels/console_video.h 2008-03-08 23:06:34 +0100 @@@@ -28,10 +28,7 @@@@ "console {device}" #else -#include -#ifndef OLD_FFMPEG -#include /* requires a recent ffmpeg */ -#endif +#include #define CONSOLE_VIDEO_CMDS \ "console {videodevice|videocodec" \ @ 1.23 log @move subst into %build section and add IAX library @ text @d2 4 a5 8 --- Makefile.orig 2006-12-11 22:55:43 +0100 +++ Makefile 2006-12-23 11:34:46 +0100 @@@@ -47,14 +47,14 @@@@ #K6OPT = -DK6OPT #Tell gcc to optimize the code -OPTIMIZE+=-O6 +#OPTIMIZE+=-O6 d8 4 a11 41 #Overwite config files on "make samples" OVERWRITE=y #Include debug and macro symbols in the executables (-g) and profiling info (-pg) -DEBUG=-g3 #-pg +#DEBUG=-g3 #-pg #Set NOCRYPTO to yes if you do not want to have crypto support or #dependencies @@@@ -110,35 +110,19 @@@@ # Don't use together with -DBUSYDETECT_TONEONLY BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE -ifneq ($(OSARCH),SunOS) - ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk - ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk - ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk - ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk - ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk - ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf - ASTBINDIR=$(INSTALL_PREFIX)/usr/bin - ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin - ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run - ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin -else - ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib - ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib - ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk - ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool - ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log - ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf - ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin - ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin - ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run - ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin a12 80 +ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk +ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk +ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk +ASTSPOOLDIR=$(INSTALL_PREFIX)/var/asterisk/spool +ASTLOGDIR=$(INSTALL_PREFIX)/var/asterisk/log +ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk +ASTCONFPATH=$(ASTETCDIR)/asterisk.conf +ASTBINDIR=$(INSTALL_PREFIX)/bin +ASTSBINDIR=$(INSTALL_PREFIX)/sbin +ASTVARRUNDIR=$(INSTALL_PREFIX)/var/asterisk/run +ASTMANDIR=$(INSTALL_PREFIX)/man +MODULES_DIR=$(ASTLIBDIR)/modules +AGI_DIR=$(ASTLIBDIR)/agi-bin ASTCFLAGS= @@@@ -218,21 +202,29 @@@@ ID=id ifeq ($(OSARCH),SunOS) - GREP=/usr/xpg4/bin/grep - M4=/usr/local/bin/m4 - ID=/usr/xpg4/bin/id - LN=/usr/xpg4/bin/ln - INSTALL=ginstall + GREP=$(shell if [ -f /usr/xpg4/bin/grep ]; then echo /usr/xpg4/bin/grep; else echo grep; fi) + ID=$(shell if [ -f /usr/xpg4/bin/id ]; then echo /usr/xpg4/bin/grep; else echo id; fi) + LN=$(shell if [ -f /usr/xpg4/bin/ln ]; then echo /usr/xpg4/bin/grep; else echo ln; fi) + INSTALL=$(INSTALL_PREFIX)/lib/openpkg/shtool install -c endif INCLUDE+=-Iinclude -I../include ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY +ASTCFLAGS+=-Wno-sign-compare -Wno-pointer-sign ASTCFLAGS+=$(OPTIMIZE) ASTOBJ=-o asterisk ifeq ($(findstring BSD,$(OSARCH)),BSD) PROC=$(shell uname -m) - ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib +endif + +ASTCFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib + +ifndef WITHOUT_ZAPTEL +ifeq ($(OSARCH),FreeBSD) +ASTCFLAGS+=-I/usr/local/include +LIBS+=-L/usr/local/lib +endif endif ifneq ($(PROC),ultrasparc) @@@@ -252,29 +244,9 @@@@ endif ifeq ($(OSARCH),FreeBSD) - BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) - ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) - ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp - endif + CFLAGS+=-pthread + LIBS+=-pthread MPG123TARG=freebsd - - # XXX FreeBSD paths - PREFIX?=/usr/local - ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk - ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk - ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk - ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk - ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk - ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf - ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin - ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin - ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run - ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man - # XXX end FreeBSD paths a13 2 endif # FreeBSD d15 1 a15 59 @@@@ -289,7 +261,7 @@@@ ifeq ($(OSARCH),SunOS) ASTCFLAGS+=-Wcast-align -DSOLARIS - INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/opt/ssl/include -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include + INCLUDE+=-Iinclude/solaris-compat ifeq ($(OSCPU),sun4u) OPTIMIZE+=-mcpu=v9 -mcpu=ultrasparc endif @@@@ -341,9 +313,9 @@@@ ASTCFLAGS+= $(MALLOC_DEBUG) ASTCFLAGS+= $(BUSYDETECT) ASTCFLAGS+= $(OPTIONS) -ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) -ASTCFLAGS+= -fomit-frame-pointer -endif +#ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) +#ASTCFLAGS+= -fomit-frame-pointer +#endif SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \ @@@@ -711,31 +683,6 @@@@ fi install: all datafiles bininstall install-subdirs - @@if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi - @@echo " +---- Asterisk Installation Complete -------+" - @@echo " + +" - @@echo " + YOU MUST READ THE SECURITY DOCUMENT +" - @@echo " + +" - @@echo " + Asterisk has successfully been installed. +" - @@echo " + If you would like to install the sample +" - @@echo " + configuration files (overwriting any +" - @@echo " + existing config files), run: +" - @@echo " + +" - @@echo " + $(MAKE) samples +" - @@echo " + +" - @@echo " +----------------- or ---------------------+" - @@echo " + +" - @@echo " + You can go ahead and install the asterisk +" - @@echo " + program documentation now or later run: +" - @@echo " + +" - @@echo " + $(MAKE) progdocs +" - @@echo " + +" - @@echo " + **Note** This requires that you have +" - @@echo " + doxygen installed on your local system +" - @@echo " +-------------------------------------------+" - @@$(MAKE) -s oldmodcheck upgrade: all bininstall Index: agi/Makefile --- agi/Makefile.orig 2006-03-28 22:22:05 +0200 +++ agi/Makefile 2006-12-23 11:34:46 +0100 @@@@ -20,9 +20,7 @@@@ LIBS=-lsocket -lnsl ../strcompat.o d17 5 d23 16 a38 34 -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib all: depend $(AGIS) Index: app_conference/Makefile --- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200 +++ app_conference/Makefile 2006-12-23 11:34:46 +0100 @@@@ -20,10 +20,10 @@@@ INSTALL_PREFIX := /opt/horizon INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules -ASTERISK_INCLUDE_DIR := $(HOME)/local/asterisk/asterisk/include +ASTERISK_INCLUDE_DIR := ../include # turn app_conference debugging on or off ( 0 == OFF, 1 == ON ) -APP_CONFERENCE_DEBUG := 1 +APP_CONFERENCE_DEBUG := 0 # 0 = OFF 1 = astdsp 2 = speex SILDET := 2 @@@@ -44,22 +44,23 @@@@ CC = gcc INCLUDE = -I$(ASTERISK_INCLUDE_DIR) -LIBS = -ldl -lpthread -lm -DEBUG := -g +LIBS = -lpthread -lm +DEBUG := CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE +CFLAGS += -fPIC d40 15 a54 158 #CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math # PERF: below is 10% faster than -O2 or -O3 alone. #CFLAGS += -O3 -ffast-math -funroll-loops # below is another 5% faster or so. -CFLAGS += -O3 -ffast-math -funroll-all-loops -fprefetch-loop-arrays -fsingle-precision-constant +#CFLAGS += -O3 -ffast-math -funroll-all-loops -fprefetch-loop-arrays -fsingle-precision-constant # this is fun for PPC #CFLAGS += -mcpu=7450 -faltivec -mabi=altivec -mdynamic-no-pic # this is fun for x86 -CFLAGS += -march=pentium3 -msse -mfpmath=sse,387 +#CFLAGS += -march=pentium3 -msse -mfpmath=sse,387 # adding -msse -mfpmath=sse has little effect. @@@@ -72,13 +73,19 @@@@ CFLAGS += -DAPP_CONFERENCE_DEBUG endif +OSARCH=$(shell uname -s) +ifeq ($(OSARCH),SunOS) + CFLAGS+=-DSOLARIS -I$(ASTERISK_INCLUDE_DIR)/solaris-compat +endif + # # additional flag values for silence detection # ifeq ($(SILDET), 2) -OBJS += libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o -CFLAGS += -Ilibspeex -DSILDET=2 +CFLAGS += -DSILDET=2 +CFLAGS += -I$(INSTALL_PREFIX)/include/speex -I$(INSTALL_PREFIX)/include +LIBS += -L$(INSTALL_PREFIX)/lib -lspeex -lm endif ifeq ($(SILDET), 1) @@@@ -102,14 +109,13 @@@@ rm -f *.so *.o $(OBJS) app_conference.so : $(OBJS) - $(CC) -pg -shared -Xlinker -x -o $@@ $(OBJS) + $(CC) -shared -Xlinker -x -o $@@ $(OBJS) $(LIBS) vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o $(CC) $(PROFILE) -o $@@ $^ -lm install: all for x in $(SHAREDOS); do $(INSTALL) -m 755 $$x $(INSTALL_MODULES_DIR) ; done - /var/horizon/mojo/lib/horizoncmd restart asterisk # config: all # cp conf.conf /etc/asterisk/ Index: app_conference/app_conference.h --- app_conference/app_conference.h.orig 2005-12-16 23:31:58 +0100 +++ app_conference/app_conference.h 2006-12-23 11:34:46 +0100 @@@@ -33,6 +33,7 @@@@ #include #include #include +#include /* standard includes */ #include @@@@ -40,10 +41,9 @@@@ #include #include -#include - #if (SILDET == 2) -#include "libspeex/speex_preprocess.h" +#include +#include #endif // Index: app_conference/conference.c --- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200 +++ app_conference/conference.c 2006-12-23 11:34:46 +0100 @@@@ -568,7 +568,6 @@@@ conf->memberlist = NULL ; conf->membercount = 0 ; - conf->conference_thread = -1 ; conf->debug_flag = 0 ; @@@@ -618,7 +617,7 @@@@ // acquire conference mutexes ast_mutex_lock( &conf->lock ) ; - if ( pthread_create( &conf->conference_thread, NULL, (void*)conference_exec, conf ) == 0 ) + if ( ast_pthread_create( &conf->conference_thread, NULL, (void*)conference_exec, conf ) == 0 ) { // detach the thread so it doesn't leak pthread_detach( conf->conference_thread ) ; @@@@ -632,8 +631,6 @@@@ { ast_log( LOG_ERROR, "unable to start conference thread for conference %s\n", conf->name ) ; - conf->conference_thread = -1 ; - // release conference mutexes ast_mutex_unlock( &conf->lock ) ; Index: apps/Makefile --- apps/Makefile.orig 2006-04-30 15:38:22 +0200 +++ apps/Makefile 2006-12-23 11:34:46 +0100 @@@@ -54,16 +54,11 @@@@ APPS+=app_osplookup.so endif -ifeq ($(findstring BSD,${OSARCH}),BSD) -CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib -CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) -ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) - ifneq (${CURLLIBS},) - APPS+=app_curl.so - endif -endif +CFLAGS+=$(shell $(INSTALL_PREFIX)/bin/curl-config --cflags) +CURLLIBS=$(shell $(INSTALL_PREFIX)/bin/curl-config --libs) +APPS+=app_curl.so ifeq (${OSARCH},CYGWIN) CYGSOLINK=-Wl,--out-implib=lib$@@.a -Wl,--export-all-symbols Index: asterisk-addons-1.2.5/Makefile --- asterisk-addons-1.2.5/Makefile.orig 2005-12-02 00:14:28 +0100 +++ asterisk-addons-1.2.5/Makefile 2006-12-23 11:34:46 +0100 @@@@ -27,17 +27,9 @@@@ # # MySQL stuff... Autoconf anyone?? # -MODS+=$(shell if [ -d /usr/local/mysql/include ] || [ -d /usr/include/mysql ] || [ -d /usr/local/include/mysql ] || [ -d /opt/mysql/include ]; then echo "cdr_addon_mysql.so app_addon_sql_mysql.so res_config_mysql.so"; fi) -CFLAGS+=$(shell if [ -d /usr/local/mysql/include ]; then echo "-I/usr/local/mysql/include"; fi) -CFLAGS+=$(shell if [ -d /usr/include/mysql ]; then echo "-I/usr/include/mysql"; fi) -CFLAGS+=$(shell if [ -d /usr/local/include/mysql ]; then echo "-I/usr/local/include/mysql"; fi) -CFLAGS+=$(shell if [ -d /opt/mysql/include/mysql ]; then echo "-I/opt/mysql/include/mysql"; fi) -MLFLAGS= -MLFLAGS+=$(shell if [ -d /usr/lib/mysql ]; then echo "-L/usr/lib/mysql"; fi) -MLFLAGS+=$(shell if [ -d /usr/lib64/mysql ]; then echo "-L/usr/lib64/mysql"; fi) -MLFLAGS+=$(shell if [ -d /usr/local/mysql/lib ]; then echo "-L/usr/local/mysql/lib"; fi) -MLFLAGS+=$(shell if [ -d /usr/local/lib/mysql ]; then echo "-L/usr/local/lib/mysql"; fi) -MLFLAGS+=$(shell if [ -d /opt/mysql/lib/mysql ]; then echo "-L/opt/mysql/lib/mysql"; fi) +CFLAGS+=-I$(INSTALL_PREFIX)/include +MFLAGS+=-L$(INSTALL_PREFIX)/lib +MODS+=cdr_addon_mysql.so app_addon_sql_mysql.so res_config_mysql.so OSARCH=$(shell uname -s) Index: asterisk-perl-0.09/Makefile.PL --- asterisk-perl-0.09/Makefile.PL.orig 2006-12-23 11:35:36 +0100 +++ asterisk-perl-0.09/Makefile.PL 2006-12-23 11:35:36 +0100 d60 16 a75 407 Index: asterisk-sounds-1.2.1/Makefile --- asterisk-sounds-1.2.1/Makefile.orig 2005-12-02 00:20:51 +0100 +++ asterisk-sounds-1.2.1/Makefile 2006-12-23 11:34:46 +0100 @@@@ -66,7 +66,7 @@@@ mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha for x in sounds/letters/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ else \ echo "No description for $$x"; \ exit 1; \ @@@@ -74,7 +74,7 @@@@ done for x in sounds/phonetic/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ else \ echo "No description for $$x"; \ exit 1; \ @@@@ -82,7 +82,7 @@@@ done for x in sounds/silence/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \ else \ echo "No description for $$x"; \ exit 1; \ @@@@ -90,7 +90,7 @@@@ done for x in sounds/wx/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/wx ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/wx ; \ else \ echo "No description for $$x"; \ exit 1; \ @@@@ -98,7 +98,7 @@@@ done for x in sounds/ha/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha ; \ else \ echo "No description for $$x"; \ exit 1; \ @@@@ -106,7 +106,7 @@@@ done for x in sounds/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ else \ echo "No description for $$x"; \ exit 1; \ Index: asterisk.c --- asterisk.c.orig 2006-10-27 19:36:07 +0200 +++ asterisk.c 2006-12-23 11:34:46 +0100 @@@@ -1902,9 +1902,9 @@@@ } else if (!strcasecmp(v->name, "astspooldir")) { ast_copy_string(ast_config_AST_SPOOL_DIR, v->value, sizeof(ast_config_AST_SPOOL_DIR)); snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value); + snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value); } else if (!strcasecmp(v->name, "astvarlibdir")) { ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR)); - snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value); snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value); } else if (!strcasecmp(v->name, "astlogdir")) { ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR)); Index: build_tools/make_build_h --- build_tools/make_build_h.orig 2006-03-03 18:13:37 +0100 +++ build_tools/make_build_h 2006-12-23 11:34:46 +0100 @@@@ -4,7 +4,11 @@@@ MACHINE=`uname -m` OS=`uname -s` if [ `uname -s` = "SunOS" ]; then + if [ -f /usr/xpg4/bin/id ]; then USER=`/usr/xpg4/bin/id -un` + else + USER=`/usr/bin/id -un` + fi else USER=`id -un` fi Index: build_tools/make_defaults_h --- build_tools/make_defaults_h.orig 2005-06-20 19:26:08 +0200 +++ build_tools/make_defaults_h 2006-12-23 11:34:46 +0100 @@@@ -14,7 +14,7 @@@@ #define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}" #define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}" #define AST_KEY_DIR "${INSTALL_PATH}${ASTVARLIBDIR}/keys" -#define AST_DB "${INSTALL_PATH}${ASTVARLIBDIR}/astdb" +#define AST_DB "${INSTALL_PATH}${ASTSPOOLDIR}/astdb" #define AST_TMP_DIR "${INSTALL_PATH}${ASTSPOOLDIR}/tmp" #define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}" Index: cdr/Makefile --- cdr/Makefile.orig 2006-11-16 21:29:28 +0100 +++ cdr/Makefile 2006-12-23 11:34:46 +0100 @@@@ -20,10 +20,8 @@@@ CFLAGS+=-fPIC endif -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include +SOLINK+=-L$(INSTALL_PREFIX)/lib #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. #This works for even old (2.96) versions of gcc and provides a small boost either way. Index: chan_capi_1_6_1/Makefile --- chan_capi_1_6_1/Makefile.orig 2006-06-21 17:06:35 +0200 +++ chan_capi_1_6_1/Makefile 2006-12-23 11:34:46 +0100 @@@@ -10,38 +10,14 @@@@ INSTALL_PREFIX= -ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/include +ASTERISK_HEADER_DIR=../include -ifeq (${OSNAME},FreeBSD) -ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/local/include -endif - -ifeq (${OSNAME},NetBSD) -ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/pkg/include -endif - -ASTERISKVERSION=$(shell if [ -f .version ]; then cat .version; else if [ -d CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`"; else echo "CVS-HEAD-`date +"%D-%T"`"; fi; fi; fi) - -MODULES_DIR=$(INSTALL_PREFIX)/usr/lib/asterisk/modules - -ifeq (${OSNAME},FreeBSD) -MODULES_DIR=$(INSTALL_PREFIX)/usr/local/lib/asterisk/modules -endif +ASTERISKVERSION=$(shell if [ -f ../.version ]; then cat ../.version; else if [ -d CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`"; else echo "CVS-HEAD-`date +"%D-%T"`"; fi; fi; fi) -ifeq (${OSNAME},NetBSD) -MODULES_DIR=$(INSTALL_PREFIX)/usr/pkg/lib/asterisk/modules -endif +MODULES_DIR=$(INSTALL_PREFIX)/lib/asterisk/modules CONFIG_DIR=$(INSTALL_PREFIX)/etc/asterisk -ifeq (${OSNAME},FreeBSD) -CONFIG_DIR=$(INSTALL_PREFIX)/usr/local/etc/asterisk -endif - -ifeq (${OSNAME},NetBSD) -CONFIG_DIR=$(INSTALL_PREFIX)/usr/pkg/etc/asterisk -endif - PROC=$(shell uname -m) DEBUG=-g #-pg @@@@ -56,7 +32,7 @@@@ endif CFLAGS=-pipe -fPIC -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE CFLAGS+=$(OPTIMIZE) -CFLAGS+=-O6 +CFLAGS+=-O2 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi) CFLAGS+=-Wformat Index: channels/Makefile --- channels/Makefile.orig 2006-08-17 23:57:19 +0200 +++ channels/Makefile 2006-12-23 11:34:46 +0100 @@@@ -21,9 +21,7 @@@@ #CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so endif -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib ifeq (${OSARCH},OpenBSD) PTLIB=-lpt_OpenBSD_x86_r Index: channels/chan_h323.c --- channels/chan_h323.c.orig 2006-08-30 20:59:44 +0200 +++ channels/chan_h323.c 2006-12-23 11:34:46 +0100 @@@@ -31,6 +31,7 @@@@ * \ingroup channel_drivers */ +#include #include #include #include Index: channels/chan_iax2.c --- channels/chan_iax2.c.orig 2006-12-09 16:45:37 +0100 +++ channels/chan_iax2.c 2006-12-23 11:34:46 +0100 @@@@ -2608,7 +2608,7 @@@@ struct ast_variable *var; struct ast_variable *tmp; struct iax2_peer *peer=NULL; - time_t regseconds, nowtime; + time_t regseconds = 0, nowtime; int dynamic=0; if (peername) @@@@ -2649,8 +2649,10 @@@@ break; } } else if (!strcasecmp(tmp->name, "regseconds")) { - if (sscanf(tmp->value, "%ld", (time_t *)®seconds) != 1) - regseconds = 0; + long s; + if (sscanf(tmp->value, "%ld", &s) != 1) + s = 0; + regseconds = s; } else if (!strcasecmp(tmp->name, "ipaddr")) { inet_aton(tmp->value, &(peer->addr.sin_addr)); } else if (!strcasecmp(tmp->name, "port")) { Index: channels/chan_sip.c --- channels/chan_sip.c.orig 2006-12-06 16:42:41 +0100 +++ channels/chan_sip.c 2006-12-23 11:34:46 +0100 @@@@ -12341,7 +12341,7 @@@@ int obproxyfound=0; int found=0; int format=0; /* Ama flags */ - time_t regseconds; + time_t regseconds = 0; char *varname = NULL, *varval = NULL; struct ast_variable *tmpvar = NULL; struct ast_flags peerflags = {(0)}; @@@@ -12424,8 +12424,10 @@@@ } if (realtime && !strcasecmp(v->name, "regseconds")) { - if (sscanf(v->value, "%ld", (time_t *)®seconds) != 1) - regseconds = 0; + long s; + if (sscanf(v->value, "%ld", &s) != 1) + s = 0; + regseconds = (time_t)s; } else if (realtime && !strcasecmp(v->name, "ipaddr") && !ast_strlen_zero(v->value) ) { inet_aton(v->value, &(peer->addr.sin_addr)); } else if (realtime && !strcasecmp(v->name, "name")) Index: channels/chan_skinny.c --- channels/chan_skinny.c.orig 2006-10-26 19:08:40 +0200 +++ channels/chan_skinny.c 2006-12-23 11:34:46 +0100 @@@@ -99,7 +99,7 @@@@ #define htolel(x) (x) #define htoles(x) (x) #else -#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) +#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) || defined(__FreeBSD__) #define __bswap_16(x) \ ((((x) & 0xff00) >> 8) | \ (((x) & 0x00ff) << 8)) Index: codecs/Makefile --- codecs/Makefile.orig 2005-11-29 19:24:39 +0100 +++ codecs/Makefile 2006-12-23 11:34:46 +0100 @@@@ -28,45 +28,16 @@@@ LIBG723B=g723.1b/libg723b.a endif -UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) -UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) -ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) -ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h) -ifneq (${UI_SPEEX},) - MODSPEEX=codec_speex.so - LIBSPEEX+=-lspeex -lm -endif -ifneq (${UIS_SPEEX},) - MODSPEEX=codec_speex.so - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/speex - LIBSPEEX+=-lspeex -lm -endif -ifneq (${ULI_SPEEX},) - MODSPEEX=codec_speex.so - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include - LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib - LIBSPEEX+=-lspeex -lm -endif -ifneq (${ULIS_SPEEX},) - MODSPEEX=codec_speex.so - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex - LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib - LIBSPEEX+=-lspeex -lm -endif - -ifneq ($(wildcard ilbc/iLBC_decode.h),) - MODILBC=codec_ilbc.so - LIBILBC=ilbc/libilbc.a -endif +MODSPEEX=codec_speex.so +CFLAGS+=-I$(INSTALL_PREFIX)/include/speex +LIBSPEEX+=-L$(INSTALL_PREFIX)/lib -lspeex -lm LIBGSM=gsm/lib/libgsm.a LIBGSMT=gsm/lib/libgsm.a LIBLPC10=lpc10/liblpc10.a -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \ Index: codecs/gsm/src/short_term.c --- codecs/gsm/src/short_term.c.orig 2005-11-29 19:24:39 +0100 +++ codecs/gsm/src/short_term.c 2006-12-23 11:34:46 +0100 @@@@ -373,7 +373,6 @@@@ word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ]; word LARp[8]; -int i; #undef FILTER #if defined(FAST) && defined(USE_FLOAT_MUL) # define FILTER (* (S->fast \ Index: codecs/lpc10/analys.c --- codecs/lpc10/analys.c.orig 2005-11-29 19:24:39 +0100 +++ codecs/lpc10/analys.c 2006-12-23 11:34:46 +0100 @@@@ -32,7 +32,7 @@@@ #include "f2c.h" -#ifdef P_R_O_T_O_T_Y_P_E_S +#if 1 extern int analys_(real *speech, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_encoder_state *st); /* comlen contrl_ 12 */ /*:ref: preemp_ 14 5 6 6 4 6 6 */ Index: dns.c --- dns.c.orig 2005-11-29 19:24:39 +0100 +++ dns.c 2006-12-23 11:34:46 +0100 @@@@ -194,9 +194,7 @@@@ int res, ret = -1; #ifdef HAS_RES_NINIT -#ifdef MAKE_VALGRIND_HAPPY memset(&dnsstate, 0, sizeof(dnsstate)); -#endif res_ninit(&dnsstate); res = res_nsearch(&dnsstate, dname, class, type, (unsigned char *)answer, sizeof(answer)); #else Index: formats/Makefile --- formats/Makefile.orig 2005-11-29 19:24:39 +0100 +++ formats/Makefile 2006-12-23 11:34:46 +0100 @@@@ -29,9 +29,7 @@@@ FORMAT_LIBS+=format_ogg_vorbis.so endif -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib GSMLIB=../codecs/gsm/lib/libgsm.a Index: formats/msgsm.h --- formats/msgsm.h.orig 2005-11-29 19:24:39 +0100 +++ formats/msgsm.h 2006-12-23 11:34:46 +0100 @@@@ -562,6 +562,7 @@@@ xmc[46] = sr & 0x7; sr >>= 3; xmc[47] = sr & 0x7; sr >>= 3; sr = *c++; + /* FIXME: 48? */ xmc[49] = sr & 0x7; sr >>= 3; sr |= (uword)*c++ << 2; xmc[50] = sr & 0x7; sr >>= 3; Index: frame.c --- frame.c.orig 2006-11-20 20:50:21 +0100 +++ frame.c 2006-12-23 11:34:46 +0100 @@@@ -1059,7 +1059,7 @@@@ { switch(buf & TYPE_MASK) { case TYPE_DONTSEND: - return 0; + return 2; break; case TYPE_SILENCE: return 4; Index: funcs/Makefile --- funcs/Makefile.orig 2005-11-29 19:24:39 +0100 +++ funcs/Makefile 2006-12-23 11:34:46 +0100 @@@@ -40,9 +40,7 @@@@ CFLAGS+=-fPIC endif -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib all: $(FUNCS) Index: funcs/func_strings.c --- funcs/func_strings.c.orig 2006-03-21 18:45:56 +0100 +++ funcs/func_strings.c 2006-12-23 11:34:46 +0100 @@@@ -169,7 +169,7 @@@@ epochi = tv.tv_sec; } - ast_localtime(&epochi, &time, timezone); + { time_t t = (time_t)epochi; ast_localtime(&t, &time, timezone); } if (!format) { format = "%c"; d78 1 a78 1 +++ iax-0.2.2/src/Makefile.in 2006-12-23 11:39:21 +0100 d108 1 a108 1 +++ iax-0.2.2/src/iax.c 2006-12-23 11:34:46 +0100 d123 5 a127 6 Index: pbx/Makefile --- pbx/Makefile.orig 2005-11-29 19:24:39 +0100 +++ pbx/Makefile 2006-12-23 11:34:46 +0100 @@@@ -14,9 +14,7 @@@@ PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so pbx_realtime.so \ pbx_ael.so d129 6 a134 12 -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib # Add GTK console if appropriate #PBX_LIBS+=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") Index: res/Makefile --- res/Makefile.orig 2005-11-29 19:24:39 +0100 +++ res/Makefile 2006-12-23 11:34:46 +0100 @@@@ -36,10 +36,8 @@@@ endif d137 7 a143 78 -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include +SOLINK+=-L$(INSTALL_PREFIX)/lib ifeq (${OSARCH},CYGWIN) CYGSOLINK=-Wl,--out-implib=lib$@@.a -Wl,--export-all-symbols Index: res/res_features.c --- res/res_features.c.orig 2006-11-30 20:04:11 +0100 +++ res/res_features.c 2006-12-23 11:34:46 +0100 @@@@ -505,13 +505,13 @@@@ if (touch_monitor) { len = strlen(touch_monitor) + 50; args = alloca(len); - snprintf(args, len, "%s|auto-%ld-%s|m", (touch_format) ? touch_format : "wav", time(NULL), touch_monitor); + snprintf(args, len, "%s|auto-%ld-%s|m", (touch_format) ? touch_format : "wav", (long)time(NULL), touch_monitor); } else { caller_chan_id = ast_strdupa(caller_chan->cid.cid_num ? caller_chan->cid.cid_num : caller_chan->name); callee_chan_id = ast_strdupa(callee_chan->cid.cid_num ? callee_chan->cid.cid_num : callee_chan->name); len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50; args = alloca(len); - snprintf(args, len, "%s|auto-%ld-%s-%s|m", (touch_format) ? touch_format : "wav", time(NULL), caller_chan_id, callee_chan_id); + snprintf(args, len, "%s|auto-%ld-%s-%s|m", (touch_format) ? touch_format : "wav", (long)time(NULL), caller_chan_id, callee_chan_id); } for( x = 0; x < strlen(args); x++) Index: say.c --- say.c.orig 2005-11-29 19:24:39 +0100 +++ say.c 2006-12-23 11:34:46 +0100 @@@@ -3133,7 +3133,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3156,7 +3156,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3332,7 +3332,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3355,7 +3355,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3524,7 +3524,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3547,7 +3547,7 @@@@ time_t beg_today; d145 5 a149 176 gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3727,7 +3727,7 @@@@ char todo = format[offset]; /* The letter to format*/ gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3883,7 +3883,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3906,7 +3906,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4101,7 +4101,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4124,7 +4124,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4303,7 +4303,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4326,7 +4326,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4528,7 +4528,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4551,7 +4551,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4740,7 +4740,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4763,7 +4763,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -5010,7 +5010,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -5033,7 +5033,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -6043,7 +6043,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -6066,7 +6066,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); Index: utils.c --- utils.c.orig 2006-10-31 07:18:36 +0100 +++ utils.c 2006-12-23 11:34:46 +0100 @@@@ -63,6 +63,8 @@@@ /* duh? ERANGE value copied from web... */ #define ERANGE 34 #undef gethostbyname +#undef gethostbyname_r +#define gethostbyname_r __ast_gethostbyname_r AST_MUTEX_DEFINE_STATIC(__mutex); Index: utils/Makefile --- utils/Makefile.orig 2005-11-29 19:24:39 +0100 +++ utils/Makefile 2006-12-23 11:34:46 +0100 @@@@ -16,17 +16,15 @@@@ # CFLAGS+=-DNO_AST_MM -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib TARGET=stereorize streamplayer -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) +ifneq ($(wildcard $(INSTALL_PREFIX)/include/popt.h)$(wildcard -f $(INSTALL_PREFIX)/include/popt.h),) TARGET+=smsq endif -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) +ifneq ($(wildcard $(INSTALL_PREFIX)/include/newt.h)$(wildcard -f $(INSTALL_PREFIX)/include/newt.h),) TARGET+=astman endif d151 2 @ 1.22 log @upgrading package: asterisk 1.2.13 -> 1.2.14 @ text @d3 1 a3 1 +++ Makefile 2006-12-16 12:07:50 +0100 d194 1 a194 1 +++ agi/Makefile 2006-12-16 12:07:50 +0100 d208 1 a208 1 +++ app_conference/Makefile 2006-12-16 12:07:50 +0100 d290 1 a290 1 +++ app_conference/app_conference.h 2006-12-16 12:07:50 +0100 d314 1 a314 1 +++ app_conference/conference.c 2006-12-16 12:07:50 +0100 d343 1 a343 1 +++ apps/Makefile 2006-12-16 12:07:50 +0100 d367 1 a367 1 +++ asterisk-addons-1.2.5/Makefile 2006-12-16 12:07:50 +0100 d389 8 d399 1 a399 1 +++ asterisk-sounds-1.2.1/Makefile 2006-12-16 12:07:50 +0100 d456 1 a456 1 +++ asterisk.c 2006-12-16 12:07:50 +0100 d470 1 a470 1 +++ build_tools/make_build_h 2006-12-16 12:07:50 +0100 d485 1 a485 1 +++ build_tools/make_defaults_h 2006-12-16 12:07:50 +0100 d497 1 a497 1 +++ cdr/Makefile 2006-12-16 12:07:50 +0100 d513 1 a513 1 +++ chan_capi_1_6_1/Makefile 2006-12-16 12:07:50 +0100 d567 1 a567 1 +++ channels/Makefile 2006-12-16 12:07:50 +0100 d581 1 a581 1 +++ channels/chan_h323.c 2006-12-16 12:07:50 +0100 d592 1 a592 1 +++ channels/chan_iax2.c 2006-12-16 12:07:50 +0100 d617 1 a617 1 +++ channels/chan_sip.c 2006-12-16 12:07:50 +0100 d642 1 a642 1 +++ channels/chan_skinny.c 2006-12-16 12:07:50 +0100 d654 1 a654 1 +++ codecs/Makefile 2006-12-16 12:07:50 +0100 d707 1 a707 1 +++ codecs/gsm/src/short_term.c 2006-12-16 12:07:50 +0100 d718 1 a718 1 +++ codecs/lpc10/analys.c 2006-12-16 12:07:50 +0100 d730 1 a730 1 +++ dns.c 2006-12-16 12:07:50 +0100 d743 1 a743 1 +++ formats/Makefile 2006-12-16 12:07:50 +0100 d757 1 a757 1 +++ formats/msgsm.h 2006-12-16 12:07:50 +0100 d768 1 a768 1 +++ frame.c 2006-12-16 12:07:50 +0100 d780 1 a780 1 +++ funcs/Makefile 2006-12-16 12:07:50 +0100 d794 1 a794 1 +++ funcs/func_strings.c 2006-12-16 12:07:50 +0100 d804 47 d853 1 a853 1 +++ pbx/Makefile 2006-12-16 12:07:50 +0100 d867 1 a867 1 +++ res/Makefile 2006-12-16 12:07:50 +0100 d883 1 a883 1 +++ res/res_features.c 2006-12-16 12:07:50 +0100 d902 1 a902 1 +++ say.c 2006-12-16 12:07:50 +0100 d1094 1 a1094 1 +++ utils.c 2006-12-16 12:07:50 +0100 d1106 1 a1106 1 +++ utils/Makefile 2006-12-16 12:07:50 +0100 @ 1.21 log @first cut for ISDN/CAPI support under FreeBSD/NetBSD via the I4B CAPI20 API @ text @d2 2 a3 2 --- Makefile.orig 2006-09-06 22:09:10 +0200 +++ Makefile 2006-10-22 14:07:55 +0200 d160 1 a160 1 @@@@ -702,31 +674,6 @@@@ d194 1 a194 1 +++ agi/Makefile 2006-10-22 14:07:55 +0200 d208 1 a208 1 +++ app_conference/Makefile 2006-10-22 14:07:55 +0200 d290 1 a290 1 +++ app_conference/app_conference.h 2006-10-22 14:07:55 +0200 d314 1 a314 1 +++ app_conference/conference.c 2006-10-22 14:07:55 +0200 d343 1 a343 1 +++ apps/Makefile 2006-10-22 14:07:55 +0200 d367 1 a367 1 +++ asterisk-addons-1.2.5/Makefile 2006-10-22 14:07:55 +0200 d391 1 a391 1 +++ asterisk-sounds-1.2.1/Makefile 2006-10-22 14:07:55 +0200 d447 2 a448 2 --- asterisk.c.orig 2006-09-26 22:49:21 +0200 +++ asterisk.c 2006-10-22 14:07:55 +0200 d462 1 a462 1 +++ build_tools/make_build_h 2006-10-22 14:07:55 +0200 d477 1 a477 1 +++ build_tools/make_defaults_h 2006-10-22 14:07:55 +0200 d488 2 a489 2 --- cdr/Makefile.orig 2006-09-21 18:18:19 +0200 +++ cdr/Makefile 2006-10-22 14:07:55 +0200 d505 1 a505 1 +++ chan_capi_1_6_1/Makefile 2006-10-22 14:10:15 +0200 d559 1 a559 1 +++ channels/Makefile 2006-10-22 14:07:55 +0200 d573 1 a573 1 +++ channels/chan_h323.c 2006-10-22 14:07:55 +0200 d583 3 a585 3 --- channels/chan_iax2.c.orig 2006-10-13 18:18:08 +0200 +++ channels/chan_iax2.c 2006-10-22 14:07:55 +0200 @@@@ -2607,7 +2607,7 @@@@ d594 1 a594 1 @@@@ -2648,8 +2648,10 @@@@ d608 3 a610 3 --- channels/chan_sip.c.orig 2006-10-17 22:37:17 +0200 +++ channels/chan_sip.c 2006-10-22 14:07:55 +0200 @@@@ -12298,7 +12298,7 @@@@ d619 1 a619 1 @@@@ -12381,8 +12381,10 @@@@ d633 2 a634 2 --- channels/chan_skinny.c.orig 2006-10-17 19:50:36 +0200 +++ channels/chan_skinny.c 2006-10-22 14:07:55 +0200 d646 1 a646 1 +++ codecs/Makefile 2006-10-22 14:07:55 +0200 d699 1 a699 1 +++ codecs/gsm/src/short_term.c 2006-10-22 14:07:55 +0200 d710 1 a710 1 +++ codecs/lpc10/analys.c 2006-10-22 14:07:55 +0200 d722 1 a722 1 +++ dns.c 2006-10-22 14:07:55 +0200 d735 1 a735 1 +++ formats/Makefile 2006-10-22 14:07:55 +0200 d749 1 a749 1 +++ formats/msgsm.h 2006-10-22 14:07:55 +0200 d759 3 a761 3 --- frame.c.orig 2006-09-28 20:00:30 +0200 +++ frame.c 2006-10-22 14:07:55 +0200 @@@@ -1055,7 +1055,7 @@@@ d772 1 a772 1 +++ funcs/Makefile 2006-10-22 14:07:55 +0200 d786 1 a786 1 +++ funcs/func_strings.c 2006-10-22 14:07:55 +0200 d798 1 a798 1 +++ pbx/Makefile 2006-10-22 14:07:55 +0200 d812 1 a812 1 +++ res/Makefile 2006-10-22 14:07:55 +0200 d827 2 a828 2 --- res/res_features.c.orig 2006-09-28 20:00:30 +0200 +++ res/res_features.c 2006-10-22 14:07:55 +0200 a844 15 Index: rtp.c --- rtp.c.orig 2006-09-01 19:35:06 +0200 +++ rtp.c 2006-10-22 14:07:55 +0200 @@@@ -962,8 +962,10 @@@@ rtp->us.sin_port = htons(x); rtp->us.sin_addr = addr; /* If there's rtcp, initialize it as well. */ - if (rtp->rtcp) + if (rtp->rtcp) { rtp->rtcp->us.sin_port = htons(x + 1); + rtp->rtcp->us.sin_addr = addr; + } /* Try to bind it/them. */ if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) && (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us)))) d847 1 a847 1 +++ say.c 2006-10-22 14:07:55 +0200 d1038 2 a1039 2 --- utils.c.orig 2006-10-12 20:31:26 +0200 +++ utils.c 2006-10-22 14:07:55 +0200 d1051 1 a1051 1 +++ utils/Makefile 2006-10-22 14:07:55 +0200 @ 1.20 log @upgrading package: asterisk 1.2.12.1 -> 1.2.13 @ text @d3 1 a3 1 +++ Makefile 2006-10-19 07:38:26 +0200 d194 1 a194 1 +++ agi/Makefile 2006-10-19 07:38:26 +0200 d208 1 a208 1 +++ app_conference/Makefile 2006-10-19 07:38:26 +0200 d290 1 a290 1 +++ app_conference/app_conference.h 2006-10-19 07:38:26 +0200 d314 1 a314 1 +++ app_conference/conference.c 2006-10-19 07:38:26 +0200 d343 1 a343 1 +++ apps/Makefile 2006-10-19 07:38:26 +0200 d367 1 a367 1 +++ asterisk-addons-1.2.5/Makefile 2006-10-19 07:38:26 +0200 d391 1 a391 1 +++ asterisk-sounds-1.2.1/Makefile 2006-10-19 07:38:26 +0200 d448 1 a448 1 +++ asterisk.c 2006-10-19 07:38:26 +0200 d462 1 a462 1 +++ build_tools/make_build_h 2006-10-19 07:38:26 +0200 d477 1 a477 1 +++ build_tools/make_defaults_h 2006-10-19 07:38:26 +0200 d489 1 a489 1 +++ cdr/Makefile 2006-10-19 07:38:26 +0200 d503 54 d559 1 a559 1 +++ channels/Makefile 2006-10-19 07:38:26 +0200 d573 1 a573 1 +++ channels/chan_h323.c 2006-10-19 07:38:26 +0200 d584 1 a584 1 +++ channels/chan_iax2.c 2006-10-19 07:38:26 +0200 d609 1 a609 1 +++ channels/chan_sip.c 2006-10-19 07:38:26 +0200 d634 1 a634 1 +++ channels/chan_skinny.c 2006-10-19 07:38:26 +0200 d646 1 a646 1 +++ codecs/Makefile 2006-10-19 07:38:26 +0200 d699 1 a699 1 +++ codecs/gsm/src/short_term.c 2006-10-19 07:38:26 +0200 d710 1 a710 1 +++ codecs/lpc10/analys.c 2006-10-19 07:38:26 +0200 d722 1 a722 1 +++ dns.c 2006-10-19 07:38:26 +0200 d735 1 a735 1 +++ formats/Makefile 2006-10-19 07:38:26 +0200 d749 1 a749 1 +++ formats/msgsm.h 2006-10-19 07:38:26 +0200 d760 1 a760 1 +++ frame.c 2006-10-19 07:38:26 +0200 d772 1 a772 1 +++ funcs/Makefile 2006-10-19 07:38:26 +0200 d786 1 a786 1 +++ funcs/func_strings.c 2006-10-19 07:38:26 +0200 d798 1 a798 1 +++ pbx/Makefile 2006-10-19 07:38:26 +0200 d812 1 a812 1 +++ res/Makefile 2006-10-19 07:38:26 +0200 d828 1 a828 1 +++ res/res_features.c 2006-10-19 07:38:26 +0200 d847 1 a847 1 +++ rtp.c 2006-10-19 07:38:26 +0200 d862 1 a862 1 +++ say.c 2006-10-19 07:38:26 +0200 d1054 1 a1054 1 +++ utils.c 2006-10-19 07:38:26 +0200 d1066 1 a1066 1 +++ utils/Makefile 2006-10-19 07:38:26 +0200 @ 1.19 log @port to Sun Solaris @ text @d3 1 a3 1 +++ Makefile 2006-10-13 22:45:33 +0200 d194 1 a194 1 +++ agi/Makefile 2006-10-13 22:45:33 +0200 d208 1 a208 1 +++ app_conference/Makefile 2006-10-13 22:45:33 +0200 d290 1 a290 1 +++ app_conference/app_conference.h 2006-10-13 22:45:33 +0200 d314 1 a314 1 +++ app_conference/conference.c 2006-10-13 22:45:33 +0200 d343 1 a343 1 +++ apps/Makefile 2006-10-13 22:45:33 +0200 d365 3 a367 3 Index: asterisk-addons-1.2.4/Makefile --- asterisk-addons-1.2.4/Makefile.orig 2005-12-02 00:14:28 +0100 +++ asterisk-addons-1.2.4/Makefile 2006-10-13 22:45:33 +0200 d391 1 a391 1 +++ asterisk-sounds-1.2.1/Makefile 2006-10-13 22:45:55 +0200 d447 2 a448 2 --- asterisk.c.orig 2006-08-22 00:34:26 +0200 +++ asterisk.c 2006-10-13 22:45:33 +0200 d462 1 a462 1 +++ build_tools/make_build_h 2006-10-13 22:45:33 +0200 d477 1 a477 1 +++ build_tools/make_defaults_h 2006-10-13 22:45:33 +0200 d488 2 a489 2 --- cdr/Makefile.orig 2006-04-30 16:27:56 +0200 +++ cdr/Makefile 2006-10-13 22:45:33 +0200 d505 1 a505 1 +++ channels/Makefile 2006-10-13 22:45:33 +0200 d519 1 a519 1 +++ channels/chan_h323.c 2006-10-13 22:45:33 +0200 d529 3 a531 3 --- channels/chan_iax2.c.orig 2006-09-06 17:55:20 +0200 +++ channels/chan_iax2.c 2006-10-13 22:45:33 +0200 @@@@ -2606,7 +2606,7 @@@@ d540 1 a540 1 @@@@ -2647,8 +2647,10 @@@@ d554 3 a556 3 --- channels/chan_sip.c.orig 2006-09-09 14:14:03 +0200 +++ channels/chan_sip.c 2006-10-13 22:45:33 +0200 @@@@ -12250,7 +12250,7 @@@@ d565 1 a565 1 @@@@ -12333,8 +12333,10 @@@@ d579 2 a580 2 --- channels/chan_skinny.c.orig 2006-08-30 20:59:44 +0200 +++ channels/chan_skinny.c 2006-10-13 22:45:33 +0200 d592 1 a592 1 +++ codecs/Makefile 2006-10-13 22:45:33 +0200 d645 1 a645 1 +++ codecs/gsm/src/short_term.c 2006-10-13 22:45:33 +0200 d656 1 a656 1 +++ codecs/lpc10/analys.c 2006-10-13 22:45:33 +0200 d668 1 a668 1 +++ dns.c 2006-10-13 22:45:33 +0200 d681 1 a681 1 +++ formats/Makefile 2006-10-13 22:45:33 +0200 d695 1 a695 1 +++ formats/msgsm.h 2006-10-13 22:45:33 +0200 d705 2 a706 2 --- frame.c.orig 2006-07-31 06:06:16 +0200 +++ frame.c 2006-10-13 22:45:33 +0200 d718 1 a718 1 +++ funcs/Makefile 2006-10-13 22:45:33 +0200 d732 1 a732 1 +++ funcs/func_strings.c 2006-10-13 22:45:33 +0200 d744 1 a744 1 +++ pbx/Makefile 2006-10-13 22:45:33 +0200 d758 1 a758 1 +++ res/Makefile 2006-10-13 22:45:33 +0200 d773 2 a774 2 --- res/res_features.c.orig 2006-08-02 01:07:06 +0200 +++ res/res_features.c 2006-10-13 22:45:33 +0200 d793 1 a793 1 +++ rtp.c 2006-10-13 22:45:33 +0200 d808 1 a808 1 +++ say.c 2006-10-13 22:45:33 +0200 d999 2 a1000 2 --- utils.c.orig 2006-07-12 15:54:10 +0200 +++ utils.c 2006-10-13 22:45:33 +0200 d1012 1 a1012 1 +++ utils/Makefile 2006-10-13 22:45:33 +0200 @ 1.19.2.1 log @file asterisk.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:48:09 +0000 @ text @d1 1033 @ 1.19.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 1033 Index: Makefile --- Makefile.orig 2006-09-06 22:09:10 +0200 +++ Makefile 2006-10-13 22:45:33 +0200 @@@@ -47,14 +47,14 @@@@ #K6OPT = -DK6OPT #Tell gcc to optimize the code -OPTIMIZE+=-O6 +#OPTIMIZE+=-O6 endif #Overwite config files on "make samples" OVERWRITE=y #Include debug and macro symbols in the executables (-g) and profiling info (-pg) -DEBUG=-g3 #-pg +#DEBUG=-g3 #-pg #Set NOCRYPTO to yes if you do not want to have crypto support or #dependencies @@@@ -110,35 +110,19 @@@@ # Don't use together with -DBUSYDETECT_TONEONLY BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE -ifneq ($(OSARCH),SunOS) - ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk - ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk - ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk - ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk - ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk - ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf - ASTBINDIR=$(INSTALL_PREFIX)/usr/bin - ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin - ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run - ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin -else - ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib - ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib - ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk - ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool - ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log - ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf - ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin - ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin - ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run - ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin -endif +ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk +ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk +ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk +ASTSPOOLDIR=$(INSTALL_PREFIX)/var/asterisk/spool +ASTLOGDIR=$(INSTALL_PREFIX)/var/asterisk/log +ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk +ASTCONFPATH=$(ASTETCDIR)/asterisk.conf +ASTBINDIR=$(INSTALL_PREFIX)/bin +ASTSBINDIR=$(INSTALL_PREFIX)/sbin +ASTVARRUNDIR=$(INSTALL_PREFIX)/var/asterisk/run +ASTMANDIR=$(INSTALL_PREFIX)/man +MODULES_DIR=$(ASTLIBDIR)/modules +AGI_DIR=$(ASTLIBDIR)/agi-bin ASTCFLAGS= @@@@ -218,21 +202,29 @@@@ ID=id ifeq ($(OSARCH),SunOS) - GREP=/usr/xpg4/bin/grep - M4=/usr/local/bin/m4 - ID=/usr/xpg4/bin/id - LN=/usr/xpg4/bin/ln - INSTALL=ginstall + GREP=$(shell if [ -f /usr/xpg4/bin/grep ]; then echo /usr/xpg4/bin/grep; else echo grep; fi) + ID=$(shell if [ -f /usr/xpg4/bin/id ]; then echo /usr/xpg4/bin/grep; else echo id; fi) + LN=$(shell if [ -f /usr/xpg4/bin/ln ]; then echo /usr/xpg4/bin/grep; else echo ln; fi) + INSTALL=$(INSTALL_PREFIX)/lib/openpkg/shtool install -c endif INCLUDE+=-Iinclude -I../include ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY +ASTCFLAGS+=-Wno-sign-compare -Wno-pointer-sign ASTCFLAGS+=$(OPTIMIZE) ASTOBJ=-o asterisk ifeq ($(findstring BSD,$(OSARCH)),BSD) PROC=$(shell uname -m) - ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib +endif + +ASTCFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib + +ifndef WITHOUT_ZAPTEL +ifeq ($(OSARCH),FreeBSD) +ASTCFLAGS+=-I/usr/local/include +LIBS+=-L/usr/local/lib +endif endif ifneq ($(PROC),ultrasparc) @@@@ -252,29 +244,9 @@@@ endif ifeq ($(OSARCH),FreeBSD) - BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) - ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) - ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp - endif + CFLAGS+=-pthread + LIBS+=-pthread MPG123TARG=freebsd - - # XXX FreeBSD paths - PREFIX?=/usr/local - ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk - ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk - ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk - ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk - ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk - ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf - ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin - ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin - ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run - ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man - # XXX end FreeBSD paths - endif # FreeBSD ifeq ($(OSARCH),NetBSD) @@@@ -289,7 +261,7 @@@@ ifeq ($(OSARCH),SunOS) ASTCFLAGS+=-Wcast-align -DSOLARIS - INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/opt/ssl/include -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include + INCLUDE+=-Iinclude/solaris-compat ifeq ($(OSCPU),sun4u) OPTIMIZE+=-mcpu=v9 -mcpu=ultrasparc endif @@@@ -341,9 +313,9 @@@@ ASTCFLAGS+= $(MALLOC_DEBUG) ASTCFLAGS+= $(BUSYDETECT) ASTCFLAGS+= $(OPTIONS) -ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) -ASTCFLAGS+= -fomit-frame-pointer -endif +#ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) +#ASTCFLAGS+= -fomit-frame-pointer +#endif SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \ @@@@ -702,31 +674,6 @@@@ fi install: all datafiles bininstall install-subdirs - @@if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi - @@echo " +---- Asterisk Installation Complete -------+" - @@echo " + +" - @@echo " + YOU MUST READ THE SECURITY DOCUMENT +" - @@echo " + +" - @@echo " + Asterisk has successfully been installed. +" - @@echo " + If you would like to install the sample +" - @@echo " + configuration files (overwriting any +" - @@echo " + existing config files), run: +" - @@echo " + +" - @@echo " + $(MAKE) samples +" - @@echo " + +" - @@echo " +----------------- or ---------------------+" - @@echo " + +" - @@echo " + You can go ahead and install the asterisk +" - @@echo " + program documentation now or later run: +" - @@echo " + +" - @@echo " + $(MAKE) progdocs +" - @@echo " + +" - @@echo " + **Note** This requires that you have +" - @@echo " + doxygen installed on your local system +" - @@echo " +-------------------------------------------+" - @@$(MAKE) -s oldmodcheck upgrade: all bininstall Index: agi/Makefile --- agi/Makefile.orig 2006-03-28 22:22:05 +0200 +++ agi/Makefile 2006-10-13 22:45:33 +0200 @@@@ -20,9 +20,7 @@@@ LIBS=-lsocket -lnsl ../strcompat.o endif -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib all: depend $(AGIS) Index: app_conference/Makefile --- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200 +++ app_conference/Makefile 2006-10-13 22:45:33 +0200 @@@@ -20,10 +20,10 @@@@ INSTALL_PREFIX := /opt/horizon INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules -ASTERISK_INCLUDE_DIR := $(HOME)/local/asterisk/asterisk/include +ASTERISK_INCLUDE_DIR := ../include # turn app_conference debugging on or off ( 0 == OFF, 1 == ON ) -APP_CONFERENCE_DEBUG := 1 +APP_CONFERENCE_DEBUG := 0 # 0 = OFF 1 = astdsp 2 = speex SILDET := 2 @@@@ -44,22 +44,23 @@@@ CC = gcc INCLUDE = -I$(ASTERISK_INCLUDE_DIR) -LIBS = -ldl -lpthread -lm -DEBUG := -g +LIBS = -lpthread -lm +DEBUG := CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE +CFLAGS += -fPIC #CFLAGS += -O2 #CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math # PERF: below is 10% faster than -O2 or -O3 alone. #CFLAGS += -O3 -ffast-math -funroll-loops # below is another 5% faster or so. -CFLAGS += -O3 -ffast-math -funroll-all-loops -fprefetch-loop-arrays -fsingle-precision-constant +#CFLAGS += -O3 -ffast-math -funroll-all-loops -fprefetch-loop-arrays -fsingle-precision-constant # this is fun for PPC #CFLAGS += -mcpu=7450 -faltivec -mabi=altivec -mdynamic-no-pic # this is fun for x86 -CFLAGS += -march=pentium3 -msse -mfpmath=sse,387 +#CFLAGS += -march=pentium3 -msse -mfpmath=sse,387 # adding -msse -mfpmath=sse has little effect. @@@@ -72,13 +73,19 @@@@ CFLAGS += -DAPP_CONFERENCE_DEBUG endif +OSARCH=$(shell uname -s) +ifeq ($(OSARCH),SunOS) + CFLAGS+=-DSOLARIS -I$(ASTERISK_INCLUDE_DIR)/solaris-compat +endif + # # additional flag values for silence detection # ifeq ($(SILDET), 2) -OBJS += libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o -CFLAGS += -Ilibspeex -DSILDET=2 +CFLAGS += -DSILDET=2 +CFLAGS += -I$(INSTALL_PREFIX)/include/speex -I$(INSTALL_PREFIX)/include +LIBS += -L$(INSTALL_PREFIX)/lib -lspeex -lm endif ifeq ($(SILDET), 1) @@@@ -102,14 +109,13 @@@@ rm -f *.so *.o $(OBJS) app_conference.so : $(OBJS) - $(CC) -pg -shared -Xlinker -x -o $@@ $(OBJS) + $(CC) -shared -Xlinker -x -o $@@ $(OBJS) $(LIBS) vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o $(CC) $(PROFILE) -o $@@ $^ -lm install: all for x in $(SHAREDOS); do $(INSTALL) -m 755 $$x $(INSTALL_MODULES_DIR) ; done - /var/horizon/mojo/lib/horizoncmd restart asterisk # config: all # cp conf.conf /etc/asterisk/ Index: app_conference/app_conference.h --- app_conference/app_conference.h.orig 2005-12-16 23:31:58 +0100 +++ app_conference/app_conference.h 2006-10-13 22:45:33 +0200 @@@@ -33,6 +33,7 @@@@ #include #include #include +#include /* standard includes */ #include @@@@ -40,10 +41,9 @@@@ #include #include -#include - #if (SILDET == 2) -#include "libspeex/speex_preprocess.h" +#include +#include #endif // Index: app_conference/conference.c --- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200 +++ app_conference/conference.c 2006-10-13 22:45:33 +0200 @@@@ -568,7 +568,6 @@@@ conf->memberlist = NULL ; conf->membercount = 0 ; - conf->conference_thread = -1 ; conf->debug_flag = 0 ; @@@@ -618,7 +617,7 @@@@ // acquire conference mutexes ast_mutex_lock( &conf->lock ) ; - if ( pthread_create( &conf->conference_thread, NULL, (void*)conference_exec, conf ) == 0 ) + if ( ast_pthread_create( &conf->conference_thread, NULL, (void*)conference_exec, conf ) == 0 ) { // detach the thread so it doesn't leak pthread_detach( conf->conference_thread ) ; @@@@ -632,8 +631,6 @@@@ { ast_log( LOG_ERROR, "unable to start conference thread for conference %s\n", conf->name ) ; - conf->conference_thread = -1 ; - // release conference mutexes ast_mutex_unlock( &conf->lock ) ; Index: apps/Makefile --- apps/Makefile.orig 2006-04-30 15:38:22 +0200 +++ apps/Makefile 2006-10-13 22:45:33 +0200 @@@@ -54,16 +54,11 @@@@ APPS+=app_osplookup.so endif -ifeq ($(findstring BSD,${OSARCH}),BSD) -CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib -CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) -ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) - ifneq (${CURLLIBS},) - APPS+=app_curl.so - endif -endif +CFLAGS+=$(shell $(INSTALL_PREFIX)/bin/curl-config --cflags) +CURLLIBS=$(shell $(INSTALL_PREFIX)/bin/curl-config --libs) +APPS+=app_curl.so ifeq (${OSARCH},CYGWIN) CYGSOLINK=-Wl,--out-implib=lib$@@.a -Wl,--export-all-symbols Index: asterisk-addons-1.2.4/Makefile --- asterisk-addons-1.2.4/Makefile.orig 2005-12-02 00:14:28 +0100 +++ asterisk-addons-1.2.4/Makefile 2006-10-13 22:45:33 +0200 @@@@ -27,17 +27,9 @@@@ # # MySQL stuff... Autoconf anyone?? # -MODS+=$(shell if [ -d /usr/local/mysql/include ] || [ -d /usr/include/mysql ] || [ -d /usr/local/include/mysql ] || [ -d /opt/mysql/include ]; then echo "cdr_addon_mysql.so app_addon_sql_mysql.so res_config_mysql.so"; fi) -CFLAGS+=$(shell if [ -d /usr/local/mysql/include ]; then echo "-I/usr/local/mysql/include"; fi) -CFLAGS+=$(shell if [ -d /usr/include/mysql ]; then echo "-I/usr/include/mysql"; fi) -CFLAGS+=$(shell if [ -d /usr/local/include/mysql ]; then echo "-I/usr/local/include/mysql"; fi) -CFLAGS+=$(shell if [ -d /opt/mysql/include/mysql ]; then echo "-I/opt/mysql/include/mysql"; fi) -MLFLAGS= -MLFLAGS+=$(shell if [ -d /usr/lib/mysql ]; then echo "-L/usr/lib/mysql"; fi) -MLFLAGS+=$(shell if [ -d /usr/lib64/mysql ]; then echo "-L/usr/lib64/mysql"; fi) -MLFLAGS+=$(shell if [ -d /usr/local/mysql/lib ]; then echo "-L/usr/local/mysql/lib"; fi) -MLFLAGS+=$(shell if [ -d /usr/local/lib/mysql ]; then echo "-L/usr/local/lib/mysql"; fi) -MLFLAGS+=$(shell if [ -d /opt/mysql/lib/mysql ]; then echo "-L/opt/mysql/lib/mysql"; fi) +CFLAGS+=-I$(INSTALL_PREFIX)/include +MFLAGS+=-L$(INSTALL_PREFIX)/lib +MODS+=cdr_addon_mysql.so app_addon_sql_mysql.so res_config_mysql.so OSARCH=$(shell uname -s) Index: asterisk-sounds-1.2.1/Makefile --- asterisk-sounds-1.2.1/Makefile.orig 2005-12-02 00:20:51 +0100 +++ asterisk-sounds-1.2.1/Makefile 2006-10-13 22:45:55 +0200 @@@@ -66,7 +66,7 @@@@ mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha for x in sounds/letters/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ else \ echo "No description for $$x"; \ exit 1; \ @@@@ -74,7 +74,7 @@@@ done for x in sounds/phonetic/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ else \ echo "No description for $$x"; \ exit 1; \ @@@@ -82,7 +82,7 @@@@ done for x in sounds/silence/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \ else \ echo "No description for $$x"; \ exit 1; \ @@@@ -90,7 +90,7 @@@@ done for x in sounds/wx/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/wx ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/wx ; \ else \ echo "No description for $$x"; \ exit 1; \ @@@@ -98,7 +98,7 @@@@ done for x in sounds/ha/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha ; \ else \ echo "No description for $$x"; \ exit 1; \ @@@@ -106,7 +106,7 @@@@ done for x in sounds/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ else \ echo "No description for $$x"; \ exit 1; \ Index: asterisk.c --- asterisk.c.orig 2006-08-22 00:34:26 +0200 +++ asterisk.c 2006-10-13 22:45:33 +0200 @@@@ -1902,9 +1902,9 @@@@ } else if (!strcasecmp(v->name, "astspooldir")) { ast_copy_string(ast_config_AST_SPOOL_DIR, v->value, sizeof(ast_config_AST_SPOOL_DIR)); snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value); + snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value); } else if (!strcasecmp(v->name, "astvarlibdir")) { ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR)); - snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value); snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value); } else if (!strcasecmp(v->name, "astlogdir")) { ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR)); Index: build_tools/make_build_h --- build_tools/make_build_h.orig 2006-03-03 18:13:37 +0100 +++ build_tools/make_build_h 2006-10-13 22:45:33 +0200 @@@@ -4,7 +4,11 @@@@ MACHINE=`uname -m` OS=`uname -s` if [ `uname -s` = "SunOS" ]; then + if [ -f /usr/xpg4/bin/id ]; then USER=`/usr/xpg4/bin/id -un` + else + USER=`/usr/bin/id -un` + fi else USER=`id -un` fi Index: build_tools/make_defaults_h --- build_tools/make_defaults_h.orig 2005-06-20 19:26:08 +0200 +++ build_tools/make_defaults_h 2006-10-13 22:45:33 +0200 @@@@ -14,7 +14,7 @@@@ #define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}" #define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}" #define AST_KEY_DIR "${INSTALL_PATH}${ASTVARLIBDIR}/keys" -#define AST_DB "${INSTALL_PATH}${ASTVARLIBDIR}/astdb" +#define AST_DB "${INSTALL_PATH}${ASTSPOOLDIR}/astdb" #define AST_TMP_DIR "${INSTALL_PATH}${ASTSPOOLDIR}/tmp" #define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}" Index: cdr/Makefile --- cdr/Makefile.orig 2006-04-30 16:27:56 +0200 +++ cdr/Makefile 2006-10-13 22:45:33 +0200 @@@@ -20,10 +20,8 @@@@ CFLAGS+=-fPIC endif -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include +SOLINK+=-L$(INSTALL_PREFIX)/lib #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. #This works for even old (2.96) versions of gcc and provides a small boost either way. Index: channels/Makefile --- channels/Makefile.orig 2006-08-17 23:57:19 +0200 +++ channels/Makefile 2006-10-13 22:45:33 +0200 @@@@ -21,9 +21,7 @@@@ #CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so endif -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib ifeq (${OSARCH},OpenBSD) PTLIB=-lpt_OpenBSD_x86_r Index: channels/chan_h323.c --- channels/chan_h323.c.orig 2006-08-30 20:59:44 +0200 +++ channels/chan_h323.c 2006-10-13 22:45:33 +0200 @@@@ -31,6 +31,7 @@@@ * \ingroup channel_drivers */ +#include #include #include #include Index: channels/chan_iax2.c --- channels/chan_iax2.c.orig 2006-09-06 17:55:20 +0200 +++ channels/chan_iax2.c 2006-10-13 22:45:33 +0200 @@@@ -2606,7 +2606,7 @@@@ struct ast_variable *var; struct ast_variable *tmp; struct iax2_peer *peer=NULL; - time_t regseconds, nowtime; + time_t regseconds = 0, nowtime; int dynamic=0; if (peername) @@@@ -2647,8 +2647,10 @@@@ break; } } else if (!strcasecmp(tmp->name, "regseconds")) { - if (sscanf(tmp->value, "%ld", (time_t *)®seconds) != 1) - regseconds = 0; + long s; + if (sscanf(tmp->value, "%ld", &s) != 1) + s = 0; + regseconds = s; } else if (!strcasecmp(tmp->name, "ipaddr")) { inet_aton(tmp->value, &(peer->addr.sin_addr)); } else if (!strcasecmp(tmp->name, "port")) { Index: channels/chan_sip.c --- channels/chan_sip.c.orig 2006-09-09 14:14:03 +0200 +++ channels/chan_sip.c 2006-10-13 22:45:33 +0200 @@@@ -12250,7 +12250,7 @@@@ int obproxyfound=0; int found=0; int format=0; /* Ama flags */ - time_t regseconds; + time_t regseconds = 0; char *varname = NULL, *varval = NULL; struct ast_variable *tmpvar = NULL; struct ast_flags peerflags = {(0)}; @@@@ -12333,8 +12333,10 @@@@ } if (realtime && !strcasecmp(v->name, "regseconds")) { - if (sscanf(v->value, "%ld", (time_t *)®seconds) != 1) - regseconds = 0; + long s; + if (sscanf(v->value, "%ld", &s) != 1) + s = 0; + regseconds = (time_t)s; } else if (realtime && !strcasecmp(v->name, "ipaddr") && !ast_strlen_zero(v->value) ) { inet_aton(v->value, &(peer->addr.sin_addr)); } else if (realtime && !strcasecmp(v->name, "name")) Index: channels/chan_skinny.c --- channels/chan_skinny.c.orig 2006-08-30 20:59:44 +0200 +++ channels/chan_skinny.c 2006-10-13 22:45:33 +0200 @@@@ -99,7 +99,7 @@@@ #define htolel(x) (x) #define htoles(x) (x) #else -#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) +#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) || defined(__FreeBSD__) #define __bswap_16(x) \ ((((x) & 0xff00) >> 8) | \ (((x) & 0x00ff) << 8)) Index: codecs/Makefile --- codecs/Makefile.orig 2005-11-29 19:24:39 +0100 +++ codecs/Makefile 2006-10-13 22:45:33 +0200 @@@@ -28,45 +28,16 @@@@ LIBG723B=g723.1b/libg723b.a endif -UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) -UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) -ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) -ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h) -ifneq (${UI_SPEEX},) - MODSPEEX=codec_speex.so - LIBSPEEX+=-lspeex -lm -endif -ifneq (${UIS_SPEEX},) - MODSPEEX=codec_speex.so - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/speex - LIBSPEEX+=-lspeex -lm -endif -ifneq (${ULI_SPEEX},) - MODSPEEX=codec_speex.so - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include - LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib - LIBSPEEX+=-lspeex -lm -endif -ifneq (${ULIS_SPEEX},) - MODSPEEX=codec_speex.so - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex - LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib - LIBSPEEX+=-lspeex -lm -endif - -ifneq ($(wildcard ilbc/iLBC_decode.h),) - MODILBC=codec_ilbc.so - LIBILBC=ilbc/libilbc.a -endif +MODSPEEX=codec_speex.so +CFLAGS+=-I$(INSTALL_PREFIX)/include/speex +LIBSPEEX+=-L$(INSTALL_PREFIX)/lib -lspeex -lm LIBGSM=gsm/lib/libgsm.a LIBGSMT=gsm/lib/libgsm.a LIBLPC10=lpc10/liblpc10.a -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \ Index: codecs/gsm/src/short_term.c --- codecs/gsm/src/short_term.c.orig 2005-11-29 19:24:39 +0100 +++ codecs/gsm/src/short_term.c 2006-10-13 22:45:33 +0200 @@@@ -373,7 +373,6 @@@@ word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ]; word LARp[8]; -int i; #undef FILTER #if defined(FAST) && defined(USE_FLOAT_MUL) # define FILTER (* (S->fast \ Index: codecs/lpc10/analys.c --- codecs/lpc10/analys.c.orig 2005-11-29 19:24:39 +0100 +++ codecs/lpc10/analys.c 2006-10-13 22:45:33 +0200 @@@@ -32,7 +32,7 @@@@ #include "f2c.h" -#ifdef P_R_O_T_O_T_Y_P_E_S +#if 1 extern int analys_(real *speech, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_encoder_state *st); /* comlen contrl_ 12 */ /*:ref: preemp_ 14 5 6 6 4 6 6 */ Index: dns.c --- dns.c.orig 2005-11-29 19:24:39 +0100 +++ dns.c 2006-10-13 22:45:33 +0200 @@@@ -194,9 +194,7 @@@@ int res, ret = -1; #ifdef HAS_RES_NINIT -#ifdef MAKE_VALGRIND_HAPPY memset(&dnsstate, 0, sizeof(dnsstate)); -#endif res_ninit(&dnsstate); res = res_nsearch(&dnsstate, dname, class, type, (unsigned char *)answer, sizeof(answer)); #else Index: formats/Makefile --- formats/Makefile.orig 2005-11-29 19:24:39 +0100 +++ formats/Makefile 2006-10-13 22:45:33 +0200 @@@@ -29,9 +29,7 @@@@ FORMAT_LIBS+=format_ogg_vorbis.so endif -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib GSMLIB=../codecs/gsm/lib/libgsm.a Index: formats/msgsm.h --- formats/msgsm.h.orig 2005-11-29 19:24:39 +0100 +++ formats/msgsm.h 2006-10-13 22:45:33 +0200 @@@@ -562,6 +562,7 @@@@ xmc[46] = sr & 0x7; sr >>= 3; xmc[47] = sr & 0x7; sr >>= 3; sr = *c++; + /* FIXME: 48? */ xmc[49] = sr & 0x7; sr >>= 3; sr |= (uword)*c++ << 2; xmc[50] = sr & 0x7; sr >>= 3; Index: frame.c --- frame.c.orig 2006-07-31 06:06:16 +0200 +++ frame.c 2006-10-13 22:45:33 +0200 @@@@ -1055,7 +1055,7 @@@@ { switch(buf & TYPE_MASK) { case TYPE_DONTSEND: - return 0; + return 2; break; case TYPE_SILENCE: return 4; Index: funcs/Makefile --- funcs/Makefile.orig 2005-11-29 19:24:39 +0100 +++ funcs/Makefile 2006-10-13 22:45:33 +0200 @@@@ -40,9 +40,7 @@@@ CFLAGS+=-fPIC endif -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib all: $(FUNCS) Index: funcs/func_strings.c --- funcs/func_strings.c.orig 2006-03-21 18:45:56 +0100 +++ funcs/func_strings.c 2006-10-13 22:45:33 +0200 @@@@ -169,7 +169,7 @@@@ epochi = tv.tv_sec; } - ast_localtime(&epochi, &time, timezone); + { time_t t = (time_t)epochi; ast_localtime(&t, &time, timezone); } if (!format) { format = "%c"; Index: pbx/Makefile --- pbx/Makefile.orig 2005-11-29 19:24:39 +0100 +++ pbx/Makefile 2006-10-13 22:45:33 +0200 @@@@ -14,9 +14,7 @@@@ PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so pbx_realtime.so \ pbx_ael.so -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib # Add GTK console if appropriate #PBX_LIBS+=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") Index: res/Makefile --- res/Makefile.orig 2005-11-29 19:24:39 +0100 +++ res/Makefile 2006-10-13 22:45:33 +0200 @@@@ -36,10 +36,8 @@@@ endif endif -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include +SOLINK+=-L$(INSTALL_PREFIX)/lib ifeq (${OSARCH},CYGWIN) CYGSOLINK=-Wl,--out-implib=lib$@@.a -Wl,--export-all-symbols Index: res/res_features.c --- res/res_features.c.orig 2006-08-02 01:07:06 +0200 +++ res/res_features.c 2006-10-13 22:45:33 +0200 @@@@ -505,13 +505,13 @@@@ if (touch_monitor) { len = strlen(touch_monitor) + 50; args = alloca(len); - snprintf(args, len, "%s|auto-%ld-%s|m", (touch_format) ? touch_format : "wav", time(NULL), touch_monitor); + snprintf(args, len, "%s|auto-%ld-%s|m", (touch_format) ? touch_format : "wav", (long)time(NULL), touch_monitor); } else { caller_chan_id = ast_strdupa(caller_chan->cid.cid_num ? caller_chan->cid.cid_num : caller_chan->name); callee_chan_id = ast_strdupa(callee_chan->cid.cid_num ? callee_chan->cid.cid_num : callee_chan->name); len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50; args = alloca(len); - snprintf(args, len, "%s|auto-%ld-%s-%s|m", (touch_format) ? touch_format : "wav", time(NULL), caller_chan_id, callee_chan_id); + snprintf(args, len, "%s|auto-%ld-%s-%s|m", (touch_format) ? touch_format : "wav", (long)time(NULL), caller_chan_id, callee_chan_id); } for( x = 0; x < strlen(args); x++) Index: rtp.c --- rtp.c.orig 2006-09-01 19:35:06 +0200 +++ rtp.c 2006-10-13 22:45:33 +0200 @@@@ -962,8 +962,10 @@@@ rtp->us.sin_port = htons(x); rtp->us.sin_addr = addr; /* If there's rtcp, initialize it as well. */ - if (rtp->rtcp) + if (rtp->rtcp) { rtp->rtcp->us.sin_port = htons(x + 1); + rtp->rtcp->us.sin_addr = addr; + } /* Try to bind it/them. */ if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) && (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us)))) Index: say.c --- say.c.orig 2005-11-29 19:24:39 +0100 +++ say.c 2006-10-13 22:45:33 +0200 @@@@ -3133,7 +3133,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3156,7 +3156,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3332,7 +3332,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3355,7 +3355,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3524,7 +3524,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3547,7 +3547,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3727,7 +3727,7 @@@@ char todo = format[offset]; /* The letter to format*/ gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3883,7 +3883,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -3906,7 +3906,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4101,7 +4101,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4124,7 +4124,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4303,7 +4303,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4326,7 +4326,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4528,7 +4528,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4551,7 +4551,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4740,7 +4740,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -4763,7 +4763,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -5010,7 +5010,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -5033,7 +5033,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -6043,7 +6043,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); @@@@ -6066,7 +6066,7 @@@@ time_t beg_today; gettimeofday(&now,NULL); - ast_localtime(&now.tv_sec,&tmnow,timezone); + { time_t t = (time_t)now.tv_sec; ast_localtime(&t,&tmnow,timezone); } /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* In any case, it saves not having to do ast_mktime() */ beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); Index: utils.c --- utils.c.orig 2006-07-12 15:54:10 +0200 +++ utils.c 2006-10-13 22:45:33 +0200 @@@@ -63,6 +63,8 @@@@ /* duh? ERANGE value copied from web... */ #define ERANGE 34 #undef gethostbyname +#undef gethostbyname_r +#define gethostbyname_r __ast_gethostbyname_r AST_MUTEX_DEFINE_STATIC(__mutex); Index: utils/Makefile --- utils/Makefile.orig 2005-11-29 19:24:39 +0100 +++ utils/Makefile 2006-10-13 22:45:33 +0200 @@@@ -16,17 +16,15 @@@@ # CFLAGS+=-DNO_AST_MM -ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif +CFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib TARGET=stereorize streamplayer -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) +ifneq ($(wildcard $(INSTALL_PREFIX)/include/popt.h)$(wildcard -f $(INSTALL_PREFIX)/include/popt.h),) TARGET+=smsq endif -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) +ifneq ($(wildcard $(INSTALL_PREFIX)/include/newt.h)$(wildcard -f $(INSTALL_PREFIX)/include/newt.h),) TARGET+=astman endif @ 1.19.2.3 log @MFC: fixed vendor version @ text @d3 1 a3 1 +++ Makefile 2006-10-19 07:38:26 +0200 d194 1 a194 1 +++ agi/Makefile 2006-10-19 07:38:26 +0200 d208 1 a208 1 +++ app_conference/Makefile 2006-10-19 07:38:26 +0200 d290 1 a290 1 +++ app_conference/app_conference.h 2006-10-19 07:38:26 +0200 d314 1 a314 1 +++ app_conference/conference.c 2006-10-19 07:38:26 +0200 d343 1 a343 1 +++ apps/Makefile 2006-10-19 07:38:26 +0200 d365 3 a367 3 Index: asterisk-addons-1.2.5/Makefile --- asterisk-addons-1.2.5/Makefile.orig 2005-12-02 00:14:28 +0100 +++ asterisk-addons-1.2.5/Makefile 2006-10-19 07:38:26 +0200 d391 1 a391 1 +++ asterisk-sounds-1.2.1/Makefile 2006-10-19 07:38:26 +0200 d447 2 a448 2 --- asterisk.c.orig 2006-09-26 22:49:21 +0200 +++ asterisk.c 2006-10-19 07:38:26 +0200 d462 1 a462 1 +++ build_tools/make_build_h 2006-10-19 07:38:26 +0200 d477 1 a477 1 +++ build_tools/make_defaults_h 2006-10-19 07:38:26 +0200 d488 2 a489 2 --- cdr/Makefile.orig 2006-09-21 18:18:19 +0200 +++ cdr/Makefile 2006-10-19 07:38:26 +0200 d505 1 a505 1 +++ channels/Makefile 2006-10-19 07:38:26 +0200 d519 1 a519 1 +++ channels/chan_h323.c 2006-10-19 07:38:26 +0200 d529 3 a531 3 --- channels/chan_iax2.c.orig 2006-10-13 18:18:08 +0200 +++ channels/chan_iax2.c 2006-10-19 07:38:26 +0200 @@@@ -2607,7 +2607,7 @@@@ d540 1 a540 1 @@@@ -2648,8 +2648,10 @@@@ d554 3 a556 3 --- channels/chan_sip.c.orig 2006-10-17 22:37:17 +0200 +++ channels/chan_sip.c 2006-10-19 07:38:26 +0200 @@@@ -12298,7 +12298,7 @@@@ d565 1 a565 1 @@@@ -12381,8 +12381,10 @@@@ d579 2 a580 2 --- channels/chan_skinny.c.orig 2006-10-17 19:50:36 +0200 +++ channels/chan_skinny.c 2006-10-19 07:38:26 +0200 d592 1 a592 1 +++ codecs/Makefile 2006-10-19 07:38:26 +0200 d645 1 a645 1 +++ codecs/gsm/src/short_term.c 2006-10-19 07:38:26 +0200 d656 1 a656 1 +++ codecs/lpc10/analys.c 2006-10-19 07:38:26 +0200 d668 1 a668 1 +++ dns.c 2006-10-19 07:38:26 +0200 d681 1 a681 1 +++ formats/Makefile 2006-10-19 07:38:26 +0200 d695 1 a695 1 +++ formats/msgsm.h 2006-10-19 07:38:26 +0200 d705 2 a706 2 --- frame.c.orig 2006-09-28 20:00:30 +0200 +++ frame.c 2006-10-19 07:38:26 +0200 d718 1 a718 1 +++ funcs/Makefile 2006-10-19 07:38:26 +0200 d732 1 a732 1 +++ funcs/func_strings.c 2006-10-19 07:38:26 +0200 d744 1 a744 1 +++ pbx/Makefile 2006-10-19 07:38:26 +0200 d758 1 a758 1 +++ res/Makefile 2006-10-19 07:38:26 +0200 d773 2 a774 2 --- res/res_features.c.orig 2006-09-28 20:00:30 +0200 +++ res/res_features.c 2006-10-19 07:38:26 +0200 d793 1 a793 1 +++ rtp.c 2006-10-19 07:38:26 +0200 d808 1 a808 1 +++ say.c 2006-10-19 07:38:26 +0200 d999 2 a1000 2 --- utils.c.orig 2006-10-12 20:31:26 +0200 +++ utils.c 2006-10-19 07:38:26 +0200 d1012 1 a1012 1 +++ utils/Makefile 2006-10-19 07:38:26 +0200 @ 1.18 log @do not warn about signed/unsigned mismatches as Asterisk has too many of them (and they do not really hurt here); add a zapata.conf configuration file to make Asterisk happy if built with Zaptel support @ text @d3 1 a3 1 +++ Makefile 2006-09-17 19:59:40 +0200 d70 2 a71 1 @@@@ -219,7 +203,6 @@@@ d74 1 a74 1 GREP=/usr/xpg4/bin/grep d76 8 a83 4 ID=/usr/xpg4/bin/id LN=/usr/xpg4/bin/ln INSTALL=ginstall @@@@ -227,12 +210,21 @@@@ d160 32 d194 1 a194 1 +++ agi/Makefile 2006-09-17 19:59:20 +0200 d208 1 a208 1 +++ app_conference/Makefile 2006-09-17 19:59:20 +0200 d250 11 a260 1 @@@@ -77,8 +78,9 @@@@ d272 1 a272 1 @@@@ -102,14 +104,13 @@@@ d290 1 a290 1 +++ app_conference/app_conference.h 2006-09-17 19:59:20 +0200 d314 1 a314 1 +++ app_conference/conference.c 2006-09-17 19:59:20 +0200 d343 1 a343 1 +++ apps/Makefile 2006-09-17 19:59:20 +0200 d367 1 a367 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-17 19:59:20 +0200 d389 57 d448 1 a448 1 +++ asterisk.c 2006-09-17 19:59:20 +0200 d460 15 d477 1 a477 1 +++ build_tools/make_defaults_h 2006-09-17 19:59:20 +0200 d489 1 a489 1 +++ cdr/Makefile 2006-09-17 19:59:20 +0200 d505 1 a505 1 +++ channels/Makefile 2006-09-17 19:59:20 +0200 d519 1 a519 1 +++ channels/chan_h323.c 2006-09-17 19:59:20 +0200 d530 1 a530 1 +++ channels/chan_iax2.c 2006-09-17 19:59:20 +0200 d555 1 a555 1 +++ channels/chan_sip.c 2006-09-17 19:59:20 +0200 d580 1 a580 1 +++ channels/chan_skinny.c 2006-09-17 19:59:20 +0200 d592 1 a592 1 +++ codecs/Makefile 2006-09-17 19:59:20 +0200 d645 1 a645 1 +++ codecs/gsm/src/short_term.c 2006-09-17 19:59:20 +0200 d656 1 a656 1 +++ codecs/lpc10/analys.c 2006-09-17 19:59:20 +0200 d668 1 a668 1 +++ dns.c 2006-09-17 19:59:20 +0200 d681 1 a681 1 +++ formats/Makefile 2006-09-17 19:59:20 +0200 d695 1 a695 1 +++ formats/msgsm.h 2006-09-17 19:59:20 +0200 d706 1 a706 1 +++ frame.c 2006-09-17 19:59:20 +0200 d718 1 a718 1 +++ funcs/Makefile 2006-09-17 19:59:20 +0200 d732 1 a732 1 +++ funcs/func_strings.c 2006-09-17 19:59:20 +0200 d744 1 a744 1 +++ pbx/Makefile 2006-09-17 19:59:20 +0200 d758 1 a758 1 +++ res/Makefile 2006-09-17 19:59:20 +0200 d774 1 a774 1 +++ res/res_features.c 2006-09-17 19:59:20 +0200 d793 1 a793 1 +++ rtp.c 2006-09-17 19:59:20 +0200 d808 1 a808 1 +++ say.c 2006-09-17 19:59:20 +0200 d1000 1 a1000 1 +++ utils.c 2006-09-17 19:59:20 +0200 d1012 1 a1012 1 +++ utils/Makefile 2006-09-17 19:59:20 +0200 @ 1.17 log @fix building under FreeBSD by preferring the OpenPKG instance libraries @ text @d3 1 a3 1 +++ Makefile 2006-09-16 17:39:39 +0200 d78 7 a84 1 @@@@ -232,7 +215,15 @@@@ d101 1 a101 1 @@@@ -252,29 +243,9 @@@@ d133 1 a133 1 @@@@ -289,7 +260,7 @@@@ d142 1 a142 1 @@@@ -341,9 +312,9 @@@@ d157 1 a157 1 +++ agi/Makefile 2006-09-16 17:38:48 +0200 d171 1 a171 1 +++ app_conference/Makefile 2006-09-16 17:38:48 +0200 d243 1 a243 1 +++ app_conference/app_conference.h 2006-09-16 17:38:48 +0200 d267 1 a267 1 +++ app_conference/conference.c 2006-09-16 17:38:48 +0200 d296 1 a296 1 +++ apps/Makefile 2006-09-16 17:38:48 +0200 d320 1 a320 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-16 17:38:48 +0200 d344 1 a344 1 +++ asterisk.c 2006-09-16 17:38:48 +0200 d358 1 a358 1 +++ build_tools/make_defaults_h 2006-09-16 17:38:48 +0200 d370 1 a370 1 +++ cdr/Makefile 2006-09-16 17:38:48 +0200 d386 1 a386 1 +++ channels/Makefile 2006-09-16 17:38:48 +0200 d400 1 a400 1 +++ channels/chan_h323.c 2006-09-16 17:38:48 +0200 d411 1 a411 1 +++ channels/chan_iax2.c 2006-09-16 17:38:48 +0200 d436 1 a436 1 +++ channels/chan_sip.c 2006-09-16 17:38:48 +0200 d461 1 a461 1 +++ channels/chan_skinny.c 2006-09-16 17:38:48 +0200 d473 1 a473 1 +++ codecs/Makefile 2006-09-16 17:38:48 +0200 d526 1 a526 1 +++ codecs/gsm/src/short_term.c 2006-09-16 17:38:48 +0200 d537 1 a537 1 +++ codecs/lpc10/analys.c 2006-09-16 17:38:48 +0200 d549 1 a549 1 +++ dns.c 2006-09-16 17:38:48 +0200 d562 1 a562 1 +++ formats/Makefile 2006-09-16 17:38:48 +0200 d576 1 a576 1 +++ formats/msgsm.h 2006-09-16 17:38:48 +0200 d587 1 a587 1 +++ frame.c 2006-09-16 17:38:48 +0200 d599 1 a599 1 +++ funcs/Makefile 2006-09-16 17:38:48 +0200 d613 1 a613 1 +++ funcs/func_strings.c 2006-09-16 17:38:48 +0200 d625 1 a625 1 +++ pbx/Makefile 2006-09-16 17:38:48 +0200 d639 1 a639 1 +++ res/Makefile 2006-09-16 17:38:48 +0200 d655 1 a655 1 +++ res/res_features.c 2006-09-16 17:38:48 +0200 d674 1 a674 1 +++ rtp.c 2006-09-16 17:38:48 +0200 d689 1 a689 1 +++ say.c 2006-09-16 17:38:48 +0200 d881 1 a881 1 +++ utils.c 2006-09-16 17:38:48 +0200 d893 1 a893 1 +++ utils/Makefile 2006-09-16 17:38:48 +0200 @ 1.16 log @add optional Zaptel support for Linux & FreeBSD; this allows one to use PSTN hardware or at least the ztdummy kernel device which in turn allows one to use the more robust MeetMe conference application @ text @d3 1 a3 1 +++ Makefile 2006-09-16 14:56:22 +0200 d78 1 a78 1 @@@@ -232,9 +215,10 @@@@ d83 9 a93 2 +ASTCFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib + d95 1 a95 3 ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) endif @@@@ -252,29 +236,9 @@@@ d127 1 a127 1 @@@@ -289,7 +253,7 @@@@ d136 1 a136 12 @@@@ -306,6 +270,10 @@@@ endif ifndef WITHOUT_ZAPTEL +ifeq ($(OSARCH),FreeBSD) +CFLAGS+=-I/usr/local/include +LIBS+=-L/usr/local/lib +endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS @@@@ -341,9 +309,9 @@@@ d151 1 a151 1 +++ agi/Makefile 2006-09-16 14:55:34 +0200 d165 1 a165 1 +++ app_conference/Makefile 2006-09-16 14:55:34 +0200 d237 1 a237 1 +++ app_conference/app_conference.h 2006-09-16 14:55:34 +0200 d261 1 a261 1 +++ app_conference/conference.c 2006-09-16 14:55:34 +0200 d290 1 a290 1 +++ apps/Makefile 2006-09-16 14:55:34 +0200 d314 1 a314 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-16 14:55:34 +0200 d338 1 a338 1 +++ asterisk.c 2006-09-16 14:55:34 +0200 d352 1 a352 1 +++ build_tools/make_defaults_h 2006-09-16 14:55:34 +0200 d364 1 a364 1 +++ cdr/Makefile 2006-09-16 14:55:34 +0200 d380 1 a380 1 +++ channels/Makefile 2006-09-16 14:55:34 +0200 d394 1 a394 1 +++ channels/chan_h323.c 2006-09-16 14:55:34 +0200 d405 1 a405 1 +++ channels/chan_iax2.c 2006-09-16 14:55:34 +0200 d430 1 a430 1 +++ channels/chan_sip.c 2006-09-16 14:55:34 +0200 d455 1 a455 1 +++ channels/chan_skinny.c 2006-09-16 14:55:34 +0200 d467 1 a467 1 +++ codecs/Makefile 2006-09-16 14:55:34 +0200 d520 1 a520 1 +++ codecs/gsm/src/short_term.c 2006-09-16 14:55:34 +0200 d531 1 a531 1 +++ codecs/lpc10/analys.c 2006-09-16 14:55:34 +0200 d543 1 a543 1 +++ dns.c 2006-09-16 14:55:34 +0200 d556 1 a556 1 +++ formats/Makefile 2006-09-16 14:55:34 +0200 d570 1 a570 1 +++ formats/msgsm.h 2006-09-16 14:55:34 +0200 d581 1 a581 1 +++ frame.c 2006-09-16 14:55:34 +0200 d593 1 a593 1 +++ funcs/Makefile 2006-09-16 14:55:34 +0200 d607 1 a607 1 +++ funcs/func_strings.c 2006-09-16 14:55:34 +0200 d619 1 a619 1 +++ pbx/Makefile 2006-09-16 14:55:34 +0200 d633 1 a633 1 +++ res/Makefile 2006-09-16 14:55:34 +0200 d649 1 a649 1 +++ res/res_features.c 2006-09-16 14:55:34 +0200 d668 1 a668 1 +++ rtp.c 2006-09-16 14:55:34 +0200 d683 1 a683 1 +++ say.c 2006-09-16 14:55:34 +0200 d875 1 a875 1 +++ utils.c 2006-09-16 14:55:34 +0200 d887 1 a887 1 +++ utils/Makefile 2006-09-16 14:55:34 +0200 @ 1.15 log @fix segfault under FreeBSD @ text @d3 1 a3 1 +++ Makefile 2006-09-16 09:51:07 +0200 d131 12 a142 1 @@@@ -341,9 +305,9 @@@@ d157 1 a157 1 +++ agi/Makefile 2006-09-16 09:51:07 +0200 d171 1 a171 1 +++ app_conference/Makefile 2006-09-16 09:51:07 +0200 d243 1 a243 1 +++ app_conference/app_conference.h 2006-09-16 09:51:07 +0200 d267 1 a267 1 +++ app_conference/conference.c 2006-09-16 09:51:07 +0200 d296 1 a296 1 +++ apps/Makefile 2006-09-16 09:51:07 +0200 d320 1 a320 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-16 09:51:07 +0200 d344 1 a344 1 +++ asterisk.c 2006-09-16 09:51:07 +0200 d358 1 a358 1 +++ build_tools/make_defaults_h 2006-09-16 09:51:07 +0200 d370 1 a370 1 +++ cdr/Makefile 2006-09-16 09:51:07 +0200 d386 1 a386 1 +++ channels/Makefile 2006-09-16 09:51:07 +0200 d400 1 a400 1 +++ channels/chan_h323.c 2006-09-16 09:51:07 +0200 d411 1 a411 1 +++ channels/chan_iax2.c 2006-09-16 09:51:07 +0200 d436 1 a436 1 +++ channels/chan_sip.c 2006-09-16 09:51:07 +0200 d461 1 a461 1 +++ channels/chan_skinny.c 2006-09-16 09:51:07 +0200 d473 1 a473 1 +++ codecs/Makefile 2006-09-16 09:51:07 +0200 d526 1 a526 1 +++ codecs/gsm/src/short_term.c 2006-09-16 09:51:07 +0200 d537 1 a537 1 +++ codecs/lpc10/analys.c 2006-09-16 09:51:07 +0200 d549 1 a549 1 +++ dns.c 2006-09-16 09:51:50 +0200 d562 1 a562 1 +++ formats/Makefile 2006-09-16 09:51:07 +0200 d576 1 a576 1 +++ formats/msgsm.h 2006-09-16 09:51:07 +0200 d587 1 a587 1 +++ frame.c 2006-09-16 09:51:07 +0200 d599 1 a599 1 +++ funcs/Makefile 2006-09-16 09:51:07 +0200 d613 1 a613 1 +++ funcs/func_strings.c 2006-09-16 09:51:07 +0200 d625 1 a625 1 +++ pbx/Makefile 2006-09-16 09:51:07 +0200 d639 1 a639 1 +++ res/Makefile 2006-09-16 09:51:07 +0200 d655 1 a655 1 +++ res/res_features.c 2006-09-16 09:51:07 +0200 d674 1 a674 1 +++ rtp.c 2006-09-16 09:51:07 +0200 d689 1 a689 1 +++ say.c 2006-09-16 09:51:07 +0200 d881 1 a881 1 +++ utils.c 2006-09-16 09:51:07 +0200 d893 1 a893 1 +++ utils/Makefile 2006-09-16 09:51:07 +0200 @ 1.14 log @resolve the gethostbyname_r issue the more general way @ text @d3 1 a3 1 +++ Makefile 2006-09-15 07:54:50 +0200 d146 1 a146 1 +++ agi/Makefile 2006-09-15 07:54:50 +0200 d160 1 a160 1 +++ app_conference/Makefile 2006-09-15 07:54:50 +0200 d232 1 a232 1 +++ app_conference/app_conference.h 2006-09-15 07:54:50 +0200 d256 1 a256 1 +++ app_conference/conference.c 2006-09-15 07:54:50 +0200 d285 1 a285 1 +++ apps/Makefile 2006-09-15 07:54:50 +0200 d309 1 a309 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-15 07:54:50 +0200 d333 1 a333 1 +++ asterisk.c 2006-09-15 07:54:50 +0200 d347 1 a347 1 +++ build_tools/make_defaults_h 2006-09-15 07:54:50 +0200 d359 1 a359 1 +++ cdr/Makefile 2006-09-15 07:54:50 +0200 d375 1 a375 1 +++ channels/Makefile 2006-09-15 07:54:50 +0200 d389 1 a389 1 +++ channels/chan_h323.c 2006-09-15 07:54:50 +0200 d400 1 a400 1 +++ channels/chan_iax2.c 2006-09-15 07:54:50 +0200 d425 1 a425 1 +++ channels/chan_sip.c 2006-09-15 07:54:50 +0200 d450 1 a450 1 +++ channels/chan_skinny.c 2006-09-15 07:54:50 +0200 d462 1 a462 1 +++ codecs/Makefile 2006-09-15 07:54:50 +0200 d515 1 a515 1 +++ codecs/gsm/src/short_term.c 2006-09-15 07:54:50 +0200 d526 1 a526 1 +++ codecs/lpc10/analys.c 2006-09-15 07:54:50 +0200 d536 13 d551 1 a551 1 +++ formats/Makefile 2006-09-15 07:54:50 +0200 d565 1 a565 1 +++ formats/msgsm.h 2006-09-15 07:54:50 +0200 d576 1 a576 1 +++ frame.c 2006-09-15 07:54:50 +0200 d588 1 a588 1 +++ funcs/Makefile 2006-09-15 07:54:50 +0200 d602 1 a602 1 +++ funcs/func_strings.c 2006-09-15 07:54:50 +0200 d614 1 a614 1 +++ pbx/Makefile 2006-09-15 07:54:50 +0200 d628 1 a628 1 +++ res/Makefile 2006-09-15 07:54:50 +0200 d644 1 a644 1 +++ res/res_features.c 2006-09-15 07:54:50 +0200 d663 1 a663 1 +++ rtp.c 2006-09-15 07:54:50 +0200 d678 1 a678 1 +++ say.c 2006-09-15 07:54:50 +0200 d870 1 a870 1 +++ utils.c 2006-09-15 07:55:37 +0200 d882 1 a882 1 +++ utils/Makefile 2006-09-15 07:54:50 +0200 @ 1.13 log @build against external speex instead of against a local (and older) copy of speex @ text @d3 1 a3 1 +++ Makefile 2006-09-13 07:53:22 +0200 d146 1 a146 1 +++ agi/Makefile 2006-09-13 07:53:22 +0200 d160 1 a160 1 +++ app_conference/Makefile 2006-09-13 07:53:52 +0200 d232 1 a232 1 +++ app_conference/app_conference.h 2006-09-13 07:53:22 +0200 d256 1 a256 1 +++ app_conference/conference.c 2006-09-13 07:53:22 +0200 d285 1 a285 1 +++ apps/Makefile 2006-09-13 07:53:22 +0200 d309 1 a309 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-13 07:53:22 +0200 d333 1 a333 1 +++ asterisk.c 2006-09-13 07:53:22 +0200 d347 1 a347 1 +++ build_tools/make_defaults_h 2006-09-13 07:53:22 +0200 d359 1 a359 1 +++ cdr/Makefile 2006-09-13 07:53:22 +0200 d375 1 a375 1 +++ channels/Makefile 2006-09-13 07:53:22 +0200 d389 1 a389 1 +++ channels/chan_h323.c 2006-09-13 07:53:22 +0200 d400 1 a400 1 +++ channels/chan_iax2.c 2006-09-13 07:53:22 +0200 d425 1 a425 1 +++ channels/chan_sip.c 2006-09-13 07:53:22 +0200 d450 1 a450 1 +++ channels/chan_skinny.c 2006-09-13 07:53:22 +0200 d462 1 a462 1 +++ codecs/Makefile 2006-09-13 07:53:22 +0200 d515 1 a515 1 +++ codecs/gsm/src/short_term.c 2006-09-13 07:53:22 +0200 d526 1 a526 1 +++ codecs/lpc10/analys.c 2006-09-13 07:53:22 +0200 d538 1 a538 1 +++ formats/Makefile 2006-09-13 07:53:22 +0200 d552 1 a552 1 +++ formats/msgsm.h 2006-09-13 07:53:22 +0200 d563 1 a563 1 +++ frame.c 2006-09-13 07:53:22 +0200 d575 1 a575 1 +++ funcs/Makefile 2006-09-13 07:53:22 +0200 d589 1 a589 1 +++ funcs/func_strings.c 2006-09-13 07:53:22 +0200 d601 1 a601 1 +++ pbx/Makefile 2006-09-13 07:53:22 +0200 d615 1 a615 1 +++ res/Makefile 2006-09-13 07:53:22 +0200 d631 1 a631 1 +++ res/res_features.c 2006-09-13 07:53:22 +0200 d650 1 a650 1 +++ rtp.c 2006-09-13 07:53:22 +0200 d665 1 a665 1 +++ say.c 2006-09-13 07:53:22 +0200 d857 2 a858 11 +++ utils.c 2006-09-13 07:53:22 +0200 @@@@ -58,7 +58,10 @@@@ static char base64[64]; static char b2a[256]; -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) +#if defined(__FreeBSD__) +#include +#endif +#if (defined(__FreeBSD__) && __FreeBSD_version < 601104) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) d861 6 d869 1 a869 1 +++ utils/Makefile 2006-09-13 07:53:22 +0200 @ 1.12 log @cleanup pthread usage by using the Asterisk way @ text @d3 1 a3 1 +++ Makefile 2006-09-13 07:30:00 +0200 d146 1 a146 1 +++ agi/Makefile 2006-09-13 07:30:00 +0200 d160 1 a160 1 +++ app_conference/Makefile 2006-09-13 07:30:00 +0200 d202 13 a214 1 @@@@ -102,14 +103,13 @@@@ d219 1 a219 1 + $(CC) -shared -Xlinker -x -o $@@ $(OBJS) d232 1 a232 1 +++ app_conference/app_conference.h 2006-09-13 07:31:29 +0200 d241 1 a241 1 @@@@ -40,8 +41,6 @@@@ d248 3 a250 1 #include "libspeex/speex_preprocess.h" d252 2 d256 1 a256 1 +++ app_conference/conference.c 2006-09-13 07:30:00 +0200 d285 1 a285 1 +++ apps/Makefile 2006-09-13 07:30:00 +0200 d309 1 a309 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-13 07:30:00 +0200 d333 1 a333 1 +++ asterisk.c 2006-09-13 07:30:00 +0200 d347 1 a347 1 +++ build_tools/make_defaults_h 2006-09-13 07:30:00 +0200 d359 1 a359 1 +++ cdr/Makefile 2006-09-13 07:30:00 +0200 d375 1 a375 1 +++ channels/Makefile 2006-09-13 07:30:00 +0200 d389 1 a389 1 +++ channels/chan_h323.c 2006-09-13 07:30:00 +0200 d400 1 a400 1 +++ channels/chan_iax2.c 2006-09-13 07:30:00 +0200 d425 1 a425 1 +++ channels/chan_sip.c 2006-09-13 07:30:00 +0200 d450 1 a450 1 +++ channels/chan_skinny.c 2006-09-13 07:30:00 +0200 d462 1 a462 1 +++ codecs/Makefile 2006-09-13 07:30:00 +0200 d515 1 a515 1 +++ codecs/gsm/src/short_term.c 2006-09-13 07:30:00 +0200 d526 1 a526 1 +++ codecs/lpc10/analys.c 2006-09-13 07:30:00 +0200 d538 1 a538 1 +++ formats/Makefile 2006-09-13 07:30:00 +0200 d552 1 a552 1 +++ formats/msgsm.h 2006-09-13 07:30:00 +0200 d563 1 a563 1 +++ frame.c 2006-09-13 07:30:00 +0200 d575 1 a575 1 +++ funcs/Makefile 2006-09-13 07:30:00 +0200 d589 1 a589 1 +++ funcs/func_strings.c 2006-09-13 07:30:00 +0200 d601 1 a601 1 +++ pbx/Makefile 2006-09-13 07:30:00 +0200 d615 1 a615 1 +++ res/Makefile 2006-09-13 07:30:00 +0200 d631 1 a631 1 +++ res/res_features.c 2006-09-13 07:30:00 +0200 d650 1 a650 1 +++ rtp.c 2006-09-13 07:30:00 +0200 d665 1 a665 1 +++ say.c 2006-09-13 07:30:00 +0200 d857 1 a857 1 +++ utils.c 2006-09-13 07:30:00 +0200 d872 1 a872 1 +++ utils/Makefile 2006-09-13 07:30:00 +0200 @ 1.11 log @disable too aggressive optimizations in order to try to get the newer version running again @ text @d3 1 a3 1 +++ Makefile 2006-09-11 10:26:50 +0200 d146 1 a146 1 +++ agi/Makefile 2006-09-11 10:25:27 +0200 d160 1 a160 1 +++ app_conference/Makefile 2006-09-11 10:25:27 +0200 d218 20 d240 1 a240 1 +++ app_conference/conference.c 2006-09-11 10:25:27 +0200 d269 1 a269 1 +++ apps/Makefile 2006-09-11 10:25:27 +0200 d293 1 a293 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-11 10:25:27 +0200 d317 1 a317 1 +++ asterisk.c 2006-09-11 10:25:27 +0200 d331 1 a331 1 +++ build_tools/make_defaults_h 2006-09-11 10:25:27 +0200 d343 1 a343 1 +++ cdr/Makefile 2006-09-11 10:25:27 +0200 d359 1 a359 1 +++ channels/Makefile 2006-09-11 10:25:27 +0200 d373 1 a373 1 +++ channels/chan_h323.c 2006-09-11 10:25:27 +0200 d384 1 a384 1 +++ channels/chan_iax2.c 2006-09-11 10:25:27 +0200 d408 3 a410 3 --- channels/chan_sip.c.orig 2006-09-04 17:46:07 +0200 +++ channels/chan_sip.c 2006-09-11 10:25:27 +0200 @@@@ -12252,7 +12252,7 @@@@ d419 1 a419 1 @@@@ -12335,8 +12335,10 @@@@ d434 1 a434 1 +++ channels/chan_skinny.c 2006-09-11 10:25:27 +0200 d446 1 a446 1 +++ codecs/Makefile 2006-09-11 10:25:27 +0200 d499 1 a499 1 +++ codecs/gsm/src/short_term.c 2006-09-11 10:25:27 +0200 d510 1 a510 1 +++ codecs/lpc10/analys.c 2006-09-11 10:25:27 +0200 d522 1 a522 1 +++ formats/Makefile 2006-09-11 10:25:27 +0200 d536 1 a536 1 +++ formats/msgsm.h 2006-09-11 10:25:27 +0200 d547 1 a547 1 +++ frame.c 2006-09-11 10:25:27 +0200 d559 1 a559 1 +++ funcs/Makefile 2006-09-11 10:25:27 +0200 d573 1 a573 1 +++ funcs/func_strings.c 2006-09-11 10:25:27 +0200 d585 1 a585 1 +++ pbx/Makefile 2006-09-11 10:25:27 +0200 d599 1 a599 1 +++ res/Makefile 2006-09-11 10:25:27 +0200 d615 1 a615 1 +++ res/res_features.c 2006-09-11 10:25:27 +0200 d634 1 a634 1 +++ rtp.c 2006-09-11 10:25:27 +0200 d649 1 a649 1 +++ say.c 2006-09-11 10:25:27 +0200 d841 1 a841 1 +++ utils.c 2006-09-11 10:25:27 +0200 d856 1 a856 1 +++ utils/Makefile 2006-09-11 10:25:27 +0200 @ 1.10 log @fix one more potential segfault situation related to ast_localtime usage @ text @d3 18 a20 1 +++ Makefile 2006-09-09 19:28:53 +0200 d90 1 a90 1 @@@@ -252,29 +236,8 @@@@ d100 1 d122 1 a122 1 @@@@ -289,7 +252,7 @@@@ d131 13 d146 1 a146 1 +++ agi/Makefile 2006-09-09 19:28:53 +0200 d160 1 a160 1 +++ app_conference/Makefile 2006-09-09 19:28:53 +0200 d220 1 a220 1 +++ app_conference/conference.c 2006-09-09 19:28:53 +0200 d249 1 a249 1 +++ apps/Makefile 2006-09-09 19:28:53 +0200 d273 1 a273 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-09 19:28:53 +0200 d297 1 a297 1 +++ asterisk.c 2006-09-09 19:28:53 +0200 d311 1 a311 1 +++ build_tools/make_defaults_h 2006-09-09 19:28:53 +0200 d323 1 a323 1 +++ cdr/Makefile 2006-09-09 19:28:53 +0200 d339 1 a339 1 +++ channels/Makefile 2006-09-09 19:28:53 +0200 d353 1 a353 1 +++ channels/chan_h323.c 2006-09-09 19:28:53 +0200 d364 1 a364 1 +++ channels/chan_iax2.c 2006-09-09 19:28:53 +0200 d389 1 a389 1 +++ channels/chan_sip.c 2006-09-09 19:28:53 +0200 d414 1 a414 1 +++ channels/chan_skinny.c 2006-09-09 19:28:53 +0200 d426 1 a426 1 +++ codecs/Makefile 2006-09-09 19:28:53 +0200 d479 1 a479 1 +++ codecs/gsm/src/short_term.c 2006-09-09 19:28:53 +0200 d490 1 a490 1 +++ codecs/lpc10/analys.c 2006-09-09 19:28:53 +0200 d502 1 a502 1 +++ formats/Makefile 2006-09-09 19:28:53 +0200 d516 1 a516 1 +++ formats/msgsm.h 2006-09-09 19:28:53 +0200 d527 1 a527 1 +++ frame.c 2006-09-09 19:28:53 +0200 d539 1 a539 1 +++ funcs/Makefile 2006-09-09 19:28:53 +0200 d553 1 a553 1 +++ funcs/func_strings.c 2006-09-09 19:30:57 +0200 d565 1 a565 1 +++ pbx/Makefile 2006-09-09 19:28:53 +0200 d579 1 a579 1 +++ res/Makefile 2006-09-09 19:28:53 +0200 d595 1 a595 1 +++ res/res_features.c 2006-09-09 19:28:53 +0200 d614 1 a614 1 +++ rtp.c 2006-09-09 19:28:53 +0200 d629 1 a629 1 +++ say.c 2006-09-09 19:28:53 +0200 d821 1 a821 1 +++ utils.c 2006-09-09 19:28:53 +0200 d836 1 a836 1 +++ utils/Makefile 2006-09-09 19:28:53 +0200 @ 1.9 log @ops, this change was not intended @ text @d2 2 a3 2 --- Makefile.orig 2006-06-29 21:23:18 +0200 +++ Makefile 2006-09-08 08:39:22 +0200 d115 1 a115 1 +++ agi/Makefile 2006-09-08 08:39:22 +0200 d129 1 a129 1 +++ app_conference/Makefile 2006-09-08 08:39:22 +0200 d189 1 a189 1 +++ app_conference/conference.c 2006-09-08 08:43:40 +0200 d218 1 a218 1 +++ apps/Makefile 2006-09-08 08:39:22 +0200 d242 1 a242 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-08 08:39:22 +0200 d266 1 a266 1 +++ asterisk.c 2006-09-08 08:39:22 +0200 d280 1 a280 1 +++ build_tools/make_defaults_h 2006-09-08 08:39:22 +0200 d292 1 a292 1 +++ cdr/Makefile 2006-09-08 08:39:22 +0200 d308 1 a308 1 +++ channels/Makefile 2006-09-08 08:39:22 +0200 d321 2 a322 2 --- channels/chan_h323.c.orig 2006-08-05 07:08:50 +0200 +++ channels/chan_h323.c 2006-09-08 08:39:22 +0200 d332 2 a333 2 --- channels/chan_iax2.c.orig 2006-08-05 07:08:50 +0200 +++ channels/chan_iax2.c 2006-09-08 08:39:22 +0200 d357 3 a359 3 --- channels/chan_sip.c.orig 2006-08-20 06:49:48 +0200 +++ channels/chan_sip.c 2006-09-08 08:39:22 +0200 @@@@ -12232,7 +12232,7 @@@@ d368 1 a368 1 @@@@ -12315,8 +12315,10 @@@@ d382 2 a383 2 --- channels/chan_skinny.c.orig 2006-08-05 07:08:50 +0200 +++ channels/chan_skinny.c 2006-09-08 08:39:22 +0200 d395 1 a395 1 +++ codecs/Makefile 2006-09-08 08:39:22 +0200 d448 1 a448 1 +++ codecs/gsm/src/short_term.c 2006-09-08 08:39:22 +0200 d459 1 a459 1 +++ codecs/lpc10/analys.c 2006-09-08 08:39:22 +0200 d471 1 a471 1 +++ formats/Makefile 2006-09-08 08:39:22 +0200 d485 1 a485 1 +++ formats/msgsm.h 2006-09-08 08:39:22 +0200 d496 1 a496 1 +++ frame.c 2006-09-08 08:39:22 +0200 d508 1 a508 1 +++ funcs/Makefile 2006-09-08 08:39:22 +0200 d520 12 d534 1 a534 1 +++ pbx/Makefile 2006-09-08 08:39:22 +0200 d548 1 a548 1 +++ res/Makefile 2006-09-08 08:39:22 +0200 d564 1 a564 1 +++ res/res_features.c 2006-09-08 08:39:22 +0200 d582 2 a583 2 --- rtp.c.orig 2006-07-13 20:44:17 +0200 +++ rtp.c 2006-09-08 08:39:22 +0200 d598 1 a598 1 +++ say.c 2006-09-08 08:39:22 +0200 d790 1 a790 1 +++ utils.c 2006-09-08 08:39:22 +0200 d805 1 a805 1 +++ utils/Makefile 2006-09-08 08:39:22 +0200 @ 1.8 log @fix a bunch of potential segfaults @ text @a445 12 Index: codecs/gsm/src/preprocess.c --- codecs/gsm/src/preprocess.c.orig 2005-11-29 19:24:39 +0100 +++ codecs/gsm/src/preprocess.c 2006-09-08 08:39:22 +0200 @@@@ -46,8 +46,6 @@@@ word SO; - ulongword utmp; /* for L_ADD */ - register int k = 160; while (k--) { @ 1.7 log @move astdb into a var directory; add SPYGROUP to conference setup; fix asterisk.conf to allow daemon mode; add %post/%pre for the usual daemon restart/stop/cleanup @ text @d3 1 a3 1 +++ Makefile 2006-09-06 08:25:09 +0200 d115 1 a115 1 +++ agi/Makefile 2006-09-06 08:25:09 +0200 d129 1 a129 1 +++ app_conference/Makefile 2006-09-06 08:25:09 +0200 d189 10 a198 2 +++ app_conference/conference.c 2006-09-06 08:25:09 +0200 @@@@ -618,7 +618,7 @@@@ d207 9 d218 1 a218 1 +++ apps/Makefile 2006-09-06 08:25:09 +0200 d242 1 a242 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-06 08:25:09 +0200 d266 1 a266 1 +++ asterisk.c 2006-09-06 08:31:47 +0200 d280 1 a280 1 +++ build_tools/make_defaults_h 2006-09-06 08:32:28 +0200 d292 1 a292 1 +++ cdr/Makefile 2006-09-06 08:25:09 +0200 d308 1 a308 1 +++ channels/Makefile 2006-09-06 08:25:09 +0200 d322 1 a322 1 +++ channels/chan_h323.c 2006-09-06 08:25:09 +0200 d331 50 d383 1 a383 1 +++ channels/chan_skinny.c 2006-09-06 08:25:09 +0200 d395 1 a395 1 +++ codecs/Makefile 2006-09-06 08:25:09 +0200 d446 35 d483 1 a483 1 +++ formats/Makefile 2006-09-06 08:25:09 +0200 d495 11 d508 1 a508 1 +++ frame.c 2006-09-06 08:25:09 +0200 d520 1 a520 1 +++ funcs/Makefile 2006-09-06 08:25:09 +0200 d534 1 a534 1 +++ pbx/Makefile 2006-09-06 08:25:09 +0200 d548 1 a548 1 +++ res/Makefile 2006-09-06 08:25:09 +0200 d562 19 d583 1 a583 1 +++ rtp.c 2006-09-06 08:25:09 +0200 d596 192 d790 1 a790 1 +++ utils.c 2006-09-06 08:25:09 +0200 d805 1 a805 1 +++ utils/Makefile 2006-09-06 08:25:09 +0200 @ 1.6 log @fix building under FreeBSD/amd64 (where -fPIC is a strict requirement for DSOs) @ text @d3 1 a3 1 +++ Makefile 2006-09-05 22:54:11 +0200 d115 1 a115 1 +++ agi/Makefile 2006-09-05 22:54:11 +0200 d129 1 a129 1 +++ app_conference/Makefile 2006-09-05 22:54:40 +0200 d189 1 a189 1 +++ app_conference/conference.c 2006-09-05 22:54:11 +0200 d201 1 a201 1 +++ apps/Makefile 2006-09-05 22:54:11 +0200 d225 1 a225 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-05 22:54:11 +0200 d247 26 d275 1 a275 1 +++ cdr/Makefile 2006-09-05 22:54:11 +0200 d291 1 a291 1 +++ channels/Makefile 2006-09-05 22:54:11 +0200 d305 1 a305 1 +++ channels/chan_h323.c 2006-09-05 22:54:11 +0200 d316 1 a316 1 +++ channels/chan_skinny.c 2006-09-05 22:54:11 +0200 d328 1 a328 1 +++ codecs/Makefile 2006-09-05 22:54:11 +0200 d381 1 a381 1 +++ formats/Makefile 2006-09-05 22:54:11 +0200 d395 1 a395 1 +++ frame.c 2006-09-05 22:54:11 +0200 d407 1 a407 1 +++ funcs/Makefile 2006-09-05 22:54:11 +0200 d421 1 a421 1 +++ pbx/Makefile 2006-09-05 22:54:11 +0200 d435 1 a435 1 +++ res/Makefile 2006-09-05 22:54:11 +0200 d451 1 a451 1 +++ rtp.c 2006-09-05 22:54:11 +0200 d466 1 a466 1 +++ utils.c 2006-09-05 22:54:11 +0200 d481 1 a481 1 +++ utils/Makefile 2006-09-05 22:54:11 +0200 @ 1.5 log @fix building against (optional) newt and popt @ text @d3 1 a3 1 +++ Makefile 2006-09-05 22:48:02 +0200 d115 1 a115 1 +++ agi/Makefile 2006-09-05 22:48:02 +0200 d129 1 a129 1 +++ app_conference/Makefile 2006-09-05 22:48:02 +0200 d143 1 a143 1 @@@@ -44,8 +44,8 @@@@ d153 1 d155 1 a155 1 @@@@ -53,13 +53,13 @@@@ d171 1 a171 1 @@@@ -102,14 +102,13 @@@@ d189 1 a189 1 +++ app_conference/conference.c 2006-09-05 22:48:02 +0200 d201 1 a201 1 +++ apps/Makefile 2006-09-05 22:48:02 +0200 d225 1 a225 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-05 22:48:02 +0200 d249 1 a249 1 +++ cdr/Makefile 2006-09-05 22:48:02 +0200 d265 1 a265 1 +++ channels/Makefile 2006-09-05 22:48:02 +0200 d279 1 a279 1 +++ channels/chan_h323.c 2006-09-05 22:48:02 +0200 d290 1 a290 1 +++ channels/chan_skinny.c 2006-09-05 22:48:02 +0200 d302 1 a302 1 +++ codecs/Makefile 2006-09-05 22:48:02 +0200 d355 1 a355 1 +++ formats/Makefile 2006-09-05 22:48:02 +0200 d369 1 a369 1 +++ frame.c 2006-09-05 22:48:02 +0200 d381 1 a381 1 +++ funcs/Makefile 2006-09-05 22:48:02 +0200 d395 1 a395 1 +++ pbx/Makefile 2006-09-05 22:48:02 +0200 d409 1 a409 1 +++ res/Makefile 2006-09-05 22:48:02 +0200 d425 1 a425 1 +++ rtp.c 2006-09-05 22:48:02 +0200 d440 1 a440 1 +++ utils.c 2006-09-05 22:48:02 +0200 d455 1 a455 1 +++ utils/Makefile 2006-09-05 22:49:34 +0200 @ 1.4 log @regen patch (to be sorted); fix building under slightly older FreeBSD 6 @ text @d3 1 a3 1 +++ Makefile 2006-09-05 22:20:22 +0200 d115 1 a115 1 +++ agi/Makefile 2006-09-05 22:20:22 +0200 d129 1 a129 1 +++ app_conference/Makefile 2006-09-05 22:20:22 +0200 d188 1 a188 1 +++ app_conference/conference.c 2006-09-05 22:20:22 +0200 d200 1 a200 1 +++ apps/Makefile 2006-09-05 22:20:22 +0200 d224 1 a224 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-05 22:20:22 +0200 d248 1 a248 1 +++ cdr/Makefile 2006-09-05 22:20:22 +0200 d264 1 a264 1 +++ channels/Makefile 2006-09-05 22:20:22 +0200 d278 1 a278 1 +++ channels/chan_h323.c 2006-09-05 22:20:22 +0200 d289 1 a289 1 +++ channels/chan_skinny.c 2006-09-05 22:20:22 +0200 d301 1 a301 1 +++ codecs/Makefile 2006-09-05 22:20:22 +0200 d354 1 a354 1 +++ formats/Makefile 2006-09-05 22:20:22 +0200 d368 1 a368 1 +++ frame.c 2006-09-05 22:20:22 +0200 d380 1 a380 1 +++ funcs/Makefile 2006-09-05 22:20:22 +0200 d394 1 a394 1 +++ pbx/Makefile 2006-09-05 22:20:22 +0200 d408 1 a408 1 +++ res/Makefile 2006-09-05 22:20:22 +0200 d424 1 a424 1 +++ rtp.c 2006-09-05 22:20:22 +0200 d439 1 a439 1 +++ utils.c 2006-09-05 22:22:20 +0200 d454 2 a455 2 +++ utils/Makefile 2006-09-05 22:20:22 +0200 @@@@ -16,9 +16,7 @@@@ d466 10 @ 1.3 log @add Perl API for AGI @ text @d3 1 a3 1 +++ Makefile 2006-09-05 09:10:38 +0200 d115 1 a115 1 +++ agi/Makefile 2006-09-05 09:10:38 +0200 d129 1 a129 1 +++ app_conference/Makefile 2006-09-05 09:10:38 +0200 d188 1 a188 1 +++ app_conference/conference.c 2006-09-05 09:10:38 +0200 d200 1 a200 1 +++ apps/Makefile 2006-09-05 09:35:21 +0200 d224 1 a224 1 +++ asterisk-addons-1.2.4/Makefile 2006-09-05 09:10:38 +0200 d248 1 a248 1 +++ cdr/Makefile 2006-09-05 09:10:38 +0200 d264 1 a264 1 +++ channels/Makefile 2006-09-05 09:10:38 +0200 d276 23 d301 1 a301 1 +++ codecs/Makefile 2006-09-05 09:10:38 +0200 d354 1 a354 1 +++ formats/Makefile 2006-09-05 09:10:38 +0200 d366 12 d380 1 a380 1 +++ funcs/Makefile 2006-09-05 09:10:38 +0200 d394 1 a394 1 +++ pbx/Makefile 2006-09-05 09:10:38 +0200 d408 1 a408 1 +++ res/Makefile 2006-09-05 09:10:38 +0200 d422 15 d439 2 a440 2 +++ utils.c 2006-09-05 09:10:38 +0200 @@@@ -58,7 +58,7 @@@@ d445 4 a448 1 +#if defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) d454 1 a454 1 +++ utils/Makefile 2006-09-05 09:10:38 +0200 a465 50 Index: channels/chan_h323.c --- channels/chan_h323.c.orig 2006-08-05 07:08:50 +0200 +++ channels/chan_h323.c 2006-09-05 09:43:50 +0200 @@@@ -31,6 +31,7 @@@@ * \ingroup channel_drivers */ +#include #include #include #include Index: channels/chan_skinny.c --- channels/chan_skinny.c.orig 2006-08-05 07:08:50 +0200 +++ channels/chan_skinny.c 2006-09-05 09:43:50 +0200 @@@@ -99,7 +99,7 @@@@ #define htolel(x) (x) #define htoles(x) (x) #else -#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) +#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) || defined(__FreeBSD__) #define __bswap_16(x) \ ((((x) & 0xff00) >> 8) | \ (((x) & 0x00ff) << 8)) Index: frame.c --- frame.c.orig 2006-07-31 06:06:16 +0200 +++ frame.c 2006-09-05 09:43:50 +0200 @@@@ -1055,7 +1055,7 @@@@ { switch(buf & TYPE_MASK) { case TYPE_DONTSEND: - return 0; + return 2; break; case TYPE_SILENCE: return 4; Index: rtp.c --- rtp.c.orig 2006-07-13 20:44:17 +0200 +++ rtp.c 2006-09-05 09:43:50 +0200 @@@@ -962,8 +962,10 @@@@ rtp->us.sin_port = htons(x); rtp->us.sin_addr = addr; /* If there's rtcp, initialize it as well. */ - if (rtp->rtcp) + if (rtp->rtcp) { rtp->rtcp->us.sin_port = htons(x + 1); + rtp->rtcp->us.sin_addr = addr; + } /* Try to bind it/them. */ if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) && (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us)))) @ 1.2 log @apply fixes from FreeBSD ports and fix a typo in our subst @ text @d49 1 a49 1 +AGI_DIR=$(ASTVARLIBDIR)/agi-bin @ 1.1 log @first cut for a VoIP-only Asterisk packaging @ text @d413 50 @