@ -1,7 +1,7 @@
Index: Makefile
--- Makefile.orig 2010-02-18 05:21:31.000000000 +01 00
+++ Makefile 2010-04-07 08:46:55 .000000000 +0200
@@ -127,42 +127,19 @@
--- Makefile.orig 2010-06-10 22:35:06.000000000 +02 00
+++ Makefile 2010-07-24 11:16:19 .000000000 +0200
@@ -126,40 +126,18 @@
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@ -14,7 +14,6 @@ Index: Makefile
- 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
@ -22,7 +21,6 @@ Index: Makefile
ASTETCDIR=$(sysconfdir)/asterisk
ASTLIBDIR=$(libdir)/asterisk
ASTHEADERDIR=$(includedir)/asterisk
ASTBINDIR=$(bindir)
ASTSBINDIR=$(sbindir)
- ASTSPOOLDIR=$(localstatedir)/spool/asterisk
- ASTLOGDIR=$(localstatedir)/log/asterisk
@ -32,13 +30,14 @@ Index: Makefile
+ ASTVARRUNDIR=$(localstatedir)/run
ASTMANDIR=$(mandir)
-ifneq ($(findstring BSD,$(OSARCH)),)
ASTVARLIBDIR=$(prefix)/share/asterisk
- ASTVARLIBDIR=$(prefix)/share/asterisk
- ASTVARRUNDIR=$(localstatedir)/run/asterisk
- ASTDBDIR=$(localstatedir)/db/asterisk
-else
- ASTVARLIBDIR=$(localstatedir)/lib/asterisk
- ASTDBDIR=$(ASTVARLIBDIR)
-endif
+ ASTVARLIBDIR=$(localstatedir)/lib
+ ASTDBDIR=$(localstatedir)/db
ASTKEYDIR=$(ASTVARLIBDIR)
-endif
@ -48,7 +47,7 @@ Index: Makefile
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
@@ -262,12 +239 ,6 @@
@@ -259,12 +237 ,6 @@
_ASTCFLAGS+=-fsigned-char
endif
@ -61,7 +60,7 @@ Index: Makefile
ifeq ($(OSARCH),NetBSD)
_ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
@@ -573,8 +544 ,7 @@
@@ -567,8 +539 ,7 @@
fi
mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
@ -72,8 +71,8 @@ Index: Makefile
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
--- apps/app_backticks.c.orig 2010-04-07 08:46:55 .000000000 +0200
+++ apps/app_backticks.c 2010-04-07 08:46:55 .000000000 +0200
--- apps/app_backticks.c.orig 2010-07-24 11:12:31 .000000000 +0200
+++ apps/app_backticks.c 2010-07-24 11:12:31 .000000000 +0200
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
@ -205,8 +204,8 @@ Index: apps/app_backticks.c
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
Index: apps/app_meetme.c
--- apps/app_meetme.c.orig 2010-01-06 21:40:34.000000000 +01 00
+++ apps/app_meetme.c 2010-04-07 08:46:55 .000000000 +0200
--- apps/app_meetme.c.orig 2010-06-23 23:15:53.000000000 +02 00
+++ apps/app_meetme.c 2010-07-24 11:12:31 .000000000 +0200
@@ -522,6 +522,7 @@
CONFFLAG_DURATION_LIMIT = (1 << 30),
/*! Do not write any audio to this channel until the state is up. */
@ -254,7 +253,7 @@ Index: apps/app_meetme.c
ast_mutex_lock(&conf->playlock);
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2008-01-24 23:58:10.000000000 +0100
+++ build_tools/make_defaults_h 2010-04-07 08:46:55 .000000000 +0200
+++ build_tools/make_defaults_h 2010-07-24 11:12:31 .000000000 +0200
@@ -17,7 +17,7 @@
#define DEFAULT_PID "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@ -266,7 +265,7 @@ Index: build_tools/make_defaults_h
#define DEFAULT_KEY_DIR "${INSTALL_PATH}${ASTDATADIR}/keys"
Index: cdr/cdr_custom.c
--- cdr/cdr_custom.c.orig 2008-11-20 18:48:58.000000000 +0100
+++ cdr/cdr_custom.c 2010-04-07 08:46:55 .000000000 +0200
+++ cdr/cdr_custom.c 2010-07-24 11:12:31 .000000000 +0200
@@ -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);
@ -277,9 +276,9 @@ Index: cdr/cdr_custom.c
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 .000000000 +0200
+++ cdr/cdr_sqlite3_custom.c 2010-04-07 08:46:55 .000000000 +0200
@@ -296,7 +296 ,7 @@
--- cdr/cdr_sqlite3_custom.c.orig 2010-04-13 18:38:41 .000000000 +0200
+++ cdr/cdr_sqlite3_custom.c 2010-07-24 11:12:31 .000000000 +0200
@@ -300,7 +300 ,7 @@
}
/* is the database there? */
@ -290,7 +289,7 @@ Index: cdr/cdr_sqlite3_custom.c
ast_log(LOG_ERROR, "Could not open database %s.\n", filename);
Index: chan_capi-1.1.5/Makefile
--- chan_capi-1.1.5/Makefile.orig 2010-04-06 19:33:25.000000000 +0200
+++ chan_capi-1.1.5/Makefile 2010-04-07 08:47:17 .000000000 +0200
+++ chan_capi-1.1.5/Makefile 2010-07-24 11:12:31 .000000000 +0200
@@ -100,6 +100,9 @@
CFLAGS+=-O2
CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
@ -303,7 +302,7 @@ Index: chan_capi-1.1.5/Makefile
CC=gcc
Index: chan_capi-1.1.5/chan_capi20.h
--- chan_capi-1.1.5/chan_capi20.h.orig 2005-09-20 20:33:40.000000000 +0200
+++ chan_capi-1.1.5/chan_capi20.h 2010-04-07 08:46:55 .000000000 +0200
+++ chan_capi-1.1.5/chan_capi20.h 2010-07-24 11:12:31 .000000000 +0200
@@ -8,6 +8,8 @@
#undef CAPI_OS_HINT
@ -324,7 +323,7 @@ Index: chan_capi-1.1.5/chan_capi20.h
#endif
Index: chan_capi-1.1.5/chan_capi_utils.c
--- chan_capi-1.1.5/chan_capi_utils.c.orig 2010-04-06 19:33:25.000000000 +0200
+++ chan_capi-1.1.5/chan_capi_utils.c 2010-04-07 08:46:55 .000000000 +0200
+++ chan_capi-1.1.5/chan_capi_utils.c 2010-07-24 11:12:31 .000000000 +0200
@@ -1087,6 +1087,9 @@
{
MESSAGE_EXCHANGE_ERROR error;
@ -337,7 +336,7 @@ Index: chan_capi-1.1.5/chan_capi_utils.c
Index: chan_capi-1.1.5/libcapi20/capi20.c
--- chan_capi-1.1.5/libcapi20/capi20.c.orig 2010-04-06 19:33:25.000000000 +0200
+++ chan_capi-1.1.5/libcapi20/capi20.c 2010-04-07 08:48:10 .000000000 +0200
+++ chan_capi-1.1.5/libcapi20/capi20.c 2010-07-24 11:12:31 .000000000 +0200
@@ -19,8 +19,10 @@
#include <stdio.h>
#include <ctype.h>
@ -652,7 +651,7 @@ Index: chan_capi-1.1.5/libcapi20/capi20.c
* functions added to the CAPI2.0 spec
Index: chan_capi-1.1.5/libcapi20/convert.c
--- chan_capi-1.1.5/libcapi20/convert.c.orig 2009-07-23 16:11:08.000000000 +0200
+++ chan_capi-1.1.5/libcapi20/convert.c 2010-04-07 08:46:55 .000000000 +0200
+++ chan_capi-1.1.5/libcapi20/convert.c 2010-07-24 11:12:31 .000000000 +0200
@@ -11,7 +11,14 @@
#include <stddef.h>
#include <time.h>
@ -670,7 +669,7 @@ Index: chan_capi-1.1.5/libcapi20/convert.c
Index: channels/console_video.h
--- channels/console_video.h.orig 2008-06-30 17:45:15.000000000 +0200
+++ channels/console_video.h 2010-04-07 08:46:55 .000000000 +0200
+++ channels/console_video.h 2010-07-24 11:12:31 .000000000 +0200
@@ -28,10 +28,7 @@
"console {device}"
#else
@ -684,24 +683,24 @@ Index: channels/console_video.h
#define CONSOLE_VIDEO_CMDS \
"console {videodevice|videocodec" \
Index: configure
--- configure.orig 2010-02-10 20:49:18.000000000 +01 00
+++ configure 2010-04-07 08:46:55 .000000000 +0200
@@ -4109,11 +4109 ,6 @@
--- configure.orig 2010-06-24 01:40:16.000000000 +02 00
+++ configure 2010-07-24 11:14:22 .000000000 +0200
@@ -4530,11 +4530 ,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 2010-02-08 23:46:47.000000000 +01 00
+++ main/Makefile 2010-04-07 08:46:55 .000000000 +0200
@@ -75,10 +75 ,7 @@
--- main/Makefile.orig 2010-06-25 20:58:37.000000000 +02 00
+++ main/Makefile 2010-07-24 11:12:31 .000000000 +0200
@@ -78,10 +78 ,7 @@
endif
ifeq ($(OSARCH),FreeBSD)
@ -714,8 +713,8 @@ Index: main/Makefile
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
Index: main/file.c
--- main/file.c.orig 2010-01-08 20:33:56 .000000000 +0100
+++ main/file.c 2010-04-07 08:46:55 .000000000 +0200
--- main/file.c.orig 2010-03-25 17:26:13 .000000000 +0100
+++ main/file.c 2010-07-24 11:12:31 .000000000 +0200
@@ -254,7 +254,7 @@
char *fn = NULL;
@ -726,9 +725,9 @@ Index: main/file.c
if (filename[0] == '/') {
if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
Index: main/tcptls.c
--- main/tcptls.c.orig 2010-02-16 22:03:57 .000000000 +0100
+++ main/tcptls.c 2010-04-07 08:46:55 .000000000 +0200
@@ -324,6 +324 ,7 @@
--- main/tcptls.c.orig 2010-03-20 18:33:03 .000000000 +0100
+++ main/tcptls.c 2010-07-24 11:12:31 .000000000 +0200
@@ -325,6 +325 ,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);
@ -737,8 +736,8 @@ Index: main/tcptls.c
ast_verb(0, "SSL certificate ok\n");
Index: menuselect-tree
--- menuselect-tree.orig 2010-03-11 21:28:28.000000000 +01 00
+++ menuselect-tree 2010-04-07 08:46:55 .000000000 +0200
--- menuselect-tree.orig 2010-07-22 21:20:17.000000000 +02 00
+++ menuselect-tree 2010-07-24 11:12:31 .000000000 +0200
@@ -153,6 +153,8 @@
</member>
<member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
@ -748,7 +747,7 @@ Index: menuselect-tree
<member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
</member>
<member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
@@ -689,9 +691 ,9 @@
@@ -693,9 +695 ,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
</member>
<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
@ -759,7 +758,7 @@ Index: menuselect-tree
</member>
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
</member>
@@ -767,6 +769 ,7 @@
@@ -771,6 +773 ,7 @@
<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
</member>
<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law format">
@ -769,7 +768,7 @@ Index: menuselect-tree
</member>
Index: res/res_http_post.c
--- res/res_http_post.c.orig 2009-10-27 18:12:09.000000000 +0100
+++ res/res_http_post.c 2010-04-07 08:46:55 .000000000 +0200
+++ res/res_http_post.c 2010-07-24 11:12:31 .000000000 +0200
@@ -122,14 +122,8 @@
ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
return;
@ -789,7 +788,7 @@ Index: res/res_http_post.c
Index: sounds/sounds.xml
--- sounds/sounds.xml.orig 2009-08-18 22:31:40.000000000 +0200
+++ sounds/sounds.xml 2010-04-07 08:46:55 .000000000 +0200
+++ sounds/sounds.xml 2010-07-24 11:12:31 .000000000 +0200
@@ -4,9 +4,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
</member>
