patching in PIA failures

[doiggl]

Hello,
I got this when patching in PIA

# patch -p1 -N < ./cacti-plugin-arch/cacti-plugin-0.8.7g-PA-v2.8.diff
patching file auth_changepassword.php
patching file auth_login.php
Hunk #1 succeeded at 122 (offset -2 lines).
Hunk #2 succeeded at 189 (offset -2 lines).
Hunk #3 succeeded at 277 (offset -2 lines).
Hunk #4 succeeded at 324 (offset -2 lines).
patching file data_sources.php
patching file graph_image.php
patching file graph.php
Hunk #2 FAILED at 96.
1 out of 4 hunks FAILED -- saving rejects to file graph.php.rej
patching file graphs_new.php
patching file graphs.php
patching file host.php
Hunk #4 succeeded at 542 with fuzz 1.
patching file images/disable_icon.png
patching file images/enable_icon_disabled.png
patching file images/enable_icon.png
patching file images/install_icon_disabled.png
patching file images/install_icon.png
patching file images/uninstall_icon.gif
patching file images/view_none.gif
patching file include/auth.php
patching file include/bottom_footer.php
patching file include/config.php
patching file include/global_arrays.php
patching file include/global_constants.php
patching file include/global_form.php
patching file include/global.php
patching file include/global_settings.php
patching file include/plugins.php
patching file include/top_graph_header.php
Hunk #1 succeeded at 25 with fuzz 1.
Hunk #2 FAILED at 57.
Hunk #3 succeeded at 97 (offset -2 lines).
Hunk #4 succeeded at 109 (offset -2 lines).
Hunk #5 succeeded at 117 (offset -2 lines).
Hunk #6 succeeded at 146 (offset -2 lines).
1 out of 6 hunks FAILED -- saving rejects to file include/top_graph_header.php.rej
patching file include/top_header.php
Hunk #1 FAILED at 22.
1 out of 4 hunks FAILED -- saving rejects to file include/top_header.php.rej
patching file index.php
patching file lib/api_device.php
patching file lib/auth.php
patching file lib/functions.php
patching file lib/html_form.php
patching file lib/html.php
Hunk #1 FAILED at 144.
Hunk #3 FAILED at 269.
2 out of 8 hunks FAILED -- saving rejects to file lib/html.php.rej
patching file lib/plugins.php
patching file lib/poller.php
Hunk #1 succeeded at 343 (offset -1 lines).
patching file lib/rrd.php
Hunk #3 succeeded at 1383 with fuzz 1.
patching file lib/variables.php
patching file plugins/index.php
patching file plugins.php
patching file poller.php
patching file user_admin.php
patching file utilities.php
#

I located the .rej files they look a fair size

#find . | grep -i "\.rej"
./lib/html.php.rej
./graph.php.rej
./include/top_header.php.rej
./include/top_graph_header.php.rej
#
# ls -l ./lib/html.php.rej ./graph.php.rej ./include/top_header.php.rej ./include/top_graph_header.php.rej
-rw-r--r-- 1 2196 Dec 11 14:25 ./graph.php.rej
-rw-r--r-- 1 7648 Dec 11 14:25 ./include/top_graph_header.php.rej
-rw-r--r-- 1 3530 Dec 11 14:25 ./include/top_header.php.rej
-rw-r--r-- 1 8103 Dec 11 14:25 ./lib/html.php.rej


How do I progress from here ?
Glenn

[doiggl]

I did a fresh install of cacti using this as a base http://www.cacti.net/downloads/cacti-0.8.7g.tar.gz
Following these instructions http://docs.cacti.net/manual:087:1_installation.9_pia
This seemed to apply for a dry-run ok.


# cd /usr/share/cacti
# wget -c http://mirror.cactiusers.org/downloads/ ... 2.8.tar.gz
# gunzip -v cacti-plugin-0.8.7g-PA-v2.8.tar.gz
# tar -xvf cacti-plugin-0.8.7g-PA-v2.8.tar

# cd /usr/share/cacti
# patch -p1 -N --dry-run < cacti-plugin-arch/cacti-plugin-0.8.7g-PA-v2.8.diff
patching file auth_changepassword.php
patching file auth_login.php
patching file data_sources.php
patching file graph_image.php
patching file graph.php
patching file graphs_new.php
patching file graphs.php
patching file host.php
patching file images/disable_icon.png
patching file images/enable_icon_disabled.png
patching file images/enable_icon.png
patching file images/install_icon_disabled.png
patching file images/install_icon.png
patching file images/uninstall_icon.gif
patching file images/view_none.gif
patching file include/auth.php
patching file include/bottom_footer.php
patching file include/config.php
patching file include/global_arrays.php
patching file include/global_constants.php
patching file include/global_form.php
patching file include/global.php
patching file include/global_settings.php
patching file include/plugins.php
patching file include/top_graph_header.php
patching file include/top_header.php
patching file index.php
patching file lib/api_device.php
patching file lib/auth.php
patching file lib/functions.php
patching file lib/html_form.php
patching file lib/html.php
patching file lib/plugins.php
patching file lib/poller.php
patching file lib/rrd.php
patching file lib/variables.php
patching file plugins/index.php
patching file plugins.php
patching file poller.php
patching file user_admin.php
patching file utilities.php