[Pkg-voip-commits] r3519 - in freepbx/trunk/debian: . patches
Diego Iastrubni
elcuco-guest at alioth.debian.org
Tue May 8 10:41:36 UTC 2007
Author: elcuco-guest
Date: 2007-05-08 10:41:34 +0000 (Tue, 08 May 2007)
New Revision: 3519
Modified:
freepbx/trunk/debian/control
freepbx/trunk/debian/patches/add-sqlite3-support.dpatch
freepbx/trunk/debian/patches/fix-open-or-die.dpatch
Log:
* fix sqlite3 support. the patch is borked under php4, see upstream http://www.freepbx.org/trac/changeset/3965
* depend on php-curl, as some parts of the gui needs them
* fix-open-or-dir was commited upstream, commneted that this should be removed for next version
Modified: freepbx/trunk/debian/control
===================================================================
--- freepbx/trunk/debian/control 2007-05-08 08:31:27 UTC (rev 3518)
+++ freepbx/trunk/debian/control 2007-05-08 10:41:34 UTC (rev 3519)
@@ -99,7 +99,7 @@
Architecture: all
Replaces: amportal-common, freepbx-module-core
Conflicts: amportal-common
-Depends: adduser, asterisk-config-freepbx, freepbx-database|freepbx-mysql, asterisk(>= 1.2), apache2|apache|httpd-cgi, libapache2-mod-php5|libapache2-mod-php4|libapache-mod-php4|php5-cgi|php4-cgi, php-db|php4-pear(<< 4:4.4.0-0), php5-cli|php4-cli, php5-pear|php-pear|php4-pear, libdbi-perl
+Depends: adduser, asterisk-config-freepbx, freepbx-database|freepbx-mysql, asterisk(>= 1.2), apache2|apache|httpd-cgi, libapache2-mod-php5|libapache2-mod-php4|libapache-mod-php4|php5-cgi|php4-cgi, php-db|php4-pear(<< 4:4.4.0-0), php5-cli|php4-cli, php5-pear|php-pear|php4-pear, php-curl|php5-curl|php4-curl, libdbi-perl
Description: FreePBX administration panel
FreePBX (formally AMP) is a web-based GUI for Asterisk.
This package contains the common files needed for freepbx, as well as the
Modified: freepbx/trunk/debian/patches/add-sqlite3-support.dpatch
===================================================================
--- freepbx/trunk/debian/patches/add-sqlite3-support.dpatch 2007-05-08 08:31:27 UTC (rev 3518)
+++ freepbx/trunk/debian/patches/add-sqlite3-support.dpatch 2007-05-08 10:41:34 UTC (rev 3519)
@@ -1,13 +1,13 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## add-sqlite3-support.dpatch by <diegolocal at localhost.localdomain>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Add sqlite3 support for freePBX. Note that most (if not) all this patch
+## DP: is commited usptream, and should be part of freePBX 2.2.2 or 2.2.3
@DPATCH@
diff -urNad upstream~/amp_conf/bin/retrieve_conf upstream/amp_conf/bin/retrieve_conf
---- upstream~/amp_conf/bin/retrieve_conf 2007-05-06 12:40:11.000000000 +0300
-+++ upstream/amp_conf/bin/retrieve_conf 2007-05-06 12:40:11.000000000 +0300
+--- upstream~/amp_conf/bin/retrieve_conf 2007-05-08 13:34:28.000000000 +0300
++++ upstream/amp_conf/bin/retrieve_conf 2007-05-08 13:34:28.000000000 +0300
@@ -223,6 +223,18 @@
$db->connect( $DSN );
break;
@@ -28,8 +28,8 @@
die( "Unknown SQL engine: [$db_engine]");
}
diff -urNad upstream~/amp_conf/bin/retrieve_iax_conf_from_mysql.pl upstream/amp_conf/bin/retrieve_iax_conf_from_mysql.pl
---- upstream~/amp_conf/bin/retrieve_iax_conf_from_mysql.pl 2007-05-06 12:40:11.000000000 +0300
-+++ upstream/amp_conf/bin/retrieve_iax_conf_from_mysql.pl 2007-05-06 12:40:11.000000000 +0300
+--- upstream~/amp_conf/bin/retrieve_iax_conf_from_mysql.pl 2007-05-08 13:34:27.000000000 +0300
++++ upstream/amp_conf/bin/retrieve_iax_conf_from_mysql.pl 2007-05-08 13:34:28.000000000 +0300
@@ -60,6 +60,15 @@
my $db_file = $ampconf->{"AMPDBFILE"};
$dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
@@ -47,8 +47,8 @@
# Load the 'register' lines into iax_registrations.conf
diff -urNad upstream~/amp_conf/bin/retrieve_op_conf_from_mysql.pl upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl
---- upstream~/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2007-05-06 12:40:11.000000000 +0300
-+++ upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2007-05-06 12:40:11.000000000 +0300
+--- upstream~/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2007-05-08 13:34:28.000000000 +0300
++++ upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2007-05-08 13:34:28.000000000 +0300
@@ -178,6 +178,15 @@
my $db_file = $ampconf->{"AMPDBFILE"};
$dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
@@ -66,8 +66,8 @@
open( EXTEN, ">$op_conf" ) or die "Cannot create/overwrite config file: $op_conf ($!)\n";
print EXTEN $warning_banner;
diff -urNad upstream~/amp_conf/bin/retrieve_queues_conf_from_mysql.pl upstream/amp_conf/bin/retrieve_queues_conf_from_mysql.pl
---- upstream~/amp_conf/bin/retrieve_queues_conf_from_mysql.pl 2007-05-06 12:40:11.000000000 +0300
-+++ upstream/amp_conf/bin/retrieve_queues_conf_from_mysql.pl 2007-05-06 12:40:30.000000000 +0300
+--- upstream~/amp_conf/bin/retrieve_queues_conf_from_mysql.pl 2007-05-08 13:34:27.000000000 +0300
++++ upstream/amp_conf/bin/retrieve_queues_conf_from_mysql.pl 2007-05-08 13:34:28.000000000 +0300
@@ -56,8 +56,18 @@
my $db_file = $ampconf->{"AMPDBFILE"};
$dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
@@ -89,8 +89,8 @@
unless ($result) {
# check for errors after every single database call
diff -urNad upstream~/amp_conf/bin/retrieve_sip_conf_from_mysql.pl upstream/amp_conf/bin/retrieve_sip_conf_from_mysql.pl
---- upstream~/amp_conf/bin/retrieve_sip_conf_from_mysql.pl 2007-05-06 12:40:11.000000000 +0300
-+++ upstream/amp_conf/bin/retrieve_sip_conf_from_mysql.pl 2007-05-06 12:40:11.000000000 +0300
+--- upstream~/amp_conf/bin/retrieve_sip_conf_from_mysql.pl 2007-05-08 13:34:27.000000000 +0300
++++ upstream/amp_conf/bin/retrieve_sip_conf_from_mysql.pl 2007-05-08 13:34:28.000000000 +0300
@@ -60,6 +60,15 @@
my $db_file = $ampconf->{"AMPDBFILE"};
$dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
@@ -108,8 +108,8 @@
$statement = "SELECT keyword,data from $table_name where id=-1 and keyword <> 'account' and flags <> 1";
my $result = $dbh->selectall_arrayref($statement);
diff -urNad upstream~/amp_conf/bin/retrieve_zap_conf_from_mysql.pl upstream/amp_conf/bin/retrieve_zap_conf_from_mysql.pl
---- upstream~/amp_conf/bin/retrieve_zap_conf_from_mysql.pl 2007-05-06 12:40:11.000000000 +0300
-+++ upstream/amp_conf/bin/retrieve_zap_conf_from_mysql.pl 2007-05-06 12:40:11.000000000 +0300
+--- upstream~/amp_conf/bin/retrieve_zap_conf_from_mysql.pl 2007-05-08 13:34:27.000000000 +0300
++++ upstream/amp_conf/bin/retrieve_zap_conf_from_mysql.pl 2007-05-08 13:34:28.000000000 +0300
@@ -61,6 +61,15 @@
my $db_file = $ampconf->{"AMPDBFILE"};
$dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
@@ -128,7 +128,7 @@
my $result = $dbh->selectall_arrayref($statement);
diff -urNad upstream~/amp_conf/htdocs/admin/common/db_connect.php upstream/amp_conf/htdocs/admin/common/db_connect.php
--- upstream~/amp_conf/htdocs/admin/common/db_connect.php 2006-06-25 13:37:15.000000000 +0300
-+++ upstream/amp_conf/htdocs/admin/common/db_connect.php 2007-05-06 12:40:11.000000000 +0300
++++ upstream/amp_conf/htdocs/admin/common/db_connect.php 2007-05-08 13:34:28.000000000 +0300
@@ -49,6 +49,18 @@
$db->connect( $DSN );
break;
@@ -150,7 +150,7 @@
}
diff -urNad upstream~/amp_conf/htdocs/admin/modules/core/functions.inc.php upstream/amp_conf/htdocs/admin/modules/core/functions.inc.php
--- upstream~/amp_conf/htdocs/admin/modules/core/functions.inc.php 2007-01-25 09:14:53.000000000 +0200
-+++ upstream/amp_conf/htdocs/admin/modules/core/functions.inc.php 2007-05-06 12:40:11.000000000 +0300
++++ upstream/amp_conf/htdocs/admin/modules/core/functions.inc.php 2007-05-08 13:38:04.000000000 +0300
@@ -1417,11 +1417,11 @@
global $db;
global $amp_conf;
@@ -203,10 +203,10 @@
+ // this in php. I am not sure why "6" and not "7"
+ // but I don't really care -> it works :)
$results = sql("SELECT DISTINCT context FROM extensions WHERE context LIKE 'outrt-%' ORDER BY context ","getAll");
-+ foreach( $results as &$tmp )
-+ {
-+ $tmp[0] = substr( $tmp[0], 6);
-+ }
++ foreach( array_keys($results) as $idx )
++ {
++ $results[$idx][0] = substr( $results[$idx][0], 6);
++ }
}
else
{
@@ -242,8 +242,8 @@
}
diff -urNad upstream~/install_amp upstream/install_amp
---- upstream~/install_amp 2007-05-06 12:40:11.000000000 +0300
-+++ upstream/install_amp 2007-05-06 12:40:11.000000000 +0300
+--- upstream~/install_amp 2007-05-08 13:34:28.000000000 +0300
++++ upstream/install_amp 2007-05-08 13:34:28.000000000 +0300
@@ -425,7 +425,8 @@
if ( (strtolower(substr($file,-4)) == ".sqlite") && ($db_engine == "sqlite") ) {
install_sqlupdate( $version, $file );
Modified: freepbx/trunk/debian/patches/fix-open-or-die.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-open-or-die.dpatch 2007-05-08 08:31:27 UTC (rev 3518)
+++ freepbx/trunk/debian/patches/fix-open-or-die.dpatch 2007-05-08 10:41:34 UTC (rev 3519)
@@ -1,7 +1,7 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix-open-or-die.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
##
-## DP: Fix some perl syntax issues.
+## DP: Fix some perl syntax issues. Commited upstream at r3963, to be removed for 2.2.2 or 2.3.0
@DPATCH@
diff -urNad freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_iax_conf_from_mysql.pl freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_iax_conf_from_mysql.pl
More information about the Pkg-voip-commits
mailing list