[Pkg-voip-commits] r5228 - in /freepbx/trunk/debian: changelog patches/clean-install-amp patches/install_amp_no_asterisk patches/series

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Mon Feb 18 22:46:20 UTC 2008


Author: tzafrir-guest
Date: Mon Feb 18 22:46:20 2008
New Revision: 5228

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5228
Log:
* clean-install-amp: Also disables test for a running Asterisk.
* Removed a separate unused patch that did the same.

Removed:
    freepbx/trunk/debian/patches/install_amp_no_asterisk
Modified:
    freepbx/trunk/debian/changelog
    freepbx/trunk/debian/patches/clean-install-amp
    freepbx/trunk/debian/patches/series

Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=5228&op=diff
==============================================================================
--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Mon Feb 18 22:46:20 2008
@@ -1,12 +1,12 @@
 freepbx (2.3.1~dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * fix-ari-link.dpatch: update for 2.3.1 .
-  * clean-install-amp.dpatch: update to 2.3.1 and remove some messages.
+  * fix-ari-link: update for 2.3.1 .
+  * clean-install-amp: update to 2.3.1 and remove some messages.
+  * Also disables test for a running Asterisk.
   * There is a single freepbx-modules package now. No need to provide a
     meta-package of our own. 
-  * install_amp_no_asterisk.dpatch: we can install eve if asterisk is not
-    running.
+  * Switched from dpatch to quilt.
   * ITP files (Closes: #464926).
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu,  7 Feb 2008 01:16:22 +0200

Modified: freepbx/trunk/debian/patches/clean-install-amp
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/clean-install-amp?rev=5228&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/clean-install-amp (original)
+++ freepbx/trunk/debian/patches/clean-install-amp Mon Feb 18 22:46:20 2008
@@ -8,8 +8,8 @@
 ## some dependencies checking, as they are already taken care by 
 ## dpkg.
 
---- a/install_amp
-+++ b/install_amp
+--- freepbx-2.3.1~dfsg.orig/install_amp
++++ freepbx-2.3.1~dfsg/install_amp
 @@ -7,12 +7,12 @@ require_once ("libfreepbx.install.php");
  define("AMP_CONF", "/etc/amportal.conf");
  define("ASTERISK_CONF", "/etc/asterisk/asterisk.conf");
@@ -56,16 +56,22 @@
  		case "--my-svn-is-correct":
  			$override_astvers = true;
  		break;
-@@ -686,7 +690,7 @@ outn("Checking if Asterisk is running.."
- exec("pidof asterisk", $pid_val, $ret);
- if ($ret) {
- 	out("FAILED");
+@@ -682,14 +686,6 @@ if ($current_user != "root"){
+ out("OK");
+ 
+ 
+-outn("Checking if Asterisk is running..");
+-exec("pidof asterisk", $pid_val, $ret);
+-if ($ret) {
+-	out("FAILED");
 -	fatal($argv[0]."\n\tAsterisk must be running. If this is a first time install, you should start\n\tAsterisk by typing './start_asterisk start'\n\tFor upgrading, you should run 'amportal start'");
-+	fatal($argv[0]."\n\tAsterisk must be running. If this is a first time install, you should start\n\tAsterisk by typing './start_asterisk start'\n\tFor upgrading, you should run 'invoke-rc.d asterisk start', and don't forget to enable it in /etc/default/asterisk");
- }
- out("running with PID: ".$pid_val[0]."..OK");
- 
-@@ -701,7 +705,7 @@ if (!file_exists(AMP_CONF)) {
+-}
+-out("running with PID: ".$pid_val[0]."..OK");
+-
+ // **** Check for amportal.conf, create if necessary
+ 
+ outn("Checking for ".AMP_CONF."..");
+@@ -701,7 +697,7 @@ if (!file_exists(AMP_CONF)) {
  	// this addresses http://freepbx.org/trac/ticket/1878
  	chown(AMP_CONF, "asterisk"); 
  	chgrp(AMP_CONF, "asterisk"); 
@@ -74,7 +80,7 @@
  
  	collect_settings(AMP_CONF, $dbhost, $new_username, $new_password, 'asterisk');
  
-@@ -723,7 +727,7 @@ out("OK");
+@@ -723,7 +719,7 @@ out("OK");
  
  if (!array_key_exists("AMPWEBROOT",$amp_conf)) {
  	out("Adding AMPWEBROOT option to amportal.conf - using AMP default");
@@ -83,7 +89,7 @@
  }
  
  if (!array_key_exists("FOPWEBROOT",$amp_conf)) {
-@@ -733,7 +737,7 @@ if (!array_key_exists("FOPWEBROOT",$amp_
+@@ -733,7 +729,7 @@ if (!array_key_exists("FOPWEBROOT",$amp_
  
  if (!array_key_exists("AMPBIN",$amp_conf)) {
  	out("Adding AMPBIN option to amportal.conf - using AMP default");
@@ -92,7 +98,7 @@
  }
  
  if (!array_key_exists("AMPSBIN",$amp_conf)) {
-@@ -769,7 +773,7 @@ if (isset($dbname)) {
+@@ -769,7 +765,7 @@ if (isset($dbname)) {
  // write amportal.conf
  write_amportal_conf(AMP_CONF, $amp_conf);
  
@@ -101,7 +107,7 @@
  
  outn("Checking for ".ASTERISK_CONF."..");
  if (!file_exists(ASTERISK_CONF)) {
-@@ -792,7 +796,8 @@ out("OK");
+@@ -792,7 +788,8 @@ out("OK");
     
     this code will stay in 2.2, but in 2.3 it will be gone. developers - please
     update your code
@@ -111,7 +117,7 @@
  if (isset($asterisk_conf['astetcdir'])) { $amp_conf['ASTETCDIR'] = $asterisk_conf['astetcdir']; }
  if (isset($asterisk_conf['astmoddir'])) { $amp_conf['ASTMODDIR'] = $asterisk_conf['astmoddir']; }
  if (isset($asterisk_conf['astvarlibdir'])) { $amp_conf['ASTVARLIBDIR'] = $asterisk_conf['astvarlibdir']; }
-@@ -800,6 +805,7 @@ if (isset($asterisk_conf['astagidir'])) 
+@@ -800,6 +797,7 @@ if (isset($asterisk_conf['astagidir'])) 
  if (isset($asterisk_conf['astspooldir'])) { $amp_conf['ASTSPOOLDIR'] = $asterisk_conf['astspooldir']; }
  if (isset($asterisk_conf['astrundir'])) { $amp_conf['ASTRUNDIR'] = $asterisk_conf['astrundir']; }
  if (isset($asterisk_conf['astlogdir'])) { $amp_conf['ASTLOGDIR'] = $asterisk_conf['astlogdir']; }
@@ -119,7 +125,7 @@
  
  if (!isset($pbx_engine)) { $pbx_engine='asterisk'; }
  out("Using $pbx_engine as PBX Engine");
-@@ -811,17 +817,20 @@ write_amportal_conf(AMP_CONF, $amp_conf)
+@@ -811,17 +809,20 @@ write_amportal_conf(AMP_CONF, $amp_conf)
  // **** Write asterisk version to ASTETCDIR/version
  
  $tmpoutput = '';
@@ -142,7 +148,7 @@
  
  
  // normally this would be the contents of ASTETCDIR/version, but this is for simplicity, as we just read it above
-@@ -900,25 +909,7 @@ switch ($db_engine)
+@@ -900,25 +901,7 @@ switch ($db_engine)
  		break;
  	
  	case "sqlite":
@@ -169,7 +175,7 @@
  		break;
  	
  	case "sqlite3":
-@@ -928,6 +919,13 @@ switch ($db_engine)
+@@ -928,6 +911,13 @@ switch ($db_engine)
  		if (isset($amp_conf["AMPDBFILE"]) == "")
  			die("AMPDBFILE in /etc/amportal.conf cannot be blank");
  
@@ -183,7 +189,7 @@
  		require_once('DB/sqlite3.php');
  		$datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
  		$db = DB::connect($datasource);
-@@ -975,15 +973,15 @@ if ($install_files)
+@@ -975,15 +965,15 @@ if ($install_files)
  }
  
  // **** Apply amportal.conf configuration to files
@@ -202,7 +208,7 @@
  	if (file_exists($amp_conf["AMPBIN"]."/freepbx_engine")) {
  		exec("chmod u+x ".$amp_conf["AMPBIN"]."/freepbx_engine");
  		outn("freepbx_engine..");
-@@ -995,7 +993,7 @@ if (!$dryrun) {
+@@ -995,7 +985,7 @@ if (!$dryrun) {
  	// reload manager in asterisk if it is running:
  	//
  	outn("apply username/password changes to conf files..");
@@ -211,7 +217,7 @@
  	out("done");
  
  	// reload manager in asterisk if it was running:
-@@ -1012,7 +1010,7 @@ if (!is_dir($asterisk_conf["astspooldir"
+@@ -1012,7 +1002,7 @@ if (!is_dir($asterisk_conf["astspooldir"
  
  
  // **** Set permissions all files
@@ -220,7 +226,7 @@
  if ($install_files)
  {
  	outn("Setting permissions on files..");
-@@ -1020,7 +1018,7 @@ if ($install_files)
+@@ -1020,7 +1010,7 @@ if ($install_files)
  		exec($amp_conf["AMPSBIN"]."/amportal chown");
  	}
  	out("OK");
@@ -229,7 +235,7 @@
  
  // Run through all the upgrade scripts starting at the specified version
  //
-@@ -1030,7 +1028,7 @@ upgrade_all($version);
+@@ -1030,7 +1020,7 @@ upgrade_all($version);
  out("Generating AMP configs..");
  generate_configs();
  out("Generating AMP configs..OK");
@@ -238,7 +244,7 @@
  $version = install_getversion();
  $filename = $amp_conf["AMPWEBROOT"]."/admin/version.txt";
  if (!$fd = fopen($filename, "w")) {
-@@ -1043,7 +1041,7 @@ fclose($fd);
+@@ -1043,7 +1033,7 @@ fclose($fd);
  outn("Restarting Flash Operator Panel..");
  exec('su - asterisk -c "'.$amp_conf["AMPBIN"].'/bounce_op.sh"');
  out("OK");
@@ -247,7 +253,7 @@
  
  // Now force an install for all modules that are packaged with the tarball
  // directory.
-@@ -1060,7 +1058,7 @@ install_needreload();
+@@ -1060,7 +1050,7 @@ install_needreload();
  
  if ($amp_conf["AMPWEBADDRESS"])
  {

Modified: freepbx/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/series?rev=5228&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/series (original)
+++ freepbx/trunk/debian/patches/series Mon Feb 18 22:46:20 2008
@@ -2,7 +2,6 @@
 #ast-config-dirs		<- moved to freepbx-module-core
 disable-online-updates
 clean-install-amp
-#install_amp_no_asterisk
 fix-ari-link
 
 # integration with debian's op-panel




More information about the Pkg-voip-commits mailing list