[Pkg-voip-commits] r6340 - in /freepbx/trunk/debian: ./ patches/
odd_bloke-guest at alioth.debian.org
odd_bloke-guest at alioth.debian.org
Wed Oct 29 13:37:15 UTC 2008
Author: odd_bloke-guest
Date: Wed Oct 29 13:37:15 2008
New Revision: 6340
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6340
Log:
debian/patches: Refreshed patches.
Modified:
freepbx/trunk/debian/changelog
freepbx/trunk/debian/patches/clean-install-amp
freepbx/trunk/debian/patches/disable-online-updates
freepbx/trunk/debian/patches/fix-ari-link
freepbx/trunk/debian/patches/fix-fop-config
freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg
freepbx/trunk/debian/patches/no_cp_symlink_subdirs
freepbx/trunk/debian/patches/path-to-fop
freepbx/trunk/debian/patches/resolve_conf-report_errors-db
Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=6340&op=diff
==============================================================================
--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Wed Oct 29 13:37:15 2008
@@ -16,8 +16,9 @@
+ Removed php4-specific code, as php4 is no longer distributed as part of
unstable.
+ Fixed inconsistent whitespace.
-
- -- Daniel Watkins <daniel.watkins at credativ.co.uk> Fri, 24 Oct 2008 14:08:51 +0100
+ * debian/patches: Refreshed patches.
+
+ -- Daniel Watkins <daniel.watkins at credativ.co.uk> Fri, 24 Oct 2008 14:50:35 +0100
freepbx (2.3.1~dfsg-1) UNRELEASED; urgency=low
Modified: freepbx/trunk/debian/patches/clean-install-amp
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/clean-install-amp?rev=6340&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/clean-install-amp (original)
+++ freepbx/trunk/debian/patches/clean-install-amp Wed Oct 29 13:37:15 2008
@@ -10,9 +10,11 @@
##
## TODO: split this patch to separate fixes.
---- freepbx-2.3.1~dfsg.orig/install_amp
-+++ freepbx-2.3.1~dfsg/install_amp
-@@ -7,12 +7,12 @@ require_once ("libfreepbx.install.php");
+Index: freepbx-2.4.0~dfsg/install_amp
+===================================================================
+--- freepbx-2.4.0~dfsg.orig/install_amp 2008-10-24 14:40:59.000000000 +0100
++++ freepbx-2.4.0~dfsg/install_amp 2008-10-24 14:42:16.000000000 +0100
+@@ -7,12 +7,12 @@
define("AMP_CONF", "/etc/amportal.conf");
define("ASTERISK_CONF", "/etc/asterisk/asterisk.conf");
define("UPGRADE_DIR", dirname(__FILE__)."/upgrades");
@@ -29,7 +31,7 @@
$ampbin_dir = "/var/lib/asterisk/bin";
$asterisk_user = "asteriskuser";
$asterisk_pass = "amp109";
-@@ -113,7 +113,7 @@ function showHelp() {
+@@ -121,7 +121,7 @@
out(" --force-version <ver> Force upgrade from version <ver>");
out(" --skip-module-install Don't run install scripts for packaged modules, the files are still loaded.");
out(" In a development environment you may not want the install scripts run.");
@@ -38,7 +40,7 @@
out(" --install-moh Install default music-on-hold files (normally doesn't, unless ");
out(" it's a new installation)");
//out(" --make-links-devel Make links to files in the source directory instead of copying");
-@@ -387,7 +387,7 @@ function collect_settings($filename, $db
+@@ -395,7 +395,7 @@
if (is_dir($amp_conf["AMPSBIN"])) {
break;
@@ -47,7 +49,7 @@
out("Created ".$amp_conf["AMPSBIN"]);
break;
} else {
-@@ -611,6 +611,10 @@ foreach ($args[0] as $arg) {
+@@ -630,6 +630,10 @@
$install_files = false;
out("Running upgrade only, without installing files.");
break;
@@ -58,7 +60,7 @@
case "--my-svn-is-correct":
$override_astvers = true;
break;
-@@ -682,14 +686,6 @@ if ($current_user != "root"){
+@@ -701,14 +705,6 @@
out("OK");
@@ -73,7 +75,7 @@
// **** Check for amportal.conf, create if necessary
outn("Checking for ".AMP_CONF."..");
-@@ -701,7 +697,7 @@ if (!file_exists(AMP_CONF)) {
+@@ -720,7 +716,7 @@
// this addresses http://freepbx.org/trac/ticket/1878
chown(AMP_CONF, "asterisk");
chgrp(AMP_CONF, "asterisk");
@@ -82,7 +84,7 @@
collect_settings(AMP_CONF, $dbhost, $new_username, $new_password, 'asterisk');
-@@ -723,7 +719,7 @@ out("OK");
+@@ -742,7 +738,7 @@
if (!array_key_exists("AMPWEBROOT",$amp_conf)) {
out("Adding AMPWEBROOT option to amportal.conf - using AMP default");
@@ -91,7 +93,7 @@
}
if (!array_key_exists("FOPWEBROOT",$amp_conf)) {
-@@ -733,7 +729,7 @@ if (!array_key_exists("FOPWEBROOT",$amp_
+@@ -752,7 +748,7 @@
if (!array_key_exists("AMPBIN",$amp_conf)) {
out("Adding AMPBIN option to amportal.conf - using AMP default");
@@ -100,7 +102,7 @@
}
if (!array_key_exists("AMPSBIN",$amp_conf)) {
-@@ -769,7 +765,7 @@ if (isset($dbname)) {
+@@ -788,7 +784,7 @@
// write amportal.conf
write_amportal_conf(AMP_CONF, $amp_conf);
@@ -109,7 +111,7 @@
outn("Checking for ".ASTERISK_CONF."..");
if (!file_exists(ASTERISK_CONF)) {
-@@ -792,7 +788,8 @@ out("OK");
+@@ -811,7 +807,8 @@
this code will stay in 2.2, but in 2.3 it will be gone. developers - please
update your code
@@ -119,7 +121,7 @@
if (isset($asterisk_conf['astetcdir'])) { $amp_conf['ASTETCDIR'] = $asterisk_conf['astetcdir']; }
if (isset($asterisk_conf['astmoddir'])) { $amp_conf['ASTMODDIR'] = $asterisk_conf['astmoddir']; }
if (isset($asterisk_conf['astvarlibdir'])) { $amp_conf['ASTVARLIBDIR'] = $asterisk_conf['astvarlibdir']; }
-@@ -800,6 +797,7 @@ if (isset($asterisk_conf['astagidir']))
+@@ -819,6 +816,7 @@
if (isset($asterisk_conf['astspooldir'])) { $amp_conf['ASTSPOOLDIR'] = $asterisk_conf['astspooldir']; }
if (isset($asterisk_conf['astrundir'])) { $amp_conf['ASTRUNDIR'] = $asterisk_conf['astrundir']; }
if (isset($asterisk_conf['astlogdir'])) { $amp_conf['ASTLOGDIR'] = $asterisk_conf['astlogdir']; }
@@ -127,7 +129,7 @@
if (!isset($pbx_engine)) { $pbx_engine='asterisk'; }
out("Using $pbx_engine as PBX Engine");
-@@ -811,17 +809,20 @@ write_amportal_conf(AMP_CONF, $amp_conf)
+@@ -830,17 +828,20 @@
// **** Write asterisk version to ASTETCDIR/version
$tmpoutput = '';
@@ -150,7 +152,7 @@
// normally this would be the contents of ASTETCDIR/version, but this is for simplicity, as we just read it above
-@@ -975,15 +965,15 @@ if ($install_files)
+@@ -986,15 +987,15 @@
}
// **** Apply amportal.conf configuration to files
@@ -169,7 +171,7 @@
if (file_exists($amp_conf["AMPBIN"]."/freepbx_engine")) {
exec("chmod u+x ".$amp_conf["AMPBIN"]."/freepbx_engine");
outn("freepbx_engine..");
-@@ -995,7 +985,7 @@ if (!$dryrun) {
+@@ -1006,7 +1007,7 @@
// reload manager in asterisk if it is running:
//
outn("apply username/password changes to conf files..");
@@ -178,7 +180,7 @@
out("done");
// reload manager in asterisk if it was running:
-@@ -1012,7 +1002,7 @@ if (!is_dir($asterisk_conf["astspooldir"
+@@ -1023,7 +1024,7 @@
// **** Set permissions all files
@@ -187,7 +189,7 @@
if ($install_files)
{
outn("Setting permissions on files..");
-@@ -1020,7 +1010,7 @@ if ($install_files)
+@@ -1031,7 +1032,7 @@
exec($amp_conf["AMPSBIN"]."/amportal chown");
}
out("OK");
@@ -196,7 +198,7 @@
// Run through all the upgrade scripts starting at the specified version
//
-@@ -1030,7 +1020,7 @@ upgrade_all($version);
+@@ -1041,7 +1042,7 @@
out("Generating AMP configs..");
generate_configs();
out("Generating AMP configs..OK");
@@ -205,7 +207,7 @@
$version = install_getversion();
$filename = $amp_conf["AMPWEBROOT"]."/admin/version.txt";
if (!$fd = fopen($filename, "w")) {
-@@ -1043,7 +1033,7 @@ fclose($fd);
+@@ -1054,7 +1055,7 @@
outn("Restarting Flash Operator Panel..");
exec('su - asterisk -c "'.$amp_conf["AMPBIN"].'/bounce_op.sh"');
out("OK");
@@ -214,7 +216,7 @@
// Now force an install for all modules that are packaged with the tarball
// directory.
-@@ -1060,7 +1050,7 @@ install_needreload();
+@@ -1071,7 +1072,7 @@
if ($amp_conf["AMPWEBADDRESS"])
{
Modified: freepbx/trunk/debian/patches/disable-online-updates
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/disable-online-updates?rev=6340&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/disable-online-updates (original)
+++ freepbx/trunk/debian/patches/disable-online-updates Wed Oct 29 13:37:15 2008
@@ -2,8 +2,10 @@
##
## configuration in amportal.conf
---- a/amp_conf/htdocs/admin/page.modules.php
-+++ b/amp_conf/htdocs/admin/page.modules.php
+Index: freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/page.modules.php
+===================================================================
+--- freepbx-2.4.0~dfsg.orig/amp_conf/htdocs/admin/page.modules.php 2008-10-24 14:40:59.000000000 +0100
++++ freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/page.modules.php 2008-10-24 14:42:10.000000000 +0100
@@ -6,11 +6,16 @@
* Optionally, the other way is to remove the below lines, and instead just define
* EXTERNAL_PACKAGE_MANAGEMENT as 1. This prevents changing the setting from amportal.conf.
@@ -21,7 +23,7 @@
$extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
-@@ -35,6 +40,15 @@ $freepbx_version = get_framework_version
+@@ -35,6 +40,15 @@
$freepbx_version = $freepbx_version ? $freepbx_version : getversion();
$freepbx_help_url = "http://www.freepbx.org/freepbx-help-system?freepbx_version=".urlencode($freepbx_version);
Modified: freepbx/trunk/debian/patches/fix-ari-link
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/fix-ari-link?rev=6340&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-ari-link (original)
+++ freepbx/trunk/debian/patches/fix-ari-link Wed Oct 29 13:37:15 2008
@@ -2,9 +2,11 @@
##
## Fix a link to ARI (the recordings) in the top bar.
---- a/amp_conf/htdocs/admin/views/freepbx.php
-+++ b/amp_conf/htdocs/admin/views/freepbx.php
-@@ -29,7 +29,7 @@ function print_sub_tool( $name, $page, $
+Index: freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/views/freepbx.php
+===================================================================
+--- freepbx-2.4.0~dfsg.orig/amp_conf/htdocs/admin/views/freepbx.php 2008-10-24 14:39:26.000000000 +0100
++++ freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/views/freepbx.php 2008-10-24 14:42:20.000000000 +0100
+@@ -29,7 +29,7 @@
if ($new_window === true) {
$html .= "target=\"_blank\" ";
} else {
@@ -13,7 +15,7 @@
//$html .= "onClick=\"return menu_popup(this, '$new_window')\" ";
}
}
-@@ -165,7 +165,7 @@ if ($reload_needed) {
+@@ -165,7 +165,7 @@
print_sub_tool( _("Admin") , "config.php", $currentFile=='config.php' );
print_sub_tool( _("Reports") , "reports.php", $currentFile=='reports.php' );
print_sub_tool( _("Panel") , "panel.php" , $currentFile=='panel.php' );
Modified: freepbx/trunk/debian/patches/fix-fop-config
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/fix-fop-config?rev=6340&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-fop-config (original)
+++ freepbx/trunk/debian/patches/fix-fop-config Wed Oct 29 13:37:15 2008
@@ -9,8 +9,10 @@
## - use a sane default password for the UI
## - use a default passwords for the manager
---- a/amp_conf/htdocs_panel/op_server.cfg
-+++ b/amp_conf/htdocs_panel/op_server.cfg
+Index: freepbx-2.4.0~dfsg/amp_conf/htdocs_panel/op_server.cfg
+===================================================================
+--- freepbx-2.4.0~dfsg.orig/amp_conf/htdocs_panel/op_server.cfg 2008-10-24 14:39:26.000000000 +0100
++++ freepbx-2.4.0~dfsg/amp_conf/htdocs_panel/op_server.cfg 2008-10-24 14:42:26.000000000 +0100
@@ -11,8 +11,8 @@
manager_host=127.0.0.1
@@ -22,7 +24,7 @@
; The optional event_mask for filtering manager events.
; Asterisk will send only the events you request
-@@ -39,14 +39,14 @@ auth_md5=1
+@@ -39,14 +39,14 @@
; the flash movie resides (just the hostname, without directories)
; This value might be omited. In that case the flash movie will
; try to connect to the same host as the web page.
Modified: freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg?rev=6340&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg (original)
+++ freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg Wed Oct 29 13:37:15 2008
@@ -3,9 +3,11 @@
## By default freePBX's script saves into the webroot. it should save
## the config into /etc/op-panel/freepbx
---- a/amp_conf/bin/retrieve_op_conf_from_mysql.pl
-+++ b/amp_conf/bin/retrieve_op_conf_from_mysql.pl
-@@ -148,7 +148,7 @@ sub parse_zapata{
+Index: freepbx-2.4.0~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl
+===================================================================
+--- freepbx-2.4.0~dfsg.orig/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2008-10-24 14:39:26.000000000 +0100
++++ freepbx-2.4.0~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2008-10-24 14:42:47.000000000 +0100
+@@ -156,7 +156,7 @@
$ampconf = parse_amportal_conf( $amportalconf );
# WARNING: this file will be substituted by the output of this program
@@ -14,8 +16,10 @@
# username to connect to the database
$username = $ampconf->{"AMPDBUSER"};
# password to connect to the database
---- a/amp_conf/htdocs_panel/op_buttons.cfg
-+++ b/amp_conf/htdocs_panel/op_buttons.cfg
+Index: freepbx-2.4.0~dfsg/amp_conf/htdocs_panel/op_buttons.cfg
+===================================================================
+--- freepbx-2.4.0~dfsg.orig/amp_conf/htdocs_panel/op_buttons.cfg 2008-10-24 14:39:26.000000000 +0100
++++ freepbx-2.4.0~dfsg/amp_conf/htdocs_panel/op_buttons.cfg 2008-10-24 14:42:47.000000000 +0100
@@ -1,7 +1,7 @@
-include => op_buttons_additional.cfg
+include => freepbx/op_buttons_additional.cfg
@@ -24,5 +28,5 @@
-include => op_buttons_custom.cfg
+include => freepbx/op_buttons_custom.cfg
- ; queues
+ ; Queues
[rectangle]
Modified: 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=6340&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/no_cp_symlink_subdirs (original)
+++ freepbx/trunk/debian/patches/no_cp_symlink_subdirs Wed Oct 29 13:37:15 2008
@@ -1,9 +1,11 @@
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)){
+Index: freepbx-2.4.0~dfsg/amp_conf/bin/retrieve_conf
+===================================================================
+--- freepbx-2.4.0~dfsg.orig/amp_conf/bin/retrieve_conf 2008-10-24 14:41:42.000000000 +0100
++++ freepbx-2.4.0~dfsg/amp_conf/bin/retrieve_conf 2008-10-24 14:41:50.000000000 +0100
+@@ -318,9 +318,6 @@
freepbx_log('retrieve_conf', 'devel-debug', $amp_conf['AMPWEBROOT']."/admin/modules/{$key}/functions.inc.php processed OK");
}
Modified: freepbx/trunk/debian/patches/path-to-fop
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/path-to-fop?rev=6340&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/path-to-fop (original)
+++ freepbx/trunk/debian/patches/path-to-fop Wed Oct 29 13:37:15 2008
@@ -2,8 +2,10 @@
##
## Use Debian's packaged FOP (op-panel).
---- a/amp_conf/htdocs/admin/views/panel.php
-+++ b/amp_conf/htdocs/admin/views/panel.php
+Index: freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/views/panel.php
+===================================================================
+--- freepbx-2.4.0~dfsg.orig/amp_conf/htdocs/admin/views/panel.php 2008-10-24 14:39:26.000000000 +0100
++++ freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/views/panel.php 2008-10-24 14:43:01.000000000 +0100
@@ -3,7 +3,7 @@
$template['title'] = $title;
$template['content'] =
Modified: 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=6340&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/resolve_conf-report_errors-db (original)
+++ freepbx/trunk/debian/patches/resolve_conf-report_errors-db Wed Oct 29 13:37:15 2008
@@ -2,10 +2,11 @@
Upstream bug: http://freepbx.org/trac/ticket/2772
@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 @@
+Index: freepbx-2.4.0~dfsg/amp_conf/bin/retrieve_conf
+===================================================================
+--- freepbx-2.4.0~dfsg.orig/amp_conf/bin/retrieve_conf 2008-10-24 14:41:50.000000000 +0100
++++ freepbx-2.4.0~dfsg/amp_conf/bin/retrieve_conf 2008-10-24 14:42:00.000000000 +0100
+@@ -614,7 +614,18 @@
function report_errors($errno, $errstr, $errfile, $errline) {
global $cp_errors;
More information about the Pkg-voip-commits
mailing list