[Pkg-voip-commits] r2168 - in freepbx/trunk/debian: . contrib
contrib/template contrib/template/debian patches rapid rapid/astetc
Diego Iastrubni
elcuco-guest at costa.debian.org
Thu Aug 3 08:45:53 UTC 2006
Author: elcuco-guest
Date: 2006-08-03 08:45:50 +0000 (Thu, 03 Aug 2006)
New Revision: 2168
Added:
freepbx/trunk/debian/contrib/
freepbx/trunk/debian/contrib/fpx-modules
freepbx/trunk/debian/contrib/template/
freepbx/trunk/debian/contrib/template/debian/
freepbx/trunk/debian/contrib/template/debian/changelog
freepbx/trunk/debian/contrib/template/debian/compat
freepbx/trunk/debian/contrib/template/debian/control
freepbx/trunk/debian/contrib/template/debian/copyright
freepbx/trunk/debian/contrib/template/debian/dirs
freepbx/trunk/debian/contrib/template/debian/install
freepbx/trunk/debian/contrib/template/debian/postinst
freepbx/trunk/debian/contrib/template/debian/prerm
freepbx/trunk/debian/contrib/template/debian/rules
freepbx/trunk/debian/patches/fix-featurescode-sqlite.dpatch
Removed:
freepbx/trunk/debian/freepbx-module-asteriskcli.dirs
freepbx/trunk/debian/freepbx-module-asteriskcli.install
freepbx/trunk/debian/freepbx-module-backup.dirs
freepbx/trunk/debian/freepbx-module-backup.install
freepbx/trunk/debian/freepbx-module-conferences.dirs
freepbx/trunk/debian/freepbx-module-conferences.install
freepbx/trunk/debian/freepbx-module-core.dirs
freepbx/trunk/debian/freepbx-module-core.install
freepbx/trunk/debian/freepbx-module-ivr.dirs
freepbx/trunk/debian/freepbx-module-ivr.install
freepbx/trunk/debian/freepbx-module-music.dirs
freepbx/trunk/debian/freepbx-module-music.install
freepbx/trunk/debian/freepbx-module-queues.dirs
freepbx/trunk/debian/freepbx-module-queues.install
freepbx/trunk/debian/freepbx-module-ringgroups.dirs
freepbx/trunk/debian/freepbx-module-ringgroups.install
freepbx/trunk/debian/freepbx-module-timeconditions.dirs
freepbx/trunk/debian/freepbx-module-timeconditions.install
freepbx/trunk/debian/rapid/dialparties.agi
Modified:
freepbx/trunk/debian/changelog
freepbx/trunk/debian/control
freepbx/trunk/debian/freepbx-admin.dirs
freepbx/trunk/debian/freepbx-admin.install
freepbx/trunk/debian/freepbx-admin.postinst
freepbx/trunk/debian/freepbx-agi.install
freepbx/trunk/debian/patches/00list
freepbx/trunk/debian/patches/fix-sqlite-install-amp.dpatch
freepbx/trunk/debian/rapid/astetc/modules.conf
freepbx/trunk/debian/rules
Log:
started working on freepbx 2.1.1.
currently only the code module is available, and there is some minimal (almost working) infrastructure for making deb package for all the modules in the freepbx "sources". the utility is found at the debian/contrib/ directory. for making it work, you should svn-export this (and the template dir as well) outside of the svn. the code is documented feel free to poke arround.
there is also a set of command line scripts for installing/removing mysql and sqlite backends (the sqlite support is buggy, and not recommended). there is also a script for messing arround with freepbx modules (enabling/removing/installing/uninstalling). this script is not perfect (on modules upgrades there are some bugs). the online updates are disabled, but there is an undocumented cheat code to enable them back (you will need to chmod +rw /usr/share/freepbx/admin/modules to make it work).
the interaction with op-panel is still missing. ari will be added to the svn "very soon".
todo:
- fix the modules upgrade bug
- interactin with op-panel should be fixed
- fix various bugs (mostly wrong paths on the dial plan)
- (make pkg-voip the maintainers again... dont wory... i did notice it...)
- make a tarball without the mp3, and asterisk-stat (IMHO no conflict... but people complain)
Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/changelog 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,16 +1,20 @@
-freepbx (2.0.1-3) UNRELEASED; urgency=low
+freepbx (2.1.1-0.2) unstable; urgency=low
+ * New upstream release
+ * freepbx-admin: patched featured codes, to support sqlite
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com> Sun, 19 Jun 2006 18:00:00 +0200
- * NOT RELEASED YET
+
+freepbx (2.0.1-2.24) experimental; urgency=low
* Obsoleted the perl verision of dialparties.agi, and using the dialparties from freepbx 2.1
* New package to provide missing sound files
* Disabled the checking for libasteriskperl on install_amp
* Added to a target to the rules file for downloading the source from the web
* freepbx-cdr is not demanded as a dependendy for installing freepbx
* freepbx-admin: provide a link to amportal on the web root - to be obsoleted soon
- * asterisk-config-freepbx: use native music on hold by default
+ * freepbx-admin: install_amp will default to using mysql
+ * asterisk-config-freepbx: use native music on hold by default, music files have been converted to 16 bit 8khz
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com> Sun, 5 Jun 2006 18:00:00 +0200
- -- Diego Iastrubni <diego.iastrubni at xorcom.com> Sun, 30 Apr 2006 18:00:00 +0200
-
freepbx (2.0.1-2) experimental; urgency=low
* Added vitual package to ease the installation of different combinations of sql/httpd servers.
* asterisk-config-freepbx: added dependency for sox
Added: freepbx/trunk/debian/contrib/fpx-modules
===================================================================
--- freepbx/trunk/debian/contrib/fpx-modules 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/contrib/fpx-modules 2006-08-03 08:45:50 UTC (rev 2168)
@@ -0,0 +1,478 @@
+#!/usr/bin/php
+<?php
+
+# Written by Diego Iastrubni <diego.iastrubni at xorcom.com>
+# and many parts "borrowed" from freePBX 2.1.1.
+# Copyright (C) 2006, Xorcom, The freePBX community
+#
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+#
+# fpx-modules:
+# in order to build the fpbx modules into debian packages, the best way i found
+# is to download them locally and generate a debian package for each one of them
+# from a template found on this dire.
+#
+#
+# this tool is capable of quering frepbx repositories and check for new updates
+# (new versions of existing modules, missing modules on the local repository)
+# and update them if needed.
+#
+# the script is also capable of rebuilding the whole tree and updating specific
+# packages when needed, and has a syntax similar to "apt-get".
+#
+
+
+
+#######################################################################################
+# if you are using this script, you should probably modify these settings
+#######################################################################################
+
+# the debian maintainer which is used to build the packages
+$debian_maintainer = "Diego Iastrubni <diego.iastrubni at xorcom.com>";
+
+# if this script it working inside an svn repository, set it to "true"
+# if not, set it to "false"
+$working_in_svn = 1;
+
+
+#######################################################################################
+# script defaultm, generally no need to modify those
+#######################################################################################
+
+define("AMP_CONF", "/etc/amportal.conf");
+define("PHP_ASMANAGER", "/var/lib/asterisk/bin/php-asmanager.php");
+define("MONITOR_DIR", "/var/spool/asterisk/monitor");
+
+
+$dryrun = false;
+$debug = false;
+$verbose = false;
+
+
+function showHelp()
+{
+ print( "Module updater needs a parameter:
+ - st, status: show the status of the modules
+ - up, update: download the updates into the local repository
+ - clean: remove all the local modules
+ - build: build all the local modules
+
+You can also use the --debug (-d) and --verbose (-d) switches to get more information.
+For more details, look at the code.
+\n");
+}
+
+function out( $s)
+{
+ global $verbose;
+
+ if ($verbose)
+ print( $s );
+}
+
+function outn( $s)
+{
+ global $verbose;
+
+ if ($verbose)
+ print( "$s\n" );
+}
+
+function debug( $s)
+{
+ global $debug;
+
+ if ($debug)
+ print( "DEBUG: $s\n" );
+}
+
+function exec_cmd( $cmd )
+{
+ debug(" executing $cmd ");
+ system( $cmd, $ret_val );
+ return $ret_val;
+}
+
+function getversion()
+{
+ return "2.1";
+}
+
+// borrowed from freepbx
+class xml2Array {
+
+ var $arrOutput = array();
+ var $resParser;
+ var $strXmlData;
+
+ function parse($strInputXML) {
+
+ $this->resParser = xml_parser_create ();
+ xml_set_object($this->resParser,$this);
+ xml_set_element_handler($this->resParser, "tagOpen", "tagClosed");
+
+ xml_set_character_data_handler($this->resParser, "tagData");
+
+ $this->strXmlData = xml_parse($this->resParser,$strInputXML );
+ if(!$this->strXmlData) {
+ die(sprintf("XML error: %s at line %d",
+ xml_error_string(xml_get_error_code($this->resParser)),
+ xml_get_current_line_number($this->resParser)));
+ }
+
+ xml_parser_free($this->resParser);
+
+ return $this->arrOutput;
+ }
+ function tagOpen($parser, $name, $attrs) {
+ $tag=array("name"=>$name,"attrs"=>$attrs);
+ array_push($this->arrOutput,$tag);
+ }
+
+ function tagData($parser, $tagData) {
+ if(trim($tagData)) {
+ if(isset($this->arrOutput[count($this->arrOutput)-1]['tagData'])) {
+ $this->arrOutput[count($this->arrOutput)-1]['tagData'] .= $tagData;
+ }
+ else {
+ $this->arrOutput[count($this->arrOutput)-1]['tagData'] = $tagData;
+ }
+ }
+ }
+
+ function tagClosed($parser, $name) {
+ $this->arrOutput[count($this->arrOutput)-2]['children'][] = $this->arrOutput[count($this->arrOutput)-1];
+ array_pop($this->arrOutput);
+ }
+}
+
+// borrowed from freepbx
+class xml2ModuleArray extends xml2Array {
+ function parseModulesXML($strInputXML) {
+ $arrOutput = $this->parse($strInputXML);
+ // if you are confused about what's happening below, uncomment this why we do it
+ // echo "<pre>"; print_r($arrOutput); echo "</pre>";
+
+ // ignore the regular xml garbage ([0]['children']) & loop through each module
+ if(!is_array($arrOutput[0]['children'])) return false;
+ foreach($arrOutput[0]['children'] as $module) {
+ if(!is_array($module['children'])) return false;
+ // loop through each modules's tags
+ foreach($module['children'] as $modTags) {
+ if(isset($modTags['children']) && is_array($modTags['children'])) {
+ $$modTags['name'] = $modTags['children'];
+ // loop if there are children (menuitems and requirements)
+ foreach($modTags['children'] as $subTag) {
+ $subTags[strtolower($subTag['name'])] = $subTag['tagData'];
+ }
+ $$modTags['name'] = $subTags;
+ unset($subTags);
+ } else {
+ // create a variable for each tag we find
+ $$modTags['name'] = $modTags['tagData'];
+ }
+
+ }
+ // now build our return array
+ $arrModules[$RAWNAME]['rawname'] = $RAWNAME; // This has to be set
+ $arrModules[$RAWNAME]['displayName'] = $NAME; // This has to be set
+ $arrModules[$RAWNAME]['version'] = $VERSION; // This has to be set
+ $arrModules[$RAWNAME]['type'] = isset($TYPE)?$TYPE:'setup';
+ $arrModules[$RAWNAME]['category'] = isset($CATEGORY)?$CATEGORY:'Unknown';
+ $arrModules[$RAWNAME]['info'] = isset($INFO)?$INFO:'http://www.freepbx.org/wiki/'.$RAWNAME;
+ $arrModules[$RAWNAME]['location'] = isset($LOCATION)?$LOCATION:'local';
+ $arrModules[$RAWNAME]['items'] = isset($MENUITEMS)?$MENUITEMS:null;
+ $arrModules[$RAWNAME]['requirements'] = isset($REQUIREMENTS)?$REQUIREMENTS:null;
+ $arrModules[$RAWNAME]['md5sum'] = isset($MD5SUM)?$MD5SUM:null;
+ //print_r($arrModules);
+ //unset our variables
+ unset($NAME);
+ unset($VERSION);
+ unset($TYPE);
+ unset($CATEGORY);
+ unset($AUTHOR);
+ unset($EMAIL);
+ unset($LOCATION);
+ unset($MENUITEMS);
+ unset($REQUIREMENTS);
+ unset($MD5SUM);
+ }
+ //echo "<pre>"; print_r($arrModules); echo "</pre>";
+
+ return $arrModules;
+ }
+}
+
+// borrowed from freepbx
+function get_online_modules()
+{
+ $version = getversion();
+ $url = "http://amportal.sourceforge.net/modules-".$version.".xml";
+ debug( "Downloding $url" );
+ $data = file_get_contents($url);
+
+ $parser = new xml2ModuleArray($data);
+ $xmlarray = $parser->parseModulesXML($data);
+
+ return $xmlarray;
+}
+
+function get_local_modules()
+{
+ $version = getversion();
+ $fn = "modules-".$version.".xml";
+ if (is_file($fn)) {
+ $data = file_get_contents($fn);
+ }
+
+ $parser = new xml2ModuleArray($data);
+ $xmlarray = $parser->parseModulesXML($data);
+ return $xmlarray;
+}
+
+function show_modules_status( $online_modules, $local_modules )
+{
+ print( "U - needs update, M - missing \n\n");
+ foreach( $online_modules as $on_module )
+ {
+ $status = "?";
+ $extra = "";
+ unset( $l_module );
+ $l_module = $local_modules[ $on_module["rawname"] ];
+
+ if (! $l_module) {
+ $status = "M";
+ }
+ else{
+ // now check versions
+ if (version_compare( $on_module["version"], $l_module["version"] ) == 1 ) {
+ $status = "U";
+ $extra = " (" . $l_module["version"] . ")";
+ }
+ else
+ $status = " ";
+
+ }
+
+ print( " $status - " . $on_module["displayName"] . ": " .
+ $on_module["version"] . $extra . "\n"
+ );
+ }
+}
+
+// some parts borrowed...
+function download_modules( $online_modules, $local_modules )
+{
+ foreach( $online_modules as $on_module )
+ {
+ $status = "?";
+ $extra = "";
+ unset( $l_module );
+ $l_module = $local_modules[ $on_module["rawname"] ];
+
+ debug( $on_module["rawname"] . " - local: [" . $l_module["version"] . "] online: [". $on_module["version"] . "]" );
+ if ( ($l_module) && (version_compare( $on_module["version"], $l_module["version"] ) != 1 ) ) {
+ debug( "No update needed" );
+ continue;
+ }
+
+ $file = basename($on_module['location']);
+ $filename = "_cache/".$file;
+
+ if (!is_dir("_cache")) {
+ mkdir("_cache");
+ }
+
+ if(file_exists($filename)) {
+ unlink($filename);
+ }
+
+ $url = "https://svn.sourceforge.net/svnroot/amportal/modules/".$on_module['location'];
+ print( "Upgrading module \"" . $on_module["displayName"] . "\"\n" );
+ debug( "Downloading from $url" );
+ debug( $on_module["rawname"] );
+
+ $name = $on_module["displayName"];
+ $rawname = $on_module["rawname"];
+ $version = $on_module["version"];
+ $date = chop( `date -R` );
+
+ // download the module
+ $fp = @fopen($filename,"w");
+ $filedata = file_get_contents($url);
+ fwrite($fp,$filedata);
+ fclose($fp);
+
+
+ if (!is_dir("modules")) {
+ mkdir("modules");
+ }
+
+ // unpack it, and generate the template for the debian package
+ // in rare cases, you should also modify the initial debian layout a little bit
+ // in about 95% it works out of the box
+ exec_cmd("tar zxf {$filename} --directory=modules");
+ if (!$l_module) {
+ outn("Installing new module, and using sane defaults");
+
+ if ($working_in_svn)
+ exec_cmd("svn export template/ modules/$rawname/ --force --quiet");
+ else {
+ exec_cmd("cp -a template/ modules/$rawname");
+ exec_cmd("mv modules/$rawname/template/* modules/$rawname/");
+ exec_cmd("rm -fr modules/$rawname/template/");
+ }
+ }
+ else {
+ putenv("DEBEMAIL=$debian_maintainer");
+ putenv("DEBFULLNAME=$debian_maintainer");
+ exec_cmd( "cd modules/$rawname/; dch -v \"2.1-$version-1\" \"New upstream release\"" );
+ outn("Please update the changelog as needed, new entry created.");
+ }
+
+ exec_cmd( "sed -r -i 's/@@RAWNAME@@/$rawname/g' modules/$rawname/debian/*" );
+ exec_cmd( "sed -r -i 's/@@VERSION@@/$version/g' modules/$rawname/debian/*" );
+ exec_cmd( "sed -r -i 's/@@NAME@@/$name/g' modules/$rawname/debian/*" );
+ exec_cmd( "sed -r -i 's|@@DATE@@|$date|g' modules/$rawname/debian/*" );
+ }
+
+ // now we have the most updated modules, download the module list as well
+ $version = getversion();
+ $url = "http://amportal.sourceforge.net/modules-".$version.".xml";
+ $filename = "modules-".$version.".xml";
+
+ debug( "Downloding $url" );
+ $fp = @fopen($filename,"w");
+ $filedata = file_get_contents($url);
+ fwrite($fp,$filedata);
+ fclose($fp);
+}
+
+function build_modules( $local_modules )
+{
+ global $verbose, $debug;
+
+ foreach( $local_modules as $module )
+ {
+ print( "Building " . $module["displayName"] . "..." );
+ if (($debug) || ($verbose)){
+ print("\n");
+ }
+
+ debug( "cd modules/" . $module["rawname"] );
+ chdir( "modules/" . $module["rawname"] );
+
+ if (exec_cmd( "debuild -uc -us -rfakeroot &> build.log" ) == 0){
+ print( " ok.\n" );
+ }
+ else{
+ print( "., ERROR, see the build log at the module directory.\n" );
+ }
+
+ debug( "cd ../../" );
+ chdir( "../../" );
+ }
+
+ if ($verbose)
+ system( "ls modules/*.deb");
+}
+
+#######################################################################################
+# main
+#######################################################################################
+
+if (! @ include('DB.php')) {
+ out("FAILED");
+ fatal("PEAR must be installed (requires DB.php). Include path: ".ini_get("include_path"));
+}
+
+if (! @ include("Console/Getopt.php")) {
+ out("FAILED");
+ fatal("PEAR must be installed (requires Console/Getopt.php). Include path: ".ini_get("include_path"));
+}
+
+// $shortopts = "h?u:p:";
+$shortopts = "hdv";
+$longopts = array( "help","debug" );
+
+
+$args = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), $shortopts, $longopts);
+if (is_object($args)) {
+ // assume it's PEAR_ERROR
+ out($args->message);
+ exit(255);
+}
+
+foreach ($args[0] as $arg) {
+ switch ($arg[0]) {
+ case "--help": case "h": case "?":
+ showHelp();
+ exit(10);
+ break;
+ case "--dry-run":
+ out("Dry-run only, nothing will be changed");
+ $dryrun = true;
+ break;
+ case "--debug": case "d":
+ $debug = true;
+ debug("Debug mode enabled");
+ break;
+
+ case "--verbose": case "v":
+ $verbose = true;
+ debug("Verbose mode enabled");
+ break;
+ }
+}
+
+$local_modules = get_local_modules();
+
+switch ($args[1][0])
+{
+ case "st":
+ case "status":
+ outn("Getting online modules information");
+ $online_modules = get_online_modules();
+ show_modules_status( $online_modules, $local_modules );
+ break;
+
+ case "up":
+ case "update":
+ case "upgrade":
+ outn("Getting online modules information");
+ $online_modules = get_online_modules();
+ download_modules( $online_modules, $local_modules );
+ break;
+
+ case "clean":
+ case "clear":
+ exec_cmd( "rm -fr _cache" );
+ exec_cmd( "rm -fr modules" );
+ exec_cmd( "rm -f modules*.xml" );
+ break;
+
+ case "build":
+ build_modules( $local_modules );
+ break;
+
+ default:
+ showHelp();
+}
+
+?>
Property changes on: freepbx/trunk/debian/contrib/fpx-modules
___________________________________________________________________
Name: svn:executable
+ *
Added: freepbx/trunk/debian/contrib/template/debian/changelog
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/changelog 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/contrib/template/debian/changelog 2006-08-03 08:45:50 UTC (rev 2168)
@@ -0,0 +1,3 @@
+freepbx-module-@@RAWNAME@@ (2.1-@@VERSION@@-1) unstable; urgency=low
+ * First release.
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com> @@DATE@@
Added: freepbx/trunk/debian/contrib/template/debian/compat
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/compat 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/contrib/template/debian/compat 2006-08-03 08:45:50 UTC (rev 2168)
@@ -0,0 +1 @@
+4
Added: freepbx/trunk/debian/contrib/template/debian/control
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/control 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/contrib/template/debian/control 2006-08-03 08:45:50 UTC (rev 2168)
@@ -0,0 +1,13 @@
+Source: freepbx-module-@@RAWNAME@@
+Section: comm
+Priority: optional
+Maintainer: Diego Iastrubni <diego.iastrubni at xorcom.com>
+Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Build-Depends-Indep: debhelper (>= 4.0.0)
+Standards-Version: 3.6.1
+
+Package: freepbx-module@@RAWNAME@@
+Architecture: all
+Depends: freepbx-admin
+Description: FreePBX module: @@NAME@@
+ This is a freepbx-module, see information on @@INFO@@
Added: freepbx/trunk/debian/contrib/template/debian/copyright
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/copyright 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/contrib/template/debian/copyright 2006-08-03 08:45:50 UTC (rev 2168)
@@ -0,0 +1,5 @@
+This freepbx module is licensed under the terms of the GPL.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License may be found in `/usr/share/common-licenses/GPL'.
+
Added: freepbx/trunk/debian/contrib/template/debian/dirs
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/dirs 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/contrib/template/debian/dirs 2006-08-03 08:45:50 UTC (rev 2168)
@@ -0,0 +1,2 @@
+usr/share/freepbx-common/
+usr/share/freepbx/admin/modules/
Added: freepbx/trunk/debian/contrib/template/debian/install
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/contrib/template/debian/install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -0,0 +1,6 @@
+*.php usr/share/freepbx/admin/modules/@@RAWNAME@@/
+*.sql usr/share/freepbx/admin/modules/@@RAWNAME@@/
+*.sqlite usr/share/freepbx/admin/modules/@@RAWNAME@@/
+*.html usr/share/freepbx/admin/modules/@@RAWNAME@@/
+*.xml usr/share/freepbx/admin/modules/@@RAWNAME@@/
+
Added: freepbx/trunk/debian/contrib/template/debian/postinst
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/postinst 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/contrib/template/debian/postinst 2006-08-03 08:45:50 UTC (rev 2168)
@@ -0,0 +1,40 @@
+#! /bin/sh
+# postinst script for amportal-common
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+ configure)
+ /usr/share/freepbx-common/freepbx-module-status enable @@RAWNAME@@
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ # dummy
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Added: freepbx/trunk/debian/contrib/template/debian/prerm
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/prerm 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/contrib/template/debian/prerm 2006-08-03 08:45:50 UTC (rev 2168)
@@ -0,0 +1,49 @@
+#! /bin/bash
+# prerm script for ${package_name}
+#
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+if [ "$DPKG_DEBUG" = "developer" ]; then
+ set -x
+fi
+
+case "$1" in
+ purge)
+ /usr/share/freepbx-common/freepbx-module-status uninstall @@RAWNAME@@
+ ;;
+
+ remove)
+ /usr/share/freepbx-common/freepbx-module-status uninstall @@RAWNAME@@
+ ;;
+
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+# dummy
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Added: freepbx/trunk/debian/contrib/template/debian/rules
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/rules 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/contrib/template/debian/rules 2006-08-03 08:45:50 UTC (rev 2168)
@@ -0,0 +1,71 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp
+ dh_testdir
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ dh_install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ dh_installman
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+
\ No newline at end of file
Property changes on: freepbx/trunk/debian/contrib/template/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Modified: freepbx/trunk/debian/control
===================================================================
--- freepbx/trunk/debian/control 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/control 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,14 +1,14 @@
Source: freepbx
Section: comm
Priority: optional
-Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Diego Iastrubni <diego.iastrubni at xorcom.com>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Maintainer: Diego Iastrubni <diego.iastrubni at xorcom.com>
+Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Build-Depends-Indep: debhelper (>= 4.0.0)
Standards-Version: 3.6.1
Package: freepbx
Architecture: all
-Depends: freepbx-admin, freepbx-modules, freepbx-vmail, freepbx-agi, freepbx-panel, asterisk-sounds-moh-freepbx
+Depends: freepbx-admin, freepbx-vmail, freepbx-agi, freepbx-panel, asterisk-sounds-moh-freepbx
Description: web-based management interface for the Asterisk PBX
FreePBX (formally AMP) is a web-based GUI for the Asterisk PBX.
It provides the ability to:
@@ -23,7 +23,6 @@
* 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
@@ -68,6 +67,7 @@
Architecture: all
Suggests: asterisk|asterisk-classic|asterisk-bri
Provides: asterisk-sounds-moh-custom
+Replaces: asterisk-sounds-moh-amportal
Description: music-on-hold files for the Asterisk PBX
music-on-hold sound files for the Asterisk PBX.
These sound files were licensed undes a somewhat restrictive licesne
@@ -97,8 +97,8 @@
Package: freepbx-admin
Architecture: all
-Replaces: amportal-common
-Conflicts: amportal-common
+Replaces: amportal-common, freepbx-module-core
+Conflicts: amportal-common, freepbx-module-core
Depends: asterisk-config-freepbx, asterisk(>= 1.2)|asterisk-classic|asterisk-bri, apache|apache2|mathopd, libapache-mod-php4|libapache2-mod-php4|php4-cgi, mysql-server|virtual-mysql-server|sqlite, php4-mysql|php4-sqlite, php4-cli, php4-pear, mime-construct, libdbi-perl
Description: freepbx administration panel
FreePBX (formally AMP) is a web-based GUI for Asterisk.
@@ -108,37 +108,6 @@
some freepbx-modules or only the modules you want.
-Package: freepbx-modules
-Architecture: all
-Depends: freepbx-module-conferences, freepbx-module-core, freepbx-module-ivr, freepbx-module-queues, freepbx-module-ringgroups, freepbx-module-timeconditions
-#Depends: freepbx-module-backup, freepbx-module-conferences, freepbx-module-core, freepbx-module-ivr, freepbx-module-music, freepbx-module-queues, freepbx-module-ringgroups, freepbx-module-timeconditions
-Description: freepbx modules
- This is a meta package which installs all the modules supplied by
- FreePBX. This package does not provide any file, by it just installs
- a bunch of modules.
-
-Package: freepbx-module-asteriskcli
-Architecture: all
-Depends: freepbx-admin
-Description: freepbx module supplies a web gui for the Asterisk CLI
- FreePBX is an administration panel for the Asterisk PBX.
- This package provides you a web interface to Asterisk command line,
- you can send commands to Asterisk from FreePBX.
-
-Package: freepbx-module-backup
-Architecture: all
-Depends: freepbx-admin
-Description: freepbx module for backup configuration
- FreePBX is an administration panel for the Asterisk PBX
- This package provides backup capabilities for your Asterisk PBX.
-
-Package: freepbx-module-conferences
-Architecture: all
-Depends: freepbx-admin
-Description: freepbx module for confernce rooms on freepbx
- FreePBX is an administration panel for the Asterisk PBX.
- This package provides conference editing capabilities for your Asterisk PBX.
-
Package: freepbx-module-core
Architecture: all
Depends: freepbx-admin
@@ -147,37 +116,6 @@
This package provides core functionality for FreePBX. If in doubt,
install this.
-Package: freepbx-module-ivr
-Architecture: all
-Depends: freepbx-admin
-Description: freepbx module for IVR
- FreePBX is an administration IVR for the Asterisk PBX
-
-Package: freepbx-module-music
-Architecture: all
-Depends: freepbx-admin
-Description: freepbx module for backup
- FreePBX is an Music on Hold administration for the Asterisk PBX
-
-Package: freepbx-module-queues
-Architecture: all
-Depends: freepbx-admin
-Description: freepbx module for backup
- FreePBX is an Queues administration panel for the Asterisk PBX
-
-Package: freepbx-module-ringgroups
-Architecture: all
-Depends: freepbx-admin
-Description: freepbx module for backup
- FreePBX is a Ringgroup administration panel for the Asterisk PBX
-
-Package: freepbx-module-timeconditions
-Architecture: all
-Depends: freepbx-admin
-Description: freepbx module for backup
- FreePBX is an time condition administration panel for the Asterisk PBX
-
-
Package: freepbx-cdr
Architecture: all
Depends: freepbx-admin
Modified: freepbx/trunk/debian/freepbx-admin.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-admin.dirs 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-admin.dirs 2006-08-03 08:45:50 UTC (rev 2168)
@@ -9,6 +9,7 @@
usr/share/freepbx-common/upgrades/1.10.010/
usr/share/freepbx/admin/
usr/share/freepbx/admin/modules/
+usr/share/freepbx/admin/modules/_cache/
usr/share/freepbx/admin/i18n/de_DE/
usr/share/freepbx/admin/i18n/es_ES/
usr/share/freepbx/admin/i18n/fr_FR/
Modified: freepbx/trunk/debian/freepbx-admin.install
===================================================================
--- freepbx/trunk/debian/freepbx-admin.install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-admin.install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -6,16 +6,17 @@
amp_conf/htdocs/*.css usr/share/freepbx/
amp_conf/htdocs/admin/*.php usr/share/freepbx/admin/
-amp_conf/htdocs/admin/voicemail.conf usr/share/freepbx/admin/
amp_conf/htdocs/admin/i18n/* usr/share/freepbx/admin/i18n/
amp_conf/htdocs/admin/common/*.css usr/share/freepbx/admin/common/
amp_conf/htdocs/admin/common/*.php usr/share/freepbx/admin/common/
amp_conf/htdocs/admin/common/script.js.php usr/share/freepbx/admin/common/
+amp_conf/htdocs/admin/modules/core usr/share/freepbx/admin/modules/
amp_conf/htdocs/admin/images/*.png usr/share/freepbx/admin/images/
amp_conf/htdocs/admin/images/*.gif usr/share/freepbx/admin/images/
debian/rapid/xorcom-rapid.png usr/share/freepbx/admin/images/
debian/rapid/xorcom.png usr/share/freepbx/admin/images/
+
debian/rapid/freepbx-install-*.sh usr/share/freepbx-common/
debian/rapid/freepbx-remove-*.sh usr/share/freepbx-common/
install_amp usr/share/freepbx-common/
Modified: freepbx/trunk/debian/freepbx-admin.postinst
===================================================================
--- freepbx/trunk/debian/freepbx-admin.postinst 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-admin.postinst 2006-08-03 08:45:50 UTC (rev 2168)
@@ -38,10 +38,9 @@
check_file "/etc/php4/apache/php.ini"
check_file "/etc/php4/apache2/php.ini"
- echo -n "Fixing permissions on /etc/asterisk"
- chown -R asterisk.asterisk /etc/asterisk
- chmod -R g+rw /etc/asterisk
- echo "."
+ 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
if [ -e /etc/amportal.conf ]; then
# UPGRADE
@@ -70,10 +69,15 @@
SQLITE=`which sqlite` || true
if [ -x "$SQLITE" ]; then
echo "Installing FreePBX using a local SQLite"
+
+ mkdir /var/lib/asterisk/freepbx/
+ chown asterisk.www-data /var/lib/asterisk/freepbx/
+ chmod g+rw /var/lib/asterisk/freepbx/
+
echo "####### SQLite support added by freepbx-admin.postint" >> /etc/amportal.conf
echo "####### remove lines bellow to use MySQL" >> /etc/amportal.conf
echo "AMPDBENGINE=sqlite" >> /etc/amportal.conf
- echo "AMPDBFILE=/var/lib/asterisk/freepbx.sqlite" >> /etc/amportal.conf
+ echo "AMPDBFILE=/var/lib/asterisk/freepbx/freepbx.sqlite" >> /etc/amportal.conf
/usr/share/freepbx-common/freepbx-install-sqlite.sh
else
echo "No suitable SQL server found on this machine."
@@ -82,7 +86,6 @@
fi
fi
-
# apply new configuration
/usr/share/freepbx-common/apply_conf.sh
Modified: freepbx/trunk/debian/freepbx-agi.install
===================================================================
--- freepbx/trunk/debian/freepbx-agi.install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-agi.install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,2 +1 @@
amp_conf/agi-bin/* /usr/share/asterisk/agi-bin/
-debian/rapid/dialparties.agi /usr/share/asterisk/agi-bin/
Deleted: freepbx/trunk/debian/freepbx-module-asteriskcli.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-module-asteriskcli.dirs 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-asteriskcli.dirs 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1 +0,0 @@
-usr/share/freepbx/admin/modules/asterisk-cli/
Deleted: freepbx/trunk/debian/freepbx-module-asteriskcli.install
===================================================================
--- freepbx/trunk/debian/freepbx-module-asteriskcli.install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-asteriskcli.install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,3 +0,0 @@
-amp_conf/htdocs/admin/modules/asterisk-cli/*.php usr/share/freepbx/admin/modules/asterisk-cli
-amp_conf/htdocs/admin/modules/asterisk-cli/*.ini usr/share/freepbx/admin/modules/asterisk-cli
-amp_conf/htdocs/admin/modules/asterisk-cli/*.sql usr/share/freepbx/admin/modules/asterisk-cli
Deleted: freepbx/trunk/debian/freepbx-module-backup.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-module-backup.dirs 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-backup.dirs 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,2 +0,0 @@
-usr/share/freepbx/admin/modules/backup/
-
Deleted: freepbx/trunk/debian/freepbx-module-backup.install
===================================================================
--- freepbx/trunk/debian/freepbx-module-backup.install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-backup.install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,3 +0,0 @@
-amp_conf/htdocs/admin/modules/backup/*.php usr/share/freepbx/admin/modules/backup/
-amp_conf/htdocs/admin/modules/backup/*.ini usr/share/freepbx/admin/modules/backup/
-amp_conf/htdocs/admin/modules/backup/*.sql usr/share/freepbx/admin/modules/backup/
Deleted: freepbx/trunk/debian/freepbx-module-conferences.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-module-conferences.dirs 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-conferences.dirs 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1 +0,0 @@
-usr/share/freepbx/admin/modules/conferences/
Deleted: freepbx/trunk/debian/freepbx-module-conferences.install
===================================================================
--- freepbx/trunk/debian/freepbx-module-conferences.install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-conferences.install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,3 +0,0 @@
-amp_conf/htdocs/admin/modules/conferences/*.php usr/share/freepbx/admin/modules/conferences/
-amp_conf/htdocs/admin/modules/conferences/*.ini usr/share/freepbx/admin/modules/conferences/
-amp_conf/htdocs/admin/modules/conferences/*.sql usr/share/freepbx/admin/modules/conferences/
Deleted: freepbx/trunk/debian/freepbx-module-core.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-module-core.dirs 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-core.dirs 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1 +0,0 @@
-usr/share/freepbx/admin/modules/core/
Deleted: freepbx/trunk/debian/freepbx-module-core.install
===================================================================
--- freepbx/trunk/debian/freepbx-module-core.install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-core.install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,3 +0,0 @@
-amp_conf/htdocs/admin/modules/core/*.php usr/share/freepbx/admin/modules/core/
-amp_conf/htdocs/admin/modules/core/*.ini usr/share/freepbx/admin/modules/core/
-amp_conf/htdocs/admin/modules/core/*.sql usr/share/freepbx/admin/modules/core/
Deleted: freepbx/trunk/debian/freepbx-module-ivr.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-module-ivr.dirs 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-ivr.dirs 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1 +0,0 @@
-usr/share/freepbx/admin/modules/ivr/
Deleted: freepbx/trunk/debian/freepbx-module-ivr.install
===================================================================
--- freepbx/trunk/debian/freepbx-module-ivr.install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-ivr.install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,3 +0,0 @@
-amp_conf/htdocs/admin/modules/ivr/*.php usr/share/freepbx/admin/modules/ivr/
-amp_conf/htdocs/admin/modules/ivr/*.ini usr/share/freepbx/admin/modules/ivr/
-amp_conf/htdocs/admin/modules/ivr/*.sql usr/share/freepbx/admin/modules/ivr/
Deleted: freepbx/trunk/debian/freepbx-module-music.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-module-music.dirs 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-music.dirs 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1 +0,0 @@
-usr/share/freepbx/admin/modules/music/
Deleted: freepbx/trunk/debian/freepbx-module-music.install
===================================================================
--- freepbx/trunk/debian/freepbx-module-music.install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-music.install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,3 +0,0 @@
-amp_conf/htdocs/admin/modules/music/*.php usr/share/freepbx/admin/modules/music/
-amp_conf/htdocs/admin/modules/music/*.ini usr/share/freepbx/admin/modules/music/
-amp_conf/htdocs/admin/modules/music/*.sql usr/share/freepbx/admin/modules/music/
Deleted: freepbx/trunk/debian/freepbx-module-queues.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-module-queues.dirs 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-queues.dirs 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1 +0,0 @@
-usr/share/freepbx/admin/modules/queues/
Deleted: freepbx/trunk/debian/freepbx-module-queues.install
===================================================================
--- freepbx/trunk/debian/freepbx-module-queues.install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-queues.install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,3 +0,0 @@
-amp_conf/htdocs/admin/modules/queues/*.php usr/share/freepbx/admin/modules/queues/
-amp_conf/htdocs/admin/modules/queues/*.ini usr/share/freepbx/admin/modules/queues/
-amp_conf/htdocs/admin/modules/queues/*.sql usr/share/freepbx/admin/modules/queues/
Deleted: freepbx/trunk/debian/freepbx-module-ringgroups.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-module-ringgroups.dirs 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-ringgroups.dirs 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1 +0,0 @@
-usr/share/freepbx/admin/modules/ringgroups
Deleted: freepbx/trunk/debian/freepbx-module-ringgroups.install
===================================================================
--- freepbx/trunk/debian/freepbx-module-ringgroups.install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-ringgroups.install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,3 +0,0 @@
-amp_conf/htdocs/admin/modules/ringgroups/*.php usr/share/freepbx/admin/modules/ringgroups/
-amp_conf/htdocs/admin/modules/ringgroups/*.ini usr/share/freepbx/admin/modules/ringgroups/
-amp_conf/htdocs/admin/modules/ringgroups/*.sql usr/share/freepbx/admin/modules/ringgroups/
Deleted: freepbx/trunk/debian/freepbx-module-timeconditions.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-module-timeconditions.dirs 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-timeconditions.dirs 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1 +0,0 @@
-usr/share/freepbx/admin/modules/timeconditions
Deleted: freepbx/trunk/debian/freepbx-module-timeconditions.install
===================================================================
--- freepbx/trunk/debian/freepbx-module-timeconditions.install 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/freepbx-module-timeconditions.install 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,3 +0,0 @@
-amp_conf/htdocs/admin/modules/timeconditions/*.php usr/share/freepbx/admin/modules/timeconditions
-amp_conf/htdocs/admin/modules/timeconditions/*.ini usr/share/freepbx/admin/modules/timeconditions
-amp_conf/htdocs/admin/modules/timeconditions/*.sql usr/share/freepbx/admin/modules/timeconditions
Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/patches/00list 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,11 +1,12 @@
ast-config-dirs
-fix-sqlite-install-amp
-fix-retrieve-op-panel-cfg
-fix-ivr-sysrec
-disable-libasteriskperl-check
+#fix-featurescode-sqlite.dpatch
+#fix-retrieve-op-panel-cfg
+#fix-ivr-sysrec
# obsoleted patch list
+#fix-sqlite-install-amp
#fix-libasteriskperl-check
#fix-postreload-bar
#fix-version-in-installsql
-#retrive-sqlite-support
\ No newline at end of file
+#retrive-sqlite-support
+#disable-libasteriskperl-check
Added: freepbx/trunk/debian/patches/fix-featurescode-sqlite.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-featurescode-sqlite.dpatch 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/patches/fix-featurescode-sqlite.dpatch 2006-08-03 08:45:50 UTC (rev 2168)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-featurescode-sqlite2.dpatch by <diegolocal at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad freepbx-2.1.1/amp_conf/htdocs/admin/featurecodes.class.php /tmp/dpep.2lTieQ/freepbx-2.1.1/amp_conf/htdocs/admin/featurecodes.class.php
+--- freepbx-2.1.1/amp_conf/htdocs/admin/featurecodes.class.php 2006-05-01 13:12:16.000000000 +0300
++++ /tmp/dpep.2lTieQ/freepbx-2.1.1/amp_conf/htdocs/admin/featurecodes.class.php 2006-06-29 18:07:20.000000000 +0300
+@@ -60,6 +60,15 @@
+
+ $s = "REPLACE INTO featurecodes (modulename, featurename, description, defaultcode, customcode, enabled) ";
+ $s .= "VALUES (".sql_formattext($this->_modulename).", ".sql_formattext($this->_featurename).", ".sql_formattext($this->_description).", ".sql_formattext($this->_defaultcode).", ".sql_formattext($this->_customcode).", ".sql_formattext($this->_enabled).") ";
++
++
++ // "replace into" is MYSQL only.
++ // pgsql should be checked. sqlite does not like this, and this is the way to work arround it.
++ if ($amp_conf["AMPDBENGINE"] == "sqlite") {
++ $s = str_replace( "REPLACE", "INSERT", $s );
++ }
++
++
+ sql($s, "query");
+
+ return true;
Property changes on: freepbx/trunk/debian/patches/fix-featurescode-sqlite.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: freepbx/trunk/debian/patches/fix-sqlite-install-amp.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-sqlite-install-amp.dpatch 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/patches/fix-sqlite-install-amp.dpatch 2006-08-03 08:45:50 UTC (rev 2168)
@@ -7,7 +7,7 @@
diff -urNad freepbx-work/install_amp /tmp/dpep.tSFERe/freepbx-work/install_amp
--- freepbx-work/install_amp 2006-03-11 16:26:58.000000000 +0200
+++ /tmp/dpep.tSFERe/freepbx-work/install_amp 2006-03-13 14:48:58.000000000 +0200
-@@ -713,16 +713,51 @@
+@@ -713,16 +713,56 @@
$db_pass = $amp_conf["AMPDBPASS"];
$db_host = $amp_conf["AMPDBHOST"];
$db_name = 'asterisk';
@@ -19,6 +19,11 @@
-if (!function_exists($db_engine.'_connect')) {
- out("FAILED");
- fatal($db_engine." PHP libraries not installed");
++if ($db_engine == "")
++{
++ $db_engine = "mysql";
++}
++
+switch ($db_engine)
+{
+ case "pgsql":
Modified: freepbx/trunk/debian/rapid/astetc/modules.conf
===================================================================
--- freepbx/trunk/debian/rapid/astetc/modules.conf 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/rapid/astetc/modules.conf 2006-08-03 08:45:50 UTC (rev 2168)
@@ -21,7 +21,7 @@
noload => app_intercom.so
;
; Explicitly load the chan_modem.so early on to be sure
-; it loads before any of the chan_modem_* 's afte rit
+; it loads before any of the chan_modem_* 's after it
;
load => res_musiconhold.so
;
@@ -33,6 +33,7 @@
; we do not force pg-sql, no no need to load that module
noload => app_voicemail_pg.so
+noload => func_odbc.so
;
; Module names listed in "global" section will have symbols globally
Deleted: freepbx/trunk/debian/rapid/dialparties.agi
===================================================================
--- freepbx/trunk/debian/rapid/dialparties.agi 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/rapid/dialparties.agi 2006-08-03 08:45:50 UTC (rev 2168)
@@ -1,417 +0,0 @@
-#!/usr/bin/php -q
-<?php
-//
-// Copyright (C) 2003 Zac Sprackett <zsprackett-asterisk at sprackett.com>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// Amended by Coalescent Systems Inc. Sept, 2004
-// to include support for DND, Call Waiting, and CF to external trunk
-// info at coalescentsystems.ca
-//
-// This script has been ported to PHP by Diego Iastrubni <diego.iastrubni at xorcom.com>
-
-$config = parse_amportal_conf( "/etc/amportal.conf" );
-
-require_once "phpagi.php";
-require_once "phpagi-asmanager.php";
-
-$debug = 4;
-
-$ext=""; // Hash that will contain our list of extensions to call
-$ext_hunt=""; // Hash that will contain our list of extensions to call used by huntgroup
-$cidnum=""; // Caller ID Number for this call
-$cidname=""; // Caller ID Name for this call
-$timer=""; // Call timer for Dial command
-$dialopts=""; // options for dialing
-$rc=""; // Catch return code
-$priority=""; // Next priority
-$rgmethod=""; // If Ring Group what ringing method was chosen
-$dsarray = array(); // This will hold all the dial strings, used to check for duplicate extensions
-
-$AGI = new AGI();
-debug("Starting New Dialparties.agi", 0);
-
-$priority = get_var( $AGI, "priority" ) + 1;
-debug( "priority is $priority" );
-
-// Caller ID info is stored in $request in AGI class, passed from Asterisk
-$cidnum = $AGI->request['agi_callerid'];
-$cidname = $AGI->request['agi_calleridname'];
-debug("Caller ID name is '$cidname' number is '$cidnum'", 1);
-
-$timer = get_var( $AGI, "ARG1" );
-$dialopts = get_var( $AGI, "ARG2" );
-$rgmethod = get_var( $AGI, "RingGroupMethod" );
-if (empty($timer)) $timer = 0;
-if (empty($dialopts)) $dialopts = "";
-if (empty($rgmethod)) $rgmethod = "none";
-debug("Methodology of ring is '$rgmethod'", 1);
-
-// Start with Arg Count set to 3 as two args are used
-$arg_cnt = 3;
-while( ($arg = get_var($AGI,"ARG". $arg_cnt)) )
-{
- if ($arg == '-')
- { // not sure why, dialparties will get stuck in a loop if noresponse
- debug("get_variable got a \"noresponse\"! Exiting",3);
- exit($arg_cnt);
- }
-
- $extarray = split( '-', $arg );
- foreach ( $extarray as $k )
- {
- $ext[] = $k;
- debug("Added extension $k to extension map", 3);
- }
-
- $arg_cnt++;
-}
-
-// Check for call forwarding first
-// If call forward is enabled, we use chan_local
-// Hacky. We should be using an associative array, shouldn't we?
-$count = 0;
-foreach( $ext as $k)
-{
- $cf = $AGI->database_get('CF',$k);
- $cf = $cf['data'];
- if (strlen($cf))
- {
- // append a hash sign so we can send out on chan_local below.
- $ext[$count] = $cf.'#';
- debug("Extension $k has call forward set to $cf", 1);
- }
- else
- {
- debug("Extension $k cf is disabled", 3);
- }
- $count++;
-}
-
-// Hacky.
-$count = 0;
-// Now check for DND
-foreach ( $ext as $k )
-{
- //if ( !preg_match($k, "/\#/", $matches) )
- if ( (strpos($k,"#")==0) )
- {
- // no point in doing if cf is enabled
- $dnd = $AGI->database_get('DND',$k);
- $dnd = $dnd['data'];
- if (strlen($dnd))
- {
- debug("Extension $k has do not disturb enabled", 1);
- unset($ext[$count]);
- //PERL: delete $ext{$k};
- }
- else
- {
- debug("Extension $k do not disturb is disabled", 3);
- }
- }
- $count++;
-}
-
-// Main calling loop
-$ds = '';
-foreach ( $ext as $k )
-{
- $extnum = $k;
- $exthascw = $AGI->database_get('CW', $extnum);// ? 1 : 0;
- $exthascw = $exthascw['data']? 1:0;
- $extcfb = $AGI->database_get('CFB', $extnum);//? 1 : 0;
- $extcfb = $extcfb['data'];
- $exthascfb = (strlen($extcfb) > 0) ? 1 : 0;
- $extcfu = $AGI->database_get('CFU', $extnum);// ? 1 : 0;
- $extcfu = $extcfu['data'];
- $exthascfu = (strlen($extcfu) > 0) ? 1 : 0;
-
- // Dump details in level 4
- debug("extnum: $extnum",4);
- debug("exthascw: $exthascw",4);
- debug("exthascfb: $exthascfb",4);
- debug("extcfb: $extcfb",4);
- debug("exthascfu: $exthascfu",4);
- debug("extcfu: $extcfu",4);
-
- // if CF is not in use
- if ( (strpos($k,"#")==0) )
- {
- // CW is not in use or CFB is in use on this extension, then we need to check!
- if ( ($exthascw == 0) || ($exthascfb == 1) || ($exthascfu == 1) )
- {
- // get ExtensionState: 0-idle; 1-busy; 4-unavail <--- these are unconfirmed
- $extstate = is_ext_avail($extnum);
-
- if ( ($exthascfu == 1) && ($extstate == 4) ) // Ext has CFU and is Unavailable
- {
- // If part of a ring group, then just do what CF does, otherwise needs to
- // drop back to dialplant with NOANSWER
- if ($rgmethod != '' && $rgmethod != 'none')
- {
- debug("Extension $extnum has call forward on no answer set and is unavailable and is part of a Ring Group forwarding to '$extcfu'",1);
- $extnum = $extcfu . '#'; # same method as the normal cf, i.e. send to Local
- }
- else
- {
- debug("Extension $extnum has call forward on no answer set and is unavailable",1);
- $extnum = '';
- $AGI->set_variable('DIALSTATUS','NOANSWER');
- }
- }
- elseif ( ($exthascw == 0) || ($exthascfb == 1) )
- {
- debug("Checking CW and CFB status for extension $extnum",3);
-
- if ($extstate > 0)
- { // extension in use
- debug("Extension $extnum is not available to be called", 1);
-
- if ($exthascfb == 1) // extension in use
- { // CFB is in use
- debug("Extension $extnum has call forward on busy set to $extcfb",1);
- $extnum = $extcfb . '#'; # same method as the normal cf, i.e. send to Local
- }
- elseif ($exthascw == 0)
- { // CW not in use
- debug("Extension $extnum has call waiting disabled",1);
- $extnum = '';
- $AGI->set_variable('DIALSTATUS','BUSY');
- }
- else
- {
- debug("Extension $extnum has call waiting enabled",1);
- }
- }
- }
- elseif ($extstate < 0)
- { // -1 means couldn't read status usually due to missing HINT
- debug("ExtensionState for $extnum could not be read...assuming ok",3);
- }
- else
- {
- debug("Extension $extnum is available",1);
- }
- }
- }
- elseif ($exthascw == 1)
- { // just log the fact that CW enabled
- debug("Extension $extnum has call waiting enabled",1);
- }
-
- if ($extnum != '')
- { // Still got an extension to be called?
- // check if we already have a dial string for this extension
- // if so, ignore it as it's pointless ringing it twice !
- $realext = str_replace("#", "", $extnum);
- if ( isset($dsarray[$realext]) )
- {
- debug("Extension '$realext' already in the dialstring, ignoring duplicate",1);
- }
- else
- {
- $dsarray[$realext] = 1; // could be dial string i suppose but currently only using for duplicate check
- $extds = get_dial_string( $AGI, $extnum);
- if (strlen($extds)) $ds .= $extds . '&';
-
- // Update Caller ID for calltrace application
- if ((strpos($k,"#")==0) && (($rgmethod != "hunt") && ($rgmethod != "memoryhunt")) )
- {
- if (isset($cidnum))
- {
- $rc = $AGI->database_put('CALLTRACE', $k, $cidnum);
- if ($rc['result'] == 1)
- {
- debug("DbSet CALLTRACE/$k to $cidnum", 3);
- }
- else
- {
- debug("Failed to DbSet CALLTRACE/$k to $cidnum ({$rc['result']})", 1);
- }
- }
- else
- {
- // We don't care about retval, this key may not exist
- $AGI->database_del('CALLTRACE', $k);
- debug("DbDel CALLTRACE/$k - Caller ID is not defined", 3);
- }
- }
- else
- {
- $ext_hunt[$k]=$extds; // Need to have the extension HASH set with technology for hunt group ring
- }
- }
- }
-} // endforeach
-
-$dshunt ='';
-$loops=0;
-$myhuntmember="";
-if (($rgmethod == "hunt") || ($rgmethod == "memoryhunt"))
-{
- if ($cidnum)
- $AGI->set_variable(CALLTRACE_HUNT,$cidnum);
-
- foreach ($extarray as $k )
- {
- // we loop through the original array to get the extensions in order of importance
- if ($ext_hunt[$k])
- {
- //If the original array is included in the extension hash then set variables
- $myhuntmember="HuntMember"."$loops";
- if ($rgmethod == "hunt")
- {
- $AGI->set_variable($myhuntmember,$ext_hunt[$k]);
- }
- elseif ($rgmethod == "memoryhunt")
- {
- if ($loops==0)
- {
- $dshunt =$ext_hunt[$k];
- }
- else
- {
- $dshunt .='&'.$ext_hunt[$k];
- }
- $AGI->set_variable($myhuntmember,$dshunt);
- }
- $loops += 1;
- }
- }
-}
-
-// chop $ds if length($ds); - removes trailing "&"
-$ds = chop($ds," &");
-
-if (!strlen($ds))
-{
- $AGI->noop('');
-} else {
- if (($rgmethod == "hunt") || ($rgmethod == "memoryhunt"))
- {
- $ds = '|';
- if ($timer)
- $ds .= $timer;
- $ds .= '|' . $dialopts; // pound to transfer, provide ringing
- $AGI->set_variable('ds',$ds);
- $AGI->set_variable("HuntMembers",$loops);
- $AGI->set_priority(20); // dial command is at priority 20 where dialplan handles calling a ringgroup with strategy of "hunt" or "MemoryHunt"
- }
- else
- {
- $ds .= '|';
- if ($timer)
- $ds .= $timer;
- $ds .= '|' . $dialopts; // pound to transfer, provide ringing
- $AGI->set_variable('ds',$ds);
- $AGI->set_priority(10); // dial command is at priority 10
- }
-}
-
-// EOF dialparties.agi
-exit( 0 );
-
-
-// helper functions
-
-function get_var( $agi, $value)
-{
- $r = $agi->get_variable( $value );
-
- if ($r['result'] == 1)
- {
- $result = $r['data'];
- return $result;
- }
- else
- return '';
-}
-
-function get_dial_string( $agi, $extnum )
-{
- $dialstring = '';
-
-// if ($extnum =~ s/#//)
- if (strpos($extnum,'#') != 0)
- {
- // "#" used to identify external numbers in forwards and callgourps
- $extnum = str_replace("#", "", $extnum);
- $dialstring = 'Local/'.$extnum.'@from-internal/n';
- }
- else
- {
- $device_str = sprintf("%d/device", $extnum);
- $device = $agi->database_get('AMPUSER',$device_str);
- $device = $device['data'];
-
- // a user can be logged into multipe devices, append the dial string for each
- $device_array = split( '&', $device );
- foreach ($device_array as $adevice)
- {
- $dds = $agi->database_get('DEVICE',$adevice.'/dial');
- $dialstring .= $dds['data'];
- $dialstring .= '&';
- }
- $dialstring = chop($dialstring," &");
- }
-
- return $dialstring;
-}
-
-function debug($string, $level=3)
-{
- global $AGI;
- $AGI->verbose($string, $level);
-}
-
-function mycallback( $rc )
-{
- debug("User hung up. (rc=" . $rc . ")", 1);
- exit ($rc);
-}
-
-function is_ext_avail( $extnum )
-{
- global $config;
-
- $astman = new AGI_AsteriskManager( );
- if (!$astman->connect("127.0.0.1", $config["AMPMGRUSER"] , $config["AMPMGRPASS"]))
- {
- return false;
- }
-
- $status = $astman->ExtensionState( $extnum, 'from-internal' );
- $astman->disconnect();
-
- $status = $status['Status'];
- debug("ExtensionState: $status", 4);
- return $status;
-
-}
-
-function parse_amportal_conf($filename)
-{
- $file = file($filename);
- $matches = array();
- $matchpattern = '/^\s*([a-zA-Z0-9]+)\s*=\s*(.*)\s*([;#].*)?/';
- foreach ($file as $line)
- {
- if (preg_match($matchpattern, $line, $matches))
- {
- $conf[ $matches[1] ] = $matches[2];
- }
- }
- return $conf;
-}
-
-?>
Modified: freepbx/trunk/debian/rules
===================================================================
--- freepbx/trunk/debian/rules 2006-08-01 17:15:11 UTC (rev 2167)
+++ freepbx/trunk/debian/rules 2006-08-03 08:45:50 UTC (rev 2168)
@@ -24,8 +24,8 @@
# this hacks are been done for get-orig-source
DEBVERSION:=$(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
-UPFILENAME := freepbx_$(UPVERSION).orig.tar.gz
-URL := http://superb-east.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)_$(DEBVERSION).tar.gz
+UPFILENAME:= freepbx_$(UPVERSION).orig.tar.gz
+URL:= http://superb-east.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)_$(DEBVERSION).tar.gz
configure: configure-stamp
configure-stamp:
@@ -41,6 +41,8 @@
%-8kh.wav: %.mp3
sox $< $<-big.wav
sox "$<-big.wav" -w -c1 -t wav -r 8000 -t wav "$<-8khz.wav" resample -q
+ rm -f "$<-big.wav"
+ mv "$<-8khz.wav" $@
SOUNDZ_BASE:=dir-intro-fnln.gsm dir-intro-fnln-oper.gsm dir-intro-fn-oper.gsm dir-intro-oper.gsm
SOUNDZ:=$(SOUNDZ_BASE:%=debian/rapid/sounds/%)
@@ -48,9 +50,10 @@
IMAGES_BASE:=xorcom.png xorcom-ts1.png xorcom-rapid.png
IMAGES:=$(IMAGES_BASE:%=debian/rapid/%)
-MP3_BASE:=QuajiroPromo-8kh.wav TristeAlegriaPromo-8kh.wav
-MP3S:=$(MP3_BASE:%=amp_conf/mohmp3/%)
+WAVS_BASE:=QuajiroPromo-8kh.wav TristeAlegriaPromo-8kh.wav
+WAVS:=$(WAVS_BASE:%=amp_conf/mohmp3/%)
+
build: build-stamp
build-stamp: patch-stamp
build-indep:
@@ -65,13 +68,15 @@
#-$(MAKE) clean
rm -f $(IMAGES)
rm -f $(MP3S)
+ rm -f $(WAVS)
rm -f debian/rapid/sounds/*.gsm
rm -f amp_conf/mohmp3/*.wav*
dh_clean
install: install-indep
-install-indep: $(IMAGES) $(MP3S) $(SOUNDZ)
+#install-indep: $(IMAGES) $(WAVS) $(SOUNDZ)
+install-indep: $(IMAGES) $(SOUNDZ)
dh_testdir
dh_testroot
dh_clean -k -i
@@ -92,7 +97,9 @@
rm -f debian/freepbx-admin/usr/share/freepbx/admin/i18n/*.txt
rm -f debian/freepbx-admin/usr/share/freepbx-common/upgrades/*.md5
rm -f debian/freepbx-admin/usr/share/freepbx-common/upgrades/md5-amp_conf.sh
- touch debian/freepbx-admin/usr/share/freepbx/admin/modules/empty.txt
+
+ chmod -x debian/freepbx-admin/usr/share/freepbx-common/upgrades/2.1beta1/tables.php
+ chmod -x debian/freepbx-admin/usr/share/freepbx-common/upgrades/2.1beta3/tables.php
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
More information about the Pkg-voip-commits
mailing list