--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon-client.install
+++ xymon-4.3.0~beta2.dfsg/debian/xymon-client.install
@@ -0,0 +1 @@
+debian/init-common.sh usr/share/hobbit
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon-client.templates
+++ xymon-4.3.0~beta2.dfsg/debian/xymon-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.
+
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon-client.postrm
+++ xymon-4.3.0~beta2.dfsg/debian/xymon-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:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# 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
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon.postrm
+++ xymon-4.3.0~beta2.dfsg/debian/xymon.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:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# 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
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon-client.hobbit-client.init
+++ xymon-4.3.0~beta2.dfsg/debian/xymon-client.hobbit-client.init
@@ -0,0 +1,103 @@
+#! /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 $?
+	;;
+  status)
+	if test -s $PIDFILE
+	then
+		kill -0 `cat $PIDFILE`
+		if test $? -eq 0
+		then
+                        echo "Hobbit client running with PID `cat $PIDFILE`"
+			exit 0
+		else
+			echo "Hobbit client not running, removing stale PID file"
+			rm -f $PIDFILE
+			exit 1
+		fi
+	else
+		echo "Hobbit client does not appear to be running"
+		exit 3
+	fi
+	;;
+  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|status|rotate}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
+
--- xymon-4.3.0~beta2.dfsg.orig/debian/README.source
+++ xymon-4.3.0~beta2.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 <patch>
+
+where <patch> 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 <file>
+
+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 <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> 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 <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon.postinst
+++ xymon-4.3.0~beta2.dfsg/debian/xymon.postinst
@@ -0,0 +1,88 @@
+#! /bin/sh
+# postinst script for hobbit
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# 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 <<EOF
+# Master configuration file for Hobbit
+#
+# This file defines several things:
+#
+# 1) By adding hosts to this file, you define hosts that are monitored by Hobbit
+# 2) By adding "page", "subpage", "group" definitions, you define the layout
+#    of the Hobbit webpages, and how hosts are divided among the various webpages 
+#    that Hobbit generates.
+# 3) Several other definitions can be done for each host, see the bb-hosts(5)
+#    man-page.
+#
+# You need to define at least the Hobbit server itself here.
+
+#0.0.0.0	.default.	# NOPROPRED:+apt,+libs
+
+#group Servers
+127.0.0.1	$CLIENTHOSTNAME	# bbd http://$CLIENTHOSTNAME/
+
+#group Dialup
+#0.0.0.0	notebook.bla.net # noconn dialup
+EOF
+	fi
+
+	test -e /etc/hobbit/hobbitpasswd || touch /etc/hobbit/hobbitpasswd
+	test -e /etc/hobbit/hobbitgroups || touch /etc/hobbit/hobbitgroups
+	if test -e /etc/init.d/apache2 ; then
+	    invoke-rc.d apache2 reload || :
+	fi
+
+	if [ "$2" ] && dpkg --compare-versions "$2" lt 4.3.0~beta2.dfsg-8~ ; then
+		if [ -x /usr/bin/rrdtool ] ; then
+			echo "Fixing RRD parameters in clock.rrd files found ..."
+			for i in `find /var/lib/hobbit/rrd/ -name clock.rrd` ; do
+				rrdtool tune $i -i la:U
+			done
+		fi
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- xymon-4.3.0~beta2.dfsg.orig/debian/watch
+++ xymon-4.3.0~beta2.dfsg/debian/watch
@@ -0,0 +1,3 @@
+version=3
+options="dversionmangle=s/\.dfsg$//,uversionmangle=s/-beta/~beta/" \
+http://sf.net/xymon/xymon-(.*).tar.gz
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon-client.lintian-overrides
+++ xymon-4.3.0~beta2.dfsg/debian/xymon-client.lintian-overrides
@@ -0,0 +1 @@
+xymon-client: package-contains-empty-directory usr/lib/hobbit/client/ext/
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon.hobbit.init
+++ xymon-4.3.0~beta2.dfsg/debian/xymon.hobbit.init
@@ -0,0 +1,110 @@
+#!/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`"
+			exit 0
+		else
+			echo "Hobbit not running, removing stale PID file"
+			rm -f $PIDFILE
+			exit 1
+		fi
+	else
+		echo "Hobbit (hobbitlaunch) does not appear to be running"
+		exit 3
+	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
+
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon-client.config
+++ xymon-4.3.0~beta2.dfsg/debian/xymon-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
+
--- xymon-4.3.0~beta2.dfsg.orig/debian/menu.cfg
+++ xymon-4.3.0~beta2.dfsg/debian/menu.cfg
@@ -0,0 +1,36 @@
+HOBBITMENU=" <div id=\"menue\"> \
+    <div class=\"outer\"> \
+      <span class=\"menutag\">Views<span class=\"invis\">: </span></span> \
+	<a class=\"inner-1\" href=\"$BBSERVERWWWURL/bb.html\">Main view</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERWWWURL/bb2.html\">All non-green view</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERCGIURL/hobbit-nkview.sh\">Critical systems</a> \
+    </div> \
+    <div class=\"outer\"> \
+      <span class=\"menutag\">Reports<span class=\"invis\">: </span></span> \
+	<a class=\"inner-1\" href=\"$BBSERVERCGIURL/bb-eventlog.sh\">Event log Report</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERCGIURL/bb-rep.sh\">Availability Report</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERCGIURL/bb-snapshot.sh\">Snapshot Report</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERCGIURL/hobbit-confreport.sh\">Config Report</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERCGIURL/hobbit-hostgraphs.sh\">Metrics Report</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERCGIURL/hobbit-ghosts.sh\">Ghost Clients</a> \
+    </div> \
+    <div class=\"outer\"> \
+      <span class=\"menutag\">Administration<span class=\"invis\">: </span></span> \
+	<a class=\"inner-1\" href=\"$BBSERVERCGIURL/bb-findhost.sh\">Find host</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERSECURECGIURL/bb-ack.sh\">Acknowledge alert</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERSECURECGIURL/hobbit-enadis.sh\">Enable/disable</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERSECURECGIURL/hobbit-nkedit.sh\">Edit critical systems</a> \
+    </div> \
+    <div class=\"outer\"> \
+      <span class=\"menutag\">Help<span class=\"invis\">: </span></span> \
+	<a class=\"inner-1\" href=\"$BBSERVERWWWURL/help/about.html\">About Hobbit</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERWWWURL/help/install.html\">Installing Hobbit</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERWWWURL/help/hobbit-config.html\">Configuring Monitoring</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERWWWURL/help/hobbit-alerts.html\">Configuring Alerts</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERWWWURL/help/criticalsystems.html\">Critical systems</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERWWWURL/help/known-issues.html\">Known problems</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERWWWURL/help/hobbit-tips.html\">Tips and Tricks</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERWWWURL/help/howtograph.html\">Custom graphs</a><span class=\"invis\"> | </span> \
+	<a class=\"inner\" href=\"$BBSERVERWWWURL/help/manpages/\">Hobbit man-pages</a> \
+    </div> \
+</div><!-- menuebox -->"
--- xymon-4.3.0~beta2.dfsg.orig/debian/compat
+++ xymon-4.3.0~beta2.dfsg/debian/compat
@@ -1 +1 @@
-4
+7
--- xymon-4.3.0~beta2.dfsg.orig/debian/rules
+++ xymon-4.3.0~beta2.dfsg/debian/rules
@@ -1,27 +1,18 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-# Must be exported
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
 	CFLAGS += -O2
 endif
 
-Makefile: configure
+Makefile: configure $(QUILT_STAMPFN)
 	dh_testdir
 	# Add here commands to configure the package.
 	USEHOBBITPING=y \
@@ -47,121 +38,136 @@
 	INSTALLEXTDIR=/usr/lib/hobbit/server/ext \
 	INSTALLTMPDIR=/var/lib/hobbit/tmp \
 	INSTALLWWWDIR=/var/lib/hobbit/www \
-	./configure
+	./configure --server \
+	--pcrelib /usr/lib/$(DEB_HOST_MULTIARCH) \
+	--ssllib /usr/lib/$(DEB_HOST_MULTIARCH) \
+	--ldaplib /usr/lib/$(DEB_HOST_MULTIARCH)
 
 build: build-stamp
-
-build-stamp:  Makefile
+build-stamp: Makefile
 	dh_testdir
 
-	# Add here commands to compile the package.
-	PKGBUILD=1 $(MAKE)
+	# Parallel building does not work as of 4.3.0~beta2
+	PKGBUILD=1 $(MAKE) -j1
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean 
+	debconf-updatepo
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	PKGBUILD=1 INSTALLROOT=$(CURDIR)/debian/hobbit/ $(MAKE) install
-	cd $(CURDIR)/debian/hobbit/usr/bin && ln -s ../lib/hobbit/server/bin/{bb,bbcmd} .
-	cd $(CURDIR)/debian/hobbit/usr/lib/hobbit/client && mv etc/hobbitclient.cfg $(CURDIR)/debian/hobbit/etc/hobbit && rm -rf $(CURDIR)/debian/hobbit/usr/lib/hobbit/client/etc && ln -s ../../../../etc/hobbit etc
-	cd $(CURDIR)/debian/hobbit/usr/lib/hobbit/client && rmdir logs && ln -s ../../../../var/log/hobbit logs
-	cd $(CURDIR)/debian/hobbit/usr/lib/hobbit/client && rmdir tmp  && ln -s ../../../../var/lib/hobbit/tmp tmp
+S=$(CURDIR)/debian/xymon
+C=$(CURDIR)/debian/xymon-client
 
+install-clean:
+	dh_prep
 
