[Pkg-voip-commits] r7216 - in /asterisk-gui/trunk/debian/patches: datadir_path series tmpdir

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Fri May 15 19:10:09 UTC 2009


Author: tzafrir-guest
Date: Fri May 15 19:10:09 2009
New Revision: 7216

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7216
Log:
Merge patch 'tmpdir' into patch 'datadir_patch' . Note the new upstream issue

Removed:
    asterisk-gui/trunk/debian/patches/tmpdir
Modified:
    asterisk-gui/trunk/debian/patches/datadir_path
    asterisk-gui/trunk/debian/patches/series

Modified: asterisk-gui/trunk/debian/patches/datadir_path
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/datadir_path?rev=7216&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/datadir_path (original)
+++ asterisk-gui/trunk/debian/patches/datadir_path Fri May 15 19:10:09 2009
@@ -1,26 +1,29 @@
-# Fix datadir to be /usr/share/asterisk rather than /var/lib/asterisk
-# Upstream issue: http://bugs.digium.com/11629
+Fix datadir to be /usr/share/asterisk rather than /var/lib/asterisk
+
+Any file that needs to be written is written to /var/spool/asterisk/tmp ,
+which is also linked from /usr/share/asterisk/static-http/config/tmp
+
+Upstream issue: https://issues.asterisk.org/view.php?id=15119
 
 --- a/scripts/listfiles
 +++ b/scripts/listfiles
-@@ -1,5 +1,7 @@
+@@ -1,5 +1,5 @@
  #!/bin/sh
 -SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
-+
-+# (a symlink to the actual temporary file)
-+SYSINFO_OUTPUT="/usr/share/asterisk/static-http/config/sysinfo_output.html"
++SYSINFO_OUTPUT="/usr/share/asterisk/static-http/config/tmp/sysinfo_output.html"
  
  #/bin/echo "<div id=list_files>" > $SYSINFO_OUTPUT
  /bin/mkdir -p $1
 --- a/config/js/index.js
 +++ b/config/js/index.js
