You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
218 lines
7.9 KiB
218 lines
7.9 KiB
Index: Makefile |
|
--- Makefile.orig 2008-03-18 16:58:50 +0100 |
|
+++ Makefile 2008-03-22 16:56:21 +0100 |
|
@@ -121,42 +121,20 @@ |
|
|
|
# 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 |
|
+ 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 |
|
+ ASTVARRUNDIR=$(localstatedir)/run |
|
+ 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 |
|
@@ -245,12 +223,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 |
|
@@ -524,8 +496,7 @@ |
|
if [ -n "$(OLDHEADERS)" ]; then \ |
|
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ |
|
fi |
|
- 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: cdr/cdr_custom.c |
|
--- cdr/cdr_custom.c.orig 2007-11-21 00:16:15 +0100 |
|
+++ cdr/cdr_custom.c 2008-03-22 16:56:03 +0100 |
|
@@ -78,7 +78,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 2008-03-18 16:58:50 +0100 |
|
+++ cdr/cdr_sqlite3_custom.c 2008-03-22 16:56:03 +0100 |
|
@@ -317,7 +317,7 @@ |
|
return AST_MODULE_LOAD_DECLINE; |
|
|
|
/* 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: channels/console_video.h |
|
--- channels/console_video.h.orig 2008-01-09 19:03:40 +0100 |
|
+++ channels/console_video.h 2008-03-22 16:56:03 +0100 |
|
@@ -28,10 +28,7 @@ |
|
"console {device}" |
|
#else |
|
|
|
-#include <ffmpeg/avcodec.h> |
|
-#ifndef OLD_FFMPEG |
|
-#include <ffmpeg/swscale.h> /* requires a recent ffmpeg */ |
|
-#endif |
|
+#include <libavcoded/avcodec.h> |
|
|
|
#define CONSOLE_VIDEO_CMDS \ |
|
"console {videodevice|videocodec" \ |
|
Index: configure |
|
--- configure.orig 2008-03-18 16:50:53 +0100 |
|
+++ configure 2008-03-22 16:56:03 +0100 |
|
@@ -4026,12 +4026,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 ${sysconfdir} = '${prefix}/etc'; then |
|
Index: include/asterisk/module.h |
|
--- include/asterisk/module.h.orig 2008-02-27 09:20:15 +0100 |
|
+++ include/asterisk/module.h 2008-03-22 16:56:03 +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-03-17 23:24:46 +0100 |
|
+++ main/Makefile 2008-03-22 16:56:03 +0100 |
|
@@ -82,10 +82,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/tcptls.c |
|
--- main/tcptls.c.orig 2008-03-12 23:50:14 +0100 |
|
+++ main/tcptls.c 2008-03-22 16:56:03 +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"); |
|
Index: menuselect-tree |
|
--- menuselect-tree.orig 2008-03-18 18:05:36 +0100 |
|
+++ menuselect-tree 2008-03-22 16:56:03 +0100 |
|
@@ -262,7 +262,6 @@ |
|
</member> |
|
<member name="chan_zap" displayname="Zapata Telephony" remove_on_change="channels/chan_zap.o channels/chan_zap.so"> |
|
<depend>res_smdi</depend> |
|
- <depend>zaptel_vldtmf</depend> |
|
<depend>zaptel</depend> |
|
<depend>tonezone</depend> |
|
<use>pri</use> |
|
@@ -616,9 +615,9 @@ |
|
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format"> |
|
</member> |
|
<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format"> |
|
+ <defaultenabled>yes</defaultenabled> |
|
</member> |
|
<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" > |
|
- <defaultenabled>yes</defaultenabled> |
|
</member> |
|
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format"> |
|
</member> |
|
@@ -676,6 +675,7 @@ |
|
<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, mu-Law format"> |
|
</member> |
|
<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law format"> |
|
+ <defaultenabled>yes</defaultenabled> |
|
</member> |
|
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM format" > |
|
</member> |
|
Index: sounds/sounds.xml |
|
--- sounds/sounds.xml.orig 2008-03-06 05:46:17 +0100 |
|
+++ sounds/sounds.xml 2008-03-22 16:56:03 +0100 |
|
@@ -4,9 +4,9 @@ |
|
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format"> |
|
</member> |
|
<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format"> |
|
+ <defaultenabled>yes</defaultenabled> |
|
</member> |
|
<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" > |
|
- <defaultenabled>yes</defaultenabled> |
|
</member> |
|
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format"> |
|
</member> |
|
@@ -64,6 +64,7 @@ |
|
<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, mu-Law format"> |
|
</member> |
|
<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law format"> |
|
+ <defaultenabled>yes</defaultenabled> |
|
</member> |
|
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM format" > |
|
</member>
|
|
|