[Pkg-voip-commits] r3025 - in freepbx/trunk/debian: . patches
Diego Iastrubni
elcuco-guest at alioth.debian.org
Tue Jan 16 16:19:42 CET 2007
Author: elcuco-guest
Date: 2007-01-16 16:19:40 +0100 (Tue, 16 Jan 2007)
New Revision: 3025
Added:
freepbx/trunk/debian/patches/fix-enums.dpatch
freepbx/trunk/debian/patches/fix-module_admin.dpatch
Removed:
freepbx/trunk/debian/patches/alternative-css.dpatch
freepbx/trunk/debian/patches/ast-config-dirs2.dpatch
freepbx/trunk/debian/patches/check-ast-runnning.dpatch
freepbx/trunk/debian/patches/fix-index-php.dpatch
freepbx/trunk/debian/patches/fix-toplinks.dpatch
freepbx/trunk/debian/patches/fix-version-2.1.3.dpatch
freepbx/trunk/debian/patches/log-retrieve.dpatch
Modified:
freepbx/trunk/debian/control
freepbx/trunk/debian/freepbx-admin.postinst
freepbx/trunk/debian/patches/00list
freepbx/trunk/debian/patches/ast-config-dirs.dpatch
freepbx/trunk/debian/patches/clean-install-amp.dpatch
freepbx/trunk/debian/patches/disable-online-updates.dpatch
freepbx/trunk/debian/patches/fix-fop-config.dpatch
freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg.dpatch
Log:
freepbx-2.2.0 is ready for testing. i am running it on a testing device, and it looks like it's working.
cleaned up obsoleted patchs, added new ones (2 fixes available upstream or already reported). several debian
enhancements.
Modified: freepbx/trunk/debian/control
===================================================================
--- freepbx/trunk/debian/control 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/control 2007-01-16 15:19:40 UTC (rev 3025)
@@ -25,8 +25,8 @@
* view extension and trunk status with Flash Operator Panel (www.asternic.org)
* read voicemail via the browser with ARI
This is a virtual package which will install all the freepbx parts
-
-
+
+
Package: freepbx-apache-mysql
Architecture: all
Depends: apache, libapache-mod-php4, mysql-server|virtual-mysql-server, php4-mysql
@@ -67,8 +67,6 @@
mathopd and sqlite.
Please install this package before installing freepbx-admin.
-
-
Package: asterisk-config-freepbx
Architecture: all
Depends: freepbx-agi, asterisk-sounds-main, asterisk-sounds-extra, freepbx-sounds-extra|amportal-sounds-extra|amportal-sounds-extra-links, sox, libapache2-mod-php5|libapache2-mod-php4|php5-cgi|php4-cgi
@@ -112,12 +110,17 @@
Package: freepbx-modules
Architecture: all
-Depends: freepbx-admin, freepbx-module-asterisk-cli, freepbx-module-callback, freepbx-module-callforward, freepbx-module-callwaiting, freepbx-module-conferences, freepbx-module-disa, freepbx-module-donotdisturb, freepbx-module-featurecodeadmin, freepbx-module-findmefollow, freepbx-module-gabcast, freepbx-module-infoservices, freepbx-module-ivr, freepbx-module-logfiles, freepbx-module-manager, freepbx-module-miscdests, freepbx-module-paging, freepbx-module-phpinfo, freepbx-module-pinsets, freepbx-module-queues, freepbx-module-recordings, freepbx-module-ringgroups, freepbx-module-timeconditions, freepbx-module-voicemail
+Depends: freepbx-admin, freepbx-module-announcement, freepbx-module-asterisk-cli, freepbx-module-blacklist, freepbx-module-callback, freepbx-module-callforward, freepbx-module-callwaiting, freepbx-module-cidlookup, freepbx-module-conferences, freepbx-module-customerdb, freepbx-module-dictate, freepbx-module-disa, freepbx-module-donotdisturb, freepbx-module-featurecodeadmin, freepbx-module-findmefollow, freepbx-module-gabcast, freepbx-module-infoservices, freepbx-module-inventorydb, freepbx-module-ivr, freepbx-module-logfiles, freepbx-module-manager, freepbx-module-miscapps, freepbx-module-miscdests, freepbx-module-paging, freepbx-module-parking, freepbx-module-pbdirectory, freepbx-module-phonebook, freepbx-module-phpagiconf, freepbx-module-phpinfo, freepbx-module-pinsets, freepbx-module-printextensions, freepbx-module-queues, freepbx-module-recordings, freepbx-module-ringgroups, freepbx-module-speeddial, freepbx-module-timeconditions, freepbx-module-voicemail, freepbx-module-zoip
Description: FreePBX modules
This is a meta package which installs all the free modules supplied by
FreePBX. This package does not provide any file, by it just installs
a bunch of modules.
.
+ Note that freepbx-module-backup is not part of this package, as it's currently
+ broken. If you want, you can still install it manually. Same goes for
+ freepbx-module-music which needs RW permissions to some directories it
+ currently has not.
+ .
Some of the modules are not required by this package, because of license
issues. If you are looking for the non free modules, the meta package
is called freepbx-modules-nonfree.
@@ -134,7 +137,7 @@
Architecture: all
Replaces: amportal-common, freepbx-module-core
Conflicts: amportal-common, freepbx-module-core
-Depends: adduser, asterisk-config-freepbx, asterisk(>= 1.2), apache|apache2|mathopd, libapache-mod-php4|libapache2-mod-php4|libapache2-mod-php5|php5-cgi|php4-cgi, mysql-server|virtual-mysql-server|sqlite, php5-mysql|php4-mysql|php4-sqlite, php5-cli|php4-cli, php5-pear|php4-pear|php-pear, mime-construct, libdbi-perl
+Depends: adduser, asterisk-config-freepbx, asterisk(>= 1.2), apache|apache2|mathopd, libapache-mod-php4|libapache2-mod-php4|libapache2-mod-php5|php5-cgi|php4-cgi, mysql-server|virtual-mysql-server|sqlite, php5-mysql|php4-mysql|php4-sqlite, php5-cli|php4-cli, php5-pear|php-pear|php4-pear, libdbi-perl
Description: FreePBX administration panel
FreePBX (formally AMP) is a web-based GUI for Asterisk.
This package contains the common files needed for freepbx, as well as
Modified: freepbx/trunk/debian/freepbx-admin.postinst
===================================================================
--- freepbx/trunk/debian/freepbx-admin.postinst 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/freepbx-admin.postinst 2007-01-16 15:19:40 UTC (rev 3025)
@@ -61,13 +61,10 @@
sed -r -i "s|AMPBIN=[a-zA-Z0-9/]*|AMPBIN=/usr/share/asterisk/bin|" /etc/amportal.conf
echo "."
- # UPGRADE
- /usr/share/freepbx-common/install_amp --no-files
-
# do the updates needed
if /usr/share/freepbx-common/install_amp --no-files ; then
# if it works, enable the core module
- /usr/share/freepbx-common/freepbx-module-status enable core
+ /usr/share/asterisk/bin/module_admin install core
else
# this may fail for so many reasons... let the user do it itself
# after the package has been installed
@@ -92,7 +89,7 @@
if [ -x "$MYSQLADMIN" ]; then
echo "Installing FreePBX using a local MySQL server"
/usr/share/freepbx-common/freepbx-install-mysql.sh
- /usr/share/freepbx-common/freepbx-module-status enable core
+ /usr/share/asterisk/bin/module_admin install core
else
SQLITE=`which sqlite` || true
if [ -x "$SQLITE" ]; then
@@ -102,7 +99,7 @@
echo "AMPDBENGINE=sqlite" >> /etc/amportal.conf
echo "AMPDBFILE=/var/lib/asterisk/freepbx.sqlite" >> /etc/amportal.conf
/usr/share/freepbx-common/freepbx-install-sqlite.sh
- /usr/share/freepbx-common/freepbx-module-status enable core
+ /usr/share/asterisk/bin/module_admin install core
else
echo "No suitable SQL server found on this machine."
echo "Please edit manually /etc/amportal.conf"
@@ -113,7 +110,7 @@
fi
# apply new configuration
- /usr/share/freepbx-common/apply_conf.sh
+ /usr/share/freepbx-common/apply_conf.sh
# on fresh installs, we need to modify the www-data user
# this might be already done by other packages, or a previous version
Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/00list 2007-01-16 15:19:40 UTC (rev 3025)
@@ -1,17 +1,16 @@
-# fix various things which freepbx just does wrong
-#ast-config-dirs
-#clean-install-amp
-#disable-online-updates
-#fix-retrieve-op-panel-cfg
-#fix-fop-config.dpatch
-#fix-version-2.1.3
+# fix bugs
+fix-enums
+fix-module_admin
+
+# debian/xorcom enhancements
+ast-config-dirs
+fix-fop-config.dpatch
+fix-retrieve-op-panel-cfg
+disable-online-updates
+clean-install-amp
+
+# pending patches, still need to be ported
+# to freepbx-2.2
#fix-open-or-die
#fix-recordings
-#fix-toplinks
-#fix-index-php
#fix-wierd-email
-
-# backports from the trunk, nice features, fixes... why not having them as well...?
-#check-ast-runnning
-#alternative-css
-#log-retrieve
Deleted: freepbx/trunk/debian/patches/alternative-css.dpatch
===================================================================
--- freepbx/trunk/debian/patches/alternative-css.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/alternative-css.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## alternative-css.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
-##
-## DP: Add support for an alternative stylesheet by modifying amportal.conf
-## DP: This patch also adds support for key names to contain _ in the key names.
-
- at DPATCH@
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/functions.inc.php /tmp/dpep.mMP7Vx/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/functions.inc.php
---- freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/functions.inc.php 2006-09-18 17:38:42.000000000 +0300
-+++ /tmp/dpep.mMP7Vx/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/functions.inc.php 2006-10-05 12:21:32.000000000 +0200
-@@ -22,7 +22,7 @@
-
- if (is_array($file)) {
- foreach ($file as $line) {
-- if (preg_match("/^\s*([a-zA-Z0-9]+)=([a-zA-Z0-9 .&-@=_<>\"\']+)\s*$/",$line,$matches)) {
-+ if (preg_match("/^\s*([a-zA-Z0-9_]+)=([a-zA-Z0-9 .&-@=_<>\"\']+)\s*$/",$line,$matches)) {
- $conf[ $matches[1] ] = $matches[2];
- }
- }
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/header.php /tmp/dpep.mMP7Vx/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/header.php
---- freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/header.php 2006-05-05 20:41:30.000000000 +0300
-+++ /tmp/dpep.mMP7Vx/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/header.php 2006-10-05 12:21:18.000000000 +0200
-@@ -31,8 +31,23 @@
- <head>
- <title><?php echo _($title) ?></title>
- <meta http-equiv="Content-Type" content="text/html">
-- <link href="common/mainstyle.css" rel="stylesheet" type="text/css">
- <?php
-+ // nice hack:
-+ // check if in the amp configuration the user has set that
-+ // he wants to use an alternative style-sheet.
-+ // on Xorcom's TS1, it's used when the system is in rescue mode.
-+
-+ $style_sheet = "common/mainstyle.css";
-+ if (isset($amp_conf["ALTERNATIVE_CSS"]))
-+ {
-+ if (($amp_conf["ALTERNATIVE_CSS"] == "1") ||
-+ ($amp_conf["ALTERNATIVE_CSS"] == "yes") ||
-+ ($amp_conf["ALTERNATIVE_CSS"] == "true"))
-+ $style_sheet = "common/mainstyle-alternative.css";
-+ }
-+
-+ echo "<link href=\"$style_sheet\" rel=\"stylesheet\" type=\"text/css\">";
-+
- if (isset($display) && is_file("modules/{$display}/{$display}.css")) {
- echo " <link href=\"modules/{$display}/{$display}.css\" rel=\"stylesheet\" type=\"text/css\">\n";
- }
Modified: freepbx/trunk/debian/patches/ast-config-dirs.dpatch
===================================================================
--- freepbx/trunk/debian/patches/ast-config-dirs.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/ast-config-dirs.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -4,9 +4,9 @@
## DP: Allow the usage of small configuration files. ALA debian :)
@DPATCH@
-diff -urNad freepbx-2.1.1/amp_conf/astetc/extensions.conf /tmp/dpep.Om4Oog/freepbx-2.1.1/amp_conf/astetc/extensions.conf
---- freepbx-2.1.1/amp_conf/astetc/extensions.conf 2006-05-24 01:15:20.000000000 +0300
-+++ /tmp/dpep.Om4Oog/freepbx-2.1.1/amp_conf/astetc/extensions.conf 2006-08-16 12:28:11.000000000 +0300
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf /tmp/dpep.zU01BJ/freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf
+--- freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf 2006-09-07 11:52:14.000000000 +0300
++++ /tmp/dpep.zU01BJ/freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf 2006-11-28 15:04:24.000000000 +0200
@@ -13,8 +13,14 @@
; Customizations to this dialplan should be made in extensions_custom.conf
@@ -22,20 +22,3 @@
[from-trunk] ; just an alias since VoIP shouldn't be called PSTN
include => from-pstn
-diff -urNad freepbx-2.1.1/amp_conf/astetc/manager.conf /tmp/dpep.Om4Oog/freepbx-2.1.1/amp_conf/astetc/manager.conf
---- freepbx-2.1.1/amp_conf/astetc/manager.conf 2006-05-01 05:09:24.000000000 +0300
-+++ /tmp/dpep.Om4Oog/freepbx-2.1.1/amp_conf/astetc/manager.conf 2006-08-16 12:28:11.000000000 +0300
-@@ -14,4 +14,13 @@
- write = system,call,log,verbose,command,agent,user
-
- #include manager_additional.conf
-+
-+; Customizations to the manager configuration should be made in
-+; manager_custom.conf
-+; note that in future versions of this debian package
-+; this file will be deprecated, and users are strongly
-+; encouraged to put custom files in manager.d/*.conf
- #include manager_custom.conf
-+
-+; include other user/package configuration
-+#include "manager.d/*.conf"
Deleted: freepbx/trunk/debian/patches/ast-config-dirs2.dpatch
===================================================================
--- freepbx/trunk/debian/patches/ast-config-dirs2.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/ast-config-dirs2.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ast-config-dirs.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
-##
-## DP: Allow the usage of small configuration files. ALA debian :)
-
- at DPATCH@
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf /tmp/dpep.zU01BJ/freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf
---- freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf 2006-09-07 11:52:14.000000000 +0300
-+++ /tmp/dpep.zU01BJ/freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf 2006-11-28 15:04:24.000000000 +0200
-@@ -13,8 +13,14 @@
-
- ; Customizations to this dialplan should be made in extensions_custom.conf
- ; See extensions_custom.conf.sample for an example
-+; note that in future versions of this debian package
-+; this file will be deprecated, and users are strongly
-+; encouraged to put custom files in extension.d/*.conf
- #include extensions_custom.conf
-
-+; include other user/package configuration
-+#include extensions.d/*.conf
-+
- [from-trunk] ; just an alias since VoIP shouldn't be called PSTN
- include => from-pstn
-
Deleted: freepbx/trunk/debian/patches/check-ast-runnning.dpatch
===================================================================
--- freepbx/trunk/debian/patches/check-ast-runnning.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/check-ast-runnning.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## check-ast-runnning.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
-##
-## DP: Display a warning when asterisk is not responding to the manager.
-## DP: This usually means asterisk is down
-
- at DPATCH@
-diff -urNad freepbx-2.1.1/amp_conf/htdocs/admin/config.php /tmp/dpep.NjMnkU/freepbx-2.1.1/amp_conf/htdocs/admin/config.php
---- freepbx-2.1.1/amp_conf/htdocs/admin/config.php 2006-05-12 02:40:18.000000000 +0300
-+++ /tmp/dpep.NjMnkU/freepbx-2.1.1/amp_conf/htdocs/admin/config.php 2006-07-09 14:12:58.000000000 +0300
-@@ -189,6 +189,28 @@
- case 'modules':
- include 'page.modules.php';
- break;
-+
-+ case '':
-+ // on the main page, alert the user if asterisk is not running
-+ // try to reuse as much strings as needed
-+ require_once('common/php-asmanager.php');
-+ $astman = new AGI_AsteriskManager();
-+ if ($res = $astman->connect("127.0.0.1", $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"])) {
-+ $astman->disconnect();
-+ }
-+ else{
-+ echo "<style>.clsError{ border: #BB0A0A 1px solid; background-color: #ffc0c0; }</style>\n";
-+ echo "<p><div class='clsError'>\n";
-+ echo "<b>" . _("Warning:") . "</b>\n";
-+ echo "<br>";
-+ echo "<br>\n";
-+ echo _("Cannot connect to Asterisk Manager with ").$amp_conf["AMPMGRUSER"];
-+ echo "<br>";
-+ echo _("Asterisk may not be running.");
-+ echo "</div></p>\n";
-+ }
-+ break;
-+
- }
-
- //use main translation file for footer
Modified: freepbx/trunk/debian/patches/clean-install-amp.dpatch
===================================================================
--- freepbx/trunk/debian/patches/clean-install-amp.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/clean-install-amp.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -11,29 +11,28 @@
## DP: dpkg.
@DPATCH@
-diff -urNad freepbx-2.1.3.dfsg~/install_amp freepbx-2.1.3.dfsg/install_amp
---- freepbx-2.1.3.dfsg~/install_amp 2006-09-18 17:29:47.000000000 +0300
-+++ freepbx-2.1.3.dfsg/install_amp 2006-09-28 17:47:37.000000000 +0300
-@@ -73,7 +73,8 @@
+diff -urNad upstream~/install_amp upstream/install_amp
+--- upstream~/install_amp 2007-01-04 23:29:08.000000000 +0200
++++ upstream/install_amp 2007-01-14 16:51:08.000000000 +0200
+@@ -93,7 +93,7 @@
+ out(" --debug Enable debug output");
out(" --dry-run Don't actually do anything");
out(" --force-version <ver> Force upgrade from version <ver>");
- out(" --dbhost <ip address> Use a remote database server");
- out(" --no-files Just run updates without installing files");
+ out(" --no-files Just run updates without installing files (default)");
-+ out(" --install-files Just run updates and install files (dagerous!)");
+ out(" --install-moh Install default music-on-hold files (normally doesn't, unless ");
+ out(" it's a new installation)");
+ out(" --my-svn-is-correct Ignore Asterisk version, assume it is correct");
+@@ -241,7 +241,7 @@
+ return ($retVal != 0);
}
- function install_parse_amportal_conf($filename) {
-@@ -196,7 +197,7 @@
- } while(1);
- }
-
-function amp_mkdir($directory, $mode = "0755", $recursive = false) {
+function amp_mkdir($directory, $mode = "0775", $recursive = false) {
debug("mkdir ".$directory.", ".$mode);
$ntmp = sscanf($mode,"%o",$modenum); //assumes all inputs are octal
if (version_compare(phpversion(), 5.0) < 0) {
-@@ -205,6 +206,7 @@
+@@ -250,6 +250,7 @@
$output = false;
$return_value = false;
exec("mkdir -m ".$mode." -p ".$directory, $output, $return_value);
@@ -41,16 +40,24 @@
return ($return_value == 0);
} else {
return mkdir($directory, $modenum);
-@@ -259,7 +261,7 @@
+@@ -311,7 +312,7 @@
if (is_dir($source)) {
if (!file_exists($destination)) {
if ((!$dryrun) && ($destination != "")) {
- amp_mkdir($destination, "0750", true);
-+ amp_mkdir($destination, "0770", true);
++ amp_mkdir($destination, "0775", true);
}
}
}
-@@ -452,7 +454,7 @@
+@@ -528,13 +529,13 @@
+ else $amp_conf["AMPMGRPASS"] = $key;
+
+ do {
+- out("Enter the path to use for your AMP web root:\n [/var/www/html] ");
++ out("Enter the path to use for your AMP web root:\n [/var/www/] ");
+ $key = trim(fgets(STDIN,1024));
+- if (preg_match('/^$/',$key)) $amp_conf["AMPWEBROOT"] = "/var/www/html";
++ if (preg_match('/^$/',$key)) $amp_conf["AMPWEBROOT"] = "/var/www/";
else $amp_conf["AMPWEBROOT"] = rtrim($key,'/');
if (is_dir($amp_conf["AMPWEBROOT"])) {
break;
@@ -59,41 +66,15 @@
out("Created ".$amp_conf["AMPWEBROOT"]);
break;
} else {
-@@ -461,13 +463,13 @@
- } while(1);
+@@ -561,13 +562,13 @@
+ else $amp_conf["AMPEXTENSIONS"] = $key;
do {
-- out("Enter the path to use for your FOP web root:\n [/var/www/html/panel] ");
-+ out("Enter the path to use for your FOP web root:\n [/usr/share/op-panel] ");
+- out("Enter directory in which to store AMP executable scripts:\n [/var/lib/asterisk/bin] ");
++ out("Enter directory in which to store AMP executable scripts:\n [/usr/share/asterisk/bin] ");
$key = trim(fgets(STDIN,1024));
-- if (preg_match('/^$/',$key)) $amp_conf["FOPWEBROOT"] = "/var/www/html/panel";
-+ if (preg_match('/^$/',$key)) $amp_conf["FOPWEBROOT"] = "/usr/share/op-panel";
- else $amp_conf["FOPWEBROOT"] = rtrim($key,'/');
- if (is_dir($amp_conf["FOPWEBROOT"])) {
- break;
-- } else if (amp_mkdir($amp_conf["FOPWEBROOT"],"0755",true)){
-+ } else if (amp_mkdir($amp_conf["FOPWEBROOT"],"0775",true)){
- out("Created ".$amp_conf["FOPWEBROOT"]);
- break;
- } else {
-@@ -476,9 +478,9 @@
- } while(1);
-
- do {
-- outn("Enter the path to your Apache cgi-bin:\n [/var/www/cgi-bin] ");
-+ outn("Enter the path to your Apache cgi-bin:\n [/usr/lib/cgi-bin] ");
- $key = trim(fgets(STDIN,1024));
-- if (preg_match('/^$/',$key)) $amp_conf["AMPCGIBIN"] = "/var/www/cgi-bin";
-+ if (preg_match('/^$/',$key)) $amp_conf["AMPCGIBIN"] = "/usr/lib/cgi-bin";
- else $amp_conf["AMPCGIBIN"] = rtrim($key,'/');
- if (is_dir($amp_conf["AMPCGIBIN"])) break;
- else fatal($amp_conf["AMPCGIBIN"]." is not a directory!");
-@@ -502,11 +504,11 @@
- do {
- out("Enter directory in which to store AMP executable scripts:\n [/var/lib/asterisk/bin] ");
- $key = trim(fgets(STDIN,1024));
- if (preg_match('/^$/',$key)) $amp_conf["AMPBIN"] = "/var/lib/asterisk/bin";
-+ if (preg_match('/^$/',$key)) $amp_conf["AMPBIN"] = "/usr/lib/asterisk/bin";
++ if (preg_match('/^$/',$key)) $amp_conf["AMPBIN"] = "/usr/share/asterisk/bin";
else $amp_conf["AMPBIN"] = rtrim($key,'/');
if (is_dir($amp_conf["AMPBIN"])) {
break;
@@ -102,7 +83,7 @@
out("Created ".$amp_conf["AMPBIN"]);
break;
} else {
-@@ -521,7 +523,7 @@
+@@ -582,7 +583,7 @@
else $amp_conf["AMPSBIN"] = rtrim($key,'/');
if (is_dir($amp_conf["AMPSBIN"])) {
break;
@@ -111,16 +92,16 @@
out("Created ".$amp_conf["AMPSBIN"]);
break;
} else {
-@@ -551,7 +553,7 @@
+@@ -612,7 +613,7 @@
outn("Checking for PEAR DB..");
if (! @ include('DB.php')) {
out("FAILED");
- fatal("PEAR must be installed (requires DB.php). Include path: ".ini_get("include_path"));
-+ fatal("PEAR must be installed (requires DB.php). Include path: ".ini_get("include_path") . "\nPlese install the package php4-pear or similar." );
++ fatal("PEAR must be installed (requires DB.php). Include path: ".ini_get("include_path") . "\nPlease install the package php4-pear or similar." );
}
out("OK");
-@@ -560,7 +562,7 @@
+@@ -621,7 +622,7 @@
outn("Checking for PEAR Console::Getopt..");
if (! @ include("Console/Getopt.php")) {
out("FAILED");
@@ -129,80 +110,99 @@
}
out("OK");
-@@ -577,7 +579,7 @@
+@@ -638,7 +639,7 @@
$debug = false;
$dryrun = false;
-$install_files = true;
-+$install_files = false; // by default, do not install any files
++$install_files = false;
+ $override_astvers = false;
- //initialize variables to avoid php notices
- $dbhost = null;
-@@ -617,6 +619,9 @@
- case "--no-files":
+ $install_moh = false;
+@@ -687,6 +688,10 @@
$install_files = false;
out("Running upgrade only, without installing files.");
+ break;
+ case "--install-files":
+ $install_files = true;
+ out("Installing files, I hope you know what you are doying....");
++ break;
+ case "--my-svn-is-correct":
+ $override_astvers = true;
break;
- }
+@@ -755,7 +760,7 @@
+ if (!file_exists(AMP_CONF)) {
+ out(AMP_CONF." does not exist, copying default");
+ copy("amportal.conf", AMP_CONF);
+- chmod(AMP_CONF, 0640);
++ chmod(AMP_CONF, 0660);
+ collect_settings(AMP_CONF, $dbhost, $new_username, $new_password, 'asterisk');
+
+ out("Assuming new install, --install-moh added to command line");
+@@ -776,7 +781,7 @@
+
+ if (!array_key_exists("AMPWEBROOT",$amp_conf)) {
+ out("Adding AMPWEBROOT option to amportal.conf - using AMP default");
+- $amp_conf["AMPWEBROOT"] = "/var/www/html";
++ $amp_conf["AMPWEBROOT"] = "/var/www/";
}
-@@ -665,24 +670,25 @@
- if (!array_key_exists("AMPWEBROOT",$amp_conf)) {
- out("Adding AMPWEBROOT option to amportal.conf - using AMP default");
-- $amp_conf["AMPWEBROOT"] = "/var/www/html";
-+ $amp_conf["AMPWEBROOT"] = "/usr/share/freepbx";
- }
-
- if (!array_key_exists("AMPCGIBIN",$amp_conf)) {
- out("Adding AMPCGIBIN option to amportal.conf - using AMP default");
-- $amp_conf["AMPCGIBIN"] = "/var/www/cgi-bin";
-+ $amp_conf["AMPCGIBIN"] = "/usr/lib/cgi-bin";
- }
-
- if (!array_key_exists("FOPWEBROOT",$amp_conf)) {
- out("Adding FOPWEBROOT option to amportal.conf - using AMP default");
-- $amp_conf["FOPWEBROOT"] = $amp_conf["AMPWEBROOT"]."/panel";
-+ $amp_conf["FOPWEBROOT"] = "/usr/share/op-panel";
- }
-
- if (!array_key_exists("AMPBIN",$amp_conf)) {
- out("Adding AMPBIN option to amportal.conf - using AMP default");
-- $amp_conf["AMPBIN"] = "/var/lib/asterisk/bin";
-+ $amp_conf["AMPBIN"] = "/usr/share/asterisk/bin";
- }
-
-+ // todo, is this needed on debian...?
- if (!array_key_exists("AMPSBIN",$amp_conf)) {
- out("Adding AMPSBIN option to amportal.conf - using AMP default");
- $amp_conf["AMPSBIN"] = "/usr/sbin";
-@@ -710,7 +716,7 @@
- write_amportal_conf(AMP_CONF, $amp_conf);
+ if (!array_key_exists("FOPWEBROOT",$amp_conf)) {
+@@ -786,7 +791,7 @@
+
+ if (!array_key_exists("AMPBIN",$amp_conf)) {
+ out("Adding AMPBIN option to amportal.conf - using AMP default");
+- $amp_conf["AMPBIN"] = "/var/lib/asterisk/bin";
++ $amp_conf["AMPBIN"] = "/usr/share/asterisk/bin";
}
+ if (!array_key_exists("AMPSBIN",$amp_conf)) {
+@@ -822,7 +827,7 @@
+ // write amportal.conf
+ write_amportal_conf(AMP_CONF, $amp_conf);
+
-// **** Check for amportal.conf, create if necessary
+// **** Check for asterisk.conf, create if necessary
outn("Checking for ".ASTERISK_CONF."..");
if (!file_exists(ASTERISK_CONF)) {
-@@ -740,14 +746,6 @@
+@@ -845,7 +850,8 @@
+
+ this code will stay in 2.2, but in 2.3 it will be gone. developers - please
+ update your code
+- */
++
++-- on debian this is not used at all.--
+ 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']; }
+@@ -853,6 +859,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']; }
++ */
- write_amportal_conf(AMP_CONF, $amp_conf);
+ if (!isset($pbx_engine)) { $pbx_engine='asterisk'; }
+ out("Using $pbx_engine as PBX Engine");
+@@ -868,13 +875,16 @@
+ if ($exitcode != 0) {
+ fatal("Error executing asterisk: be sure Asterisk is installed and in the path");
+ }
++/*
++-- on debian we do not do this thing --
++ see http://www.freepbx.org/trac/ticket/1679
+ if (!$fd = fopen($amp_conf['ASTETCDIR'].'/version','w')) {
+ fatal('Cannot open '.$amp_conf['ASTETCDIR'].'/version for writing');
+ }
+ fwrite($fd, $tmpout);
+ fclose($fd);
+ // change to read-only
+-chmod($amp_conf['ASTETCDIR'].'/version',0444);
++chmod($amp_conf['ASTETCDIR'].'/version',0444);*/
--// **** Check for func_callerid.so - this is only in asterisk 1.2
--
--outn("Checking for Asterisk 1.2..");
--if (!file_exists($amp_conf["ASTMODDIR"]."/func_callerid.so")) {
-- fatal("Asterisk 1.2 is required for this version of freePBX");
--}
--out("OK");
--
- // **** Make sure selinux isn't enabled
- outn("Checking for selinux..");
-@@ -781,7 +779,7 @@
+ // normally this would be the contents of ASTETCDIR/version, but this is for simplicity, as we just read it above
+@@ -943,7 +953,7 @@
// datasource in in this style: dbengine://username:password@host/database
if (!function_exists($db_engine.'_connect')) {
out("FAILED");
@@ -211,7 +211,7 @@
}
$datasource = $db_engine.'://'.$db_user.':'.$db_pass.'@'.$db_host.'/'.$db_name;
-@@ -847,7 +845,7 @@
+@@ -1009,7 +1019,7 @@
$md5sums = read_md5_file(UPGRADE_DIR."/".$version.".md5");
recursive_copy("amp_conf", "", $md5sums);
if (!is_file("/etc/asterisk/voicemail.conf")) copy("/etc/asterisk/voicemail.conf.template","/etc/asterisk/voicemail.conf");
@@ -220,7 +220,7 @@
out("OK");
}
-@@ -855,8 +853,6 @@
+@@ -1017,29 +1027,15 @@
debug("Running ".dirname(__FILE__)."/apply_conf.sh");
outn("Configuring install for your environment..");
if (!$dryrun) {
@@ -229,10 +229,15 @@
exec(dirname(__FILE__)."/apply_conf.sh");
}
out("OK");
-@@ -868,18 +864,6 @@
- amp_mkdir($asterisk_conf["astspooldir"]."/fax","0766",true);
-
+ // **** Create spool directories for monitor and fax
+ if (!is_dir($asterisk_conf["astspooldir"]."/monitor"))
+- amp_mkdir($asterisk_conf["astspooldir"]."/monitor","0766",true);
++ amp_mkdir($asterisk_conf["astspooldir"]."/monitor","0775",true);
+ if (!is_dir($asterisk_conf["astspooldir"]."/fax"))
+- amp_mkdir($asterisk_conf["astspooldir"]."/fax","0766",true);
+-
+-
-// **** Set permissions all files
-
-if ($install_files)
@@ -243,23 +248,35 @@
- }
- out("OK");
-}
--
--
++ amp_mkdir($asterisk_conf["astspooldir"]."/fax","0775",true);
+
+
// **** Read upgrades/ directory
+@@ -1077,19 +1073,24 @@
+ out("Generating AMP configs..OK");
- outn("Checking for upgrades..");
-@@ -920,14 +904,6 @@
+ // **** Bounce FOP
++/*
++TODO still unavailable in debian
+ outn("Restarting Flash Operator Panel..");
+ exec('su - asterisk -c "'.$amp_conf["AMPWEBROOT"].'/admin/bounce_op.sh"');
out("OK");
++*/
$version = install_getversion();
--$filename = $amp_conf["AMPWEBROOT"]."/admin/version.txt";
--if (!$fd = fopen($filename, "w")) {
++/*
++-- on debian we do not do this thing --
++ see http://www.freepbx.org/trac/ticket/1679
+ $filename = $amp_conf["AMPWEBROOT"]."/admin/version.txt";
+ if (!$fd = fopen($filename, "w")) {
- fatal("Could not open ".$filename." for writing");
--}
--fwrite($fd, $version);
--fclose($fd);
++ fatal("Could not open ".$filename." for writing");
+ }
+ fwrite($fd, $version);
+ fclose($fd);
-
-
++*/
// **** Set reload flag for AMP admin
install_needreload();
Modified: freepbx/trunk/debian/patches/disable-online-updates.dpatch
===================================================================
--- freepbx/trunk/debian/patches/disable-online-updates.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/disable-online-updates.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -5,13 +5,30 @@
## DP: configuration in amportal.conf
@DPATCH@
-diff -urNad freepbx-2.1.3.dfsg~/amp_conf/htdocs/admin/page.modules.php freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/page.modules.php
---- freepbx-2.1.3.dfsg~/amp_conf/htdocs/admin/page.modules.php 2006-09-21 06:04:12.000000000 +0300
-+++ freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/page.modules.php 2006-09-28 17:34:48.000000000 +0300
-@@ -5,6 +5,15 @@
+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
+@@ -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.
+ */
++
++/*
++on debian we force the usage of the package managment.
+ if (!isset($amp_conf['AMPEXTERNPACKAGES']) || ($amp_conf['AMPEXTERNPACKAGES'] != 'true')) {
+ define('EXTERNAL_PACKAGE_MANAGEMENT', 0);
+ } else {
+ define('EXTERNAL_PACKAGE_MANAGEMENT', 1);
+ }
++*/
++define('EXTERNAL_PACKAGE_MANAGEMENT', 1);
- $installed = find_allmodules();
+ $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
+@@ -28,6 +33,15 @@
+ uninstall - uninstall local module
+ */
+
+if (isset($amp_conf["AMP_ONLINE_UPDATE"])) {
+ $packager_mode = (strtolower($amp_conf["AMP_ONLINE_UPDATE"]) == "true" );
+}
@@ -24,205 +41,3 @@
function pageReload(){
return "";
//return "<script language=\"Javascript\">document.location='".$_SERVER['PHP_SELF']."?".$_SERVER['QUERY_STRING']."&foo=".rand()."'</script>";
-@@ -18,12 +27,11 @@
- installModule($module,$_POST[$module.'_version']);
- else
- echo "<div class=\"error\">"._("Module install script failed to run")."</div>";
-- break;
-- case "uninstall":
-- if (runModuleSQL($module,'uninstall'))
-- uninstallModule($module);
-- else
-- echo "<div class=\"error\">"._("Module uninstall script failed to run")."</div>";
-+ break;
-+ if (runModuleSQL($module,'uninstall'))
-+ uninstallModule($module);
-+ else
-+ echo "<div class=\"error\">"._("Module uninstall script failed to run")."</div>";
- break;
- case "enable":
- enableModule($module);
-@@ -34,12 +42,22 @@
- echo pageReload();
- break;
- case "delete":
-+ if ($packager_mode){
-+ echo "<div class=\"error\">" . _("Deleting modules is not supported on packager mode.") . _("Use your distribution packaging system for manipulating modules.") . "</div>";
-+ break;
-+ }
-+
- deleteModule($module);
- rmModule($module);
-- break;
-+ break;
- case "download":
-+ if ($packager_mode){
-+ echo "<div class=\"error\">" . _("Downloading modules is not supported on packager mode.");
-+ echo _("Use your distribution packaging system for manipulating modules.") . "</div>";
-+ break;
-+ }
- fetchModule($module);
-- break;
-+ break;
- case "upgrade":
- upgradeModule($module);
- break;
-@@ -62,6 +80,12 @@
- }
- break;
- case "downloadinstall": // download, install and enable
-+ if ($packager_mode){
-+ echo "<div class=\"error\">" . _("Downloading not supported on packager mode.") .
-+ _("Use your distribution packaging system for manipulating modules.") . "</div>";
-+ break;
-+ }
-+
- fetchModule($module);
- if (runModuleSQL($module,'install'))
- installModule($module,$_POST[$module.'_version']);
-@@ -70,6 +94,11 @@
- enableModule($module);
- break;
- case "downloadupdate": //download and update
-+ if ($packager_mode){
-+ echo "<div class=\"error\">" . _("Downloading not supported on packager mode.") .
-+ _("Use your distribution packaging system for manipulating modules.") . "</div>";
-+ break;
-+ }
- fetchModule($module);
- upgradeModule($module);
- break;
-@@ -98,6 +127,15 @@
- <?php
- switch($extdisplay) {
- case "online":
-+ if ($packager_mode)
-+ {
-+ echo "<h2>";
-+ echo _("Module Administration (online)");
-+ echo "</h2>";
-+ echo _("This feature has been disabled in this version of FreePBX.");
-+ echo _("Use your distribution packaging system for manipulating modules.");
-+ }
-+
- echo "<h2>";
- echo _("Module Administration (online)");
- echo "</h2>";
-@@ -123,7 +161,8 @@
- echo "<h2>";
- echo _("Module Administration");
- echo "</h2>";
-- echo "<a href='config.php?display=modules&type=tool&extdisplay=online'>"._("Connect to Online Module Repository")."</a>\n";
-+ if (!$packager_mode)
-+ echo "<a href='config.php?display=modules&type=tool&extdisplay=online'>"._("Connect to Online Module Repository")."</a>\n";
- $installed = find_allmodules();
- $dispMods = new displayModules($installed);
- echo $dispMods->drawModules();
-@@ -144,6 +183,7 @@
- var $html;
- //constructor
- function displayModules($installed,$online=false) {
-+ global $packager_mode;
- // So, we have an array with several:
- /*
- [phpinfo] => Array
-@@ -294,14 +334,26 @@
- $color = "white";
- $rows .= $this->tableHtml($mod,$color);
- }
-- $this->options = "
-- <select name=\"modaction\">
-- <option value=\"disable\">"._("Disable Selected")."
-- <option value=\"uninstall\">"._("Uninstall Selected")."
-- <option value=\"uninstalldelete\">"._("Uninstall and Delete Selected")."
-- </select>
-- <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-- ";
-+
-+ if ($packager_mode){
-+ $this->options = "
-+ <select name=\"modaction\">
-+ <option value=\"disable\">"._("Disable Selected")."
-+ <option value=\"uninstall\">"._("Uninstall Selected")."
-+ </select>
-+ <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-+ ";
-+ }
-+ else {
-+ $this->options = "
-+ <select name=\"modaction\">
-+ <option value=\"disable\">"._("Disable Selected")."
-+ <option value=\"uninstall\">"._("Uninstall Selected")."
-+ <option value=\"uninstalldelete\">"._("Uninstall and Delete Selected")."
-+ </select>
-+ <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-+ ";
-+ }
- // build the table
- $this->html .= $this->formStart(_("Enabled Modules"));
- $this->html .= $rows;
-@@ -317,14 +369,24 @@
- $color = "white";
- $rows .= $this->tableHtml($mod,$color);
- }
-- $this->options = "
-- <select name=\"modaction\">
-- <option value=\"enable\">"._("Enable Selected")."
-- <option value=\"uninstall\">"._("Uninstall Selected")."
-- <option value=\"uninstalldelete\">"._("Uninstall and Delete Selected")."
-- </select>
-- <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-- ";
-+
-+ if ($packager_mode)
-+ $this->options = "
-+ <select name=\"modaction\">
-+ <option value=\"enable\">"._("Enable Selected")."
-+ <option value=\"uninstall\">"._("Uninstall Selected")."
-+ </select>
-+ <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-+ ";
-+ else
-+ $this->options = "
-+ <select name=\"modaction\">
-+ <option value=\"enable\">"._("Enable Selected")."
-+ <option value=\"uninstall\">"._("Uninstall Selected")."
-+ <option value=\"uninstalldelete\">"._("Uninstall and Delete Selected")."
-+ </select>
-+ <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-+ ";
- // build the table
- $this->html .= $this->formStart(_("Disabled Modules"));
- $this->html .= $rows;
-@@ -340,13 +402,24 @@
- $color = "white";
- $rows .= $this->tableHtml($mod,$color);
- }
-- $this->options = "
-- <select name=\"modaction\">
-- <option value=\"installenable\">"._("Enable Selected")."
-- <option value=\"delete\">"._("Delete Selected")."
-- </select>
-- <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-- ";
-+
-+ if ($packager_mode){
-+ $this->options = "
-+ <select name=\"modaction\">
-+ <option value=\"installenable\">"._("Enable Selected")."
-+ </select>
-+ <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-+ ";
-+ }
-+ else {
-+ $this->options = "
-+ <select name=\"modaction\">
-+ <option value=\"installenable\">"._("Enable Selected")."
-+ <option value=\"delete\">"._("Delete Selected")."
-+ </select>
-+ <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-+ ";
-+ }
- // build the table
- $this->html .= $this->formStart(_("Not Installed Local Modules"));
- $this->html .= $rows;
Added: freepbx/trunk/debian/patches/fix-enums.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-enums.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/fix-enums.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-enums.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
+##
+## DP: Fix an enum bug, as reported by http://www.freepbx.org/2007/01/06/whoops-enum-lookups-broken-in-220/
+
+ at DPATCH@
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/astetc/extensions.conf freepbx-2.2.0~dfsg/amp_conf/astetc/extensions.conf
+--- freepbx-2.2.0~dfsg~/amp_conf/astetc/extensions.conf 2007-01-05 00:32:40.000000000 +0200
++++ freepbx-2.2.0~dfsg/amp_conf/astetc/extensions.conf 2007-01-14 11:42:04.000000000 +0200
+@@ -425,7 +425,7 @@
+ ; to 1: Be compliant with all the depreciated bits in asterisk 1.2 and
+ ; above, and 2: to give a good shot at attempting to be compliant with
+ ; RFC3761 by honouring the order in which records are returned.
+-exten => s,1,GotoIf($["${ARG3}" = ""]?PASSWD:NOPASSWD); arg3 is pattern password
++exten => s,1,GotoIf($["${ARG3}" != ""“”]?PASSWD:NOPASSWD); arg3 is pattern password
+ exten => s,n(PASSWD),Authenticate(${ARG3})
+ exten => s,n(NOPASSWD),Macro(user-callerid,SKIPTTL)
+ exten => s,n,Macro(record-enable,${CALLERID(number)},OUT)
Property changes on: freepbx/trunk/debian/patches/fix-enums.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: freepbx/trunk/debian/patches/fix-fop-config.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-fop-config.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/fix-fop-config.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -12,44 +12,35 @@
@DPATCH@
-diff -urNad freepbx-2.1.1/amp_conf/htdocs_panel/op_server.cfg /tmp/dpep.U4TyWY/freepbx-2.1.1/amp_conf/htdocs_panel/op_server.cfg
---- freepbx-2.1.1/amp_conf/htdocs_panel/op_server.cfg 2006-05-13 09:01:22.000000000 +0300
-+++ /tmp/dpep.U4TyWY/freepbx-2.1.1/amp_conf/htdocs_panel/op_server.cfg 2006-08-16 17:12:42.000000000 +0300
-@@ -3,8 +3,8 @@
+diff -urNad upstream~/amp_conf/htdocs_panel/op_server.cfg upstream/amp_conf/htdocs_panel/op_server.cfg
+--- upstream~/amp_conf/htdocs_panel/op_server.cfg 2006-09-16 11:19:23.000000000 +0300
++++ upstream/amp_conf/htdocs_panel/op_server.cfg 2007-01-14 12:24:43.000000000 +0200
+@@ -11,8 +11,8 @@
manager_host=127.0.0.1
; user and secret for connecting to * manager
--manager_user=user
--manager_secret=secret
-+manager_user=op-panel
-+manager_secret=op_panel_password
+-manager_user=UNUSED
+-manager_secret=UNUSED
++manager_user=user
++manager_secret=password
; The optional event_mask for filtering manager events.
; Asterisk will send only the events you request
-@@ -31,14 +31,14 @@
+@@ -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.
--web_hostname=www.myexample.com
-+web_hostname=
+-web_hostname=UNUSED
++;web_hostname=
; location of the .swf file in your disk (must reside somewhere
; inside your web root)
--flash_dir=/var/www/html/panel
+-flash_dir=UNUSED
+flash_dir=/usr/share/op-panel/flash/
; secret code for performing hangups and transfers
--security_code=dkd4393kld
+-security_code=UNUSED
+security_code=password
; Frequency in second to poll for sip and iax status
poll_interval=120
-@@ -170,7 +170,7 @@
- ; extension at context, it will originate a call to
- ; voicemailmain when double clicking on the MWI icon
- ; for any button.
--voicemail_extension = 3000 at features
-+;# voicemail_extension = 3000 at features
-
- ; You can have panel contexts with their own
- ; button layout and configuration. The following entry
Deleted: freepbx/trunk/debian/patches/fix-index-php.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-index-php.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/fix-index-php.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-index-php.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
-##
-## DP: The default index.php shiped with freepbx contains broken html,
-## DP: because it does not include "footer.php". This patch fixed it,
-## DP: and also unsets $_SESSION["AMP_user"], this way the "inyourface"
-## DP: bar is not displayed on that page
-
- at DPATCH@
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/index.php /tmp/dpep.lbyARy/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/index.php
---- freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/index.php 2006-05-12 01:34:09.000000000 +0300
-+++ /tmp/dpep.lbyARy/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/index.php 2006-12-06 14:35:42.000000000 +0200
-@@ -94,7 +94,6 @@
-
-
-
--</div>
-
- <script language="javascript">
- <!--
-@@ -107,3 +106,7 @@
- //-->
- </script>
-
-+<?php
-+$_SESSION["AMP_user"] = null;
-+include "footer.php";
-+?>
Added: freepbx/trunk/debian/patches/fix-module_admin.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-module_admin.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/fix-module_admin.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-module_admin.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
+##
+## DP: Create a connection to the manager in the module_admin
+
+ at DPATCH@
+diff -urNad upstream~/amp_conf/bin/module_admin upstream/amp_conf/bin/module_admin
+--- upstream~/amp_conf/bin/module_admin 2007-01-14 14:00:02.000000000 +0200
++++ upstream/amp_conf/bin/module_admin 2007-01-14 16:38:31.000000000 +0200
+@@ -52,7 +52,7 @@
+ }
+
+ function init_amportal_environment($ampconfpath) {
+- global $amp_conf, $asterisk_conf, $db;
++ global $amp_conf, $asterisk_conf, $db, $astman;
+
+ if (!file_exists($ampconfpath)) {
+ fatal('Cannot find conf file: '.$ampconfpath);
+@@ -68,12 +68,18 @@
+ }
+ // include the functions file from WEBROOT
+ include(AMP_BASE_INCLUDE_PATH.'/functions.inc.php');
+-
++ include(AMP_BASE_INCLUDE_PATH.'/common/php-asmanager.php');
++
+ // now apply the real parse function (this makes some default assumptions and does a bit more error checking)
+ $amp_conf = parse_amportal_conf($ampconfpath);
+
+ $asterisk_conf = parse_asterisk_conf("/etc/asterisk/asterisk.conf");
+
++ $astman= new AGI_AsteriskManager();
++ if (! $res = $astman->connect("127.0.0.1", $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"])) {
++ unset( $astman );
++ }
++
+ // connect to database
+ if (!file_exists(AMP_BASE_INCLUDE_PATH.'/common/db_connect.php')) {
+ fatal('Cannot locate '.AMP_BASE_INCLUDE_PATH.'/common/db_connect.php');
Property changes on: freepbx/trunk/debian/patches/fix-module_admin.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -1,41 +1,18 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix-retrieve-op-panel-cfg.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
##
-## DP: By default freePBX's script saves into the webroot.
-## DP: it should save the config into /etc/op-panel/freepbx
+## DP: By default freePBX's script saves into the webroot. it should save the config into /etc/op-panel
@DPATCH@
-diff -urNad freepbx-2.1.1/amp_conf/bin/retrieve_op_conf_from_mysql.pl /tmp/dpep.IKHN0O/freepbx-2.1.1/amp_conf/bin/retrieve_op_conf_from_mysql.pl
---- freepbx-2.1.1/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2006-04-25 19:44:45.000000000 +0300
-+++ /tmp/dpep.IKHN0O/freepbx-2.1.1/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2006-08-16 16:54:32.000000000 +0300
-@@ -31,7 +31,7 @@
-
-
- $zapataconf="/etc/asterisk/zapata.conf";
--$zapataautoconf="/etc/asterisk/zapata-auto.conf";
-+$zapataautoconf="/etc/asterisk/zapata-channels.conf";
-
- if (-e $zapataconf) {
- @zaplines = parse_zapata($zapataconf);
-@@ -108,7 +108,7 @@
+diff -urNad upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl /tmp/dpep.XTjPf1/upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl
+--- upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2006-03-06 17:07:41.000000000 +0200
++++ /tmp/dpep.XTjPf1/upstream/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2006-05-14 13:32:56.000000000 +0300
+@@ -98,7 +98,7 @@
$ampconf = parse_amportal_conf( "/etc/amportal.conf" );
# WARNING: this file will be substituted by the output of this program
-$op_conf = $ampconf->{"AMPWEBROOT"}."/panel/op_buttons_additional.cfg";
-+$op_conf = "/etc/op-panel/freepbx/op_buttons_additional.cfg";
++$op_conf = "/etc/op-panel/op_buttons_additional.cfg";
# username to connect to the database
$username = $ampconf->{"AMPDBUSER"};
# password to connect to the database
-diff -urNad freepbx-2.1.1/amp_conf/htdocs_panel/op_buttons.cfg /tmp/dpep.IKHN0O/freepbx-2.1.1/amp_conf/htdocs_panel/op_buttons.cfg
---- freepbx-2.1.1/amp_conf/htdocs_panel/op_buttons.cfg 2005-03-16 00:10:19.000000000 +0200
-+++ /tmp/dpep.IKHN0O/freepbx-2.1.1/amp_conf/htdocs_panel/op_buttons.cfg 2006-08-16 16:54:56.000000000 +0300
-@@ -1,7 +1,7 @@
--include => op_buttons_additional.cfg
-+include => freepbx/op_buttons_additional.cfg
-
- ; use this for your customizations to FOP
--include => op_buttons_custom.cfg
-+include => freepbx/op_buttons_custom.cfg
-
- [rectangle]
- x=492
Deleted: freepbx/trunk/debian/patches/fix-toplinks.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-toplinks.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/fix-toplinks.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-toplinks.dpatch by <diego at boole>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/header.php /tmp/dpep.QH14HN/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/header.php
---- freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/header.php 2006-05-05 20:41:30.000000000 +0300
-+++ /tmp/dpep.QH14HN/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/header.php 2006-11-28 14:52:28.000000000 +0200
-@@ -102,15 +102,15 @@
- </a>
- <?php } ?>
-
--<?php if (is_file("../panel/index_amp.php")){ ?>
-+<?php if (is_file("panel/index_amp.php")){ ?>
- <a id="<?php echo ($currentFile=='panel.php' ? 'current':'') ?>" href="panel.php?">
- •
- <li><?php echo _("Panel") ?></li>
- </a>
- <?php } ?>
-
--<?php if (is_file("../recordings/index.php")){ ?>
-- <a href="../recordings/index.php" target="_blank">
-+<?php if (is_file("recordings/index.php")){ ?>
-+ <a href="recordings/index.php" target="_blank">
- •
- <li><?php echo _("Recordings") ?></li>
- </a>
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/panel.php /tmp/dpep.QH14HN/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/panel.php
---- freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/panel.php 2006-04-11 00:06:12.000000000 +0300
-+++ /tmp/dpep.QH14HN/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/panel.php 2006-11-28 14:54:38.000000000 +0200
-@@ -22,7 +22,7 @@
- include 'header_auth.php';
- ?>
- </div>
--<iframe width="97%" height="600" frameborder="0" align="top" src="../panel/index_amp.php?context=<?php echo $_SESSION["AMP_user"]->_deptname?>"></iframe>
-+<iframe width="97%" height="600" frameborder="0" align="top" src="panel/index_amp.php?context=<?php echo $_SESSION["AMP_user"]->_deptname?>"></iframe>
-
- </body>
- </html>
Deleted: freepbx/trunk/debian/patches/fix-version-2.1.3.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-version-2.1.3.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/fix-version-2.1.3.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -1,49 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-version-2.1.3.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
-##
-## DP: Fix tarball contains a bug which identifies this verison as 2.1.2 and not
-## DP: 2.1.3. This fixes it, and also makes an update for installed versions.
-
- at DPATCH@
-diff -urNad freepbx-2.1.3.dfsg/install_amp /tmp/dpep.2WVQnT/freepbx-2.1.3.dfsg/install_amp
---- freepbx-2.1.3.dfsg/install_amp 2006-11-26 12:30:45.000000000 +0200
-+++ /tmp/dpep.2WVQnT/freepbx-2.1.3.dfsg/install_amp 2006-11-26 12:30:58.000000000 +0200
-@@ -30,7 +30,8 @@
- '2.1beta3',
- '2.1.0',
- '2.1.1',
-- '2.1.2'
-+ '2.1.2',
-+ '2.1.3'
- );
-
- define("AMP_CONF", "/etc/amportal.conf");
-diff -urNad freepbx-2.1.3.dfsg/SQL/newinstall.sql /tmp/dpep.2WVQnT/freepbx-2.1.3.dfsg/SQL/newinstall.sql
---- freepbx-2.1.3.dfsg/SQL/newinstall.sql 2006-09-26 01:43:11.000000000 +0300
-+++ /tmp/dpep.2WVQnT/freepbx-2.1.3.dfsg/SQL/newinstall.sql 2006-11-26 12:30:45.000000000 +0200
-@@ -64,7 +64,7 @@
-
- /*!40000 ALTER TABLE `admin` DISABLE KEYS */;
- LOCK TABLES `admin` WRITE;
--INSERT INTO `admin` VALUES ('need_reload','true'),('version','2.1.2');
-+INSERT INTO `admin` VALUES ('need_reload','true'),('version','2.1.3');
- UNLOCK TABLES;
- /*!40000 ALTER TABLE `admin` ENABLE KEYS */;
-
-diff -urNad freepbx-2.1.3.dfsg/SQL/newinstall.sqlite.sql /tmp/dpep.2WVQnT/freepbx-2.1.3.dfsg/SQL/newinstall.sqlite.sql
---- freepbx-2.1.3.dfsg/SQL/newinstall.sqlite.sql 2006-04-26 23:52:54.000000000 +0300
-+++ /tmp/dpep.2WVQnT/freepbx-2.1.3.dfsg/SQL/newinstall.sqlite.sql 2006-11-26 12:30:45.000000000 +0200
-@@ -27,7 +27,7 @@
- --
-
- INSERT INTO admin VALUES ('need_reload', 'false');
--INSERT INTO admin VALUES ('version','2.0.0');
-+INSERT INTO admin VALUES ('version','2.1.3');
- -- --------------------------------------------------------
-
- --
-diff -urNad freepbx-2.1.3.dfsg/upgrades/2.1.3/fix-version.sql /tmp/dpep.2WVQnT/freepbx-2.1.3.dfsg/upgrades/2.1.3/fix-version.sql
---- freepbx-2.1.3.dfsg/upgrades/2.1.3/fix-version.sql 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.2WVQnT/freepbx-2.1.3.dfsg/upgrades/2.1.3/fix-version.sql 2006-11-26 12:30:45.000000000 +0200
-@@ -0,0 +1 @@
-+UPDATE admin SET value = '2.1.3' WHERE variable = 'version'
Deleted: freepbx/trunk/debian/patches/log-retrieve.dpatch
===================================================================
--- freepbx/trunk/debian/patches/log-retrieve.dpatch 2007-01-15 12:37:02 UTC (rev 3024)
+++ freepbx/trunk/debian/patches/log-retrieve.dpatch 2007-01-16 15:19:40 UTC (rev 3025)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## log-retrieve.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
-##
-## DP: backport from the trunk (2.2.x): retrieve_conf will send it's output to /var/log/
-
- at DPATCH@
-diff -urNad freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/footer.php /tmp/dpep.7rnVmA/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/footer.php
---- freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/footer.php 2006-06-18 15:42:17.000000000 +0300
-+++ /tmp/dpep.7rnVmA/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/footer.php 2006-11-21 16:54:44.000000000 +0200
-@@ -65,8 +65,8 @@
-
- //run retrieve script
- $retrieve = $amp_conf['AMPBIN'].'/retrieve_conf';
-- exec($retrieve.'>/dev/null');
--
-+ exec($retrieve.'>& ' . $asterisk_conf['astlogdir'] . "/freepbx-retrieve.log" );
-+
- require_once('common/php-asmanager.php');
- $astman = new AGI_AsteriskManager();
- if ($res = $astman->connect("127.0.0.1", $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"])) {
-@@ -81,8 +81,8 @@
-
- //bounce op_server.pl
- $wOpBounce = rtrim($_SERVER['SCRIPT_FILENAME'],$currentFile).'bounce_op.sh';
-- exec($wOpBounce.'>/dev/null');
--
-+ exec($wOpBounce.'>& ' . $asterisk_conf['astlogdir'] . "/freepbx-opbounce.log" );
-+
- //store asterisk reloaded status
- $sql = "UPDATE admin SET value = 'false' WHERE variable = 'need_reload'";
- $result = $db->query($sql);
More information about the Pkg-voip-commits
mailing list