--- hobbit-4.2.0.dfsg.orig/.hgtags +++ hobbit-4.2.0.dfsg/.hgtags @@ -0,0 +1,12 @@ +ce67c7b55aac1cc5ce244328cb269a0eb87da9c0 debian-4.2.0.dfsg-1 +6a65ac965e9f9015690090dbebd57305aece44bd debian-4.2.0.dfsg-2 +cefb8ee7b399d85ad876711d42d75d9293ad79de debian-4.2.0.dfsg-3 +d8d89524da04884d4196e3bb881e35f4e012a616 debian-4.2.0.dfsg-4 +dda32c0250161c2d4a9ebc48e5d22ea610041393 debian-4.2.0.dfsg-5 +8009e20ebcb7e799ec577d0d50d5b1279ccc3f40 debian-4.2.0.dfsg-6 +c84e22de27cb1527f34bfe26904d2ab2c63aa652 debian-4.2.0.dfsg-7 +ab52594e978b8e63f22c87267c8c8f18d3da4220 debian-4.2.0.dfsg-8 +bc030ff28a305ac4c3b76543f59a93de4ecb0549 debian-4.2.0.dfsg-9 +5c8e23a2ddfa74f7da2f80089dcf99bd9e46d9e1 debian-4.2.0.dfsg-10 +5f0f850133f227b97c493e2003c12f3d2a85129f debian-4.2.0.dfsg-11 +e7691a897bd7c27e3351fbedeb55967be7eb46f1 debian-4.2.0.dfsg-12 --- hobbit-4.2.0.dfsg.orig/debian/copyright +++ hobbit-4.2.0.dfsg/debian/copyright @@ -0,0 +1,134 @@ +This package was debianized by Henrik Stoerner on +Sun, 6 Mar 2005 21:58:45 +0100. + +The current debianization is based on Henrik's and was done by Christoph Berg + on Wed, 15 Aug 2007 21:09:40 +0200. + +It was downloaded from http://sourceforge.net/projects/hobbitmon/ +The tarball was rebuild to remove a non-free javascript menu and the debian/ +directory. The new menu was written by Christoph Berg but is sufficiently +trivial such that it is copyright-free. + +Upstream author: Henrik Stoerner + +Copyright: + +Most files are carry the following copyright header: + Copyright (C) 2002-2006 Henrik Storner + This program is released under the GNU General Public License (GPL), + version 2. See the file "COPYING" for details. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +Other copyrights: + +client/hobbitclient-sco_sv.sh: + SCO_SV client for Hobbit + Copyright (C) 2005-2006 Henrik Storner + Copyright (C) 2006 Charles Goyard + +client/runclient.sh: + Copyright (C) 2005-2006 Henrik Storner + "status" section (C) Scott Smith 2006 + +hobbitd/webfiles/zoom.js: + Copyright (C) 2004 Eric Steffen + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +lib/md5.c: + This file is part of the Hobbit monitor library, but was written by + Peter Deutsch and released under the GNU GPL. + Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +lib/ripemd.h: + Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) + All rights reserved. + + This package is an SSL implementation written + by Eric Young (eay@cryptsoft.com). + The implementation was written so as to conform with Netscapes SSL. + + This library is free for commercial and non-commercial use as long as + the following conditions are aheared to. The following conditions + apply to all code found in this distribution, be it the RC4, RSA, + lhash, DES, etc., code; not just the SSL code. The SSL documentation + included with this distribution is covered by the same copyright terms + except that the holder is Tim Hudson (tjh@cryptsoft.com). + + Copyright remains Eric Young's, and as such any Copyright notices in + the code are not to be removed. + If this package is used in a product, Eric Young should be given attribution + as the author of the parts of the library used. + This can be in the form of a textual message at program startup or + in documentation (online or textual) provided with the package. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + "This product includes cryptographic software written by + Eric Young (eay@cryptsoft.com)" + The word 'cryptographic' can be left out if the rouines from the library + being used are not cryptographic related :-). + 4. If you include any Windows specific code (or a derivative thereof) from + the apps directory (application code) you must include an acknowledgement: + "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" + + THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + The licence and distribution terms for any publically available version or + derivative of this code cannot be changed. i.e. this code cannot simply be + copied and put under another distribution licence + [including the GNU Public Licence.] + +There is a nested c-ares tarball in bbnet/: + Copyright 1998, 2000 by the Massachusetts Institute of Technology. + Copyright (C) 2004 by Daniel Stenberg et al + + Permission to use, copy, modify, and distribute this + software and its documentation for any purpose and without + fee is hereby granted, provided that the above copyright + notice appear in all copies and that both that copyright + notice and this permission notice appear in supporting + documentation, and that the name of M.I.T. not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + M.I.T. makes no representations about the suitability of + this software for any purpose. It is provided "as is" + without express or implied warranty. --- hobbit-4.2.0.dfsg.orig/debian/patches/doc-paths +++ hobbit-4.2.0.dfsg/debian/patches/doc-paths @@ -0,0 +1,85 @@ +Index: hobbit-4.2.0.dfsg/docs/hobbit-apacheconf.txt +=================================================================== +--- hobbit-4.2.0.dfsg.orig/docs/hobbit-apacheconf.txt 2007-09-07 17:39:37.000000000 +0200 ++++ hobbit-4.2.0.dfsg/docs/hobbit-apacheconf.txt 2007-09-07 17:40:04.000000000 +0200 +@@ -9,35 +9,35 @@ + # the Hobbit webfiles as the root URL. In that case, + # you should instead set this: + # +-# DocumentRoot /usr/local/hobbit/server/www/ ++# DocumentRoot /usr/lib/hobbit/server/www/ + +-Alias /hobbit/ "/usr/local/hobbit/server/www/" +- ++Alias /hobbit/ "/usr/lib/hobbit/server/www/" ++ + Options Indexes FollowSymLinks Includes MultiViews + Order allow,deny + Allow from all + + +-ScriptAlias /hobbit-cgi/ "/usr/local/hobbit/cgi-bin/" +- ++ScriptAlias /hobbit-cgi/ "/usr/lib/hobbit/cgi-bin/" ++ + AllowOverride None + Options ExecCGI Includes + Order allow,deny + Allow from all + + +-ScriptAlias /hobbit-seccgi/ "/usr/local/hobbit/cgi-secure/" +- ++ScriptAlias /hobbit-seccgi/ "/usr/lib/hobbit/cgi-secure/" ++ + AllowOverride None + Options ExecCGI Includes + Order allow,deny + Allow from all + + # Password file where users with access to these scripts are kept. +- # Create it with "htpasswd -c /usr/local/hobbit/server/etc/hobbitpasswd USERNAME" +- # Add more users / change passwords with "htpasswd /usr/local/hobbit/server/etc/hobbitpasswd USERNAME" ++ # Create it with "htpasswd -c /usr/lib/hobbit/server/etc/hobbitpasswd USERNAME" ++ # Add more users / change passwords with "htpasswd /usr/lib/hobbit/server/etc/hobbitpasswd USERNAME" + +- AuthUserFile /usr/local/hobbit/server/etc/hobbitpasswd ++ AuthUserFile /usr/lib/hobbit/server/etc/hobbitpasswd + AuthType Basic + AuthName "Hobbit Administration" + Require valid-user +Index: hobbit-4.2.0.dfsg/docs/hobbit-mrtg.html +=================================================================== +--- hobbit-4.2.0.dfsg.orig/docs/hobbit-mrtg.html 2007-09-07 17:39:37.000000000 +0200 ++++ hobbit-4.2.0.dfsg/docs/hobbit-mrtg.html 2007-09-07 17:40:13.000000000 +0200 +@@ -35,7 +35,7 @@ file like this at the top of the file: + # For Hobbit integration +-WorkDir: /usr/local/hobbit/data/rrd ++WorkDir: /usr/lib/hobbit/data/rrd + LogFormat: rrdtool + + +@@ -59,7 +59,7 @@ query the SNMP daemon on the router.

+ +

The Directory[mrtg.myrouter.eth0]: myrouter.sample.com instructs MRTG to + save the data file in this directory relative to the WorkDir directory, i.e. the final directory +-for the RRD datafile will be /usr/local/hobbit/data/rrd/myrouter.sample.com which is ++for the RRD datafile will be /usr/lib/hobbit/data/rrd/myrouter.sample.com which is + where Hobbit expects all of the RRD-files for the myrouter.sample.com host to be. The + name of the RRD data-file will be mrtg.myrouter.eth0.rrd - i.e. the name of the target.