-@@ -249,22 +249,24 @@ var onLogInFunctions = {
+@@ -253,23 +253,26 @@ var onLogInFunctions = {
  		if( ASTERISK_CONF === null ){ ASTERISK_CONF = new ASTGUI.customObject ; } // if context 'directories' not found in asterisk.conf
  		sessionData.directories.asteriskConfig =  ASTERISK_CONF.getProperty('astetcdir') ||  '/etc/asterisk/' ;
  		sessionData.directories.astvarlibdir = ASTERISK_CONF.getProperty('astvarlibdir') || '/var/lib/asterisk/' ;
 +		sessionData.directories.astdatadir = ASTERISK_CONF.getProperty('astdatadir') || '/usr/share/asterisk/' ;
  		sessionData.directories.AGIBIN = ASTERISK_CONF.getProperty('astagidir') || '/var/lib/asterisk/agi-bin/' ;
  		sessionData.directories.astspooldir = ASTERISK_CONF.getProperty('astspooldir') || '/var/spool/asterisk/' ;
++		sessionData.directories.tmpdir = sessionData.directories.astspooldir + 'tmp/';
  
  		if( !sessionData.directories.asteriskConfig.endsWith('/') ){ sessionData.directories.asteriskConfig = sessionData.directories.asteriskConfig + '/' ; }
  		if( !sessionData.directories.astvarlibdir.endsWith('/') ){ sessionData.directories.astvarlibdir = sessionData.directories.astvarlibdir + '/' ; }
@@ -39,7 +42,63 @@
  		sessionData.directories.menusRecord = sessionData.directories.Sounds + 'record/' ;
  
 -		sessionData.directories.scripts = sessionData.directories.astvarlibdir + 'scripts/';/* Directory for gui scripts (listfiles, for example) */	
+-		sessionData.directories.output_SysInfo = './sysinfo_output.html' ;
 +		sessionData.directories.scripts = sessionData.directories.astdatadir + 'scripts/';/* Directory for gui scripts (listfiles, for example) */	
- 		sessionData.directories.output_SysInfo = './sysinfo_output.html' ;
++		sessionData.directories.output_SysInfo = 'tmp/sysinfo_output.html' ;
  		sessionData.directories.voicemails_dir = sessionData.directories.astspooldir + 'voicemail/default/' ;
  		sessionData.directories.script_takeBackup =  'sh ' + sessionData.directories.scripts + 'takebackup';
+ 		sessionData.directories.script_restoreBackup =  'sh ' + sessionData.directories.scripts + 'restorebackup';
+--- a/config/js/astman.js
++++ b/config/js/astman.js
+@@ -332,6 +332,7 @@ var ASTGUI = {
+ 		g729RegInfo: 'g729reginfo.conf', // ASTGUI.globals.g729RegInfo, the sessionData.directories.script_Registerg729 script will read this file to generate tab delimited file
+ 		hwcfgFile: 'gui_confighw.conf', // file to store configured hardware information, to detect hardware changes
+ 		dahdiIncludeFile: 'dahdi_guiread.conf', // file that will be used to read zaptel.conf or dahdi/system.conf , ASTGUI.globals.dahdiIncludeFile
++		dahdiIncludeFile: '/var/spool/asterisk/tmp/dahdi_guiread.conf', // file that will be used to read zaptel.conf or dahdi/system.conf , ASTGUI.globals.dahdiIncludeFile
+ 		dahdiScanOutput: 'dahdi_scan.conf', // file that will be used to read output from ztscan or dahdi_scan, ASTGUI.globals.dahdiScanOutput
+ 		pingInterval : 5000,
+ 		app_factoryReset : '/bin/reset_config', // ASTGUI.globals.app_factoryReset
+@@ -2366,12 +2367,12 @@ var ASTGUI = {
+ 		// output will be sent as a argument to the callback function
+ 		//var fcmd = cmd + ' > ' + top.sessionData.directories.guiInstall +  ;
+ 		var tmp_opf = ( top.sessionData.directories.output_SysInfo.afterChar('/') || top.sessionData.directories.output_SysInfo ).rChop('.html') + Math.round( 10000 * Math.random() ) + '.html' ;
+-		var fcmd = cmd + ' > ' + top.sessionData.directories.guiInstall + tmp_opf ;
++		var fcmd = cmd + ' > ' + top.sessionData.directories.tmpdir + tmp_opf ;
+ 
+ 		var after = function(){
+ 			parent.document.getElementById('ajaxstatus').style.display = 'none';
+-			ASTGUI.loadHTML( tmp_opf , function(cmd_output){
+-				ASTGUI.systemCmd( 'rm ' + top.sessionData.directories.guiInstall + tmp_opf, function(){cb(cmd_output);} );
++			ASTGUI.loadHTML( 'tmp/' + tmp_opf , function(cmd_output){
++				ASTGUI.systemCmd( 'rm ' + top.sessionData.directories.tmpdir + tmp_opf, function(){cb(cmd_output);} );
+ 			});
+ 		};
+ 
+--- a/scripts/detectdahdi.sh
++++ b/scripts/detectdahdi.sh
+@@ -2,7 +2,7 @@
+ 
+ # script to detect whether zaptel/dahdi was installed & generate an include file for GUI
+ 
+-OUTPUTFILE="/etc/asterisk/dahdi_guiread.conf"
++OUTPUTFILE="/var/spool/asterisk/tmp/dahdi_guiread.conf"
+ 
+ echo "" > ${OUTPUTFILE}
+ echo "[general]" >> ${OUTPUTFILE}
+@@ -10,14 +10,14 @@ echo "" >> ${OUTPUTFILE}
+ 
+ if [ -e /dev/zap ]; then
+ 	echo "zaptel"
+-	echo "#include \"../zaptel.conf\"" >> ${OUTPUTFILE}
++	echo "#include \"/etc/zaptel.conf\"" >> ${OUTPUTFILE}
+ 	echo "" >> ${OUTPUTFILE}
+ 	exit 0
+ fi
+ 
+ if [ -e /dev/dahdi ]; then
+         echo "dahdi"
+-	echo "#include \"../dahdi/system.conf\"" >> ${OUTPUTFILE}
++	echo "#include \"/etc/dahdi/system.conf\"" >> ${OUTPUTFILE}
+ 	echo "" >> ${OUTPUTFILE}
+ 	exit 0
+ fi

Modified: asterisk-gui/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/series?rev=7216&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/series (original)
+++ asterisk-gui/trunk/debian/patches/series Fri May 15 19:10:09 2009
@@ -1,7 +1,2 @@
+trademark
 datadir_path
-#trademark_text
-#change_colors
-#sysinfo_path
-#log_path
-trademark
-tmpdir




More information about the Pkg-voip-commits mailing list