[Pkg-voip-commits] r6369 - in /freepbx/trunk/debian: changelog patches/no_dl_sqlite patches/series patches/sqlite-no-dl

[odd_bloke-guest at alioth.debian.org]

Author: odd_bloke-guest
Date: Thu Oct 30 10:26:57 2008
New Revision: 6369

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6369
Log:
debian/patches: Added sqlite-no-dl, to remove needless dynamic loading of modules we already have loaded.

Added:
    freepbx/trunk/debian/patches/sqlite-no-dl
Removed:
    freepbx/trunk/debian/patches/no_dl_sqlite
Modified:
    freepbx/trunk/debian/changelog
    freepbx/trunk/debian/patches/series

Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=6369&op=diff
==============================================================================
--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Thu Oct 30 10:26:57 2008
@@ -19,6 +19,8 @@
     + Refreshed patches for new version.
     + Removed debian/patches/resolve_conf-report-errors-db as it has been
       merged upstream.
+    + Added sqlite-no-dl, to remove needless dynamic loading of modules we
+      already have loaded.
   * debian/patches/clean-install-amp: Changed $webroot to be /usr/share/freepbx
     rather than /var/www.
   * debian/rules: Don't link /usr/share/freepbx into /var/www, as per lintian
@@ -31,7 +33,7 @@
   * Add Daniel Watkins as an uploader, and remove Diego.
   * Standards version 3.8.0 . No change needed.
 
- -- Daniel Watkins <daniel.watkins at credativ.co.uk>  Thu, 30 Oct 2008 09:43:26 +0000
+ -- Daniel Watkins <daniel.watkins at credativ.co.uk>  Thu, 30 Oct 2008 10:25:42 +0000
 
 freepbx (2.4.0~dfsg-1) UNRELEASED; urgency=low
 

Modified: freepbx/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/series?rev=6369&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/series (original)
+++ freepbx/trunk/debian/patches/series Thu Oct 30 10:26:57 2008
@@ -14,3 +14,5 @@
 # to freepbx-2.2
 #fix-wierd-email
 noisy_fail_mod_msg
+
+sqlite-no-dl

Added: freepbx/trunk/debian/patches/sqlite-no-dl
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/sqlite-no-dl?rev=6369&op=file
==============================================================================
--- freepbx/trunk/debian/patches/sqlite-no-dl (added)
+++ freepbx/trunk/debian/patches/sqlite-no-dl Thu Oct 30 10:26:57 2008
@@ -1,0 +1,45 @@
+Index: freepbx-2.5.1~dfsg/install_amp
+===================================================================
+--- freepbx-2.5.1~dfsg.orig/install_amp	2008-10-30 10:10:59.000000000 +0000
++++ freepbx-2.5.1~dfsg/install_amp	2008-10-30 10:11:26.000000000 +0000
+@@ -966,10 +966,6 @@
+ 		if (isset($amp_conf["AMPDBFILE"]) == "")
+ 			die("AMPDBFILE in /etc/amportal.conf cannot be blank");
+ 
+-		/* on centos this extension is not loaded by default */
+-		if (! extension_loaded('sqlite3.so')  && ! extension_loaded('SQLITE3'))
+-			dl('sqlite3.so');
+-
+ 		if (! @require_once('DB/sqlite3.php') )
+ 		{
+ 			out("FAILED");
+Index: freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/common/db_connect.php
+===================================================================
+--- freepbx-2.5.1~dfsg.orig/amp_conf/htdocs/admin/common/db_connect.php	2008-10-30 10:11:08.000000000 +0000
++++ freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/common/db_connect.php	2008-10-30 10:11:37.000000000 +0000
+@@ -42,10 +42,6 @@
+ 		if (isset($amp_conf["AMPDBFILE"]) == "")
+ 			die_freepbx("AMPDBFILE in /etc/amportal.conf cannot be blank");
+ 
+-		/* on centos this extension is not loaded by default */
+-		if (! extension_loaded('sqlite3') && ! extension_loaded('SQLITE3'))
+-			dl('sqlite3.so');
+-
+ 		if (! @require_once('DB/sqlite3.php') )
+ 		{
+ 			die_freepbx("Your PHP installation has no PEAR/SQLite3 support. Please install php-sqlite3 and php-pear.");
+Index: freepbx-2.5.1~dfsg/amp_conf/bin/retrieve_conf
+===================================================================
+--- freepbx-2.5.1~dfsg.orig/amp_conf/bin/retrieve_conf	2008-10-30 10:11:14.000000000 +0000
++++ freepbx-2.5.1~dfsg/amp_conf/bin/retrieve_conf	2008-10-30 10:11:50.000000000 +0000
+@@ -244,10 +244,6 @@
+ 		if (isset($amp_conf["AMPDBFILE"]) == "")
+ 			fatal("AMPDBFILE in $amportalconf cannot be blank");
+ 
+-		/* on centos this extension is not loaded by default */
+-		if (! extension_loaded('sqlite3.so')  && ! extension_loaded('SQLITE3'))
+-			dl('sqlite3.so');
+-
+ 		if (! @require_once('DB/sqlite3.php') )
+ 		{
+ 			die_freepbx("Your PHP installation has no PEAR/SQLite3 support. Please install php-sqlite3 and php-pear.");