From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 26 23:20:05 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A89D91065672 for ; Sun, 26 Oct 2008 23:20:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 135018FC31 for ; Sun, 26 Oct 2008 23:20:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QNK4pd066406 for ; Sun, 26 Oct 2008 23:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id m9QNK4fS066405; Sun, 26 Oct 2008 23:20:04 GMT (envelope-from gnats) Resent-Date: Sun, 26 Oct 2008 23:20:04 GMT Resent-Message-Id: <200810262320.m9QNK4fS066405@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Phillip N." Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A629B106566B for ; Sun, 26 Oct 2008 23:11:36 +0000 (UTC) (envelope-from pneumann@gmail.com) Received: from yx-out-2324.google.com (yx-out-2324.google.com [74.125.44.28]) by mx1.freebsd.org (Postfix) with ESMTP id 338D78FC14 for ; Sun, 26 Oct 2008 23:11:35 +0000 (UTC) (envelope-from pneumann@gmail.com) Received: by yx-out-2324.google.com with SMTP id 8so474121yxb.13 for ; Sun, 26 Oct 2008 16:11:35 -0700 (PDT) Received: by 10.90.68.20 with SMTP id q20mr603281aga.99.1225060714438; Sun, 26 Oct 2008 15:38:34 -0700 (PDT) Received: from negro.transtel.cl ([190.196.41.7]) by mx.google.com with ESMTPS id w43sm2557819hsa.7.2008.10.26.15.38.31 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 26 Oct 2008 15:38:33 -0700 (PDT) Message-Id: <1225060710.62979@negro.transtel.cl> Date: Sun, 26 Oct 2008 19:38:30 -0300 From: "Phillip N." To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/128403: [Update] www/asterisk-gui to 2.0.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Oct 2008 23:20:05 -0000 >Number: 128403 >Category: ports >Synopsis: [Update] www/asterisk-gui to 2.0.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Oct 26 23:20:04 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Phillip N. >Release: FreeBSD 7.1-PRERELEASE i386 >Organization: >Environment: System: FreeBSD 7.1-PRERELEASE #0: Sun Oct 12 20:08:35 CLST 2008 root@negro.transtel.cl:/usr/obj/usr/src/sys/NEGRO >Description: Update to version 2.0.3. >How-To-Repeat: >Fix: --- asterisk-gui-2.0.diff begins here --- diff -ruN asterisk-gui.orig/Makefile asterisk-gui/Makefile --- asterisk-gui.orig/Makefile 2008-08-19 20:57:27.000000000 -0400 +++ asterisk-gui/Makefile 2008-10-26 13:24:35.000000000 -0300 @@ -6,16 +6,15 @@ # PORTNAME= asterisk-gui -PORTVERSION= 0.0.1r20070801 -PORTREVISION= 3 +PORTVERSION= 2.0.3 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -DISTNAME= ${PORTNAME}-snap-2007-08-01 +MASTER_SITES= http://downloads.digium.com/pub/telephony/asterisk-gui/releases/ MAINTAINER= pneumann@gmail.com COMMENT= An asterisk ajax web manager -RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk +RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk \ + wget:${PORTSDIR}/ftp/wget PROJECTHOST= asterisk-bsd USE_AUTOTOOLS= autoconf:262 automake:19 @@ -23,18 +22,16 @@ PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message -OPTIONS= SIP_QUEUES "In queues register users as SIP, not Agents" off \ - SAMPLE_CONFIG "Install sample configuration files" off - post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/config/backup.html \ - ${WRKSRC}/config/syslog.html \ - ${WRKSRC}/config/scripts/astman.js \ - ${WRKSRC}/tools/zapscan.c \ - ${WRKSRC}/tools/zapscan \ - ${WRKSRC}/scripts/gui_sysinfo \ - ${WRKSRC}/scripts/listfiles + @${GREP} -Rl '/var/lib' ${WRKSRC} | \ + ${XARGS} ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' + @${GREP} -Rl '/etc' ${WRKSRC} | \ + ${XARGS} ${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' + @${GREP} -Rl '/bin/grep' ${WRKSRC} | \ + ${XARGS} ${REINPLACE_CMD} -e 's|/bin/grep|grep|g' + @${GREP} -Rl 'bash' ${WRKSRC} | \ + ${XARGS} ${REINPLACE_CMD} -e 's|bash|sh|g' + @${FIND} ${WRKSRC} -name "*.orig" -o -name "*.bak" | ${XARGS} ${RM} run-autotools: @@ -45,14 +42,7 @@ .include -.if defined(WITH_SIP_QUEUES) -EXTRA_PATCHES+= ${FILESDIR}/extra-config-queues.html -.endif - post-install: -.if defined(WITH_SAMPLE_CONFIG) - @cd ${WRKSRC} && ${GMAKE} samples -.endif - @${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} .include diff -ruN asterisk-gui.orig/distinfo asterisk-gui/distinfo --- asterisk-gui.orig/distinfo 2007-08-11 05:42:40.000000000 -0400 +++ asterisk-gui/distinfo 2008-10-26 13:24:45.000000000 -0300 @@ -1,3 +1,3 @@ -MD5 (asterisk-gui-snap-2007-08-01.tar.gz) = cb2565b344fdb80f86b16853f413a0a3 -SHA256 (asterisk-gui-snap-2007-08-01.tar.gz) = ea5b04f2430fe79a9809d0a98bd3f1c909a69ca5856f75d412bfcc936882984b -SIZE (asterisk-gui-snap-2007-08-01.tar.gz) = 317986 +MD5 (asterisk-gui-2.0.3.tar.gz) = 5fc9b90df223475e0ec4b9af6f33a482 +SHA256 (asterisk-gui-2.0.3.tar.gz) = b7a64b5089d30b436c771a03e3971e94ea68fe071bca2d206df635549842c738 +SIZE (asterisk-gui-2.0.3.tar.gz) = 588350 diff -ruN asterisk-gui.orig/files/extra-config-queues.html asterisk-gui/files/extra-config-queues.html --- asterisk-gui.orig/files/extra-config-queues.html 2007-06-28 22:17:00.000000000 -0400 +++ asterisk-gui/files/extra-config-queues.html 1969-12-31 21:00:00.000000000 -0300 @@ -1,29 +0,0 @@ ---- config/queues.html.orig Thu Jun 28 14:58:19 2007 -+++ config/queues.html Thu Jun 28 14:59:20 2007 -@@ -171,7 +171,7 @@ - for(k=0; k<$('agents').length; k++){ - selectedagent = "selectedagent" + k; - if( $(selectedagent).checked ){ -- uri += build_action('append', p, $('name').value,"member", "Agent/"+$(selectedagent).value); -+ uri += build_action('append', p, $('name').value,"member", "SIP/"+$(selectedagent).value); - p = p+1; - } - } -@@ -338,7 +338,7 @@ - queuenames[j] = t.name; - return t.name + " -- Queue '" + t.fieldbyname['fullname'] + "'"; - }else if(InArray(extensions_conf_qs, t.name)) { // if is a subcategory -- tmp = t.fields[x].split ('Agent/'); -+ tmp = t.fields[x].split ('SIP/'); - if(t.names[x] == 'member' && tmp.length > 1){ - queueagents [j] [k] = tmp[1]; - k = k+1; -@@ -435,7 +435,7 @@ - - - -- Agents: -+ Users: - -
- 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 2007-06-03 16:04:19.000000000 -0400 +++ asterisk-gui/files/patch-config-backup.html 1969-12-31 21:00:00.000000000 -0300 @@ -1,29 +0,0 @@ ---- 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/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); - } - -@@ -131,7 +131,7 @@ - - function delete_bkp( filename ){ - if(!confirm("Delete selected Backup Configuration ?")){ return ; } -- parent.astmanEngine.run_tool("/bin/rm -f "+ asterisk_ConfigBkpPath + filename , callback=function(){ -+ parent.astmanEngine.run_tool("rm -f "+ asterisk_ConfigBkpPath + filename , callback=function(){ - gui_feedback('Delete Request Successfull !','default'); - window.location.href = window.location.href ; - }); -@@ -177,7 +177,7 @@ - //var seconds =addzero(today.getSeconds()); - var bkpfile = _nn.value +"__" + year + month + day +".tar"; - -- parent.astmanEngine.run_tool("/bin/tar -cf "+ asterisk_ConfigBkpPath + bkpfile + " " + asterisk_configfolder, callback=function(){ -+ parent.astmanEngine.run_tool("tar -cf "+ asterisk_ConfigBkpPath + bkpfile + " " + asterisk_configfolder, callback=function(){ - gui_feedback('Backup Successfull!','blue'); - window.location.href = window.location.href ; - } 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 2007-06-03 16:04:19.000000000 -0400 +++ asterisk-gui/files/patch-config-scripts-astman.js 1969-12-31 21:00:00.000000000 -0300 @@ -1,35 +0,0 @@ ---- 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: 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_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 " + asterisk_scriptsFolder + "gui_sysinfo" ; - var asterisk_guiSysInfo_output = "./sysinfo_output.html"; --var asterisk_guiZapscan = "/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_configfolder = asterisk_prefix + "etc/asterisk/"; - var asterisk_guiListFiles = "sh " + asterisk_scriptsFolder + "listfiles" ; - - var sortbynames = false; -@@ -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("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-config-sysinfo.html asterisk-gui/files/patch-config-sysinfo.html --- asterisk-gui.orig/files/patch-config-sysinfo.html 1969-12-31 21:00:00.000000000 -0300 +++ asterisk-gui/files/patch-config-sysinfo.html 2008-09-28 20:34:19.000000000 -0400 @@ -0,0 +1,11 @@ +--- config/sysinfo.html.orig 2008-09-28 20:33:25.000000000 -0400 ++++ config/sysinfo.html 2008-09-28 20:33:46.000000000 -0400 +@@ -114,7 +114,7 @@ + desc: 'Memory Usage', + click_function: function(){ + $('.hideall').hide(); +- ASTGUI.systemCmdWithOutput( 'free' , function(free){ ++ ASTGUI.systemCmdWithOutput( 'vmstat' , function(free){ + _$('memoryusage').innerHTML = '
' + free +'
'; + $('.hideall').hide(); + $('#memory_div').show(); diff -ruN asterisk-gui.orig/files/patch-config-syslog.html asterisk-gui/files/patch-config-syslog.html --- asterisk-gui.orig/files/patch-config-syslog.html 2007-06-04 03:39:45.000000000 -0400 +++ asterisk-gui/files/patch-config-syslog.html 1969-12-31 21:00:00.000000000 -0300 @@ -1,13 +0,0 @@ ---- config/syslog.html.orig Mon May 14 19:21:38 2007 -+++ config/syslog.html Mon May 14 19:27:37 2007 -@@ -31,8 +31,8 @@ - _$('status_message').style.display = "" ; - var _ld = _$('log_day').value; - if( _ld < 10 ){ var space = " "; }else{ var space = " "; } -- var tmp_command = "/bin/grep /var/log/asterisk/messages -e '" + _$('log_month').value + space + _ld -- + " ' > /var/lib/asterisk/static-http/config/today_log.html" ; -+ var tmp_command = "grep /var/log/asterisk/messages -e '" + _$('log_month').value + space + _ld -+ + " ' > %%PREFIX%%/share/asterisk/static-http/config/today_log.html" ; - parent.astmanEngine.run_tool( tmp_command , onSuccess = function() { _$('status_message').style.display='none'; load_todayslog(); } ); - } - 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 2007-06-03 16:04:19.000000000 -0400 +++ asterisk-gui/files/patch-scripts-gui_sysinfo 1969-12-31 21:00:00.000000000 -0300 @@ -1,42 +0,0 @@ ---- 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 "
$UPTIME
" >> $SYSINFO_OUTPUT - --ASTERISK="`/usr/sbin/asterisk -V`" -+ASTERISK="`%%PREFIX%%/sbin/asterisk -V`" - /bin/echo "
$ASTERISK
" >> $SYSINFO_OUTPUT - - TODAY="`date`" - /bin/echo "
$TODAY
" >> $SYSINFO_OUTPUT - --HOSTNAME="`hostname -f`" -+HOSTNAME="`hostname`" - /bin/echo "
$HOSTNAME
" >> $SYSINFO_OUTPUT - - IFCONFIG=`ifconfig` -@@ -24,14 +24,14 @@ - DISKUSAGE=`df -h` - /bin/echo "
$DISKUSAGE
" >> $SYSINFO_OUTPUT - --MEMORYUSAGE=`free` -+MEMORYUSAGE=`vmstat` - /bin/echo "
$MEMORYUSAGE
" >> $SYSINFO_OUTPUT - - - THISMONTH=`/bin/date +%b` - THISDAY=`/bin/date +%d` - THIS_DAY=`/bin/date +%_d` --/bin/grep /var/log/asterisk/messages -e "$THISMONTH\( $THISDAY\| $THIS_DAY\)" > /var/lib/asterisk/static-http/config/today_log.html -+grep /var/log/asterisk/messages -e "$THISMONTH\( $THISDAY\| $THIS_DAY\)" > %%PREFIX%%/share/asterisk/static-http/config/today_log.html - - #/bin/echo "
" >> $SYSINFO_OUTPUT - #/bin/mkdir -p /var/lib/asterisk/gui_configbackups diff -ruN asterisk-gui.orig/files/patch-scripts-listfiles asterisk-gui/files/patch-scripts-listfiles --- asterisk-gui.orig/files/patch-scripts-listfiles 2007-06-03 16:04:19.000000000 -0400 +++ asterisk-gui/files/patch-scripts-listfiles 1969-12-31 21:00:00.000000000 -0300 @@ -1,9 +0,0 @@ ---- 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 --SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html" -+SYSINFO_OUTPUT="%%PREFIX%%/share/asterisk/static-http/config/sysinfo_output.html" - - #/bin/echo "
" > $SYSINFO_OUTPUT - /bin/mkdir -p $1 diff -ruN asterisk-gui.orig/files/patch-tools-Makefile asterisk-gui/files/patch-tools-Makefile --- asterisk-gui.orig/files/patch-tools-Makefile 2007-06-04 03:39:45.000000000 -0400 +++ asterisk-gui/files/patch-tools-Makefile 1969-12-31 21:00:00.000000000 -0300 @@ -1,14 +0,0 @@ ---- tools/Makefile.orig Wed May 9 21:32:43 2007 -+++ tools/Makefile Wed May 9 21:33:17 2007 -@@ -25,9 +25,9 @@ - ifeq ($(PBX_ZAPTEL),1) - mkdir -p $(ASTSBINDIR) - $(INSTALL) -m 755 zapscan.bin $(ASTSBINDIR) -- $(INSTALL) -m 755 zapscan.bin /sbin -+ $(INSTALL) -m 755 zapscan.bin $(ASTSBINDIR)/../sbin - $(INSTALL) -m 755 zapscan $(ASTSBINDIR) -- $(INSTALL) -m 755 zapscan /sbin -+ $(INSTALL) -m 755 zapscan $(ASTSBINDIR)/../sbin - endif - - clean: diff -ruN asterisk-gui.orig/files/patch-tools-zapscan asterisk-gui/files/patch-tools-zapscan --- asterisk-gui.orig/files/patch-tools-zapscan 2007-06-03 16:04:19.000000000 -0400 +++ asterisk-gui/files/patch-tools-zapscan 1969-12-31 21:00:00.000000000 -0300 @@ -1,22 +0,0 @@ ---- ./tools/zapscan.orig Thu Dec 21 18:25:26 2006 -+++ ./tools/zapscan Sat Mar 31 17:54:39 2007 -@@ -1,12 +1,12 @@ - #!/bin/sh --if [ -f /etc/zaptel.conf.zapscan ] && [ -f /etc/asterisk/zapata.conf.zapscan ]; then -- rm -f /etc/zaptel.conf -- rm -f /etc/asterisk/zapata.conf -- ( echo "# Created by zapscan -- edit zaptel.conf.zapscan instead" ; cat /etc/zaptel.conf.zapscan ) > /etc/zaptel.conf -- ( echo "; Created by zapscan -- edit zapata.conf.zapscan instead" ; cat /etc/asterisk/zapata.conf.zapscan ) > /etc/asterisk/zapata.conf -- rm -f /etc/asterisk/zapscan.conf -+if [ -f %%PREFIX%%/etc/zaptel.conf.zapscan ] && [ -f %%PREFIX%%/etc/asterisk/zapata.conf.zapscan ]; then -+ rm -f %%PREFIX%%/etc/zaptel.conf -+ rm -f %%PREFIX%%/etc/asterisk/zapata.conf -+ ( echo "# Created by zapscan -- edit zaptel.conf.zapscan instead" ; cat %%PREFIX%%/etc/zaptel.conf.zapscan ) > %%PREFIX%%/etc/zaptel.conf -+ ( echo "; Created by zapscan -- edit zapata.conf.zapscan instead" ; cat %%PREFIX%%/etc/asterisk/zapata.conf.zapscan ) > %%PREFIX%%/etc/asterisk/zapata.conf -+ rm -f %%PREFIX%%/etc/asterisk/zapscan.conf - echo -n "Scanning for zaptel devices..." -- if /sbin/zapscan.bin; then -+ if %%PREFIX%%/sbin/zapscan.bin; then - echo "OK" - else - echo "Failed!" diff -ruN asterisk-gui.orig/files/patch-tools-zapscan.c asterisk-gui/files/patch-tools-zapscan.c --- asterisk-gui.orig/files/patch-tools-zapscan.c 2007-06-03 16:04:19.000000000 -0400 +++ asterisk-gui/files/patch-tools-zapscan.c 1969-12-31 21:00:00.000000000 -0300 @@ -1,15 +0,0 @@ ---- ./tools/zapscan.c.orig Fri Nov 3 01:48:08 2006 -+++ ./tools/zapscan.c Sat Mar 31 17:54:39 2007 -@@ -37,9 +37,9 @@ - int oldsig=-1; - int fd = open("/dev/zap/ctl", O_RDWR); - struct zt_params ztp; -- FILE *zdc = fopen("/etc/zaptel.conf", "a"); -- FILE *zsc = fopen("/etc/asterisk/zapscan.conf", "w"); -- FILE *zap = fopen("/etc/asterisk/zapata.conf", "a"); -+ FILE *zdc = fopen("%%PREFIX%%/etc/zaptel.conf", "a"); -+ FILE *zsc = fopen("%%PREFIX%%/etc/asterisk/zapscan.conf", "w"); -+ FILE *zap = fopen("%%PREFIX%%/etc/asterisk/zapata.conf", "a"); - if (fd < 0) { - fprintf(stderr, "Failed to open /dev/zap/ctl: %s\n", strerror(errno)); - exit(1); diff -ruN asterisk-gui.orig/files/pkg-message.in asterisk-gui/files/pkg-message.in --- asterisk-gui.orig/files/pkg-message.in 2007-06-03 16:04:19.000000000 -0400 +++ asterisk-gui/files/pkg-message.in 2008-09-28 19:31:24.000000000 -0400 @@ -9,8 +9,8 @@ * Asterisk is running * manager.conf has 'write' uncommented -You should be able to access the setup process in: -http://localhost:8088/asterisk/static/config/setup/install.html +You should be able to access the web gui in: +http://localhost:8088/asterisk/static/config/index.html Good luck! diff -ruN asterisk-gui.orig/pkg-plist asterisk-gui/pkg-plist --- asterisk-gui.orig/pkg-plist 2007-08-11 05:42:40.000000000 -0400 +++ asterisk-gui/pkg-plist 2008-10-26 13:09:47.000000000 -0300 @@ -1,82 +1,128 @@ -etc/asterisk/gui_custommenus.conf -share/asterisk/scripts/graphs.sh +share/asterisk/scripts/dldsoundpack +share/asterisk/scripts/editmisdn.sh +share/asterisk/scripts/editzap.sh share/asterisk/scripts/gui_sysinfo share/asterisk/scripts/listfiles share/asterisk/scripts/mastercsvexists +share/asterisk/scripts/restorebackup +share/asterisk/scripts/takebackup +share/asterisk/static-http/config/asterisklogs.html +share/asterisk/static-http/config/backup.html +share/asterisk/static-http/config/bulkadd.html share/asterisk/static-http/config/cdr.html -share/asterisk/static-http/config/cdr_conf.html -share/asterisk/static-http/config/graphs/graph_cpu.svgz +share/asterisk/static-http/config/callingrules.html +share/asterisk/static-http/config/cfgbasic.html +share/asterisk/static-http/config/cli.html +share/asterisk/static-http/config/date.html +share/asterisk/static-http/config/dialplans.html +share/asterisk/static-http/config/digital.html +share/asterisk/static-http/config/directory.html +share/asterisk/static-http/config/emailsettings.html +share/asterisk/static-http/config/features.html +share/asterisk/static-http/config/feditor.html +share/asterisk/static-http/config/flashupdate.html +share/asterisk/static-http/config/flipadvanced.html +share/asterisk/static-http/config/followme.html +share/asterisk/static-http/config/guialert.html +share/asterisk/static-http/config/hardware.html +share/asterisk/static-http/config/hardware_aa50.html +share/asterisk/static-http/config/home.html +share/asterisk/static-http/config/iax.html share/asterisk/static-http/config/images/1.gif +share/asterisk/static-http/config/images/aa50.png share/asterisk/static-http/config/images/accordion-icon.gif +share/asterisk/static-http/config/images/add.gif share/asterisk/static-http/config/images/adv-v.gif +share/asterisk/static-http/config/images/agent_loggedin.png +share/asterisk/static-http/config/images/agent_loggedout.png +share/asterisk/static-http/config/images/ar_down.png +share/asterisk/static-http/config/images/ar_right.png +share/asterisk/static-http/config/images/arrow_blank.png +share/asterisk/static-http/config/images/arrow_down.png +share/asterisk/static-http/config/images/arrow_up.png +share/asterisk/static-http/config/images/asterisk-arrow-down.png +share/asterisk/static-http/config/images/asterisk-arrow-up.png +share/asterisk/static-http/config/images/asterisk_green.gif +share/asterisk/static-http/config/images/asterisk_red.gif +share/asterisk/static-http/config/images/bandwidth.gif +share/asterisk/static-http/config/images/cancel.gif +share/asterisk/static-http/config/images/checkbox_blank.gif +share/asterisk/static-http/config/images/delete.gif +share/asterisk/static-http/config/images/delete_circle.png share/asterisk/static-http/config/images/digiumlogo.gif share/asterisk/static-http/config/images/dots.gif +share/asterisk/static-http/config/images/down_arr.gif +share/asterisk/static-http/config/images/edit.gif share/asterisk/static-http/config/images/favicon.ico 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/ngt.jpg share/asterisk/static-http/config/images/panel.png share/asterisk/static-http/config/images/refresh.png +share/asterisk/static-http/config/images/simplesignal.jpg share/asterisk/static-http/config/images/slice-v.gif share/asterisk/static-http/config/images/split-v.gif +share/asterisk/static-http/config/images/status_blue.png +share/asterisk/static-http/config/images/status_gray.png +share/asterisk/static-http/config/images/status_green.png +share/asterisk/static-http/config/images/status_orange.png +share/asterisk/static-http/config/images/status_red.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 -share/asterisk/static-http/config/stylesheets/schwing.css -share/asterisk/static-http/config/setup/1.html -share/asterisk/static-http/config/setup/10.html -share/asterisk/static-http/config/setup/2.html -share/asterisk/static-http/config/setup/3.html -share/asterisk/static-http/config/setup/4.html -share/asterisk/static-http/config/setup/5.html -share/asterisk/static-http/config/setup/6.html -share/asterisk/static-http/config/setup/7.html -share/asterisk/static-http/config/setup/8.html -share/asterisk/static-http/config/setup/digiumlogo.gif -share/asterisk/static-http/config/setup/install.html -share/asterisk/static-http/config/setup/setup.css -share/asterisk/static-http/config/setup/template.html -share/asterisk/static-http/config/backup.html -share/asterisk/static-http/config/cfgbasic.html -share/asterisk/static-http/config/cli.html -share/asterisk/static-http/config/callparking.html -share/asterisk/static-http/config/emailsettings.html -share/asterisk/static-http/config/feditor.html -share/asterisk/static-http/config/guialert.html -share/asterisk/static-http/config/graphs.html -share/asterisk/static-http/config/home.html -share/asterisk/static-http/config/http_options.html -share/asterisk/static-http/config/iax.html +share/asterisk/static-http/config/images/tooltip_info.gif +share/asterisk/static-http/config/images/voicepulse.gif share/asterisk/static-http/config/incoming.html -share/asterisk/static-http/config/jabber.html -share/asterisk/static-http/config/jingle.html -share/asterisk/static-http/config/localexts.html +share/asterisk/static-http/config/index.html +share/asterisk/static-http/config/js/astman.js +share/asterisk/static-http/config/js/guiversion.js +share/asterisk/static-http/config/js/index.js +share/asterisk/static-http/config/js/jquery.date_input.js +share/asterisk/static-http/config/js/jquery.js +share/asterisk/static-http/config/js/jquery.tooltip.js +share/asterisk/static-http/config/js/pbx.js +share/asterisk/static-http/config/js/tooltip.js +share/asterisk/static-http/config/language.html share/asterisk/static-http/config/meetme.html +share/asterisk/static-http/config/menuprompts_record.html +share/asterisk/static-http/config/menuprompts_upload.html share/asterisk/static-http/config/menus.html -share/asterisk/static-http/config/moh.html -share/asterisk/static-http/config/numberplan.html -share/asterisk/static-http/config/options.html +share/asterisk/static-http/config/misdn.html +share/asterisk/static-http/config/mohfiles.html +share/asterisk/static-http/config/networking.html +share/asterisk/static-http/config/password.html +share/asterisk/static-http/config/preferences.html share/asterisk/static-http/config/queues.html -share/asterisk/static-http/config/record.html +share/asterisk/static-http/config/reboot.html +share/asterisk/static-http/config/reset_defaults.html share/asterisk/static-http/config/ringgroups.html share/asterisk/static-http/config/sip.html +share/asterisk/static-http/config/smtp_settings.html share/asterisk/static-http/config/status.html +share/asterisk/static-http/config/stylesheets/cfgbasic.css +share/asterisk/static-http/config/stylesheets/schwing.css share/asterisk/static-http/config/sysinfo.html -share/asterisk/static-http/config/syslog.html -share/asterisk/static-http/config/timerules.html -share/asterisk/static-http/config/trunks.html +share/asterisk/static-http/config/timeintervals.html +share/asterisk/static-http/config/timezone.html +share/asterisk/static-http/config/trunks_analog.html +share/asterisk/static-http/config/trunks_digital.html +share/asterisk/static-http/config/trunks_providers.html +share/asterisk/static-http/config/trunks_sps.html +share/asterisk/static-http/config/trunks_voip.html +share/asterisk/static-http/config/upload2.html +share/asterisk/static-http/config/upload_abe_overlay.html +share/asterisk/static-http/config/upload_form.html share/asterisk/static-http/config/users.html +share/asterisk/static-http/config/vmgroups.html share/asterisk/static-http/config/voicemail.html -share/asterisk/static-http/config/zapata.html +share/asterisk/static-http/config/welcome.html +share/asterisk/static-http/index.html @dirrm share/asterisk/static-http/config/stylesheets -@dirrm share/asterisk/static-http/config/setup -@dirrm share/asterisk/static-http/config/scripts -@dirrm share/asterisk/static-http/config/graphs +@dirrm share/asterisk/static-http/config/private/bkps +@dirrm share/asterisk/static-http/config/private +@dirrm share/asterisk/static-http/config/js @dirrm share/asterisk/static-http/config/images -@dirrm share/asterisk/static-http/config/bkps -@dirrm share/asterisk/static-http/config +@dirrmtry share/asterisk/static-http/config +@dirrmtry share/asterisk/static-http @dirrm share/asterisk/scripts +@dirrmtry share/asterisk/gui_backups --- asterisk-gui-2.0.diff ends here --- --- UPDATING.diff begins here --- --- UPDATING.orig 2008-10-26 13:14:31.000000000 -0300 +++ UPDATING 2008-10-26 13:23:06.000000000 -0300 @@ -6,6 +6,14 @@ time you update your ports collection, before attempting any port upgrades. +20081026: + AFFECTS: users of www/asterisk-gui + AUTHOR: pneumann@gmail.com + + The upgrade to version 2.0 will modify your asterisk dialplan when login + to the page. Hardware autodetection will not work, pending update of + misc/zaptel. + 20080926: AFFECTS: users of www/squid30 AUTHOR: tmseck@netcologne.de --- UPDATING.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: