after testing a fresh checkout

git-svn-id: https://svn.code.sf.net/p/freetel/code@11 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/freepbx-sandbox/Makefile b/freepbx-sandbox/Makefile
index 34d5c17e688b6f7147ad443106e8be7851048083..fa5b41eb0b01b309d91098419481eb585ed614ab 100644 (file)
--- a/freepbx-sandbox/Makefile
+++ b/freepbx-sandbox/Makefile
@@ -232,7 +232,7 @@ $(DL_DIR)/$(FREEPBX_SOURCE):
 
 $(FREEPBX_DIR)/.unpacked: $(DL_DIR)/$(FREEPBX_SOURCE)
        zcat $(DL_DIR)/$(FREEPBX_SOURCE) | tar -C $(BUILD_DIR) -xf -
-       patch -d $(FREEPBX_DIR) -p5 < patch/freepbx.patch
+       patch -d $(FREEPBX_DIR) -p1 < patch/freepbx.patch
        touch $(FREEPBX_DIR)/.unpacked
 
 $(FREEPBX_DIR)/.installed: $(FREEPBX_DIR)/.unpacked

diff --git a/freepbx-sandbox/patch/freepbx.patch b/freepbx-sandbox/patch/freepbx.patch
index ce0de80f2be25b08de7c60511054e40af0b92ae2..b2fb51c671738eabf5ec29a072356fccff145013 100644 (file)
--- a/freepbx-sandbox/patch/freepbx.patch
+++ b/freepbx-sandbox/patch/freepbx.patch
@@ -172,7 +172,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-07 19:18:46.000000000 +1030
++++ freepbx-2.4.0//install_amp 2008-03-08 10:05:14.000000000 +1030
 @@ -4,7 +4,7 @@
  require_once ("libfreepbx.install.php");
  
@@ -192,7 +192,7 @@
 -if ($current_user != "root"){
 -      out("FAILED");
 -      fatal($argv[0]." must be run as root");
-+if (function_exists('posix_getpwuid') && functionIexists('posix_geteuid') {
++if (function_exists('posix_getpwuid') && function_exists('posix_geteuid')) {
 +      //$current_user=(isset($_ENV["USER"]) ? $_ENV["USER"] : exec('whoami',$output));
 +      $euid = (posix_getpwuid(posix_geteuid()));
 +      $current_user = $euid['name'];
@@ -274,7 +274,7 @@
  
  ?>
 --- freepbx-2.4.0-orig//amp_conf/bin/retrieve_conf     2007-12-15 08:18:39.000000000 +1030
-+++ freepbx-2.4.0//amp_conf/bin/retrieve_conf  2008-03-07 15:45:02.000000000 +1030
++++ freepbx-2.4.0//amp_conf/bin/retrieve_conf  2008-03-07 20:39:45.000000000 +1030
 @@ -10,7 +10,7 @@
  
  ini_set('error_reporting', E_ALL & ~E_NOTICE);