[Pkg-voip-commits] r5507 - in /freepbx/trunk/debian: changelog patches/no_cp_symlink_subdirs patches/resolve_conf-report_errors-db patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sun Apr  6 18:15:42 2008
New Revision: 5507

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5507
Log:
* no_cp_symlink_subdirs: Some copying that should be done at install /
  postinst .
* resolve_conf-report_errors-db: Yet another data-base-dependent part.

Added:
    freepbx/trunk/debian/patches/no_cp_symlink_subdirs
    freepbx/trunk/debian/patches/resolve_conf-report_errors-db   (with props)
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=5507&op=diff
==============================================================================
--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Sun Apr  6 18:15:42 2008
@@ -8,8 +8,11 @@
     meta-package of our own. 
   * Switched from dpatch to quilt.
   * ITP files (Closes: #464926).
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu,  7 Feb 2008 01:16:22 +0200
+  * no_cp_symlink_subdirs: Some copying that should be done at install /
+    postinst .
+  * resolve_conf-report_errors-db: Yet another data-base-dependent part.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 06 Apr 2008 21:14:35 +0300
 
 freepbx (2.3.0~dfsg-1) UNRELEASED; urgency=low
 

Added: freepbx/trunk/debian/patches/no_cp_symlink_subdirs
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/no_cp_symlink_subdirs?rev=5507&op=file
==============================================================================
--- freepbx/trunk/debian/patches/no_cp_symlink_subdirs (added)
+++ freepbx/trunk/debian/patches/no_cp_symlink_subdirs Sun Apr  6 18:15:42 2008
@@ -1,0 +1,15 @@
+Don't start copying / symlinking files in retrieve_conf . Those should
+be done explicitly at module isntall time.
+
+--- freepbx-2.3.1~dfsg.orig/amp_conf/bin/retrieve_conf
++++ freepbx-2.3.1~dfsg/amp_conf/bin/retrieve_conf
+@@ -323,9 +323,6 @@ if(is_array($modules)){
+ 				freepbx_log('retrieve_conf', 'devel-debug', $amp_conf['AMPWEBROOT']."/admin/modules/{$key}/functions.inc.php processed OK");
+ 			}
+ 
+-			// create symlinks for files in appropriate sub directories
+-			symlink_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
+-			cp_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
+ 		}
+ 	}
+ }

Added: freepbx/trunk/debian/patches/resolve_conf-report_errors-db
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/resolve_conf-report_errors-db?rev=5507&op=file
==============================================================================
--- freepbx/trunk/debian/patches/resolve_conf-report_errors-db (added)
+++ freepbx/trunk/debian/patches/resolve_conf-report_errors-db Sun Apr  6 18:15:42 2008
@@ -1,0 +1,27 @@
+report_errors() in retrieve_conf uses a mysql-specific function.
+Upstream bug: http://freepbx.org/trac/ticket/2772
+
+ at DPATCH@
+diff -urNad freepbx-2.3.1~dfsg~/amp_conf/bin/retrieve_conf freepbx-2.3.1~dfsg/amp_conf/bin/retrieve_conf
+--- freepbx-2.3.1~dfsg~/amp_conf/bin/retrieve_conf	2007-10-22 18:56:52.000000000 +0200
++++ freepbx-2.3.1~dfsg/amp_conf/bin/retrieve_conf	2008-04-06 17:38:04.682430057 +0300
+@@ -561,7 +561,18 @@
+ 
+ function report_errors($errno, $errstr, $errfile, $errline) {
+ 	global $cp_errors;
+-	freepbx_log('retrieve-conf', 'error', "php reported: '".mysql_real_escape_string($errstr)."' after copy or unlink attempt!");
++	switch($db_engine) {
++		case "sqlite3": 
++			$escaped_string = sqlite_real_escape($errstr);
++			break;
++		case "mysql":
++			$escaped_string = mysql_real_escape_string($errstr);
++			break;
++		case "pgsql":
++			$escaped_string = pg_escape_string($errstr);
++			break;
++	}
++	freepbx_log('retrieve-conf', 'error', "php reported: '$escaped_string' after copy or unlink attempt!");
+ 	$cp_errors .= $errstr."\n";
+ }
+ 

Propchange: freepbx/trunk/debian/patches/resolve_conf-report_errors-db
------------------------------------------------------------------------------
    svn:executable = *

Modified: freepbx/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/series?rev=5507&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/series (original)
+++ freepbx/trunk/debian/patches/series Sun Apr  6 18:15:42 2008
@@ -1,5 +1,7 @@
 # debian/xorcom enhancements
 #ast-config-dirs		<- moved to freepbx-module-core
+no_cp_symlink_subdirs
+resolve_conf-report_errors-db
 disable-online-updates
 clean-install-amp
 fix-ari-link