+ +Index: hobbit-4.2.0.dfsg/docs/install.html +=================================================================== +--- hobbit-4.2.0.dfsg.orig/docs/install.html 2007-09-07 17:39:38.000000000 +0200 ++++ hobbit-4.2.0.dfsg/docs/install.html 2007-09-07 17:40:13.000000000 +0200 +@@ -163,7 +163,7 @@ directory (recommended for better securi + password-file that controls access to this directory. Use the htpasswd + command both to create the password file and to add or delete users:
+ 

+-	# /usr/sbin/htpasswd -c /usr/local/hobbit/server/etc/hobbitpasswd admin
++	# /usr/sbin/htpasswd -c /usr/lib/hobbit/server/etc/hobbitpasswd admin
+ 	New password:
+ 	Re-type new password:
+ 	Adding password for user admin
--- hobbit-4.2.0.dfsg.orig/debian/patches/series
+++ hobbit-4.2.0.dfsg/debian/patches/series
@@ -0,0 +1,14 @@
+new-menu
+doc-paths
+hobbitclient-debian
+hobbitvars
+hobbitgraph.netstat
+hobbit-ghosts-menu
+ncv-ignoretext.patch 
+rrd_net_granularity
+hobbitgraph.mailq
+disk-linecount
+splitncv
+ldap-deprecated
+http-proxy-url
+hobbitclient-tmpfs
--- hobbit-4.2.0.dfsg.orig/debian/patches/hobbitgraph.netstat
+++ hobbit-4.2.0.dfsg/debian/patches/hobbitgraph.netstat
@@ -0,0 +1,26 @@
+--- a/hobbitd/etcfiles/hobbitgraph.cfg.org	2007-10-13 12:58:50.000000000 +0200
++++ b/hobbitd/etcfiles/hobbitgraph.cfg	2007-10-21 15:52:31.000000000 +0200
+@@ -1081,15 +1081,15 @@
+ 	DEF:outbytes@RRDIDX@=@RRDFN@:bytesSent:AVERAGE
+ 	CDEF:out@RRDIDX@=outbytes@RRDIDX@,8,*
+ 	LINE2:in@RRDIDX@#@COLOR@:@RRDPARAM@  inbound
+-	GPRINT:in@RRDIDX@:LAST: \: %10.1lf (cur)
+-	GPRINT:in@RRDIDX@:MAX: \: %10.1lf (max)
+-	GPRINT:in@RRDIDX@:MIN: \: %10.1lf (min)
+-	GPRINT:in@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
++	GPRINT:in@RRDIDX@:LAST: \: %5.1lf%s (cur)
++	GPRINT:in@RRDIDX@:MAX: \: %5.1lf%s (max)
++	GPRINT:in@RRDIDX@:MIN: \: %5.1lf%s (min)
++	GPRINT:in@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
+ 	LINE2:out@RRDIDX@#@COLOR@:@RRDPARAM@ outbound
+-	GPRINT:out@RRDIDX@:LAST: \: %10.1lf (cur)
+-	GPRINT:out@RRDIDX@:MAX: \: %10.1lf (max)
+-	GPRINT:out@RRDIDX@:MIN: \: %10.1lf (min)
+-	GPRINT:out@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
++	GPRINT:out@RRDIDX@:LAST: \: %5.1lf%s (cur)
++	GPRINT:out@RRDIDX@:MAX: \: %5.1lf%s (max)
++	GPRINT:out@RRDIDX@:MIN: \: %5.1lf%s (min)
++	GPRINT:out@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
+ 
+ [files]
+ 	FNPATTERN filesizes.(.+).rrd
--- hobbit-4.2.0.dfsg.orig/debian/patches/rrd_net_granularity
+++ hobbit-4.2.0.dfsg/debian/patches/rrd_net_granularity
@@ -0,0 +1,80 @@
+--- a/hobbitd/rrd/do_net.c
++++ b/hobbitd/rrd/do_net.c
+@@ -85,7 +85,7 @@ int do_net_rrd(char *hostname, char *tes
+ 		p = strstr(msg, "\nSeconds:");
+ 		if (p && (sscanf(p+1, "Seconds: %f", &seconds) == 1)) {
+ 			setupfn("tcp.%s.rrd", testname);
+-			sprintf(rrdvalues, "%d:%.2f", (int)tstamp, seconds);
++			sprintf(rrdvalues, "%d:%f", (int)tstamp, seconds);
+ 			return create_and_update_rrd(hostname, rrdfn, bbnet_params, bbnet_tpl);
+ 		}
+ 	}
+--- a/bbnet/bbtest-net.c
++++ b/bbnet/bbtest-net.c
+@@ -1746,8 +1746,8 @@ void send_results(service_t *service, in
+ 		}
+ 
+ 		if (t->duration.tv_sec != -1) {
+-			sprintf(msgtext, "\nSeconds: %u.%02u\n", 
+-				(unsigned int)t->duration.tv_sec, (unsigned int)t->duration.tv_usec / 10000);
++			sprintf(msgtext, "\nSeconds: %f\n", 
++				(unsigned int)t->duration.tv_sec + (unsigned int)t->duration.tv_usec / 1000000.0);
+ 			addtostatus(msgtext);
+ 		}
+ 		addtostatus("\n\n");
+--- a/bbnet/dns.c
++++ b/bbnet/dns.c
+@@ -354,7 +354,7 @@ int dns_test_server(char *serverip, char
+ 		tst = strtok(NULL, ",");
+ 	}
+ 	xfree(tspec);
+-	sprintf(msg, "\nSeconds: %u.%03u\n", (unsigned int)tspent->tv_sec, (unsigned int)tspent->tv_usec/1000);
++	sprintf(msg, "\nSeconds: %f\n", (unsigned int)tspent->tv_sec + (unsigned int)tspent->tv_usec/1000000.0);
+ 	addtobuffer(banner, msg);
+ 
+ 	return (status != ARES_SUCCESS);
+--- a/bbnet/httpresult.c
++++ b/bbnet/httpresult.c
+@@ -235,9 +235,9 @@ void send_http_results(service_t *httpte
+ 			}
+ 			if (req->faileddeps) addtostatus(req->faileddeps);
+ 
+-			sprintf(urlmsg, "\nSeconds: %5d.%02d\n\n", 
+-				(unsigned int)req->tcptest->totaltime.tv_sec, 
+-				(unsigned int)req->tcptest->totaltime.tv_usec / 10000 );
++			sprintf(urlmsg, "\nSeconds: %f\n\n", 
++				(unsigned int)req->tcptest->totaltime.tv_sec +
++				(unsigned int)req->tcptest->totaltime.tv_usec / 1000000.0 );
+ 			addtostatus(urlmsg);
+ 			xfree(urlmsg);
+ 		}
+--- a/bbnet/ldaptest.c
++++ b/bbnet/ldaptest.c
+@@ -444,8 +444,8 @@ void send_ldap_results(service_t *ldapte
+ 		}
+ 		if (req->faileddeps) addtostatus(req->faileddeps);
+ 
+-		sprintf(msgline, "\nSeconds: %u.%02u\n",
+-			(unsigned int)req->duration.tv_sec, (unsigned int)req->duration.tv_usec / 10000);
++		sprintf(msgline, "\nSeconds: %f\n",
++			(unsigned int)req->duration.tv_sec + (unsigned int)req->duration.tv_usec / 1000000.0);
+ 
+ 		addtostatus(msgline);
+ 	}
+--- a/bbnet/hobbitping.c
++++ b/bbnet/hobbitping.c
+@@ -354,11 +354,11 @@ void show_results(void)
+ 		if (hosts[idx]->received > 0) {
+ 			printf("%s is alive", inet_ntoa(hosts[idx]->addr.sin_addr));
+ 			rtt_usecs = (hosts[idx]->rtt_total.tv_sec*1000000 + hosts[idx]->rtt_total.tv_usec) / hosts[idx]->received;
+-			if (rtt_usecs >= 1000) {
+-				printf(" (%lu ms)\n", rtt_usecs / 1000);
++			if (rtt_usecs >= 3000) {
++				printf(" (%.1f ms)\n", rtt_usecs / 1000.0);
+ 			}
+ 			else {
+-				printf(" (0.%02lu ms)\n", (rtt_usecs / 10));
++				printf(" (%u usec)\n", rtt_usecs);
+ 			}
+ 		}
+ 		else {
--- hobbit-4.2.0.dfsg.orig/debian/patches/splitncv
+++ hobbit-4.2.0.dfsg/debian/patches/splitncv
@@ -0,0 +1,352 @@
+# To: hobbit (at) hswn.dk
+# Subject: Re: [hobbit] Custom graphs again
+# From: Charles Goyard 
+# Date: Thu, 29 Mar 2007 17:07:01 +0200
+# References: <460B354F.8050404@yahoo.com>
+# http://www.hswn.dk/hobbiton/2007/03/msg00368.html
+
+--- a/hobbitd/do_rrd.c
++++ b/hobbitd/do_rrd.c
+@@ -29,6 +29,7 @@ static char rcsid[] = "$Id: do_rrd.c,v 1
+ #include "do_rrd.h"
+ 
+ char *rrddir = NULL;
++char *trackmax = NULL;
+ static char *exthandler = NULL;
+ static char **extids = NULL;
+ 
+@@ -37,11 +38,16 @@ static char rra1[] = "RRA:AVERAGE:0.5:1:
+ static char rra2[] = "RRA:AVERAGE:0.5:6:576";
+ static char rra3[] = "RRA:AVERAGE:0.5:24:576";
+ static char rra4[] = "RRA:AVERAGE:0.5:288:576";
++static char rra5[] = "RRA:MAX:0.5:1:576";
++static char rra6[] = "RRA:MAX:0.5:6:576";
++static char rra7[] = "RRA:MAX:0.5:24:576";
++static char rra8[] = "RRA:MAX:0.5:288:576";
+ 
+ static char *senderip = NULL;
+ static char rrdfn[PATH_MAX];	/* This one used by the modules */
+ static char filedir[PATH_MAX];	/* This one used here */
+ 
++
+ void setup_exthandler(char *handlerpath, char *ids)
+ {
+ 	char *p;
+@@ -100,6 +106,24 @@ static void setupfn(char *format, char *
+ 	rrdfn[sizeof(rrdfn)-1] = '\0';
+ }
+ 
++static int has_trackmax(char *testname)
++{
++	char testnamecoma[strlen(testname)+3];
++
++	if(trackmax == NULL) {
++		return 0;
++	}
++	
++	sprintf(testnamecoma, ",%s,", testname);
++	if(strstr(trackmax, testnamecoma)) {
++		return 1;
++	}
++	else {
++		return 0;
++	}
++}
++
++
+ static int create_and_update_rrd(char *hostname, char *fn, char *creparams[], char *template)
+ {
+ 	struct stat st;
+--- a/hobbitd/do_rrd.h
++++ b/hobbitd/do_rrd.h
+@@ -16,6 +16,7 @@
+ #include "libbbgen.h"
+ 
+ extern char *rrddir;
++extern char *trackmax;
+ extern void setup_exthandler(char *handlerpath, char *ids);
+ extern void update_rrd(char *hostname, char *testname, char *restofmsg, time_t tstamp, char *sender, hobbitrrd_t *ldef);
+ 
+--- a/hobbitd/hobbitd_rrd.8
++++ b/hobbitd/hobbitd_rrd.8
+@@ -65,6 +65,16 @@ Default directory where RRD files are st
+ Defines the types of data collected by the "ncv" module in hobbitd_rrd.
+ See below for more information.
+ 
++.IP SPLITNCV_testname
++The same as NCV_testname, but keeps the data into separate files. That
++is, it creates one rrd file per "NAME : value" line found in the
++status message. It is useful when the list of NCV lines is varying.
++
++.IP TRACKMAX
++Comma-separated list of columnname for which you want to keep the
++maximum values along with the default average values. This only works
++ for the NCV backend.
++
+ .SH COLLECTED DATA
+ The following RRD-file datasets are generated by hobbitd_rrd:
+ 
+@@ -152,18 +162,22 @@ Many data-collection scripts report data
+ or "NAME = value". So a generic module in hobbitd_rrd allows for
+ easy tracking of this type of data.
+ 
+-The "ncv" module will automatically detect all occurrences of
+-a "NAME : value" or "NAME = value" string in a status message, and
+-generate an RRD file holding all of the name/value data found in
+-the message. The colon- or equal-sign must be present - if there is
+-only whitespace, this module will fail.
++The "ncv" module will automatically detect all occurrences of a "NAME
++: value" or "NAME = value" string in a status message, and generate an
++RRD file holding all of the name/value data found in the message
++(unless you use SPLITNCV, see above). The colon- or equal-sign must be
++present - if there is only whitespace, this module will fail.
+ 
+ Only the valid letters (A-Z, a-z) and digits (0-9) are used in the 
+ dataset names; whitespace and other characters are stripped off 
+-automatically. Only the first 19 characters of a dataset name are
+-used (this is an RRD limitation). Underscore '_' is not allowed,
+-even though RRDtool permits this, and will be stripped from the
+-name.
++automatically. Only the first 19 characters of a dataset name are used
++(this is an RRD limitation). Underscore '_' is not allowed, even
++though RRDtool permits this, and will be stripped from the name.
++
++When using the alternative SPLITNCV_testname, the dataset name is not
++limited in length, and non-valid characters are changed to underscores
++instead of being stripped off. The dataset inside the resulting rrd
++file is always "lambda".
+ 
+ Note that each "NAME : value" must be on a line by itself. If you have
+ a custom script generating the status- or data-message that is fed
+@@ -177,12 +191,13 @@ TEST2RRD setting and the COLUMNNAME to t
+ all status-messages for the column COLUMNNAME through the hobbitd_rrd
+ ncv-handler.
+ 
+-The name of the RRD file will be COLUMNNAME.rrd.
++The name of the RRD file will be COLUMNNAME.rrd. When using SPLITNCV,
++the name of the RRD file will be COLUMNAME,DATASETNAME.rrd.
+ 
+ By default, all of the datasets are generated as the RRD type "DERIVE"
+ which works for all types of monotonically increasing counters. If you 
+ have data that are of the type GAUGE, you can override the default via
+-an environment variable NCV_COLUMNNAME. 
++an environment variable NCV_COLUMNNAME (or SPLITNCV_COLUMNAME). 
+ 
+ E.g. if you are using the bb-mysqlstatus script from www.deadcat.net to 
+ collect data about your MySQL server, it generates a report in the column 
+--- a/hobbitd/hobbitd_rrd.c
++++ b/hobbitd/hobbitd_rrd.c
+@@ -74,6 +74,13 @@ int main(int argc, char *argv[])
+ 		rrddir = strdup(xgetenv("BBRRDS"));
+ 	}
+ 
++	/* trackmax initialization */
++	if(getenv("TRACKMAX")) {
++		trackmax = (char*)malloc(strlen(getenv("TRACKMAX"))+3);
++		sprintf(trackmax, ",%s,", getenv("TRACKMAX"));
++		dbgprintf("Will track max for: %s\n", trackmax);
++	}
++	
+ 	save_errbuf = 0;
+ 	setup_signalhandler("hobbitd_rrd");
+ 	memset(&sa, 0, sizeof(sa));
+@@ -139,7 +146,7 @@ int main(int argc, char *argv[])
+ 				break;
+ 
+ 			  default:
+-				/* Ignore reports with purple, blue or clear - they have no data we want. */
++				/* Ignore reports with purple or clear - they have no data we want. */
+ 				break;
+ 			}
+ 		}
+--- a/hobbitd/rrd/do_ncv.c
++++ b/hobbitd/rrd/do_ncv.c
+@@ -5,6 +5,7 @@
+ /*     NAME: VALUE                                                            */
+ /*                                                                            */
+ /* Copyright (C) 2004-2006 Henrik Storner                     */
++/* split-ncv added by Charles Goyard November 2006                            */
+ /*                                                                            */
+ /* This program is released under the GNU General Public License (GPL),       */
+ /* version 2. See the file "COPYING" for details.                             */
+@@ -17,22 +18,31 @@ int do_ncv_rrd(char *hostname, char *tes
+ { 
+ 	char **params = NULL;
+ 	int paridx;
+-	char dsdef[1024];
++	char dsdef[1024];     /* destination DS syntax for rrd engine */
+ 	char *l, *name, *val;
+ 	char *envnam;
+-	char *dstypes = NULL;
+-
+-	setupfn("%s.rrd", testname);
++	char *dstypes = NULL; /* contain NCV_testname value*/
++	int split_ncv = 0;
++	int dslen;
+ 	sprintf(rrdvalues, "%d", (int)tstamp);
+-
+ 	params = (char **)calloc(8, sizeof(char *));
+ 	params[0] = "rrdcreate";
+-	params[1] = rrdfn;
+ 	paridx = 1;
+ 
+-	envnam = (char *)malloc(4 + strlen(testname) + 1); sprintf(envnam, "NCV_%s", testname);
++	envnam = (char *)malloc(9 + strlen(testname) + 1);
++	sprintf(envnam, "SPLITNCV_%s", testname);
+ 	l = getenv(envnam);
+ 	if (l) {
++		split_ncv = 1;
++		dslen = 200;
++	}
++	else {
++		dslen = 19;
++		setupfn("%s.rrd", testname);
++		sprintf(envnam, "NCV_%s", testname);
++	l = getenv(envnam);
++	}
++	if (l) {
+ 		dstypes = (char *)malloc(strlen(l)+3);
+ 		sprintf(dstypes, ",%s,", l);
+ 	}
+@@ -84,62 +94,128 @@ int do_ncv_rrd(char *hostname, char *tes
+ 
+ 			strtod(val, &endptr);
+ 			if (isspace((int)*endptr) || (*endptr == '\0')) {
+-				char dsname[20];
+-				char dskey[22];
+-				char *dstype = NULL;
++				char dsname[250];    /* name of ncv in status message (with space and al) */
++				char dskey[252];     /* name of final DS key (stripped)                   */
++				char *dstype = NULL; /* type of final DS                                  */
+ 				char *inp;
+ 				int outidx;
+-
+ 				/* val contains a valid number */
+-				/* rrdcreate(1) says: ds must be in the set [a-zA-Z0-9_] */
+-				for (inp=name,outidx=0; (*inp && (outidx < 19)); inp++) {
++				/* rrdcreate(1) says: ds must be in the set [a-zA-Z0-9_] ... */
++				for (inp=name,outidx=0; (*inp && (outidx < dslen)); inp++) {
+ 					if ( ((*inp >= 'A') && (*inp <= 'Z')) ||
+ 					     ((*inp >= 'a') && (*inp <= 'z')) ||
+ 					     ((*inp >= '0') && (*inp <= '9'))    ) {
+ 						dsname[outidx++] = *inp;
+ 					}
++					/* ... however, for split ncv, we replace anything else  */
++					/* with an underscore, compacting successive invalid     */
++					/* characters into a single one                          */
++					else if (split_ncv && (dsname[outidx - 1] != '_')) {
++						dsname[outidx++] = '_';
++					}
++				}
++				if(dsname[outidx-1] == '_') {
++					dsname[outidx-1] = '\0';
+ 				}
++				else {
+ 				dsname[outidx] = '\0';
++				}
+ 				sprintf(dskey, ",%s:", dsname);
++				if(split_ncv) {
++					/* setupfn("%s,%s.rrd", testname, dsname); */
++					snprintf(rrdfn, sizeof(rrdfn)-1, "%s,%s.rrd", testname,dsname);
++					rrdfn[sizeof(rrdfn)-1] = '\0';
++					
++					params[1] = rrdfn;
++					paridx = 1;
++				}
+ 
+ 				if (dstypes) {
+ 					dstype = strstr(dstypes, dskey);
+-					if (!dstype) { strcpy(dskey, ",*:"); dstype = strstr(dstypes, dskey); }
++					if (!dstype) {
++						strcpy(dskey, ",*:");
++						dstype = strstr(dstypes, dskey);
++					}
+ 				}
+ 
+-				if (dstype) {
++				if (dstype) { /* if ds type is forced */
+ 					char *p;
+ 
+ 					dstype += strlen(dskey);
+ 					p = strchr(dstype, ','); if (p) *p = '\0';
++					if(split_ncv) {
++						sprintf(dsdef, "DS:lambda:%s:600:0:U", dstype);
++					}
++					else {
+ 					sprintf(dsdef, "DS:%s:%s:600:0:U", dsname, dstype);
++					}
+ 					if (p) *p = ',';
+ 				}
++				else { /* nothing specified in the environnement, and no '*:' default */
++					if(split_ncv) {
++						strcpy(dsdef, "DS:lambda:DERIVE:600:0:U");
++					}
+ 				else {
+ 					sprintf(dsdef, "DS:%s:DERIVE:600:0:U", dsname);
+ 				}
++				}
+ 
+-				if (!dstype || (strncasecmp(dstype, "NONE", 4) != 0)) {
++				if (!dstype || (strncasecmp(dstype, "NONE", 4) != 0)) { /* if we have something */
+ 					paridx++;
+ 					params = (char **)realloc(params, (7 + paridx)*sizeof(char *));
+ 					params[paridx] = strdup(dsdef);
+ 					params[paridx+1] = NULL;
+-
+ 					sprintf(rrdvalues+strlen(rrdvalues), ":%s", val);
+ 				}
+ 			}
++			
++			if(split_ncv && (paridx > 1)) {
++				int i;
++				params[++paridx] = strdup(rra1);
++				params[++paridx] = strdup(rra2);
++				params[++paridx] = strdup(rra3);
++				params[++paridx] = strdup(rra4);
++
++				if(has_trackmax(testname)) {
++					params = (char **)realloc(params, (11 + paridx)*sizeof(char *));
++					params[++paridx] = strdup(rra5);
++					params[++paridx] = strdup(rra6);
++					params[++paridx] = strdup(rra7);
++					params[++paridx] = strdup(rra8);
++				}
++
++				params[++paridx] = NULL;
++				create_and_update_rrd(hostname, rrdfn, params, NULL);
++				for(i = 2 ; i 1) {
++	} /* end of while */
++
++	if (split_ncv) {
++		for (paridx=2; (params[paridx] != NULL); paridx++) {
++			xfree(params[paridx]);
++		}
++	}
++	else if(paridx > 1) {
+ 		params[++paridx] = strdup(rra1);
+ 		params[++paridx] = strdup(rra2);
+ 		params[++paridx] = strdup(rra3);
+ 		params[++paridx] = strdup(rra4);
+-		params[++paridx] = NULL;
+ 
+-		create_and_update_rrd(hostname, rrdfn, params, NULL);
++		if(has_trackmax(testname)) {
++			params = (char **)realloc(params, (11 + paridx)*sizeof(char *));
++			params[++paridx] = strdup(rra5);
++			params[++paridx] = strdup(rra6);
++			params[++paridx] = strdup(rra7);
++			params[++paridx] = strdup(rra8);
++		}
+ 
++		params[++paridx] = NULL;
++		create_and_update_rrd(hostname, rrdfn, params, NULL);
+ 		for (paridx=2; (params[paridx] != NULL); paridx++)
+ 		xfree(params[paridx]);
+ 	}
--- hobbit-4.2.0.dfsg.orig/debian/patches/disk-linecount
+++ hobbit-4.2.0.dfsg/debian/patches/disk-linecount
@@ -0,0 +1,22 @@
+--- a/lib/htmllog.c
++++ b/lib/htmllog.c
+@@ -332,6 +332,8 @@ void generate_html_log(char *hostname, c
+ 		if (strstr(multigraphs, multikey)) {
+ 			/* The "disk" report from the NetWare client puts a "warning light" on all entries */
+ 			int netwarediskreport = (strstr(firstline, "NetWare Volumes") != NULL);
++			/* Old BB clients do not send in df's header line */
++			int header = (strchr(firstline, '/') == NULL);
+ 
+ 			/* Count how many lines are in the status message. This is needed by hobbitd_graph later */
+ 			linecount = 0; p = restofmsg;
+@@ -352,8 +354,8 @@ void generate_html_log(char *hostname, c
+ 				}
+ 			} while (p && (*p));
+ 
+-			/* There is probably a header line ... */
+-			if (!netwarediskreport && (linecount > 1)) linecount--;
++			/* Do not count the 'df' header line */
++			if (!netwarediskreport && header && (linecount > 1)) linecount--;
+ 		}
+ 		xfree(multikey);
+ 
--- hobbit-4.2.0.dfsg.orig/debian/patches/ncv-ignoretext.patch
+++ hobbit-4.2.0.dfsg/debian/patches/ncv-ignoretext.patch
@@ -0,0 +1,37 @@
+--- a/hobbitd/rrd/do_ncv.c
++++ b/hobbitd/rrd/do_ncv.c
+@@ -11,7 +11,7 @@
+ /*                                                                            */
+ /*----------------------------------------------------------------------------*/
+ 
+-static char ncv_rcsid[] = "$Id: do_ncv.c,v 1.10 2006/06/09 22:23:49 henrik Rel $";
++static char ncv_rcsid[] = "$Id: do_ncv.c,v 1.10 2006/06/09 22:23:49 henrik Rel henrik $";
+ 
+ int do_ncv_rrd(char *hostname, char *testname, char *msg, time_t tstamp) 
+ { 
+@@ -44,11 +44,22 @@ int do_ncv_rrd(char *hostname, char *tes
+ 
+ 		l += strspn(l, " \t\n");
+ 		if (*l) { 
++			/* See if this line contains a '=' or ':' sign */
+ 			name = l; 
+-			l += strcspn(l, ":="); 
+-			if( *l ) { *l = '\0'; l++; }
+-			else break;
++			l += strcspn(l, ":=\n"); 
++
++			if (*l) {
++				if (( *l == '=') || (*l == ':')) { 
++					*l = '\0'; l++;
++				}
++				else {
++					/* No marker, so skip this line */
++					name = NULL;
++				}
++			}
++			else break;	/* We've hit the end of the message */
+ 		}
++
+ 		if (name) { 
+ 			val = l + strspn(l, " \t"); 
+ 			l = val + strspn(val, "0123456789."); 
--- hobbit-4.2.0.dfsg.orig/debian/patches/http-proxy-url
+++ hobbit-4.2.0.dfsg/debian/patches/http-proxy-url
@@ -0,0 +1,13 @@
+--- a/lib/url.c
++++ b/lib/url.c
+@@ -563,7 +563,9 @@ char *decode_url(char *testspec, bburl_t
+ 	if (poststart) getescapestring(poststart, &bburl->postdata, NULL);
+ 	if (expstart)  getescapestring(expstart, &bburl->expdata, NULL);
+ 
+-	p = strstr(urlstart, "/http");
++	p = strstr(urlstart, "/http://");
++	if (!p)
++		p = strstr(urlstart, "/https://");
+ 	if (p) {
+ 		proxystart = urlstart;
+ 		urlstart = (p+1);
--- hobbit-4.2.0.dfsg.orig/debian/patches/hobbitgraph.mailq
+++ hobbit-4.2.0.dfsg/debian/patches/hobbitgraph.mailq
@@ -0,0 +1,11 @@
+--- a/hobbitd/etcfiles/hobbitgraph.cfg
++++ b/hobbitd/etcfiles/hobbitgraph.cfg
+@@ -923,7 +923,7 @@
+ 
+ [mailq]
+ 	# This handles "mailq.rrd", "mailqin.rrd" and "mailqout.rrd"
+-	FNPATTERN mailq(.+).rrd
++	FNPATTERN mailq(.*).rrd
+ 	TITLE Mail Queue Length
+ 	YAXIS Queue Length
+ 	DEF:mailq@RRDIDX@=@RRDFN@:mailq:AVERAGE
--- hobbit-4.2.0.dfsg.orig/debian/patches/hobbitclient-debian
+++ hobbit-4.2.0.dfsg/debian/patches/hobbitclient-debian
@@ -0,0 +1,11 @@
+--- a/client/hobbitclient-linux.sh
++++ b/client/hobbitclient-linux.sh
+@@ -63,6 +63,8 @@ echo "[ifstat]"
+ /sbin/ifconfig
+ echo "[ps]"
+ ps -Aw -o pid,ppid,user,start,state,pri,pcpu,time,pmem,rsz,vsz,cmd
++echo "[dpkg]"
++COLUMNS=200 dpkg -l | awk '/^..  / { print $1 " " $2 " " $3 }'
+ 
+ # $TOP must be set, the install utility should do that for us if it exists.
+ if test "$TOP" != ""
--- hobbit-4.2.0.dfsg.orig/debian/patches/hobbitclient-tmpfs
+++ hobbit-4.2.0.dfsg/debian/patches/hobbitclient-tmpfs
@@ -0,0 +1,32 @@
+hobbit (4.2.0.dfsg-13) unstable; urgency=low
+
+  * Do not ignore tmpfs mountpoints in hobbitclient-linux.sh, but add
+    /dev, /dev/shm, and /lib/init/rw to the default IGNORE list in
+    /etc/hobbit/hobbit-clients.cfg. (Closes: #487157)
+
+ -- Christoph Berg   Sat, 05 Jul 2008 14:43:23 +0200
+
+--- a/client/hobbitclient-linux.sh
++++ b/client/hobbitclient-linux.sh
+@@ -42,7 +42,7 @@ uptime
+ echo "[who]"
+ who
+ echo "[df]"
+-df -Pl -x none -x tmpfs -x shmfs -x unknown -x iso9660 | sed -e '/^[^ 	][^ 	]*$/{
++df -Pl -x none -x shmfs -x unknown -x iso9660 | sed -e '/^[^ 	][^ 	]*$/{
+ N
+ s/[ 	]*\n[ 	]*/ /
+ }'
+--- a/hobbitd/etcfiles/hobbit-clients.cfg
++++ b/hobbitd/etcfiles/hobbit-clients.cfg
+@@ -347,6 +347,10 @@
+ # be placed at the end of the file.
+ 
+ DEFAULT
++	# Ignore some usually uninteresting tmpfs mounts.
++	DISK    /dev IGNORE
++	DISK    /dev/shm IGNORE
++	DISK    /lib/init/rw IGNORE
+ 	# These are the built-in defaults.
+ 	UP      1h
+ 	LOAD    5.0 10.0
--- hobbit-4.2.0.dfsg.orig/debian/patches/ldap-deprecated
+++ hobbit-4.2.0.dfsg/debian/patches/ldap-deprecated
@@ -0,0 +1,55 @@
+From: dann frazier 
+To: submit@bugs.debian.org
+Subject: hobbit: ldap_init, ldap_get_values implicitly converted to pointer
+Date: Thu, 31 Jan 2008 08:52:40 -0700
+
+Package: hobbit
+Version: 4.2.0.dfsg-9
+Severity: important
+Tags: patch
+Usertags: implicit-pointer-conversion
+
+Our automated buildd log filter[1] detected a problem that is likely to
+cause your package to segfault on architectures where the size of a
+pointer is greater than the size of an integer, such as ia64 and amd64.
+
+This is often due to a missing function prototype definition.
+For more information, see [2].
+
+[1] http://people.debian.org/~dannf/check-implicit-pointer-functions
+[2] http://wiki.debian.org/ImplicitPointerConversions
+
+  Function `ldap_init' implicitly converted to pointer at test-ldap.c:16
+  Function `ldap_init' implicitly converted to pointer at ldaptest.c:140
+  Function `ldap_get_values' implicitly converted to pointer at ldaptest.c:309
+
+The libldap API has been updated and many functions used by the ldap
+plugin are now deprecated. This package should either update to the
+new API or define LDAP_DEPRECATED to continue using the deprecated
+interfaces.
+
+This patch implements the lazy solution.
+
+diff -urpN hobbit-4.2.0.dfsg.orig/bbnet/ldaptest.h hobbit-4.2.0.dfsg/bbnet/ldaptest.h
+--- hobbit-4.2.0.dfsg.orig/bbnet/ldaptest.h	2006-08-09 14:09:56.000000000 -0600
++++ hobbit-4.2.0.dfsg/bbnet/ldaptest.h	2008-01-31 08:47:12.000000000 -0700
+@@ -17,6 +17,7 @@
+ 
+ #ifdef BBGEN_LDAP
+ #include 
++#define LDAP_DEPRECATED 1
+ #include 
+ 
+ #ifndef LDAPS_PORT
+diff -urpN hobbit-4.2.0.dfsg.orig/build/test-ldap.c hobbit-4.2.0.dfsg/build/test-ldap.c
+--- hobbit-4.2.0.dfsg.orig/build/test-ldap.c	2006-08-09 14:09:57.000000000 -0600
++++ hobbit-4.2.0.dfsg/build/test-ldap.c	2008-01-31 08:46:33.000000000 -0700
+@@ -2,6 +2,7 @@
+ #include 
+ 
+ #include 
++#define LDAP_DEPRECATED 1
+ #include 
+ 
+ LDAPURLDesc ludp;
+
--- hobbit-4.2.0.dfsg.orig/debian/patches/new-menu
+++ hobbit-4.2.0.dfsg/debian/patches/new-menu
@@ -0,0 +1,52 @@
+diff -r b5f2a50e38fe hobbitd/Makefile
+--- a/hobbitd/Makefile	Sat Aug 18 21:36:21 2007 +0200
++++ b/hobbitd/Makefile	Sat Aug 18 21:37:37 2007 +0200
+@@ -117,7 +117,7 @@ cfgfiles:
+ 	cat etcfiles/hobbit-alerts.cfg.DIST | sed -e 's!@BBHOSTNAME@!$(BBHOSTNAME)!g' | sed -e 's!@BBHOSTIP@!$(BBHOSTIP)!g' >etcfiles/hobbit-alerts.cfg
+ 	cat etcfiles/hobbitlaunch.cfg.DIST | sed -e 's!@BBHOME@!$(BBHOME)!g' | sed -e 's!@BBTOPDIR@!$(BBTOPDIR)!g' >etcfiles/hobbitlaunch.cfg
+ 	cat etcfiles/hobbitcgi.cfg.DIST | sed -e 's!@BBHOME@!$(BBHOME)!g' >etcfiles/hobbitcgi.cfg
+-	cat wwwfiles/menu/menu_items.js.DIST | sed -e 's!@BBHOSTURL@!$(BBHOSTURL)!g' | sed -e 's!@BBCGIURL@!$(BBCGIURL)!g' | sed -e 's!@SECUREBBCGIURL@!$(SECUREBBCGIURL)!g' >wwwfiles/menu/menu_items.js
++#	cat wwwfiles/menu/menu_items.js.DIST | sed -e 's!@BBHOSTURL@!$(BBHOSTURL)!g' | sed -e 's!@BBCGIURL@!$(BBCGIURL)!g' | sed -e 's!@SECUREBBCGIURL@!$(SECUREBBCGIURL)!g' >wwwfiles/menu/menu_items.js
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) -c -o $@ $<
+diff -r b5f2a50e38fe hobbitd/webfiles/bb_footer
+--- a/hobbitd/webfiles/bb_footer	Sat Aug 18 21:36:21 2007 +0200
++++ b/hobbitd/webfiles/bb_footer	Sat Aug 18 21:37:37 2007 +0200
+@@ -9,16 +9,5 @@
+ 
+ 
+ 
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ 
+ 
+diff -r b5f2a50e38fe hobbitd/webfiles/hobbitnk_footer
+--- a/hobbitd/webfiles/hobbitnk_footer	Sat Aug 18 21:36:21 2007 +0200
++++ b/hobbitd/webfiles/hobbitnk_footer	Sat Aug 18 21:37:37 2007 +0200
+@@ -56,16 +56,5 @@
+ 
+ 
+ 
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ 
+ 
--- hobbit-4.2.0.dfsg.orig/debian/patches/hobbit-ghosts-menu
+++ hobbit-4.2.0.dfsg/debian/patches/hobbit-ghosts-menu
@@ -0,0 +1,12 @@
+--- a/web/hobbit-ghosts.sh.DIST
++++ b/web/hobbit-ghosts.sh.DIST
+@@ -2,6 +2,9 @@
+ 
+ # This is the Hobbit wrapper for the ghosts CGI
+ 
++include () { . $1 ; }
+ . @BBHOME@/etc/hobbitcgi.cfg
++. @BBHOME@/etc/hobbitserver.cfg
++export HOBBITMENU
+ @RUNTIMEDEFS@ exec @BBHOME@/bin/hobbit-ghosts.cgi $CGI_GHOSTS_OPTS
+ 
--- hobbit-4.2.0.dfsg.orig/debian/patches/hobbitvars
+++ hobbit-4.2.0.dfsg/debian/patches/hobbitvars
@@ -0,0 +1,176 @@
+--- a/hobbitd/etcfiles/hobbitserver.cfg.DIST
++++ b/hobbitd/etcfiles/hobbitserver.cfg.DIST
+@@ -5,8 +5,8 @@ BBSERVERLOGS="@BBLOGDIR@"		# Directory f
+ HOBBITCLIENTHOME="@BBTOPDIR@/client"    # BBHOME directory for the client
+ 
+ 
+-BBSERVERHOSTNAME="@BBHOSTNAME@"		# The hostname of your server
+-BBSERVERIP="@BBHOSTIP@"			# The IP-address of your server. Use the real one, not 127.0.0.1 .
++include /etc/default/hobbit-client
++BBSERVERHOSTNAME="$CLIENTHOSTNAME"
+ BBSERVEROS="@BBHOSTOS@"			# The operating system of your server. linux,freebsd,solaris,hpux,aix,osf
+ 
+ BBSERVERWWWNAME="@BBHOSTNAME@"		# The name used for this hosts' webserver
+@@ -31,8 +31,7 @@ PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr
+ 
+ # General settings
+ BBPORT="1984"			# Portnumber where hobbitd/bbd listens
+-BBDISP="$BBSERVERIP"		# IP of a single hobbit/bbd server
+-BBDISPLAYS=""			# IP of multiple hobbit/bbd servers. If used, BBDISP must be 0.0.0.0
++include /var/run/hobbit/bbdisp-runtime.cfg
+ FQDN="TRUE"			# Use fully-qualified hostnames internally. Keep it TRUE unless you know better.
+ BBGHOSTS="1"                    # How to handle status messages from unknown hosts.
+                                 # 0=accept message, 1=discard message, 2=discard message and log the event
+@@ -57,9 +56,10 @@ BBWEBHOST="http://$BBSERVERWWWNAME"		# J
+ BBWEBHOSTURL="$BBWEBHOST$BBSERVERWWWURL"	# Prefix for all static Hobbit pages - http://www.foo.com/bb
+ BBWEBHTMLLOGS="$BBWEBHOSTURL/html"		# Prefix for the Hobbit HTML logs (only if BBLOGSTATUS=STATIC)
+ BBWEB="$BBSERVERWWWURL"				# Hobbit URL prefix without the host part
+-BBSKIN="$BBSERVERWWWURL/gifs"			# Hobbit URL prefix for the GIF files
++BBSKIN="$BBSERVERWWWURL/gifs/static"			# Hobbit URL prefix for the GIF files
+ BBHELPSKIN="$BBSERVERWWWURL/help"               # Hobbit URL prefix for the online help files.
+ BBNOTESSKIN="$BBSERVERWWWURL/notes"             # Hobbit URL prefix for the online notes-files.
++include /etc/hobbit/web/menu.cfg
+ BBMENUSKIN="$BBSERVERWWWURL/menu"               # Hobbit URL prefix for the webpage menu files.
+ BBREPURL="$BBSERVERWWWURL/rep"			# Hobbit URL prefix for the Hobbit availability reports
+ BBSNAPURL="$BBSERVERWWWURL/snap"		# Hobbit URL prefix for the Hobbit snapshots
+@@ -69,7 +69,7 @@ SECURECGIBINURL="$BBSERVERSECURECGIURL"	
+ 
+ # Locations of system-wide files and directories
+ BBHOME="@BBHOME@"				# The Hobbit server directory, where programs and configurations go. 
+-BBTMP="$BBHOME/tmp"				# Directory used for temporary files.
++BBTMP="/var/lib/hobbit/tmp"			# Directory used for temporary files.
+ BBHOSTS="$BBHOME/etc/bb-hosts"			# The bb-hosts file
+ BB="$BBHOME/bin/bb"				# The 'bb' client program
+ BBGEN="$BBHOME/bin/bbgen"			# The bbgen program
+@@ -185,3 +185,5 @@ BBGENSNAPOPTS="$BBGENOPTS"			# bbgen(1) 
+ # For the bb-hist CGI 
+ BBHISTEXT=""					# What extensions to run on history pages.
+ 
++include /var/run/hobbit/hobbitclient-include.cfg
++include /var/run/hobbit/hobbitserver-include.cfg
+--- a/hobbitd/etcfiles/hobbit-apache-open.DIST
++++ b/hobbitd/etcfiles/hobbit-apache-open.DIST
+@@ -15,7 +15,7 @@ Alias @BBHOSTURL@/  "@INSTALLWWWDIR@/"
+ 
+     Options Indexes FollowSymLinks Includes MultiViews
+     Order allow,deny
+-    Allow from all
++    Allow from localhost ::1/128
+ 
+ 
+ ScriptAlias @BBCGIURL@/ "@CGIDIR@/"
+@@ -23,6 +23,6 @@ ScriptAlias @BBCGIURL@/ "@CGIDIR@/"
+     AllowOverride None
+     Options ExecCGI Includes
+     Order allow,deny
+-    Allow from all
++    Allow from localhost ::1/128
+ 
+ 
+--- a/hobbitd/etcfiles/hobbit-apache-secure.DIST
++++ b/hobbitd/etcfiles/hobbit-apache-secure.DIST
+@@ -15,7 +15,7 @@ Alias @BBHOSTURL@/  "@INSTALLWWWDIR@/"
+ 
+     Options Indexes FollowSymLinks Includes MultiViews
+     Order allow,deny
+-    Allow from all
++    Allow from localhost ::1/128
+ 
+ 
+ ScriptAlias @BBCGIURL@/ "@CGIDIR@/"
+@@ -23,7 +23,7 @@ ScriptAlias @BBCGIURL@/ "@CGIDIR@/"
+     AllowOverride None
+     Options ExecCGI Includes
+     Order allow,deny
+-    Allow from all
++    Allow from localhost ::1/128
+ 
+ 
+ ScriptAlias @SECUREBBCGIURL@/ "@SECURECGIDIR@/"
+@@ -31,7 +31,7 @@ ScriptAlias @SECUREBBCGIURL@/ "@SECURECG
+     AllowOverride None
+     Options ExecCGI Includes
+     Order allow,deny
+-    Allow from all
++    Allow from localhost ::1/128
+ 
+     # Password file where users with access to these scripts are kept.
+     # Create it with "htpasswd -c @INSTALLETCDIR@/hobbitpasswd USERNAME"
+--- a/hobbitd/etcfiles/hobbitlaunch.cfg.DIST
++++ b/hobbitd/etcfiles/hobbitlaunch.cfg.DIST
+@@ -11,7 +11,7 @@
+ # you want to run).
+ [hobbitd]
+ 	ENVFILE @BBHOME@/etc/hobbitserver.cfg
+-	CMD hobbitd --pidfile=$BBSERVERLOGS/hobbitd.pid --restart=$BBTMP/hobbitd.chk --checkpoint-file=$BBTMP/hobbitd.chk --checkpoint-interval=600 --log=$BBSERVERLOGS/hobbitd.log --admin-senders=127.0.0.1,$BBSERVERIP --store-clientlogs=!msgs
++	CMD hobbitd --pidfile=/var/run/hobbit/hobbitd.pid --restart=$BBTMP/hobbitd.chk --checkpoint-file=$BBTMP/hobbitd.chk --checkpoint-interval=600 --log=$BBSERVERLOGS/hobbitd.log --admin-senders=127.0.0.1,$BBSERVERIP --store-clientlogs=!msgs
+ 
+ 
+ # "bbstatus" saves status-logs in text- and html-format, like the old Big Brother 
+@@ -124,7 +124,7 @@
+ [bbproxy]
+ 	DISABLED
+ 	ENVFILE @BBHOME@/etc/hobbitserver.cfg
+-	CMD $BBHOME/bin/bbproxy --hobbitd --bbdisplay=YOUR.HOBBIT.SERVER.IP --report=$MACHINE.bbproxy --no-daemon --pidfile=$BBSERVERLOGS/bbproxy.pid
++	CMD $BBHOME/bin/bbproxy --hobbitd --bbdisplay=YOUR.HOBBIT.SERVER.IP --report=$MACHINE.bbproxy --no-daemon --pidfile=/var/run/hobbit/bbproxy.pid
+ 	LOGFILE $BBSERVERLOGS/bbproxy.log
+ 
+ 
+@@ -139,7 +139,7 @@
+ [hobbitfetch]
+ 	DISABLED
+ 	ENVFILE @BBHOME@/etc/hobbitserver.cfg
+-	CMD $BBHOME/bin/hobbitfetch --server=YOUR.HOBBIT.SERVER.IP --no-daemon --pidfile=$BBSERVERLOGS/hobbitfetch.pid
++	CMD $BBHOME/bin/hobbitfetch --server=YOUR.HOBBIT.SERVER.IP --no-daemon --pidfile=/var/run/hobbit/hobbitfetch.pid
+ 	LOGFILE $BBSERVERLOGS/hobbitfetch.log
+ 
+ 
+@@ -204,3 +204,5 @@
+ 	LOGFILE $BBSERVERLOGS/hobbitclient.log
+ 	INTERVAL 5m
+ 
++include /var/run/hobbit/clientlaunch-include.cfg
++include /var/run/hobbit/hobbitlaunch-include.cfg
+--- a/client/clientlaunch.cfg.DIST
++++ b/client/clientlaunch.cfg.DIST
+@@ -16,7 +16,7 @@
+ [msgcache]
+ 	DISABLED
+ 	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
+-	CMD $HOBBITCLIENTHOME/bin/msgcache --no-daemon --pidfile=$HOBBITCLIENTHOME/logs/msgcache.pid
++	CMD $HOBBITCLIENTHOME/bin/msgcache --no-daemon --pidfile=/var/run/hobbit/msgcache.pid
+ 	LOGFILE $HOBBITCLIENTHOME/logs/msgcache.log
+ 
+ # The main client task
+--- a/client/hobbitclient.cfg.DIST
++++ b/client/hobbitclient.cfg.DIST
+@@ -1,15 +1,17 @@
+ # Environment settings for the Hobbit client.
+ 
+-BBDISP="@BBHOSTIP@"             # IP address of the Hobbit server
+-BBDISPLAYS=""                   # IP of multiple Hobbit servers. BBDISP must be "0.0.0.0".
++include /etc/default/hobbit-client
++include /var/run/hobbit/bbdisp-runtime.cfg
+ CONFIGCLASS="$BBOSTYPE"         # Default configuration class for logfiles
+ 
+-PATH="/bin:/usr/bin:/sbin:/usr/sbin:/etc"  # PATH setting for the client scripts.
++PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/lib/hobbit/client/bin"  # PATH setting for the client scripts.
+ 
+ # You normally dont need to modify anything below here
+ BBPORT="1984"                   # Portnumber where hobbitd listens
++HOBBITCLIENTHOME="/usr/lib/hobbit/client"
+ BBHOME="$HOBBITCLIENTHOME"      # Directory for the Hobbit client files
+ BB="$BBHOME/bin/bb"             # The Hobbit client "bb" utility
+-BBTMP="$BBHOME/tmp"             # Where we may store temporary files.
+-BBCLIENTLOGS="$BBHOME/logs"     # Where we store the client logfiles
++BBTMP="/var/lib/hobbit/tmp"     # Where we may store temporary files.
++BBCLIENTLOGS="/var/log/hobbit"  # Where we store the client logfiles
+ 
++include /var/run/hobbit/hobbitclient-include.cfg
+--- a/hobbitd/etcfiles/hobbitgraph.cfg
++++ b/hobbitd/etcfiles/hobbitgraph.cfg
+@@ -1136,3 +1136,4 @@
+ 	GPRINT:cnt@RRDIDX@:AVERAGE: %6.1lf (avg)\n
+ 
+ 
++include /var/run/hobbit/hobbitgraph-include.cfg
--- hobbit-4.2.0.dfsg.orig/debian/compat
+++ hobbit-4.2.0.dfsg/debian/compat
@@ -0,0 +1 @@
+4
--- hobbit-4.2.0.dfsg.orig/debian/hobbit.lintian-overrides
+++ hobbit-4.2.0.dfsg/debian/hobbit.lintian-overrides
@@ -0,0 +1,5 @@
+hobbit: package-contains-empty-directory usr/lib/hobbit/server/download/
+#446982
+hobbit: possibly-insecure-handling-of-tmp-files-in-maintainer-script preinst:30
+hobbit: setuid-binary usr/lib/hobbit/server/bin/hobbitping 4755 root/root
+hobbit: spelling-error-in-copyright publically publicly
--- hobbit-4.2.0.dfsg.orig/debian/menu.css
+++ hobbit-4.2.0.dfsg/debian/menu.css
@@ -0,0 +1,60 @@
+#menue {
+position:absolute;
+top: 0px;
+left: 0;
+padding-bottom: 2px;
+z-index: 200;
+}
+
+.outer {
+float: left;
+display: block;
+overflow: hidden;
+width: 10em;
+height: 1.3em;
+text-align: left;
+border: 1px solid #123456;
+font: 12px Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
+background: #123456;
+color: #FFFFFF;
+}
+.outer:hover {
+height: auto;
+border: 1px solid #FFFFFF;
+background: #5AA7E5;
+color: #FFFFFF;
+}
+
+a.inner-1 {
+margin-top: 2px;
+}
+a.inner,
+a.inner-1 {
+display: block;
+width: 9.9em;
+padding: 2px 0;
+text-decoration: none;
+font-weight: normal;
+border: 0px;
+color: #000000;
+background: #46B446;
+}
+a:visited.inner,
+a:visited.inner-1 {
+color: #202020;
+background: #46B446;
+}
+a:hover.inner,
+a:hover.inner-1 {
+background-color: #f7eedb;
+background: #5AE55A;
+}
+
+span.menutag {
+display: block;
+cursor: default;
+}
+
+span.invis {
+display: none;
+}
--- hobbit-4.2.0.dfsg.orig/debian/hobbit.postinst
+++ hobbit-4.2.0.dfsg/debian/hobbit.postinst
@@ -0,0 +1,78 @@
+#! /bin/sh
+# postinst script for hobbit
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        *  `configure' 
+#        *  `abort-upgrade' 
+#        *  `abort-remove' `in-favour' 
+#          
+#        *  `abort-deconfigure' `in-favour'
+#            `removing'
+#           
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    configure)
+        # Setup permissions for the newly created "hobbit" user to write
+	# data where he needs to.
+	# And for the Apache-run CGI's to generate reports.
+	test -d /var/run/hobbit || mkdir /var/run/hobbit
+	chown hobbit:hobbit /var/run/hobbit
+	test -d /var/log/hobbit || mkdir /var/log/hobbit
+	chown hobbit:adm /var/log/hobbit ; chmod 2755 /var/log/hobbit
+
+	cd /var/lib/hobbit; chown hobbit:hobbit . acks data disabled hist histlogs hostdata logs rrd tmp www
+	cd /var/lib/hobbit/www; chown hobbit:hobbit html notes wml rep snap; chgrp www-data rep snap; chmod g+w rep snap
+	cd /etc/hobbit; chgrp www-data hobbit-nkview.cfg hobbit-nkview.cfg.bak; chmod g+w hobbit-nkview.cfg hobbit-nkview.cfg.bak
+
+	if ! test -e /etc/hobbit/bb-hosts ; then
+		if test -e /etc/default/hobbit-client ; then
+			. /etc/default/hobbit-client || true
+		fi
+		cat > /etc/hobbit/bb-hosts <&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- hobbit-4.2.0.dfsg.orig/debian/hobbit.postrm
+++ hobbit-4.2.0.dfsg/debian/hobbit.postrm
@@ -0,0 +1,52 @@
+#! /bin/sh
+# postrm script for hobbit
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        *  `remove'
+#        *  `purge'
+#        *  `upgrade' 
+#        *  `failed-upgrade' 
+#        *  `abort-install'
+#        *  `abort-install' 
+#        *  `abort-upgrade' 
+#        *  `disappear' overwrit>r> 
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+	purge|disappear)
+	rm -f /etc/hobbit/bb-hosts /etc/hobbit/hobbitgroups /etc/hobbit/hobbitpasswd \
+		/etc/default/hobbit
+	if test -e /usr/share/debconf/confmodule ; then
+		. /usr/share/debconf/confmodule
+		db_purge
+	fi
+	;;
+
+	remove)
+	;;
+
+	upgrade)
+	# The server package doesn't use debconf anymore
+	if dpkg --compare-versions "$2" lt 4.2.0.dfsg-2 && test -e /usr/share/debconf/confmodule ; then
+		. /usr/share/debconf/confmodule
+		db_purge
+	fi
+	;;
+
+	failed-upgrade|abort-install|abort-upgrade)
+	;;
+
+	*)
+	echo "postrm called with unknown argument \`$1'" >&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- hobbit-4.2.0.dfsg.orig/debian/hobbit-client.templates
+++ hobbit-4.2.0.dfsg/debian/hobbit-client.templates
@@ -0,0 +1,29 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: hobbit-client/HOBBITSERVERS
+Type: string
+Default: 127.0.0.1
+_Description: Hobbit server:
+ Please enter the network address used to access the Hobbit
+ server(s). If you use multiple servers, use a space-separated list of
+ addresses.
+ .
+ Using host names instead of IP addresses is discouraged in case the
+ network experiences DNS failures.
+
+Template: hobbit-client/CLIENTHOSTNAME
+Type: string
+Default:
+_Description: Client hostname:
+ Please enter the host name used by the Hobbit client when sending
+ reports to the Hobbit server. This name must match
+ the name used in the bb-hosts file on the Hobbit
+ server.
+
--- hobbit-4.2.0.dfsg.orig/debian/hobbit-client.dirs
+++ hobbit-4.2.0.dfsg/debian/hobbit-client.dirs
@@ -0,0 +1,8 @@
+etc/default
+etc/hobbit/clientlaunch.d
+etc/hobbit/hobbitclient.d
+usr/bin
+usr/share/hobbit
+var/lib/hobbit/tmp
+var/log/hobbit
+var/run/hobbit
--- hobbit-4.2.0.dfsg.orig/debian/menu.cfg
+++ hobbit-4.2.0.dfsg/debian/menu.cfg
@@ -0,0 +1,36 @@
+HOBBITMENU=" 
 \
+    
 \
+      Views:  \
+	Main view |  \
+	All non-green view |  \
+	Critical systems \
+    
 \
+    
 \
+      Reports:  \
+	Event log Report |  \
+	Availability Report |  \
+	Snapshot Report |  \
+	Config Report |  \
+	Metrics Report |  \
+	Ghost Clients \
+    
 \
+    
 \
+      Administration:  \
+	Find host |  \
+	Acknowledge alert |  \
+	Enable/disable |  \
+	Edit critical systems \
+    
 \
+    
 \
+      Help:  \
+	About Hobbit |  \
+	Installing Hobbit |  \
+	Configuring Monitoring |  \
+	Configuring Alerts |  \
+	Critical systems |  \
+	Known problems |  \
+	Tips and Tricks |  \
+	Custom graphs |  \
+	Hobbit man-pages \
+    
 \
+
"
--- hobbit-4.2.0.dfsg.orig/debian/watch
+++ hobbit-4.2.0.dfsg/debian/watch
@@ -0,0 +1,3 @@
+version=3
+options="dversionmangle=s/\.dfsg$//" \
+http://sf.net/hobbitmon/hobbit-(.*).tar.gz
--- hobbit-4.2.0.dfsg.orig/debian/hobbit-client.postinst
+++ hobbit-4.2.0.dfsg/debian/hobbit-client.postinst
@@ -0,0 +1,73 @@
+#! /bin/sh
+# postinst script for hobbit
+#
+# see: dh_installdeb(1)
+
+# summary of how this script can be called:
+#        *  `configure' 
+#        *  `abort-upgrade' 
+#        *  `abort-remove' `in-favour' 
+#          
+#        *  `abort-deconfigure' `in-favour'
+#            `removing'
+#           
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+. /usr/share/debconf/confmodule
+
+set -e
+
+case "$1" in
+    configure)
+	getent group hobbit > /dev/null || addgroup --system hobbit
+	getent passwd hobbit > /dev/null || adduser --system \
+		--home /var/run/hobbit --no-create-home \
+		--ingroup hobbit --disabled-password --disabled-login \
+		--gecos "Hobbit System Monitor" hobbit
+
+	test -d /var/run/hobbit || mkdir /var/run/hobbit
+	chown hobbit:hobbit /var/run/hobbit
+	test -d /var/lib/hobbit/tmp || mkdir /var/lib/hobbit/tmp
+	chown hobbit:hobbit /var/lib/hobbit/tmp
+	test -d /var/log/hobbit || mkdir /var/log/hobbit
+	chown hobbit:adm /var/log/hobbit ; chmod 2755 /var/log/hobbit
+
+	# Do the debconf stuff
+	db_get hobbit-client/HOBBITSERVERS
+	HOBBITSERVERS="$RET"
+	db_get hobbit-client/CLIENTHOSTNAME
+	CLIENTHOSTNAME="$RET"
+	db_stop
+
+	# Update configuration file
+	CONFIGFILE=/etc/default/hobbit-client
+	test -e $CONFIGFILE || cp /usr/share/hobbit/hobbit-client.default $CONFIGFILE
+	if grep -q "^HOBBITSERVERS=" $CONFIGFILE ; then
+		sed -i -e "s/^HOBBITSERVERS=.*/HOBBITSERVERS=\"$HOBBITSERVERS\"/" \
+			$CONFIGFILE
+	else
+		echo "HOBBITSERVERS=\"$HOBBITSERVERS\"" >> $CONFIGFILE
+	fi
+	if grep -q "^CLIENTHOSTNAME=" $CONFIGFILE ; then
+		sed -i -e "s/^CLIENTHOSTNAME=.*/CLIENTHOSTNAME=\"$CLIENTHOSTNAME\"/" \
+			$CONFIGFILE
+	else
+		echo "CLIENTHOSTNAME=\"$CLIENTHOSTNAME\"" >> $CONFIGFILE
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- hobbit-4.2.0.dfsg.orig/debian/hobbit.preinst
+++ hobbit-4.2.0.dfsg/debian/hobbit.preinst
@@ -0,0 +1,38 @@
+#! /bin/sh
+# preinst script for hobbit
+
+set -e
+
+case "$1" in
+    install|upgrade)
+	# stop the client when the server is installed
+	invoke-rc.d hobbit-client stop || true
+	if test "$2" && dpkg --compare-versions "$2" lt 4.2.0.dfsg-2 &&
+			test -d /var/lib/hobbit/www ; then
+		if test -e /etc/logrotate.d/hobbit && ! test -e /etc/logrotate.d/hobbit.dpkg-old ; then
+			mv /etc/logrotate.d/hobbit /etc/logrotate.d/hobbit.dpkg-old
+		fi
+		# we want to replace directories with symlinks, prod dpkg to do it
+		move_dir () {
+			test -d "$1" || return
+			test -h "$1" && return
+			test -e "$1.dpkg-old" && return
+			mv "$1" "$1.dpkg-old"
+		}
+		cd /var/lib/hobbit/www
+		move_dir gifs
+		move_dir help
+		move_dir menu
+	fi
+	#446982
+	if test "$2" && dpkg --compare-versions "$2" ge 4.2.0.dfsg-1 &&
+			dpkg --compare-versions "$2" lt 4.2.0.dfsg-6 ; then
+		chown root:root /tmp
+		chmod 1777 /tmp
+	fi
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- hobbit-4.2.0.dfsg.orig/debian/hobbit-client.init
+++ hobbit-4.2.0.dfsg/debian/hobbit-client.init
@@ -0,0 +1,85 @@
+#! /bin/sh
+#
+# hobbitclient    This shell script takes care of starting and stopping
+#                 the hobbit client.
+
+### BEGIN INIT INFO
+# Provides:          hobbit-client
+# Required-Start:    $remote_fs $network
+# Should-Start:      $all
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Hobbit system monitor client
+# Description:       Client to feed system data to a remote Hobbit server.
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON="/usr/lib/hobbit/client/bin/hobbitlaunch"
+NAME=hobbitclient
+DESC="Hobbit Client"
+PIDFILE="/var/run/hobbit/clientlaunch.pid"
+HOBBITCLIENTHOME="/usr/lib/hobbit/client"
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+. /usr/share/hobbit/init-common.sh
+
+# Include hobbitclient defaults if available
+if [ -f /etc/default/hobbit-client ] ; then
+	. /etc/default/hobbit-client
+fi
+[ -z "$MACHINE" ] && MACHINE="$CLIENTHOSTNAME"
+[ -z "$MACHINEDOTS" ] && MACHINEDOTS="`hostname -f`"
+export HOBBITSERVERS HOBBITCLIENTHOME CLIENTHOSTNAME MACHINE MACHINEDOTS
+
+case "$1" in
+  start)
+	# do not run the client script on the server
+	[ -x /usr/lib/hobbit/server/bin/hobbitd ] && exit 0
+
+	create_includefiles
+
+	log_daemon_msg "Starting $DESC" "$NAME"
+	start-stop-daemon --exec $DAEMON --chuid hobbit --umask 022 --start \
+		-- \
+		--config=/etc/hobbit/clientlaunch.cfg \
+		--log=/var/log/hobbit/clientlaunch.log \
+		--pidfile=$PIDFILE
+	log_end_msg $?
+	;;
+  stop)
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	start-stop-daemon --exec $DAEMON --pidfile $PIDFILE --stop --retry 5
+	log_end_msg $?
+	;;
+  restart)
+	if [ -x /usr/lib/hobbit/server/bin/hobbitd ] ; then
+		log_action_msg "Hobbit server installed. Please restart 'hobbit' instead"
+		exit 0
+	fi
+	$0 stop
+	sleep 1
+	$0 start
+	;;
+  reload|force-reload)
+	[ -x /usr/lib/hobbit/server/bin/hobbitd ] && exit 0
+	create_includefiles
+	kill -HUP `cat /var/run/hobbit/clientlaunch.pid`
+	;;
+  rotate)
+	for PIDFILE in /var/run/hobbit/*.pid
+	do
+		test -e $PIDFILE && kill -HUP `cat $PIDFILE`
+	done
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|force-reload|rotate}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
+
--- hobbit-4.2.0.dfsg.orig/debian/po/it.po
+++ hobbit-4.2.0.dfsg/debian/po/it.po
@@ -0,0 +1,61 @@
+# Italian (it) translation of debconf templates for hobbit
+# Copyright (C) 2007 Software in the Public Interest
+# This file is distributed under the same license as the hobbit package.
+# Luca Monducci , 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit debconf templates\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-19 07:31+0200\n"
+"PO-Revision-Date: 2007-09-22 10:09+0200\n"
+"Last-Translator: Luca Monducci \n"
+"Language-Team: Italian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Server Hobbit:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr ""
+"Inserire l'indirizzo di rete da usare per accedere al server Hobbit. Se si "
+"utilizzano più server, inserire l'elenco degli indirizzi usando uno spazio "
+"come separatore."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"L'uso dei nomi host al posto degli indirizzi IP è sconsigliato nel caso "
+"si verifichino dei problemi con il DNS."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr "Nome host del client:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr ""
+"Inserire il nome host che il client Hobbit deve usare per l'invio dei report "
+"al server Hobbit. Questo nome deve coincidere con il nome utilizzato nel "
+"file bb-hosts sul server Hobbit."
--- hobbit-4.2.0.dfsg.orig/debian/po/ta.po
+++ hobbit-4.2.0.dfsg/debian/po/ta.po
@@ -0,0 +1,55 @@
+# translation of hobbit.po to TAMIL
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Dr.T.Vasudevan , 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-19 07:31+0200\n"
+"PO-Revision-Date: 2007-09-19 14:53+0530\n"
+"Last-Translator: Dr.T.Vasudevan \n"
+"Language-Team: TAMIL \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr "ஹாபிட் சேவையகம்:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr "தயவு செய்து ஹாபிட் சேவையக வலைப்பின்னல் முகவரியை உள்ளிடவும். நீங்கள் பல சேவையக கணினிகளை பயன்படுத்தினால் ஒரு  இடைவெளியால் பிரித்த முகவரிகள் பட்டியலை பயன்படுத்துக"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr "டிஎன்எஸ் தோல்விகளால் ஐபி முகவரிக்கு பதிலாக புரவன் பெயரை பயன்படுத்தாமை பரிந்துரைக்கப்படுகிறது. "
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr "சார்ந்தோன் புரவன் பெயர்:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr "ஹாபிட் சார்ந்தோன் ஹாபிட் சேவையகத்துக்கு அறிக்கைகள் அனுப்பும் போது பயன்படும் புரவன் பெயரை தயவு செய்து உள்ளிடுக. இந்த  பெயர் ஹாபிட் சேவையகத்தில் உள்ள bb-hosts  கோப்பில் உள்ள பெயருடன் ஒத்துப்போக வேண்டும்."
+
--- hobbit-4.2.0.dfsg.orig/debian/po/pt.po
+++ hobbit-4.2.0.dfsg/debian/po/pt.po
@@ -0,0 +1,62 @@
+# translation of hobbit debconf to Portuguese
+# Copyright (C) 2007 Américo Monteiro
+# This file is distributed under the same license as the hobbit package.
+#
+# Américo Monteiro , 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit 4.2.0.dfsg-4\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-23 12:28+0200\n"
+"PO-Revision-Date: 2007-09-19 18:22+0100\n"
+"Last-Translator: Américo Monteiro \n"
+"Language-Team: Portuguese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Servidor Hobbit:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr ""
+"Por favor indique o endereço de rede usado para aceder ao(s) seu(s) servidor"
+"(es) Hobbit. Se você tem vários servidores, use uma lista de endereços "
+"separados por espaços."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"A utilização de nomes de máquinas em vez de endereços IP é desaconselhada, "
+"em casos em que a rede sofra de falhas de DNS."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr "Nome da máquina cliente:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr ""
+"Por favor indique o nome da máquina usada pelo cliente Hobbit quando envia "
+"relatórios para o servidor Hobbit. Este nome tem que coincidir com o nome "
+"usado no ficheiro bb-hosts no servidor Hobbit."
--- hobbit-4.2.0.dfsg.orig/debian/po/ru.po
+++ hobbit-4.2.0.dfsg/debian/po/ru.po
@@ -0,0 +1,64 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov , 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: 4.2.0.dfsg-4\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-19 07:31+0200\n"
+"PO-Revision-Date: 2007-09-24 20:46+0400\n"
+"Last-Translator: Yuri Kozlov \n"
+"Language-Team: Russian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Сервер Hobbit:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr ""
+"Введите сетевой адрес, который нужно использовать для доступа к "
+"серверу(ам) Hobbit. Если у вас используются несколько серверов, "
+"укажите все адреса через пробел."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"Использование имён серверов вместо IP-адресов приводит к "
+"проблемам в случае отказа DNS."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr "Имя клиента:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr ""
+"Введите имя клиентской машины, которое будет использовано клиентом Hobbit "
+"при отправке отчётов на сервер Hobbit. Это имя должно совпадать с "
+"именем в файле bb-hosts на сервере Hobbit."
+
--- hobbit-4.2.0.dfsg.orig/debian/po/POTFILES.in
+++ hobbit-4.2.0.dfsg/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] hobbit-client.templates
--- hobbit-4.2.0.dfsg.orig/debian/po/gl.po
+++ hobbit-4.2.0.dfsg/debian/po/gl.po
@@ -0,0 +1,60 @@
+# Galician translation of hobbit's debconf templates
+# This file is distributed under the same license as the hobbit package.
+# Jacobo Tarrio , 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-19 07:31+0200\n"
+"PO-Revision-Date: 2007-09-30 18:53+0100\n"
+"Last-Translator: Jacobo Tarrio \n"
+"Language-Team: Galician \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Servidor Hobbit:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr ""
+"Introduza o enderezo de rede que quere empregar para acceder ao servidor "
+"Hobbit. Se emprega varios servidores, introduza unha lista de enderezos "
+"separados por espazos."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"Recoméndase non empregar nomes, senón enderezos IP, para evitar problemas no "
+"caso de que a rede teña problemas con DNS."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr "Nome do cliente:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr ""
+"Introduza o nome empregado polo cliente Hobbit ao enviar informes ao "
+"servidor Hobbit. Este nome debe coincidir co nome empregado no ficheiro bb-"
+"hosts no servidor Hobbit."
--- hobbit-4.2.0.dfsg.orig/debian/po/vi.po
+++ hobbit-4.2.0.dfsg/debian/po/vi.po
@@ -0,0 +1,54 @@
+# Vietnamese translation for Hobbit.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall , 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-19 07:31+0200\n"
+"PO-Revision-Date: 2007-09-19 18:20+0930\n"
+"Last-Translator: Clytie Siddall \n"
+"Language-Team: Vietnamese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.7b1\n"
+
+#: ../hobbit-client.templates:2001
+#. Type: string
+#. Description
+msgid "Hobbit server:"
+msgstr "Máy phục vụ Hobbit:"
+
+#: ../hobbit-client.templates:2001
+#. Type: string
+#. Description
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr "Hãy gõ địa chỉ mạng được dùng để truy cập (các) máy phục vụ Hobbit. Định giới nhiều máy phục vụ bằng dấu cách."
+
+#: ../hobbit-client.templates:2001
+#. Type: string
+#. Description
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr "Khuyên bạn không sử dụng tên máy thay cho địa chỉ IP, trong trường hợp mạng gặp dịch vụ DNS bị gián đoạn."
+
+#: ../hobbit-client.templates:3001
+#. Type: string
+#. Description
+msgid "Client hostname:"
+msgstr "Tên máy khách:"
+
+#: ../hobbit-client.templates:3001
+#. Type: string
+#. Description
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr "Hãy gõ tên máy được ứng dụng khách Hobbit dùng khi gửi thông báo cho máy phục vụ Hobbit. Tên này phải tương ứng với tên nằm trong tập tin « bb-hosts » trên máy phục vụ Hobbit."
--- hobbit-4.2.0.dfsg.orig/debian/po/templates.pot
+++ hobbit-4.2.0.dfsg/debian/po/templates.pot
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-23 12:28+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr ""
--- hobbit-4.2.0.dfsg.orig/debian/po/eu.po
+++ hobbit-4.2.0.dfsg/debian/po/eu.po
@@ -0,0 +1,62 @@
+# translation of hobbit-templates.po to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Piarres Beobide , 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit-templates\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-19 07:31+0200\n"
+"PO-Revision-Date: 2007-09-19 09:37+0200\n"
+"Last-Translator: Piarres Beobide \n"
+"Language-Team: Euskara \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Hobbit zerbitzaria:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr ""
+"Mesedez idatzi hobbit zerbitzaria(k) eskuratzeko erabiliko den sare helbidea. Zerbitzari "
+"anitz erabiaz gero zuriunez bereiziriko helbide zerrenda bat erabili."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"IP helbideak beharrean ostalari izenak erabiltzea arrisku bat izan liteke sareak "
+"DNS erroreak dituen kasuan."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr "Bezero ostalari izena:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr ""
+"Mesedez idatzi hobbit bezeroak zerbitzarira txostenak bidaltzeko erabiliko duen "
+"ostalari izena. Izen hau Hobbit zerbitzariko bb-hosts fitxategian dagoen berdina "
+"izan behar da."
+
--- hobbit-4.2.0.dfsg.orig/debian/po/fi.po
+++ hobbit-4.2.0.dfsg/debian/po/fi.po
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: debconf: hobbit\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-23 12:28+0200\n"
+"PO-Revision-Date: 2007-09-19 17:49+0200\n"
+"Last-Translator: Esko Arajärvi \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: FINLAND\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Hobbit-palvelin:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr ""
+"Anna Hobbit-palvelimen verkko-osoite. Jos käytössä on useampia palvelimia, "
+"syötä osoitteet välilyönnein eroteltuna."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"Verkkonimien käyttöä IP-osoitteiden sijaan ei suositella mahdollisten DNS:n "
+"toimintahäiriöiden takia."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr "Asiakaskoneen verkkonimi:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr ""
+"Anna verkkonimi, jota Hobbit-asiakas käyttää lähettäessään raportteja Hobbit-"
+"palvelimelle. Tämän nimen tulee täsmätä Hobbit-serverillä tiedostossa bb-"
+"hosts olevaan nimeen."
--- hobbit-4.2.0.dfsg.orig/debian/po/de.po
+++ hobbit-4.2.0.dfsg/debian/po/de.po
@@ -0,0 +1,60 @@
+# hobbit
+# Copyright (C) 2007
+# This file is distributed under the same license as the hobbit package.
+# Christoph Berg 
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-23 12:28+0200\n"
+"PO-Revision-Date: 2007-10-08 22:50+0200\n"
+"Last-Translator: Christoph Berg \n"
+"Language-Team: debian-l10n-german \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Hobbit-Server:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr ""
+"Geben Sie die Adresse zum Zugriff auf den Hobbit-Server ein. Wenn Sie mehrere "
+"Server benutzen, trennen Sie die Adressen mit Leerzeichen."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"Es wird empfohlen im Falle von DNS-Ausfällen statt Hostnamen IP-Adressen zu "
+"benutzen."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr "Client-Hostname:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr ""
+"Geben Sie den Hostnamen ein den der Hobbit-Client benutzt um Reports and den "
+"Hobbit-Server zu senden. "
+"Der Name muss mit dem in der Datei bb-hosts auf dem Server übereinstimmen."
--- hobbit-4.2.0.dfsg.orig/debian/po/nl.po
+++ hobbit-4.2.0.dfsg/debian/po/nl.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE 'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the  package.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-23 12:28+0200\n"
+"PO-Revision-Date: 2007-10-26 14:23+0100\n"
+"Last-Translator: Bart Cornelis \n"
+"Language-Team: debian-l10n-dutch \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Hobbit-server:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Please enter the network address used to access the Hobbit server(s). If you use multiple servers, use a space-separated list of addresses."
+msgstr "Wat is het netwerkadres waarmee de Hobbit-server(s) benaderd kunnen worden? Als u meerdere servers gebruikt dient u de adressen met spaties van elkaar te scheiden."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Using host names instead of IP addresses is discouraged in case the network experiences DNS failures."
+msgstr "Gebruik van computernamen in plaats van IP-adressen wordt afgeraden (IP-adressen blijven werken als het netwerk DNS-problemen ondervindt). "
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr "Computernaam van de client:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Please enter the host name used by the Hobbit client when sending reports to the Hobbit server. This name must match the name used in the bb-hosts file on the Hobbit server."
+msgstr "Wat is de computernaam die de Hobbit-client gebruikt om rapporten naar de Hobbit-server te versturen? Deze naam dient overeen te komen met de naam die in het bestand 'bb-hosts' op de Hobbit-server gebruikt wordt."
+
--- hobbit-4.2.0.dfsg.orig/debian/po/fr.po
+++ hobbit-4.2.0.dfsg/debian/po/fr.po
@@ -0,0 +1,60 @@
+# Translation of hobbit debconf templates to French
+# Copyright (C) 2007 Geoffroy Youri Berret 
+# This file is distributed under the same license as the hobbit package.
+#
+# Geoffroy Youri Berret , 2007.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-19 07:31+0200\n"
+"PO-Revision-Date: 2007-08-28 21:51-0700\n"
+"Last-Translator: Geoffroy Youri Berret \n"
+"Language-Team: French \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Serveur hobbit :"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr ""
+"Veuillez indiquer l'adresse du (ou des) serveur(s) Hobbit. Les serveurs "
+"multiples éventuels doivent être séparés par des espaces."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr "Il est conseillé d'indiquer les adresses IP plutôt que les noms d'hôtes afin d'éviter des difficulté si la résolution de noms de domaine (DNS) ne fonctionne plus."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr "Nom d'hôte du client :"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr ""
+"Veuillez indiquer le nom d'hôte utilisé par le client Hobbit pour envoyer "
+"les rapports au serveur Hobbit. Ce nom doit correpondre à celui utilisé dans "
+"le fichier bb-hosts sur le serveur Hobbit."
--- hobbit-4.2.0.dfsg.orig/debian/po/pt_BR.po
+++ hobbit-4.2.0.dfsg/debian/po/pt_BR.po
@@ -0,0 +1,63 @@
+# hobbit Brazilian Portuguese translation
+# Copyright (C) 2007 THE hobbit'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the hobbit package.
+# Felipe Augusto van de Wiel (faw) , 2007.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit (20071005)\n"
+"Report-Msgid-Bugs-To: myon@debian.org\n"
+"POT-Creation-Date: 2007-09-23 12:28+0200\n"
+"PO-Revision-Date: 2007-10-05 02:10-0300\n"
+"Last-Translator: Felipe Augusto van de Wiel (faw) \n"
+"Language-Team: l10n portuguese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\n"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Servidor Hobbit:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Please enter the network address used to access the Hobbit server(s). If you "
+"use multiple servers, use a space-separated list of addresses."
+msgstr ""
+"Por favor, informe o endereço de rede usado para acessar o(s) servidor(es) "
+"Hobbit. Se você usa múltiplos servidores, use uma lista de endereços "
+"separada por espaços."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"Usar nomes de máquinas ao invés de endereços IP é desencorajado caso a rede "
+"sofra falhas de DNS."
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid "Client hostname:"
+msgstr "Nome da máquina cliente:"
+
+#. Type: string
+#. Description
+#: ../hobbit-client.templates:3001
+msgid ""
+"Please enter the host name used by the Hobbit client when sending reports to "
+"the Hobbit server. This name must match the name used in the bb-hosts file "
+"on the Hobbit server."
+msgstr ""
+"Por favor, informe o nome da máquina cliente usado pelo cliente Hobbit "
+"quando envia relatórios para o servidor Hobbit. Este nome precisa bater com "
+"o nome usado no arquivo bb-hosts no servidor Hobbit."
--- hobbit-4.2.0.dfsg.orig/debian/hobbit-client.config
+++ hobbit-4.2.0.dfsg/debian/hobbit-client.config
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+CONFIGFILE=/etc/default/hobbit-client
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+if [ -e $CONFIGFILE ]; then
+   . $CONFIGFILE || true
+fi
+
+# if there is no value configured, look for debconf answers
+if [ -z "$HOBBITSERVERS" ] ; then
+	db_get hobbit-client/HOBBITSERVERS
+	HOBBITSERVERS="$RET"
+fi
+# still nothing? set a default
+if [ -z "$HOBBITSERVERS" ] ; then
+	HOBBITSERVERS="127.0.0.1"
+fi
+# in any case, store the value in debconf
+db_set hobbit-client/HOBBITSERVERS "$HOBBITSERVERS"
+
+if [ -z "$CLIENTHOSTNAME" ] ; then
+	db_get hobbit-client/CLIENTHOSTNAME
+	CLIENTHOSTNAME="$RET"
+fi
+if [ -z "$CLIENTHOSTNAME" ] ; then
+	CLIENTHOSTNAME="`hostname -f 2> /dev/null || hostname`"
+fi
+db_set hobbit-client/CLIENTHOSTNAME "$CLIENTHOSTNAME"
+
+db_input high hobbit-client/HOBBITSERVERS || true
+db_input medium hobbit-client/CLIENTHOSTNAME || true
+db_go || true
+
--- hobbit-4.2.0.dfsg.orig/debian/init-common.sh
+++ hobbit-4.2.0.dfsg/debian/init-common.sh
@@ -0,0 +1,50 @@
+# common init functions for hobbit and hobbit-client
+
+create_includefiles ()
+{
+	if [ "$HOBBITSERVERS" = "" ]; then
+		echo "Please configure HOBBITSERVERS in /etc/default/hobbit-client"
+		exit 0
+	fi
+
+	umask 022
+
+	set -- $HOBBITSERVERS
+	if [ $# -eq 1 ]; then
+		echo "BBDISP=\"$HOBBITSERVERS\""
+		echo "BBDISPLAYS=\"\""
+	else
+		echo "BBDISP=\"0.0.0.0\""
+		echo "BBDISPLAYS=\"$HOBBITSERVERS\""
+	fi > /var/run/hobbit/bbdisp-runtime.cfg
+
+	for cfg in /etc/hobbit/clientlaunch.d/*.cfg ; do
+		test -e $cfg && echo "include $cfg"
+	done > /var/run/hobbit/clientlaunch-include.cfg
+
+	if test -d /etc/hobbit/hobbitlaunch.d ; then
+		for cfg in /etc/hobbit/hobbitlaunch.d/*.cfg ; do
+			test -e $cfg && echo "include $cfg"
+		done > /var/run/hobbit/hobbitlaunch-include.cfg
+	fi
+
+	if test -d /etc/hobbit/hobbitgraph.d ; then
+		for cfg in /etc/hobbit/hobbitgraph.d/*.cfg ; do
+			test -e $cfg && echo "include $cfg"
+		done > /var/run/hobbit/hobbitgraph-include.cfg
+	fi
+
+	if test -d /etc/hobbit/hobbitserver.d ; then
+		for cfg in /etc/hobbit/hobbitserver.d/*.cfg ; do
+			test -e $cfg && echo "include $cfg"
+		done > /var/run/hobbit/hobbitserver-include.cfg
+	fi
+
+	if test -d /etc/hobbit/hobbitclient.d ; then
+		for cfg in /etc/hobbit/hobbitclient.d/*.cfg ; do
+			test -e $cfg && echo "include $cfg"
+		done > /var/run/hobbit/hobbitclient-include.cfg
+	fi
+
+	return 0
+}
--- hobbit-4.2.0.dfsg.orig/debian/README.source
+++ hobbit-4.2.0.dfsg/debian/README.source
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new 
+
+where  is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add 
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P  /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed).  as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete 
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
--- hobbit-4.2.0.dfsg.orig/debian/hobbit.NEWS
+++ hobbit-4.2.0.dfsg/debian/hobbit.NEWS
@@ -0,0 +1,6 @@
+hobbit (4.2.0.dfsg-9) unstable; urgency=low
+
+  This release adds Charles Goyard's splitncv patch. See hobbitd_rrd(8) and
+  http://www.hswn.dk/hobbiton/2007/03/msg00368.html for more information.
+
+ -- Christoph Berg   Mon, 31 Dec 2007 10:47:56 +0100
--- hobbit-4.2.0.dfsg.orig/debian/hobbit-client.files
+++ hobbit-4.2.0.dfsg/debian/hobbit-client.files
@@ -0,0 +1,13 @@
+usr/share/man/man1/bb.1
+usr/share/man/man1/bbcmd.1
+usr/share/man/man1/bbdigest.1
+usr/share/man/man1/bbhostgrep.1
+usr/share/man/man1/bbhostshow.1
+usr/share/man/man5/clientlaunch.cfg.5
+usr/share/man/man1/clientupdate.1
+usr/share/man/man7/hobbit.7
+usr/share/man/man5/hobbitclient.cfg.5
+usr/share/man/man8/hobbitlaunch.8
+usr/share/man/man1/logfetch.1
+usr/share/man/man8/msgcache.8
+usr/share/man/man1/orcahobbit.1
--- hobbit-4.2.0.dfsg.orig/debian/README.Debian
+++ hobbit-4.2.0.dfsg/debian/README.Debian
@@ -0,0 +1,22 @@
+Hobbit for Debian
+=================
+
+This Debian package follows pretty closely the original debianization shipped
+by upstream. The main differences are
+
+- 'hobbit' depends on 'hobbit-client' rather than conflicting with it; it uses
+  the client package for monitoring the local host. (The client package's init
+  script/daemon is disabled when the server is installed.)
+
+- Additional tests to run can be plugged into /etc/hobbit/clientlaunch.d/*.cfg.
+  Client and server will read these files on startup. Install the
+  hobbit-plugins package for some pre-packaged modules.
+
+- Access to the monitoring website is restricted to localhost by default.
+  Edit /etc/apache2/conf.d/hobbit to change this.
+
+- The javascript menu has been replaced by a CSS menu; the animated gifs were
+  replaced by static versions in the default install, change BBSKIN for the
+  animated version.
+
+ -- Christoph Berg   Thu, 16 Aug 2007 00:07:40 +0200
--- hobbit-4.2.0.dfsg.orig/debian/rules
+++ hobbit-4.2.0.dfsg/debian/rules
@@ -0,0 +1,150 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+Makefile: configure $(QUILT_STAMPFN)
+	dh_testdir
+	# Add here commands to configure the package.
+	USEHOBBITPING=y \
+	ENABLESSL=y \
+	ENABLELDAP=y \
+	ENABLELDAPSSL=y \
+	BBUSER=hobbit \
+	BBTOPDIR=/usr/lib/hobbit \
+	BBVAR=/var/lib/hobbit \
+	BBHOSTURL=/hobbit \
+	CGIDIR=/usr/lib/hobbit/cgi-bin \
+	BBCGIURL=/hobbit-cgi \
+	SECURECGIDIR=/usr/lib/hobbit/cgi-secure \
+	SECUREBBCGIURL=/hobbit-seccgi \
+	HTTPDGID=www-data \
+	BBLOGDIR=/var/log/hobbit \
+	BBHOSTNAME=localhost \
+	BBHOSTIP=127.0.0.1 \
+	MANROOT=/usr/share/man \
+	INSTALLBINDIR=/usr/lib/hobbit/server/bin \
+	INSTALLETCDIR=/etc/hobbit \
+	INSTALLWEBDIR=/etc/hobbit/web \
+	INSTALLEXTDIR=/usr/lib/hobbit/server/ext \
+	INSTALLTMPDIR=/var/lib/hobbit/tmp \
+	INSTALLWWWDIR=/var/lib/hobbit/www \
+	./configure
+
+build: build-stamp
+build-stamp: Makefile
+	dh_testdir
+
+	# Add here commands to compile the package.
+	PKGBUILD=1 $(MAKE)
+
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean 
+	debconf-updatepo
+
+S=$(CURDIR)/debian/hobbit
+C=$(CURDIR)/debian/hobbit-client
+
+install-clean:
+	dh_clean -k
+
+install: install-server install-client
+install-server: build install-clean
+	#################### Installing server ########################
+	dh_testdir
+	dh_testroot
+	dh_install -a
+	dh_installdirs -a
+	PKGBUILD=1 INSTALLROOT=$S/ $(MAKE) install
+	# Static content in /usr/share
+	cd $S/var/lib/hobbit/www && \
+		mv gifs ../../../../usr/share/hobbit && ln -s ../../../../usr/share/hobbit/gifs . && \
+		mv help ../../../../usr/share/hobbit && ln -s ../../../../usr/share/hobbit/help . && \
+		rmdir menu && ln -s ../../../../usr/share/hobbit/menu .
+	# Create static gifs
+	cd $S/usr/share/hobbit/gifs && mkdir static && \
+		for gif in *.gif ; do \
+			convert "$$gif[0]" xpm:- | convert xpm:- static/$$gif || exit 1 ; \
+		done && \
+		cd static && ln -s ../*.ico .
+	# We depend on the -client package
+	rm -rf $S/usr/lib/hobbit/client
+	# This needs root
+	chmod 4755 $S/usr/lib/hobbit/server/bin/hobbitping
+	mv $S/etc/hobbit/hobbit-apache.conf \
+		$S/etc/apache2/conf.d/hobbit
+	# We use a modified version of this as /etc/init.d/hobbit
+	rm $S/usr/lib/hobbit/server/hobbit.sh
+	# Autogenerated on first install
+	rm $S/etc/hobbit/bb-hosts
+	# Install a free menu
+	sed -i -e's/ Transitional//' -e'/"Topline"/i&HOBBITMENU' \
+		$S/etc/hobbit/web/*_header
+
+install-client: build install-clean
+	#################### Installing client ########################
+	dh_testdir
+	dh_testroot
+	dh_install -a
+	dh_installdirs -a
+	PKGBUILD=1 INSTALLROOT=$C/ $(MAKE) install-client
+	cd $C/usr/lib/hobbit/client && mv etc/* $C/etc/hobbit && rmdir etc && ln -s ../../../../etc/hobbit etc
+	cd $C/usr/lib/hobbit/client && rmdir logs && ln -s ../../../../var/log/hobbit logs
+	cd $C/usr/lib/hobbit/client && rmdir tmp && ln -s ../../../../var/lib/hobbit/tmp
+	# the only command needed in /usr/bin is bbcmd, its PATH includes our private .../bin
+	cd $C/usr/bin && ln -s ../lib/hobbit/client/bin/bbcmd bbcmd
+	cp debian/hobbit-client.default.dist $C/usr/share/hobbit/hobbit-client.default
+	# dynamic list of installed client extensions
+	echo "include /var/run/hobbit/clientlaunch-include.cfg" >> \
+		$C/etc/hobbit/clientlaunch.cfg
+	rm $C/usr/lib/hobbit/client/runclient.sh
+
+binary-indep:
+
+binary binary-arch: build install-server install-client
+	#################### Building .deb files ########################
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a Changes
+	dh_installdocs -a
+	dh_installexamples -a
+	-dh_lintian -a
+	# move some files into the client package
+	dh_movefiles --sourcedir=debian/hobbit -a
+	cd $S/usr/lib/hobbit/server/bin && \
+		for f in * ; do \
+			if [ -f $C/usr/lib/hobbit/client/bin/$$f ] ; then \
+				rm -v $$f ; ln -s ../../client/bin/$$f ; \
+			fi \
+		done
+	rmdir $S/usr/share/man/man7
+	dh_installdebconf -a
+	dh_installlogrotate -a
+	dh_installinit -a -- defaults 98 02
+	dh_installman -a
+	cd $C/usr/share/man/man1 && mv bb.1 hobbit.1
+	cd $C/usr/share/man/man8 && ln -s ../man1/hobbit.1 bb.8
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a -Xbin/hobbitping
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+.PHONY: build clean binary-indep binary-arch binary install install-server install-client
--- hobbit-4.2.0.dfsg.orig/debian/control
+++ hobbit-4.2.0.dfsg/debian/control
@@ -0,0 +1,43 @@
+Source: hobbit
+Section: net
+Priority: extra
+Maintainer: Christoph Berg 
+Uploaders: Martin Zobel-Helas 
+Build-Depends: debhelper (>= 4.0.0), librrd2-dev | librrd0-dev, libssl-dev, libldap2-dev, libpcre3-dev,
+ imagemagick, po-debconf, quilt (>= 0.40)
+Standards-Version: 3.8.0
+Vcs-Hg: http://hg.debian.org/hg/collab-maint/hobbit/debian
+Homepage: http://hobbitmon.sourceforge.net/
+
+Package: hobbit
+Architecture: any
+Depends: hobbit-client, ${shlibs:Depends}, ${misc:Depends}
+Description: monitoring system for systems, networks and applications - server
+ Hobbit is a network- and applications-monitoring system designed for use in
+ large-scale networks. It will also work just fine on a small network with
+ just a few nodes. It is low-overhead and high-performance, with an easy to use
+ web front-end. It handles monitoring of network services, and through client
+ packages it can also be used to monitor server-specific items. Alerts can
+ trigger when monitoring detects a problem, resulting in e-mails or calls to
+ your pager or mobile phone.
+ .
+ Hobbit has a great deal of inspiration from the non-free Big Brother package,
+ but does not include any Big Brother code.
+
+Package: hobbit-client
+Architecture: any
+Conflicts: hobbit (<= 4.2.0-1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base
+Suggests: hobbit-plugins
+Description: client for the Hobbit network monitor
+ Hobbit is a network- and applications-monitoring system designed for use in
+ large-scale networks. But it will also work just fine on a small network with
+ just a few nodes. It is low-overhead and high-performance, with an easy to use
+ web front-end. It handles monitoring of network services, and through client
+ packages it can also be used to monitor server-specific items. Alerts can
+ trigger when monitoring detects a problem, resulting in e-mails or calls to
+ your pager or mobile phone.
+ .
+ This is the client data collection package for Hobbit. It gathers statistics
+ and data from a single system and reports it to the Hobbit monitor. You should
+ run this on all systems if you have a Hobbit server installed.
--- hobbit-4.2.0.dfsg.orig/debian/hobbit-client.default.dist
+++ hobbit-4.2.0.dfsg/debian/hobbit-client.default.dist
@@ -0,0 +1,21 @@
+# Configure the Hobbit client settings.
+
+# You MUST set the list of Hobbit servers that this
+# client reports to.
+# It is good to use IP-adresses here instead of DNS
+# names - DNS might not work if there's a problem.
+# (Internally this will be translated to BBDISP and BBDISPLAYS
+# variables in /var/run/hobbit/bbdisp-include.cfg)
+#
+# E.g. (a single Hobbit server)
+#   HOBBITSERVERS="192.168.1.1"
+# or (multiple servers)
+#   HOBBITSERVERS="10.0.0.1 192.168.1.1"
+
+HOBBITSERVERS=""
+
+# Hostname used by the client for its reports.
+# Must match the name for this host in the Hobbit servers'
+# bb-hosts file.
+
+CLIENTHOSTNAME=""
--- hobbit-4.2.0.dfsg.orig/debian/hobbit-client.postrm
+++ hobbit-4.2.0.dfsg/debian/hobbit-client.postrm
@@ -0,0 +1,44 @@
+#! /bin/sh
+# postrm script for hobbit
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        *  `remove'
+#        *  `purge'
+#        *  `upgrade' 
+#        *  `failed-upgrade' 
+#        *  `abort-install'
+#        *  `abort-install' 
+#        *  `abort-upgrade' 
+#        *  `disappear' overwrit>r> 
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+# Before deluser so debconf still works
+#DEBHELPER#
+
+case "$1" in
+	purge|disappear)
+	rm -rf /var/lib/hobbit /var/log/hobbit /var/run/hobbit /etc/hobbit \
+		/etc/default/hobbit-client
+	if test -x /usr/sbin/deluser ; then
+		deluser hobbit || true
+	fi
+	if test -x /usr/sbin/delgroup ; then
+		delgroup --only-if-empty hobbit || true
+	fi
+	;;
+
+	remove|upgrade|failed-upgrade|abort-install|abort-upgrade)
+	;;
+
+	*)
+	echo "postrm called with unknown argument \`$1'" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- hobbit-4.2.0.dfsg.orig/debian/changelog
+++ hobbit-4.2.0.dfsg/debian/changelog
@@ -0,0 +1,237 @@
+hobbit (4.2.0.dfsg-13~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for Etch backports.
+
+ -- Christoph Berg   Thu, 17 Jul 2008 00:14:04 +0200
+
+hobbit (4.2.0.dfsg-13) unstable; urgency=low
+
+  * Use lsb init functions.
+  * ncv-ignoretext.patch uses -p1. (Closes: #484950)
+  * Do not ignore tmpfs mountpoints in hobbitclient-linux.sh, but add
+    /dev, /dev/shm, and /lib/init/rw to the default IGNORE list in
+    /etc/hobbit/hobbit-clients.cfg. (Closes: #487157)
+  * Add README.source.
+
+ -- Christoph Berg   Sat, 05 Jul 2008 14:57:16 +0200
+
+hobbit (4.2.0.dfsg-12) unstable; urgency=low
+
+  * Debconf was broken for the initial install, thanks to Peter Eisentraut for
+    spotting. (Closes: #470988)
+  * Actually include /var/run/hobbit/hobbitclient-include.cfg so
+    /etc/hobbit/hobbitclient.d/ works. Also spotted by Peter.
+  * Use dh_lintian.
+
+ -- Christoph Berg   Sat, 10 May 2008 21:31:25 +0200
+
+hobbit (4.2.0.dfsg-11) unstable; urgency=low
+
+  * Make force-reload reload, not restart in init scripts.
+  * Move init scripts to S98 and Should-Start: $all so monitored services have
+    already started. (S98 only effective on new installs.)
+  * Set umask to 022 on for files in /var/run/hobbit/.
+  * Add patch to allow "/http" in URLs (require full "/http[s]://" for proxy
+    requests).
+  * Add /etc/hobbit/hobbitclient.d/.
+
+ -- Christoph Berg   Wed, 09 Apr 2008 13:32:39 +0200
+
+hobbit (4.2.0.dfsg-10) unstable; urgency=low
+
+  * Add patch by dann frazier to define LDAP_DEPRECATED to continue using the
+    deprecated libldap interfaces, thanks. (Closes: #463424)
+
+ -- Christoph Berg   Fri, 15 Feb 2008 12:18:50 +0100
+
+hobbit (4.2.0.dfsg-9) unstable; urgency=low
+
+  * Add splitncv patch by Charles Goyard.
+  * Updated lintian overrides.
+
+ -- Christoph Berg   Sat, 22 Dec 2007 20:22:45 +0100
+
+hobbit (4.2.0.dfsg-8) unstable; urgency=low
+
+  * Set umask to 022 on startup.
+  * Fix mailq regexp in hobbitgraph.cfg, thanks to Roland Rosenfeld for the
+    patch. (Closes: #450830)
+  * Do not assume the first df output line to be a header. (Closes: #450834)
+  * Add librrd0-dev as alternative to build-depends.
+
+ -- Christoph Berg   Sat, 15 Dec 2007 22:37:27 +0100
+
+hobbit (4.2.0.dfsg-7) unstable; urgency=low
+
+  * Add patch by Roland Rosenfeld to adjust description width in the netstat
+    graphs. (Closes: #447484)
+  * Return 0 in init-common.sh, thanks to Jason Cormie for spotting.
+    (Closes: #448482)
+  * Recreate /usr/lib/hobbit/*/tmp/ symlinks, pointing to /var/lib/hobbit/tmp,
+    and properly set permissions. (Closes: #448489)
+  * Make our HOBBITMENU work for the ghost clients report. (Closes: #446095)
+  * Grab patch from upstream to fix slightly broken NCV parsing.
+  * Add /etc/hobbit/hobbitgraph.d/ and /etc/hobbit/hobbitserver.d/.
+  * Improve TCP tests time granularity.
+  * Translations: Dutch, thanks Bart Cornelis. (Closes: #448934)
+
+ -- Christoph Berg   Thu, 01 Nov 2007 20:51:26 +0100
+
+hobbit (4.2.0.dfsg-6) unstable; urgency=low
+
+  * Remove /usr/lib/hobbit/*/tmp/ symlinks, set BBTMP="/var/lib/hobbit/tmp".
+    (Closes: #446982)
+  * Drop "hobbit" binary again, instead bbcmd will set PATH to include
+    the hobbit binaries.
+  * Add /etc/hobbit/hobbitlaunch.d/ directory for server extensions.
+  * When upgrading from a pre-Debian version, move old directories in
+    /var/lib/hobbit/www/ away, we want them to be symlinks.
+  * Add missing "test" in postrm. Thanks to Yukio Shiiya for the patch.
+    (Closes: #446347)
+  * Add COLUMS=200 to the dpkg -l call for Sarge compatibility.
+  * Add some examples to the default bb-hosts file.
+  * Move the config file tweaking from debian/rules to quilt.
+
+ -- Christoph Berg   Wed, 17 Oct 2007 18:06:02 +0200
+
+hobbit (4.2.0.dfsg-5) unstable; urgency=low
+
+  * The Smith inquisition reviewed our templates - thanks Christian Perrier.
+    (Closes: #442953)
+    + Basque, thanks Piarres Beobide (Closes: #443155).
+    + Vietnamese, thanks Clytie Siddall (Closes: #443161).
+    + Portuguese, thanks Américo Monteiro (Closes: #443214).
+    + Finnish, thanks Esko Arajärvi (Closes: #443617).
+    + Czech, thanks Miroslav Kure (Closes: #443667).
+    + Russian, thanks Yuri Kozlov (Closes: #443861).
+    + Tamil, thanks Tirumurti Vasudevan (Closes: #444281).
+    + Italian, thanks Luca Monducci (Closes: #444610).
+    + French, thanks Geoffroy Youri Berret (Closes: #444659).
+    + Galician, thanks Jacobo Tarrio (Closes: #444751).
+    + Brazilian Portuguese, thanks Felipe Augusto van de Wiel.
+      (Closes: #445339)
+  * Use $BBSERVERWWWURL and friends in menu.cfg.
+  * Fix reading of /etc/default/hobbit-client in config script.
+    (Closes: #445828)
+
+ -- Christoph Berg   Mon, 08 Oct 2007 22:40:39 +0200
+
+hobbit (4.2.0.dfsg-4) unstable; urgency=low
+
+  * Instead of conflicting with bb, rename our 'bb' binary to 'hobbit'.
+    Move bb.1 to bb.8 (Closes: #441030 again).
+  * Send (reformatted) dpkg -l output with client message.
+
+ -- Christoph Berg   Wed, 19 Sep 2007 00:36:23 +0200
+
+hobbit (4.2.0.dfsg-3) unstable; urgency=low
+
+  * Debconf translations:
+    Portuguese, thanks Américo Monteiro (Closes: #439693).
+    French, thanks Geoffroy Youri Berret (Closes: #440504).
+  * Actually install README.Debian and fix paths in html docs
+    (Closes: #440949).
+  * Quiltize source.
+  * hobbit-client:
+    + Conflict with bb (<= 1.3rc1-8), it ships bb.1 (Closes: #441030).
+    + Set missing environment variables (Closes: #441199, thanks Jason
+      Cormie).
+
+ -- Christoph Berg   Fri, 07 Sep 2007 19:13:22 +0200
+
+hobbit (4.2.0.dfsg-2) unstable; urgency=low
+
+  * Install /usr/bin/bb and bbcmd.
+  * Use HOBBITSERVERS in /etc/default/hobbit-client (again).
+  * Consistently use start-stop-daemon for daemon handling.
+  * Priority: extra.
+
+ -- Christoph Berg   Thu, 23 Aug 2007 17:24:10 +0200
+
+hobbit (4.2.0.dfsg-1) unstable; urgency=low
+
+  * Preparing for Debian upload.
+  * Repackaged the source:
+    + Removed non-free tigra menu files from hobbitd/wwwfiles/menu/.
+    + Removed upstream's debian/ dir.
+
+ -- Christoph Berg   Sat, 18 Aug 2007 22:05:09 +0200
+
+hobbit (4.2.0-1) unstable; urgency=low
+
+  * Hobbit version 4.2: New upstream release.
+
+ -- Henrik Stoerner   Wed, 09 Aug 2006 21:48:00 +0200
+
+hobbit (4.2-RC-20060712) unstable; urgency=low
+
+  * Release candidate of 4.2
+
+ -- Henrik Stoerner   Wed, 12 Jul 2006 23:13:00 +0200
+
+hobbit (4.2-beta-20060605) unstable; urgency=low
+
+  * Beta release of 4.2
+
+ -- Henrik Stoerner   Mon, 05 Jun 2006 16:53:00 +0200
+
+hobbit (4.2-alfa-20060404) unstable; urgency=low
+
+  * Alfa release of 4.2
+
+ -- Henrik Stoerner   Tue, 04 Apr 2006 23:30:00 +0200
+
+hobbit (4.1.2p1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Henrik Stoerner   Thu, 10 Nov 2005 17:32:00 +0100
+
+hobbit (4.1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Henrik Stoerner   Mon, 10 Oct 2005 22:30:00 +0200
+
+hobbit (4.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Henrik Stoerner   Mon, 25 Jul 2005 17:49:00 +0200
+
+hobbit (4.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Henrik Stoerner   Sun, 24 Jul 2005 23:27:00 +0200
+
+hobbit (4.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Henrik Stoerner   Sun, 29 May 2005 12:08:00 +0200
+
+hobbit (4.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Henrik Stoerner   Sun, 22 May 2005 09:34:57 +0200
+
+hobbit (4.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Henrik Stoerner   Sun, 10 Apr 2005 19:39:15 +0200
+
+hobbit (4.0.1-1) unstable; urgency=low
+
+  * Build problems fixed on Solaris, HP-UX
+  * Zoomed graphs could lose the hostname in the title.
+
+ -- Henrik Stoerner   Fri,  1 Apr 2005 07:43:42 +0200
+
+hobbit (4.0-1) unstable; urgency=low
+
+  * Upstream release of version 4.0
+
+ -- Henrik Stoerner   Wed, 30 Mar 2005 21:31:03 +0200
--- hobbit-4.2.0.dfsg.orig/debian/hobbit.dirs
+++ hobbit-4.2.0.dfsg/debian/hobbit.dirs
@@ -0,0 +1,6 @@
+etc/apache2/conf.d
+etc/hobbit/hobbitlaunch.d
+etc/hobbit/hobbitgraph.d
+etc/hobbit/hobbitserver.d
+usr/share/hobbit
+var/run/hobbit
--- hobbit-4.2.0.dfsg.orig/debian/docs
+++ hobbit-4.2.0.dfsg/debian/docs
@@ -0,0 +1,6 @@
+README
+README.CLIENT
+Changes
+CREDITS
+RELEASENOTES
+docs/TODO
--- hobbit-4.2.0.dfsg.orig/debian/hobbit-client.install
+++ hobbit-4.2.0.dfsg/debian/hobbit-client.install
@@ -0,0 +1 @@
+debian/init-common.sh usr/share/hobbit
--- hobbit-4.2.0.dfsg.orig/debian/hobbit.install
+++ hobbit-4.2.0.dfsg/debian/hobbit.install
@@ -0,0 +1,2 @@
+debian/menu.css usr/share/hobbit/menu
+debian/menu.cfg etc/hobbit/web
--- hobbit-4.2.0.dfsg.orig/debian/hobbit-client.logrotate
+++ hobbit-4.2.0.dfsg/debian/hobbit-client.logrotate
@@ -0,0 +1,16 @@
+#
+#       Logrotate fragment for Hobbit (client and server).
+#
+/var/log/hobbit/*.log {
+        weekly
+        compress
+        delaycompress
+        rotate 5
+        missingok
+        nocreate
+        sharedscripts
+        postrotate
+                /etc/init.d/hobbit-client rotate
+        endscript
+}
+
--- hobbit-4.2.0.dfsg.orig/debian/hobbit.init
+++ hobbit-4.2.0.dfsg/debian/hobbit.init
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Startup script for the Hobbit monitor
+#
+# This starts the "hobbitlaunch" tool, which in turn starts
+# all of the other Hobbit server programs.
+
+### BEGIN INIT INFO
+# Provides:          hobbit
+# Required-Start:    $remote_fs $network
+# Should-Start:      $all
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Hobbit system monitor server
+# Description:       Hobbit system monitor, server part.
+#                    (Also monitors the local host.)
+### END INIT INFO
+
+PIDFILE=/var/run/hobbit/hobbitlaunch.pid
+DAEMON=/usr/lib/hobbit/server/bin/hobbitlaunch
+NAME="hobbitd"
+DESC="Hobbit Server"
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+. /usr/share/hobbit/init-common.sh
+
+# Include hobbitclient defaults if available
+if [ -f /etc/default/hobbit-client ] ; then
+	. /etc/default/hobbit-client
+fi
+
+case "$1" in
+   "start")
+	create_includefiles
+
+	log_daemon_msg "Starting $DESC" "$NAME"
+	start-stop-daemon --exec $DAEMON --chuid hobbit --umask 022 --start \
+		-- \
+		--config=/etc/hobbit/hobbitlaunch.cfg \
+		--env=/etc/hobbit/hobbitserver.cfg \
+		--log=/var/log/hobbit/hobbitlaunch.log \
+		--pidfile=$PIDFILE
+	log_end_msg $?
+	;;
+
+   "stop")
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	start-stop-daemon --exec $DAEMON --pidfile $PIDFILE --stop --retry 5
+	log_end_msg $?
+	;;
+
+   "status")
+	if test -s $PIDFILE
+	then
+		kill -0 `cat $PIDFILE`
+		if test $? -eq 0
+		then
+			echo "Hobbit (hobbitlaunch) running with PID `cat $PIDFILE`"
+		else
+			echo "Hobbit not running, removing stale PID file"
+			rm -f $PIDFILE
+		fi
+	else
+		echo "Hobbit (hobbitlaunch) does not appear to be running"
+	fi
+	;;
+
+   "restart")
+	if test -s $PIDFILE
+	then
+		$0 stop
+		sleep 1
+		$0 start
+	else
+		log_action_msg "hobbitlaunch does not appear to be running, starting it"
+		$0 start
+	fi
+	;;
+
+   "reload"|"force-reload")
+	if test -s $PIDFILE
+	then
+		create_includefiles
+		log_action_msg "Reloading hobbitd config"
+		kill -HUP `cat /var/run/hobbit/hobbitd.pid`
+	else
+		log_action_msg "hobbitd not running (no PID file)"
+	fi
+	;;
+
+   "rotate")
+	for PIDFILE in /var/run/hobbit/*.pid
+	do
+		test -e $PIDFILE && kill -HUP `cat $PIDFILE`
+	done
+	;;
+
+   *)
+   	echo "Usage: $0 start|stop|restart|force-reload|reload|status|rotate"
+	break;
+esac
+
+exit 0
+
--- hobbit-4.2.0.dfsg.orig/debian/hobbit-client.lintian-overrides
+++ hobbit-4.2.0.dfsg/debian/hobbit-client.lintian-overrides
@@ -0,0 +1,2 @@
+hobbit-client: spelling-error-in-copyright publically publicly
+hobbit-client: package-contains-empty-directory usr/lib/hobbit/client/ext/
--- hobbit-4.2.0.dfsg.orig/.hgignore
+++ hobbit-4.2.0.dfsg/.hgignore
@@ -0,0 +1,33 @@
+syntax:glob
+hobbit
+hobbit-client
+files
+*.debhelper
+*.substvars
+stamp-patched
+.pc
+
+# upstream
+COPYING
+CREDITS
+Changes
+README
+README.CLIENT
+RELEASENOTES
+bbdisplay
+bbnet
+bbproxy
+build
+client
+common
+configure
+configure.client
+configure.server
+contrib
+demotool
+docs
+hobbitd
+include
+lib
+rpm
+web