[Pkg-voip-commits] r2863 - asterisk/trunk/debian/patches
Kilian Krause
kilian at alioth.debian.org
Thu Dec 28 00:09:59 CET 2006
Author: kilian
Date: 2006-12-28 00:09:59 +0100 (Thu, 28 Dec 2006)
New Revision: 2863
Modified:
asterisk/trunk/debian/patches/30_ast-data-dir.dpatch
Log:
make patch apply again. I wonder why "was applied for 1.2" doesn't look like
it's still fully shipped like that in the source. Someone(TM) feel like digging
why parts have been reverted or wether we can actually remove this patch?
Modified: asterisk/trunk/debian/patches/30_ast-data-dir.dpatch
===================================================================
--- asterisk/trunk/debian/patches/30_ast-data-dir.dpatch 2006-12-27 22:42:15 UTC (rev 2862)
+++ asterisk/trunk/debian/patches/30_ast-data-dir.dpatch 2006-12-27 23:09:59 UTC (rev 2863)
@@ -5,124 +5,14 @@
## DP: Patch to make Asterisk conform with the Linux File System Hierarchy Standard (FHS)
## DP: Places read-only architecture-independent data under /usr/share/asterisk (autoconf --datadir)
## DP: not /var/lib/asterisk
+## (in short make ASTVARLIBDIR become ASTDATADIR)
## -- is applied upstream for 1.2
@DPATCH@
-diff -urNad asterisk-1.2.7.1.dfsg/asterisk.c /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/asterisk.c
---- asterisk-1.2.7.1.dfsg/asterisk.c 2006-05-13 18:14:15.970288503 +0300
-+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/asterisk.c 2006-05-13 18:14:16.228355957 +0300
-@@ -216,6 +216,7 @@
- char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
- char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
- char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
-+char ast_config_AST_DATA_DIR[AST_CONFIG_MAX_PATH];
- char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
- char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
- char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
-@@ -1882,6 +1883,7 @@
- ast_copy_string(ast_config_AST_MODULE_DIR, AST_MODULE_DIR, sizeof(ast_config_AST_MODULE_DIR));
- snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", ast_config_AST_SPOOL_DIR);
- ast_copy_string(ast_config_AST_VAR_DIR, AST_VAR_DIR, sizeof(ast_config_AST_VAR_DIR));
-+ ast_copy_string(ast_config_AST_DATA_DIR, AST_DATA_DIR, sizeof(ast_config_AST_DATA_DIR));
- ast_copy_string(ast_config_AST_LOG_DIR, AST_LOG_DIR, sizeof(ast_config_AST_LOG_DIR));
- ast_copy_string(ast_config_AST_AGI_DIR, AST_AGI_DIR, sizeof(ast_config_AST_AGI_DIR));
- ast_copy_string(ast_config_AST_DB, AST_DB, sizeof(ast_config_AST_DB));
-@@ -1918,6 +1920,8 @@
- 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, "astdatadir")) {
-+ ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR));
- } else if (!strcasecmp(v->name, "astlogdir")) {
- ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR));
- } else if (!strcasecmp(v->name, "astagidir")) {
-diff -urNad asterisk-1.2.7.1.dfsg/build_tools/make_defaults_h /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/build_tools/make_defaults_h
---- asterisk-1.2.7.1.dfsg/build_tools/make_defaults_h 2005-06-20 20:26:08.000000000 +0300
-+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/build_tools/make_defaults_h 2006-05-13 18:14:16.228355957 +0300
-@@ -11,6 +11,7 @@
- #define AST_MODULE_DIR "${INSTALL_PATH}${MODULES_DIR}"
- #define AST_SPOOL_DIR "${INSTALL_PATH}${ASTSPOOLDIR}"
- #define AST_VAR_DIR "${INSTALL_PATH}${ASTVARLIBDIR}"
-+#define AST_DATA_DIR "${INSTALL_PATH}${ASTDATADIR}"
- #define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}"
- #define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}"
- #define AST_KEY_DIR "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
-@@ -19,7 +20,7 @@
-
- #define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
-
--#define AST_SOUNDS "${INSTALL_PATH}${ASTVARLIBDIR}/sounds"
--#define AST_IMAGES "${INSTALL_PATH}${ASTVARLIBDIR}/images"
-+#define AST_SOUNDS "${INSTALL_PATH}${ASTDATADIR}/sounds"
-+#define AST_IMAGES "${INSTALL_PATH}${ASTDATADIR}/images"
-
- END
-diff -urNad asterisk-1.2.7.1.dfsg/channels/chan_iax2.c /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/channels/chan_iax2.c
---- asterisk-1.2.7.1.dfsg/channels/chan_iax2.c 2006-03-31 22:11:26.000000000 +0300
-+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/channels/chan_iax2.c 2006-05-13 18:27:17.074963284 +0300
-@@ -1367,7 +1367,7 @@
- cur = cur->next;
- }
- /* Now that we've freed them, load the new ones */
-- snprintf(dir, sizeof(dir), "%s/firmware/iax", (char *)ast_config_AST_VAR_DIR);
-+ snprintf(dir, sizeof(dir), "%s/firmware/iax", (char *)ast_config_AST_DATA_DIR);
- fwd = opendir(dir);
- if (fwd) {
- while((de = readdir(fwd))) {
-diff -urNad asterisk-1.2.7.1.dfsg/configs/musiconhold.conf.sample /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/configs/musiconhold.conf.sample
---- asterisk-1.2.7.1.dfsg/configs/musiconhold.conf.sample 2005-11-29 20:24:39.000000000 +0200
-+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/configs/musiconhold.conf.sample 2006-05-13 18:14:16.228355957 +0300
-@@ -4,7 +4,7 @@
-
- [default]
- mode=quietmp3
--directory=/var/lib/asterisk/mohmp3
-+directory=/usr/share/asterisk/mohmp3
-
- ; valid mode options:
- ; quietmp3 -- default
-diff -urNad asterisk-1.2.7.1.dfsg/file.c /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/file.c
---- asterisk-1.2.7.1.dfsg/file.c 2006-01-10 00:07:26.000000000 +0200
-+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/file.c 2006-05-13 18:14:16.228355957 +0300
-@@ -313,7 +313,7 @@
- } else {
- char tmp[AST_CONFIG_MAX_PATH] = "";
-
-- snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_VAR_DIR, "sounds");
-+ snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_DATA_DIR, "sounds");
- fnsize = strlen(tmp) + strlen(filename) + strlen(type) + 3;
- fn = malloc(fnsize);
- if (fn)
-diff -urNad asterisk-1.2.7.1.dfsg/image.c /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/image.c
---- asterisk-1.2.7.1.dfsg/image.c 2006-03-24 16:48:11.000000000 +0200
-+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/image.c 2006-05-13 18:14:16.228355957 +0300
-@@ -108,9 +108,9 @@
- snprintf(buf, len, "%s.%s", filename, ext);
- } else {
- if (preflang && strlen(preflang))
-- snprintf(buf, len, "%s/%s/%s-%s.%s", ast_config_AST_VAR_DIR, "images", filename, preflang, ext);
-+ snprintf(buf, len, "%s/%s/%s-%s.%s", ast_config_AST_DATA_DIR, "images", filename, preflang, ext);
- else
-- snprintf(buf, len, "%s/%s/%s.%s", ast_config_AST_VAR_DIR, "images", filename, ext);
-+ snprintf(buf, len, "%s/%s/%s.%s", ast_config_AST_DATA_DIR, "images", filename, ext);
- }
- }
-
-diff -urNad asterisk-1.2.7.1.dfsg/include/asterisk.h /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/include/asterisk.h
---- asterisk-1.2.7.1.dfsg/include/asterisk.h 2005-11-30 05:37:37.000000000 +0200
-+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/include/asterisk.h 2006-05-13 18:14:16.228355957 +0300
-@@ -29,6 +29,7 @@
- extern char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
- extern char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
- extern char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
-+extern char ast_config_AST_DATA_DIR[AST_CONFIG_MAX_PATH];
- extern char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
- extern char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
- extern char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
-diff -urNad asterisk-1.2.7.1.dfsg/Makefile /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/Makefile
---- asterisk-1.2.7.1.dfsg/Makefile 2006-04-12 00:58:47.000000000 +0300
-+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/Makefile 2006-05-13 18:26:34.253802810 +0300
-@@ -110,6 +110,7 @@
+diff -urNad asterisk-1.2.14~dfsg~/Makefile asterisk-1.2.14~dfsg/Makefile
+--- asterisk-1.2.14~dfsg~/Makefile 2006-12-11 22:55:43.000000000 +0100
++++ asterisk-1.2.14~dfsg/Makefile 2006-12-28 00:06:09.385758679 +0100
+@@ -113,6 +113,7 @@
ifneq ($(OSARCH),SunOS)
ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
@@ -130,7 +20,7 @@
ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
-@@ -117,10 +118,10 @@
+@@ -120,10 +121,10 @@
ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
@@ -143,7 +33,7 @@
else
ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
-@@ -136,6 +137,7 @@
+@@ -139,6 +140,7 @@
MODULES_DIR=$(ASTLIBDIR)/modules
AGI_DIR=$(ASTVARLIBDIR)/agi-bin
endif
@@ -151,13 +41,15 @@
ASTCFLAGS=
-@@ -542,38 +544,38 @@
+@@ -552,12 +554,12 @@
datafiles: all
if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
++ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/silence
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
for x in sounds/digits/*.gsm; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
@@ -166,6 +58,15 @@
else \
echo "No description for $$x"; \
exit 1; \
+@@ -565,34 +567,34 @@
+ done
+ for x in sounds/silence/*.gsm; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/silence ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
fi; \
done
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
@@ -199,9 +100,9 @@
else \
echo "No description for $$x"; \
exit 1; \
-@@ -581,16 +583,16 @@
+@@ -600,16 +602,16 @@
done
- for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
+ for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* sounds/second* ; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
@@ -220,7 +121,7 @@
done
mkdir -p $(DESTDIR)$(AGI_DIR)
-@@ -626,6 +628,7 @@
+@@ -645,6 +647,7 @@
mkdir -p $(DESTDIR)$(ASTETCDIR)
mkdir -p $(DESTDIR)$(ASTBINDIR)
mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
@@ -228,7 +129,7 @@
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
-@@ -648,12 +651,12 @@
+@@ -666,12 +669,12 @@
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
@@ -244,7 +145,7 @@
mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-@@ -662,7 +665,7 @@
+@@ -680,7 +683,7 @@
$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
if [ -d contrib/firmware/iax ]; then \
@@ -253,7 +154,7 @@
else \
echo "You need to do cvs update -d not just cvs update" ; \
fi
-@@ -764,10 +767,10 @@
+@@ -785,10 +788,10 @@
else \
echo "Skipping asterisk.conf creation"; \
fi
@@ -266,7 +167,7 @@
else \
echo "No description for $$x"; \
exit 1; \
-@@ -781,11 +784,11 @@
+@@ -802,11 +805,11 @@
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
@@ -280,3 +181,114 @@
done
webvmail:
+diff -urNad asterisk-1.2.14~dfsg~/asterisk.c asterisk-1.2.14~dfsg/asterisk.c
+--- asterisk-1.2.14~dfsg~/asterisk.c 2006-12-28 00:05:16.821504762 +0100
++++ asterisk-1.2.14~dfsg/asterisk.c 2006-12-28 00:05:17.853588396 +0100
+@@ -216,6 +216,7 @@
+ char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
+ char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
+ char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
++char ast_config_AST_DATA_DIR[AST_CONFIG_MAX_PATH];
+ char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
+ char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
+ char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
+@@ -1872,6 +1873,7 @@
+ ast_copy_string(ast_config_AST_MODULE_DIR, AST_MODULE_DIR, sizeof(ast_config_AST_MODULE_DIR));
+ snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", ast_config_AST_SPOOL_DIR);
+ ast_copy_string(ast_config_AST_VAR_DIR, AST_VAR_DIR, sizeof(ast_config_AST_VAR_DIR));
++ ast_copy_string(ast_config_AST_DATA_DIR, AST_DATA_DIR, sizeof(ast_config_AST_DATA_DIR));
+ ast_copy_string(ast_config_AST_LOG_DIR, AST_LOG_DIR, sizeof(ast_config_AST_LOG_DIR));
+ ast_copy_string(ast_config_AST_AGI_DIR, AST_AGI_DIR, sizeof(ast_config_AST_AGI_DIR));
+ ast_copy_string(ast_config_AST_DB, AST_DB, sizeof(ast_config_AST_DB));
+@@ -1908,6 +1910,8 @@
+ 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, "astdatadir")) {
++ ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR));
+ } else if (!strcasecmp(v->name, "astlogdir")) {
+ ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR));
+ } else if (!strcasecmp(v->name, "astagidir")) {
+diff -urNad asterisk-1.2.14~dfsg~/build_tools/make_defaults_h asterisk-1.2.14~dfsg/build_tools/make_defaults_h
+--- asterisk-1.2.14~dfsg~/build_tools/make_defaults_h 2005-06-20 19:26:08.000000000 +0200
++++ asterisk-1.2.14~dfsg/build_tools/make_defaults_h 2006-12-28 00:05:17.853588396 +0100
+@@ -11,6 +11,7 @@
+ #define AST_MODULE_DIR "${INSTALL_PATH}${MODULES_DIR}"
+ #define AST_SPOOL_DIR "${INSTALL_PATH}${ASTSPOOLDIR}"
+ #define AST_VAR_DIR "${INSTALL_PATH}${ASTVARLIBDIR}"
++#define AST_DATA_DIR "${INSTALL_PATH}${ASTDATADIR}"
+ #define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}"
+ #define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}"
+ #define AST_KEY_DIR "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
+@@ -19,7 +20,7 @@
+
+ #define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
+
+-#define AST_SOUNDS "${INSTALL_PATH}${ASTVARLIBDIR}/sounds"
+-#define AST_IMAGES "${INSTALL_PATH}${ASTVARLIBDIR}/images"
++#define AST_SOUNDS "${INSTALL_PATH}${ASTDATADIR}/sounds"
++#define AST_IMAGES "${INSTALL_PATH}${ASTDATADIR}/images"
+
+ END
+diff -urNad asterisk-1.2.14~dfsg~/channels/chan_iax2.c asterisk-1.2.14~dfsg/channels/chan_iax2.c
+--- asterisk-1.2.14~dfsg~/channels/chan_iax2.c 2006-12-28 00:05:16.425472669 +0100
++++ asterisk-1.2.14~dfsg/channels/chan_iax2.c 2006-12-28 00:05:17.977598445 +0100
+@@ -1384,7 +1384,7 @@
+ cur = cur->next;
+ }
+ /* Now that we've freed them, load the new ones */
+- snprintf(dir, sizeof(dir), "%s/firmware/iax", (char *)ast_config_AST_VAR_DIR);
++ snprintf(dir, sizeof(dir), "%s/firmware/iax", (char *)ast_config_AST_DATA_DIR);
+ fwd = opendir(dir);
+ if (fwd) {
+ while((de = readdir(fwd))) {
+diff -urNad asterisk-1.2.14~dfsg~/configs/musiconhold.conf.sample asterisk-1.2.14~dfsg/configs/musiconhold.conf.sample
+--- asterisk-1.2.14~dfsg~/configs/musiconhold.conf.sample 2005-11-29 19:24:39.000000000 +0100
++++ asterisk-1.2.14~dfsg/configs/musiconhold.conf.sample 2006-12-28 00:05:17.977598445 +0100
+@@ -4,7 +4,7 @@
+
+ [default]
+ mode=quietmp3
+-directory=/var/lib/asterisk/mohmp3
++directory=/usr/share/asterisk/mohmp3
+
+ ; valid mode options:
+ ; quietmp3 -- default
+diff -urNad asterisk-1.2.14~dfsg~/file.c asterisk-1.2.14~dfsg/file.c
+--- asterisk-1.2.14~dfsg~/file.c 2006-10-06 18:52:14.000000000 +0200
++++ asterisk-1.2.14~dfsg/file.c 2006-12-28 00:05:17.977598445 +0100
+@@ -316,7 +316,7 @@
+ } else {
+ char tmp[AST_CONFIG_MAX_PATH] = "";
+
+- snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_VAR_DIR, "sounds");
++ snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_DATA_DIR, "sounds");
+ fnsize = strlen(tmp) + strlen(filename) + strlen(type) + 3;
+ fn = malloc(fnsize);
+ if (fn)
+diff -urNad asterisk-1.2.14~dfsg~/image.c asterisk-1.2.14~dfsg/image.c
+--- asterisk-1.2.14~dfsg~/image.c 2006-03-24 15:48:11.000000000 +0100
++++ asterisk-1.2.14~dfsg/image.c 2006-12-28 00:05:17.977598445 +0100
+@@ -108,9 +108,9 @@
+ snprintf(buf, len, "%s.%s", filename, ext);
+ } else {
+ if (preflang && strlen(preflang))
+- snprintf(buf, len, "%s/%s/%s-%s.%s", ast_config_AST_VAR_DIR, "images", filename, preflang, ext);
++ snprintf(buf, len, "%s/%s/%s-%s.%s", ast_config_AST_DATA_DIR, "images", filename, preflang, ext);
+ else
+- snprintf(buf, len, "%s/%s/%s.%s", ast_config_AST_VAR_DIR, "images", filename, ext);
++ snprintf(buf, len, "%s/%s/%s.%s", ast_config_AST_DATA_DIR, "images", filename, ext);
+ }
+ }
+
+diff -urNad asterisk-1.2.14~dfsg~/include/asterisk.h asterisk-1.2.14~dfsg/include/asterisk.h
+--- asterisk-1.2.14~dfsg~/include/asterisk.h 2005-11-30 04:37:37.000000000 +0100
++++ asterisk-1.2.14~dfsg/include/asterisk.h 2006-12-28 00:05:17.977598445 +0100
+@@ -29,6 +29,7 @@
+ extern char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
+ extern char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
+ extern char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
++extern char ast_config_AST_DATA_DIR[AST_CONFIG_MAX_PATH];
+ extern char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
+ extern char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
+ extern char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
More information about the Pkg-voip-commits
mailing list