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

[Diego Iastrubni]

Author: elcuco-guest
Date: 2007-05-02 09:46:54 +0000 (Wed, 02 May 2007)
New Revision: 3507

Modified:
   freepbx/trunk/debian/changelog
   freepbx/trunk/debian/patches/use-conf-defaults.dpatch
Log:
fix for upstream ticket: http://freepbx.org/trac/ticket/1921, now voicemail module is working once more
reformat changelog to fit in 80columsn :(



Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog	2007-05-01 13:19:54 UTC (rev 3506)
+++ freepbx/trunk/debian/changelog	2007-05-02 09:46:54 UTC (rev 3507)
@@ -13,16 +13,18 @@
   * freepbx-common: apply_conf.sh is now called /usr/sbin/update-freepbx
   * freepbx-mysql, freepbx-sqlite3: support for sql "servers" has been
     put in separate packages. One package is needed for the configuration.
-  * freepbx-common: fixed patch for module_admin, now it also fixes upstream 1899).
-    Now it is possible to install freepbx-sqlite3 in chroot
+  * freepbx-common: fixed patch for module_admin, now it also fixes upstream 
+    1899). Now it is possible to install freepbx-sqlite3 in chroot
   * freepbx-common: agi/directory will store logs in the correct dir (fixes
     upstream 1912)
-  * freepbx-common: archive_recordings points to the correct php-asmanager.php (thanks 
-    to Robert Roach for reporting)
-  * freepbx-sqlite3, freepbx-mysql: create a default inbound route to the demos provided
-    in the asterisk documentation
-  * freepbx-common: retrive_conf will now (at least try) to save the files in mode 660,
-    as they contain passowrds - they should not be world readable.
+  * freepbx-common: archive_recordings now points to the correct 
+    php-asmanager.php (thanks to Robert Roach for reporting)
+  * freepbx-sqlite3, freepbx-mysql: create a default inbound route to the demos
+    provided in the asterisk documentation
+  * freepbx-common: retrive_conf will now (at least try) to save the files in 
+    mode 660, as they contain passowrds - they should not be world readable.
+  * freepbx-common: updated use_conf_defaults to fix upstream: 
+    http://freepbx.org/trac/ticket/1921
 
   [ Chris Halls ]
   * Remove fix-recordings.patch - already fixed in a different way upstream

Modified: freepbx/trunk/debian/patches/use-conf-defaults.dpatch
===================================================================
--- freepbx/trunk/debian/patches/use-conf-defaults.dpatch	2007-05-01 13:19:54 UTC (rev 3506)
+++ freepbx/trunk/debian/patches/use-conf-defaults.dpatch	2007-05-02 09:46:54 UTC (rev 3507)
@@ -6,12 +6,13 @@
 ## DP: entries are missing from amportal.conf. Defaults are copied from
 ## DP: amp_conf/htdocs/admin/functions.inc.php
 ## DP: Commited upstream at revision 3775. To be removed when packaging 2.2.1
+## DP: Contains a fix for upstream bug: http://freepbx.org/trac/ticket/1921
 
 @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 @@
+diff -urNad freepbx-2.2.1~dfsg~/amp_conf/bin/retrieve_parse_amportal_conf.pl freepbx-2.2.1~dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl
+--- freepbx-2.2.1~dfsg~/amp_conf/bin/retrieve_parse_amportal_conf.pl	2006-11-27 04:53:24.000000000 +0200
++++ freepbx-2.2.1~dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl	2007-05-02 12:38:35.000000000 +0300
+@@ -9,7 +9,13 @@
  sub parse_amportal_conf
  {
  	my $filename = $_[0];
@@ -20,7 +21,21 @@
 +                AMPDBENGINE => "mysql",
 +                AMPDBNAME => "asterisk",
 +                AMPENGINE => "asterisk",
++		ASTETCDIR => "/etc/asterisk", 
++		ASTMANAGERPORT => "5038"
 +	);
  	
  	open(AMPCONF, $filename) or die "Cannot open $filename";
  	
+diff -urNad freepbx-2.2.1~dfsg~/amp_conf/htdocs/admin/functions.inc.php freepbx-2.2.1~dfsg/amp_conf/htdocs/admin/functions.inc.php
+--- freepbx-2.2.1~dfsg~/amp_conf/htdocs/admin/functions.inc.php	2007-05-02 12:32:26.000000000 +0300
++++ freepbx-2.2.1~dfsg/amp_conf/htdocs/admin/functions.inc.php	2007-05-02 12:38:15.000000000 +0300
+@@ -27,6 +27,8 @@
+ 		'AMPDBNAME' => 'asterisk',
+ 		'AMPENGINE' => 'asterisk',
+ 		'USECATEGORIES' => true,
++		'ASTETCDIR' => '/etc/asterisk/',
++		'ASTMANAGERPORT' => '5038'
+ 		);
+ 	// boolean values, will be converted to true/false
+ 	// "yes", "true", 1 (case-insensitive) will be treated as true, everything else is false