SOURCES: cacti-config.patch - up to 0.8.7a

[grzegorz]

Author: grzegorz                     Date: Tue Dec  4 08:36:19 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 0.8.7a

---- Files affected:
SOURCES:
   cacti-config.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/cacti-config.patch
diff -u SOURCES/cacti-config.patch:1.3 SOURCES/cacti-config.patch:1.4
--- SOURCES/cacti-config.patch:1.3	Sun Nov 25 16:43:36 2007
+++ SOURCES/cacti-config.patch	Tue Dec  4 09:36:14 2007
@@ -1,22 +1,12 @@
-diff -urN cacti-0.8.7a.org/include/config.php cacti-0.8.7a/include/config.php
---- cacti-0.8.7a.org/include/config.php	2007-11-17 19:11:52.000000000 +0100
-+++ cacti-0.8.7a/include/config.php	2007-11-25 16:38:21.751333314 +0100
-@@ -33,4 +33,6 @@
- /* Default session name - Session name must contain alpha characters */
- #$cacti_session_name = "Cacti";
+diff -urN cacti-0.8.7a.orig/include/config.php cacti-0.8.7a/include/config.php
+--- cacti-0.8.7a.orig/include/config.php	2007-11-17 19:11:52.000000000 +0100
++++ cacti-0.8.7a/include/config.php	2007-12-04 10:53:28.000000000 +0100
+@@ -30,6 +30,8 @@
+ $database_password = "cactiuser";
+ $database_port = "3306";
  
 +include '/etc/cacti/cacti.cfg';
 +
- ?>
-diff -urN cacti-0.8.7a.org/include/global.php cacti-0.8.7a/include/global.php
---- cacti-0.8.7a.org/include/global.php	2007-11-17 19:11:52.000000000 +0100
-+++ cacti-0.8.7a/include/global.php	2007-11-25 16:39:16.847520953 +0100
-@@ -170,7 +170,7 @@
- error_reporting(E_ALL);
+ /* Default session name - Session name must contain alpha characters */
+ #$cacti_session_name = "Cacti";
  
- /* include base modules */
--include($config["library_path"] . "/adodb/adodb.inc.php");
-+include("/usr/share/php/adodb/adodb.inc.php");
- include($config["library_path"] . "/database.php");
- include_once($config["library_path"] . "/functions.php");
- include_once($config["include_path"] . "/global_constants.php");
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cacti-config.patch?r1=1.3&r2=1.4&f=u