[Pkg-voip-commits] r3121 - in freepbx/trunk/debian: . patches

[Chris Halls]

Author: halls
Date: 2007-02-07 17:29:04 +0100 (Wed, 07 Feb 2007)
New Revision: 3121

Added:
   freepbx/trunk/debian/patches/use-conf-defaults.dpatch
Modified:
   freepbx/trunk/debian/changelog
   freepbx/trunk/debian/patches/00list
Log:
Needed to ensure that correct defaults are used when configuration entries are missing from amportal.conf. Defaults are copied from amp_conf/htdocs/admin/functions.inc.php


Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog	2007-02-07 03:49:10 UTC (rev 3120)
+++ freepbx/trunk/debian/changelog	2007-02-07 16:29:04 UTC (rev 3121)
@@ -15,8 +15,10 @@
   * freepbx-panel: op-panel now uses asterisk user
   * freepbx-panel: Depend on op-panel >= 0.26.dfsg-5 where this change
     happened
+  * fix generation of *_additional.conf files if datbase configuration is not
+    explicitly specified in amportal.conf (use-conf-defaults.dpatch)
 
- -- Chris Halls <halls at debian.org>  Thu,  1 Feb 2007 11:47:18 +0000
+ -- Chris Halls <halls at debian.org>  Wed,  7 Feb 2007 16:05:27 +0000
 
 freepbx (2.1.3.dfsg-1) UNRELEASED; urgency=low
 

Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list	2007-02-07 03:49:10 UTC (rev 3120)
+++ freepbx/trunk/debian/patches/00list	2007-02-07 16:29:04 UTC (rev 3121)
@@ -2,6 +2,7 @@
 fix-enums
 fix-module_admin
 fix-warning-sqlite
+use-conf-defaults
 
 # debian/xorcom enhancements
 ast-config-dirs

Added: freepbx/trunk/debian/patches/use-conf-defaults.dpatch
===================================================================
--- freepbx/trunk/debian/patches/use-conf-defaults.dpatch	2007-02-07 03:49:10 UTC (rev 3120)
+++ freepbx/trunk/debian/patches/use-conf-defaults.dpatch	2007-02-07 16:29:04 UTC (rev 3121)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use-conf-defaults.dpatch by Chris Halls <halls at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## 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
+
+ at 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
+--- freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_parse_amportal_conf.pl	2006-11-27 02:53:24.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl	2007-02-07 15:59:17.000000000 +0000
+@@ -9,7 +9,11 @@
+ sub parse_amportal_conf
+ {
+ 	my $filename = $_[0];
+-	my %ampconf;
++	my %ampconf = (
++                AMPDBENGINE => "mysql",
++                AMPDBNAME => "asterisk",
++                AMPENGINE => "asterisk",
++	);
+ 	
+ 	open(AMPCONF, $filename) or die "Cannot open $filename";
+ 	


Property changes on: freepbx/trunk/debian/patches/use-conf-defaults.dpatch
___________________________________________________________________
Name: svn:executable
   + *