[Pkg-voip-commits] r3461 - in freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian: . patches

Diego Iastrubni elcuco-guest at alioth.debian.org
Mon Apr 23 10:23:36 UTC 2007 

Author: elcuco-guest
Date: 2007-04-23 10:23:36 +0000 (Mon, 23 Apr 2007)
New Revision: 3461

Added:
   freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/debian-paths.dpatch
Modified:
   freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/changelog
   freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/00list
   freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/sqlite3-support.dpatch
Log:
 * sqlite3 support fixed: submit on the phpagi window works now
 * added new patch, which changes the default paths to be used
 * the original code cerated a file in /tmp and then moved it to /etc/asterisk/
   the new code creates the file directly in /etc/asterisk and renames it in the
   same dir. this works better, since on some machines /tmp/ and /etc/ are on
   different file systems. this will be commited upstream very soon. i will
   probably split this into another patch, to be removed in a next version 
   of this module.



Modified: freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/changelog	2007-04-23 09:51:30 UTC (rev 3460)
+++ freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/changelog	2007-04-23 10:23:36 UTC (rev 3461)
@@ -2,8 +2,9 @@
 
   * SQLite3 support. Fixes upstream
     http://www.freepbx.org/trac/ticket/1779
+  * Fixed paths to match Debian's FSH
 
- -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Wed, 14 Feb 2007 16:43:01 +0200
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Mon, 23 Apr 2007 12:43:01 +0200
 
 freepbx-module-phpagiconf (2.2-1.1-1) unstable; urgency=low
 

Modified: freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/00list
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/00list	2007-04-23 09:51:30 UTC (rev 3460)
+++ freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/00list	2007-04-23 10:23:36 UTC (rev 3461)
@@ -1 +1,3 @@
 sqlite3-support
+debian-paths
+

Added: freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/debian-paths.dpatch
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/debian-paths.dpatch	2007-04-23 09:51:30 UTC (rev 3460)
+++ freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/debian-paths.dpatch	2007-04-23 10:23:36 UTC (rev 3461)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian-paths.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad freepbx-module-phpagiconf~/functions.inc.php freepbx-module-phpagiconf/functions.inc.php
+--- freepbx-module-phpagiconf~/functions.inc.php	2007-04-22 18:31:31.000000000 +0300
++++ freepbx-module-phpagiconf/functions.inc.php	2007-04-22 18:31:31.000000000 +0300
+@@ -3,7 +3,7 @@
+ function phpagiconf_gen_conf() {
+ 	global $active_modules;
+ 
+-	$file = "/tmp/phpagi_".rand().".conf";
++	$file = "/etc/asterisk/phpagi_".rand().".conf";
+ 	$data = phpagiconf_get();
+ 	$content = "[phpagi]\n";
+ 	$content .= "debug=".($data['debug']?'true':'false')."\n";
+diff -urNad freepbx-module-phpagiconf~/page.phpagiconf.php freepbx-module-phpagiconf/page.phpagiconf.php
+--- freepbx-module-phpagiconf~/page.phpagiconf.php	2007-04-02 11:21:33.000000000 +0300
++++ freepbx-module-phpagiconf/page.phpagiconf.php	2007-04-22 18:31:31.000000000 +0300
+@@ -23,10 +23,10 @@
+ $asman_server = isset($_REQUEST['asman_server'])?$_REQUEST['asman_server']:'localhost';
+ $asman_port = isset($_REQUEST['asman_port'])?$_REQUEST['asman_port']:'5038';
+ $asmanager = isset($_REQUEST['asmanager'])?$_REQUEST['asmanager']:''; // This comes from the API module
+-$cepstral_swift = isset($_REQUEST['cepstral_swift'])?$_REQUEST['cepstral_swift']:'/opt/swift/bin/swift';
++$cepstral_swift = isset($_REQUEST['cepstral_swift'])?$_REQUEST['cepstral_swift']:'/usr/bin/swift';
+ $cepstral_voice = isset($_REQUEST['cepstral_voice'])?$_REQUEST['cepstral_voice']:'David';
+ $setuid = isset($_REQUEST['setuid'])?$_REQUEST['setuid']:'0';
+-$basedir = isset($_REQUEST['basedir'])?$_REQUEST['basedir']:'/var/lib/asterisk/agi-bin/';
++$basedir = isset($_REQUEST['basedir'])?$_REQUEST['basedir']:'/usr/share/asterisk/agi-bin/';
+ 
+ $dispnum = "phpagiconf"; //used for switch on config.php
+ 


Property changes on: freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/debian-paths.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/sqlite3-support.dpatch
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/sqlite3-support.dpatch	2007-04-23 09:51:30 UTC (rev 3460)
+++ freepbx/modules-2.2/modules/freepbx-module-phpagiconf/debian/patches/sqlite3-support.dpatch	2007-04-23 10:23:36 UTC (rev 3461)
@@ -4,9 +4,27 @@
 ## DP: SQLite3 support. See http://www.freepbx.org/trac/ticket/1779
 
 @DPATCH@
+diff -urNad freepbx-module-phpagiconf~/functions.inc.php freepbx-module-phpagiconf/functions.inc.php
+--- freepbx-module-phpagiconf~/functions.inc.php	2007-04-02 11:21:33.000000000 +0300
++++ freepbx-module-phpagiconf/functions.inc.php	2007-04-23 12:41:50.000000000 +0300
+@@ -52,7 +52,13 @@
+ 	} else {
+ 		$asmanager = array ($amp_conf['AMPDBUSER'], $amp_conf['AMPDBPASS']);
+ 	}
+-	$results = sql("INSERT INTO phpagiconf SET `debug`=$p_debug, error_handler=$p_error_handler, err_email='$p_err_email', hostname='$p_hostname', tempdir='$p_tempdir', festival_text2wave='$p_festival_text2wave', asman_server='$p_asman_server', asman_port=$p_asman_port, asman_user='".$asmanager[0]."', asman_secret='".$asmanager[1]."', cepstral_swift='$p_cepstral_swift', cepstral_voice='$p_cepstral_voice', setuid=$p_setuid, basedir='$p_basedir'");
++
++	$sql = "INSERT INTO phpagiconf 
++		(debug   ,    error_handler,     err_email,       hostname,      tempdir,      festival_text2wave,      asman_server,    asman_port,          asman_user,        asman_secret,      cepstral_swift,      cepstral_voice, setuid, basedir)
++	VALUES	($p_debug, $p_error_handler, '$p_err_email', '$p_hostname', '$p_tempdir', '$p_festival_text2wave', '$p_asman_server', $p_asman_port, '".$asmanager[0]."', '".$asmanager[1]."', '$p_cepstral_swift', '$p_cepstral_voice', $p_setuid, '$p_basedir')
++	";
++
++	$results = sql($sql);
+ }
+ 
+ ?>
 diff -urNad freepbx-module-phpagiconf~/install.php freepbx-module-phpagiconf/install.php
 --- freepbx-module-phpagiconf~/install.php	1970-01-01 02:00:00.000000000 +0200
