From 858b98c23cc2b980ecca13754086da413d21a986 Mon Sep 17 00:00:00 2001
From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Fri, 7 Mar 2008 08:03:23 +0000
Subject: [PATCH] added machine type to conf array

git-svn-id: https://svn.code.sf.net/p/freetel/code@8 01035d8c-6547-0410-b346-abe4f91aad63
---
 freepbx-sandbox/Makefile            |  8 ++++++
 freepbx-sandbox/patch/freepbx.patch | 41 +++++++++++++++++++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/freepbx-sandbox/Makefile b/freepbx-sandbox/Makefile
index f82df800..345c644c 100644
--- a/freepbx-sandbox/Makefile
+++ b/freepbx-sandbox/Makefile
@@ -378,6 +378,14 @@ freepbx-make-patch:
 	$(AROOT)/admin/cdr/lib/Class.Table.php \
 	>> patch/freepbx.patch
 
+	# support for Blackfin machine type in conf array, helps install_amp switch
+	# off a few unsupported function calls
+
+	-diff -uN \
+	$(AO)/amp_conf/htdocs/admin/functions.inc.php \
+	$(A)/amp_conf/htdocs/admin/functions.inc.php \
+	>> patch/freepbx.patch
+
 	# typo in newinstall.sqlite3.sql
 
 	-diff -uN \
diff --git a/freepbx-sandbox/patch/freepbx.patch b/freepbx-sandbox/patch/freepbx.patch
index 44306863..b75a5955 100644
--- a/freepbx-sandbox/patch/freepbx.patch
+++ b/freepbx-sandbox/patch/freepbx.patch
@@ -160,6 +160,16 @@
  		$num = $res -> numRows();
  		
  		
+--- freepbx-2.4.0-orig//amp_conf/htdocs/admin/functions.inc.php	2008-02-09 02:12:18.000000000 +1030
++++ freepbx-2.4.0//amp_conf/htdocs/admin/functions.inc.php	2008-03-07 18:20:40.000000000 +1030
+@@ -32,6 +32,7 @@
+ 	'AMPMGRPASS'     => array('std' , 'amp111'),
+ 	'FOPPASSWORD'    => array('std' , 'passw0rd'),
+ 	'FOPSORT'        => array('std' , 'extension'),
++	'AMPMACHINE'     => array('std' , 'x86'),
+ 
+ 	'ASTETCDIR'      => array('dir' , '/etc/asterisk'),
+ 	'ASTMODDIR'      => array('dir' , '/usr/lib/asterisk/modules'),
 --- freepbx-2.4.0-orig//SQL/newinstall.sqlite3.sql	2008-02-11 14:27:53.000000000 +1030
 +++ freepbx-2.4.0//SQL/newinstall.sqlite3.sql	2008-03-02 20:20:33.000000000 +1030
 @@ -323,7 +323,7 @@
@@ -172,7 +182,7 @@
  	`id` varchar(20) NOT NULL default 'xml',
  	`time` int(11) NOT NULL default '0',
 --- freepbx-2.4.0-orig//install_amp	2008-01-28 04:22:58.000000000 +1030
-+++ freepbx-2.4.0//install_amp	2008-03-02 20:20:33.000000000 +1030
++++ freepbx-2.4.0//install_amp	2008-03-07 18:24:30.000000000 +1030
 @@ -4,7 +4,7 @@
  require_once ("libfreepbx.install.php");
  
@@ -182,7 +192,34 @@
  define("ASTERISK_CONF", "/etc/asterisk/asterisk.conf");
  define("UPGRADE_DIR", dirname(__FILE__)."/upgrades");
  define("MODULE_DIR", dirname(__FILE__)."/amp_conf/htdocs/admin/modules/");
-@@ -892,10 +892,12 @@
+@@ -691,13 +691,20 @@
+ // **** Look for user = root
+ 
+ outn("Checking user..");
+-//$current_user=(isset($_ENV["USER"]) ? $_ENV["USER"] : exec('whoami',$output));
+-$euid = (posix_getpwuid(posix_geteuid()));
+-$current_user = $euid['name'];
+-if ($current_user != "root"){
+-	out("FAILED");
+-	fatal($argv[0]." must be run as root");
++if ($amp_conf["AMPMACHINE"] != "Blackfin") {
++
++	# Blackfin doesn't support posix_getuid() but we are always root anyway
++
++	//$current_user=(isset($_ENV["USER"]) ? $_ENV["USER"] : exec('whoami',$output));
++	$euid = (posix_getpwuid(posix_geteuid()));
++	$current_user = $euid['name'];
++	if ($current_user != "root"){
++		out("FAILED");
++		fatal($argv[0]." must be run as root");
++	}
++
+ }
++
+ out("OK");
+ 
+ 
+@@ -892,10 +899,12 @@
  
  outn("Connecting to database..");
  
-- 
2.25.1