[Pkg-voip-commits] r3135 - in freepbx/trunk/debian: . patches
Diego Iastrubni
elcuco-guest at alioth.debian.org
Mon Feb 12 15:01:19 CET 2007
Author: elcuco-guest
Date: 2007-02-12 15:01:18 +0100 (Mon, 12 Feb 2007)
New Revision: 3135
Modified:
freepbx/trunk/debian/control
freepbx/trunk/debian/freepbx-admin.postinst
freepbx/trunk/debian/patches/add-sqlite3-support.dpatch
freepbx/trunk/debian/patches/use-conf-defaults.dpatch
Log:
- since Chris is toying with this code, lets add him to the uploaders (he has an @debian.org, while I only have an @kde.org, he wins)
- updated the sqlite3 patch, works better now
- the use-conf-defaults patch has been commited upstream and will be part of freepbx 2.2.2, remember to remove that patch by then
- fix the "chown" lintian warning
Modified: freepbx/trunk/debian/control
===================================================================
--- freepbx/trunk/debian/control 2007-02-12 08:30:24 UTC (rev 3134)
+++ freepbx/trunk/debian/control 2007-02-12 14:01:18 UTC (rev 3135)
@@ -2,10 +2,9 @@
Section: comm
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Diego Iastrubni <diego.iastrubni at xorcom.com>
+Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Diego Iastrubni <diego.iastrubni at xorcom.com>, Chris Halls <halls at debian.org>
Build-Depends: debhelper (>= 4.0.0)
Build-Depends-Indep: sharutils, sox, dpatch
-#Standards-Version: 3.6.1
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
Modified: freepbx/trunk/debian/freepbx-admin.postinst
===================================================================
--- freepbx/trunk/debian/freepbx-admin.postinst 2007-02-12 08:30:24 UTC (rev 3134)
+++ freepbx/trunk/debian/freepbx-admin.postinst 2007-02-12 14:01:18 UTC (rev 3135)
@@ -44,12 +44,12 @@
fi
# echo -n "Fixing webroot permissions"
-# chown -R www-data.www-data /usr/share/freepbx/admin/modules
+# chown -R www-data:www-data /usr/share/freepbx/admin/modules
# chmod -R g+rw /usr/share/freepbx/admin/modules
# fix log permissions, if not available - create them
touch /var/log/asterisk/
- for i in retrieve opbounce; do j=/var/log/asterisk/freepbx-$i.log; touch $j; chown asterisk.asterisk $j; chmod g+rw $j; done
+ for i in retrieve opbounce; do j=/var/log/asterisk/freepbx-$i.log; touch $j; chown asterisk:asterisk $j; chmod g+rw $j; done
# is this an upgrade? or clean install?
if [ -e /etc/amportal.conf ]; then
Modified: freepbx/trunk/debian/patches/add-sqlite3-support.dpatch
===================================================================
--- freepbx/trunk/debian/patches/add-sqlite3-support.dpatch 2007-02-12 08:30:24 UTC (rev 3134)
+++ freepbx/trunk/debian/patches/add-sqlite3-support.dpatch 2007-02-12 14:01:18 UTC (rev 3135)
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad upstream~/amp_conf/bin/retrieve_conf upstream/amp_conf/bin/retrieve_conf
--- upstream~/amp_conf/bin/retrieve_conf 2007-01-04 02:48:29.000000000 +0200
-+++ upstream/amp_conf/bin/retrieve_conf 2007-02-04 17:47:02.000000000 +0200
++++ upstream/amp_conf/bin/retrieve_conf 2007-02-12 12:50:57.000000000 +0200
@@ -223,6 +223,18 @@
$db->connect( $DSN );
break;
@@ -27,9 +27,104 @@
default:
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 2006-11-27 04:53:24.000000000 +0200
++++ upstream/amp_conf/bin/retrieve_iax_conf_from_mysql.pl 2007-02-12 12:52:09.000000000 +0200
+@@ -60,6 +60,15 @@
+ my $db_file = $ampconf->{"AMPDBFILE"};
+ $dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
+ }
++elsif ( $db_engine eq "sqlite3" ) {
++ if (!exists($ampconf->{"AMPDBFILE"})) {
++ print "No AMPDBFILE set in /etc/amportal.conf\n";
++ exit;
++ }
++
++ my $db_file = $ampconf->{"AMPDBFILE"};
++ $dbh = DBI->connect("dbi:SQLite:dbname=$db_file","","");
++}
+
+ # 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-02-12 12:50:56.000000000 +0200
++++ upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2007-02-12 12:52:17.000000000 +0200
+@@ -178,6 +178,15 @@
+ my $db_file = $ampconf->{"AMPDBFILE"};
+ $dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
+ }
++elsif ( $db_engine eq "sqlite3" ) {
++ if (!exists($ampconf->{"AMPDBFILE"})) {
++ print "No AMPDBFILE set in /etc/amportal.conf\n";
++ exit;
++ }
++
++ my $db_file = $ampconf->{"AMPDBFILE"};
++ $dbh = DBI->connect("dbi:SQLite:dbname=$db_file","","");
++}
+
+ 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 2006-11-27 04:53:24.000000000 +0200
++++ upstream/amp_conf/bin/retrieve_queues_conf_from_mysql.pl 2007-02-12 12:52:29.000000000 +0200
+@@ -56,6 +56,15 @@
+ my $db_file = $ampconf->{"AMPDBFILE"};
+ $dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
+ }
++elsif ( $db_engine eq "sqlite3" ) {
++ if (!exists($ampconf->{"AMPDBFILE"})) {
++ print "No AMPDBFILE set in /etc/amportal.conf\n";
++ exit;
++ }
++
++ my $db_file = $ampconf->{"AMPDBFILE"};
++ $dbh = DBI->connect("dbi:SQLite:dbname=$db_file","","");
++}
+
+ $statement = "SELECT keyword,data from $table_name where id=0 and keyword <> 'account'";
+ my $result = $dbh->selectall_arrayref($statement);
+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 2006-11-27 04:53:24.000000000 +0200
++++ upstream/amp_conf/bin/retrieve_sip_conf_from_mysql.pl 2007-02-12 12:52:35.000000000 +0200
+@@ -60,6 +60,15 @@
+ my $db_file = $ampconf->{"AMPDBFILE"};
+ $dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
+ }
++elsif ( $db_engine eq "sqlite3" ) {
++ if (!exists($ampconf->{"AMPDBFILE"})) {
++ print "No AMPDBFILE set in /etc/amportal.conf\n";
++ exit;
++ }
++
++ my $db_file = $ampconf->{"AMPDBFILE"};
++ $dbh = DBI->connect("dbi:SQLite:dbname=$db_file","","");
++}
+
+ $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 2006-11-27 04:53:24.000000000 +0200
++++ upstream/amp_conf/bin/retrieve_zap_conf_from_mysql.pl 2007-02-12 12:52:39.000000000 +0200
+@@ -61,6 +61,15 @@
+ my $db_file = $ampconf->{"AMPDBFILE"};
+ $dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
+ }
++elsif ( $db_engine eq "sqlite3" ) {
++ if (!exists($ampconf->{"AMPDBFILE"})) {
++ print "No AMPDBFILE set in /etc/amportal.conf\n";
++ exit;
++ }
++
++ my $db_file = $ampconf->{"AMPDBFILE"};
++ $dbh = DBI->connect("dbi:SQLite:dbname=$db_file","","");
++}
+
+ $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/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-02-04 17:47:02.000000000 +0200
++++ upstream/amp_conf/htdocs/admin/common/db_connect.php 2007-02-12 12:50:57.000000000 +0200
@@ -49,6 +49,18 @@
$db->connect( $DSN );
break;
@@ -51,7 +146,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-03 03:33:31.000000000 +0200
-+++ upstream/amp_conf/htdocs/admin/modules/core/functions.inc.php 2007-02-04 17:47:02.000000000 +0200
++++ upstream/amp_conf/htdocs/admin/modules/core/functions.inc.php 2007-02-12 12:50:57.000000000 +0200
@@ -1411,7 +1411,7 @@
global $db;
global $amp_conf;
@@ -71,8 +166,8 @@
// TODO: sqlite work arround - diego
$results = sql("SELECT DISTINCT context FROM extensions WHERE context LIKE 'outrt-%' ORDER BY context ","getAll");
diff -urNad upstream~/install_amp upstream/install_amp
---- upstream~/install_amp 2007-02-04 17:47:02.000000000 +0200
-+++ upstream/install_amp 2007-02-04 17:47:02.000000000 +0200
+--- upstream~/install_amp 2007-02-12 12:50:56.000000000 +0200
++++ upstream/install_amp 2007-02-12 12:50:57.000000000 +0200
@@ -424,7 +424,8 @@
if ( (strtolower(substr($file,-4)) == ".sqlite") && ($db_engine == "sqlite") ) {
install_sqlupdate( $version, $file );
Modified: freepbx/trunk/debian/patches/use-conf-defaults.dpatch
===================================================================
--- freepbx/trunk/debian/patches/use-conf-defaults.dpatch 2007-02-12 08:30:24 UTC (rev 3134)
+++ freepbx/trunk/debian/patches/use-conf-defaults.dpatch 2007-02-12 14:01:18 UTC (rev 3135)
@@ -5,6 +5,7 @@
## DP: Needed to ensure that correct defaults are used when configuration
## DP: entries are missing from amportal.conf. Defaults are copied from
## DP: amp_conf/htdocs/admin/functions.inc.php
+## DP: Commited upstream at revision 3775. To be removed when packaging 2.2.1
@DPATCH@
diff -urNad freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_parse_amportal_conf.pl freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl
More information about the Pkg-voip-commits
mailing list