[Pkg-voip-commits] r6384 - /freepbx/trunk/debian/patches/remove-sqlite

[odd_bloke-guest at alioth.debian.org]

Author: odd_bloke-guest
Date: Tue Nov  4 15:26:05 2008
New Revision: 6384

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6384
Log:
Fixed broken patch.

Modified:
    freepbx/trunk/debian/patches/remove-sqlite

Modified: freepbx/trunk/debian/patches/remove-sqlite
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/remove-sqlite?rev=6384&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/remove-sqlite (original)
+++ freepbx/trunk/debian/patches/remove-sqlite Tue Nov  4 15:26:05 2008
@@ -1,37 +1,7 @@
-Index: freepbx-2.5.1~dfsg/install_amp
-===================================================================
---- freepbx-2.5.1~dfsg.orig/install_amp	2008-10-30 15:54:19.000000000 +0000
-+++ freepbx-2.5.1~dfsg/install_amp	2008-10-30 15:56:46.000000000 +0000
-@@ -960,24 +960,7 @@
- 		break;
- 	
- 	case "sqlite3":
--		if (!isset($amp_conf["AMPDBFILE"]))
--			die("You must setup properly AMPDBFILE in /etc/amportal.conf");
--			
--		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");
--			fatal( "Your PHP installation has no PEAR/SQLite3 support. Please install php-sqlite3 and php-pear.");
--		}
--
--		$datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
--		$db = DB::connect($datasource);
-+		die_freepbx("SQLite3 support is not currently available in Debian.");
- 		break;
- 
- 	default:
 Index: freepbx-2.5.1~dfsg/amportal.conf
 ===================================================================
---- freepbx-2.5.1~dfsg.orig/amportal.conf	2008-10-30 15:57:08.000000000 +0000
-+++ freepbx-2.5.1~dfsg/amportal.conf	2008-10-30 15:57:24.000000000 +0000
+--- freepbx-2.5.1~dfsg.orig/amportal.conf	2008-10-21 19:32:25.000000000 +0100
++++ freepbx-2.5.1~dfsg/amportal.conf	2008-11-04 15:22:50.000000000 +0000
 @@ -200,7 +200,7 @@
  # less frequently (such as Astersisk Uptime) based on the INFO value
  
@@ -43,9 +13,9 @@
  # DEFAULT VALUE: false
 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 15:58:20.000000000 +0000
-+++ freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/common/db_connect.php	2008-10-30 15:59:42.000000000 +0000
-@@ -36,27 +36,7 @@
+--- freepbx-2.5.1~dfsg.orig/amp_conf/htdocs/admin/common/db_connect.php	2008-11-04 15:21:02.000000000 +0000
++++ freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/common/db_connect.php	2008-11-04 15:23:52.000000000 +0000
+@@ -36,23 +36,7 @@
  		break;
  
  	case "sqlite3":
@@ -54,10 +24,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') )
 -		{
@@ -76,9 +42,9 @@
  	default:
 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 16:01:28.000000000 +0000
-+++ freepbx-2.5.1~dfsg/amp_conf/bin/retrieve_conf	2008-10-30 16:01:59.000000000 +0000
-@@ -238,24 +238,7 @@
+--- freepbx-2.5.1~dfsg.orig/amp_conf/bin/retrieve_conf	2008-11-04 15:21:02.000000000 +0000
++++ freepbx-2.5.1~dfsg/amp_conf/bin/retrieve_conf	2008-11-04 15:24:24.000000000 +0000
+@@ -238,20 +238,7 @@
  		break;
  	
  	case "sqlite3":
@@ -87,10 +53,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') )
 -		{