From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Sun, 25 Nov 2007 15:43:36 +0000 (+0000)
Subject: - update
X-Git-Tag: auto/ac/cacti-0_8_7a-1~6
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=2dc860a35460de4379a25565a15012160eeaff1d;p=packages%2Fcacti.git

- update

Changed files:
    cacti-config.patch -> 1.3
---

diff --git a/cacti-config.patch b/cacti-config.patch
index b2ee855..feb9cc8 100644
--- a/cacti-config.patch
+++ b/cacti-config.patch
@@ -1,20 +1,22 @@
---- cacti-0.8.6g/include/config.php	2005-10-06 11:57:42.021629992 +0200
-+++ cacti-0.8.6h/include/config.php	2006-04-15 14:05:53.184042777 +0300
-@@ -31,6 +31,8 @@
- $database_username = "cactiuser";
- $database_password = "cactiuser";
+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";
  
 +include '/etc/cacti/cacti.cfg';
 +
- /* ----- you probably do not need to change anything below this line ----- */
- 
- /* Files that do not need http header information - Command line scripts */
-@@ -163,7 +165,7 @@
+ ?>
+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);
  
  /* include base modules */
 -include($config["library_path"] . "/adodb/adodb.inc.php");
-+include('/usr/share/php/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"] . "/config_constants.php");
+ include_once($config["include_path"] . "/global_constants.php");