Attachment 77473 Details for Bug 111559 – diff1.diff

[patch] diff1.diff

diff1.diff (text/x-patch), 11.75 KB, created by Phillip N. on 2007-05-03 22:38:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Phillip N.

Created: 2007-05-03 22:38:25 UTC

Size: 11.75 KB

patch

obsolete

>diff -ruN asterisk-gui.orig/Makefile asterisk-gui/Makefile
>--- asterisk-gui.orig/Makefile	Thu May  3 21:23:33 2007
>+++ asterisk-gui/Makefile	Thu May  3 21:22:46 2007
>@@ -6,10 +6,10 @@
> #
> 
> PORTNAME=	asterisk-gui
>-PORTVERSION=	0.0.1r20070413
>+PORTVERSION=	0.0.1r20070501
> CATEGORIES=	www
> MASTER_SITES=	http://asterisk-bsd.googlecode.com/files/
>-DISTNAME=	${PORTNAME}-snap-2007-04-13
>+DISTNAME=	${PORTNAME}-snap-2007-05-01
> 
> MAINTAINER=	pneumann@gmail.com
> COMMENT=	An asterisk ajax web manager
>@@ -31,10 +31,8 @@
> 		${WRKSRC}/config/scripts/astman.js \
> 		${WRKSRC}/tools/zapscan.c \
> 		${WRKSRC}/tools/zapscan \
>-		${WRKSRC}/scripts/output_path \
> 		${WRKSRC}/scripts/gui_sysinfo \
>-		${WRKSRC}/scripts/listfiles \
>-		${WRKSRC}/scripts/output_path
>+		${WRKSRC}/scripts/listfiles
> 	@${FIND} ${WRKSRC} -name "*.orig" -o -name "*.bak" | ${XARGS} ${RM}
> 
> run-autotools:
>diff -ruN asterisk-gui.orig/distinfo asterisk-gui/distinfo
>--- asterisk-gui.orig/distinfo	Thu May  3 21:23:33 2007
>+++ asterisk-gui/distinfo	Thu May  3 21:22:46 2007
>@@ -1,3 +1,3 @@
>-MD5 (asterisk-gui-snap-2007-04-13.tar.gz) = 32c0e1dc0e80e94420836acc9fea5597
>-SHA256 (asterisk-gui-snap-2007-04-13.tar.gz) = 8312f661f2af2e4413ba80abfa1b4b5d1c26e37a63767c58aae2d3bc49bd43c9
>-SIZE (asterisk-gui-snap-2007-04-13.tar.gz) = 288726
>+MD5 (asterisk-gui-snap-2007-05-01.tar.gz) = c5029e1d0d679d15054e6763ec214922
>+SHA256 (asterisk-gui-snap-2007-05-01.tar.gz) = d633ef9fe1924304dfcf7abe25c10274fe670de77f8beb927b0aaf9d2167db99
>+SIZE (asterisk-gui-snap-2007-05-01.tar.gz) = 286455
>diff -ruN asterisk-gui.orig/files/patch-config-backup.html asterisk-gui/files/patch-config-backup.html
>--- asterisk-gui.orig/files/patch-config-backup.html	Thu May  3 21:23:33 2007
>+++ asterisk-gui/files/patch-config-backup.html	Thu May  3 21:22:45 2007
>@@ -1,15 +1,15 @@
>---- config/backup.html.orig	Fri Apr 13 23:28:20 2007
>-+++ config/backup.html	Fri Apr 13 23:29:44 2007
>+--- config/backup.html.orig	Thu Apr 26 21:57:18 2007
>++++ config/backup.html	Thu Apr 26 21:57:54 2007
> @@ -116,7 +116,7 @@
>  
>  
>  function restore_bkp(filename){
>--	parent.astmanEngine.run_tool("rm /etc/asterick/* -rf ", callback=function(){ restore_bkp_step2(filename);} );
>-+	parent.astmanEngine.run_tool("rm %%PREFIX%%/etc/asterisk/* -rf ", callback=function(){ restore_bkp_step2(filename);} );
>+-	//parent.astmanEngine.run_tool("rm /etc/asterisk/* -rf ", callback=function(){ restore_bkp_step2(filename);} );
>++	//parent.astmanEngine.run_tool("rm %%PREFIX%%/etc/asterisk/* -rf ", callback=function(){ restore_bkp_step2(filename);} );
>+ 	restore_bkp_step2(filename);
>  }
>  
>- 
>-@@ -130,7 +130,7 @@
>+@@ -131,7 +131,7 @@
>  
>  function delete_bkp( filename ){
>  	if(!confirm("Delete selected Backup Configuration ?")){ return ; }
>@@ -18,7 +18,7 @@
>  		gui_feedback('Delete Request Successfull !','default');
>  		window.location.href = window.location.href ;
>  	});
>-@@ -169,7 +169,7 @@
>+@@ -177,7 +177,7 @@
>  	//var seconds =addzero(today.getSeconds());
>  	var bkpfile =  _nn.value +"__" + year + month + day +".tar";
>  
>@@ -27,10 +27,3 @@
>  			gui_feedback('Backup Successfull!','blue');
>  			window.location.href = window.location.href ;
>  		}
>-@@ -235,4 +235,4 @@
>- <div id="sysinfohtml" style="display:none"></div>
>- <div id="bg_transparent" STYLE="display:none; position: absolute; left: 0; top: 24; width:100%; height:100%;  background-color:#EFEFEF; -moz-opacity:.50;opacity:.50; border-width: 1px; border-color: #EFEFEF; border-style: solid; z-index:4">
>- </div>
>--</body>
>-\ No newline at end of file
>-+</body>
>diff -ruN asterisk-gui.orig/files/patch-config-scripts-astman.js asterisk-gui/files/patch-config-scripts-astman.js
>--- asterisk-gui.orig/files/patch-config-scripts-astman.js	Thu May  3 21:23:33 2007
>+++ asterisk-gui/files/patch-config-scripts-astman.js	Thu May  3 21:22:45 2007
>@@ -1,34 +1,35 @@
>---- config/scripts/astman.js.orig	Fri Apr 13 16:56:54 2007
>-+++ config/scripts/astman.js	Sat Apr 14 02:39:51 2007
>-@@ -25,16 +25,16 @@
>+--- config/scripts/astman.js.orig	Tue May  1 16:01:00 2007
>++++ config/scripts/astman.js	Tue May  1 16:12:08 2007
>+@@ -25,16 +25,18 @@
>  var asterisk_guitoolsversion = "0.7";
>- var asterisk_guiversion = "$Revision: 656 $";
>+ var asterisk_guiversion = "$Revision: 817 $";
>  var asterisk_guifbt = 3000; // Feedback msg time
>+-var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (graphs.sh, for example) */
> -var asterisk_ConfigBkpPath = "/var/lib/asterisk/gui_configbackups/" ;
> -var asterisk_Sounds_path = "/var/lib/asterisk/sounds/";
>-+var asterisk_ConfigBkpPath = "%%PREFIX%%/share/asterisk/gui_configbackups/" ;
>-+var asterisk_Sounds_path = "%%PREFIX%%/share/asterisk/sounds/";
>++var asterisk_prefix = "%%PREFIX%%/"  // "/" for typical linux instalation
>++var asterisk_varlib = asterisk_prefix + "share/asterisk/" // /var/lib/astersik/ for linux
>++var asterisk_scriptsFolder = asterisk_varlib + "scripts/" ; /* Directory for gui scripts (graphs.sh, for example) */
>++var asterisk_ConfigBkpPath = asterisk_varlib + "gui_configbackups/" ;
>++var asterisk_Sounds_path = asterisk_varlib + "sounds/";
>  var asterisk_menusRecord_path = asterisk_Sounds_path + "record/";
>--var asterisk_guiSysInfo = "sh /etc/asterisk/scripts/gui_sysinfo" ;
>-+var asterisk_guiSysInfo = "sh %%PREFIX%%/etc/asterisk/scripts/gui_sysinfo" ;
>+ var asterisk_guiSysInfo = "sh " + asterisk_scriptsFolder + "gui_sysinfo" ;
>  var asterisk_guiSysInfo_output = "./sysinfo_output.html";
> -var asterisk_guiZapscan = "/sbin/zapscan.bin" ;
>-+var asterisk_guiZapscan = "%%PREFIX%%/sbin/zapscan.bin" ;
>++var asterisk_guiZapscan = asterisk_prefix + "sbin/zapscan.bin" ;
>  var asterisk_rawmanPath = "../../rawman" ;
>  var asterisk_guiConfigFile = "guipreferences.conf"; // will be created in asterisk_configfolder, if the file does not exist 
> -var asterisk_configfolder = "/etc/asterisk/";
>--var asterisk_guiListFiles = "sh /etc/asterisk/scripts/listfiles" ;
>-+var asterisk_configfolder = "%%PREFIX%%/etc/asterisk/";
>-+var asterisk_guiListFiles = "sh %%PREFIX%%/etc/asterisk/scripts/listfiles" ;
>++var asterisk_configfolder = asterisk_prefix + "etc/asterisk/";
>+ var asterisk_guiListFiles = "sh " + asterisk_scriptsFolder + "listfiles" ;
>  
>  var sortbynames = false;
>- var dragdata = new Object;
>-@@ -1522,7 +1522,7 @@
>+@@ -1521,7 +1523,7 @@
>  	this.doConfig = function(t, box) {
>  		if( t[0].headers['message'] && t[0].headers['message'] == "Config file not found" ){
>  			if( box.config_file == "zapscan.conf" || box.config_file == "contactinfo.conf" || box.config_file == "jingle.conf" || box.config_file == "providers.conf" ){
> -				parent.astmanEngine.run_tool("/bin/touch /etc/asterisk/"+box.config_file, function(){ window.location.href = window.location.href ; } );
>-+				parent.astmanEngine.run_tool("/usr/bin/touch %%PREFIX%%/etc/asterisk/"+box.config_file, function(){ window.location.href = window.location.href ; } );
>++				parent.astmanEngine.run_tool("touch "+ asterisk_configfolder + box.config_file, function(){ window.location.href = window.location.href ; } );
>  				return ;
>  			} else {
>  				alert( "Asterisk says it cannot find a required config file (" + box.config_file + ") \n You will be now redirected to the main page !" );
>diff -ruN asterisk-gui.orig/files/patch-scripts-gui_sysinfo asterisk-gui/files/patch-scripts-gui_sysinfo
>--- asterisk-gui.orig/files/patch-scripts-gui_sysinfo	Thu May  3 21:23:33 2007
>+++ asterisk-gui/files/patch-scripts-gui_sysinfo	Thu May  3 21:22:45 2007
>@@ -1,6 +1,13 @@
>---- scripts/gui_sysinfo.orig	Fri Apr 13 23:30:57 2007
>-+++ scripts/gui_sysinfo	Fri Apr 13 23:35:22 2007
>-@@ -8,13 +8,13 @@
>+--- scripts/gui_sysinfo.orig	Fri Apr 27 18:08:53 2007
>++++ scripts/gui_sysinfo	Tue May  1 17:01:25 2007
>+@@ -1,5 +1,5 @@
>+ #!/bin/sh
>+-SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
>++SYSINFO_OUTPUT="%%PREFIX%%/share/asterisk/static-http/config/sysinfo_output.html"
>+ 
>+ #SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
>+ 
>+@@ -9,13 +9,13 @@
>  UPTIME="`uptime`"
>  /bin/echo "<div id=si_uptime>$UPTIME</div>" >> $SYSINFO_OUTPUT 
>                    
>@@ -16,7 +23,7 @@
>  /bin/echo "<div id=si_hostname>$HOSTNAME</div>" >> $SYSINFO_OUTPUT 
>       
>  IFCONFIG=`ifconfig`
>-@@ -23,14 +23,14 @@
>+@@ -24,14 +24,14 @@
>  DISKUSAGE=`df -h`
>  /bin/echo "<div id=si_du><pre>$DISKUSAGE</pre></div>" >> $SYSINFO_OUTPUT 
>                          
>diff -ruN asterisk-gui.orig/files/patch-scripts-listfiles asterisk-gui/files/patch-scripts-listfiles
>--- asterisk-gui.orig/files/patch-scripts-listfiles	Thu May  3 21:23:33 2007
>+++ asterisk-gui/files/patch-scripts-listfiles	Thu May  3 21:22:45 2007
>@@ -1,9 +1,9 @@
>---- scripts/listfiles.orig	Sat Apr 14 02:44:50 2007
>-+++ scripts/listfiles	Sat Apr 14 02:45:19 2007
>+--- scripts/listfiles.orig	Tue May  1 16:16:13 2007
>++++ scripts/listfiles	Tue May  1 16:19:27 2007
> @@ -1,5 +1,5 @@
>  #!/bin/sh
>--. /etc/asterisk/scripts/output_path
>-+. %%PREFIX%%/etc/asterisk/scripts/output_path
>+-SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
>++SYSINFO_OUTPUT="%%PREFIX%%/share/asterisk/static-http/config/sysinfo_output.html"
>  
>- /bin/echo "<div id=list_files>" > $SYSINFO_OUTPUT
>+ #/bin/echo "<div id=list_files>" > $SYSINFO_OUTPUT
>  /bin/mkdir -p $1
>diff -ruN asterisk-gui.orig/files/patch-scripts-output_path asterisk-gui/files/patch-scripts-output_path
>--- asterisk-gui.orig/files/patch-scripts-output_path	Thu May  3 21:23:33 2007
>+++ asterisk-gui/files/patch-scripts-output_path	Wed Dec 31 21:00:00 1969
>@@ -1,7 +0,0 @@
>---- scripts/output_path.bak	Fri Apr 13 16:25:17 2007
>-+++ scripts/output_path	Sat Apr 14 02:48:50 2007
>-@@ -1,3 +1,3 @@
>- 
>--SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
>-+SYSINFO_OUTPUT="%%PREFIX%%/share/asterisk/static-http/config/sysinfo_output.html"
>- 
>diff -ruN asterisk-gui.orig/pkg-plist asterisk-gui/pkg-plist
>--- asterisk-gui.orig/pkg-plist	Thu May  3 21:23:33 2007
>+++ asterisk-gui/pkg-plist	Thu May  3 21:22:46 2007
>@@ -1,32 +1,25 @@
>-etc/asterisk/scripts/graphs.sh
>-etc/asterisk/scripts/gui_sysinfo
>-etc/asterisk/scripts/listfiles
>-etc/asterisk/scripts/output_path
> etc/asterisk/gui_custommenus.conf
>+share/asterisk/scripts/graphs.sh
>+share/asterisk/scripts/gui_sysinfo
>+share/asterisk/scripts/listfiles
> share/asterisk/static-http/config/graphs/graph_cpu.svgz
> share/asterisk/static-http/config/images/1.gif
> share/asterisk/static-http/config/images/accordion-icon.gif
> share/asterisk/static-http/config/images/adv-v.gif
>-share/asterisk/static-http/config/images/adv-v.png
>-share/asterisk/static-http/config/images/adv.png
> share/asterisk/static-http/config/images/digiumlogo.gif
> share/asterisk/static-http/config/images/dots.gif
> share/asterisk/static-http/config/images/favicon.ico
>-share/asterisk/static-http/config/images/home-icon.png
> share/asterisk/static-http/config/images/home.png
> share/asterisk/static-http/config/images/iaxtel.jpg
> share/asterisk/static-http/config/images/loading.gif
> share/asterisk/static-http/config/images/panel.png
> share/asterisk/static-http/config/images/refresh.png
> share/asterisk/static-http/config/images/slice-v.gif
>-share/asterisk/static-http/config/images/slice-v.png
>-share/asterisk/static-http/config/images/slice.png
> share/asterisk/static-http/config/images/split-v.gif
>-share/asterisk/static-http/config/images/split-v.png
>-share/asterisk/static-http/config/images/split.png
> share/asterisk/static-http/config/images/tick.gif
> share/asterisk/static-http/config/images/title_gradient.gif
> share/asterisk/static-http/config/scripts/astman.js
>+share/asterisk/static-http/config/scripts/lang.js
> share/asterisk/static-http/config/scripts/prototype.js
> share/asterisk/static-http/config/scripts/rico.js
> share/asterisk/static-http/config/scripts/tooltip.js
>@@ -77,5 +70,4 @@
> @dirrm share/asterisk/static-http/config/images
> @dirrm share/asterisk/static-http/config/bkps
> @dirrm share/asterisk/static-http/config
>-@dirrm etc/asterisk/scripts
>-@dirrmtry etc/asterisk
>+@dirrm share/asterisk/scripts

Actions: View | Diff

Attachments on bug 111559: 77472 | 77473 | 77474