cacti-plugin-0.8.7g-PA-v2.8.diff breaking on a fresh install

[pozar]

On a fresh install of 0.8.7g cacti-plugin-0.8.7g-PA-v2.8.diff is breaking. Any thoughts?
---
[...]
--------------------------
|diff -Naur cacti-0.8.7g-old/images/disable_icon.png cacti-0.8.7g/images/disable_icon.png
|--- cacti-0.8.7g-old/images/disable_icon.png 1969-12-31 19:00:00.000000000 -0500
|+++ cacti-0.8.7g/images/disable_icon.png 2010-07-09 18:34:11.000000000 -0400
--------------------------
Patching file images/disable_icon.png using Plan A...
patch: **** malformed patch at line 384: diff -Naur cacti-0.8.7g-old/images/enable_icon_disabled.png cacti-0.8.7g/images/enable_icon_disabled.png

[mcutting]

Did you try with the pre-patched files ?

[pozar]

Whoops. Sorry missed that. When I did applied the patches shown at:

http://www.cacti.net/download_patches.php

I am still getting....

[...]
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -Naur cacti-0.8.7g-old/images/disable_icon.png cacti-0.8.7g/images/disable_icon.png
|--- cacti-0.8.7g-old/images/disable_icon.png 1969-12-31 19:00:00.000000000 -0500
|+++ cacti-0.8.7g/images/disable_icon.png 2010-07-09 18:34:11.000000000 -0400
--------------------------
Patching file images/disable_icon.png using Plan A...
patch: **** malformed patch at line 384: diff -Naur cacti-0.8.7g-old/images/enable_icon_disabled.png cacti-0.8.7g/images/enable_icon_disabled.png
#
[...]

[pozar]

BTW... Here is the patch file I am patching with.

[Howie]

On what OS?

I had this problem on FreeBSD - I think that binary patches (like this one failing, that modifies/creates a new icon) might not be part of the standard patch format...

[pozar]

Ah... That be it. I am running FreeBSD. I guess I would have to dig up some gnu patch program.

I did do a work around by:

1] installing a fresh copy
2] adding patches
3] doing a "cp -r -p [patchdirectory]/files-0.8.7g/* /usr/local/share/cacti/

I did find that there are some directory assumptions that are still a little wonky that I dealt with on the short term with symbolic links.

Tim

[Linegod]

It's an icon. It didn't change. Ignore the error.

[Howie]

It's an icon. It didn't change. Ignore the error.

It's been a while, but my memory of it was that the patch process just stops, so anything after that doesn't happen.

[pozar]

I did find that there are some directory assumptions that are still a little wonky that I dealt with on the short term with symbolic links.

Silly me. The directory assumptions issue can be solved by editing "../include/global.php" and putting in the URL for the site at...

Code: Select all

/* set URL path */
if (! isset($url_path)) {
        /* $url_path = ""; */
        $url_path = "https://cacti.domain.com/";
}

With these "work arounds", all is good.

Tim