-install-client: build
+install: install-server install-client
+install-server: build install-clean
+	#################### Installing server ########################
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	PKGBUILD=1 INSTALLROOT=$(CURDIR)/debian/hobbit-client/ $(MAKE) install-client
-	cp debian/hobbit-client.default $(CURDIR)/debian/hobbit-client/etc/default/hobbit-client
-	mkdir -p $(CURDIR)/debian/hobbit-client/var/log/hobbit
-	mkdir -p $(CURDIR)/debian/hobbit-client/etc/hobbit
-	cd $(CURDIR)/debian/hobbit-client/usr/lib/hobbit/client && mv etc/* $(CURDIR)/debian/hobbit-client/etc/hobbit && rmdir etc && ln -s ../../../../etc/hobbit etc
-	cd $(CURDIR)/debian/hobbit-client/usr/lib/hobbit/client && rmdir logs && ln -s ../../../../var/log/hobbit logs
-	cd $(CURDIR)/debian/hobbit-client/usr/lib/hobbit/client && rmdir tmp && ln -s ../../../../tmp tmp
-	mv $(CURDIR)/debian/hobbit-client/usr/lib/hobbit/client/etc/hobbitclient.cfg /tmp/hobbitclient.cfg.$$
-	cat /tmp/hobbitclient.cfg.$$ | sed -e 's!^BBDISP=.*!include /var/run/hobbitclient-runtime.cfg!' | grep -v "^BBDISPLAYS=" >$(CURDIR)/debian/hobbit-client/usr/lib/hobbit/client/etc/hobbitclient.cfg
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+	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 . && \
+		rm -rf 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
 
-hobbit: DH_OPTIONS=--package=hobbit
-hobbit: build install
+install-client: build install-clean
+	#################### Installing client ########################
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs Changes
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-	dh_installdebconf	
-	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-#	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	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
+ifneq (,$(findstring kfreebsd,$(shell dpkg --print-architecture)))
+	# kfreebsd support
+	install -m644 debian/kfreebsd.cfg $C/etc/hobbit/hobbitclient.d/kfreebsd.cfg
+else
+	# no kfreebsd support
+endif
 
-hobbit-client: DH_OPTIONS=--package=hobbit-client
-hobbit-client: build install-client
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs Changes
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-	dh_installdebconf	
-	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-#	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+binary: binary-arch binary-indep
 
-binary-arch: hobbit hobbit-client
+binary-indep:
+	#################### Building dummy packages ########################
+	dh_testdir -i
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_compress -i
+	dh_gencontrol -i
+	dh_builddeb -i
+
+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
+	# ignore missing dh_lintian for older dh versions
+	-dh_lintian -a
+	# move some files into the client package
+	dh_movefiles --sourcedir=debian/xymon -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
+	# use the old file names for now
+	dh_installlogrotate --name=hobbit-client -a
+	dh_installinit --name=hobbit -p'xymon' -- defaults 98 02
+	dh_installinit --name=hobbit-client -p'xymon-client' -- 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
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install install-server install-client
--- xymon-4.3.0~beta2.dfsg.orig/debian/changelog
+++ xymon-4.3.0~beta2.dfsg/debian/changelog
@@ -1,80 +1,314 @@
-hobbit (4.3.0-0.beta2) unstable; urgency=low
+xymon (4.3.0~beta2.dfsg-9.1ubuntu0.1) precise-security; urgency=low
 
-  * Xymon version 4.3.0 BETA 2
+  * SECURITY UPDATE: Multiple cross site scripting (XSS) vulnerabilities
+    (LP: #1092412)
+    - debian/patches/7-CVE-2011-1716.patch: show user input as html quoted
+      output. Based on upstream changes.
+    - CVE-2011-1716 
 
-  Core changes:
-  * New API's for loadhosts and sendmessage, in preparation for
-    the full 5.0 changes.
-  * Always use getcurrenttime() instead of time().
-  * Support for defining holidays as non-working days in alerts and
-    SLA calculations.
-  * Hosts which appear on multiple pages in the web display can
-    use any page they are on in the alerting rules and elsewhere.
-  * Worker modules (RRD, client-data parsers etc) can operate on
-    remote hosts from the hobbitd daemon, for load-sharing.
-  * Various bugfixes collected over time.
-  * New client support: z/OS, z/VSE and z/VM.
-
-  Network test changes:
-  * Merged new network tests from trunk: SOAP-over-HTTP,
-    SSL minimum cipher strength
-  * Changed network test code to always report a validity period
-    for network tests, so it it possible to run network tests less
-    often than every 30 minutes (e.g. once an hour).
-  * Make the content-type setting in HTTP POST tests configurable.
-  * Make the source-address used for TCP tests configurable.
-  * Make the acceptable HTTP result codes configurable.
-  * Use and save HTTP session cookies.
-
-  Web changes
-  * Support generic drop-down lists in templates.
-  * "NOCOLUMNS" changed to work for all columns.
-  * New "group-sorted" definition to auto-sort hosts in a group
-  * Use browser tooltips for host comments
-  * "Compact" status allows several statuses to appear as a single
-    status on the overview webpages.
-  * Trends page can select the time period to show. Buttons provided
-    for the common selections.
-  * Ghost list report now lists possible candidates for a ghost,
-    based on IP-address or unqualified hostname.
-  * Enhanced eventlog and top-changing hosts webpage
-
-  Report changes
-  * Number of outages as SLA parameter
-
-  Miscellaneous
-  * hobbitlaunch support for running tasks only on certain hosts,
-    and for a maximum time.
-
- -- Henrik Stoerner <henrik@hswn.dk>  Fri, 24 May 2009 10:39:00 +0200
-
-hobbit (4.2.3-1) unstable; urgency=low
-
-  * Xymon version 4.2.3 release
-  * Time-out code changed to use clock_gettime() with CLOCK_MONOTONIC
-  * Bugfix for hobbitd/hobbitd_worker communication going out-of-sync
-    resulting in "garbled data" being logged and worker modules 
-    stopping.
-  * NCV module now works with negative numbers.
-  * Several bugfixes in DNS lookup code - could lead to crashes when
-    performing DNS tests.
-  * Switch to C-ARES 1.6.0 - drop support for older versions.
-  * Run more TCP tests in parallel by not waiting for very slow
-    connections to complete before starting new ones.
-  * Added "hostlist" web utility for spreadsheet-reporting of the
-    hosts in Hobbit.
-
- -- Henrik Stoerner <henrik@hswn.dk>  Mon, 09 Feb 2009 10:46:00 +0100
-
-hobbit (4.2.2-1) unstable; urgency=low
-
-  * Xymon version 4.2.2: 4.2.0 plus all-in-one patch
-  * BBWin support added
-  * Project renamed to "Xymon" - preliminary changes in
-    documents and web templates, but no filename changes.
+ -- Christian Kuersteiner <ckuerste@gmx.ch>  Sun, 23 Dec 2012 14:08:54 +0700
 
- -- Henrik Stoerner <henrik@hswn.dk>  Thu, 28 Sep 2008 14:52:00 +0100
+xymon (4.3.0~beta2.dfsg-9.1) unstable; urgency=low
 
+  * Non-maintainer upload.
+  * Fix "FTBFS: PCRE not found": patch from Ubuntu / Steve Langasek:
+    - debian/rules: pass --pcrelib to find libpcre in the multiarch dir
+      LP: #749190.
+    Additionally build-depend on dpkg-dev (>= 1.16.0) and
+    libpcre3-dev (>= 8.12-4~). (Closes: #651231)
+  * Since this Ubuntu patch, SSL and LDAP also went multiarch, so:
+    - also pass --ssllib and --ldaplib to configure in debian/rules
+    - build-depend on libssl-dev (>= 1.0.0e-1~) and libldap2-dev (>= 2.4.25-2~)
+  * libpng also went multiarch, so build/rrd.sh doesn't find it, and there's
+    no option for configure. Add patch png-multiarch that changes build/rrd.sh
+    to use libpng12-config instead of guessing.
+
+ -- gregor herrmann <gregoa@debian.org>  Mon, 26 Dec 2011 23:40:38 +0100
+
+xymon (4.3.0~beta2.dfsg-9) unstable; urgency=low
+
+  [ Axel Beckert ]
+  * Change SF project name from hobbitmon to xymon in debian/watch.
+
+  [ Christoph Berg ]
+  * Remove transitional packages hobbit and hobbit-client.
+  * Add /run to the default tmpfs ignore list in hobbit-clients.cfg.
+    (Closes: #633061)
+  * Move hobbit HOME to /var/lib/hobbit (does not affect existing
+    installations). (Closes: #608787)
+
+ -- Christoph Berg <myon@debian.org>  Fri, 08 Jul 2011 10:54:50 +0200
+
+xymon (4.3.0~beta2.dfsg-8) unstable; urgency=low
+
+  * libssl1.0.0 removes SSLv2_client_method(), stop using it and document in
+    bb-hosts(5) that testing "https2" will in fact use v3. (Closes: #621115)
+
+ -- Christoph Berg <myon@debian.org>  Tue, 12 Apr 2011 13:19:22 +0200
+
+xymon (4.3.0~beta2.dfsg-7) experimental; urgency=low
+
+  * Allow negative time offset (clock too fast) in clock.rrd. Patch by
+    Roland Rosenfeld. (Closes: #580493)
+  * Add postinst code to fix old clock.rrd files using rrdtool.
+  * Fix bbcombotest: "Could not access hobbitd board, error 0".
+  * Debconf translation: Danish by Joe Hansen, thanks! (Closes: #605324)
+
+ -- Christoph Berg <myon@debian.org>  Sun, 05 Dec 2010 12:21:01 +0100
+
+xymon (4.3.0~beta2.dfsg-6) unstable; urgency=low
+
+  * Support GNU/kFreeBSD by adding a Makefile and a config snippet that
+    pretends we are running on Linux. (Closes: #458417)
+  * Tweak hobbitclient-linux.sh to report 'df' data without /proc/filesystems
+    mounted.
+
+ -- Christoph Berg <myon@debian.org>  Fri, 09 Apr 2010 00:17:03 +0200
+
+xymon (4.3.0~beta2.dfsg-5) unstable; urgency=low
+
+  * Add HTMLCHARSET headers to all html pages generated.
+
+ -- Christoph Berg <myon@debian.org>  Tue, 19 Jan 2010 12:08:47 +0100
+
+xymon (4.3.0~beta2.dfsg-4) unstable; urgency=low
+
+  * Japanese debconf translation, thanks Hideki Yamane. (Closes: #558065)
+  * Fix bashism in hobbitclient-linux.sh, thanks Raphael Geissert.
+    (Closes: #530227)
+  * Ignore apache2 reload errors in postinst. Suggested by Giacomo Catenazzi.
+    (Closes: #528195)
+
+ -- Christoph Berg <myon@debian.org>  Wed, 02 Dec 2009 14:18:48 +0100
+
+xymon (4.3.0~beta2.dfsg-3) unstable; urgency=low
+
+  * Fix SPLITNCV rrd generation.
+  * Czech debconf translation added, thanks Martin Šín. (Closes: #535029)
+  * Update Build-Depends to librrd-dev, dropping Sarge support.
+  * Bump Standards-Version and DH compat level.
+
+ -- Christoph Berg <myon@debian.org>  Sun, 16 Aug 2009 14:32:56 +0200
+
+xymon (4.3.0~beta2.dfsg-2) unstable; urgency=low
+
+  * Mangle upstream version number in watch file.
+  * Really fix librrd dependency. Thanks to Achim Schaefer for spotting.
+    (Again Closes: #521045)
+  * Once again a patch for using LDAP_DEPRECATED from dann frazier, now
+    for the build/ directory. Thanks! (Closes: #526176)
+  * Removing Martin from Uploaders.
+
+ -- Christoph Berg <myon@debian.org>  Thu, 30 Apr 2009 16:22:10 +0200
+
+xymon (4.3.0~beta2.dfsg-1) unstable; urgency=low
+
+  * New upstream release candidate. (Closes: #497819, #511560)
+  * Rebuilding fixes librrd dependency. (Closes: #521045)
+  * Forbid parallel building.
+  * init scripts create /var/run/hobbit if missing. By Axel Beckert.
+  * init scripts properly support 'status'. By Peter Eisentraut.
+    (Closes: #525347)
+  * Uploading to unstable, and adding transitional packages replacing hobbit
+    and hobbit-client.
+
+ -- Christoph Berg <myon@debian.org>  Tue, 28 Apr 2009 12:49:05 +0200
+
+xymon (4.2.3~rc1.dfsg-1) experimental; urgency=low
+
+  * New upstream release candidate.
+
+ -- Christoph Berg <myon@debian.org>  Thu, 12 Feb 2009 16:25:24 +0100
+
+xymon (4.2.2.dfsg-2) experimental; urgency=low
+
+  * Add "IFEXIST" patch to hobbit-clients.cfg/files test. By Bernd Zeimetz.
+
+ -- Christoph Berg <myon@debian.org>  Mon, 19 Jan 2009 17:11:51 +0100
+
+xymon (4.2.2.dfsg-1) experimental; urgency=low
+
+  * Hobbit was renamed to Xymon (pronounced 'simon'). We only rename the
+    packages for now, most of the filenames stay the same.
+    http://www.hswn.dk/hobbiton/2008/11/msg00123.html
+  * New upstream version mostly consisting of the "all-in-one" patch and
+    support for BBWin clients.
+  * Remove patches that went upstream: bbgen_ASN1_UTCTIME, disk-linecount,
+    http-proxy-url, ldap-deprecated, ncv-ignoretext.patch.
+  * Known issue: only the first dns test for a host works.
+
+ -- Christoph Berg <myon@debian.org>  Thu, 15 Jan 2009 09:55:18 +0100
+
+hobbit (4.2.0.dfsg-16) unstable; urgency=low
+
+  * Spanish debconf translation, thanks Enrique Monge. (Closes: #505206)
+
+ -- Christoph Berg <myon@debian.org>  Mon, 10 Nov 2008 17:31:58 +0100
+
+hobbit (4.2.0.dfsg-15) unstable; urgency=medium
+
+  * bbnet/contest.c: Do not crash on long-living SSL certs. (Closes: #503111)
+
+ -- Christoph Berg <myon@debian.org>  Sat, 25 Oct 2008 14:04:35 +0200
+
+hobbit (4.2.0.dfsg-14) unstable; urgency=low
+
+  * Swedish debconf translation, thanks Martin Ågren. (Closes: #491368)
+
+ -- Christoph Berg <myon@debian.org>  Sat, 19 Jul 2008 01:24:50 +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 <myon@debian.org>  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 <myon@debian.org>  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 <myon@debian.org>  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 <myon@debian.org>  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 <myon@debian.org>  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 <myon@debian.org>  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 <myon@debian.org>  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 <myon@debian.org>  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 <myon@debian.org>  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 <myon@debian.org>  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 <myon@debian.org>  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 <myon@debian.org>  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 <myon@debian.org>  Sat, 18 Aug 2007 22:05:09 +0200
 
 hobbit (4.2.0-1) unstable; urgency=low
 
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon-client.postinst
+++ xymon-4.3.0~beta2.dfsg/debian/xymon-client.postinst
@@ -0,0 +1,73 @@
+#! /bin/sh
+# postinst script for hobbit
+#
+# see: dh_installdeb(1)
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# 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/lib/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
--- xymon-4.3.0~beta2.dfsg.orig/debian/init-common.sh
+++ xymon-4.3.0~beta2.dfsg/debian/init-common.sh
@@ -0,0 +1,55 @@
+# 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
+
+	if ! [ -d /var/run/hobbit ] ; then
+		mkdir /var/run/hobbit
+		chown hobbit:hobbit /var/run/hobbit
+	fi
+
+	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
+}
--- xymon-4.3.0~beta2.dfsg.orig/debian/kfreebsd.cfg
+++ xymon-4.3.0~beta2.dfsg/debian/kfreebsd.cfg
@@ -0,0 +1,4 @@
+# To make the xymon client work on Debian GNU/kFreeBSD, we pretend to be
+# running on Linux
+BBOSSCRIPT="hobbitclient-linux.sh"
+BBOSTYPE="linux"
--- xymon-4.3.0~beta2.dfsg.orig/debian/hobbit-client.default.dist
+++ xymon-4.3.0~beta2.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=""
--- xymon-4.3.0~beta2.dfsg.orig/debian/README.Debian
+++ xymon-4.3.0~beta2.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 <myon@debian.org>  Thu, 16 Aug 2007 00:07:40 +0200
--- xymon-4.3.0~beta2.dfsg.orig/debian/copyright
+++ xymon-4.3.0~beta2.dfsg/debian/copyright
@@ -1,13 +1,134 @@
 This package was debianized by Henrik Stoerner <henrik@hswn.dk> on
 Sun,  6 Mar 2005 21:58:45 +0100.
 
-It was downloaded from http://sourceforge.net/projects/hobbitmon/
+The current debianization is based on Henrik's and was done by Christoph Berg
+<myon@debian.org> on Wed, 15 Aug 2007 21:09:40 +0200.
 
-Copyright: Henrik Stoerner <henrik@hswn.dk>
+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 <henrik@hswn.dk>
 
-License: GNU GPL
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
+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.
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon.preinst
+++ xymon-4.3.0~beta2.dfsg/debian/xymon.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
--- xymon-4.3.0~beta2.dfsg.orig/debian/control
+++ xymon-4.3.0~beta2.dfsg/debian/control
@@ -1,35 +1,45 @@
-Source: hobbit
+Source: xymon
 Section: net
-Priority: optional
-Maintainer: Henrik Stoerner <henrik@hswn.dk>
-Build-Depends: debhelper (>= 4.0.0), librrd2-dev, libssl-dev, libldap2-dev, libpcre3-dev, fping
-Standards-Version: 3.6.1
+Priority: extra
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Christoph Berg <myon@debian.org>
+Build-Depends: debhelper (>= 7), librrd-dev, 
+ libssl-dev (>= 1.0.0e-1~), libldap2-dev (>= 2.4.25-2~), libpcre3-dev (>= 8.12-4~),
+ imagemagick, po-debconf, quilt (>= 0.40), dpkg-dev (>= 1.16.0)
+Standards-Version: 3.9.2
+Vcs-Git: git://git.debian.org/collab-maint/xymon.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/xymon.git
+Homepage: http://hobbitmon.sourceforge.net/
 
-Package: hobbit
+Package: xymon
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: hobbit (<< 4.2.2)
+Provides: hobbit
+Replaces: hobbit (<< 4.2.2)
+Depends: xymon-client, ${shlibs:Depends}, ${misc:Depends}
+Suggests: rrdtool
 Description: monitoring system for systems, networks and applications
  Xymon (previously called 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.
+ 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.
  .
- Xymon has a great deal of inspiration from the non-free Big Brother 
+ Xymon has a great deal of inspiration from the non-free Big Brother
  package, but does not include any Big Brother code.
 
-Package: hobbit-client
+Package: xymon-client
 Architecture: any
-Conflicts: hobbit
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: hobbit (<= 4.2.0-1), hobbit-client (<< 4.2.2)
+Provides: hobbit-client
+Replaces: hobbit-client (<< 4.2.2)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base
+Suggests: xymon-plugins | hobbit-plugins
 Description: client for the Xymon network monitor
- Client data collection package for Xymon (previously 
- known as Hobbit). This gathers statistics and data from 
- a single system and reports it to the Xymon monitor. 
- You should run this on all systems if you have a Xymon 
- server installed.
-
+ Client data collection package for Xymon (previously known as Hobbit).
+ This gathers statistics and data from a single system and reports it to
+ the Xymon monitor. You should run this on all systems if you have a
+ Xymon server installed.
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon.lintian-overrides
+++ xymon-4.3.0~beta2.dfsg/debian/xymon.lintian-overrides
@@ -0,0 +1,4 @@
+xymon: package-contains-empty-directory usr/lib/hobbit/server/download/
+#446982
+xymon: possibly-insecure-handling-of-tmp-files-in-maintainer-script preinst:30
+xymon: setuid-binary usr/lib/hobbit/server/bin/hobbitping 4755 root/root
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon-client.dirs
+++ xymon-4.3.0~beta2.dfsg/debian/xymon-client.dirs
@@ -0,0 +1,7 @@
+etc/default
+etc/hobbit/clientlaunch.d
+etc/hobbit/hobbitclient.d
+usr/bin
+usr/share/hobbit
+var/lib/hobbit/tmp
+var/log/hobbit
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon.NEWS
+++ xymon-4.3.0~beta2.dfsg/debian/xymon.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 <myon@debian.org>  Mon, 31 Dec 2007 10:47:56 +0100
--- xymon-4.3.0~beta2.dfsg.orig/debian/menu.css
+++ xymon-4.3.0~beta2.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;
+}
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon.install
+++ xymon-4.3.0~beta2.dfsg/debian/xymon.install
@@ -0,0 +1,2 @@
+debian/menu.css usr/share/hobbit/menu
+debian/menu.cfg etc/hobbit/web
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon.dirs
+++ xymon-4.3.0~beta2.dfsg/debian/xymon.dirs
@@ -0,0 +1,5 @@
+etc/apache2/conf.d
+etc/hobbit/hobbitlaunch.d
+etc/hobbit/hobbitgraph.d
+etc/hobbit/hobbitserver.d
+usr/share/hobbit
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon-client.files
+++ xymon-4.3.0~beta2.dfsg/debian/xymon-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/xymon.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
--- xymon-4.3.0~beta2.dfsg.orig/debian/xymon-client.hobbit-client.logrotate
+++ xymon-4.3.0~beta2.dfsg/debian/xymon-client.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
+}
+
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/eu.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/eu.po
@@ -0,0 +1,63 @@
+# 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 <pi@beobide.net>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit-templates\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-09-19 09:37+0200\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: Euskara <Librezale@librezale.org>\n"
+"Language: \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
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Hobbit zerbitzaria:"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-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
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Bezero ostalari izena:"
+
+#. Type: string
+#. Description
+#: ../xymon-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."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/fr.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/fr.po
@@ -0,0 +1,64 @@
+# Translation of hobbit debconf templates to French
+# Copyright (C) 2007 Geoffroy Youri Berret <mxondebian@free.fr>
+# This file is distributed under the same license as the hobbit package.
+#
+# Geoffroy Youri Berret <mxondebian@free.fr>, 2007.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-08-28 21:51-0700\n"
+"Last-Translator: Geoffroy Youri Berret <mxondebian@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Serveur hobbit :"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-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
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Nom d'hôte du client :"
+
+#. Type: string
+#. Description
+#: ../xymon-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."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/ja.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/ja.po
@@ -0,0 +1,61 @@
+# Japanese translation of xymon debconf templates.
+# Copyright (C) 2009 Hideki Yamane <henrich@debian.or.jp>
+# This file is distributed under the same license as xymon package.
+# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xymon 4.3.0~beta2.dfsg-3\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2009-11-07 06:52+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Hobbit サーバ:"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-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
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "クライアントのホスト名:"
+
+#. Type: string
+#. Description
+#: ../xymon-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 サーバにレポートを送信する際に使うホスト名を入力"
+"してください。この名前は Hobbit サーバ上の bb-hosts ファイルで使われている名"
+"前と一致している必要があります。"
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/POTFILES.in
+++ xymon-4.3.0~beta2.dfsg/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] xymon-client.templates
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/it.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/it.po
@@ -0,0 +1,62 @@
+# 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 <luca.mo@tiscali.it>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit debconf templates\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-09-22 10:09+0200\n"
+"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Server Hobbit:"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-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
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Nome host del client:"
+
+#. Type: string
+#. Description
+#: ../xymon-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."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/nl.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/nl.po
@@ -0,0 +1,63 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE 'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the  package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-10-26 14:23+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language: \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
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Hobbit-server:"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-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
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Computernaam van de client:"
+
+#. Type: string
+#. Description
+#: ../xymon-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."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/cs.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/cs.po
@@ -0,0 +1,61 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the xymon package.
+# Martin Sin <martin.sin@zshk.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xymon 4.3.0~beta2.dfsg-2\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2009-06-29 07:18+0200\n"
+"Last-Translator: Martin Sin <martin.sin@zshk.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Server Hobbit:"
+
+#. Type: string
+#. Description
+#: ../xymon-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 ""
+"Zadejte prosím síťovou adresu serveru/serverů Hobbit. Pokud chcete použít "
+"více serverů, oddělte je pomocí mezery."
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"Použití jmen počítačů místo IP adresy není doporučeno, zejména pokud může "
+"dojít k selhání serveru DNS."
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Jméno klienta:"
+
+#. Type: string
+#. Description
+#: ../xymon-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 ""
+"Zadejte prosím jméno klienta Hobbit, které bude použito při zasílání zpráv "
+"na server Hobbit. Jméno musí odpovídat tomu, které je použito v souboru bb-"
+"hosts na serveru Hobbit."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/es.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/es.po
@@ -0,0 +1,86 @@
+# hobbit translation to spanish
+# Copyright (C) 2008 Software in the Public Interest, SPI Inc.
+# This file is distributed under the same license as the hobbit package.
+#
+# Changes:
+# 	- Initial translation
+# 		Enrique Monge <emonge@debian.org.sv> , 2008
+#
+# Traductores, si no conoce el formato PO, merece la pena leer la 
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# 	info -n '(gettext)PO Files'
+# 	info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# 	- El proyecto de traducción de Debian al español
+# 	http://www.debian.org/intl/spanish/
+# 	especialmente las notas y normas de traducción en
+# 	http://www.debian.org/intl/spanish/notas
+#
+# 	 - La guía de traducción de po's de debconf:
+# 	/usr/share/doc/po-debconf/README-trans
+# 	o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Si tiene dudas o consultas sobre esta traducción consulte con el último
+# traductor (campo Last-Translator) y ponga en copia a la lista de
+# traducción de Debian al español (<debian-l10n-spanish@lists.debian.org>)
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit 4.2.0.dfsg-14\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2008-10-24 09:39-0600\n"
+"Last-Translator: Enrique Monge <emonge@debian.org.sv>\n"
+"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Servidor «Hobbit»:"
+
+#. Type: string
+#. Description
+#: ../xymon-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 ""
+"Ingrese la dirección de red para acceder al servidor(es) «Hobbit». Si usa "
+"varios servidores, use un espacio para separar la lista de direcciones."
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"Usar los nombres de equipo en lugar de direcciones IP no es recomendable en "
+"caso que la red experimente fallos de DNS."
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Nombre del cliente"
+
+#. Type: string
+#. Description
+#: ../xymon-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 ""
+"Introduzca el nombre del equipo que utilizará el cliente para enviar "
+"reportes al servidor «Hobbit». Este nombre debe coincidir con el nombre "
+"usado en el fichero «bb-hosts» en el servidor «Hobbit»."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/pt.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/pt.po
@@ -0,0 +1,63 @@
+# 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 <a_monteiro@netcabo.pt>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit 4.2.0.dfsg-4\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-09-19 18:22+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: pt\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
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Servidor Hobbit:"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-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
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Nome da máquina cliente:"
+
+#. Type: string
+#. Description
+#: ../xymon-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."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/sv.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/sv.po
@@ -0,0 +1,64 @@
+# translation of hobbit_4.2.0.dfsg-13_sv.po to Swedish
+# Copyright (C) 2008
+# This file is distributed under the same license as the hobbit package.
+#
+# Martin Ågren <martin.agren@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit_4.2.0.dfsg-13_sv\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2008-07-18 23:44+0200\n"
+"Last-Translator: Martin Ågren <martin.agren@gmail.com>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
+"Language: sv\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=2; plural=(n != 1);\n"
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Hobbitserver:"
+
+#. Type: string
+#. Description
+#: ../xymon-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 ""
+"Var vänlig skriv in den nätverksadress som används för att ansluta till "
+"Hobbitservern/-servrarna. Om du använder flera servrar, separera adresserna "
+"med blanksteg."
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"Användande av värdnamn istället för IP-adresser är inte rekommenderat ifall "
+"nätverket upplever DNS-problem."
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Klientens värdnamn:"
+
+#. Type: string
+#. Description
+#: ../xymon-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 ""
+"Var vänlig ange det värdnamn som används av Hobbitklienten för att sända "
+"rapporter till Hobbitservern. Detta namn måste stämma överens med det namn "
+"som används i bb-hosts-filen på Hobbitservern."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/pt_BR.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/pt_BR.po
@@ -0,0 +1,64 @@
+# 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) <faw@debian.org>, 2007.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit (20071005)\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-10-05 02:10-0300\n"
+"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
+"Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"Language: \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
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Servidor Hobbit:"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-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
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Nome da máquina cliente:"
+
+#. Type: string
+#. Description
+#: ../xymon-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."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/da.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/da.po
@@ -0,0 +1,61 @@
+# Danish translation xymon.
+# Copyright (C) 2010 xymon & nedenstående oversættere.
+# This file is distributed under the same license as xymon package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xymon\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2010-12-05 12:28+0100\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Hobbitserver:"
+
+#. Type: string
+#. Description
+#: ../xymon-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 ""
+"Indtast venligst netværksadressen brugt til at tilgå Hobbitserveren. Hvis du "
+"bruger flere servere, så brug en mellemrumsadskilt liste for adresserne."
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"Brug af værtsnavne i steden for IP-adresser frarådes i tilfælde af at "
+"netværket oplever DNS-fejl."
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Klientværtsnavn:"
+
+#. Type: string
+#. Description
+#: ../xymon-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 ""
+"Indtast venligst værtsnavnet brugt af Hobbitklienten, når der indsendes "
+"rapporter til Hobbitserveren. Dette navn skal svare til navnet brugt i bb-"
+"hosts-filen på Hobbitserveren."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/de.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/de.po
@@ -0,0 +1,61 @@
+# hobbit
+# Copyright (C) 2007
+# This file is distributed under the same license as the hobbit package.
+# Christoph Berg <myon@debian.org>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-10-08 22:50+0200\n"
+"Last-Translator: Christoph Berg <myon@debian.org>\n"
+"Language-Team: debian-l10n-german <debian-l10n-german@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Hobbit-Server:"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-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
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Client-Hostname:"
+
+#. Type: string
+#. Description
+#: ../xymon-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."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/fi.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/fi.po
@@ -0,0 +1,59 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: debconf: hobbit\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-09-19 17:49+0200\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"Language: fi\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
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Hobbit-palvelin:"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-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
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Asiakaskoneen verkkonimi:"
+
+#. Type: string
+#. Description
+#: ../xymon-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."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/vi.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/vi.po
@@ -0,0 +1,62 @@
+# Vietnamese translation for Hobbit.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-09-19 18:20+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\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"
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Máy phục vụ Hobbit:"
+
+#. Type: string
+#. Description
+#: ../xymon-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 ""
+"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."
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+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."
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Tên máy khách:"
+
+#. Type: string
+#. Description
+#: ../xymon-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 ""
+"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."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/gl.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/gl.po
@@ -0,0 +1,61 @@
+# Galician translation of hobbit's debconf templates
+# This file is distributed under the same license as the hobbit package.
+# Jacobo Tarrio <jtarrio@debian.org>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-09-30 18:53+0100\n"
+"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
+"Language: gl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Servidor Hobbit:"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-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
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Nome do cliente:"
+
+#. Type: string
+#. Description
+#: ../xymon-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."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/ta.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/ta.po
@@ -0,0 +1,62 @@
+# 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 <agnihot3@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: hobbit\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-09-19 14:53+0530\n"
+"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
+"Language-Team: TAMIL <ubuntu-l10n-tam@lists.ubuntu.com>\n"
+"Language: \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
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "ஹாபிட் சேவையகம்:"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+"டிஎன்எஸ் தோல்விகளால் ஐபி முகவரிக்கு பதிலாக புரவன் பெயரை பயன்படுத்தாமை "
+"பரிந்துரைக்கப்படுகிறது. "
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "சார்ந்தோன் புரவன் பெயர்:"
+
+#. Type: string
+#. Description
+#: ../xymon-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  கோப்பில் உள்ள "
+"பெயருடன் ஒத்துப்போக வேண்டும்."
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/templates.pot
+++ xymon-4.3.0~beta2.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 <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-client.templates:2001
+msgid ""
+"Using host names instead of IP addresses is discouraged in case the network "
+"experiences DNS failures."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../xymon-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 ""
--- xymon-4.3.0~beta2.dfsg.orig/debian/po/ru.po
+++ xymon-4.3.0~beta2.dfsg/debian/po/ru.po
@@ -0,0 +1,65 @@
+# 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 <kozlov.y@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: 4.2.0.dfsg-4\n"
+"Report-Msgid-Bugs-To: xymon@packages.debian.org\n"
+"POT-Creation-Date: 2009-01-08 15:38+0100\n"
+"PO-Revision-Date: 2007-09-24 20:46+0400\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"Language: ru\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
+#: ../xymon-client.templates:2001
+msgid "Hobbit server:"
+msgstr "Сервер Hobbit:"
+
+#. Type: string
+#. Description
+#: ../xymon-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
+#: ../xymon-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
+#: ../xymon-client.templates:3001
+msgid "Client hostname:"
+msgstr "Имя клиента:"
+
+#. Type: string
+#. Description
+#: ../xymon-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."
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/hobbitgraph.mailq
+++ xymon-4.3.0~beta2.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
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/hobbitvars
+++ xymon-4.3.0~beta2.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 Xymon pages - http://www.foo.com/bb
+ BBWEBHTMLLOGS="$BBWEBHOSTURL/html"		# Prefix for the Xymon HTML logs (only if BBLOGSTATUS=STATIC)
+ BBWEB="$BBSERVERWWWURL"				# Xymon URL prefix without the host part
+-BBSKIN="$BBSERVERWWWURL/gifs"			# Xymon URL prefix for the GIF files
++BBSKIN="$BBSERVERWWWURL/gifs/static"		# Xymon URL prefix for the GIF files
+ BBHELPSKIN="$BBSERVERWWWURL/help"               # Xymon URL prefix for the online help files.
+ BBNOTESSKIN="$BBSERVERWWWURL/notes"             # Xymon URL prefix for the online notes-files.
++include /etc/hobbit/web/menu.cfg
+ BBMENUSKIN="$BBSERVERWWWURL/menu"               # Xymon URL prefix for the webpage menu files.
+ BBREPURL="$BBSERVERWWWURL/rep"			# Xymon URL prefix for the Xymon availability reports
+ BBSNAPURL="$BBSERVERWWWURL/snap"		# Xymon URL prefix for the Xymon snapshots
+@@ -69,7 +69,7 @@ SECURECGIBINURL="$BBSERVERSECURECGIURL"	
+ 
+ # Locations of system-wide files and directories
+ BBHOME="@BBHOME@"				# The Xymon 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@/"
+ <Directory "@INSTALLWWWDIR@">
+     Options Indexes FollowSymLinks Includes MultiViews
+     Order allow,deny
+-    Allow from all
++    Allow from localhost ::1/128
+ </Directory>
+ 
+ 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
+ </Directory>
+ 
+--- a/hobbitd/etcfiles/hobbit-apache-secure.DIST
++++ b/hobbitd/etcfiles/hobbit-apache-secure.DIST
+@@ -15,7 +15,7 @@ Alias @BBHOSTURL@/  "@INSTALLWWWDIR@/"
+ <Directory "@INSTALLWWWDIR@">
+     Options Indexes FollowSymLinks Includes MultiViews
+     Order allow,deny
+-    Allow from all
++    Allow from localhost ::1/128
+ </Directory>
+ 
+ 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
+ </Directory>
+ 
+ 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
+@@ -1868,3 +1868,4 @@
+          GPRINT:pct:AVERAGE: \: %3.1lf (avg)\n
+ # End of System z graph definitions
+ 
++include /var/run/hobbit/hobbitgraph-include.cfg
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/doc-paths
+++ xymon-4.3.0~beta2.dfsg/debian/patches/doc-paths
@@ -0,0 +1,59 @@
+--- a/docs/hobbit-apacheconf.txt
++++ b/docs/hobbit-apacheconf.txt
+@@ -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/"
+-<Directory "/usr/local/hobbit/server/www/">
++Alias /hobbit/  "/usr/lib/hobbit/server/www/"
++<Directory "/usr/lib/hobbit/server/www/">
+     Options Indexes FollowSymLinks Includes MultiViews
+     Order allow,deny
+     Allow from all
+ </Directory>
+ 
+-ScriptAlias /hobbit-cgi/ "/usr/local/hobbit/cgi-bin/"
+-<Directory "/usr/local/hobbit/cgi-bin">
++ScriptAlias /hobbit-cgi/ "/usr/lib/hobbit/cgi-bin/"
++<Directory "/usr/lib/hobbit/cgi-bin">
+     AllowOverride None
+     Options ExecCGI Includes
+     Order allow,deny
+     Allow from all
+ </Directory>
+ 
+-ScriptAlias /hobbit-seccgi/ "/usr/local/hobbit/cgi-secure/"
+-<Directory "/usr/local/hobbit/cgi-secure">
++ScriptAlias /hobbit-seccgi/ "/usr/lib/hobbit/cgi-secure/"
++<Directory "/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
+--- a/docs/install.html
++++ b/docs/install.html
+@@ -163,7 +163,7 @@ directory (recommended for better securi
+ password-file that controls access to this directory. Use the <tt>htpasswd</tt>
+ command both to create the password file and to add or delete users:<br>
+ <pre><tt>
+-	# /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
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/kfreebsd-makefile
+++ xymon-4.3.0~beta2.dfsg/debian/patches/kfreebsd-makefile
@@ -0,0 +1,54 @@
+--- /dev/null
++++ b/build/Makefile.GNU_kFreeBSD
+@@ -0,0 +1,27 @@
++# bbgen compile-time settings for GNU/kFreeBSD systems
++
++OSDEF =
++
++# NETLIBS: None needed on Linux
++NETLIBS =
++
++# Compile flags for normal build
++CC = gcc
++CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF)
++
++ifndef PKGBUILD
++RPATH = -Wl,--rpath,
++endif
++
++# Compile flags for debugging
++# CFLAGS = -g -DDEBUG -Wall -D_REENTRANT $(LFSDEF) $(OSDEF)
++
++# By default, Hobbit uses a static library for common code.
++# To save some diskspace and run-time memory, you can use a
++# shared library by un-commenting this.
++# HOBBITLIBRARY=libhobbit.so
++
++# Mail program: This must support "CMD -s SUBJECT ADDRESS" to send out a mail with a subject
++# Typically, this will be "mail" or "mailx"
++MAILPROGRAM="mail"
++
+--- a/configure.server
++++ b/configure.server
+@@ -471,16 +471,17 @@ echo "# Large File Support settings"
+ echo "LFSDEF = $LFS"                     >>Makefile
+ 
+ echo "" >>Makefile
+-if test -r build/Makefile.`uname -s`
++if test -r build/Makefile.`uname -s | tr '/' '_'`
+ then
+-	echo "include build/Makefile.`uname -s`" >>Makefile
++	# use sinclude here so "clean" works even when build/Makefile.GNU_kFreeBSD is not patched yet
++	echo "sinclude build/Makefile.`uname -s | tr '/' '_'`" >>Makefile
+ 	echo ""
+-	echo "Using `uname -s` Makefile settings"
++	echo "Using `uname -s | tr '/' '_'` Makefile settings"
+ 	echo ""
+ else
+ 	echo "include build/Makefile.generic" >>Makefile
+ 	echo ""
+-	echo "Using GENERIC Makefile settings"
++	echo "Using GENERIC Makefile settings (uname -s is `uname -s`)"
+ 	echo ""
+ 	echo "If this fails, change the compile settings in Makefile"
+ 	echo ""
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/htmlcontenttype
+++ xymon-4.3.0~beta2.dfsg/debian/patches/htmlcontenttype
@@ -0,0 +1,313 @@
+--- a/hobbitd/webfiles/acknowledge_header
++++ b/hobbitd/webfiles/acknowledge_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ 
+ <TITLE>Xymon - Acknowledge Alert</TITLE>
+ 
+--- a/hobbitd/webfiles/bb2_header
++++ b/hobbitd/webfiles/bb2_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="REFRESH" CONTENT="60">
+ <META HTTP-EQUIV="EXPIRES" CONTENT="Sat, 01 Jan 2001 00:00:00 GMT">
+ <TITLE>&BBBACKGROUND : Xymon - Status @ &BBDATE</TITLE>
+--- a/hobbitd/webfiles/bb_header
++++ b/hobbitd/webfiles/bb_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="REFRESH" CONTENT="60">
+ <META HTTP-EQUIV="EXPIRES" CONTENT="Sat, 01 Jan 2001 00:00:00 GMT">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="pagepath=&BBPAGEPATH; path=/">
+--- a/hobbitd/webfiles/bbnk_header
++++ b/hobbitd/webfiles/bbnk_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="REFRESH" CONTENT="60">
+ <META HTTP-EQUIV="EXPIRES" CONTENT="Sat, 01 Jan 2001 00:00:00 GMT">
+ <TITLE>&BBBACKGROUND : Xymon - Status @ &BBDATE</TITLE>
+--- a/hobbitd/webfiles/bbrep_header
++++ b/hobbitd/webfiles/bbrep_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="pagepath=&BBPAGEPATH; path=/">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="host=; path=/">
+ <TITLE>Xymon Availability Report : &BBDATE</TITLE>
+--- a/hobbitd/webfiles/bbsnap2_header
++++ b/hobbitd/webfiles/bbsnap2_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <TITLE>&BBBACKGROUND : Xymon - Snapshot</TITLE>
+ 
+ <!-- Styles for the menu bar -->
+--- a/hobbitd/webfiles/bbsnap_header
++++ b/hobbitd/webfiles/bbsnap_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="pagepath=&BBPAGEPATH; path=/">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="host=; path=/">
+ <TITLE>Xymon Snapshot Report : &BBDATE</TITLE>
+--- a/hobbitd/webfiles/bbsnapnk_header
++++ b/hobbitd/webfiles/bbsnapnk_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <TITLE>&BBBACKGROUND : Xymon - Snapshot @ &BBDATE</TITLE>
+ 
+ <!-- Styles for the menu bar -->
+--- a/hobbitd/webfiles/columndoc_header
++++ b/hobbitd/webfiles/columndoc_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <TITLE>&BBBACKGROUND : Xymon - Documentation</TITLE>
+ 
+ <!-- Styles for the menu bar -->
+--- a/hobbitd/webfiles/confreport_header
++++ b/hobbitd/webfiles/confreport_header
+@@ -1,6 +1,9 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <html>
+-<head><title>Xymon configuration Report</title></head>
++<head>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
++<title>Xymon configuration Report</title>
++</head>
+ 
+ <body>
+ 
+--- a/hobbitd/webfiles/event_header
++++ b/hobbitd/webfiles/event_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="EXPIRES" CONTENT="Sat, 01 Jan 2001 00:00:00 GMT">
+ <TITLE>&BBBACKGROUND : Xymon - Eventlog @ &BBDATE</TITLE>
+ 
+--- a/hobbitd/webfiles/findhost_header
++++ b/hobbitd/webfiles/findhost_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ 
+ <TITLE>Xymon - Find Host</TITLE>
+ 
+--- a/hobbitd/webfiles/ghosts_header
++++ b/hobbitd/webfiles/ghosts_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ 
+ <TITLE>Xymon - Ghost Clients</TITLE>
+ 
+--- a/hobbitd/webfiles/graphs_header
++++ b/hobbitd/webfiles/graphs_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <TITLE>&BBBACKGROUND : Xymon - Status @ &BBDATE</TITLE>
+ 
+ <!-- Styles for the menu bar -->
+--- a/hobbitd/webfiles/hist_header
++++ b/hobbitd/webfiles/hist_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="pagepath=; path=/">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="host=&BBHIKEY; path=/">
+ <TITLE>&BBBACKGROUND : Xymon - History @ &BBDATE</TITLE>
+--- a/hobbitd/webfiles/histlog_header
++++ b/hobbitd/webfiles/histlog_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="pagepath=; path=/">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="host=&BBHIKEY; path=/">
+ <TITLE>Xymon Historical Status: &BBHOST - &BBSVC @ &LOGTIME</TITLE>
+--- a/hobbitd/webfiles/hobbitnk_header
++++ b/hobbitd/webfiles/hobbitnk_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="REFRESH" CONTENT="60">
+ <META HTTP-EQUIV="EXPIRES" CONTENT="Sat, 01 Jan 2001 00:00:00 GMT">
+ <TITLE>&BBBACKGROUND : Xymon - Status @ &BBDATE</TITLE>
+--- a/hobbitd/webfiles/hostgraphs_header
++++ b/hobbitd/webfiles/hostgraphs_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ 
+ <TITLE>Xymon - Metrics Report</TITLE>
+ 
+--- a/hobbitd/webfiles/hostlist_header
++++ b/hobbitd/webfiles/hostlist_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ 
+ <TITLE>Xymon - List of Hosts</TITLE>
+ 
+--- a/hobbitd/webfiles/hostsvc_header
++++ b/hobbitd/webfiles/hostsvc_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="REFRESH" CONTENT="&BBREFRESH">
+ <META HTTP-EQUIV="EXPIRES" CONTENT="Sat, 01 Jan 2001 00:00:00 GMT">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="pagepath=; path=/">
+--- a/hobbitd/webfiles/info_header
++++ b/hobbitd/webfiles/info_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="pagepath=; path=/">
+ <META HTTP-EQUIV="Set-Cookie" CONTENT="host=&BBHIKEY; path=/">
+ <TITLE>Xymon - Host Information</TITLE>
+--- a/hobbitd/webfiles/maint_header
++++ b/hobbitd/webfiles/maint_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ 
+ <TITLE>Xymon - Maintenance</TITLE>
+ 
+--- a/hobbitd/webfiles/maintact_header
++++ b/hobbitd/webfiles/maintact_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ 
+ <TITLE>Xymon - Maintenance</TITLE>
+ 
+--- a/hobbitd/webfiles/nkedit_header
++++ b/hobbitd/webfiles/nkedit_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ 
+ <TITLE>Xymon - Critical Systems editor</TITLE>
+ 
+--- a/hobbitd/webfiles/notify_header
++++ b/hobbitd/webfiles/notify_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="EXPIRES" CONTENT="Sat, 01 Jan 2001 00:00:00 GMT">
+ <TITLE>&BBBACKGROUND : Xymon - Notification Log @ &BBDATE</TITLE>
+ 
+--- a/hobbitd/webfiles/perfdata_header
++++ b/hobbitd/webfiles/perfdata_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="EXPIRES" CONTENT="Sat, 01 Jan 2001 00:00:00 GMT">
+ <TITLE>&BBBACKGROUND : Xymon - Performance data @ &BBDATE</TITLE>
+ 
+--- a/hobbitd/webfiles/replog_header
++++ b/hobbitd/webfiles/replog_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <TITLE>Xymon Availability Report : &BBHOST - &BBSVC &BBDATE</TITLE>
+ 
+ <!-- Styles for the menu bar -->
+--- a/hobbitd/webfiles/report_header
++++ b/hobbitd/webfiles/report_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ 
+ <TITLE>Xymon - Availability Report</TITLE>
+ 
+--- a/hobbitd/webfiles/snapshot_header
++++ b/hobbitd/webfiles/snapshot_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ 
+ <TITLE>Xymon - Snapshot Report</TITLE>
+ 
+--- a/hobbitd/webfiles/topchanges_header
++++ b/hobbitd/webfiles/topchanges_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ <META HTTP-EQUIV="EXPIRES" CONTENT="Sat, 01 Jan 2001 00:00:00 GMT">
+ <TITLE>&BBBACKGROUND : Xymon - Top Changes @ &BBDATE</TITLE>
+ 
+--- a/hobbitd/webfiles/useradm_header
++++ b/hobbitd/webfiles/useradm_header
+@@ -1,6 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <HTML>
+ <HEAD>
++<META HTTP-EQUIV="Content-Type" CONTENT="&HTMLCONTENTTYPE">
+ 
+ <TITLE>Xymon - Manage Users</TITLE>
+ 
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/hobbitclient-tmpfs
+++ xymon-4.3.0~beta2.dfsg/debian/patches/hobbitclient-tmpfs
@@ -0,0 +1,49 @@
+xymon (4.3.0~beta2.dfsg-6) unstable; urgency=low
+
+  * Support GNU/kFreeBSD by adding a Makefile and a config snippet that
+    pretends we are running on Linux. (Closes: #458417)
+  * Tweak hobbitclient-linux.sh to report 'df' data without /proc/filesystems
+    mounted.
+
+ -- Christoph Berg <myon@debian.org>  Fri, 09 Apr 2010 00:17:03 +0200
+
+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 <myon@debian.org>  Sat, 05 Jul 2008 14:43:23 +0200
+
+--- a/client/hobbitclient-linux.sh
++++ b/client/hobbitclient-linux.sh
+@@ -42,8 +42,13 @@ uptime
+ echo "[who]"
+ who
+ echo "[df]"
+-EXCLUDES=`cat /proc/filesystems | grep nodev | awk '{print $2}' | xargs echo | sed -e 's! ! -x !g'`
+-df -Pl -x iso9660 -x $EXCLUDES | sed -e '/^[^ 	][^ 	]*$/{
++if test -f /proc/filesystems ; then # Linux
++	EXCLUDES=`cat /proc/filesystems | grep nodev | grep -v tmpfs | awk '{print $2}' | xargs echo | sed -e 's! ! -x !g'`
++else # kfreebsd (or /proc not mounted)
++	EXCLUDES=`mount | grep -v '^/' | grep -v tmpfs | awk '{print $1}' | xargs echo | sed -e 's! ! -x !g'`
++fi
++# kfreebsd needs an extra grep -v
++df -Pl -x iso9660 -x $EXCLUDES | grep -v '^/sys' | sed -e '/^[^ 	][^ 	]*$/{
+ N
+ s/[ 	]*\n[ 	]*/ /
+ }'
+--- a/hobbitd/etcfiles/hobbit-clients.cfg
++++ b/hobbitd/etcfiles/hobbit-clients.cfg
+@@ -347,6 +347,11 @@
+ # 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
++	DISK    /run IGNORE
+ 	# These are the built-in defaults.
+ 	UP      1h
+ 	LOAD    5.0 10.0
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/hobbit-ghosts-menu
+++ xymon-4.3.0~beta2.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
+ 
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/530227-hobbitclient-bashism
+++ xymon-4.3.0~beta2.dfsg/debian/patches/530227-hobbitclient-bashism
@@ -0,0 +1,11 @@
+--- a/client/hobbitclient-linux.sh
++++ b/client/hobbitclient-linux.sh
+@@ -24,7 +24,7 @@ elif [ -f /etc/redhat-release ]; then
+ elif [ -f /etc/gentoo-release ]; then
+ 	cat /etc/gentoo-release
+ elif [ -f /etc/debian_version ]; then
+-	echo -en "Debian "
++	echo -n "Debian "
+ 	cat /etc/debian_version
+ elif [ -f /etc/S?SE-release ]; then
+ 	egrep -i "^suse|^opensuse" /etc/S?SE-release
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/526176-ldap
+++ xymon-4.3.0~beta2.dfsg/debian/patches/526176-ldap
@@ -0,0 +1,47 @@
+From: dann frazier <dannf@debian.org>
+To: submit@bugs.debian.org
+Subject: #526176: xymon: ldap_init implicitly converted to pointer
+Date: Wed, 29 Apr 2009 12:18:00 -0600
+
+Package: xymon
+Version: 4.3.0~beta2.dfsg-1
+Severity: serious
+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.
+
+  Function `ldap_init' implicitly converted to pointer at test-ldap.c:25
+
+  This is often due to a missing function prototype definition.
+  For more information, see [2].
+
+  Though it is guaranteed that this codepath will cause a segfault on certain
+  architectures, it is not guaranteed that this codepath would ever be executed
+  (e.g., if the returned pointer is never dereferenced). However, this bug
+  does prevent the ia64 buildd from successfully building this package, resulting
+  in a practical FTBFS issue and warranting the serious severity.
+
+  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.
+
+  [1] http://people.debian.org/~dannf/check-implicit-pointer-functions
+  [2] http://wiki.debian.org/ImplicitPointerConversions
+
+--- orig-xymon-4.3.0~beta2.dfsg/build/test-ldap.c	2009-02-12 06:00:50.000000000 -0700
++++ xymon-4.3.0~beta2.dfsg/build/test-ldap.c	2009-04-29 12:13:07.387783442 -0600
+@@ -1,6 +1,7 @@
+ #include <time.h>
+ #include <stdio.h>
+ 
++#define LDAP_DEPRECATED 1
+ #include <ldap.h>
+ #include <lber.h>
+ 
+
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/hobbitgraph.netstat
+++ xymon-4.3.0~beta2.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
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/hobbit_files_ifexist
+++ xymon-4.3.0~beta2.dfsg/debian/patches/hobbit_files_ifexist
@@ -0,0 +1,71 @@
+--- a/client/localclient.cfg
++++ b/client/localclient.cfg
+@@ -191,6 +191,8 @@
+ #             - "NOEXIST" triggers a warning if the file exists. By default,
+ #               a warning is triggered for files that have a FILE entry, but
+ #               which do not exist.
++#             - "IFEXIST" only checks the file if it exists. If the file is
++#                reported as missing by the client, it is ignored.
+ #             - "TYPE=type" where "type" is one of "file", "dir", "char", "block", 
+ #               "fifo", or "socket". Triggers warning if the file is not of the
+ #               specified type.
+--- a/hobbitd/client_config.c
++++ b/hobbitd/client_config.c
+@@ -102,6 +102,7 @@ typedef struct c_log_t {
+ #define FCHK_MD5      (1 << 25)
+ #define FCHK_SHA1     (1 << 26)
+ #define FCHK_RMD160   (1 << 27)
++#define FCHK_IFEXIST  (1 << 28)
+ 
+ #define CHK_OPTIONAL  (1 << 30)
+ #define CHK_TRACKIT   (1 << 31)
+@@ -788,6 +789,9 @@ curtime, curtext, curgroup, cfid);
+ 					if (strcasecmp(tok, "noexist") == 0) {
+ 						currule->flags |= FCHK_NOEXIST;
+ 					}
++					else if (strcasecmp(tok, "ifexist") == 0) {
++						currule->flags |= FCHK_IFEXIST;
++					}
+ 					else if (strncasecmp(tok, "type=", 5) == 0) {
+ 						currule->flags |= FCHK_TYPE;
+ 						if (strcasecmp(tok+5, "socket") == 0) currule->rule.fcheck.ftype = S_IFSOCK;
+@@ -1103,6 +1107,8 @@ void dump_client_config(void)
+ 
+ 			if (rwalk->flags & FCHK_NOEXIST) 
+ 				printf(" noexist");
++			if (rwalk->flags & FCHK_IFEXIST)
++				printf(" ifexist");
+ 			if (rwalk->flags & FCHK_TYPE)
+ 				printf(" type=%s", ftypestr(rwalk->rule.fcheck.ftype));
+ 			if (rwalk->flags & FCHK_MODE) 
+@@ -1556,6 +1562,7 @@ int check_file(namelist_t *hinfo, char *
+ 		*anyrules = 1;
+ 		if (!exists) {
+ 			if (rwalk->flags & CHK_OPTIONAL) goto nextcheck;
++			if (rwalk->flags & FCHK_IFEXIST) goto nextcheck;
+ 
+ 			if (!(rwalk->flags & FCHK_NOEXIST)) {
+ 				/* Required file does not exist */
+--- a/hobbitd/etcfiles/hobbit-clients.cfg
++++ b/hobbitd/etcfiles/hobbit-clients.cfg
+@@ -189,6 +189,8 @@
+ #             - "NOEXIST" triggers a warning if the file exists. By default,
+ #               a warning is triggered for files that have a FILE entry, but
+ #               which do not exist.
++#             - "IFEXIST" only checks the file if it exists. If the file is
++#                reported as missing by the client, it is ignored.
+ #             - "TYPE=type" where "type" is one of "file", "dir", "char", "block", 
+ #               "fifo", or "socket". Triggers warning if the file is not of the
+ #               specified type.
+--- a/hobbitd/hobbit-clients.cfg.5
++++ b/hobbitd/hobbit-clients.cfg.5
+@@ -273,6 +273,9 @@ For files, you can check one or more of 
+ triggers a warning if the file exists. By default,
+ a warning is triggered for files that have a FILE entry, but
+ which do not exist.
++.IP "ifexist"
++only checks the file if it exists. If the file is
++reported as missing by the client, it is ignored.
+ .IP "type=TYPE"
+ where TYPE is one of "file", "dir", "char", "block",
+ "fifo", or "socket". Triggers warning if the file is not of the
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/hobbitd-rrdparameters
+++ xymon-4.3.0~beta2.dfsg/debian/patches/hobbitd-rrdparameters
@@ -0,0 +1,13 @@
+SPLITNCV rrd generation is broken, fix it:
+
+--- a/hobbitd/rrd/do_ncv.c
++++ b/hobbitd/rrd/do_ncv.c
+@@ -177,7 +177,7 @@ int do_ncv_rrd(char *hostname, char *tes
+ 				}
+ 			}
+ 			
+-			if (split_ncv && (paridx > 1)) {
++			if (split_ncv && (paridx > 0)) {
+ 				create_and_update_rrd(hostname, testname, classname, pagepaths, params, NULL);
+ 
+ 				/* We've created one RRD, so reset the params for the next one */
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/bbcombotest-fix
+++ xymon-4.3.0~beta2.dfsg/debian/patches/bbcombotest-fix
@@ -0,0 +1,11 @@
+--- a/hobbitd/bbcombotest.c
++++ b/hobbitd/bbcombotest.c
+@@ -213,7 +213,7 @@ static int gethobbitdvalue(char *hostnam
+ 		sendreturn_t *sres = newsendreturnbuf(1, NULL);
+ 
+ 		hobbitdresult = sendmessage("hobbitdboard fields=hostname,testname,color", NULL, BBTALK_TIMEOUT, sres);
+-		if ((hobbitdresult != BB_OK) || (board == NULL)) {
++		if (hobbitdresult != BB_OK) {
+ 			board = "";
+ 			*errptr += sprintf(*errptr, "Could not access hobbitd board, error %d\n", hobbitdresult);
+ 			return COL_CLEAR;
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/png-multiarch
+++ xymon-4.3.0~beta2.dfsg/debian/patches/png-multiarch
@@ -0,0 +1,17 @@
+Description: tell the build script how to link to libpng
+Origin: vendor
+Forwarded: no
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2011-12-26
+
+--- a/build/rrd.sh
++++ b/build/rrd.sh
+@@ -3,7 +3,7 @@
+ 	RRDDEF=""
+ 	RRDINC=""
+ 	RRDLIB=""
+-	PNGLIB=""
++	PNGLIB="$(libpng12-config --ldflags)"
+ 	ZLIB=""
+ 	for DIR in /opt/rrdtool* /usr/local/rrdtool* /usr/local /usr /usr/pkg /opt/csw /opt/sfw /usr/sfw
+ 	do
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/rrd_net_granularity
+++ xymon-4.3.0~beta2.dfsg/debian/patches/rrd_net_granularity
@@ -0,0 +1,93 @@
+--- 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)) {
+ 			setupfn2("%s.%s.rrd", "tcp", testname);
+-			sprintf(rrdvalues, "%d:%.2f", (int)tstamp, seconds);
++			sprintf(rrdvalues, "%d:%f", (int)tstamp, seconds);
+ 			return create_and_update_rrd(hostname, testname, classname, pagepaths, bbnet_params, bbnet_tpl);
+ 		}
+ 	}
+--- a/bbnet/bbtest-net.c
++++ b/bbnet/bbtest-net.c
+@@ -1656,8 +1656,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_nsec / 10000000);
++			sprintf(msgtext, "\nSeconds: %f\n", 
++				(unsigned int)t->duration.tv_sec + (unsigned int)t->duration.tv_nsec / 1000000000.0);
+ 			addtostatus(msgtext);
+ 		}
+ 		addtostatus("\n\n");
+--- a/bbnet/dns.c
++++ b/bbnet/dns.c
+@@ -349,7 +349,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_nsec/1000000);
++	sprintf(msg, "\nSeconds: %f\n", (unsigned int)tspent->tv_sec + (unsigned int)tspent->tv_nsec/1000000000.0);
+ 	addtobuffer(banner, msg);
+ 
+ 	ares_destroy(channel);
+--- a/bbnet/httpresult.c
++++ b/bbnet/httpresult.c
+@@ -295,9 +295,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_nsec / 10000000 );
++			sprintf(urlmsg, "\nSeconds: %f\n\n", 
++				(unsigned int)req->tcptest->totaltime.tv_sec +
++				(unsigned int)req->tcptest->totaltime.tv_nsec / 1000000000.0);
+ 			addtostatus(urlmsg);
+ 			xfree(urlmsg);
+ 		}
+--- a/bbnet/ldaptest.c
++++ b/bbnet/ldaptest.c
+@@ -443,8 +443,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_nsec / 10000000);
++		sprintf(msgline, "\nSeconds: %f\n",
++			(unsigned int)req->duration.tv_sec + (unsigned int)req->duration.tv_nsec / 1000000000.0);
+ 
+ 		addtostatus(msgline);
+ 	}
+@@ -463,9 +463,9 @@ void show_ldap_test_results(service_t *l
+ 		req = (ldap_data_t *) t->privdata;
+ 
+ 		printf("URL        : %s\n", t->testspec);
+-		printf("Time spent : %u.%02u\n", 
+-			(unsigned int)req->duration.tv_sec, 
+-			(unsigned int)req->duration.tv_nsec / 10000000);
++		printf("Time spent : %f\n", 
++			(unsigned int)req->duration.tv_sec +
++			(unsigned int)req->duration.tv_nsec / 1000000000.0);
+ 		printf("LDAP output:\n%s\n", textornull(req->output));
+ 		printf("------------------------------------------------------\n");
+ 	}
+--- a/bbnet/hobbitping.c
++++ b/bbnet/hobbitping.c
+@@ -357,11 +357,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_nsec / 1000)) / 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 {
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/series
+++ xymon-4.3.0~beta2.dfsg/debian/patches/series
@@ -0,0 +1,22 @@
+new-menu
+htmlcontenttype
+doc-paths
+hobbitclient-debian
+hobbitvars
+hobbitgraph.netstat
+hobbit-ghosts-menu
+rrd_net_granularity
+hobbitgraph.mailq
+hobbitclient-tmpfs
+hobbit_files_ifexist
+
+# bug fixes
+526176-ldap
+hobbitd-rrdparameters
+530227-hobbitclient-bashism
+580493-negative-timeoffset
+kfreebsd-makefile
+bbcombotest-fix
+622069-sslv2-deprecation
+png-multiarch
+7-CVE-2011-1716
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/580493-negative-timeoffset
+++ xymon-4.3.0~beta2.dfsg/debian/patches/580493-negative-timeoffset
@@ -0,0 +1,11 @@
+--- a/hobbitd/rrd/do_la.c
++++ b/hobbitd/rrd/do_la.c
+@@ -12,7 +12,7 @@ static char la_rcsid[] = "$Id: do_la.c 6
+ 
+ int do_la_rrd(char *hostname, char *testname, char *classname, char *pagepaths, char *msg, time_t tstamp)
+ {
+-	static char *la_params[]          = { "DS:la:GAUGE:600:0:U", NULL };
++	static char *la_params[]          = { "DS:la:GAUGE:600:U:U", NULL };
+ 	static void *la_tpl               = NULL;
+ 
+ 	static pcre *as400_exp = NULL;
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/hobbitclient-debian
+++ xymon-4.3.0~beta2.dfsg/debian/patches/hobbitclient-debian
@@ -0,0 +1,11 @@
+--- a/client/hobbitclient-linux.sh
++++ b/client/hobbitclient-linux.sh
+@@ -66,6 +66,8 @@ echo "[ifstat]"
+ if test -r /proc/mdstat; then echo "[mdstat]"; cat /proc/mdstat; fi
+ echo "[ps]"
+ ps -Aww -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" != ""
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/new-menu
+++ xymon-4.3.0~beta2.dfsg/debian/patches/new-menu
@@ -0,0 +1,112 @@
+--- a/hobbitd/Makefile
++++ b/hobbitd/Makefile
+@@ -120,7 +120,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 $@ $<
+--- a/hobbitd/webfiles/bb_footer
++++ b/hobbitd/webfiles/bb_footer
+@@ -9,16 +9,5 @@
+ </TR>
+ </TABLE>
+ 
+-
+-<!-- menu script itself. you should not modify this file -->
+-<script type="text/javascript" language="JavaScript" src="&BBMENUSKIN/menu.js"></script>
+-<!-- items structure. menu hierarchy and links are stored there -->
+-<script type="text/javascript" language="JavaScript" src="&BBMENUSKIN/menu_items.js"></script>
+-<!-- files with geometry and styles structures -->
+-<script type="text/javascript" language="JavaScript" src="&BBMENUSKIN/menu_tpl.js"></script>
+-<script type="text/javascript" language="JavaScript">
+-        new menu (MENU_ITEMS, MENU_POS);
+-</script>
+-
+ </BODY>
+ </HTML>
+--- a/hobbitd/webfiles/hobbitnk_footer
++++ b/hobbitd/webfiles/hobbitnk_footer
+@@ -57,16 +57,5 @@
+ </TR>
+ </TABLE>
+ 
+-
+-<!-- menu script itself. you should not modify this file -->
+-<script type="text/javascript" language="JavaScript" src="&BBMENUSKIN/menu.js"></script>
+-<!-- items structure. menu hierarchy and links are stored there -->
+-<script type="text/javascript" language="JavaScript" src="&BBMENUSKIN/menu_items.js"></script>
+-<!-- files with geometry and styles structures -->
+-<script type="text/javascript" language="JavaScript" src="&BBMENUSKIN/menu_tpl.js"></script>
+-<script type="text/javascript" language="JavaScript">
+-        new menu (MENU_ITEMS, MENU_POS);
+-</script>
+-
+ </BODY>
+ </HTML>
+--- /dev/null
++++ b/hobbitd/wwwfiles/menu/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;
++}
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/622069-sslv2-deprecation
+++ xymon-4.3.0~beta2.dfsg/debian/patches/622069-sslv2-deprecation
@@ -0,0 +1,36 @@
+--- a/bbnet/contest.c
++++ b/bbnet/contest.c
+@@ -478,8 +478,10 @@ static void setup_ssl(tcptest_t *item)
+ 
+ 	if (item->sslctx == NULL) {
+ 		switch (item->ssloptions->sslversion) {
++#if 0
+ 		  case SSLVERSION_V2:
+ 			item->sslctx = SSL_CTX_new(SSLv2_client_method()); break;
++#endif
+ 		  case SSLVERSION_V3:
+ 			item->sslctx = SSL_CTX_new(SSLv3_client_method()); break;
+ 		  case SSLVERSION_TLS1:
+--- a/common/bb-hosts.5
++++ b/common/bb-hosts.5
+@@ -928,6 +928,9 @@ one or more "dialect names" to the URL s
+ These can be combined where it makes sense, e.g to force
+ SSLv2 and HTTP 1.0 you would use "https210".
+ 
++Note: libssl 1.0.0 in Debian deprecates the use of SSLv2 and hence https2 will
++fall back to testing SSLv3.
++
+ .IP "Testing sites by IP-address"
+ bbtest-net ignores the "testip" tag normally used to force a 
+ test to use the IP-address from the bb-hosts file instead of
+--- a/docs/manpages/man5/bb-hosts.5.html
++++ b/docs/manpages/man5/bb-hosts.5.html
+@@ -993,6 +993,8 @@ one or more &quot;dialect names&quot; to
+ These can be combined where it makes sense, e.g to force
+ SSLv2 and HTTP 1.0 you would use &quot;https210&quot;.
+ <P>
++Note: libssl 1.0.0 in Debian deprecates the use of SSLv2 and hence https2 will
++fall back to testing SSLv3.
+ <DT>Testing sites by IP-address<DD>
+ bbtest-net ignores the &quot;testip&quot; tag normally used to force a 
+ test to use the IP-address from the bb-hosts file instead of
--- xymon-4.3.0~beta2.dfsg.orig/debian/patches/7-CVE-2011-1716
+++ xymon-4.3.0~beta2.dfsg/debian/patches/7-CVE-2011-1716
@@ -0,0 +1,687 @@
+Description: fix for XSS vulnerabiliites in Web UI
+Origin: upstream
+Author: ckuerste@gmx.ch
+Bug: http://xymon.svn.sourceforge.net/viewvc/xymon/branches/4.3.2/Changes?revision=6673&view=markup
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/precise/+source/xymon/+bug/1092412
+Index: xymon-4.3.0~beta2.dfsg/lib/eventlog.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/lib/eventlog.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/lib/eventlog.c	2012-12-23 13:24:51.633388972 +0700
+@@ -544,7 +544,7 @@
+ 	if (fromtime) {
+ 		firstevent = eventreport_time(fromtime);
+ 		if(firstevent < 0) {
+-			if (output) fprintf(output,"<B>Invalid 'from' time: %s</B>", fromtime);
++			if (output) fprintf(output,"<B>Invalid 'from' time: %s</B>", htmlquoted(fromtime));
+ 			return;
+ 		}
+ 	}
+@@ -562,7 +562,7 @@
+ 	if (totime) {
+ 		lastevent = eventreport_time(totime);
+ 		if (lastevent < 0) {
+-			if (output) fprintf(output,"<B>Invalid 'to' time: %s</B>", totime);
++			if (output) fprintf(output,"<B>Invalid 'to' time: %s</B>", htmlquoted(totime));
+ 			return;
+ 		}
+ 		if (lastevent < firstevent) {
+@@ -715,7 +715,7 @@
+ 		countlist_t *cwalk;
+ 		unsigned long totalcount = 0;
+ 
+-		if (periodstring) fprintf(output, "<p><font size=+1>%s</font></p>\n", periodstring);
++		if (periodstring) fprintf(output, "<p><font size=+1>%s</font></p>\n", htmlquoted(periodstring));
+ 
+ 		switch (sumtype) {
+ 		  case S_HOST_BREAKDOWN:
+@@ -778,7 +778,7 @@
+ 		fprintf(output, "<BR><BR>\n");
+ 		fprintf(output, "<TABLE SUMMARY=\"$EVENTSTITLE\" BORDER=0>\n");
+ 		fprintf(output, "<TR BGCOLOR=\"#333333\">\n");
+-		fprintf(output, "<TD ALIGN=CENTER COLSPAN=6><FONT SIZE=-1 COLOR=\"#33ebf4\">%s</FONT></TD></TR>\n", title);
++		fprintf(output, "<TD ALIGN=CENTER COLSPAN=6><FONT SIZE=-1 COLOR=\"#33ebf4\">%s</FONT></TD></TR>\n", htmlquoted(title));
+ 
+ 		for (ewalk=eventhead; (ewalk); ewalk=ewalk->next) {
+ 			char *hostname = bbh_item(ewalk->host, BBH_HOSTNAME);
+Index: xymon-4.3.0~beta2.dfsg/lib/headfoot.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/lib/headfoot.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/lib/headfoot.c	2012-12-23 13:24:51.637390972 +0700
+@@ -1463,7 +1463,7 @@
+ 		xfree(templatedata);
+ 	}
+ 	else {
+-		fprintf(output, "<HTML><BODY> \n <HR size=4> \n <BR>%s is either missing or invalid, please create this file with your custom header<BR> \n<HR size=4>", filename);
++		fprintf(output, "<HTML><BODY> \n <HR size=4> \n <BR>%s is either missing or invalid, please create this file with your custom header<BR> \n<HR size=4>", htmlquoted(filename));
+ 	}
+ 
+ 	/* Check for bulletin files */
+Index: xymon-4.3.0~beta2.dfsg/lib/htmllog.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/lib/htmllog.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/lib/htmllog.c	2012-12-23 13:24:51.649396972 +0700
+@@ -80,7 +80,7 @@
+ 			<INPUT TYPE=HIDDEN NAME=\"IP\" VALUE=\"%s\"> \
+ 			<INPUT TYPE=HIDDEN NAME=\"DISPLAYNAME\" VALUE=\"%s\"> \
+ 			</FORM></CENTER>\n",
+-			cgibinurl, btntxt, hostname, service, ip, displayname);
++			cgibinurl, htmlquoted(btntxt), htmlquoted(hostname), htmlquoted(service), htmlquoted(ip), htmlquoted(displayname));
+ 	}
+ 
+ 	xfree(tmp2);
+@@ -161,7 +161,7 @@
+ 
+ 	hostsvc_setup();
+ 	if (!displayname) displayname = hostname;
+-	sethostenv(displayname, ip, service, colorname(color), hostname);
++	sethostenv(htmlquoted(displayname), htmlquoted(ip), htmlquoted(service), colorname(color), htmlquoted(hostname));
+ 	if (logtime) sethostenv_snapshot(logtime);
+ 
+ 	if (is_history) tplfile = "histlog";
+@@ -254,9 +254,9 @@
+ 				strftime(untilstr, sizeof(untilstr)-1, "%Y-%m-%d %H:%M", localtime(&validuntil));
+ 				fprintf(output, "<tr>");
+ 				fprintf(output, "<td align=center><font %s>%d</font></td>", ackfont, level);
+-				fprintf(output, "<td><font %s>%s</font></td>", ackfont, ackedby);
++				fprintf(output, "<td><font %s>%s</font></td>", ackfont, htmlquoted(ackedby));
+ 				fprintf(output, "<td><font %s>%s&nbsp;-&nbsp;%s</font></td>", ackfont, receivedstr, untilstr);
+-				fprintf(output, "<td><font %s>%s</font></td>", ackfont, msg);
++				fprintf(output, "<td><font %s>%s</font></td>", ackfont, htmlquoted(msg));
+ 				fprintf(output, "</tr>\n");
+ 			}
+ 
+@@ -274,12 +274,12 @@
+ 	}
+ 
+ 	fprintf(output, "<CENTER><TABLE ALIGN=CENTER BORDER=0 SUMMARY=\"Detail Status\">\n");
+-	if (wantserviceid) fprintf(output, "<TR><TH><FONT %s>%s - %s</FONT><BR><HR WIDTH=\"60%%\"></TH></TR>\n", rowfont, displayname, service);
++	if (wantserviceid) fprintf(output, "<TR><TH><FONT %s>%s - %s</FONT><BR><HR WIDTH=\"60%%\"></TH></TR>\n", rowfont, htmlquoted(displayname), htmlquoted(service));
+ 
+ 	if (disabletime != 0) {
+ 		fprintf(output, "<TR><TD><H3>Disabled until %s</H3></TD></TR>\n", 
+ 			(disabletime == -1 ? "OK" : ctime(&disabletime)));
+-		fprintf(output, "<TR><TD><PRE>%s</PRE></TD></TR>\n", dismsg);
++		fprintf(output, "<TR><TD><PRE>%s</PRE></TD></TR>\n", htmlquoted(dismsg));
+ 		fprintf(output, "<TR><TD><BR><HR>Current status message follows:<HR><BR></TD></TR>\n");
+ 
+ 		fprintf(output, "<TR><TD>");
+@@ -295,7 +295,7 @@
+ 		char *txt = skipword(firstline);
+ 
+ 		if (dismsg) {
+-			fprintf(output, "<TR><TD><H3>Planned downtime: %s</H3></TD></TR>\n", dismsg);
++			fprintf(output, "<TR><TD><H3>Planned downtime: %s</H3></TD></TR>\n", htmlquoted(dismsg));
+ 			fprintf(output, "<TR><TD><BR><HR>Current status message follows:<HR><BR></TD></TR>\n");
+ 		}
+ 
+@@ -333,12 +333,12 @@
+ 		if (ackedby) {
+ 			*ackedby = '\0';
+ 			fprintf(output, "<font %s>Current acknowledgment: %s<br>%s<br>%s</font><br>\n", 
+-				ackfont, ackmsg, (ackedby+1), ackuntil);
++				ackfont, htmlquoted(ackmsg), (ackedby+1), ackuntil);
+ 			*ackedby = '\n';
+ 		}
+ 		else {
+ 			fprintf(output, "<font %s>Current acknowledgment: %s<br>%s</font><br>\n", 
+-				ackfont, ackmsg, ackuntil);
++				ackfont, htmlquoted(ackmsg), ackuntil);
+ 		}
+ 
+ 		MEMUNDEFINE(ackuntil);
+Index: xymon-4.3.0~beta2.dfsg/lib/notifylog.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/lib/notifylog.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/lib/notifylog.c	2012-12-23 13:24:51.653398972 +0700
+@@ -120,7 +120,7 @@
+ 	if (fromtime) {
+ 		firstevent = convert_time(fromtime);
+ 		if(firstevent < 0) {
+-			fprintf(output,"<B>Invalid 'from' time: %s</B>", fromtime);
++			fprintf(output,"<B>Invalid 'from' time: %s</B>", htmlquoted(fromtime));
+ 			return;
+ 		}
+ 	}
+@@ -134,7 +134,7 @@
+ 	if (totime) {
+ 		lastevent = convert_time(totime);
+ 		if (lastevent < 0) {
+-			fprintf(output,"<B>Invalid 'to' time: %s</B>", totime);
++			fprintf(output,"<B>Invalid 'to' time: %s</B>", htmlquoted(totime));
+ 			return;
+ 		}
+ 		if (lastevent < firstevent) {
+@@ -314,7 +314,7 @@
+ 		fprintf(output, "<BR><BR>\n");
+ 		fprintf(output, "<TABLE SUMMARY=\"Notification log\" BORDER=0>\n");
+ 		fprintf(output, "<TR BGCOLOR=\"#333333\">\n");
+-		fprintf(output, "<TD ALIGN=CENTER COLSPAN=4><FONT SIZE=-1 COLOR=\"#33ebf4\">%s</FONT></TD></TR>\n", title);
++		fprintf(output, "<TD ALIGN=CENTER COLSPAN=4><FONT SIZE=-1 COLOR=\"#33ebf4\">%s</FONT></TD></TR>\n", htmlquoted(title));
+ 		fprintf(output, "<TR BGCOLOR=\"#333333\"><TH>Time</TH><TH>Host</TH><TH>Service</TH><TH>Recipient</TH></TR>\n");
+ 
+ 		for (walk=head; (walk != lasttoshow->next); walk=walk->next) {
+@@ -350,9 +350,9 @@
+ 			strcpy(title, "No notifications logged");
+ 
+ 		fprintf(output, "<CENTER><BR>\n");
+-		fprintf(output, "<TABLE SUMMARY=\"%s\" BORDER=0>\n", title);
++		fprintf(output, "<TABLE SUMMARY=\"%s\" BORDER=0>\n", htmlquoted(title));
+ 		fprintf(output, "<TR BGCOLOR=\"#333333\">\n");
+-		fprintf(output, "<TD ALIGN=CENTER COLSPAN=6><FONT SIZE=-1 COLOR=\"#33ebf4\">%s</FONT></TD>\n", title);
++		fprintf(output, "<TD ALIGN=CENTER COLSPAN=6><FONT SIZE=-1 COLOR=\"#33ebf4\">%s</FONT></TD>\n", htmlquoted(title));
+ 		fprintf(output, "</TR>\n");
+ 		fprintf(output, "</TABLE>\n");
+ 		fprintf(output, "</CENTER>\n");
+Index: xymon-4.3.0~beta2.dfsg/lib/reportlog.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/lib/reportlog.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/lib/reportlog.c	2012-12-23 13:24:51.665404972 +0700
+@@ -34,7 +34,7 @@
+ 	int curbg = 0;
+ 
+ 	if (!displayname) displayname = hostname;
+-	sethostenv(displayname, ip, service, colorname(color), hostname);
++	sethostenv(htmlquoted(displayname), htmlquoted(ip), htmlquoted(service), colorname(color), htmlquoted(hostname));
+ 	sethostenv_report(st, end, reportwarnlevel, reportgreenlevel);
+ 
+ 	headfoot(htmlrep, "replog", "", "header", color);
+@@ -42,7 +42,7 @@
+ 	fprintf(htmlrep, "\n");
+ 
+ 	fprintf(htmlrep, "<CENTER>\n");
+-	fprintf(htmlrep, "<BR><FONT %s><B>%s - %s</B></FONT>\n", xgetenv("MKBBROWFONT"), displayname, service);
++	fprintf(htmlrep, "<BR><FONT %s><B>%s - %s</B></FONT>\n", xgetenv("MKBBROWFONT"), htmlquoted(displayname), htmlquoted(service));
+ 	fprintf(htmlrep, "<TABLE BORDER=0 BGCOLOR=\"#333333\" CELLPADDING=3 SUMMARY=\"Availability percentages\">\n");
+ 	fprintf(htmlrep, "<TR>\n");
+ 
+Index: xymon-4.3.0~beta2.dfsg/lib/strfunc.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/lib/strfunc.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/lib/strfunc.c	2012-12-23 13:24:51.665404972 +0700
+@@ -177,3 +177,34 @@
+ 	*(buf->s+buf->used) = '\0';
+ }
+ 
++char *htmlquoted(char *s)
++{
++	/*
++         * This routine converts a plain string into an html-quoted string
++         */
++	static strbuffer_t *result = NULL;
++	char *inp, *endp;
++	char c;
++
++	if (!result) result = newstrbuffer(4096);
++	clearstrbuffer(result);
++
++	inp = s;
++	do {
++		endp = inp + strcspn(inp, "\"&<> ");
++		c = *endp;
++		if (endp > inp) addtobufferraw(result, inp, endp-inp);
++		switch (c) {
++		  case '"': addtobuffer(result, "&quot;"); break;
++		  case '&': addtobuffer(result, "&amp;"); break;
++		  case '<': addtobuffer(result, "&lt;"); break;
++		  case '>': addtobuffer(result, "&gt;"); break;
++		  case ' ': addtobuffer(result, "&nbsp;"); break;
++		  default: break;
++		}
++		inp = (c == '\0') ? NULL : endp+1;
++	} while (inp);
++
++	return STRBUF(result);
++}
++
+Index: xymon-4.3.0~beta2.dfsg/lib/strfunc.h
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/lib/strfunc.h	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/lib/strfunc.h	2012-12-23 13:24:51.665404972 +0700
+@@ -24,6 +24,7 @@
+ extern void strbufferrecalc(strbuffer_t *buf);
+ extern void strbuffergrow(strbuffer_t *buf, int bytes);
+ extern void strbufferuse(strbuffer_t *buf, int bytes);
++extern char *htmlquoted(char *s);
+ 
+ #endif
+ 
+Index: xymon-4.3.0~beta2.dfsg/web/bb-ack.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/bb-ack.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/bb-ack.c	2012-12-23 13:24:51.677410973 +0700
+@@ -159,16 +159,16 @@
+ 
+ 	fprintf(output, "<tr>\n");
+ 
+-	fprintf(output, "    <td>%s</td>\n", (hname ? hname : "&nbsp;"));
+-	fprintf(output, "    <td>%s</td>\n", (tname ? tname : "&nbsp;"));
++	fprintf(output, "    <td>%s</td>\n", (hname ? htmlquoted(hname) : "&nbsp;"));
++	fprintf(output, "    <td>%s</td>\n", (tname ? htmlquoted(tname) : "&nbsp;"));
+ 	fprintf(output, "    <TD><INPUT TYPE=TEXT NAME=\"DELAY_%s\" SIZE=8 MAXLENGTH=20></TD>\n", numstr);
+ 	fprintf(output, "    <TD><INPUT TYPE=TEXT NAME=\"MESSAGE_%s\" SIZE=60 MAXLENGTH=80></TD>\n", numstr);
+ 
+ 	fprintf(output, "    <TD>\n");
+ 	if (ackcode && hname && tname) {
+-		fprintf(output, "       <INPUT TYPE=\"HIDDEN\" NAME=\"NUMBER_%d\" VALUE=\"%s\">\n", num, ackcode);
+-		fprintf(output, "       <INPUT TYPE=\"HIDDEN\" NAME=\"HOSTNAME_%d\" VALUE=\"%s\">\n", num, hname);
+-		fprintf(output, "       <INPUT TYPE=\"HIDDEN\" NAME=\"TESTNAME_%d\" VALUE=\"%s\">\n", num, tname);
++		fprintf(output, "       <INPUT TYPE=\"HIDDEN\" NAME=\"NUMBER_%d\" VALUE=\"%s\">\n", num, htmlquoted(ackcode));
++		fprintf(output, "       <INPUT TYPE=\"HIDDEN\" NAME=\"HOSTNAME_%d\" VALUE=\"%s\">\n", num, htmlquoted(hname));
++		fprintf(output, "       <INPUT TYPE=\"HIDDEN\" NAME=\"TESTNAME_%d\" VALUE=\"%s\">\n", num, htmlquoted(tname));
+ 		fprintf(output, "       <INPUT TYPE=\"SUBMIT\" NAME=\"Send_%d\" VALUE=\"Send\" ALT=\"Send\">\n", num);
+ 	}
+ 	else {
+Index: xymon-4.3.0~beta2.dfsg/web/bb-eventlog.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/bb-eventlog.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/bb-eventlog.c	2012-12-23 13:24:51.677410973 +0700
+@@ -337,9 +337,9 @@
+ 	parse_query();
+ 
+ 	if ((*periodstring == '\0') && (fromtime || totime)) {
+-		if (fromtime && totime) sprintf(periodstring, "Events between %s - %s", fromtime, totime);
+-		else if (fromtime) sprintf(periodstring, "Events since %s", fromtime);
+-		else if (totime) sprintf(periodstring, "Events until %s", totime);
++		if (fromtime && totime) sprintf(periodstring, "Events between %s - %s", htmlquoted(fromtime), htmlquoted(totime));
++		else if (fromtime) sprintf(periodstring, "Events since %s", htmlquoted(fromtime));
++		else if (totime) sprintf(periodstring, "Events until %s", htmlquoted(totime));
+ 	}
+ 
+ 	/* Now generate the webpage */
+Index: xymon-4.3.0~beta2.dfsg/web/bb-findhost.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/bb-findhost.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/bb-findhost.c	2012-12-23 13:24:51.677410973 +0700
+@@ -163,7 +163,7 @@
+ 		regerror(re_status, &re, re_errstr, BUFSIZE);
+ 
+ 		print_header();
+-		printf("<tr><td align=left><font color=red>%s</font></td>\n",  pSearchPat);
++		printf("<tr><td align=left><font color=red>%s</font></td>\n",  htmlquoted(pSearchPat));
+ 		printf("<td align=left><font color=red>%s</font></td></tr>\n", re_errstr);
+ 		print_footer();
+ 
+@@ -254,7 +254,7 @@
+ 
+ 	print_header();
+ 	if (!gotany) {
+-		printf("<tr><td align=left>%s</td><td align=left>Not found</td></tr>\n", pSearchPat);
++		printf("<tr><td align=left>%s</td><td align=left>Not found</td></tr>\n", htmlquoted(pSearchPat));
+ 	}
+ 	else {
+ 		printf("%s", grabstrbuffer(outbuf));
+Index: xymon-4.3.0~beta2.dfsg/web/bb-hist.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/bb-hist.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/bb-hist.c	2012-12-23 13:24:51.677410973 +0700
+@@ -510,14 +510,14 @@
+ 		      int entrycount,			/* Log entry maxcount */
+ 		      replog_t *loghead)		/* Eventlog for entrycount events back */
+ {
+-	sethostenv(displayname, ip, service, colorname(COL_GREEN), hostname);
++	sethostenv(htmlquoted(displayname), htmlquoted(ip), htmlquoted(service), colorname(COL_GREEN), htmlquoted(hostname));
+ 	headfoot(htmlrep, "hist", "", "header", COL_GREEN);
+ 
+ 	fprintf(htmlrep, "\n");
+ 	fprintf(htmlrep, "<CENTER>\n");
+ 	if (wantserviceid) {
+ 		fprintf(htmlrep, "<BR><FONT %s><B>%s - %s</B></FONT><BR>\n", 
+-			xgetenv("MKBBROWFONT"), displayname, service);
++			xgetenv("MKBBROWFONT"), htmlquoted(displayname), htmlquoted(service));
+ 	}
+ 
+ 	/* Create the color-bars */
+Index: xymon-4.3.0~beta2.dfsg/web/bb-rep.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/bb-rep.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/bb-rep.c	2012-12-23 13:24:51.685414972 +0700
+@@ -288,7 +288,7 @@
+ 		strftime(endstr, sizeof(endstr), "%b %d %Y", localtime(&endtime));
+ 		printf("<CENTER><A NAME=begindata>&nbsp;</A>\n");
+ 		printf("<BR><BR><BR><BR>\n");
+-		printf("<H3>Generating report for the period: %s - %s (%s)<BR>\n", startstr, endstr, style);
++		printf("<H3>Generating report for the period: %s - %s (%s)<BR>\n", htmlquoted(startstr), htmlquoted(endstr), htmlquoted(style));
+ 		printf("<P><P>\n");
+ 		fflush(stdout);
+ 	}
+Index: xymon-4.3.0~beta2.dfsg/web/bb-snapshot.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/bb-snapshot.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/bb-snapshot.c	2012-12-23 13:24:51.697420973 +0700
+@@ -218,7 +218,7 @@
+ 		strftime(startstr, sizeof(startstr), "%b %d %Y", localtime(&starttime));
+ 		printf("<CENTER><A NAME=begindata>&nbsp;</A>\n");
+ 		printf("<BR><BR><BR><BR>\n");
+-		printf("<H3>Generating snapshot: %s<BR>\n", startstr);
++		printf("<H3>Generating snapshot: %s<BR>\n", htmlquoted(startstr));
+ 		printf("<P><P>\n");
+ 		fflush(stdout);
+ 	}
+Index: xymon-4.3.0~beta2.dfsg/web/hobbit-ackinfo.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/hobbit-ackinfo.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/hobbit-ackinfo.c	2012-12-23 13:24:51.697420973 +0700
+@@ -122,7 +122,7 @@
+ 	fprintf(stdout, "Content-type: %s\n", xgetenv("HTMLCONTENTTYPE"));
+ 	fprintf(stdout, "Location: %s\n", getenv("HTTP_REFERER"));
+ 	fprintf(stdout, "\n");
+-	fprintf(stdout, "Sent to hobbitd:\n%s\n", bbmsg);
++	fprintf(stdout, "Sent to hobbitd:\n%s\n", htmlquoted(bbmsg));
+ 
+ 	return 0;
+ }
+Index: xymon-4.3.0~beta2.dfsg/web/hobbit-enadis.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/hobbit-enadis.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/hobbit-enadis.c	2012-12-23 13:24:51.697420973 +0700
+@@ -199,7 +199,7 @@
+ 
+ 			if (preview) {
+ 				printf("<tr><td>Enabling host <b>%s</b> test <b>%s</b> : %s</td></tr>\n", 
+-					hostname, enabletest[i], ((result == BB_OK) ? "OK" : "Failed"));
++					htmlquoted(hostname), htmlquoted(enabletest[i]), ((result == BB_OK) ? "OK" : "Failed"));
+ 			}
+ 		}
+ 		break;
+@@ -219,7 +219,7 @@
+ 
+ 			if (preview) {
+ 				printf("<tr><td>Disabling host <b>%s</b> test <b>%s</b>: %s</td></tr>\n", 
+-					hostname, disabletest[i], ((result == BB_OK) ? "OK" : "Failed"));
++					htmlquoted(hostname), htmlquoted(disabletest[i]), ((result == BB_OK) ? "OK" : "Failed"));
+ 			}
+ 		}
+ 		break;
+@@ -232,7 +232,7 @@
+ 
+ 			if (preview) {
+ 				printf("<tr><td>Scheduling disable of host <b>%s</b> test <b>%s</b> at <b>%s</b>: %s</td></tr>\n", 
+-					hostname, disabletest[i], ctime(&schedtime), ((result == BB_OK) ? "OK" : "Failed"));
++					htmlquoted(hostname), htmlquoted(disabletest[i]), ctime(&schedtime), ((result == BB_OK) ? "OK" : "Failed"));
+ 			}
+ 		}
+ 		break;
+Index: xymon-4.3.0~beta2.dfsg/web/hobbitgraph.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/hobbitgraph.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/hobbitgraph.c	2012-12-23 13:24:51.697420973 +0700
+@@ -640,9 +640,9 @@
+ 	switch (action) {
+ 	  case ACT_MENU:
+ 		fprintf(output, "  <td align=\"left\"><img src=\"%s&amp;action=view&amp;graph=%s\" alt=\"%s graph\"></td>\n",
+-			uri, grtype, grtype);
++			uri, htmlquoted(grtype), htmlquoted(grtype));
+ 		fprintf(output, "  <td align=\"left\" valign=\"top\"> <a href=\"%s&amp;graph=%s&amp;action=selzoom&amp;color=%s\"> <img src=\"%s/zoom.gif\" border=0 alt=\"Zoom graph\" style='padding: 3px'> </a> </td>\n",
+-			uri, grtype, colorname(bgcolor), getenv("BBSKIN"));
++			uri, htmlquoted(grtype), colorname(bgcolor), getenv("BBSKIN"));
+ 		break;
+ 
+ 	  case ACT_SELZOOM:
+@@ -650,7 +650,7 @@
+ 		if (graphstart == 0) gstart = gend - persecs; else gstart = graphstart;
+ 
+ 		fprintf(output, "  <td align=\"left\"><img id='zoomGraphImage' src=\"%s&amp;graph=%s&amp;action=view&amp;graph_start=%u&amp;graph_end=%u&amp;graph_height=%d&amp;graph_width=%d&amp;",
+-			uri, grtype, (int) gstart, (int) gend, graphheight, graphwidth);
++			uri, htmlquoted(grtype), (int) gstart, (int) gend, graphheight, graphwidth);
+ 		if (haveupperlimit) fprintf(output, "&amp;upper=%f", upperlimit);
+ 		if (havelowerlimit) fprintf(output, "&amp;lower=%f", lowerlimit);
+ 		fprintf(output, "\" alt=\"Zoom source image\"></td>\n");
+@@ -700,7 +700,7 @@
+ {
+ 	/* This is special-handled, because we just want to generate an HTML link page */
+ 	fprintf(stdout, "Content-type: %s\n\n", xgetenv("HTMLCONTENTTYPE"));
+-	sethostenv(displayname, "", service, colorname(bgcolor), hostname);
++	sethostenv(htmlquoted(displayname), "", htmlquoted(service), colorname(bgcolor), htmlquoted(hostname));
+ 	sethostenv_backsecs(backsecs);
+ 
+ 	headfoot(stdout, "graphs", "", "header", bgcolor);
+@@ -882,7 +882,7 @@
+ 			char msg[8192];
+ 
+ 			snprintf(msg, sizeof(msg), "hobbitgraph.cfg error, PCRE pattern %s invalid: %s, offset %d\n",
+-				 gdef->fnpat, errmsg, errofs);
++				 htmlquoted(gdef->fnpat), errmsg, errofs);
+ 			errormsg(msg);
+ 		}
+ 		if (gdef->exfnpat) {
+@@ -892,7 +892,7 @@
+ 
+ 				snprintf(msg, sizeof(msg), 
+ 					 "hobbitgraph.cfg error, PCRE pattern %s invalid: %s, offset %d\n",
+-					 gdef->exfnpat, errmsg, errofs);
++					 htmlquoted(gdef->exfnpat), errmsg, errofs);
+ 				errormsg(msg);
+ 			}
+ 		}
+@@ -1130,7 +1130,7 @@
+ void generate_zoompage(char *selfURI)
+ {
+ 	fprintf(stdout, "Content-type: %s\n\n", xgetenv("HTMLCONTENTTYPE"));
+-	sethostenv(displayname, "", service, colorname(bgcolor), hostname);
++	sethostenv(htmlquoted(displayname), "", htmlquoted(service), colorname(bgcolor), htmlquoted(hostname));
+ 	headfoot(stdout, "graphs", "", "header", bgcolor);
+ 
+ 
+Index: xymon-4.3.0~beta2.dfsg/web/hobbit-nkedit.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/hobbit-nkedit.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/hobbit-nkedit.c	2012-12-23 13:24:51.701422973 +0700
+@@ -231,7 +231,7 @@
+ 	if (rec) sethostenv_nkedit(rec->updinfo, rec->priority, rec->ttgroup, rec->starttime, rec->endtime, rec->nktime, rec->ttextra);
+ 	else sethostenv_nkedit("", 0, NULL, 0, 0, NULL, NULL);
+ 
+-	sethostenv(hostname, "", service, colorname(COL_BLUE), NULL);
++	sethostenv(htmlquoted(hostname), "", htmlquoted(service), colorname(COL_BLUE), NULL);
+ 
+ 	*warnmsg = '\0';
+ 	if (!rec && nodatawarning) sprintf(warnmsg, "<SCRIPT LANGUAGE=\"Javascript\" type=\"text/javascript\"> alert('%s'); </SCRIPT>\n", nodatawarning);
+Index: xymon-4.3.0~beta2.dfsg/web/hobbit-statusreport.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/hobbit-statusreport.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/hobbit-statusreport.c	2012-12-23 13:24:51.713428971 +0700
+@@ -129,7 +129,7 @@
+ 	if (!embedded) {
+ 		printf("Content-type: %s\n\n", xgetenv("HTMLCONTENTTYPE"));
+ 
+-		printf("<html><head><title>%s</title></head>\n", heading);
++		printf("<html><head><title>%s</title></head>\n", htmlquoted(heading));
+ 		printf("<body>");
+ 		printf("<table border=1 cellpadding=5><tr><th>%s</th><th align=left>Status</th></tr>\n",
+ 		       (showcolumn ? "Host/Column" : "Host"));
+@@ -157,16 +157,16 @@
+ 			printf("<tr><td align=left valign=top><b>");
+ 
+ 			if (addlink) 
+-				printf("<a href=\"%s\">%s</a>", hostsvcurl(hostname, xgetenv("INFOCOLUMN"), 1), hostname);
++				printf("<a href=\"%s\">%s</a>", hostsvcurl(hostname, xgetenv("INFOCOLUMN"), 1), htmlquoted(hostname));
+ 			else 
+-				printf("%s", hostname);
++				printf("%s", htmlquoted(hostname));
+ 
+ 			if (showcolumn) {
+ 				printf("<br>");
+ 				if (addlink) 
+-					printf("<a href=\"%s\">%s</a>", hostsvcurl(hostname, testname, 1), testname);
++					printf("<a href=\"%s\">%s</a>", hostsvcurl(hostname, testname, 1), htmlquoted(testname));
+ 				else
+-					printf("%s", testname);
++					printf("%s", htmlquoted(testname));
+ 			}
+ 
+ 			if (showcolors) printf("&nbsp;-&nbsp;%s", colorstr);
+Index: xymon-4.3.0~beta2.dfsg/web/hobbitsvc.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/hobbitsvc.c	2012-12-23 13:24:48.243694987 +0700
++++ xymon-4.3.0~beta2.dfsg/web/hobbitsvc.c	2012-12-23 13:24:51.713428971 +0700
+@@ -139,10 +139,10 @@
+ 		char *p, *req;
+ 
+ 		req = getenv("SCRIPT_NAME");
+-		clienturi = (char *)malloc(strlen(req) + 10 + strlen(hostname));
++		clienturi = (char *)malloc(strlen(req) + 10 + strlen(htmlquoted(hostname)));
+ 		strcpy(clienturi, req);
+ 		p = strchr(clienturi, '?'); if (p) *p = '\0'; else p = clienturi + strlen(clienturi);
+-		sprintf(p, "?CLIENT=%s", hostname);
++		sprintf(p, "?CLIENT=%s", htmlquoted(hostname));
+ 	}
+ 
+ 	return 0;
+@@ -240,7 +240,7 @@
+ 	else if ((strcmp(service, xgetenv("TRENDSCOLUMN")) == 0) || (strcmp(service, xgetenv("INFOCOLUMN")) == 0)) {
+ 		if (loadhostdata(hostname, &ip, &displayname, &compacts) != 0) return 1;
+ 		ishtmlformatted = 1;
+-		sethostenv(displayname, ip, service, colorname(COL_GREEN), hostname);
++		sethostenv(htmlquoted(displayname), htmlquoted(ip), htmlquoted(service), colorname(COL_GREEN), htmlquoted(hostname));
+ 		sethostenv_refresh(600);
+ 		color = COL_GREEN;
+ 		logtime = getcurrenttime(NULL);
+@@ -383,7 +383,7 @@
+ 			displayname = ((items[16]  && *items[16]) ? items[16] : hostname);
+ 			clntstamp = ((items[17]  && *items[17]) ? atol(items[17]) : 0);
+ 
+-			sethostenv(displayname, ip, service, colorname(COL_GREEN), hostname);
++			sethostenv(htmlquoted(displayname), htmlquoted(ip), htmlquoted(service), colorname(COL_GREEN), htmlquoted(hostname));
+ 			sethostenv_refresh(60);
+ 		}
+ 		else {
+@@ -414,7 +414,7 @@
+ 				if (icolor > color) color = icolor;
+ 
+ 				sprintf(l, "<tr><td align=left>&%s&nbsp;<a href=\"%s\">%s</a></td></tr>\n", 
+-					itmcolor, hostsvcurl(hostname, testname, 1), testname);
++					itmcolor, hostsvcurl(hostname, testname, 1), htmlquoted(testname));
+ 				addtobuffer(cmsg, l);
+ 				row = strtok_r(NULL, "\n", &p_row);
+ 			}
+@@ -546,12 +546,12 @@
+ 
+ 				qres = locator_query(hostname, ST_HOSTDATA, &cgiurl);
+ 				if (!qres) {
+-					errprintf("Cannot find hostdata files for host %s\n", hostname);
++					errprintf("Cannot find hostdata files for host %s\n", htmlquoted(hostname));
+ 				}
+ 				else {
+-					clienturi = (char *)malloc(strlen(cgiurl) + 20 + strlen(hostname));
++					clienturi = (char *)malloc(strlen(cgiurl) + 20 + strlen(htmlquoted(hostname)));
+ 					sprintf(clienturi, "%s/bb-hostsvc.sh?CLIENT=%s&amp;TIMEBUF=%s", 
+-						cgiurl, hostname, clientid);
++						cgiurl, htmlquoted(hostname), clientid);
+ 				}
+ 			}
+ 			else {
+Index: xymon-4.3.0~beta2.dfsg/web/hobbitsvc-info.c
+===================================================================
+--- xymon-4.3.0~beta2.dfsg.orig/web/hobbitsvc-info.c	2009-02-12 20:09:34.000000000 +0700
++++ xymon-4.3.0~beta2.dfsg/web/hobbitsvc-info.c	2012-12-23 13:53:19.495993140 +0700
+@@ -225,7 +225,7 @@
+ 	char l[1024];
+ 	int i, rcount;
+ 
+-	sprintf(l, "<table summary=\"%s Alerts\" border=1>\n", hostname);
++	sprintf(l, "<table summary=\"%s Alerts\" border=1>\n", htmlquoted(hostname));
+ 	addtobuffer(buf, l);
+ 	addtobuffer(buf, "<tr><th>Service</th><th>Recipient</th><th>1st Delay</th><th>Stop after</th><th>Repeat</th><th>Time of Day</th><th>Colors</th></tr>\n");
+ 
+@@ -272,7 +272,7 @@
+ 
+ 	holidayset = bbh_item(hi, BBH_HOLIDAYS);
+ 
+-	sprintf(l, "<table summary=\"%s Holidays\" border=1>\n", hostname);
++	sprintf(l, "<table summary=\"%s Holidays\" border=1>\n", htmlquoted(hostname));
+ 	addtobuffer(buf, l);
+ 
+ 	addtobuffer(buf, "<tr>");
+@@ -450,7 +450,7 @@
+ 
+ 	sprintf(l, "<form name=\"disableform\" method=\"post\" action=\"%s/hobbit-enadis.sh\">\n", xgetenv("SECURECGIBINURL"));
+ 	addtobuffer(buf, l);
+-	sprintf(l, "<table summary=\"%s disable\" border=1>\n", hostname);
++	sprintf(l, "<table summary=\"%s disable\" border=1>\n", htmlquoted(hostname));
+ 	addtobuffer(buf, l);
+ 
+ 	addtobuffer(buf, "<tr>\n");
+@@ -562,7 +562,7 @@
+ 
+ 	addtobuffer(buf, "</table>\n");
+ 
+-	sprintf(l, "<input name=\"hostname\" type=hidden value=\"%s\">\n", hostname);
++	sprintf(l, "<input name=\"hostname\" type=hidden value=\"%s\">\n", htmlquoted(hostname));
+ 	addtobuffer(buf, l);
+ 	addtobuffer(buf, "</form>\n");
+ }
+@@ -573,7 +573,7 @@
+ 	char l[1024];
+ 	char *msg, *eoln;
+ 
+-	sprintf(l, "<table summary=\"%s disabled tests\" border=1>\n", hostname);
++	sprintf(l, "<table summary=\"%s disabled tests\" border=1>\n", htmlquoted(hostname));
+ 	addtobuffer(buf, l);
+ 
+ 	addtobuffer(buf, "<tr><th>Test</th><th>Disabled until</th><th>Cause</th><th>&nbsp;</th></tr>\n");
+@@ -594,7 +594,7 @@
+ 		addtobuffer(buf, "<td>");
+ 		while ((eoln = strchr(msg, '\n')) != NULL) {
+ 			*eoln = '\0';
+-			addtobuffer(buf, msg);
++			addtobuffer(buf, htmlquoted(msg));
+ 			addtobuffer(buf, "<br>");
+ 			msg = (eoln + 1);
+ 		}
+@@ -604,7 +604,7 @@
+ 		addtobuffer(buf, "<td>");
+ 		sprintf(l, "<form method=\"post\" action=\"%s/hobbit-enadis.sh\">\n", xgetenv("SECURECGIBINURL"));
+ 		addtobuffer(buf, l);
+-		sprintf(l, "<input name=\"hostname\" type=hidden value=\"%s\">\n", hostname);
++		sprintf(l, "<input name=\"hostname\" type=hidden value=\"%s\">\n", htmlquoted(hostname));
+ 		addtobuffer(buf, l);
+ 		sprintf(l, "<input name=\"enabletest\" type=hidden value=\"%s\">\n", tnames[i].name);
+ 		addtobuffer(buf, l);
+@@ -620,7 +620,7 @@
+ 	addtobuffer(buf, "<td>");
+ 	sprintf(l, "<form method=\"post\" action=\"%s/hobbit-enadis.sh\">\n", xgetenv("SECURECGIBINURL"));
+ 	addtobuffer(buf, l);
+-	sprintf(l, "<input name=\"hostname\" type=hidden value=\"%s\">\n", hostname);
++	sprintf(l, "<input name=\"hostname\" type=hidden value=\"%s\">\n", htmlquoted(hostname));
+ 	addtobuffer(buf, l);
+ 	sprintf(l, "<input name=\"enabletest\" type=hidden value=\"%s\">\n", "*");
+ 	addtobuffer(buf, l);
+@@ -640,7 +640,7 @@
+ 	sched_t *swalk;
+ 	char *msg, *eoln;
+ 
+-	sprintf(l, "<table summary=\"%s scheduled disables\" border=1>\n", hostname);
++	sprintf(l, "<table summary=\"%s scheduled disables\" border=1>\n", htmlquoted(hostname));
+ 	addtobuffer(buf, l);
+ 
+ 	addtobuffer(buf, "<tr><th>ID</th><th>When</th><th>Command</th><th>&nbsp;</th></tr>\n");
+@@ -658,7 +658,7 @@
+ 		addtobuffer(buf, "<td>");
+ 		while ((eoln = strchr(msg, '\n')) != NULL) {
+ 			*eoln = '\0';
+-			addtobuffer(buf, msg);
++			addtobuffer(buf, htmlquoted(msg));
+ 			addtobuffer(buf, "<br>");
+ 			msg = (eoln + 1);
+ 		}
+@@ -668,7 +668,7 @@
+ 		addtobuffer(buf, "<td>");
+ 		sprintf(l, "<form method=\"post\" action=\"%s/hobbit-enadis.sh\">\n", xgetenv("SECURECGIBINURL"));
+ 		addtobuffer(buf, l);
+-		sprintf(l, "<input name=\"hostname\" type=hidden value=\"%s\">\n", hostname);
++		sprintf(l, "<input name=\"hostname\" type=hidden value=\"%s\">\n", htmlquoted(hostname));
+ 		addtobuffer(buf, l);
+ 		sprintf(l, "<input name=\"canceljob\" type=hidden value=\"%d\">\n", swalk->id);
+ 		addtobuffer(buf, l);
+@@ -720,10 +720,10 @@
+ 	val = bbh_item(hostwalk, BBH_DISPLAYNAME);
+ 	if (val && (strcmp(val, hostname) != 0)) {
+ 		sprintf(l, "<tr><th align=left>Hostname:</th><td align=left>%s (%s)</td></tr>\n", 
+-			val, hostname);
++			val, htmlquoted(hostname));
+ 	}
+ 	else {
+-		sprintf(l, "<tr><th align=left>Hostname:</th><td align=left>%s</td></tr>\n", hostname);
++		sprintf(l, "<tr><th align=left>Hostname:</th><td align=left>%s</td></tr>\n", htmlquoted(hostname));
+ 	}
+ 	addtobuffer(infobuf, l);
+