[Pkg-voip-commits] r8157 - in /asterisk/trunk/debian: changelog patches/moh_datadir patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sat Mar  6 21:15:48 2010
New Revision: 8157

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8157
Log:
* New upstream RC: 1.6.2.6-rc2 .
* Patch moh_datadir: Make the datadir the default base for moh files
  if a relative path is used.

Added:
    asterisk/trunk/debian/patches/moh_datadir
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8157&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sat Mar  6 21:15:48 2010
@@ -1,10 +1,12 @@
-asterisk (1:1.6.2.3~rc2-1) unstable; urgency=low
+asterisk (1:1.6.2.6~rc2-1) unstable; urgency=low
 
   * New upstream RC.
   * Patch h323-fix-makefile dropped: merged upstream.
   * Patch safe_asterisk-config: Mostly merged upstream. 
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 14 Feb 2010 18:48:54 +0200
+  * Patch moh_datadir: Make the datadir the default base for moh files
+    if a relative path is used.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 06 Mar 2010 22:58:17 +0200
 
 asterisk (1:1.6.2.2-1) unstable; urgency=medium
 

Added: asterisk/trunk/debian/patches/moh_datadir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/moh_datadir?rev=8157&op=file
==============================================================================
--- asterisk/trunk/debian/patches/moh_datadir (added)
+++ asterisk/trunk/debian/patches/moh_datadir Sat Mar  6 21:15:48 2010
@@ -1,0 +1,21 @@
+Subject: install MOH files under datadir
+Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Bug: https://issues.asterisk.org/view.php?id=16906
+
+If a relative path is used in the datadir, make it use the datadir (normally
+/usr/share/asterisk on Debian packages) rather than the var_dir (normally
+/var/lib/asterisk).
+
+Issue is currently in review by upstream.
+
+--- a/res/res_musiconhold.c
++++ b/res/res_musiconhold.c
+@@ -967,7 +967,7 @@ static int moh_scan_files(struct mohclas
+ 	int i;
+ 
+ 	if (class->dir[0] != '/') {
+-		ast_copy_string(dir_path, ast_config_AST_VAR_DIR, sizeof(dir_path));
++		ast_copy_string(dir_path, ast_config_AST_DATA_DIR, sizeof(dir_path));
+ 		strncat(dir_path, "/", sizeof(dir_path) - 1);
+ 		strncat(dir_path, class->dir, sizeof(dir_path) - 1);
+ 	} else {

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=8157&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Sat Mar  6 21:15:48 2010
@@ -16,3 +16,4 @@
 dahdi_ptmp_nt
 dahdi_pri_debug_spannums
 sound_files
+moh_datadir