[RackTables] Fix patch file

Colin Coe coec at fedoraproject.org
Mon Aug 29 13:00:13 UTC 2011


commit 0a32aed16e5daba788a9d467a94a777a73950215
Author: Colin Coe <colin.coe at gmail.com>
Date:   Mon Aug 29 20:59:53 2011 +0800

    Fix patch file

 RackTables-0.19.6-Fedora-paths.patch |   26 ----------------------
 RackTables-0.19.8-Fedora-paths.patch |   40 ++++++++++++++++++++++------------
 2 files changed, 26 insertions(+), 40 deletions(-)
---
diff --git a/RackTables-0.19.8-Fedora-paths.patch b/RackTables-0.19.8-Fedora-paths.patch
index ed75c43..f4213ec 100644
--- a/RackTables-0.19.8-Fedora-paths.patch
+++ b/RackTables-0.19.8-Fedora-paths.patch
@@ -1,14 +1,26 @@
-diff -r RackTables-0.19.6-orig/scripts/syncdomain.php RackTables-0.19.6/scripts/syncdomain.php
-1c1
-< #!/usr/local/bin/php
----
-> #!/usr/bin/php
-diff -r RackTables-0.19.6-orig/wwwroot/inc/pre-init.php RackTables-0.19.6/wwwroot/inc/pre-init.php
-22c22
-< 	$racktables_staticdir = $racktables_rootdir;
----
-> 	$racktables_staticdir = '/usr/share/RackTables/static';
-26c26
-< 	$racktables_confdir = dirname (__FILE__);
----
-> 	$racktables_confdir = '/etc/RackTables';
+diff -ru RackTables-0.19.8.orig/scripts/syncdomain.php RackTables-0.19.8/scripts/syncdomain.php
+--- RackTables-0.19.8.orig/scripts/syncdomain.php	2011-03-01 02:12:30.000000000 +0800
++++ RackTables-0.19.8/scripts/syncdomain.php	2011-08-29 20:56:30.906937327 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/php
++#!/usr/bin/php
+ <?php
+ 
+ $script_mode = TRUE;
+diff -ru RackTables-0.19.8.orig/wwwroot/inc/pre-init.php RackTables-0.19.8/wwwroot/inc/pre-init.php
+--- RackTables-0.19.8.orig/wwwroot/inc/pre-init.php	2011-04-06 23:39:01.000000000 +0800
++++ RackTables-0.19.8/wwwroot/inc/pre-init.php	2011-08-29 20:57:45.470068863 +0800
+@@ -19,11 +19,11 @@
+ # code, multiple instances" deploy, in which case the paths could be changed
+ # in the custom entry point wrapper (like own index.php)
+ if (! isset ($racktables_staticdir)) // the directory containing 'pix', 'js', 'css' dirs
+-	$racktables_staticdir = $racktables_rootdir;
++	$racktables_staticdir = '/usr/share/RackTables/static';
+ if (! isset ($racktables_gwdir)) // the directory containing 'deviceconfig', 'sendfile' dirs, etc
+ 	$racktables_gwdir = realpath ($racktables_rootdir . '/../gateways');
+ if (! isset ($racktables_confdir)) // the directory containing local.php and secret.php (default is wwwroot/inc)
+-	$racktables_confdir = dirname (__FILE__);
++	$racktables_confdir = '/etc/RackTables';
+ if (! isset ($path_to_secret_php))
+ 	$path_to_secret_php = $racktables_confdir . '/secret.php';
+ if (! isset ($path_to_local_php))


More information about the scm-commits mailing list