[Pkg-voip-commits] r5195 - in /freepbx/trunk/debian/patches: clean-install-amp disable-online-updates fix-ari-link fix-fop-config fix-retrieve-op-panel-cfg path-to-fop
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Fri Feb 8 22:53:59 UTC 2008
Author: tzafrir-guest
Date: Fri Feb 8 22:53:59 2008
New Revision: 5195
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5195
Log:
Refreshing applied patches.
Modified:
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/path-to-fop
Modified: freepbx/trunk/debian/patches/clean-install-amp
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/clean-install-amp?rev=5195&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/clean-install-amp (original)
+++ freepbx/trunk/debian/patches/clean-install-amp Fri Feb 8 22:53:59 2008
@@ -8,10 +8,9 @@
## some dependencies checking, as they are already taken care by
## dpkg.
-diff -urNad freepbx-2.3.0~dfsg~/install_amp freepbx-2.3.0~dfsg/install_amp
---- freepbx-2.3.0~dfsg~/install_amp 2007-07-28 21:09:05.000000000 +0300
-+++ freepbx-2.3.0~dfsg/install_amp 2007-09-20 12:25:08.000000000 +0200
-@@ -7,12 +7,12 @@
+--- a/install_amp
++++ b/install_amp
+@@ -7,12 +7,12 @@ require_once ("libfreepbx.install.php");
define("AMP_CONF", "/etc/amportal.conf");
define("ASTERISK_CONF", "/etc/asterisk/asterisk.conf");
define("UPGRADE_DIR", dirname(__FILE__)."/upgrades");
@@ -28,7 +27,7 @@
$ampbin_dir = "/var/lib/asterisk/bin";
$asterisk_user = "asteriskuser";
$asterisk_pass = "amp109";
-@@ -115,7 +115,7 @@
+@@ -113,7 +113,7 @@ function showHelp() {
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.");
@@ -37,7 +36,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");
-@@ -391,7 +391,7 @@
+@@ -387,7 +387,7 @@ function collect_settings($filename, $db
if (is_dir($amp_conf["AMPSBIN"])) {
break;
@@ -46,7 +45,7 @@
out("Created ".$amp_conf["AMPSBIN"]);
break;
} else {
-@@ -615,6 +615,10 @@
+@@ -611,6 +611,10 @@ foreach ($args[0] as $arg) {
$install_files = false;
out("Running upgrade only, without installing files.");
break;
@@ -57,7 +56,7 @@
case "--my-svn-is-correct":
$override_astvers = true;
break;
-@@ -690,7 +694,7 @@
+@@ -686,7 +690,7 @@ outn("Checking if Asterisk is running.."
exec("pidof asterisk", $pid_val, $ret);
if ($ret) {
out("FAILED");
@@ -66,7 +65,7 @@
}
out("running with PID: ".$pid_val[0]."..OK");
-@@ -705,7 +709,7 @@
+@@ -701,7 +705,7 @@ if (!file_exists(AMP_CONF)) {
// this addresses http://freepbx.org/trac/ticket/1878
chown(AMP_CONF, "asterisk");
chgrp(AMP_CONF, "asterisk");
@@ -75,7 +74,7 @@
collect_settings(AMP_CONF, $dbhost, $new_username, $new_password, 'asterisk');
-@@ -727,7 +731,7 @@
+@@ -723,7 +727,7 @@ out("OK");
if (!array_key_exists("AMPWEBROOT",$amp_conf)) {
out("Adding AMPWEBROOT option to amportal.conf - using AMP default");
@@ -84,7 +83,7 @@
}
if (!array_key_exists("FOPWEBROOT",$amp_conf)) {
-@@ -737,7 +741,7 @@
+@@ -733,7 +737,7 @@ if (!array_key_exists("FOPWEBROOT",$amp_
if (!array_key_exists("AMPBIN",$amp_conf)) {
out("Adding AMPBIN option to amportal.conf - using AMP default");
@@ -93,7 +92,7 @@
}
if (!array_key_exists("AMPSBIN",$amp_conf)) {
-@@ -773,7 +777,7 @@
+@@ -769,7 +773,7 @@ if (isset($dbname)) {
// write amportal.conf
write_amportal_conf(AMP_CONF, $amp_conf);
@@ -102,7 +101,7 @@
outn("Checking for ".ASTERISK_CONF."..");
if (!file_exists(ASTERISK_CONF)) {
-@@ -796,7 +800,8 @@
+@@ -792,7 +796,8 @@ out("OK");
this code will stay in 2.2, but in 2.3 it will be gone. developers - please
update your code
@@ -112,7 +111,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']; }
-@@ -804,6 +809,7 @@
+@@ -800,6 +805,7 @@ if (isset($asterisk_conf['astagidir']))
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']; }
@@ -120,7 +119,7 @@
if (!isset($pbx_engine)) { $pbx_engine='asterisk'; }
out("Using $pbx_engine as PBX Engine");
-@@ -815,17 +821,20 @@
+@@ -811,17 +817,20 @@ write_amportal_conf(AMP_CONF, $amp_conf)
// **** Write asterisk version to ASTETCDIR/version
$tmpoutput = '';
@@ -143,7 +142,7 @@
// normally this would be the contents of ASTETCDIR/version, but this is for simplicity, as we just read it above
-@@ -904,25 +913,7 @@
+@@ -900,25 +909,7 @@ switch ($db_engine)
break;
case "sqlite":
@@ -170,7 +169,7 @@
break;
case "sqlite3":
-@@ -932,6 +923,13 @@
+@@ -928,6 +919,13 @@ switch ($db_engine)
if (isset($amp_conf["AMPDBFILE"]) == "")
die("AMPDBFILE in /etc/amportal.conf cannot be blank");
@@ -184,7 +183,7 @@
require_once('DB/sqlite3.php');
$datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
$db = DB::connect($datasource);
-@@ -979,15 +977,15 @@
+@@ -975,15 +973,15 @@ if ($install_files)
}
// **** Apply amportal.conf configuration to files
@@ -203,7 +202,7 @@
if (file_exists($amp_conf["AMPBIN"]."/freepbx_engine")) {
exec("chmod u+x ".$amp_conf["AMPBIN"]."/freepbx_engine");
outn("freepbx_engine..");
-@@ -999,7 +997,7 @@
+@@ -995,7 +993,7 @@ if (!$dryrun) {
// reload manager in asterisk if it is running:
//
outn("apply username/password changes to conf files..");
@@ -212,7 +211,7 @@
out("done");
// reload manager in asterisk if it was running:
-@@ -1016,7 +1014,7 @@
+@@ -1012,7 +1010,7 @@ if (!is_dir($asterisk_conf["astspooldir"
// **** Set permissions all files
@@ -221,7 +220,7 @@
if ($install_files)
{
outn("Setting permissions on files..");
-@@ -1024,7 +1022,7 @@
+@@ -1020,7 +1018,7 @@ if ($install_files)
exec($amp_conf["AMPSBIN"]."/amportal chown");
}
out("OK");
@@ -230,7 +229,7 @@
// Run through all the upgrade scripts starting at the specified version
//
-@@ -1034,7 +1032,7 @@
+@@ -1030,7 +1028,7 @@ upgrade_all($version);
out("Generating AMP configs..");
generate_configs();
out("Generating AMP configs..OK");
@@ -239,7 +238,7 @@
$version = install_getversion();
$filename = $amp_conf["AMPWEBROOT"]."/admin/version.txt";
if (!$fd = fopen($filename, "w")) {
-@@ -1047,7 +1045,7 @@
+@@ -1043,7 +1041,7 @@ fclose($fd);
outn("Restarting Flash Operator Panel..");
exec('su - asterisk -c "'.$amp_conf["AMPBIN"].'/bounce_op.sh"');
out("OK");
@@ -248,7 +247,7 @@
// Now force an install for all modules that are packaged with the tarball
// directory.
-@@ -1064,7 +1062,7 @@
+@@ -1060,7 +1058,7 @@ install_needreload();
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=5195&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/disable-online-updates (original)
+++ freepbx/trunk/debian/patches/disable-online-updates Fri Feb 8 22:53:59 2008
@@ -2,9 +2,8 @@
##
## configuration in amportal.conf
-diff -urNad upstream~/amp_conf/htdocs/admin/page.modules.php upstream/amp_conf/htdocs/admin/page.modules.php
---- upstream~/amp_conf/htdocs/admin/page.modules.php 2007-01-04 20:31:02.000000000 +0200
-+++ upstream/amp_conf/htdocs/admin/page.modules.php 2007-01-14 12:46:50.000000000 +0200
+--- a/amp_conf/htdocs/admin/page.modules.php
++++ b/amp_conf/htdocs/admin/page.modules.php
@@ -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.
@@ -22,9 +21,9 @@
$extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
-@@ -28,6 +33,15 @@
- uninstall - uninstall local module
- */
+@@ -35,6 +40,15 @@ $freepbx_version = get_framework_version
+ $freepbx_version = $freepbx_version ? $freepbx_version : getversion();
+ $freepbx_help_url = "http://www.freepbx.org/freepbx-help-system?freepbx_version=".urlencode($freepbx_version);
+if (isset($amp_conf["AMP_ONLINE_UPDATE"])) {
+ $packager_mode = (strtolower($amp_conf["AMP_ONLINE_UPDATE"]) == "true" );
Modified: freepbx/trunk/debian/patches/fix-ari-link
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/fix-ari-link?rev=5195&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-ari-link (original)
+++ freepbx/trunk/debian/patches/fix-ari-link Fri Feb 8 22:53:59 2008
@@ -2,10 +2,9 @@
##
## Fix a link to ARI (the recordings) in the top bar.
-diff -urNad freepbx-2.3.0~dfsg~/amp_conf/htdocs/admin/views/freepbx.php freepbx-2.3.0~dfsg/amp_conf/htdocs/admin/views/freepbx.php
---- freepbx-2.3.0~dfsg~/amp_conf/htdocs/admin/views/freepbx.php 2007-08-24 22:34:49.000000000 +0300
-+++ freepbx-2.3.0~dfsg/amp_conf/htdocs/admin/views/freepbx.php 2007-09-20 11:19:20.000000000 +0200
-@@ -29,7 +29,7 @@
+--- 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, $
if ($new_window === true) {
$html .= "target=\"_blank\" ";
} else {
@@ -14,7 +13,7 @@
//$html .= "onClick=\"return menu_popup(this, '$new_window')\" ";
}
}
-@@ -165,7 +165,7 @@
+@@ -165,7 +165,7 @@ if ($reload_needed) {
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=5195&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-fop-config (original)
+++ freepbx/trunk/debian/patches/fix-fop-config Fri Feb 8 22:53:59 2008
@@ -9,9 +9,8 @@
## - use a sane default password for the UI
## - use a default passwords for the manager
-diff -urNad freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_server.cfg freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_server.cfg
---- freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_server.cfg 2007-02-26 10:29:49.000000000 +0000
-+++ freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_server.cfg 2007-02-26 10:31:41.000000000 +0000
+--- a/amp_conf/htdocs_panel/op_server.cfg
++++ b/amp_conf/htdocs_panel/op_server.cfg
@@ -11,8 +11,8 @@
manager_host=127.0.0.1
@@ -23,7 +22,7 @@
; The optional event_mask for filtering manager events.
; Asterisk will send only the events you request
-@@ -39,14 +39,14 @@
+@@ -39,14 +39,14 @@ auth_md5=1
; 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=5195&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg (original)
+++ freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg Fri Feb 8 22:53:59 2008
@@ -3,11 +3,10 @@
## By default freePBX's script saves into the webroot. it should save
## the config into /etc/op-panel/freepbx
-diff -urNad freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_op_conf_from_mysql.pl freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl
---- freepbx-2.2.0~dfsg~/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2007-02-26 10:29:49.000000000 +0000
-+++ freepbx-2.2.0~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2007-02-26 10:34:23.000000000 +0000
-@@ -138,7 +138,7 @@
- $ampconf = parse_amportal_conf( "/etc/amportal.conf" );
+--- 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{
+ $ampconf = parse_amportal_conf( $amportalconf );
# WARNING: this file will be substituted by the output of this program
-$op_conf = $ampconf->{"AMPWEBROOT"}."/panel/op_buttons_additional.cfg";
@@ -15,9 +14,8 @@
# username to connect to the database
$username = $ampconf->{"AMPDBUSER"};
# password to connect to the database
-diff -urNad freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_buttons.cfg freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_buttons.cfg
---- freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_buttons.cfg 2006-10-16 01:57:56.000000000 +0100
-+++ freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_buttons.cfg 2007-02-26 10:36:17.000000000 +0000
+--- a/amp_conf/htdocs_panel/op_buttons.cfg
++++ b/amp_conf/htdocs_panel/op_buttons.cfg
@@ -1,7 +1,7 @@
-include => op_buttons_additional.cfg
+include => freepbx/op_buttons_additional.cfg
Modified: freepbx/trunk/debian/patches/path-to-fop
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/path-to-fop?rev=5195&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/path-to-fop (original)
+++ freepbx/trunk/debian/patches/path-to-fop Fri Feb 8 22:53:59 2008
@@ -2,9 +2,8 @@
##
## Use Debian's packaged FOP (op-panel).
-diff -urNad freepbx-2.3.0~dfsg~/amp_conf/htdocs/admin/views/panel.php freepbx-2.3.0~dfsg/amp_conf/htdocs/admin/views/panel.php
---- freepbx-2.3.0~dfsg~/amp_conf/htdocs/admin/views/panel.php 2007-07-26 08:55:59.000000000 +0300
-+++ freepbx-2.3.0~dfsg/amp_conf/htdocs/admin/views/panel.php 2007-09-19 16:47:35.000000000 +0200
+--- a/amp_conf/htdocs/admin/views/panel.php
++++ b/amp_conf/htdocs/admin/views/panel.php
@@ -3,7 +3,7 @@
$template['title'] = $title;
$template['content'] =
More information about the Pkg-voip-commits
mailing list