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

[Chris Halls]

Author: halls
Date: 2007-02-08 22:53:33 +0100 (Thu, 08 Feb 2007)
New Revision: 3126

Added:
   freepbx/trunk/debian/patches/fix-agibin-dir.dpatch
Modified:
   freepbx/trunk/debian/changelog
   freepbx/trunk/debian/patches/00list
Log:
fix trunk dialing rules and recording (fix-agibin-dir.dpatch)

The problem manifested as a failure to process dialing prefixes for a trunk. I also fixed a similar problem in the recordingcheck script.

The problem was caused because some files in the agibin directory have a hardcoded agi include path under /var/lib/asterisk/agi-bin, whereas we install these files under /usr. Some files already use the dirname(__FILE__) so the patch does this for the remaining files in the directory.


Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog	2007-02-07 21:31:33 UTC (rev 3125)
+++ freepbx/trunk/debian/changelog	2007-02-08 21:53:33 UTC (rev 3126)
@@ -17,8 +17,9 @@
     happened
   * fix generation of *_additional.conf files if datbase configuration is not
     explicitly specified in amportal.conf (use-conf-defaults.dpatch)
+  * fix trunk dialing rules and recording (fix-agibin-dir.dpatch)
 
- -- Chris Halls <halls at debian.org>  Wed,  7 Feb 2007 16:05:27 +0000
+ -- Chris Halls <halls at debian.org>  Thu,  8 Feb 2007 10:15:11 +0000
 
 freepbx (2.1.3.dfsg-1) UNRELEASED; urgency=low
 

Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list	2007-02-07 21:31:33 UTC (rev 3125)
+++ freepbx/trunk/debian/patches/00list	2007-02-08 21:53:33 UTC (rev 3126)
@@ -10,6 +10,7 @@
 fix-retrieve-op-panel-cfg
 disable-online-updates
 clean-install-amp
+fix-agibin-dir
 
 # backports from trunk
 add-sqlite3-support

Added: freepbx/trunk/debian/patches/fix-agibin-dir.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-agibin-dir.dpatch	2007-02-07 21:31:33 UTC (rev 3125)
+++ freepbx/trunk/debian/patches/fix-agibin-dir.dpatch	2007-02-08 21:53:33 UTC (rev 3126)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-agibin-dir.dpatch by Chris Halls <halls at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/agi-bin/fixlocalprefix freepbx-2.2.0~dfsg/amp_conf/agi-bin/fixlocalprefix
+--- freepbx-2.2.0~dfsg~/amp_conf/agi-bin/fixlocalprefix	2006-12-06 20:50:30.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/agi-bin/fixlocalprefix	2007-02-08 10:13:41.000000000 +0000
+@@ -69,7 +69,7 @@
+ 
+ */
+ 
+-define("AGIBIN_DIR", "/var/lib/asterisk/agi-bin");
++define("AGIBIN_DIR", dirname(__FILE__));
+ define("LOCALPREFIX_FILE", "/etc/asterisk/localprefixes.conf");
+ 
+ include(AGIBIN_DIR."/phpagi.php");
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/agi-bin/recordingcheck freepbx-2.2.0~dfsg/amp_conf/agi-bin/recordingcheck
+--- freepbx-2.2.0~dfsg~/amp_conf/agi-bin/recordingcheck	2006-06-26 00:46:50.000000000 +0100
++++ freepbx-2.2.0~dfsg/amp_conf/agi-bin/recordingcheck	2007-02-08 10:13:58.000000000 +0000
+@@ -17,7 +17,7 @@
+ The program checks determines if Asterisk should record a call
+ */
+ 
+-define("AGIBIN_DIR", "/var/lib/asterisk/agi-bin");
++define("AGIBIN_DIR", dirname(__FILE__));
+ 
+ include(AGIBIN_DIR."/phpagi.php");
+ 


Property changes on: freepbx/trunk/debian/patches/fix-agibin-dir.dpatch
___________________________________________________________________
Name: svn:executable
   + *