[Pkg-voip-commits] r2790 - in freepbx/trunk/debian: . patches rapid
rapid/astetc
Diego Iastrubni
elcuco-guest at alioth.debian.org
Wed Dec 6 14:31:40 CET 2006
Author: elcuco-guest
Date: 2006-12-06 14:31:40 +0100 (Wed, 06 Dec 2006)
New Revision: 2790
Added:
freepbx/trunk/debian/asterisk-config-freepbx.examples
freepbx/trunk/debian/patches/ast-config-dirs2.dpatch
freepbx/trunk/debian/patches/fix-index-php.dpatch
freepbx/trunk/debian/patches/fix-open-or-die.dpatch
freepbx/trunk/debian/patches/fix-recordings.dpatch
freepbx/trunk/debian/patches/fix-toplinks.dpatch
freepbx/trunk/debian/patches/fix-version-2.1.3.dpatch
freepbx/trunk/debian/patches/fix-wierd-email.dpatch
freepbx/trunk/debian/patches/log-retrieve.dpatch
freepbx/trunk/debian/rapid/astetc/manager.conf.template
freepbx/trunk/debian/rapid/astetc/musiconhold_custom.conf.sample
freepbx/trunk/debian/rapid/freepbx-enable-all-modules
Removed:
freepbx/trunk/debian/freepbx.dirs
freepbx/trunk/debian/patches/fix-konqueror-blinks.dpatch
freepbx/trunk/debian/patches/fix-reload-on-no-asterisk.dpatch
Modified:
freepbx/trunk/debian/TODO.Debian
freepbx/trunk/debian/changelog
freepbx/trunk/debian/control
freepbx/trunk/debian/freepbx-admin.install
freepbx/trunk/debian/freepbx-admin.postinst
freepbx/trunk/debian/patches/00list
freepbx/trunk/debian/rapid/apply_conf.sh
freepbx/trunk/debian/rapid/astetc/logger.conf
freepbx/trunk/debian/rapid/astetc/musiconhold.conf
freepbx/trunk/debian/rapid/astetc/phpagi.conf
freepbx/trunk/debian/rapid/freepbx-module-status
Log:
* Fixed the control file to support php4, php5, mysql4, mysql5 and other variations.
This is done by a series of virtual packages.
* asterisk-config-freepbx: all configuration files are stored as examples files as well
If someone deletes a file, or modifies it, he will be able to recover it from
/usr/share/doc/asterisk-config-freepbx/examples
* asterisk-config-freepbx: configuration files contain minimal documentation (backport from amportal packages)
Most of the config files contain links to http://voip-info.org/wiki/
* asterisk-config-freepbx: system recording are saved in ASTVARLIB/sounds/custom and not /tmp (fix-recordings.dpatch)
Official code from freepbx saves the temporary files in /tmp. When the IVR wizard ends, it then copies
the file. Renaming the file is not possible, since /tmp/ and /var/lib/asteris/sounds/custom maybe on differnet
partitions or devices. The new code saves the tmp file in /var/lib/asteris/sounds/custom under a new
name, and then only renames it in the end.
* freepbx-admin: many bug fixes in freepbx-modules-status (status is working, enabling a module will also try to upgrade it if needed)
* freepbx-admin: fixed some typos in the help of freepbx-module-status
The command line utility for manupulating freepbx-modules should be in workig state now.
* freepbx-admin: added a new patch for alternative configuraiton support
A patch for displaying freePBX with different colors
* freepbx-admin: log of the retriev_conf script is stored in the log directory (backport from the trunk, log-retrieve.dpatch)
Backport from the trunk: each time you press the "in your face bar" the output of the retrieve_conf
command is stored at /var/log/asterisk/freepbx-retrieve.log
* freepbx-admin: package identifies itself as 2.1.3, and not 2.1.2 (fix-version-2.1.3.dpatch)
A bug in freepbx tarball has been addressed here.
* freepbx-admin: ari and op-panel are correctly detected by the gui now (fix-toplinks.dpatch)
In this version, freepbx is saved in /usr/share/freepbx and not /usr/share/freepbx/admin.
This caused the op-panel and ARI not to be recognized by the GUI.
* freepbx-admin: better support for php+mysql on Etch systems
On Etch systems, mysql.so is incuded by a special file /etc/php4/conf.d/mysql.ini,
do not overrite the main config file. On php5, do nothing.
* freepbx-admin: fixed html code on index.php (fix-index-php.dpatch)
The HTML code in the official release is broken. This fixes it.
* freepbx-admin: email validation on extensions page was too restrictive (fix-wierd-email.dpatch)
The email validation on the extension's voicemail page was too restrictive. emails like: ruth at sales
was invalid. We are more flexible :)
I probably forgot some other changes....
Still TODO:
- freepbx modules are not imported yet
- op-panel is not working yet.
- move to 2.2.0 (when it's out)
Modified: freepbx/trunk/debian/TODO.Debian
===================================================================
--- freepbx/trunk/debian/TODO.Debian 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/TODO.Debian 2006-12-06 13:31:40 UTC (rev 2790)
@@ -1,5 +1,5 @@
* more testing
-* finish the support for sqlite
-* test other http servers
+* finish the support for sqlite (migrate to sqlite3...?)
+* test other http servers, mathopd is supported, but new httpd servers are welcomed
* find a more generic way of dialing with httpd servers and sql servers
-* find a way to remove the www-data from the group asterisk
+* find a way to remove the www-data from the group asterisk (ari is the problem right now)
Added: freepbx/trunk/debian/asterisk-config-freepbx.examples
===================================================================
--- freepbx/trunk/debian/asterisk-config-freepbx.examples 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/asterisk-config-freepbx.examples 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,2 @@
+amp_conf/astetc/*
+debian/rapid/astetc/*
Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/changelog 2006-12-06 13:31:40 UTC (rev 2790)
@@ -4,12 +4,26 @@
[Diego Iastrubni]
* New upstream release
- * freepbx-common: many bug fixes in freepbx-modules-status (status is working,
- enabling a module will also try to upgrade it if needed.
- * freepbx-common: added a new patch for alternative configuraiton support
* Removed patch fix-konqueror-blinks, as it was merged upstream
* Removed patch fix-reload-on-no-asterisk, as it was merged upstream
* Many lintian fixes (works on sarge, but not etch... fun fun fun...)
+ * Fixed the control file to support php4, php5, mysql4, mysql5 and other variations.
+
+ * asterisk-config-freepbx: all configuration files are stored as examples files as well
+ * asterisk-config-freepbx: configuration files contain minimal documentation (backport from amportal packages)
+ * asterisk-config-freepbx: system recording are saved in ASTVARLIB/sounds/custom and not /tmp (fix-recordings.dpatch)
+ * freepbx-admin: many bug fixes in freepbx-modules-status (status is working, enabling a module will also try to upgrade it if needed)
+ * freepbx-admin: fixed some typos in the help of freepbx-module-status
+ * freepbx-admin: added a new patch for alternative configuraiton support
+ * freepbx-admin: log of the retriev_conf script is stored in the log directory (backport from the trunk, log-retrieve.dpatch)
+ * freepbx-admin: package identifies itself as 2.1.3, and not 2.1.2 (fix-version-2.1.3.dpatch)
+ * freepbx-admin: ari and op-panel are correctly detected by the gui now (fix-toplinks.dpatch)
+ * freepbx-admin: better support for php+mysql on Etch systems
+ * freepbx-admin: fixed html code on index.php (fix-index-php.dpatch)
+ * freepbx-admin: email validation on extensions page was too restrictive (fix-wierd-email.dpatch)
+
+ [Tzafrir Cohen]
+ * freepbx-panel: Fix incorrect invocation of invoke-rc.d on freepbx-panel.prerm
-- Diego Iastrubni <diego.iastrubni at xorcom.com> Wed, 27 Sep 2006 12:36:11 +0300
Modified: freepbx/trunk/debian/control
===================================================================
--- freepbx/trunk/debian/control 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/control 2006-12-06 13:31:40 UTC (rev 2790)
@@ -4,6 +4,7 @@
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Diego Iastrubni <diego.iastrubni at xorcom.com>
Build-Depends: debhelper (>= 4.0.0), sharutils, sox, dpatch
+Build-Depends-Indep: sharutils
#Standards-Version: 3.6.1
Standards-Version: 3.7.2
@@ -29,7 +30,7 @@
Package: freepbx-apache-mysql
Architecture: all
Depends: apache, libapache-mod-php4, mysql-server|virtual-mysql-server, php4-mysql
-Description: FreePBX - apache+mysql support package
+Description: FreePBX - apache+mysql support package
Dummy package to install all packages needed for installing FreePBX
with mysql and apache1.
Please install this package before installing freepbx-admin
@@ -42,6 +43,14 @@
mysql and apache2.
Please install this package before installing freepbx-admin.
+Package: freepbx-apache2-mysql-php5
+Architecture: all
+Depends: apache2, libapache2-mod-php5, mysql-server|virtual-mysql-server, php5-mysql
+Description: FreePBX - apache2+mysql5 support package
+ Dummy package to install all packages needed for installing FreePBX with
+ mysql5 and apache2.
+ Please install this package before installing freepbx-admin.
+
Package: freepbx-mathopd-mysql
Architecture: all
Depends: mathopd, php4-cgi, mysql-server|virtual-mysql-server, php4-mysql
@@ -62,7 +71,7 @@
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, php4-cgi|php5-cgi
+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
Provides: asterisk-config-custom
Replaces: asterisk-config, asterisk-config-amportal
Conflicts: asterisk-config-amportal, amportal-agi
@@ -94,7 +103,7 @@
Package: freepbx-agi
Architecture: all
-Depends: php5-cli | php4-cli, asterisk (>= 1.2)
+Depends: php5-cli|php4-cli, asterisk (>= 1.2)
Replaces: amportal-agi
Conflicts: amportal-agi
Description: agi support for FreePBX
@@ -125,7 +134,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-php5|libapache2-mod-php4|php4-cgi, mysql-server|virtual-mysql-server|sqlite, php5-mysql|php4-mysql|php5-mysql|php4-sqlite, php5-cli|php4-cli, php5-pear|php4-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|php4-pear|php-pear, mime-construct, 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.install
===================================================================
--- freepbx/trunk/debian/freepbx-admin.install 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/freepbx-admin.install 2006-12-06 13:31:40 UTC (rev 2790)
@@ -21,6 +21,7 @@
debian/rapid/freepbx-remove-*.sh usr/share/freepbx-common/
debian/rapid/freepbx-post-reload usr/share/freepbx-common/
debian/rapid/freepbx-module-status usr/share/freepbx-common/
+debian/rapid/freepbx-enable-all-modules usr/share/freepbx-common/
debian/rapid/post-reload/* usr/share/freepbx-common/post-reload/
SQL/*.sql usr/share/freepbx-common/sql/
Modified: freepbx/trunk/debian/freepbx-admin.postinst
===================================================================
--- freepbx/trunk/debian/freepbx-admin.postinst 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/freepbx-admin.postinst 2006-12-06 13:31:40 UTC (rev 2790)
@@ -33,15 +33,25 @@
case "$1" in
configure)
- check_file "/etc/php4/cgi/php.ini"
- check_file "/etc/php4/cli/php.ini"
- check_file "/etc/php4/apache/php.ini"
- check_file "/etc/php4/apache2/php.ini"
+ # we check only php4, as php5 on etch has other (smarter) tricks
+ # on php4+etch, if this trick is enabled, do not check for this
+ # at all.
+ if [ ! -f /etc/php4/conf.d/mysql.ini ]; then
+ check_file "/etc/php4/cgi/php.ini"
+ check_file "/etc/php4/cli/php.ini"
+ check_file "/etc/php4/apache/php.ini"
+ check_file "/etc/php4/apache2/php.ini"
+ fi
# echo -n "Fixing webroot permissions"
# chown -R www-data.www-data /usr/share/freepbx/admin/modules
# chmod -R g+rw /usr/share/freepbx/admin/modules
+ # fix log permissions, if not available - create them
+ touch /var/log/asterisk/
+ for i in retrieve opbounce; do j=/var/log/asterisk/freepbx-$i.log; touch $j; chown asterisk.asterisk $j; chmod g+rw $j; done
+
+ # is this an upgrade? or clean install?
if [ -e /etc/amportal.conf ]; then
# if you upgarde freepbx from amp you might get a wrong AMPWEBROOT.
# The webroot is part to this package then we fix it by force
@@ -53,6 +63,23 @@
# 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
+ else
+ # this may fail for so many reasons... let the user do it itself
+ # after the package has been installed
+ echo \
+"Upgrade failed, continuing anyway. Fix your system and execute:
+ /usr/share/freepbx-common/install_amp --no-files
+
+You may want also to enable the code module using this command
+(this can be done from the GUI as well):
+ /usr/share/freepbx-common/freepbx-module-status enable core
+"
+ fi
else
# NEW INSTALL
cp /usr/share/freepbx-common/amportal.conf /etc/amportal.conf
@@ -65,6 +92,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
else
SQLITE=`which sqlite` || true
if [ -x "$SQLITE" ]; then
@@ -74,6 +102,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
else
echo "No suitable SQL server found on this machine."
echo "Please edit manually /etc/amportal.conf"
@@ -84,21 +113,8 @@
fi
# apply new configuration
- /usr/share/freepbx-common/apply_conf.sh
+ /usr/share/freepbx-common/apply_conf.sh
- # 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
- else
- # this may fail for so many reasons... let the user do it itself
- # after the package has been installed
- echo \
-"Upgrade failed, continueing anyway. Fix your system and execute:
- /usr/share/freepbx-common/install_amp --no-files
-"
- fi
-
# on fresh installs, we need to modify the www-data user
# this might be already done by other packages, or a previous version
# of this package.
Deleted: freepbx/trunk/debian/freepbx.dirs
===================================================================
--- freepbx/trunk/debian/freepbx.dirs 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/freepbx.dirs 2006-12-06 13:31:40 UTC (rev 2790)
@@ -1,13 +0,0 @@
-/usr/lib/cgi-bin/
-/usr/share/freepbx/_asterisk/
-/usr/share/freepbx/recordings/
-/usr/share/freepbx/recordings/includes/
-/usr/share/freepbx/recordings/locale/
-/usr/share/freepbx/recordings/locale/el_GR/
-/usr/share/freepbx/recordings/locale/es_ES/
-/usr/share/freepbx/recordings/locale/fr_FR/
-/usr/share/freepbx/recordings/locale/pt_BR/
-/usr/share/freepbx/recordings/locale/sv_SE/
-/usr/share/freepbx/recordings/misc/
-/usr/share/freepbx/recordings/modules/
-/usr/share/freepbx/recordings/theme/
Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/patches/00list 2006-12-06 13:31:40 UTC (rev 2790)
@@ -1,14 +1,17 @@
# 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
-clean-install-amp
+fix-version-2.1.3
+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
-
-# obsolete pachtes
-#fix-konqueror-blinks
-#fix-reload-on-no-asterisk
+log-retrieve
Added: freepbx/trunk/debian/patches/ast-config-dirs2.dpatch
===================================================================
--- freepbx/trunk/debian/patches/ast-config-dirs2.dpatch 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/patches/ast-config-dirs2.dpatch 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,24 @@
+#! /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
+
Property changes on: freepbx/trunk/debian/patches/ast-config-dirs2.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: freepbx/trunk/debian/patches/fix-index-php.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-index-php.dpatch 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/patches/fix-index-php.dpatch 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,28 @@
+#! /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";
++?>
Property changes on: freepbx/trunk/debian/patches/fix-index-php.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: freepbx/trunk/debian/patches/fix-konqueror-blinks.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-konqueror-blinks.dpatch 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/patches/fix-konqueror-blinks.dpatch 2006-12-06 13:31:40 UTC (rev 2790)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-konqueror-blinks.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Konqueror was detected as IE. This causeed blinks on the page and lost of HTML forms.
-
- at DPATCH@
-diff -urNad freepbx-2.1.1.obsolete.0.673625482552783/amp_conf/htdocs/admin/common/script.js.php /tmp/dpep.EGmNCR/freepbx-2.1.1.obsolete.0.673625482552783/amp_conf/htdocs/admin/common/script.js.php
---- freepbx-2.1.1.obsolete.0.673625482552783/amp_conf/htdocs/admin/common/script.js.php 2006-05-05 19:51:19.000000000 +0300
-+++ /tmp/dpep.EGmNCR/freepbx-2.1.1.obsolete.0.673625482552783/amp_conf/htdocs/admin/common/script.js.php 2006-08-22 16:08:31.000000000 +0300
-@@ -25,6 +25,20 @@
- Is_DOM = (document.getElementById) ? true : false;
- Is_NS4 = (document.layers) ? true : false;
- Is_IE = (document.all) ? true : false;
-+
-+// detect for konqueror, taken from
-+// http://www.javascript-source.com/
-+var detect = navigator.userAgent.toLowerCase();
-+if (checkIt('konqueror'))
-+ Is_IE = false;
-+
-+function checkIt(string)
-+{
-+ place = detect.indexOf(string) + 1;
-+ thestring = string;
-+ return place;
-+}
-+
- Is_IE4 = Is_IE && !Is_DOM;
- Is_Mac = (navigator.appVersion.indexOf("Mac") != -1);
- Is_IE4M = Is_IE4 && Is_Mac;
Added: freepbx/trunk/debian/patches/fix-open-or-die.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-open-or-die.dpatch 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/patches/fix-open-or-die.dpatch 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,132 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-open-or-die.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
+##
+## DP: Fix some perl syntax issues.
+
+ at DPATCH@
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/ampbackup.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/ampbackup.pl
+--- freepbx-2.1.3.dfsg/amp_conf/bin/ampbackup.pl 2005-06-10 21:33:43.000000000 +0300
++++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/ampbackup.pl 2006-11-26 12:03:32.000000000 +0200
+@@ -52,7 +52,7 @@
+ # the name of the database our tables are kept
+ $database = "asterisk";
+
+-open(FILE, "/etc/amportal.conf") || die "Failed to open amportal.conf\n";
++open(FILE, "/etc/amportal.conf") || die "Failed to open amportal.conf (!$)\n";
+ while (<FILE>) {
+ chomp; # no newline
+ s/#.*//; # no comments
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/fax-process.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/fax-process.pl
+--- freepbx-2.1.3.dfsg/amp_conf/bin/fax-process.pl 2006-06-09 01:23:09.000000000 +0300
++++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/fax-process.pl 2006-11-26 12:03:57.000000000 +0200
+@@ -74,7 +74,7 @@
+ # Lets make sure that we know about a file...
+ die $usage unless $file;
+ # and that the file exists...
+-open FILE, $file or die "Error opening $file: $!";
++open (FILE, $file) or die "Error opening $file: $!";
+ # Oh, did we possibly not specify an attachment name?
+ $attachment = $file unless ($attachment);
+
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_backup_cron_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_backup_cron_from_mysql.pl
+--- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_backup_cron_from_mysql.pl 2006-09-11 05:56:34.000000000 +0300
++++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_backup_cron_from_mysql.pl 2006-11-26 12:01:52.000000000 +0200
+@@ -40,7 +40,7 @@
+ $hostname = $ampconf->{"AMPDBHOST"};
+
+ ################### END OF CONFIGURATION #######################
+-open(FILE, "/etc/amportal.conf") || die "Failed to open amportal.conf\n";
++open(FILE, "/etc/amportal.conf") or die "Failed to open amportal.conf (!$)\n";
+ while (<FILE>) {
+ chomp; # no newline
+ s/#.*//; # no comments
+@@ -58,7 +58,7 @@
+ $password = $User_Preferences{"AMPDBPASS"};
+
+
+-open EXTEN, ">$Backup_cron" or die "Cannot create\/overwrite cron file: $Backup_cron\n";
++open EXTEN, ">$Backup_cron" or die "Cannot create\/overwrite cron file: $Backup_cron (!$)\n";
+
+ $dbh = DBI->connect("dbi:mysql:dbname=$database;host=$hostname", "$username", "$password");
+
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_iax_conf_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_iax_conf_from_mysql.pl
+--- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_iax_conf_from_mysql.pl 2006-04-25 23:40:47.000000000 +0300
++++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_iax_conf_from_mysql.pl 2006-11-26 12:04:34.000000000 +0200
+@@ -67,7 +67,7 @@
+ exit;
+ }
+
+-open EXTEN, ">$iax_conf" or die "Cannot create/overwrite extensions file: $iax_conf\n";
++open (EXTEN, ">$iax_conf") or die "Cannot create/overwrite extensions file: $iax_conf (!$)\n";
+ $additional = "";
+ my @resultSet = @{$result};
+ if ( $#resultSet > -1 ) {
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl
+--- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2006-11-26 12:00:17.000000000 +0200
++++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl 2006-11-26 12:02:21.000000000 +0200
+@@ -53,7 +53,7 @@
+
+ $zaplabel="Zap \%c";
+ $lastlabelnum=0;
+- open ZAPATA, "<$conffile" || die "Cannot open config file: $zapataconf\n";
++ open( ZAPATA, "<$conffile" ) or die "Cannot open config file: $zapataconf (!$)\n";
+ while( $line = <ZAPATA> ) {
+ next if $line =~ /^(\s)*$/;
+ chomp($line);
+@@ -143,7 +143,7 @@
+ $dbh = DBI->connect("dbi:SQLite2:dbname=$db_file","","");
+ }
+
+-open EXTEN, ">$op_conf" || die "Cannot create/overwrite config file: $op_conf\n";
++open( EXTEN, ">$op_conf" ) or die "Cannot create/overwrite config file: $op_conf (!$)\n";
+
+ #First, populate extensions
+
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl
+--- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl 2006-02-17 00:40:17.000000000 +0200
++++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_parse_amportal_conf.pl 2006-11-26 12:00:17.000000000 +0200
+@@ -11,7 +11,7 @@
+ my $filename = $_[0];
+ my %ampconf;
+
+- open(AMPCONF, $filename) || die "Cannot open $filename";
++ open(AMPCONF, $filename) or die "Cannot open $filename (!$)";
+
+ while (<AMPCONF>)
+ {
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_queues_conf_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_queues_conf_from_mysql.pl
+--- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_queues_conf_from_mysql.pl 2006-03-06 17:07:41.000000000 +0200
++++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_queues_conf_from_mysql.pl 2006-11-26 12:02:43.000000000 +0200
+@@ -62,7 +62,7 @@
+ exit;
+ }
+
+-open EXTEN, ">$queues_conf" or die "Cannot create/overwrite extensions file: $queues_conf\n";
++open EXTEN, ">$queues_conf" or die "Cannot create/overwrite extensions file: $queues_conf (!$)\n";
+ $additional = "";
+ my @resultSet = @{$result};
+ if ( $#resultSet > -1 ) {
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_sip_conf_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_sip_conf_from_mysql.pl
+--- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_sip_conf_from_mysql.pl 2006-04-25 23:40:47.000000000 +0300
++++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_sip_conf_from_mysql.pl 2006-11-26 12:02:54.000000000 +0200
+@@ -66,7 +66,7 @@
+ exit;
+ }
+
+-open EXTEN, ">$sip_conf" or die "Cannot create/overwrite extensions file: $sip_conf\n";
++open EXTEN, ">$sip_conf" or die "Cannot create/overwrite extensions file: $sip_conf (!$)\n";
+ $additional = "";
+ my @resultSet = @{$result};
+ if ( $#resultSet > -1 ) {
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_zap_conf_from_mysql.pl /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_zap_conf_from_mysql.pl
+--- freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_zap_conf_from_mysql.pl 2006-04-25 23:40:47.000000000 +0300
++++ /tmp/dpep.hkL9wn/freepbx-2.1.3.dfsg/amp_conf/bin/retrieve_zap_conf_from_mysql.pl 2006-11-26 12:03:13.000000000 +0200
+@@ -66,7 +66,7 @@
+ exit;
+ }
+
+-open EXTEN, ">$zap_conf" or die "Cannot create/overwrite extensions file: $zap_conf\n";
++open EXTEN, ">$zap_conf" or die "Cannot create/overwrite extensions file: $zap_conf ($!)\n";
+ $additional = "";
+ my @resultSet = @{$result};
+ if ( $#resultSet > -1 ) {
Added: freepbx/trunk/debian/patches/fix-recordings.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-recordings.dpatch 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/patches/fix-recordings.dpatch 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-recordings.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
+##
+## DP: temporary calls should not be saved in /tmp, but in the sounds dir. This way
+## DP: we can rename them to the correct names in an atomic command
+
+ at DPATCH@
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf /tmp/dpep.c51xrf/freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf
+--- freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf 2006-11-26 15:15:22.000000000 +0200
++++ /tmp/dpep.c51xrf/freepbx-2.1.3.dfsg/amp_conf/astetc/extensions.conf 2006-11-26 15:17:11.000000000 +0200
+@@ -543,11 +543,11 @@
+ [macro-systemrecording]
+ exten => s,1,Goto(${ARG1},1)
+
+-exten => dorecord,1,Record(/tmp/${CALLERID(number)}-ivrrecording:wav)
++exten => dorecord,1,Record(custom/ivr-tmp-${CALLERID(number)}-ivrrecording:wav)
+ exten => dorecord,n,Wait(1)
+ exten => dorecord,n,Goto(confmenu,1)
+
+-exten => docheck,1,Playback(/tmp/${CALLERID(number)}-ivrrecording)
++exten => docheck,1,Playback(custom/ivr-tmp-${CALLERID(number)}-ivrrecording)
+ exten => docheck,n,Wait(1)
+ exten => docheck,n,Goto(confmenu,1)
+
Property changes on: freepbx/trunk/debian/patches/fix-recordings.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: freepbx/trunk/debian/patches/fix-reload-on-no-asterisk.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-reload-on-no-asterisk.dpatch 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/patches/fix-reload-on-no-asterisk.dpatch 2006-12-06 13:31:40 UTC (rev 2790)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-reload-on-no-asterisk.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
-##
-## DP: this fixes a problem caused by a "need reload" request when
-## DP: the manager does not respond. backport from the branch.
-
- at DPATCH@
-diff -urNad freepbx-2.1.1/amp_conf/htdocs/admin/footer.php /tmp/dpep.v2AoWw/freepbx-2.1.1/amp_conf/htdocs/admin/footer.php
---- freepbx-2.1.1/amp_conf/htdocs/admin/footer.php 2006-04-27 19:11:31.000000000 +0300
-+++ /tmp/dpep.v2AoWw/freepbx-2.1.1/amp_conf/htdocs/admin/footer.php 2006-09-13 15:06:37.157453735 +0300
-@@ -80,10 +80,10 @@
- */
- //reload asterisk
- $astman->send_request('Command', array('Command'=>'reload'));
-+ $astman->disconnect();
- } else {
- echo _("Cannot connect to Asterisk Manager with ").$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"];
- }
-- $astman->disconnect();
-
- //bounce op_server.pl
- $wOpBounce = rtrim($_SERVER['SCRIPT_FILENAME'],$currentFile).'bounce_op.sh';
Added: freepbx/trunk/debian/patches/fix-toplinks.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-toplinks.dpatch 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/patches/fix-toplinks.dpatch 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,41 @@
+#! /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>
Property changes on: freepbx/trunk/debian/patches/fix-toplinks.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: freepbx/trunk/debian/patches/fix-version-2.1.3.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-version-2.1.3.dpatch 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/patches/fix-version-2.1.3.dpatch 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,49 @@
+#! /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'
Property changes on: freepbx/trunk/debian/patches/fix-version-2.1.3.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: freepbx/trunk/debian/patches/fix-wierd-email.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-wierd-email.dpatch 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/patches/fix-wierd-email.dpatch 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-wierd-email.dpatch by Diego IAstrubni <diego.iastrubni at xorcom.com>
+##
+## DP: stock code from freepbx.org:
+## DP: on some places, internal emails are used, and they do not always contains
+## DP: a subdomain (a valid email can be "ruth at sales")
+
+ at DPATCH@
+diff -urNad freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/common/script.js.php /tmp/dpep.7jLVlW/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/common/script.js.php
+--- freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/common/script.js.php 2006-08-22 16:26:29.000000000 +0300
++++ /tmp/dpep.7jLVlW/freepbx-2.1.3.dfsg/amp_conf/htdocs/admin/common/script.js.php 2006-12-06 14:44:49.000000000 +0200
+@@ -193,12 +193,20 @@
+ if ((i >= sLength) || (s.charAt(i) != "@")) return false;
+ else i += 2;
+
++/*
++stock code from freepbx.org:
++on some places, internal emails are used, and they do not always contains
++a subdomain (a valid email can be "ruth at sales")
++
+ // look for .
+ while ((i < sLength) && (s.charAt(i) != ".")) {
+ i++;
+ }
+ if ((i >= sLength - 1) || (s.charAt(i) != ".")) return false;
+ else return true;
++*/
++
++ return true;
+ }
+
+ // ***************************************************
Property changes on: freepbx/trunk/debian/patches/fix-wierd-email.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: freepbx/trunk/debian/patches/log-retrieve.dpatch
===================================================================
--- freepbx/trunk/debian/patches/log-retrieve.dpatch 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/patches/log-retrieve.dpatch 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,31 @@
+#! /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);
Property changes on: freepbx/trunk/debian/patches/log-retrieve.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: freepbx/trunk/debian/rapid/apply_conf.sh
===================================================================
--- freepbx/trunk/debian/rapid/apply_conf.sh 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/rapid/apply_conf.sh 2006-12-06 13:31:40 UTC (rev 2790)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# this file is a fork of the original AMP script
# the original script is GPL, as AMP itself.
Modified: freepbx/trunk/debian/rapid/astetc/logger.conf
===================================================================
--- freepbx/trunk/debian/rapid/astetc/logger.conf 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/rapid/astetc/logger.conf 2006-12-06 13:31:40 UTC (rev 2790)
@@ -4,6 +4,9 @@
; In this file, you configure logging to files or to
; the syslog system.
;
+; see: http://www.voip-info.org/wiki/view/Asterisk+debugging
+; see: http://www.voip-info.org/wiki/index.php?page=Asterisk+config+logger.conf
+;
; For each file, specify what to log.
;
; For console logging, you set options at start of
@@ -30,6 +33,12 @@
;messages => notice,warning,error
;full => notice,warning,error,debug,verbose
+;;
+;; work arround, if nothing is displayed to the console,
+;; commands like "asterisk -rx reload" will hang up
+;; se internal ticket #88
+console => notice,warning,error
+
;syslog keyword : This special keyword logs to syslog facility
;
;syslog.local0 => notice,warning,error
Added: freepbx/trunk/debian/rapid/astetc/manager.conf.template
===================================================================
--- freepbx/trunk/debian/rapid/astetc/manager.conf.template 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/rapid/astetc/manager.conf.template 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,27 @@
+;
+; Asterisk Call Management support
+;
+[general]
+enabled = yes
+port = 5038
+bindaddr = 0.0.0.0
+
+[AMPMGRUSER]
+secret = AMPMGRPASS
+deny=0.0.0.0/0.0.0.0
+permit=127.0.0.1/255.255.255.0
+read = system,call,log,verbose,command,agent,user
+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"
+
\ No newline at end of file
Modified: freepbx/trunk/debian/rapid/astetc/musiconhold.conf
===================================================================
--- freepbx/trunk/debian/rapid/astetc/musiconhold.conf 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/rapid/astetc/musiconhold.conf 2006-12-06 13:31:40 UTC (rev 2790)
@@ -5,5 +5,8 @@
mode=files
directory=/usr/share/asterisk/mohwav/
+
+; do not modify this file directly, but edit the custom file
+; see musiconhold_custom.conf.sample about adding new MOH categories manually
#include musiconhold_custom.conf
#include musiconhold_additional.conf
Added: freepbx/trunk/debian/rapid/astetc/musiconhold_custom.conf.sample
===================================================================
--- freepbx/trunk/debian/rapid/astetc/musiconhold_custom.conf.sample 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/rapid/astetc/musiconhold_custom.conf.sample 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,27 @@
+;;
+;; adding music on hold mannually:
+;;
+;; please note that while this does work, this is the wrong way of doing this
+;;
+;;
+;; TS-1 users notice:
+;; at the start of this procudure, you need to exec the command: "mountrw"
+;; and at the end, the command "fh-sync"
+;;
+;;
+;; 1) mkdir /usr/share/asterisk/mohmp3/sting
+;; 2) cp /etc/asterisk/musiconhold_custom.conf.sample /etc/asterisk/musiconhold_custom.conf
+;; 3) uncomment the following line from the new custom configuration
+;; class1 => custom:/usr/share/asterisk/mohmp3/class1,/usr/bin/ast-cmd wav-player
+;; 4) now you may add file wav files to /usr/share/asterisk/mohmp3/class1
+;; 5) the files must be properly encoded wav files, named *.mp3. yes, the wavs must end
+;; with mp3 extension. This is because asterisk 1.0 looks for *.mp3.
+;;
+;; The way I so this is:
+;; sox file1.wav -c1 -t wav -r 8000 -t wav file1-8khz.wav resample -q
+;; ln -s file1-8khz.wav file1-8khz.wav.mp3
+
+;; You can do this for any ammount of classes, at least until you ran out of disk
+;; space ;-)
+;;
+;; Diego Iastrubni <diego.iastrubni at xorcom.com>
Modified: freepbx/trunk/debian/rapid/astetc/phpagi.conf
===================================================================
--- freepbx/trunk/debian/rapid/astetc/phpagi.conf 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/rapid/astetc/phpagi.conf 2006-12-06 13:31:40 UTC (rev 2790)
@@ -1,3 +1,3 @@
[festival]
text2wave=/usr/bin/text2wave
-tempdir=/var/lib/asterisk/sounds/tmp/
+tempdir=/tmp/
Added: freepbx/trunk/debian/rapid/freepbx-enable-all-modules
===================================================================
--- freepbx/trunk/debian/rapid/freepbx-enable-all-modules 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/rapid/freepbx-enable-all-modules 2006-12-06 13:31:40 UTC (rev 2790)
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+#
+# small script which enables all the available
+# freepbx-modules
+#
+# Diego Iastrubni <diego.iastrubni at xorcom.com> - 2006
+# GPL
+
+DIR=`dirname $0`
+
+$DIR/freepbx-module-status enable core
+COLUMNS=180 dpkg -l | grep freepbx-module- | awk '{ print $2; }' | sed 's/^freepbx-module-//' | xargs -l $DIR/freepbx-module-status enable
Modified: freepbx/trunk/debian/rapid/freepbx-module-status
===================================================================
--- freepbx/trunk/debian/rapid/freepbx-module-status 2006-12-03 15:53:49 UTC (rev 2789)
+++ freepbx/trunk/debian/rapid/freepbx-module-status 2006-12-06 13:31:40 UTC (rev 2790)
@@ -68,8 +68,9 @@
function showHelp()
{
- print( "Module install/uninsta needs a parameter:
- You can also use the --debug (-d) and --verbose (-d) switches to get more information.
+ print( "Module install/uninstall needs a parameter
+ install, enable, uninstall, disable, status, st
+ You can also use the --debug (-d) and --verbose (-v) switches to get more information.
\n");
}
More information about the Pkg-voip-commits
mailing list