[Pkg-voip-commits] r3015 - in asterisk/trunk/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2007-01-13 18:26:59 +0100 (Sat, 13 Jan 2007)
New Revision: 3015

Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/30_ast-data-dir.dpatch
Log:
update ast-data-dir patch to make use of the correct FHS-dir for private callerintros.


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2007-01-13 16:48:58 UTC (rev 3014)
+++ asterisk/trunk/debian/changelog	2007-01-13 17:26:59 UTC (rev 3015)
@@ -3,8 +3,9 @@
   * NOT RELEASED YET
   * Write a more robust version of the FHS-update for
     /usr/share/asterisk/sounds/priv-callerintros.
+  * Update 30_ast-data-dir to complete fix for #406714. Thanks to Lionel!
 
- -- Kilian Krause <kilian at debian.org>  Sat, 13 Jan 2007 14:12:26 +0100
+ -- Kilian Krause <kilian at debian.org>  Sat, 13 Jan 2007 17:08:47 +0100
 
 asterisk (1:1.2.14~dfsg-2) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/30_ast-data-dir.dpatch
===================================================================
--- asterisk/trunk/debian/patches/30_ast-data-dir.dpatch	2007-01-13 16:48:58 UTC (rev 3014)
+++ asterisk/trunk/debian/patches/30_ast-data-dir.dpatch	2007-01-13 17:26:59 UTC (rev 3015)
@@ -11,7 +11,7 @@
 @DPATCH@
 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
++++ asterisk-1.2.14~dfsg/Makefile	2007-01-13 17:07:01.960255452 +0100
 @@ -113,6 +113,7 @@
  ifneq ($(OSARCH),SunOS)
    ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
@@ -180,9 +180,22 @@
  	done
  
  webvmail:
+diff -urNad asterisk-1.2.14~dfsg~/apps/app_dial.c asterisk-1.2.14~dfsg/apps/app_dial.c
+--- asterisk-1.2.14~dfsg~/apps/app_dial.c	2006-12-02 00:30:59.000000000 +0100
++++ asterisk-1.2.14~dfsg/apps/app_dial.c	2007-01-13 17:07:31.434575889 +0100
+@@ -974,7 +974,8 @@
+ 				goto out;
+ 			}
+ 
+-			snprintf(privintro,sizeof(privintro),"priv-callerintros/%s", privcid);
++			snprintf(privintro,sizeof(privintro),"%s/sounds/priv-callerintros/%s", ast_config_AST_VAR_DIR, privcid);
++
+ 			if( ast_fileexists(privintro,NULL,NULL ) > 0 && strncmp(privcid,"NOCALLERID",10) != 0) {
+ 				/* the DELUX version of this code would allow this caller the
+ 				   option to hear and retape their previously recorded intro.
 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
+--- asterisk-1.2.14~dfsg~/asterisk.c	2007-01-13 17:07:01.760239704 +0100
++++ asterisk-1.2.14~dfsg/asterisk.c	2007-01-13 17:07:01.964255767 +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];
@@ -210,7 +223,7 @@
  		} 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
++++ asterisk-1.2.14~dfsg/build_tools/make_defaults_h	2007-01-13 17:07:01.964255767 +0100
 @@ -11,6 +11,7 @@
  #define AST_MODULE_DIR "${INSTALL_PATH}${MODULES_DIR}"
  #define AST_SPOOL_DIR  "${INSTALL_PATH}${ASTSPOOLDIR}"
@@ -230,8 +243,8 @@
  
  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
+--- asterisk-1.2.14~dfsg~/channels/chan_iax2.c	2007-01-13 17:07:01.720236554 +0100
++++ asterisk-1.2.14~dfsg/channels/chan_iax2.c	2007-01-13 17:07:01.968256082 +0100
 @@ -1384,7 +1384,7 @@
  		cur = cur->next;
  	}
@@ -243,7 +256,7 @@
  		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
++++ asterisk-1.2.14~dfsg/configs/musiconhold.conf.sample	2007-01-13 17:07:01.968256082 +0100
 @@ -4,7 +4,7 @@
  
  [default]
@@ -255,7 +268,7 @@
  ; 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
++++ asterisk-1.2.14~dfsg/file.c	2007-01-13 17:07:01.968256082 +0100
 @@ -316,7 +316,7 @@
  	} else {
  		char tmp[AST_CONFIG_MAX_PATH] = "";
@@ -267,7 +280,7 @@
  		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
++++ asterisk-1.2.14~dfsg/image.c	2007-01-13 17:07:01.968256082 +0100
 @@ -108,9 +108,9 @@
  			snprintf(buf, len, "%s.%s", filename, ext);
  	} else {
@@ -282,7 +295,7 @@
  
 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
++++ asterisk-1.2.14~dfsg/include/asterisk.h	2007-01-13 17:07:01.968256082 +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];