[hobbit] Devmon/Hobbit Patch

[Buchan Milne]

On Tuesday 01 April 2008 19:05:48 Joshua Krause wrote:
> I am trying to patch my hobbit installation and stop using
>
> extra-rrd.pl and start using do_devmon.c.  But when applying the patch I
> get these errors:
>
>
>
> patching file hobbit-4.2.0/lib/hobbitrrd.c patching file
>
> hobbit-4.2.0/lib/htmllog.c Hunk #1 FAILED at 318.
>
> Hunk #2 FAILED at 349.
>
> Hunk #3 FAILED at 366.
>
> 3 out of 3 hunks FAILED -- saving rejects to file
>
> hobbit-4.2.0/lib/htmllog.c.rej patching file
>
> hobbit-4.2.0/hobbitd/etcfiles/hobbitserver.cfg.DIST
>
> patching file hobbit-4.2.0/hobbitd/do_rrd.c patching file
>
> hobbit-4.2.0/web/hobbitsvc.c
>
>
>
>
>
> Can anyone assist me in getting the patch applied correctly so that I can
> start using do_devmon.c instead of the extra-rrd.pl script.?

The intention is to apply the patch to a hobbit-4.2.0 source tree that has the 
allinone patch applied. E.g.:

[bgmilne at tiger BUILD]$ tar 
xjf /home/bgmilne/Download/source/svn/mandriva/hobbit/SOURCES/hobbit-4.2.0.tar.bz2
[bgmilne at tiger BUILD]$ cd hobbit-4.2.0
[bgmilne at tiger hobbit-4.2.0]$ patch -p1 
< /home/bgmilne/Download/source/svn/mandriva/hobbit/SOURCES/allinone.patch
patching file bbdisplay/bbgen.h
patching file bbdisplay/loadbbhosts.c
patching file bbdisplay/loadbbhosts.h
patching file bbdisplay/loaddata.c
patching file bbdisplay/pagegen.c
patching file bbnet/bbtest-net.c
patching file bbnet/bbtest-net.h
patching file build/bb-commands.sh
patching file client/hobbitclient-aix.sh
patching file client/hobbitclient-darwin.sh
patching file client/hobbitclient-sunos.sh
patching file client/logfetch.c
patching file client/msgcache.c
patching file client/runclient.sh
patching file common/bb-hosts.5
patching file configure.server
patching file hobbitd/Makefile
patching file hobbitd/client_config.c
patching file hobbitd/convertnk.c
patching file hobbitd/do_alert.c
patching file hobbitd/hobbitd.c
patching file hobbitd/hobbitd.c~
patching file hobbitd/hobbitd_alert.c
patching file hobbitd/hobbitd_buffer.c
patching file hobbitd/hobbitd_buffer.h
patching file hobbitd/hobbitd_client.c
patching file hobbitd/hobbitd_ipc.c
patching file hobbitd/hobbitfetch.c
patching file hobbitd/rrd/do_ncv.c
patching file hobbitd/webfiles/confreport_front
patching file hobbitd/webfiles/hobbitnk_footer
patching file hobbitd/webfiles/info_header
patching file hobbitd/webfiles/notify_footer
patching file hobbitd/webfiles/notify_form
patching file hobbitd/webfiles/notify_header
patching file hobbitd/webfiles/zoom.js
patching file hobbitd/wwwfiles/menu/menu_items.js.DIST
patching file include/libbbgen.h
patching file lib/Makefile
patching file lib/cgi.c
patching file lib/cgi.h
patching file lib/color.c
patching file lib/headfoot.c
patching file lib/hobbitrrd.c
patching file lib/hobbitrrd.h
patching file lib/htmllog.c
patching file lib/loadhosts.c
patching file lib/loadhosts.h
patching file lib/loadhosts_file.c
patching file lib/loadhosts_net.c
patching file lib/notifylog.c
patching file lib/notifylog.h
patching file lib/timefunc.c
patching file web/Makefile
patching file web/bb-ack.c
patching file web/bb-datepage.c
patching file web/bb-eventlog.c
patching file web/bb-findhost.c
patching file web/bb-rep.c
patching file web/bb-snapshot.c
patching file web/hobbit-confreport-critical.sh.DIST
patching file web/hobbit-confreport.c
patching file web/hobbit-confreport.cgi.1
patching file web/hobbit-enadis.c
patching file web/hobbit-hostgraphs.c
patching file web/hobbit-nkedit.c
patching file web/hobbit-nkview.c
patching file web/hobbit-notifylog.c
patching file web/hobbit-notifylog.sh.DIST
patching file web/hobbit-statusreport.c
patching file web/hobbitgraph.c
patching file web/hobbitsvc-info.c
patching file web/hobbitsvc-trends.c
[bgmilne at tiger hobbit-4.2.0]$ patch -p1 
< /home/bgmilne/Download/source/svn/sf/devmon/trunk/extras/hobbit-4.2.0-devmon-complete.patch
patching file lib/hobbitrrd.c
patching file lib/htmllog.c
patching file hobbitd/etcfiles/hobbitserver.cfg.DIST
patching file hobbitd/do_rrd.c
patching file web/hobbitsvc.c
patching file hobbitd/rrd/do_devmon.c


(the new -complete patch that will be in the final 0.3.0 release puts 
do_devmon.c in place as well).

Regards,
Buchan