diff -r 73d852a30c9a -r 263143ec0fb2 asterisk/asterisk.patch --- a/asterisk/asterisk.patch Sun Mar 20 20:00:02 2011 +0100 +++ b/asterisk/asterisk.patch Sun Mar 20 20:03:11 2011 +0100 @@ -1,83 +1,74 @@ -Index: Makefile ---- Makefile.orig 2010-06-10 22:35:06.000000000 +0200 -+++ Makefile 2010-07-24 11:16:19.000000000 +0200 -@@ -126,40 +126,18 @@ +Index: addons/chan_ooh323.c +diff -Nau addons/chan_ooh323.c.orig addons/chan_ooh323.c +--- addons/chan_ooh323.c.orig 2010-10-09 16:02:26.000000000 +0200 ++++ addons/chan_ooh323.c 2011-03-13 14:03:42.000000000 +0100 +@@ -23,6 +23,12 @@ - # 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 -- ASTSBINDIR=/opt/asterisk/sbin -- ASTVARRUNDIR=/var/run/asterisk -- ASTMANDIR=/opt/asterisk/man --else - ASTETCDIR=$(sysconfdir)/asterisk - ASTLIBDIR=$(libdir)/asterisk - ASTHEADERDIR=$(includedir)/asterisk - 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 -+ ASTVARLIBDIR=$(localstatedir)/lib -+ ASTDBDIR=$(localstatedir)/db - ASTKEYDIR=$(ASTVARLIBDIR) --endif --ifeq ($(ASTDATADIR),) - ASTDATADIR:=$(ASTVARLIBDIR) --endif + #include "chan_ooh323.h" + #include ++#if defined __SVR4 && defined __sun ++#include ++#ifndef IPTOS_MINCOST ++#define IPTOS_MINCOST 0x02 ++#endif ++#endif - # Asterisk.conf is located in ASTETCDIR or by using the -C flag - # when starting Asterisk -@@ -259,12 +237,6 @@ - _ASTCFLAGS+=-fsigned-char - endif + #define FORMAT_STRING_SIZE 512 --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 -@@ -567,8 +539,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: addons/ooh323c/src/ooCmdChannel.c +diff -Nau addons/ooh323c/src/ooCmdChannel.c.orig addons/ooh323c/src/ooCmdChannel.c +--- addons/ooh323c/src/ooCmdChannel.c.orig 2010-03-26 00:38:58.000000000 +0100 ++++ addons/ooh323c/src/ooCmdChannel.c 2011-03-13 14:03:42.000000000 +0100 +@@ -25,6 +25,10 @@ + #include "ooCalls.h" + #include "ooCmdChannel.h" + ++#ifndef AF_LOCAL ++#define AF_LOCAL AF_UNIX ++#define PF_LOCAL PF_UNIX ++#endif + + /** Global endpoint structure */ + extern OOH323EndPoint gH323ep; +Index: addons/ooh323c/src/ooSocket.c +diff -Nau addons/ooh323c/src/ooSocket.c.orig addons/ooh323c/src/ooSocket.c +--- addons/ooh323c/src/ooSocket.c.orig 2010-03-25 22:39:04.000000000 +0100 ++++ addons/ooh323c/src/ooSocket.c 2011-03-13 14:03:42.000000000 +0100 +@@ -24,6 +24,9 @@ + + #include "ooSocket.h" + #include "ootrace.h" ++#if defined __SVR4 && defined __sun ++#include ++#endif + #if defined(_WIN32_WCE) + static int inited = 0; + #define SEND_FLAGS 0 +Index: addons/ooh323cDriver.c +diff -Nau addons/ooh323cDriver.c.orig addons/ooh323cDriver.c +--- addons/ooh323cDriver.c.orig 2010-03-26 00:38:58.000000000 +0100 ++++ addons/ooh323cDriver.c 2011-03-13 14:03:42.000000000 +0100 +@@ -27,6 +27,11 @@ + + #define SEC_TO_HOLD_THREAD 24 + ++#ifndef AF_LOCAL ++#define AF_LOCAL AF_UNIX ++#define PF_LOCAL PF_UNIX ++#endif ++ + extern struct ast_module *myself; + extern OOBOOL gH323Debug; + extern OOH323EndPoint gH323ep; Index: apps/app_backticks.c ---- 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 +diff -Nau apps/app_backticks.c.orig apps/app_backticks.c +--- apps/app_backticks.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ apps/app_backticks.c 2011-03-13 14:03:42.000000000 +0100 @@ -0,0 +1,129 @@ + +#include "asterisk.h" + -+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.53 $") ++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.52 $") + +#include +#include @@ -204,37 +195,38 @@ +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function"); + Index: apps/app_meetme.c ---- apps/app_meetme.c.orig 2010-06-23 23:15:53.000000000 +0200 -+++ apps/app_meetme.c 2010-07-24 11:12:31.000000000 +0200 -@@ -522,6 +522,7 @@ +diff -Nau apps/app_meetme.c.orig apps/app_meetme.c +--- apps/app_meetme.c.orig 2011-01-07 21:53:02.000000000 +0100 ++++ apps/app_meetme.c 2011-03-13 14:03:42.000000000 +0100 +@@ -604,6 +604,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), ++ CONFFLAG_USERNAME = (1 << 32), }; - enum { -@@ -531,6 +532,7 @@ - OPT_ARG_DURATION_LIMIT = 3, + /* !If set play an intro announcement at start of conference */ +@@ -617,6 +618,7 @@ OPT_ARG_MOH_CLASS = 4, - OPT_ARG_ARRAY_SIZE = 5, -+ OPT_ARG_USERNAME = 6, + OPT_ARG_INTROMSG = 5, + OPT_ARG_ARRAY_SIZE = 6, ++ OPT_ARG_USERNAME = 7, }; AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS -@@ -563,6 +565,7 @@ +@@ -650,6 +652,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"; -@@ -2243,6 +2246,12 @@ - if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER) || (confflags & CONFFLAG_INTROUSERNOREVIEW))) { + static const char * const app = "MeetMe"; +@@ -2429,6 +2432,12 @@ + ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) { char destdir[PATH_MAX]; -+ if ( (confflags & CONFFLAG_USERNAME) ++ if (!ast_test_flag64(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]); @@ -243,7 +235,7 @@ snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR); if (ast_mkdir(destdir, 0777) != 0) { -@@ -2259,6 +2268,7 @@ +@@ -2445,6 +2454,7 @@ res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL); if (res == -1) goto outrun; @@ -251,59 +243,142 @@ } 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-07-24 11:12:31.000000000 +0200 -@@ -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.000000000 +0100 -+++ 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); - 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 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 @@ +Index: apps/app_voicemail.c +diff -Nau apps/app_voicemail.c.orig apps/app_voicemail.c +--- apps/app_voicemail.c.orig 2011-01-07 20:58:30.000000000 +0100 ++++ apps/app_voicemail.c 2011-03-13 14:03:42.000000000 +0100 +@@ -366,6 +366,7 @@ + static char imapport[8]; + static char imapflags[128]; + static char imapfolder[64]; ++static int imapsubfold = 0; + static char imapparentfolder[64] = "\0"; + static char greetingfolder[64]; + static char authuser[32]; +@@ -2464,7 +2465,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.5/Makefile ---- chan_capi-1.1.5/Makefile.orig 2010-04-06 19:33:25.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) - CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi) -+ifeq (${USE_OWN_LIBCAPI},yes) -+CFLAGS+=-DUSE_OWN_LIBCAPI -+endif + /* Build up server information */ +- ast_build_string(&t, &left, "{%s:%s/imap", imapserver, imapport); ++ ast_build_string(&t, &left, "{%s:%s", imapserver, imapport); - LIBS=-ldl -lpthread -lm - 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-07-24 11:12:31.000000000 +0200 -@@ -8,6 +8,8 @@ + /* Add authentication user if present */ + if (!ast_strlen_zero(authuser)) +@@ -6035,6 +6036,7 @@ + /* simple. huh? */ + char sequence[10]; + char mailbox[256]; ++ char folder[256]; + int res; + + /* get the real IMAP message number for this message */ +@@ -6050,10 +6052,24 @@ + mail_setflag(vms->mailstream, sequence, "\\Unseen"); + mail_clearflag(vms->mailstream, sequence, "\\Seen"); + } +- if (!strcasecmp(mbox(vmu, NEW_FOLDER), vms->curbox) && (box == NEW_FOLDER || box == OLD_FOLDER)) { +- ast_mutex_unlock(&vms->lock); ++ ++ if ((!strcasecmp(mbox(vmu, NEW_FOLDER), vms->curbox) || \ ++ !strcasecmp(mbox(vmu, OLD_FOLDER), vms->curbox)) && \ ++ (box == NEW_FOLDER || box == OLD_FOLDER)) { /* Don't copy data, */ ++ ast_mutex_unlock(&vms->lock); /* just change Seen flag */ + return 0; ++ } else if (box != NEW_FOLDER && box != OLD_FOLDER) { /* Do copy data */ ++ if (imapsubfold == 1) /* using INBOX or subfolder */ ++ snprintf(folder, sizeof(folder), "%s%c%s", imapfolder, delimiter, mbox(vmu, box)); ++ else ++ strncpy(folder, mbox(vmu, box), sizeof(folder)); ++ int res = !mail_copy(vms->mailstream,sequence,folder); ++ ast_mutex_unlock(&vms->lock); ++ return res; ++ } else { /* Copy data to INBOX delegating new/old status to Seen flag */ ++ int res = !mail_copy(vms->mailstream,sequence,imapfolder); + } ++ + /* Create the folder if it don't exist */ + imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */ + ast_debug(5, "Checking if folder exists: %s\n", mailbox); +@@ -10221,6 +10237,10 @@ + #ifndef IMAP_STORAGE + } else if (!cmd) { + vms.deleted[vms.curmsg] = 1; ++#else ++ } else if (!cmd && (folder_int(vms.curbox) > 1 || box > 1)) { ++ vms.deleted[vms.curmsg] = 1; /* Enforce deletion after */ ++ deleted = 1; /* successful copy op */ + #endif + } else { + vms.deleted[vms.curmsg] = 0; +@@ -11688,6 +11708,15 @@ + } else { + ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder)); + } ++ /* IMAP saved (sub)folder location policy */ ++ if ((val = ast_variable_retrieve(cfg, "general", "imapsubfold"))) { ++ if (ast_false(val)) ++ imapsubfold = 0; ++ else ++ imapsubfold = 1; ++ } else { ++ imapsubfold = 0; ++ } + if ((val = ast_variable_retrieve(cfg, "general", "imapparentfolder"))) { + ast_copy_string(imapparentfolder, val, sizeof(imapparentfolder)); + } +Index: apps/.moduleinfo +diff -Nau apps/.moduleinfo.orig apps/.moduleinfo +--- apps/.moduleinfo.orig 2011-02-22 23:50:32.000000000 +0100 ++++ apps/.moduleinfo 2011-03-13 14:03:42.000000000 +0100 +@@ -72,7 +72,7 @@ + + + +- no ++ yes + + + jack +@@ -127,10 +127,10 @@ + + dahdi + tonezone +- no ++ yes + + +- no ++ yes + + + +Index: build_tools/cflags.xml +diff -Nau build_tools/cflags.xml.orig build_tools/cflags.xml +--- build_tools/cflags.xml.orig 2010-02-16 16:36:53.000000000 +0100 ++++ build_tools/cflags.xml 2011-03-13 14:03:42.000000000 +0100 +@@ -26,10 +26,11 @@ + + + +- no ++ yes + + + G711_NEW_ALGORITHM ++ yes + + + G711_NEW_ALGORITHM +Index: chan_capi-1.1.5.919/chan_capi20.h +diff -Nau chan_capi-1.1.5.919/chan_capi20.h.orig chan_capi-1.1.5.919/chan_capi20.h +--- chan_capi-1.1.5.919/chan_capi20.h.orig 2011-01-07 02:29:32.000000000 +0100 ++++ chan_capi-1.1.5.919/chan_capi20.h 2011-03-13 14:03:42.000000000 +0100 +@@ -4,10 +4,13 @@ + * first. Else the checks below will fail. + */ + ++#include + #include #undef CAPI_OS_HINT @@ -312,7 +387,7 @@ #if (defined(__FreeBSD__) || defined(__OpenBSD__) || \ defined(__NetBSD__) || defined(__APPLE__)) -@@ -29,6 +31,8 @@ +@@ -29,6 +32,8 @@ #include #endif /* BSD */ @@ -321,10 +396,11 @@ #ifndef HEADER_CID #define HEADER_CID(x) ((x)->adr.adrNCCI) #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-07-24 11:12:31.000000000 +0200 -@@ -1087,6 +1087,9 @@ +Index: chan_capi-1.1.5.919/chan_capi_utils.c +diff -Nau chan_capi-1.1.5.919/chan_capi_utils.c.orig chan_capi-1.1.5.919/chan_capi_utils.c +--- chan_capi-1.1.5.919/chan_capi_utils.c.orig 2011-01-07 02:29:32.000000000 +0100 ++++ chan_capi-1.1.5.919/chan_capi_utils.c 2011-03-13 14:03:42.000000000 +0100 +@@ -1155,6 +1155,9 @@ { MESSAGE_EXCHANGE_ERROR error; int waitcount = 50; @@ -334,9 +410,10 @@ unsigned char manbuf[CAPI_MANUFACTURER_LEN]; _cmsg CMSG; -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-07-24 11:12:31.000000000 +0200 +Index: chan_capi-1.1.5.919/libcapi20/capi20.c +diff -Nau chan_capi-1.1.5.919/libcapi20/capi20.c.orig chan_capi-1.1.5.919/libcapi20/capi20.c +--- chan_capi-1.1.5.919/libcapi20/capi20.c.orig 2011-01-07 02:29:31.000000000 +0100 ++++ chan_capi-1.1.5.919/libcapi20/capi20.c 2011-03-13 14:03:42.000000000 +0100 @@ -19,8 +19,10 @@ #include #include @@ -622,26 +699,7 @@ } unsigned -@@ -993,7 +1047,7 @@ - unsigned short* tmp = (unsigned short*)buf; - - if(*tmp == CapiNoError) { -- memcpy(Buf, buf + 2, (Ctrl) ? sizeof(struct capi_profile) : 2); -+ memcpy(Buf, buf + 2, (Ctrl) ? 224 /* sizeof(struct capi_profile) */ : 2); - } - - fret = *tmp; -@@ -1002,6 +1056,9 @@ - return (fret); - } - -+#if 1 -+ return CapiMsgOSResourceErr; -+#else - ioctl_data.contr = Ctrl; - - if (ioctl(capi_fd, CAPI_GET_PROFILE, &ioctl_data) < 0) { -@@ -1018,6 +1075,7 @@ +@@ -1018,6 +1072,7 @@ sizeof(ioctl_data.profile.ncontroller)); } return CapiNoError; @@ -649,9 +707,10 @@ } /* * 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-07-24 11:12:31.000000000 +0200 +Index: chan_capi-1.1.5.919/libcapi20/convert.c +diff -Nau chan_capi-1.1.5.919/libcapi20/convert.c.orig chan_capi-1.1.5.919/libcapi20/convert.c +--- chan_capi-1.1.5.919/libcapi20/convert.c.orig 2011-01-07 02:29:31.000000000 +0100 ++++ chan_capi-1.1.5.919/libcapi20/convert.c 2011-03-13 14:03:42.000000000 +0100 @@ -11,7 +11,14 @@ #include #include @@ -667,9 +726,46 @@ #include "capi20.h" +Index: chan_capi-1.1.5.919/Makefile +diff -Nau chan_capi-1.1.5.919/Makefile.orig chan_capi-1.1.5.919/Makefile +--- chan_capi-1.1.5.919/Makefile.orig 2011-01-07 02:29:32.000000000 +0100 ++++ chan_capi-1.1.5.919/Makefile 2011-03-13 14:03:42.000000000 +0100 +@@ -111,6 +111,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) + CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi) ++ifeq (${USE_OWN_LIBCAPI},yes) ++CFLAGS+=-DUSE_OWN_LIBCAPI ++endif + ifeq (${DIVA_STREAMING},1) + CFLAGS += -DDIVA_STREAMING=1 + endif +Index: channels/chan_sip.c +diff -Nau channels/chan_sip.c.orig channels/chan_sip.c +--- channels/chan_sip.c.orig 2011-01-14 18:32:52.000000000 +0100 ++++ channels/chan_sip.c 2011-03-13 14:03:42.000000000 +0100 +@@ -11210,7 +11210,16 @@ + } else { + if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { + /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */ +- snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag); ++ if (strncasecmp(p->uri, "sip:", strlen("sip:"))) ++ if (strncasecmp(p->uri, "sips:", strlen("sips:"))) ++ if (p->socket.type == SIP_TRANSPORT_TLS) ++ snprintf(to, sizeof(to), "<%s%s>;tag=%s", "sips:", p->uri, p->theirtag); ++ else ++ snprintf(to, sizeof(to), "<%s%s>;tag=%s", "sips:", p->uri, p->theirtag); ++ else /* if (strncasecmp(p->uri, "sips:"... */ ++ snprintf(to, sizeof(to), "<%s%s>;tag=%s", "", p->uri, p->theirtag); ++ else /* if (strncasecmp(p->uri, "sip:"... */ ++ snprintf(to, sizeof(to), "<%s%s>;tag=%s", "", p->uri, p->theirtag); + } else if (p->options && p->options->vxml_url) { + /* If there is a VXML URL append it to the SIP URL */ + snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url); Index: channels/console_video.h +diff -Nau channels/console_video.h.orig channels/console_video.h --- channels/console_video.h.orig 2008-06-30 17:45:15.000000000 +0200 -+++ channels/console_video.h 2010-07-24 11:12:31.000000000 +0200 ++++ channels/console_video.h 2011-03-13 14:03:42.000000000 +0100 @@ -28,10 +28,7 @@ "console {device}" #else @@ -683,10 +779,11 @@ #define CONSOLE_VIDEO_CMDS \ "console {videodevice|videocodec" \ Index: configure ---- configure.orig 2010-06-24 01:40:16.000000000 +0200 -+++ configure 2010-07-24 11:14:22.000000000 +0200 -@@ -4530,11 +4530,6 @@ - # note- does not work on FreeBSD +diff -Nau configure.orig configure +--- configure.orig 2011-01-09 22:40:34.000000000 +0100 ++++ configure 2011-03-13 14:14:50.000000000 +0100 +@@ -4700,11 +4700,6 @@ + esac case "${host_os}" in - freebsd*) @@ -697,10 +794,316 @@ openbsd*) if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then +@@ -18227,8 +18222,8 @@ + if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then + imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS` + fi +- imap_libs="${IMAP_TK_DIR}/c-client/c-client.a" +- imap_include="-I${IMAP_TK_DIR}/c-client" ++ imap_libs="-limap -lssl -lcrypto -lcrypt" ++ imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap" + CPPFLAGS="${CPPFLAGS} ${imap_include}" + LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}` + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -25461,14 +25456,14 @@ + else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " +- as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5 +-$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; } ++ as_ac_Lib=`$as_echo "ac_cv_lib_lua_${pbxfuncname}" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua" >&5 ++$as_echo_n "checking for ${pbxfuncname} in -llua... " >&6; } + if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-llua5.1 ${pbxlibdir} -lm $LIBS" ++LIBS="-llua ${pbxlibdir} -lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -25511,19 +25506,19 @@ + + # now check for the header. + if test "${AST_LUA_FOUND}" = "yes"; then +- LUA_LIB="${pbxlibdir} -llua5.1 -lm" ++ LUA_LIB="${pbxlibdir} -llua -lm" + # if --with-LUA=DIR has been specified, use it. + if test "x${LUA_DIR}" != "x"; then + LUA_INCLUDE="-I${LUA_DIR}/include" + fi + LUA_INCLUDE="${LUA_INCLUDE} " +- if test "xlua5.1/lua.h" = "x" ; then # no header, assume found ++ if test "xlua/lua.h" = "x" ; then # no header, assume found + LUA_HEADER_FOUND="1" + else # check for the header + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" +- ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default" +-if test "x$ac_cv_header_lua5_1_lua_h" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "lua/lua.h" "ac_cv_header_lua_lua_h" "$ac_includes_default" ++if test "x$ac_cv_header_lua_lua_h" = x""yes; then : + LUA_HEADER_FOUND=1 + else + LUA_HEADER_FOUND=0 +@@ -25551,9 +25546,9 @@ + + if test "x${PBX_LUA}" = "x1" ; then + if test x"${LUA_DIR}" = x; then +- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1" ++ LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua" + else +- LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1" ++ LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua" + fi + fi + +@@ -26238,7 +26233,7 @@ + pbxlibdir="-L${SQLITE_DIR}" + fi + fi +- pbxfuncname="sqlite_exec" ++ pbxfuncname="sqlite3_exec" + if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + AST_SQLITE_FOUND=yes + else +@@ -26953,16 +26948,16 @@ + if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then + PBX_GMIME=0 + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gmime-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gmime-config; ac_word=$2 ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then : ++if test "${ac_cv_prog_PKGCONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- case $CONFIG_GMIME in ++ case $PKGCONFIG in + [\\/]* | ?:[\\/]*) +- ac_cv_path_CONFIG_GMIME="$CONFIG_GMIME" # Let the user override the test with a path. ++ ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -26973,7 +26968,7 @@ + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext" ++ ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -26984,10 +26979,10 @@ + ;; + esac + fi +-CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME +-if test -n "$CONFIG_GMIME"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_GMIME" >&5 +-$as_echo "$CONFIG_GMIME" >&6; } ++PKGCONFIG=$ac_cv_path_PKGCONFIG ++if test -n "$PKGCONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 ++$as_echo "$PKGCONFIG" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -26995,18 +26990,18 @@ + + + fi +-if test -z "$ac_cv_path_CONFIG_GMIME"; then +- ac_pt_CONFIG_GMIME=$CONFIG_GMIME +- # Extract the first word of "gmime-config", so it can be a program name with args. +-set dummy gmime-config; ac_word=$2 ++if test -z "$ac_cv_path_PKGCONFIG"; then ++ ac_pt_PKGCONFIG=$PKGCONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then : ++if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- case $ac_pt_CONFIG_GMIME in ++ case $ac_pt_PKGCONFIG in + [\\/]* | ?:[\\/]*) +- ac_cv_path_ac_pt_CONFIG_GMIME="$ac_pt_CONFIG_GMIME" # Let the user override the test with a path. ++ ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -27017,7 +27012,7 @@ + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext" ++ ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -27028,17 +27023,17 @@ + ;; + esac + fi +-ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME +-if test -n "$ac_pt_CONFIG_GMIME"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_GMIME" >&5 +-$as_echo "$ac_pt_CONFIG_GMIME" >&6; } ++ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG ++if test -n "$ac_pt_PKGCONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 ++$as_echo "${ECHO_T}$ac_pt_PKGCONFIG" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +- if test "x$ac_pt_CONFIG_GMIME" = x; then +- CONFIG_GMIME="No" ++ if test "x$ac_pt_PKGCONFIG" = x; then ++ PKGCONFIG="No" + else + case $cross_compiling:$ac_tool_warned in + yes:) +@@ -27046,17 +27041,15 @@ + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +- CONFIG_GMIME=$ac_pt_CONFIG_GMIME ++ PKGCONFIG=$ac_pt_PKGCONFIG + fi + else +- CONFIG_GMIME="$ac_cv_path_CONFIG_GMIME" ++ PKGCONFIG="$ac_cv_path_PKGCONFIG" + fi + +- if test ! "x${CONFIG_GMIME}" = xNo; then +- if test x"" = x ; then A=--cflags ; else A="" ; fi +- GMIME_INCLUDE=$(${CONFIG_GMIME} $A) +- if test x"" = x ; then A=--libs ; else A="" ; fi +- GMIME_LIB=$(${CONFIG_GMIME} $A) ++ if test ! "x${PKGCONFIG}" = xNo; then ++ GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.4 --cflags 2>/dev/null) ++ GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --libs) + if test x"#include " != x ; then + saved_cppflags="${CPPFLAGS}" + if test "x${GMIME_DIR}" != "x"; then +Index: formats/format_pcm.c +diff -Nau formats/format_pcm.c.orig formats/format_pcm.c +--- formats/format_pcm.c.orig 2010-07-26 05:27:06.000000000 +0200 ++++ formats/format_pcm.c 2011-03-13 14:03:42.000000000 +0100 +@@ -350,6 +350,7 @@ + ast_log(LOG_WARNING, "Unable to write header\n"); + return -1; + } ++ fflush(f); /* issues.asterisk.org bug 0016610 */ + return 0; + } + +Index: formats/format_wav.c +diff -Nau formats/format_wav.c.orig formats/format_wav.c +--- formats/format_wav.c.orig 2010-09-02 18:43:09.000000000 +0200 ++++ formats/format_wav.c 2011-03-13 14:03:42.000000000 +0100 +@@ -310,6 +310,7 @@ + ast_log(LOG_WARNING, "Unable to write header\n"); + return -1; + } ++ fflush(f); /* issues.asterisk.org bug 0016610 */ + return 0; + } + +Index: formats/format_wav_gsm.c +diff -Nau formats/format_wav_gsm.c.orig formats/format_wav_gsm.c +--- formats/format_wav_gsm.c.orig 2010-07-26 05:27:06.000000000 +0200 ++++ formats/format_wav_gsm.c 2011-03-13 14:03:42.000000000 +0100 +@@ -362,6 +362,7 @@ + ast_log(LOG_WARNING, "Unable to write header\n"); + return -1; + } ++ fflush(f); /* issues.asterisk.org bug 0016610 */ + return 0; + } + +Index: main/db1-ast/hash/hash.h +diff -Nau main/db1-ast/hash/hash.h.orig main/db1-ast/hash/hash.h +--- main/db1-ast/hash/hash.h.orig 2006-08-21 04:11:39.000000000 +0200 ++++ main/db1-ast/hash/hash.h 2011-03-13 14:03:42.000000000 +0100 +@@ -36,6 +36,8 @@ + * @(#)hash.h 8.3 (Berkeley) 5/31/94 + */ + ++#include ++ + /* Operations */ + typedef enum { + HASH_GET, HASH_PUT, HASH_PUTNEW, HASH_DELETE, HASH_FIRST, HASH_NEXT +Index: main/db1-ast/hash/ndbm.c +diff -Nau main/db1-ast/hash/ndbm.c.orig main/db1-ast/hash/ndbm.c +--- main/db1-ast/hash/ndbm.c.orig 2006-08-21 04:11:39.000000000 +0200 ++++ main/db1-ast/hash/ndbm.c 2011-03-13 14:03:42.000000000 +0100 +@@ -49,7 +49,8 @@ + #include + #include + +-#include ++#include "../include/ndbm.h" ++#include "../include/db.h" + #include "hash.h" + + /* +Index: main/features.c +diff -Nau main/features.c.orig main/features.c +--- main/features.c.orig 2011-01-20 21:24:36.000000000 +0100 ++++ main/features.c 2011-03-13 14:03:42.000000000 +0100 +@@ -1658,6 +1658,10 @@ + snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); + } + ++ for(x = 0; x < strlen(touch_filename); x++) { ++ if (args[x] == '/') ++ args[x] = '-'; ++ } + for(x = 0; x < strlen(args); x++) { + if (args[x] == '/') + args[x] = '-'; +@@ -1774,6 +1778,10 @@ + snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav")); + } + ++ for( x = 0; x < strlen(touch_filename); x++) { ++ if (args[x] == '/') ++ args[x] = '-'; ++ } + for( x = 0; x < strlen(args); x++) { + if (args[x] == '/') + args[x] = '-'; +Index: main/file.c +diff -Nau main/file.c.orig main/file.c +--- main/file.c.orig 2011-01-12 17:05:12.000000000 +0100 ++++ main/file.c 2011-03-13 14:03:42.000000000 +0100 +@@ -255,7 +255,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/Makefile ---- main/Makefile.orig 2010-06-25 20:58:37.000000000 +0200 -+++ main/Makefile 2010-07-24 11:12:31.000000000 +0200 -@@ -78,10 +78,7 @@ +diff -Nau main/Makefile.orig main/Makefile +--- main/Makefile.orig 2010-12-18 00:52:04.000000000 +0100 ++++ main/Makefile 2011-03-13 14:03:42.000000000 +0100 +@@ -69,10 +69,7 @@ endif ifeq ($(OSARCH),FreeBSD) @@ -712,22 +1115,11 @@ endif ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) -Index: main/file.c ---- 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; - - 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 2010-03-20 18:33:03.000000000 +0100 -+++ main/tcptls.c 2010-07-24 11:12:31.000000000 +0200 -@@ -325,6 +325,7 @@ +diff -Nau main/tcptls.c.orig main/tcptls.c +--- main/tcptls.c.orig 2010-07-09 00:08:07.000000000 +0200 ++++ main/tcptls.c 2011-03-13 14:03:42.000000000 +0100 +@@ -354,6 +354,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); @@ -735,40 +1127,103 @@ } ast_verb(0, "SSL certificate ok\n"); +Index: main/udptl.c +diff -Nau main/udptl.c.orig main/udptl.c +--- main/udptl.c.orig 2011-02-22 23:52:11.000000000 +0100 ++++ main/udptl.c 2011-03-13 14:03:42.000000000 +0100 +@@ -98,6 +98,18 @@ + + #define UDPTL_BUF_MASK 15 + ++/*! Copied from chan_oss.c, corrects link errors: ++udptl.o: In function `calculate_local_max_datagram': ++main/udptl.c:740: undefined reference to `MIN' ++udptl.o: In function `calculate_far_max_ifp': ++main/udptl.c:770: undefined reference to `MAX' */ ++#ifndef MIN ++#define MIN(a,b) ((a) < (b) ? (a) : (b)) ++#endif ++#ifndef MAX ++#define MAX(a,b) ((a) > (b) ? (a) : (b)) ++#endif ++ + typedef struct { + int buf_len; + uint8_t buf[LOCAL_FAX_MAX_DATAGRAM]; +Index: Makefile +diff -Nau Makefile.orig Makefile +--- Makefile.orig 2011-01-12 16:57:43.000000000 +0100 ++++ Makefile 2011-03-13 14:03:42.000000000 +0100 +@@ -230,15 +230,6 @@ + _ASTCFLAGS+=-fsigned-char + endif + +-ifeq ($(OSARCH),FreeBSD) +- ifeq ($(PROC),i386) +- _ASTCFLAGS+=-march=i686 +- endif +- # -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 Index: menuselect-tree ---- menuselect-tree.orig 2010-07-22 21:20:17.000000000 +0200 -+++ menuselect-tree 2010-07-24 11:12:31.000000000 +0200 -@@ -153,6 +153,8 @@ +diff -Nau menuselect-tree.orig menuselect-tree +--- menuselect-tree.orig 2011-02-22 23:50:45.000000000 +0100 ++++ menuselect-tree 2011-03-13 14:03:42.000000000 +0100 +@@ -38,6 +38,8 @@ - + -+ ++ + - + - -@@ -693,9 +695,9 @@ - - + +@@ -937,11 +939,11 @@ -+ yes - yes -@@ -771,6 +773,7 @@ - - - + + yes - + + +@@ -1006,7 +1008,6 @@ + + + +- yes + + + +@@ -1017,6 +1018,7 @@ + + + ++ yes + + + +@@ -1037,6 +1039,7 @@ + + + ++ yes + + 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-07-24 11:12:31.000000000 +0200 +diff -Nau res/res_http_post.c.orig res/res_http_post.c +--- res/res_http_post.c.orig 2009-10-27 17:48:54.000000000 +0100 ++++ res/res_http_post.c 2011-03-13 14:03:42.000000000 +0100 @@ -122,14 +122,8 @@ ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n"); return; @@ -787,24 +1242,43 @@ const char *filename; Index: sounds/sounds.xml ---- sounds/sounds.xml.orig 2009-08-18 22:31:40.000000000 +0200 -+++ sounds/sounds.xml 2010-07-24 11:12:31.000000000 +0200 -@@ -4,9 +4,9 @@ - - +diff -Nau sounds/sounds.xml.orig sounds/sounds.xml +--- sounds/sounds.xml.orig 2010-10-18 23:51:23.000000000 +0200 ++++ sounds/sounds.xml 2011-03-13 14:03:42.000000000 +0100 +@@ -6,11 +6,11 @@ -+ yes - yes -@@ -82,6 +82,7 @@ - - - + + yes - + +@@ -75,7 +75,6 @@ + + + +- yes + + + +@@ -86,6 +85,7 @@ + + + ++ yes + + + +@@ -106,6 +106,7 @@ + + + ++ yes + + +