-+++ freepbx-module-phpagiconf/install.php	2007-02-14 16:36:47.000000000 +0200
++++ freepbx-module-phpagiconf/install.php	2007-04-23 12:41:18.000000000 +0300
 @@ -0,0 +1,32 @@
 +<?php
 +
@@ -41,14 +59,8 @@
 +
 +?>
 diff -urNad freepbx-module-phpagiconf~/install.sql freepbx-module-phpagiconf/install.sql
---- freepbx-module-phpagiconf~/install.sql	2006-11-04 07:54:23.000000000 +0200
+--- freepbx-module-phpagiconf~/install.sql	2007-04-02 11:21:33.000000000 +0300
 +++ freepbx-module-phpagiconf/install.sql	1970-01-01 02:00:00.000000000 +0200
 @@ -1,2 +0,0 @@
 -CREATE TABLE IF NOT EXISTS `phpagiconf` ( `phpagiid` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , `debug` BOOL , `error_handler` BOOL , `err_email` VARCHAR( 50 ) , `hostname` VARCHAR( 255 ) , `tempdir` VARCHAR( 255 ) , `festival_text2wave` VARCHAR( 255 ) , `asman_server` VARCHAR( 255 ) , `asman_port` INT NOT NULL , `asman_user` VARCHAR( 50 ) , `asman_secret` VARCHAR( 255 ) , `cepstral_swift` VARCHAR( 255 ) , `cepstral_voice` VARCHAR( 50 ) , `setuid` BOOL , `basedir` VARCHAR( 255 ) ) TYPE = MYISAM ;
 -
-diff -urNad freepbx-module-phpagiconf~/uninstall.sql freepbx-module-phpagiconf/uninstall.sql
---- freepbx-module-phpagiconf~/uninstall.sql	2006-11-04 07:54:24.000000000 +0200
-+++ freepbx-module-phpagiconf/uninstall.sql	2007-02-14 16:33:37.000000000 +0200
-@@ -1 +1 @@
--DROP TABLE IF EXISTS `phpagiconf`;
-+DROP TABLE IF EXISTS phpagiconf;

More information about the Pkg-voip-commits mailing list