--- smokeping-2.3.6.orig/debian/default-config +++ smokeping-2.3.6/debian/default-config @@ -0,0 +1,7 @@ +@include /etc/smokeping/config.d/General +@include /etc/smokeping/config.d/Alerts +@include /etc/smokeping/config.d/Database +@include /etc/smokeping/config.d/Presentation +@include /etc/smokeping/config.d/Probes +@include /etc/smokeping/config.d/Slaves +@include /etc/smokeping/config.d/Targets --- smokeping-2.3.6.orig/debian/compat +++ smokeping-2.3.6/debian/compat @@ -0,0 +1 @@ +5 --- smokeping-2.3.6.orig/debian/postinst +++ smokeping-2.3.6/debian/postinst @@ -0,0 +1,186 @@ +#! /bin/sh +# postinst script for smokeping +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +split_config () { + version="$1" + echo "splitting the old monolithic config into separate sections..." 1>&2 + local found + local stop + local DIR + local sec + + DIR=/etc/smokeping/config.d + [ -d $DIR ] || mkdir -p $DIR + for sec in General Alerts Database Presentation Probes Slaves Targets + do + if [ ! -f ${DIR}/$sec ]; then + # seed ucf with the default configuration from the version we're upgrading from + found="" + stop=false + for oldvers in 2.0.9-2 2.1.1-1 2.2.4-1 2.2.6-1 2.2.7-1 2.2.7-2 2.3.0-1 2.3.2-1 + do + if ! $stop && dpkg --compare-versions "$oldvers" gt "$version"; then + stop=true + fi + if ! $stop && [ -e /usr/share/smokeping/oldconfigs/$oldvers/$sec ]; then + found=/usr/share/smokeping/oldconfigs/$oldvers/$sec + fi + done + if [ -n "$found" ]; then + ucf --three-way $found ${DIR}/$sec + fi + sed -n "1,/^\*\*\* $sec \*\*\*/{h;d}; \${g;p;q}; /^\*\*\*/{g;p;q}; H" \ + < /etc/smokeping/config > ${DIR}/$sec + fi + done +} + +migrate_cgi_directory () { + echo "migrating CGI files into /var/lib/smokeping/__cgi..." 1>&2 + # move any old .adr files under __cgi + + (cd /var/lib/smokeping; find . -name __cgi -prune -o -name '*.adr' -print0 | \ + cpio --quiet -pdm0 /var/lib/smokeping/__cgi) + (cd /var/lib/smokeping; find . -name __cgi -prune -o -name '*.adr' -print0 | \ + xargs -0 --no-run-if-empty rm) + + # make sure the permissions are right + find /var/lib/smokeping/__cgi -name '*.adr' -print0 | \ + xargs -0 --no-run-if-empty chown www-data + find /var/lib/smokeping/__cgi -type d -print0 | \ + xargs -0 --no-run-if-empty chown smokeping:www-data + find /var/lib/smokeping/__cgi -type d -print0 | \ + xargs -0 --no-run-if-empty chmod 2775 + +} + +setup_permissions() { + # Smokeping.cgi is run as user www-data, so we need it to be able + # to write in /var/cache/smokeping/images and in /var/lib/smokeping/__cgi + + chown smokeping:smokeping /var/lib/smokeping + chown www-data /var/cache/smokeping/images + chown smokeping:www-data /var/lib/smokeping/__cgi + chmod 2775 /var/lib/smokeping/__cgi +} + +setup_apache() { + # note that this is only done on initial installations + if [ -d /etc/apache2/conf.d ] && \ + [ ! -e /etc/apache2/conf.d/smokeping ] && \ + which apache2ctl >/dev/null 2>&1 + then + if apache2ctl configtest 2>/dev/null; then + echo "enabling Apache configuration in /etc/apache2/conf.d/smokeping" 1>&2 + ln -s /etc/smokeping/apache2.conf /etc/apache2/conf.d/smokeping + if apache2ctl configtest 2>/dev/null; then + invoke-rc.d apache2 force-reload || true + fi + else + echo "broken Apache configuration detected, not enabling /etc/smokeping/apache2.conf" 1>&2 + fi + else + echo "non-standard Apache configuration or missing apache2ctl, not enabling /etc/smokeping/apache2.conf" 1>&2 + fi +} + +var_www_migration() { + # until the lenny release (2.3.6-3), the CGI wrote the images in /var/www + if [ -d /var/www/smokeping ] + then + for d in images javascript + do + if [ ! -e /var/www/smokeping/$d ] + then + ln -s /usr/share/smokeping/www/$d /var/www/smokeping/$d + fi + done + fi +} + +do_ucf() { + # install the configuration files and register them with ucfr + [ -d /etc/smokeping ] || mkdir -p /etc/smokeping + for f in basepage.html smokemail tmail + do + ucf --debconf-ok --three-way /usr/share/smokeping/etc/${f}.dist /etc/smokeping/$f + ucfr smokeping /etc/smokeping/$f + done + + [ -d /etc/smokeping/config.d ] || mkdir -p /etc/smokeping/config.d + for f in /usr/share/smokeping/etc/config.d/* + do + ucf --debconf-ok --three-way --src-dir /usr/share/smokeping/etc/config.d.md5sums/ \ + $f /etc/smokeping/config.d/$(basename $f) + ucfr smokeping /etc/smokeping/config.d/$(basename $f) + done + + # do the main config last so the admin won't be quite so surprised + ucf --debconf-ok --three-way /usr/share/smokeping/etc/default-config /etc/smokeping/config + ucfr smokeping /etc/smokeping/config +} + +# OK, let's go +case "$1" in + configure|reconfigure) + + getent passwd smokeping > /dev/null || \ + adduser --system --group --home /var/lib/smokeping --no-create-home --gecos "SmokePing daemon" smokeping + + if [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.3.5-1" + then + split_config "$2" + migrate_cgi_directory + fi + if [ -n "$2" ] && dpkg --compare-versions "$2" le "2.3.6-3" + then + var_www_migration + fi + if [ -z "$2" ] + then + setup_apache + fi + setup_permissions + do_ucf + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- smokeping-2.3.6.orig/debian/postrm +++ smokeping-2.3.6/debian/postrm @@ -0,0 +1,58 @@ +#! /bin/sh +# postrm script for smoke +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + + purge) + + rm -rf /var/run/smokeping + rm -rf /var/cache/smokeping + rm -rf /var/lib/smokeping + + for f in basepage.html smokemail tmail config + do + file=/etc/smokeping/$f + [ ! -x /usr/bin/ucf ] || ucf --purge $file + [ ! -x /usr/bin/ucfr ] || ucfr --purge smokeping $file + rm -f $file $file.ucf-old $file.ucf-new $file.ucf-dist + done + for f in Alerts Database General pathnames Presentation Probes Slaves Targets + do + file=/etc/smokeping/config.d/$f + [ ! -x /usr/bin/ucf ] || ucf --purge $file + [ ! -x /usr/bin/ucfr ] || ucfr --purge smokeping $file + rm -f $file $file.ucf-old $file.ucf-new $file.ucf-dist + done + + [ ! -d /etc/smokeping/config.d ] || rmdir --ignore-fail-on-non-empty --parents /etc/smokeping/config.d + + if [ -h /etc/apache2/conf.d/smokeping ] && \ + [ ! -e /etc/apache2/conf.d/smokeping ]; then + rm -f /etc/apache2/conf.d/smokeping + fi + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- smokeping-2.3.6.orig/debian/docs +++ smokeping-2.3.6/debian/docs @@ -0,0 +1 @@ +README --- smokeping-2.3.6.orig/debian/apache2.conf +++ smokeping-2.3.6/debian/apache2.conf @@ -0,0 +1,7 @@ +ScriptAlias /smokeping/smokeping.cgi /usr/share/smokeping/cgi-bin/smokeping.cgi +Alias /smokeping /usr/share/smokeping/www + + + Options FollowSymLinks + + --- smokeping-2.3.6.orig/debian/default-config.md5sum +++ smokeping-2.3.6/debian/default-config.md5sum @@ -0,0 +1,5 @@ +12ffd67ddfddf08c0408ae250a1f0b2c 2.0.9-2 +43f0405f445efb78d22ba891564f3de3 2.2.4-1 +c59001bfa90c6528e99ebab32669d93f 2.3.0-1 +cb6a5d5e2cc342e47dc04931f58f695b 2.3.2-1 + --- smokeping-2.3.6.orig/debian/init.d +++ smokeping-2.3.6/debian/init.d @@ -0,0 +1,199 @@ +#!/bin/sh +# +# /etc/init.d/smokeping +# +### BEGIN INIT INFO +# Provides: smokeping +# Required-Start: $syslog $network +# Should-Start: sshd apache +# Required-Stop: $syslog $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start or stop the smokeping latency logging system daemon +# Description: SmokePing is a latency logging and graphing system +# that consists of a daemon process which organizes +# the latency measurements and a CGI which presents +# the graphs. This script is used to start or stop +# the daemon. +### END INIT INFO +# + +set -e + +# Source LSB init functions +. /lib/lsb/init-functions + +DAEMON=/usr/sbin/smokeping +NAME=smokeping +DESC="latency logger daemon" +CONFIG=/etc/smokeping/config +PIDFILE=/var/run/smokeping/$NAME.pid +DAEMON_USER=smokeping +DEFAULTS=/etc/default/smokeping +MODE=master +DAEMON_ARGS="" + +# LC_ALL prevents resetting LC_NUMERIC which in turn interferes +# with Smokeping internal regexps matching floating point numbers +unset LC_ALL + +# Check whether the binary is still present: +test -f "$DAEMON" || exit 0 + +# source defaults for master vs. slave mode +if [ -f "$DEFAULTS" ] +then + . "$DEFAULTS" +fi + +check_slave() { + if [ "$MODE" != "slave" ] + then + return + fi + if [ -z "$SHARED_SECRET" ] + then + log_progress_msg "(missing \$SHARED_SECRET setting)" + log_end_msg 6 # program is not configured + exit 6 + fi + if [ ! -r "$SHARED_SECRET" ] + then + log_progress_msg "(invalid \$SHARED_SECRET setting)" + log_end_msg 2 # invalid or excess argument(s) + exit 2 + fi + if [ -z "$MASTER_URL" ] + then + log_progress_msg "(missing \$MASTER_URL setting)" + log_end_msg 6 # program is not configured + exit 6 + fi + DAEMON_ARGS="$DAEMON_ARGS --master-url $MASTER_URL --shared-secret $SHARED_SECRET" + if [ -n "$SLAVE_NAME" ] + then + DAEMON_ARGS="$DAEMON_ARGS --slave-name $SLAVE_NAME" + fi + DAEMON_ARGS="$DAEMON_ARGS --cache-dir /var/lib/smokeping" + DAEMON_ARGS="$DAEMON_ARGS --pid-dir /var/run/smokeping" +} + +check_config () { + # Check whether the configuration file is available + if [ ! -r "$CONFIG" ] && [ "$MODE" = "master" ] + then + log_progress_msg "($CONFIG does not exist)" + log_end_msg 6 # program is not configured + exit 6 + fi +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" $NAME + check_config + check_slave + set +e + pidofproc "$DAEMON" > /dev/null + STATUS=$? + set -e + if [ "$STATUS" = 0 ] + then + log_progress_msg "already running" + log_end_msg $STATUS + exit $STATUS + fi + + if [ ! -d /var/run/smokeping ]; then + mkdir /var/run/smokeping + chown ${DAEMON_USER}.root /var/run/smokeping + chmod 0755 /var/run/smokeping + fi + + set +e + start-stop-daemon --start --quiet --exec $DAEMON --oknodo \ + --chuid $DAEMON_USER --pidfile $PIDFILE \ + -- $DAEMON_ARGS \ + | logger -p daemon.notice -t $NAME + STATUS=$? + set -e + + log_end_msg $STATUS + exit $STATUS + ;; + + + stop) + log_daemon_msg "Shutting down $DESC" $NAME + + set +e + start-stop-daemon --oknodo --stop --retry 3 --quiet --pidfile /var/run/smokeping/$NAME.pid --signal 15 + STATUS=$? + set -e + + if [ "$STATUS" = 0 ] + then + rm -f $PIDFILE + pkill -u www-data speedy_backend || true + fi + + log_end_msg $STATUS + exit $STATUS + ;; + + + restart) + # Restart service (if running) or start service + $0 stop + $0 start + ;; + + + reload|force-reload) + log_action_begin_msg "Reloading $DESC configuration" + + check_config + set +e + $DAEMON --reload | logger -p daemon.notice -t smokeping + STATUS=$? + set -e + + if [ "$STATUS" = 0 ] + then + log_action_end_msg 0 "If the CGI has problems reloading, see README.Debian." + else + log_action_end_msg $STATUS + fi + exit $STATUS + ;; + + + status) + log_daemon_msg "Checking $DESC status" $NAME + # Use pidofproc to check the status of the service, + # pidofproc returns the exit status code of 0 when it the process is + # running. + + # LSB defined exit status codes for status: + # 0 program is running or service is OK + # 1 program is dead and /var/run pid file exists + # 2 program is dead and /var/lock lock file exists + # 3 program is not running + # 4 program or service status is unknown + # 5-199 reserved (5-99 LSB, 100-149 distribution, 150-199 applications) + + set +e + pidofproc "$DAEMON" > /dev/null + STATUS=$? + log_progress_msg "(status $STATUS)" + log_end_msg 0 + set -e + exit $STATUS + ;; + + + *) + echo "Usage: $0 {start|stop|status|restart|force-reload|reload}" + exit 1 + ;; +esac --- smokeping-2.3.6.orig/debian/examples +++ smokeping-2.3.6/debian/examples @@ -0,0 +1,2 @@ +doc/examples/* +etc/smokeping_secrets.dist --- smokeping-2.3.6.orig/debian/watch +++ smokeping-2.3.6/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://oss.oetiker.ch/smokeping/pub/ smokeping-(.+)\.tar\.gz --- smokeping-2.3.6.orig/debian/dirs +++ smokeping-2.3.6/debian/dirs @@ -0,0 +1,4 @@ +usr/sbin +var/cache/smokeping/images +var/lib/smokeping +var/lib/smokeping/__cgi --- smokeping-2.3.6.orig/debian/control +++ smokeping-2.3.6/debian/control @@ -0,0 +1,36 @@ +Source: smokeping +Section: net +Priority: extra +Maintainer: Jose Carlos Garcia Sogo +Uploaders: Niko Tyni +Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9) +Build-Depends-Indep: librrds-perl, groff-base, libhtml-parser-perl, + libwww-perl, liburi-perl +Standards-Version: 3.8.2 +Homepage: http://smokeping.org/ +Vcs-Browser: http://git.debian.org/?p=collab-maint/smokeping.git +Vcs-Git: git://git.debian.org/git/collab-maint/smokeping.git + +Package: smokeping +Architecture: all +Depends: ${perl:Depends}, ${misc:Depends}, libwww-perl, + libsnmp-session-perl (>= 0.86), librrds-perl (>= 1.2), liburi-perl, + fping (>= 2.4b2-to-ipv6-2), speedy-cgi-perl (>= 2.21-1), + debianutils (>= 1.7), adduser, + lsb-base (>= 3.0-6), libdigest-hmac-perl, ucf (>= 0.28), + libconfig-grammar-perl, + libjs-cropper, + libjs-scriptaculous, + libjs-prototype +Recommends: apache2 | httpd-cgi, libsocket6-perl, dnsutils, echoping +Suggests: curl, libauthen-radius-perl, libnet-ldap-perl, libnet-dns-perl, + exim4 | mail-transport-agent, + openssh-client, libio-socket-ssl-perl, libnet-telnet-perl +Description: latency logging and graphing system + SmokePing consists of a daemon process which organizes the + latency measurements and a CGI which presents the graphs. + . + With SmokePing you can measure latency and packet loss in your network. + SmokePing uses RRDtool to maintain a longterm datastore and to draw pretty + graphs giving up to the minute information on the state of each + network connection. --- smokeping-2.3.6.orig/debian/changelog +++ smokeping-2.3.6/debian/changelog @@ -0,0 +1,726 @@ +smokeping (2.3.6-5+squeeze1build0.10.04.1) lucid-security; urgency=low + + * fake sync from Debian + + -- Jamie Strandboge Mon, 01 Apr 2013 13:21:49 -0500 + +smokeping (2.3.6-5+squeeze1) stable-security; urgency=high + + * Non-maintainer upload by the Security Team. + * CVE-2012-0790: Fix cross-site scripting vulnerability allowing a + remote attacker to inject arbitrary web script or html via the + displaymode parameter. Initial patch prepared by Antoine Beaupré. + Add an adjustment to the patterns to exclude more special + characters. (Closes: #659899) + + -- Salvatore Bonaccorso Fri, 15 Mar 2013 22:46:57 +0100 + +smokeping (2.3.6-5) unstable; urgency=medium + + * debian/patches/20_html-parser.dpatch: fix an incompatibility with + recent versions of HTML::Parser. (Closes: #560562) + + -- Niko Tyni Sun, 20 Dec 2009 22:38:16 +0200 + +smokeping (2.3.6-4) unstable; urgency=low + + * Depend on libconfig-grammar-perl instead of bundling it. (Closes: #531196) + * Install the perl code in /usr/share/smokeping/lib instead of + /usr/share/perl5/smokeping. + * Downgrade the exim4 | mail-transport agent dependency to a suggestion. + (Closes: #520350) + * Remove the obsolete libnet-perl dependency. + * Depend on javascript libraries instead of bundling them. (Closes: #475285) + + cpio not used anymore. (Closes: #537026) + * Move away from /var/www but add compatibility symlinks on upgrades. + See NEWS.Debian. (Closes: #521333) + + automatically enable the web server configuration on new installations + where possible. + * Serve UTF-8 by default. Thanks to Elmar Hoffmann. (Closes: #506978) + * Don't ship /var/run/smokeping, it will be created at run time. + * Upgrade to Standards-Version 3.8.2. + + add Homepage, Vcs-Git, and Vcs-Browser information to debian/control. + * Change the alternate web server recommendation to httpd-cgi as per policy. + + -- Niko Tyni Tue, 21 Jul 2009 21:11:01 +0300 + +smokeping (2.3.6-3) unstable; urgency=low + + * Unset LC_ALL in the init script because the daemon needs to + reset LC_NUMERIC. (Closes: #489766) + * Fix a bashism in the postinst script. Thanks, lintian. + + -- Niko Tyni Fri, 29 Aug 2008 18:29:34 +0300 + +smokeping (2.3.6-2) unstable; urgency=low + + * Kill speedy_backend processes that are running on stop (Closes: #485880) + + -- Jose Carlos Garcia Sogo Wed, 02 Jul 2008 00:30:34 +0200 + +smokeping (2.3.6-1) unstable; urgency=low + + * New upstream release. + + honours the 'linkstyle' variable when zooming. (Closes: #476404) + * Wait until the daemon has exited when stopping it with the init.d script. + This should fix a race condition that made restarts fail sporadically. + (Closes: #478241) + + -- Niko Tyni Mon, 28 Apr 2008 21:49:28 +0300 + +smokeping (2.3.5-2) unstable; urgency=low + + * Prevent an unnecessary ucf prompt for the Slaves section on upgrades. + * Upload to unstable. + + -- Niko Tyni Fri, 04 Apr 2008 08:47:24 +0300 + +smokeping (2.3.5-1) experimental; urgency=low + + * New upstream release. (Closes: #470295) + + debian/patches/30_slave_piddir.dpatch: removed, included upstream. + + new dependency on libdigest-hmac-perl + * Revisit the directory permissions of various directories under /var. + See also NEWS.Debian. + + use /var/lib/smokeping/__cgi as a storage place for the CGI. + (Closes: #470382) + + debian/postinst: + * set the right permissions on install + * move *.adr files under __cgi on upgrade + * honour DAEMON_ARGS from /etc/default/smokeping even in slave mode. + * Remove the example target hierarchy 'World' from the default configuration + file, so that no unnecessary directories are created in the CGI directory. + * debian/rules: recreate empty documentation directories if needed to ease + working with a git repository. + * Split the monolithic configuration file into configuration snippets + in /etc/smokeping/config.d. See NEWS.Debian. (Closes: #473223) + + use ucf for managing all the configuration files to ease the merging + + debian/patches/20_conffile.dpatch: removed + * Install the upstream config template in /usr/share/doc too, because + smokeping_examples(7) says so and it doesn't hurt. + * Update debian/copyright. + * Don't blindly remove the whole /etc/smokeping on purge, just the + configuration files managed by maintainers scripts and any ucf leftovers. + * Upload to experimental to get a bit of testing first. + + -- Niko Tyni Tue, 11 Mar 2008 22:30:04 +0200 + +smokeping (2.3.2-1) unstable; urgency=low + + * New upstream release. (Closes: #468928) + * Add support for the new "slave mode", enabled via + /etc/default/smokeping. (Closes: #466533) + * debian/patches/30_slave_piddir.dpatch: Add an optional + --pid-dir option to specify the pid directory when running as a slave. + * Change the doc-base section to Network/Monitoring. Thanks, lintian. + + -- Niko Tyni Tue, 04 Mar 2008 23:36:58 +0200 + +smokeping (2.3.0-1) unstable; urgency=low + + * New upstream version. + + new dependency on liburi-perl + + debian/patches/30_jszoom.dpatch: removed, applied upstream. + + -- Niko Tyni Thu, 24 Jan 2008 23:27:29 +0200 + +smokeping (2.2.7-2) unstable; urgency=low + + * debian/patches/30_jszoom.dpatch: fix a javascript error + on pages without a zoom widget. (Closes: #457071) + * Change my maintainer email address. + * Upgrade to Standards-Version 3.7.3. No changes needed. + * Add two short patch descriptions in debian/patches. + * Don't install an empty /usr/bin directory. + + -- Niko Tyni Sun, 23 Dec 2007 20:57:49 +0200 + +smokeping (2.2.7-1) unstable; urgency=low + + * New upstream release + * Create /var/run/smokeping at startup if it doesn't exist. + Patch from Ubuntu. + + -- Niko Tyni Sat, 10 Nov 2007 09:55:32 +0200 + +smokeping (2.2.6-1) unstable; urgency=low + + * New upstream release. + * Update debian/copyright, including a typo fix. (Closes: #445877) + + -- Niko Tyni Sun, 28 Oct 2007 15:51:36 +0200 + +smokeping (2.2.4-1) unstable; urgency=low + + * New upstream release + + includes graph zooming code that is installed in /var/www/smokeping + + new master/slave functionality needs a dependency on libwww-perl + + requires librrds-perl >= 1.2; update the dependency + * debian/patches: + + 30_missing_smoke.dpatch: removed, now included upstream. + * Update debian/copyright for the included javascript libraries. + * Wrap overlong dependency lines in debian/control. + * debian/rules: fix the build-stamp dependency so it will not skip + the patch step + * Include an example secret file for the master/slave functionality + * Upgrade apache recommendation to apache2. + + -- Niko Tyni Mon, 17 Sep 2007 10:57:29 +0300 + +smokeping (2.1.1-1) unstable; urgency=low + + * New upstream release. + * Patches included upstream: + + 40_password.dpatch + + 50_ldap.dpatch + + 60_fping.dpatch + + 70_syslog.dpatch + * Recommend echoping, don't list it as an alternative dependency. + * Suggest openssh-client instead of ssh. (Closes: #416539) + * Don't delete the smokeping user when the package is purged. + * Update debian/watch: upstream has moved. + * Rewrite the init script for LSB support. + + Depend on lsb-base accordingly. + * Add a note in README.Debian about sporadic problems with the + CGI reloading configuration changes. + * Point to the note when executing '/etc/init.d/smokeping reload'. + (Closes: #397609) + * debian/patches/30_missing_smoke.dpatch: show the visible part of all + smoke even if the rest of it doesn't fit on the scale. (Closes: #412826) + + -- Niko Tyni Mon, 14 May 2007 23:25:27 +0300 + +smokeping (2.0.9-2) unstable; urgency=low + + * debian/patches/15_clean_makefile.dpatch: + + remove unneeded and potentially unsecure include paths. + * debian/patches: selected patches from the upstream SVN repository + + 40_password.dpatch: skip reading the password file when running as a CGI. + + 50_ldap.dpatch: Make the 'scope' option in the LDAP probe actually work. + + 60_fping.dpatch: + * Support the '-S' (set source address, see #198486) fping option. + * Don't try to execute fping when running as a CGI. + + 70_syslog.dpatch: Don't die silently if syslogd is unavailable. + (Closes: #395056) + * Remove all the autogenerated documentation at clean time, to properly + undo the effects of the 'build' target. + * Install example configuration files for documentation. + + -- Niko Tyni Thu, 26 Oct 2006 21:45:56 +0300 + +smokeping (2.0.9-1) unstable; urgency=low + + * New upstream release + * Add debian/watch. + * Update debian/copyright. + + -- Niko Tyni Sat, 15 Jul 2006 10:11:06 +0300 + +smokeping (2.0.8-3) unstable; urgency=low + + * remove all configuration file modifications from postinst, as per policy. + * no need for debconf anymore; remove all translations as well. + * add a NEWS.Debian entry about configuration file incompatibilities + between versions 1.x and 2.x. + * Upgraded to Standards-Version 3.7.2. No changes needed. + + -- Niko Tyni Sun, 28 May 2006 23:02:09 +0300 + +smokeping (2.0.8-2) unstable; urgency=low + + * debian/patches/10_path_changes.dpatch: fix the library path. + (Closes: #363439) + * debian/control: move dpatch to Build-Depends, as it's + required for the 'clean' target. + * debian/po/cs.po: include a Czech translation from Miroslav Kure. + (Closes: #363118) + * debian/po/fr.po: include a French translation from Olivier Trichet. + (Closes: #364165) + * debian/rules: don't run the 'build' target twice. + * debian/postinst: accept 'reconfigure' as the first parameter. + + -- Niko Tyni Sun, 23 Apr 2006 20:33:29 +0300 + +smokeping (2.0.8-1) unstable; urgency=low + + [ Niko Tyni ] + * New upstream version. + + makes all the CGI self-referring links relative and provides a + new variable to configure this behaviour. (Closes: #351783) + * debian/postrm: + + only call deluser if the smokeping user exists + + redirect all deluser output to stderr so debconf won't get confused + * Delay init.d startup so the SSH probe can test against localhost + (Closes: #349832) + * Upgrade to debhelper compatibility level 5. + * Move debhelper from Build-Depends-Indep to Build-Depends, since it's + required in the 'clean' target. + * (po-)debconfize the postinst note on failed upgrade + + debian/po/fi.po: include a Finnish translation + + debian/po/es.po: include a Spanish translation + + debian/rules: add a dh_installdebconf call + + debian/control: Build-Depend on po-debconf, Depend on ${misc:Depends} + + [ Jose Carlos Garcia Sogo ] + * Integrate Niko work in latest versions. Again, a big thanks goes to him. + * debian/patches: + + 10_path_changes: included again. Also change tSmoke.dist paths. + + 20_conffile: included again. + + -- Jose Carlos Garcia Sogo Sun, 16 Apr 2006 13:03:43 +0200 + +smokeping (2.0.5-2) unstable; urgency=low + + * Merge smokeping--debian--2.0.5 branch when preparing the package: + + Change default perl location. (Closes: #339690) + + Change default config file. (Closes: #339816) + + -- Jose Carlos Garcia Sogo Sat, 19 Nov 2005 10:50:22 +0100 + +smokeping (2.0.5-1) unstable; urgency=low + + [ Niko Tyni ] + * New upstream version + + use the 'cgiurl' variable for all CGI self-refering links + (Closes: #339019) + * debian/doc-base: + + add document authors + + fix the text document directory + * debian/postrm: + + use 'deluser --system' to delete the user at purge time. + + [ Jose Carlos Garcia Sogo ] + * Merged smokeping--*--2.0.5 branches from Niko's repo. + + -- Jose Carlos Garcia Sogo Wed, 16 Nov 2005 23:35:23 +0100 + +smokeping (2.0.4-1) unstable; urgency=low + + [ Niko Tyni ] + * New upstream version + + doesn't create new RRD files when run with '--reload' (Closes: #333373) + + [ Jose Carlos Garcia Sogo ] + * Added Niko Tyni to the list of uploaders. Usually he is + doing much of the work, and I do not have any need of making any change. + + -- Jose Carlos Garcia Sogo Wed, 12 Oct 2005 19:52:40 +0200 + +smokeping (2.0.3-1) unstable; urgency=low + + [ Niko Tyni ] + * New upstream version + + Make the package build without extra Build-Depends. (Closes: #330009) + + [ Jose Carlos Garcia Sogo ] + * Integrate and upload. Thanks Niko for your work! + + -- Jose Carlos Garcia Sogo Sat, 1 Oct 2005 14:00:45 +0200 + +smokeping (2.0.2-1) unstable; urgency=low + + [ Niko Tyni ] + * New upstream version + * debian/init.d: implemented 'reload' + + [ Jose Carlos Garcia Sogo ] + * Merged versions 2.0.1-1 and 2.0.2-1 in my baz repository. + Thanks goes to Niko Tyni for his work. + * Changed FSF address from copyright file. + + -- Jose Carlos Garcia Sogo Sat, 24 Sep 2005 11:11:03 +0200 + +smokeping (2.0.1-1) unstable; urgency=low + + * New upstream version (Closes: #329339) + * try to upgrade the config file automatically + * give a warning and a pointer to the smokeping_upgrade doc + if the upgrade isn't succesful + + -- Niko Tyni Thu, 22 Sep 2005 17:58:53 +0000 + +smokeping (1.42-2) unstable; urgency=low + + * Fix problem in default config file not allowing white space + which was added in previous version for local fping target. (Closes: #324846) + * debian/control: have to depend on adduser as it is being used in postinst. + + -- Jose Carlos Garcia Sogo Sun, 28 Aug 2005 20:36:32 +0200 + +smokeping (1.42-1) unstable; urgency=low + + * New upstream version + + Works with RRDtool > 1.2 (Closes: #309344) + + Fixed curl documentation (Closes: #283652) + + Added an 'include' directive in config parser (Closes: #307955) + + * Changed default location of sendmail to /usr/sbin (Closes: #302164) + * Added localhost as default fping target (Closes: #307954) + * Standars-version bumped to 3.6.2. No changes needed. + * README.Debian: document enabled localhost fping probe. + + -- Jose Carlos Garcia Sogo Thu, 18 Aug 2005 00:06:45 +0200 + +smokeping (1.38-3) unstable; urgency=low + + * Include missing matchers methods in binary package (Closes: #295354) + * Add missing suggests: libnet-dns-perl, ssh, libio-socket-ssl-perl, + libnet-telnet-perl (Closes: #295372) + + -- Jose Carlos Garcia Sogo Sun, 13 Mar 2005 13:55:44 +0100 + +smokeping (1.38-2) unstable; urgency=low + + * Added missing Build-Dependecy in groff. (Closes: #292949) + + -- Jose Carlos Garcia Sogo Sat, 5 Feb 2005 19:14:48 +0100 + +smokeping (1.38-1) unstable; urgency=low + + * The "upstream releases just when a new upstream release is uploaded to the + archive" release. + * New upstream release. + * debian/postinst: only create smokeping user if it does not exist yet. + + -- Jose Carlos Garcia Sogo Sun, 30 Jan 2005 18:36:24 +0100 + +smokeping (1.37-1) unstable; urgency=low + + * New upstream version (Closes: #289126) + * debian/patches: + + 40_fping-packet.dpatch, + + 50_concurrent-probes.dpatch, + + 60_makepod-without-config.dpatch, + + 65_fix_generating_docs.dpatch, + + 68_typos.dpatch: disabled. They are applied upstream + + 70_regenerated_docs.dpatch: updated. It is empty as docs are uptodate + in the upstream tarball. + + * debian/postinst: + + don't edit unconditionally config file. (Closes: #288628) + + fix here permissions for different dirs instead of in rules file. + + create smokeping system user + + * debian/postrm: + + delete smokeping system user on purge. + + * debian/init.d: + + run smokeping daemon as its own user. (Closes: #287253) + + * debian/rules: + + update-docs target should only regenerate pod files (Closes: #287508) + + install perl modules manpages with the probes::, matchers:: or ISG:: + prefix, as neeeded. (Closes: #288922) + + -- Jose Carlos Garcia Sogo Sun, 30 Jan 2005 17:18:53 +0100 + +smokeping (1.34-4) unstable; urgency=low + + * debian/patches: + + 30_typos: moved to 68_typos. + + 50_concurrent-probes: patch the patch. Fix signal handling. + Thanks again to Niko Tyni. (Closes: #288082) + + 65_fix_generating_docs: patch Makefile to allow generating docs without + having SmokePing installed. + + 68_typos: fix different typos in sources. + + 70_regenerated_docs: updated. + + * debian/rules: + + New update-docs target, which should be used to upgrade + 70_regenerated_docs patch. + + -- Jose Carlos Garcia Sogo Mon, 3 Jan 2005 13:55:53 +0100 + +smokeping (1.34-3) unstable; urgency=low + + * The "2004 is death - Long life to 2005!" release. + * Some docs have been moved to subdirectories. Reinstall them in + /usr/share/doc/smokeping (Closes: #287250) + * Documentation reorganized: + + *.pod files removed. We don't need to distribute those files. + + install documentation in two main subdirectories, txt and html. + Inside create both 'probes' and 'matchers' subdirectories. + + manpages are installed either in man1 or man3, depending on + the section described inside the file. File names are incorrect, so + we rename manpages being moved to section 3. + * debian/patches: + + 20_conffile: enable syslog logging by default. (Closes: #287825) + + 30_typos: New. s/secion/section/g and other typos in documentation and + source files. (Closes: #283643) + + 50_concurrent-probes: New. Allow probes to be executed in separate + processes. This permits probe-specific parameters and offset. + Thanks to Niko Tyni and Marc Haber (Closes: #283533) + + 60_makepod-without-config: New. Let 'smokeping -makepod' be run + without a config file. Thanks to Niko Tyni. + + 70_regenerated_docs: New. Contains doc regenerated to show new options + added in version 1.34-2. (Closes: #287508) + + -- Jose Carlos Garcia Sogo Fri, 31 Dec 2004 19:20:55 +0100 + +smokeping (1.34-2) unstable; urgency=low + + * Build-Depend on dpatch >= 2.0.9, as it now uses new dpatch-run + (Closes: #286431) + * Applied patch from Niko Tyni to allow fping probes with different + packet sizes. Thanks! (Closes: #283647) + + -- Jose Carlos Garcia Sogo Mon, 20 Dec 2004 23:15:52 +0100 + +smokeping (1.34-1) unstable; urgency=low + + * New upstream release. (Closes: #283621) + + Fixes whatis error in manpages. (Closes: #210622) + * debian/control: + + depend on exim4 | mail-transport-agent, as we are using + "sendmail" command in default config. (Closes: #274718) + + Recommends apache | httpd to conform with Policy. + * debian/patches: + + 10_path_changes: updated + + 30_typos: new. s/secion/section/g on every the doc. + + -- Jose Carlos Garcia Sogo Sun, 19 Dec 2004 19:44:41 +0100 + +smokeping (1.31-2) unstable; urgency=high + + * init.d: If not running, restart should start the daemon. (Closes: #275861) + * Urgency high as it fixes a RC bug also present in Sarge. + + -- Jose Carlos Garcia Sogo Mon, 11 Oct 2004 13:01:47 +0200 + +smokeping (1.31-1) unstable; urgency=low + + * New upstream version. + + -- Jose Carlos Garcia Sogo Thu, 5 Aug 2004 22:56:20 +0200 + +smokeping (1.30-1) unstable; urgency=low + + * New upstrem version. (Closes: #248264) + + -- Jose Carlos Garcia Sogo Fri, 14 May 2004 18:20:34 +0200 + +smokeping (1.28-1) unstable; urgency=low + + * New upstream version. (Closes: #240628) + * Removed 30_upstream_Smokeping.dpatch -- Included upstream. + + -- Jose Carlos Garcia Sogo Sun, 28 Mar 2004 22:22:22 +0200 + +smokeping (1.26-2) unstable; urgency=low + + * Added dpatch to Build-Depends. (Closes: #235077) + + -- Jose Carlos Garcia Sogo Fri, 27 Feb 2004 15:39:39 +0100 + +smokeping (1.26-1) unstable; urgency=low + + * New upstream version. (Closes: #233687) + * Ack previous NMU. Thanks Matthias. (Closes: #226829) + * Moved perl stuff from /usr/lib/perl5 to /usr/shre/perl5 as those files are + not Perl executables. + * Do not list /etc/smokeping files in conffiles, so they're not listed twice + when building the package. + * Using dpatch now. It makes really easier to mantain all those path changes + we need to do in upstream source: + - 10_path_changes.dpatch: Changes upstream paths to Debian ones. + - 20_conffile.dpatch: Creates a template conffile suitable for everyone. + - 30_upstream_Smokeping.dpatch: last minute upstream patch to + Smokeping.pm file fixing some typos. + * Suggests libnet-ldap-perl and libauthen-radius-perl for the new probes. + + -- Jose Carlos Garcia Sogo Sat, 21 Feb 2004 14:09:16 +0100 + +smokeping (1.25-1.1) unstable; urgency=low + + * NMU. + * Include the correct cgi script (closes: #226829). + * Suggests curl. + + -- Matthias Klose Wed, 21 Jan 2004 21:28:09 +0100 + +smokeping (1.25-1) unstable; urgency=low + + * New upstream release (Closes: #216163, #218974) + * Bumped Standars-Version. No changes needed. + + -- Jose Carlos Garcia Sogo Mon, 5 Jan 2004 21:30:53 +0100 + +smokeping (1.20-3) unstable; urgency=low + + * Fixed how email adresses are parsed. (Closes: #193697) + * Fixed permissions in /var/lib/smokeping dir so the CGI can + also write in it. (Closes: #193749) + * Fixed init.d script so it doesn't fail when trying to remove a stopped + smokeping package. (Closes: #193855) + + -- Jose Carlos Garcia Sogo Fri, 23 May 2003 22:16:27 +0200 + +smokeping (1.20-2) unstable; urgency=low + + * Changed the order in which /usr/share/doc/smokeping/pod/smokeping.pod link + is created, so we don't clash when installing *.pod files there. + (Closes: #193095) + + -- Jose Carlos Garcia Sogo Thu, 15 May 2003 23:18:21 +0200 + +smokeping (1.20-1) unstable; urgency=low + + * New upstream version. + * Added a dnsutils to recommends field, as it is used by DNS probe. + * Standars-Version bumped to 3.5.9. + + -- Jose Carlos Garcia Sogo Mon, 12 May 2003 16:08:08 +0200 + +smokeping (1.19-1) unstable; urgency=low + + * New upstream version. Add a DNS probe. + + -- Jose Carlos Garcia Sogo Thu, 20 Feb 2003 15:46:37 +0100 + +smokeping (1.18-1) unstable; urgency=low + + * New upstream release. + - Allow sub millisecond patterns. + - Report a full link in smokeping alerts. + + -- Jose Carlos Garcia Sogo Mon, 16 Dec 2002 16:15:44 +0100 + +smokeping (1.16-1) unstable; urgency=low + + * New upstream release: + - Graphs are showed in logarithmic scale. + - Added IOSPing probe. + + -- Jose Carlos Garcia Sogo Fri, 8 Nov 2002 20:50:19 +0100 + +smokeping (1.15-2) unstable; urgency=low + + * Changed postinst to check if $2 parameter passed to dpkg + --compare-versions isn't empty. (Closes: #164451) + * Upped dependencies to speedy-cgi-perl (2.21-1) and perl (5.8). + + -- Jose Carlos Garcia Sogo Sat, 12 Oct 2002 13:05:49 +0200 + +smokeping (1.15-1) unstable; urgency=low + + * Another upstream release: + - Bugfixes. + - Allow to call an external script upon matching an alert pattern. + - Unified mail tools. + + -- Jose Carlos Garcia Sogo Sat, 28 Sep 2002 12:42:28 +0200 + +smokeping (1.14-1) unstable; urgency=low + + * New upstream release: + - Some bugfixes. + + -- Jose Carlos Garcia Sogo Sat, 28 Sep 2002 12:35:52 +0200 + +smokeping (1.13-1) unstable; urgency=low + + * New upstream release. + + -- Jose Carlos Garcia Sogo Mon, 9 Sep 2002 21:03:01 +0200 + +smokeping (1.12-3) unstable; urgency=low + + * Fixed dependencies for Perl 5.8 + * Changed fping path to /usr/bin (Closes: #157905) + + -- Jose Carlos Garcia Sogo Sun, 1 Sep 2002 21:35:10 +0200 + +smokeping (1.12-2) unstable; urgency=low + + * Moved rddtool data files to /var/lib/smokeping to comply + with FHS. With this we don't need to make tricks with the owner + of smokeping binary and with /var/www/smokeping perms. (Closes: #152475) + + -- Jose Carlos Garcia Sogo Sat, 20 Jul 2002 13:43:34 +0200 + +smokeping (1.12-1) unstable; urgency=low + + * The "Once more I didn't received Freshmeat release announcement" release. + * New upstream release. + + -- Jose Carlos Garcia Sogo Sat, 8 Jun 2002 09:23:10 +0200 + +smokeping (1.11-1) unstable; urgency=low + + * New upstream release. + + -- Jose Carlos Garcia Sogo Sat, 11 May 2002 15:49:10 +0200 + +smokeping (1.9-2) unstable; urgency=low + + * Added a recommends in libsocket6-perl (Closes: #145164) + + -- Jose Carlos Garcia Sogo Wed, 1 May 2002 14:56:18 +0200 + +smokeping (1.9-1) unstable; urgency=low + + * New upstream release. + + -- Jose Carlos Garcia Sogo Tue, 30 Apr 2002 00:27:05 +0200 + +smokeping (1.8-1) unstable; urgency=low + + * New upstream release. + + -- Jose Carlos Garcia Sogo Fri, 26 Apr 2002 23:12:31 +0200 + +smokeping (1.6-2) unstable; urgency=low + + * Changed /usr/bin/perl for /usr/bin/speedy in the smokeping binary and the + smokeping cgi. (Closes: #140384) + + -- Jose Carlos Garcia Sogo Tue, 2 Apr 2002 15:02:08 +0200 + +smokeping (1.6-1) unstable; urgency=low + + * New upstream release. (Closes: #140056) + + -- Jose Carlos Garcia Sogo Thu, 28 Mar 2002 16:39:52 +0100 + +smokeping (1.5-1) unstable; urgency=low + + * New upstream release. + * Added support for echoping. + * Changed "don't touch this" /etc/smokeping/config message. + (Closes: #137836) + + -- Jose Carlos Garcia Sogo Mon, 11 Mar 2002 15:54:37 +0100 + +smokeping (1.4-2) unstable; urgency=low + + * Added forgotten #DEBHELPER# line in postinst. + Sorry for the new release, but the new incoming system works this way. + + -- Jose Carlos Garcia Sogo Sun, 10 Mar 2002 15:59:40 +0100 + +smokeping (1.4-1) unstable; urgency=low + + * New upstream release. + + -- Jose Carlos Garcia Sogo Sun, 10 Mar 2002 15:28:38 +0100 + +smokeping (1.3-1) unstable; urgency=low + + * New upstream release. + + -- Jose Carlos Garcia Sogo Sat, 9 Mar 2002 00:03:08 +0100 + +smokeping (1.1-2) unstable; urgency=low + + * Added README.Debian file explaining where to go after installing the + package to configure it, and the man page in which you can get info. + * Added a missed dependency on libdigest-md5-perl. (Closes: #136255) + + -- Jose Carlos Garcia Sogo Fri, 1 Mar 2002 19:52:04 +0100 + +smokeping (1.1-1) unstable; urgency=low + + * Initial Release. (Closes: #133824) + + -- Jose Carlos Garcia Sogo Wed, 13 Feb 2002 23:11:07 +0100 + --- smokeping-2.3.6.orig/debian/NEWS +++ smokeping-2.3.6/debian/NEWS @@ -0,0 +1,61 @@ +smokeping (2.3.6-4) unstable; urgency=low + + The file hierarchy available to the web server has been moved + away from /var/www, which was a non-standard location. The recommended + way to set up the web part of Smokeping is to use the Apache2 configuration + supplied in /etc/smokeping/apache2.conf. This is done automatically + on new installations, see the README.Debian file. + . + Although the upgrade procedure tries to keep old setups working + with symlinks, make sure to merge the pathname changes in + /etc/smokeping/config.d/pathnames. Deleting /var/www/smokeping + afterwards should be safe if you have no manually added content there. + . + The recommended URL path to the CGI script is now /smokeping/smokeping.cgi + rather than /cgi-bin/smokeping.cgi. The latter should still work + through a symlink. + . + . + The default character set in /etc/smokeping/config.d/Presentation has + been changed to UTF-8. If you were relying on the former ISO-8859-15 + setting, just edit the file to reflect this. + + -- Niko Tyni Tue, 21 Jul 2009 20:17:24 +0300 + +smokeping (2.3.5-1) experimental; urgency=low + + The configuration file, /etc/smokeping/config, has been split into + subsection snippets in /etc/smokeping/config.d to ease merging of + configuration changes. The installation scripts will automatically + split the old configuration on upgrades, but the split won't take + effect unless ucf is allowed to overwrite /etc/smokeping/config. + . + This version also includes packaging changes to make the new + master/slave functionality work. A new directory, /var/lib/smokeping/__cgi, + has been created so that the CGI on a master host can queue up + ping results received from its slaves. The main Smokeping daemon + will then monitor the queue and update the RRD files accordingly. + . + Make sure to merge the new 'dyndir' and 'precreateperms' General section + variables on upgrades, otherwise the master/slave functionality (and + most probably also the old DYNAMIC host functionality) will not work. + + -- Niko Tyni Sat, 29 Mar 2008 23:39:33 +0200 + +smokeping (2.0.8-3) unstable; urgency=low + + When upgrading from Smokeping versions 1.x to 2.x, you may have to edit + the configuration file /etc/smokeping/config. The most common incompatibility + is that the 'PROBE_CONF' lines are neither needed nor accepted anymore. Simply + deleting these lines is sufficient. + + There are some other small incompatibilities; a list of those can be found + in the smokeping_upgrade(7) document. As the Smokeping configuration file + parser is now much more strict than in 1.x, the daemon complains about + these at startup and refuses to start. + + (This entry applies to all Smokeping 2.x versions, but was only added in + version 2.0.8-3.) + + -- Niko Tyni Sun, 28 May 2006 22:30:53 +0300 + --- smokeping-2.3.6.orig/debian/rules +++ smokeping-2.3.6/debian/rules @@ -0,0 +1,144 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PACKAGE=smokeping +TMP=$(CURDIR)/debian/$(PACKAGE) + +include /usr/share/dpatch/dpatch.make + +build: build-stamp +build-stamp: patch-stamp + + $(MAKE) docdirs man html txt rename-man + touch build-stamp + +clean: clean-patched unpatch + +clean-patched: + dh_testdir + dh_testroot + + dh_clean + + $(MAKE) killdoc + $(RM) doc/pod2htm[di].tmp + + rm -f build-stamp + +install: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + install -d $(TMP)/usr/share/smokeping/lib + install -m 644 lib/*pm $(TMP)/usr/share/smokeping/lib + rm -f $(TMP)/usr/share/smokeping/lib/BER.pm + rm -f $(TMP)/usr/share/smokeping/lib/SNMP_* + + install -d $(TMP)/usr/share/smokeping/lib/Smokeping + install -m 644 lib/Smokeping/*pm $(TMP)/usr/share/smokeping/lib/Smokeping + + install -d $(TMP)/usr/share/smokeping/lib/Smokeping/probes + install -m 644 lib/Smokeping/probes/*pm $(TMP)/usr/share/smokeping/lib/Smokeping/probes + + install -d $(TMP)/usr/share/smokeping/lib/Smokeping/matchers + install -m 644 lib/Smokeping/matchers/*pm $(TMP)/usr/share/smokeping/lib/Smokeping/matchers + + install -d $(TMP)/usr/share/smokeping/lib/Smokeping/sorters + install -m 644 lib/Smokeping/sorters/*pm $(TMP)/usr/share/smokeping/lib/Smokeping/sorters + + install -d $(TMP)/usr/sbin/ + install -m 755 bin/smokeping.dist $(TMP)/usr/sbin/smokeping + install -m 755 bin/tSmoke.dist $(TMP)/usr/sbin/tSmoke + + install -d $(TMP)/etc/default + install -m 644 debian/defaults $(TMP)/etc/default/smokeping + + install -d $(TMP)/etc/smokeping + install -m 644 debian/apache2.conf $(TMP)/etc/smokeping/ + + # these are managed with ucf + install -d $(TMP)/usr/share/smokeping/etc + install -m 644 etc/basepage.html.dist $(TMP)/usr/share/smokeping/etc/ + install -m 644 debian/basepage.html.dist.md5sum $(TMP)/usr/share/smokeping/etc/ + install -m 644 debian/default-config $(TMP)/usr/share/smokeping/etc/ + install -m 644 debian/default-config.md5sum $(TMP)/usr/share/smokeping/etc/ + install -d $(TMP)/usr/share/smokeping/etc/config.d + install -m 644 debian/config.d/* $(TMP)/usr/share/smokeping/etc/config.d/ + cp -R debian/oldconfigs $(TMP)/usr/share/smokeping/oldconfigs + cp -R debian/config.d.md5sums $(TMP)/usr/share/smokeping/etc/config.d.md5sums + install -m 644 etc/smokemail.dist $(TMP)/usr/share/smokeping/etc/ + install -m 644 etc/tmail.dist $(TMP)/usr/share/smokeping/etc/ + + install -d $(TMP)/usr/share/smokeping/cgi-bin + install -m 755 htdocs/smokeping.cgi.dist $(TMP)/usr/share/smokeping/cgi-bin/smokeping.cgi + dh_link /usr/share/smokeping/cgi-bin/smokeping.cgi /usr/lib/cgi-bin/smokeping.cgi + + install -d $(TMP)/usr/share/smokeping/www/javascript + install -m 644 htdocs/cropper/smokeping-zoom.js $(TMP)/usr/share/smokeping/www/javascript/ + + dh_link /var/cache/smokeping/images /usr/share/smokeping/www/images + + for d in cropper prototype scriptaculous; do \ + dh_link /usr/share/javascript/$$d /usr/share/smokeping/www/javascript/$$d; \ + done + + install -d $(TMP)/usr/share/doc/$(PACKAGE)/html + install -d $(TMP)/usr/share/doc/$(PACKAGE)/html/Smokeping + install -d $(TMP)/usr/share/doc/$(PACKAGE)/html/Smokeping/probes + install -d $(TMP)/usr/share/doc/$(PACKAGE)/html/Smokeping/matchers + install -d $(TMP)/usr/share/doc/$(PACKAGE)/html/Smokeping/sorters + install -d $(TMP)/usr/share/doc/$(PACKAGE)/txt + install -d $(TMP)/usr/share/doc/$(PACKAGE)/txt/Smokeping + install -d $(TMP)/usr/share/doc/$(PACKAGE)/txt/Smokeping/probes + install -d $(TMP)/usr/share/doc/$(PACKAGE)/txt/Smokeping/matchers + install -d $(TMP)/usr/share/doc/$(PACKAGE)/txt/Smokeping/sorters + + install -m 644 doc/*.txt $(TMP)/usr/share/doc/$(PACKAGE)/txt + install -m 644 doc/Smokeping/*.txt $(TMP)/usr/share/doc/$(PACKAGE)/txt/Smokeping + install -m 644 doc/Smokeping/probes/*.txt $(TMP)/usr/share/doc/$(PACKAGE)/txt/Smokeping/probes + install -m 644 doc/Smokeping/matchers/*.txt $(TMP)/usr/share/doc/$(PACKAGE)/txt/Smokeping/matchers + install -m 644 doc/Smokeping/sorters/*.txt $(TMP)/usr/share/doc/$(PACKAGE)/txt/Smokeping/sorters + + install -m 644 doc/*.html $(TMP)/usr/share/doc/$(PACKAGE)/html + install -m 644 doc/Smokeping/*.html $(TMP)/usr/share/doc/$(PACKAGE)/html/Smokeping + install -m 644 doc/Smokeping/probes/*.html $(TMP)/usr/share/doc/$(PACKAGE)/html/Smokeping/probes + install -m 644 doc/Smokeping/matchers/*.html $(TMP)/usr/share/doc/$(PACKAGE)/html/Smokeping/matchers + install -m 644 doc/Smokeping/sorters/*.html $(TMP)/usr/share/doc/$(PACKAGE)/html/Smokeping/sorters + + for s in 1 3 5 7;\ + do\ + install -d $(TMP)/usr/share/man/man$$s;\ + find doc -path doc/Config -prune -o \( -name \*.$$s -print \) | \ + while read f; do install -m 644 $$f $(TMP)/usr/share/man/man$$s; done ; \ + done + +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + + # We should start later than ssh (20), so the SSH probe can test against localhost. + # Just in case, delay initialization even after apache (91). + dh_installinit -- defaults 92 20 + + dh_installman + dh_installchangelogs CHANGES + dh_link + dh_strip + dh_compress + dh_fixperms + dh_perl + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep +.PHONY: clean binary-indep binary install build --- smokeping-2.3.6.orig/debian/basepage.html.dist.md5sum +++ smokeping-2.3.6/debian/basepage.html.dist.md5sum @@ -0,0 +1,3 @@ +9f0906dfa1ddc75f3b39f832eae2f17a 2.3.0 +e267db87c75898b908ebce8bac885a92 2.2.4 +5e2de5e6384343df995b08d1e15664d3 2.0.2 --- smokeping-2.3.6.orig/debian/defaults +++ smokeping-2.3.6/debian/defaults @@ -0,0 +1,16 @@ +# /etc/default/smokeping: Startup configuration for smokeping(1) +# +# select master or slave mode +MODE=master +# in master mode, the rest of the configuration is in +# /etc/smokeping/config +# +# in slave mode, uncomment and set the following variables too +# see smokeping(1) +# +# Mandatory configuration +# MASTER_URL=http://somewhere/cgi-bin/smokeping.cgi +# SHARED_SECRET=/etc/smokeping/slavesecrets.conf +# +# Optional configuration +# SLAVE_NAME=myslave --- smokeping-2.3.6.orig/debian/copyright +++ smokeping-2.3.6/debian/copyright @@ -0,0 +1,195 @@ +This package was debianized by Jose Carlos Garcia Sogo on +Wed, 13 Feb 2002 23:11:07 +0100. + +It was downloaded from http://people.ee.ethz.ch/~oetiker/webtools/smokeping/ + +Upstream authors: Tobias Oetiker and Niko Tyni + +Copyright: + + Copyright (c) 2001-2005 Tobias Oetiker + +The file bin/tSmoke.dist has the following copyright: + + Copyright (c) 2003 by Dan McGinn-Combs. All right reserved. + +The files lib/Smokeping/Examples.pm and lib/Smokeping/RRDtools.pm +have the following copyright: + + Copyright 2005 by Niko Tyni. + +The files Avgratio.pm, Median.pm and base.pm in lib/Smokeping/matchers/ +have the following copyright: + + Copyright (c) 2004 by OETIKER+PARTNER AG. All rights reserved. + +The files CheckLatency.pm and CheckLoss.pm in lib/Smokeping/matchers/ +have the following copyright: + + Copyright (c) 2006 Dylan C Vanderhoof, Semaphore Corporation + +All files expect those mentioned below share the GPL license: + + All rights reserved. + + 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +You can find a copy of GPL license at /usr/share/common-licenses/GPL + +The files in the lib/Config directory belong the bundled Config::Grammar +Perl module and share the following copyright and license: + + Copyright (c) 2000-2005 by ETH Zurich. All rights reserved. + Copyright (c) 2007 by David Schweikert. All rights reserved. + + This program is free software; you can redistribute it and/or modify it + under the same terms as Perl itself. + +Perl is distributed under the terms of either the Artistic license or the GPL +(version 1 or later). You can find a copy of the Artistic license at +/usr/share/common-licenses/Artistic and the license of Perl itself at +/usr/share/doc/perl/copyright . + +The files lib/BER.pm and lib/SNMP_Session.pm, which are not used in the +Debian version, have the following copyright and license: + + Copyright (c) 1995-2002, Simon Leinen. + + This program is free software; you can redistribute it under the + "Artistic License" included in this distribution (file "Artistic"). + +The file lib/SNMP_util.pm, which is not used in the Debian version, +has the following copyright and license: + Copyright (c) 1998-2002, Mike Mitchell. + + This program is free software; you can redistribute it under the + "Artistic License" included in this distribution (file "Artistic"). + +You can find a copy of the Artistic license at /usr/share/common-licenses/Artistic + +The files HMAC.pm, HMAC_MD5.pm and HMAC_SHA1.pm in lib/Digest are +copies from the Digest::HMAC module and are not used in the Debian +package. They share the following copyright and license, included as +lib/Digest/HMAC.LICENSE: + + Copyright 1998-2001 Gisle Aas. + Copyright 1998 Graham Barr. + + This library is free software; you can redistribute it and/or + modify it under the same terms as Perl itself. + +The files htdocs/cropper/cropper.js and htdocs/cropper/cropper.uncompressed.js +have the following copyright and license: + + Copyright (c) 2006, David Spurr (http://www.defusion.org.uk/) + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of the David Spurr nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "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 COPYRIGHT + OWNER 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. + + http://www.opensource.org/licenses/bsd-license.php + +The files in the htdocs/cropper/lib directory have the following copyright +and license: + + builder.js + effects.js + scriptaculous.js + Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) + + controls.js + Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) + (c) 2005 Ivan Krstic (http://blogs.law.harvard.edu/ivan + (c) 2005 Jon Tirsen (http://www.tirsen.com) + + dragdrop.js + Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) + (c) 2005 Sammi Williams (http://www.oriontransfer.co.nz, + sammi@oriontransfer.co.nz) + + slider.js + Copyright (c) 2005 Marty Haught, Thomas Fuchs + + unittest.js + Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) + (c) 2005 Jon Tirsen (http://www.tirsen.com) + (c) 2005 Michael Schuerig (http://www.schuerig.de/michael/) + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + prototype.js + (c) 2005 Sam Stephenson + + Prototype is freely distributable under the terms of an MIT-style license. + For details, see the Prototype web site: http://prototype.conio.net/ + +This 'MIT-style' license is included in prototype.js.LICENSE: + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-- Niko Tyni Mon, 17 Sep 2007 11:11:14 +0300 + --- smokeping-2.3.6.orig/debian/README.Debian +++ smokeping-2.3.6/debian/README.Debian @@ -0,0 +1,37 @@ + + After installing the package you have to edit the file + /etc/smokeping/config to set your preferences. You can follow + the example provided. + Note that the domain names are bogus to avoid all the people + who install the package DoSing the same servers, but at the same time + an fping probe in localhost is enabled, so you can check if smokeping + works for you. + + You can also edit the file /etc/smokeping/basepage.html to suit + your needs. + + Anyway, please refer to the smokeping_config man page to see + all the available options. + +-- Jose Carlos Garcia Sogo + +The web server configuration is done automatically on new installations +when possible. If that doesn't happen, the recommended way to get the +CGI script working is + + ln -s /etc/smokeping/apache2.conf /etc/apache2/conf.d/smokeping + invoke-rc.d apache2 restart + +See NEWS.Debian for information on upgrades from older versions of +the package. + +-- Niko Tyni Tue, 21 Jul 2009 20:16:42 +0300 + +If you have problems getting the CGI to reload your configuration +file after changes, you may have to kill lingering speedy_backend +processes. See #397609. This should not happen, but I haven't found +the bug yet. If you have a reproducible way to trigger this, +please send me your configuration files before and after the change. + +-- Niko Tyni Mon, 14 May 2007 23:14:10 +0300 + --- smokeping-2.3.6.orig/debian/doc-base +++ smokeping-2.3.6/debian/doc-base @@ -0,0 +1,14 @@ +Document: smokeping +Author: Tobi Oetiker and Niko Tyni +Title: smokeping +Abstract: SmokePing is a latency logging and graphing system. It consists of + a daemon process which organizes the latency measurements and a CGI + which presents the graphs.. +Section: Network/Monitoring + +Format: HTML +Index: /usr/share/doc/smokeping/html/smokeping.html +Files: /usr/share/doc/smokeping/html/* + +Format: text +Files: /usr/share/doc/smokeping/txt/*.txt* --- smokeping-2.3.6.orig/debian/config.d.md5sums/Slaves.md5sum +++ smokeping-2.3.6/debian/config.d.md5sums/Slaves.md5sum @@ -0,0 +1 @@ +d41d8cd98f00b204e9800998ecf8427e /dev/null --- smokeping-2.3.6.orig/debian/config.d/Targets +++ smokeping-2.3.6/debian/config.d/Targets @@ -0,0 +1,23 @@ +*** Targets *** + +probe = FPing + +## You have to edit and uncomment all what you want below this. +# Please, refer to smokeping_config man page for more info +# The given adresses aren't real to avoid DoS. + +menu = Top +title = Network Latency Grapher +remark = Welcome to the SmokePing website of 'A poorly \ + mantained site running Debian.' + ++ Local + +menu = Local +title = Local Network + +++ LocalMachine + +menu = Local Machine +title = This host +host = localhost --- smokeping-2.3.6.orig/debian/config.d/Presentation +++ smokeping-2.3.6/debian/config.d/Presentation @@ -0,0 +1,57 @@ +*** Presentation *** + +template = /etc/smokeping/basepage.html +charset = utf-8 + ++ charts + +menu = Charts +title = The most interesting destinations + +++ stddev +sorter = StdDev(entries=>4) +title = Top Standard Deviation +menu = Std Deviation +format = Standard Deviation %f + +++ max +sorter = Max(entries=>5) +title = Top Max Roundtrip Time +menu = by Max +format = Max Roundtrip Time %f seconds + +++ loss +sorter = Loss(entries=>5) +title = Top Packet Loss +menu = Loss +format = Packets Lost %f + +++ median +sorter = Median(entries=>5) +title = Top Median Roundtrip Time +menu = by Median +format = Median RTT %f seconds + ++ overview + +width = 600 +height = 50 +range = 10h + ++ detail + +width = 600 +height = 200 +unison_tolerance = 2 + +"Last 3 Hours" 3h +"Last 30 Hours" 30h +"Last 10 Days" 10d +"Last 400 Days" 400d + +#+ hierarchies +#++ owner +#title = Host Owner +#++ location +#title = Location + --- smokeping-2.3.6.orig/debian/config.d/Database +++ smokeping-2.3.6/debian/config.d/Database @@ -0,0 +1,15 @@ +*** Database *** + +step = 300 +pings = 20 + +# consfn mrhb steps total + +AVERAGE 0.5 1 1008 +AVERAGE 0.5 12 4320 + MIN 0.5 12 4320 + MAX 0.5 12 4320 +AVERAGE 0.5 144 720 + MAX 0.5 144 720 + MIN 0.5 144 720 + --- smokeping-2.3.6.orig/debian/config.d/General +++ smokeping-2.3.6/debian/config.d/General @@ -0,0 +1,15 @@ +*** General *** + +@include /etc/smokeping/config.d/pathnames + +# Please edit this to suit your installation +owner = Joe Random +contact = joe@some.place.xyz +cgiurl = http://put_here_your_domain/cgi-bin/smokeping.cgi +mailhost = smtp.mailhost.abc +# specify this to get syslog logging +syslogfacility = local0 +# each probe is now run in its own process +# disable this to revert to the old behaviour +# concurrentprobes = no + --- smokeping-2.3.6.orig/debian/config.d/Slaves +++ smokeping-2.3.6/debian/config.d/Slaves @@ -0,0 +1,9 @@ +# *** Slaves *** +# +## make sure this is not world-readable! +## secrets=/etc/smokeping/slave-secrets +# +# +slave1 +# display_name=slave_name +# color=0000ff + --- smokeping-2.3.6.orig/debian/config.d/Alerts +++ smokeping-2.3.6/debian/config.d/Alerts @@ -0,0 +1,28 @@ +*** Alerts *** +to = alertee@address.somewhere +from = smokealert@company.xy + ++bigloss +type = loss +# in percent +pattern = ==0%,==0%,==0%,==0%,>0%,>0%,>0% +comment = suddenly there is packet loss + ++someloss +type = loss +# in percent +pattern = >0%,*12*,>0%,*12*,>0% +comment = loss 3 times in a row + ++startloss +type = loss +# in percent +pattern = ==S,>0%,>0%,>0% +comment = loss at startup + ++rttdetect +type = rtt +# in milli seconds +pattern = <10,<10,<10,<10,<10,<100,>100,>100,>100 +comment = routing messed up again ? + --- smokeping-2.3.6.orig/debian/config.d/Probes +++ smokeping-2.3.6/debian/config.d/Probes @@ -0,0 +1,6 @@ +*** Probes *** + ++ FPing + +binary = /usr/bin/fping + --- smokeping-2.3.6.orig/debian/config.d/pathnames +++ smokeping-2.3.6/debian/config.d/pathnames @@ -0,0 +1,9 @@ +sendmail = /usr/sbin/sendmail +imgcache = /var/cache/smokeping/images +imgurl = ../smokeping/images +datadir = /var/lib/smokeping +dyndir = /var/lib/smokeping/__cgi +piddir = /var/run/smokeping +smokemail = /etc/smokeping/smokemail +tmail = /etc/smokeping/tmail +precreateperms = 2775 --- smokeping-2.3.6.orig/debian/oldconfigs/2.3.2-1/Presentation +++ smokeping-2.3.6/debian/oldconfigs/2.3.2-1/Presentation @@ -0,0 +1,56 @@ +*** Presentation *** + +template = /etc/smokeping/basepage.html + ++ charts + +menu = Charts +title = The most interesting destinations + +++ stddev +sorter = StdDev(entries=>4) +title = Top Standard Deviation +menu = Std Deviation +format = Standard Deviation %f + +++ max +sorter = Max(entries=>5) +title = Top Max Roundtrip Time +menu = by Max +format = Max Roundtrip Time %f seconds + +++ loss +sorter = Loss(entries=>5) +title = Top Packet Loss +menu = Loss +format = Packets Lost %f + +++ median +sorter = Median(entries=>5) +title = Top Median Roundtrip Time +menu = by Median +format = Median RTT %f seconds + ++ overview + +width = 600 +height = 50 +range = 10h + ++ detail + +width = 600 +height = 200 +unison_tolerance = 2 + +"Last 3 Hours" 3h +"Last 30 Hours" 30h +"Last 10 Days" 10d +"Last 400 Days" 400d + +#+ hierarchies +#++ owner +#title = Host Owner +#++ location +#title = Location + --- smokeping-2.3.6.orig/debian/oldconfigs/2.0.9-2/Targets +++ smokeping-2.3.6/debian/oldconfigs/2.0.9-2/Targets @@ -0,0 +1,98 @@ +*** Targets *** + +probe = FPing + +## You have to edit and uncomment all what you want below this. +# Please, refer to smokeping_config man page for more info +# The given adresses aren't real to avoid DoS. + +menu = Top +title = Network Latency Grapher +remark = Welcome to the SmokePing website of 'A poorly \ + mantained site running Debian.' + ++ Local + +menu = Local +title = Local Network + +++ LocalMachine + +menu = Local Machine +title = This own machine +host = localhost + ++ World + +menu = World +title = Worldwide Connectivity + +++ Europe + +menu = Europe +title =European Connectivity + ++++ Switzerland + +menu = Switzerland +title =Swiss Connectivity +alerts = bigloss,someloss,startloss + +# ++++ SBB +# +# menu = SBB/CFF/FFS +# title =Swiss Federal Railways Webserver +# host = www.railway-server.abc + + +# ++++ Tiscali +# +# menu = Tiscali Web +# title = Tiscali Webserver www.tiscali.abc +# host = www.tiscali-web.abc + ++++ UK + +menu = United Kingdom +title = United Kingdom + +# ++++ UCL +# +# menu = UCL +# title = UCL +# host = www.ucl-abc.acc.uk + +++ USA + +menu = North America +title =North American Connectivity + +# +++ MIT + +# menu = MIT +# title = Massachusetts Institute of Technology Webserver +# host = www.gurkoman.ybc + +# +++ IU +# +# menu = IU +# title = Indiana University +# host = www.iu.ali + +# +++ UCB +# +# menu = U. C. Berkeley +# title = U. C. Berkeley Webserver +# host = www.berkly.udi + +# +++ UCSD +# +# menu = U. C. San Diego +# title = U. C. San Diego Webserver +# host = www.ucsdddar.art + +# +++ Sun +# +# menu = Sun Microsystems +# title = Sun Microsystems Webserver +# host = www.sun-web.com --- smokeping-2.3.6.orig/debian/oldconfigs/2.0.9-2/Presentation +++ smokeping-2.3.6/debian/oldconfigs/2.0.9-2/Presentation @@ -0,0 +1,21 @@ +*** Presentation *** + +template = /etc/smokeping/basepage.html + ++ overview + +width = 600 +height = 50 +range = 10h + ++ detail + +width = 600 +height = 200 +unison_tolerance = 2 + +"Last 3 Hours" 3h +"Last 30 Hours" 30h +"Last 10 Days" 10d +"Last 400 Days" 400d + --- smokeping-2.3.6.orig/debian/oldconfigs/2.0.9-2/Database +++ smokeping-2.3.6/debian/oldconfigs/2.0.9-2/Database @@ -0,0 +1,15 @@ +*** Database *** + +step = 300 +pings = 20 + +# consfn mrhb steps total + +AVERAGE 0.5 1 1008 +AVERAGE 0.5 12 4320 + MIN 0.5 12 4320 + MAX 0.5 12 4320 +AVERAGE 0.5 144 720 + MAX 0.5 144 720 + MIN 0.5 144 720 + --- smokeping-2.3.6.orig/debian/oldconfigs/2.0.9-2/General +++ smokeping-2.3.6/debian/oldconfigs/2.0.9-2/General @@ -0,0 +1,29 @@ +*** General *** + +################################################ +# DON'T TOUCH UNLESS YOU KNOW WHAT YOU'RE DOING +# BETWEEN THESE MARKS! +################################################ +sendmail = /usr/sbin/sendmail +imgcache = /var/www/smokeping +imgurl = ../smokeping +datadir = /var/lib/smokeping +piddir = /var/run/smokeping +smokemail = /etc/smokeping/smokemail +tmail = /etc/smokeping/tmail +################################################ +# END OF DON'T TOUCH SECTION +################################################ + + +# Please edit this to suit your installation +owner = Joe Random +contact = joe@some.place.xyz +cgiurl = http://put_here_your_domain/cgi-bin/smokeping.cgi +mailhost = smtp.mailhost.abc +# specify this to get syslog logging +syslogfacility = local0 +# each probe is now run in its own process +# disable this to revert to the old behaviour +# concurrentprobes = no + --- smokeping-2.3.6.orig/debian/oldconfigs/2.0.9-2/Alerts +++ smokeping-2.3.6/debian/oldconfigs/2.0.9-2/Alerts @@ -0,0 +1,28 @@ +*** Alerts *** +to = admin@company.xy +from = smokealert@company.xy + ++bigloss +type = loss +# in percent +pattern = ==0%,==0%,==0%,==0%,>0%,>0%,>0% +comment = suddenly there is packet loss + ++someloss +type = loss +# in percent +pattern = >0%,*12*,>0%,*12*,>0% +comment = loss 3 times in a row + ++startloss +type = loss +# in percent +pattern = ==S,>0%,>0%,>0% +comment = loss at startup + ++rttdetect +type = rtt +# in milli seconds +pattern = <10,<10,<10,<10,<10,<100,>100,>100,>100 +comment = routing mesed up again ? + --- smokeping-2.3.6.orig/debian/oldconfigs/2.0.9-2/Probes +++ smokeping-2.3.6/debian/oldconfigs/2.0.9-2/Probes @@ -0,0 +1,6 @@ +*** Probes *** + ++ FPing + +binary = /usr/bin/fping + --- smokeping-2.3.6.orig/debian/oldconfigs/2.3.0-1/Presentation +++ smokeping-2.3.6/debian/oldconfigs/2.3.0-1/Presentation @@ -0,0 +1,56 @@ +*** Presentation *** + +template = /etc/smokeping/basepage.html + ++ charts + +menu = Charts +title = The most interesting destinations + +++ stddev +sorter = StdDev(entries=>4) +title = Top Standard Deviation +menu = Std Deviation +format = Stdandard Deviation %f + +++ max +sorter = Max(entries=>5) +title = Top Max Roundtrip Time +menu = by Max +format = Max Roundtrip Time %f seconds + +++ loss +sorter = Loss(entries=>5) +title = Top Packet Loss +menu = Loss +format = Packets Lost %f + +++ median +sorter = Median(entries=>5) +title = Top Median Roundtrip Time +menu = by Median +format = Median RTT %f seconds + ++ overview + +width = 600 +height = 50 +range = 10h + ++ detail + +width = 600 +height = 200 +unison_tolerance = 2 + +"Last 3 Hours" 3h +"Last 30 Hours" 30h +"Last 10 Days" 10d +"Last 400 Days" 400d + +#+ hierarchies +#++ owner +#title = Host Owner +#++ location +#title = Location + --- smokeping-2.3.6.orig/debian/oldconfigs/2.2.4-1/Targets +++ smokeping-2.3.6/debian/oldconfigs/2.2.4-1/Targets @@ -0,0 +1,98 @@ +*** Targets *** + +probe = FPing + +## You have to edit and uncomment all what you want below this. +# Please, refer to smokeping_config man page for more info +# The given adresses aren't real to avoid DoS. + +menu = Top +title = Network Latency Grapher +remark = Welcome to the SmokePing website of 'A poorly \ + mantained site running Debian.' + ++ Local + +menu = Local +title = Local Network + +++ LocalMachine + +menu = Local Machine +title = This host +host = localhost + ++ World + +menu = World +title = Worldwide Connectivity + +++ Europe + +menu = Europe +title =European Connectivity + ++++ Switzerland + +menu = Switzerland +title =Swiss Connectivity +alerts = bigloss,someloss,startloss + +# ++++ SBB +# +# menu = SBB/CFF/FFS +# title =Swiss Federal Railways Webserver +# host = www.railway-server.abc + + +# ++++ Tiscali +# +# menu = Tiscali Web +# title = Tiscali Webserver www.tiscali.abc +# host = www.tiscali-web.abc + ++++ UK + +menu = United Kingdom +title = United Kingdom + +# ++++ UCL +# +# menu = UCL +# title = UCL +# host = www.ucl-abc.acc.uk + +++ USA + +menu = North America +title =North American Connectivity + +# +++ MIT + +# menu = MIT +# title = Massachusetts Institute of Technology Webserver +# host = www.gurkoman.ybc + +# +++ IU +# +# menu = IU +# title = Indiana University +# host = www.iu.ali + +# +++ UCB +# +# menu = U. C. Berkeley +# title = U. C. Berkeley Webserver +# host = www.berkly.udi + +# +++ UCSD +# +# menu = U. C. San Diego +# title = U. C. San Diego Webserver +# host = www.ucsdddar.art + +# +++ Sun +# +# menu = Sun Microsystems +# title = Sun Microsystems Webserver +# host = www.sun-web.com --- smokeping-2.3.6.orig/debian/oldconfigs/2.2.4-1/Presentation +++ smokeping-2.3.6/debian/oldconfigs/2.2.4-1/Presentation @@ -0,0 +1,50 @@ +*** Presentation *** + +template = /etc/smokeping/basepage.html + ++ charts + +menu = Charts +title = The most interesting destinations + +++ stddev +sorter = StdDev(entries=>4) +title = Top Standard Deviation +menu = Std Deviation +format = Stdandard Deviation %f + +++ max +sorter = Max(entries=>5) +title = Top Max Roundtrip Time +menu = by Max +format = Max Roundtrip Time %f seconds + +++ loss +sorter = Loss(entries=>5) +title = Top Packet Loss +menu = Loss +format = Packets Lost %f + +++ median +sorter = Median(entries=>5) +title = Top Median Roundtrip Time +menu = by Median +format = Median RTT %f seconds + ++ overview + +width = 600 +height = 50 +range = 10h + ++ detail + +width = 600 +height = 200 +unison_tolerance = 2 + +"Last 3 Hours" 3h +"Last 30 Hours" 30h +"Last 10 Days" 10d +"Last 400 Days" 400d + --- smokeping-2.3.6.orig/debian/oldconfigs/2.2.4-1/Alerts +++ smokeping-2.3.6/debian/oldconfigs/2.2.4-1/Alerts @@ -0,0 +1,28 @@ +*** Alerts *** +to = alertee@address.somewhere +from = smokealert@company.xy + ++bigloss +type = loss +# in percent +pattern = ==0%,==0%,==0%,==0%,>0%,>0%,>0% +comment = suddenly there is packet loss + ++someloss +type = loss +# in percent +pattern = >0%,*12*,>0%,*12*,>0% +comment = loss 3 times in a row + ++startloss +type = loss +# in percent +pattern = ==S,>0%,>0%,>0% +comment = loss at startup + ++rttdetect +type = rtt +# in milli seconds +pattern = <10,<10,<10,<10,<10,<100,>100,>100,>100 +comment = routing messed up again ? + --- smokeping-2.3.6.orig/debian/patches/20_html-parser.dpatch +++ smokeping-2.3.6/debian/patches/20_html-parser.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# +# DP: From: Niko Tyni +# DP: Date: Fri, 11 Dec 2009 13:12:46 +0200 +# DP: Subject: [PATCH] Accommodate to HTML::Parser 3.64 change in the file open interface. + +@DPATCH@ + +2009-10-25 Release 3.64 +[...] + Make parse_file() method use 3-arg open [RT#49434] + +Using \*STDIN should work with both the old and the new versions. +--- + util/fix-pod2html.pl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/util/fix-pod2html.pl b/util/fix-pod2html.pl +index fa51400..ff0176e 100755 +--- a/util/fix-pod2html.pl ++++ b/util/fix-pod2html.pl +@@ -22,7 +22,7 @@ my $p = HTML::Parser->new(api_version => 3); + $p->handler(start => \&startsub, 'tagname, text'); + $p->handler(end => \&endsub, 'tagname, text'); + $p->handler(default => sub { print shift() }, 'text'); +-$p->parse_file(shift||"-") or die("parse: $!"); ++$p->parse_file(shift||\*STDIN) or die("parse: $!"); + + my @stack; + my $a=0; +-- +1.6.5.4 + --- smokeping-2.3.6.orig/debian/patches/15_clean_makefile.dpatch +++ smokeping-2.3.6/debian/patches/15_clean_makefile.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_clean_makefile.dpatch by Niko Tyni +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: remove unneeded and potentially unsecure include paths + +@DPATCH@ +diff -urNad smokeping-2.1.1~/Makefile smokeping-2.1.1/Makefile +--- smokeping-2.1.1~/Makefile 2007-05-06 23:36:18.000000000 +0300 ++++ smokeping-2.1.1/Makefile 2007-05-06 23:36:57.000000000 +0300 +@@ -39,8 +39,8 @@ + # pod2html apparently needs to be in the target directory to get L<> links right + POD2HTML= cd $(dir $@); top="$(shell echo $(dir $@)|sed -e 's,doc/,,' -e 's,[^/]*/,../,g' -e 's,/$$,,')"; top=$${top:-.}; pod2html --infile=$(CURDIR)/$< --noindex --htmlroot=. --podroot=. --podpath=$${top} --title=$* | $${top}/../util/fix-pod2html.pl > $(notdir $@) + # we go to this trouble to ensure that MAKEPOD only uses modules in the installation directory +-MAKEPOD= $(PERL) -I/home/oetiker/lib/fake-perl/ -Ilib -I/usr/pack/rrdtool-1.2svn-to/lib/perl -mSmokeping -e 'Smokeping::main()' -- --makepod +-GENEX= $(PERL) -I/home/oetiker/lib/fake-perl/ -Ilib -I/usr/pack/rrdtool-1.2svn-to/lib/perl -mSmokeping -e 'Smokeping::main()' -- --gen-examples ++MAKEPOD= $(PERL) -Ilib -mSmokeping -e 'Smokeping::main()' -- --makepod ++GENEX= $(PERL) -Ilib -mSmokeping -e 'Smokeping::main()' -- --gen-examples + + doc/%.7: doc/%.pod + $(POD2MAN) --section 7 > $@ --- smokeping-2.3.6.orig/debian/patches/10_path_changes.dpatch +++ smokeping-2.3.6/debian/patches/10_path_changes.dpatch @@ -0,0 +1,136 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_path_changes.dpatch by Jose Carlos Garcia Sogo +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Debian-specific pathnames. + +@DPATCH@ +diff -urNad smokeping-2.2.4~/Makefile smokeping-2.2.4/Makefile +--- smokeping-2.2.4~/Makefile 2007-09-17 11:04:25.000000000 +0300 ++++ smokeping-2.2.4/Makefile 2007-09-17 11:04:29.000000000 +0300 +@@ -8,7 +8,7 @@ + NUMVERSION = 2.003006 + IGNORE = ~|CVS|var/|smokeping-$(VERSION)/smokeping-$(VERSION)|cvsignore|rej|orig|DEAD|pod2htm[di]\.tmp|\.svn|tar\.gz|DEADJOE|svn-commit\.tmp + GROFF = groff +-PERL = perl-5.8.8 ++PERL = perl + .PHONY: man html txt ref examples check-examples patch killdoc doc tar rename-man symlinks remove-symlinks + .SUFFIXES: + .SUFFIXES: .pm .pod .txt .html .man .1 .3 .5 .7 +diff -urNad smokeping-2.2.4~/bin/smokeping.dist smokeping-2.2.4/bin/smokeping.dist +--- smokeping-2.2.4~/bin/smokeping.dist 2007-09-17 11:04:25.000000000 +0300 ++++ smokeping-2.2.4/bin/smokeping.dist 2007-09-17 11:04:29.000000000 +0300 +@@ -1,12 +1,11 @@ +-#!/usr/sepp/bin/perl-5.8.4 -w ++#!/usr/bin/perl -w + # -*-perl-*- + +-use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl); +-use lib qw(lib); ++use lib qw(/usr/share/smokeping/lib); + + use Smokeping 2.003006; + +-Smokeping::main("etc/config.dist"); ++Smokeping::main("/etc/smokeping/config"); + + =head1 NAME + +diff -urNad smokeping-2.2.4~/bin/tSmoke.dist smokeping-2.2.4/bin/tSmoke.dist +--- smokeping-2.2.4~/bin/tSmoke.dist 2007-09-17 11:04:25.000000000 +0300 ++++ smokeping-2.2.4/bin/tSmoke.dist 2007-09-17 11:04:29.000000000 +0300 +@@ -50,8 +50,7 @@ + # -- Getopt::Long + # + # Point the lib variables to your implementation +-use lib qw(lib); +-use lib "/usr/local/rrdtool-1.0.39/lib/perl"; ++use lib qw(/usr/share/smokeping/lib); + + use Smokeping 2.003006 ; + use Net::SMTP; +@@ -60,7 +59,7 @@ + use RRDs; + + # Point to your Smokeping config file +-my $cfgfile = "etc/config.dist"; ++my $cfgfile = "/etc/smokeping/config"; + + # global variables + my $cfg; +@@ -468,33 +467,12 @@ + + =head1 SETUP + +-When installing tSmoke, some variables must be adjusted to fit your local system. +- +-We need to use the following B: +- +-=over +- +-=item Smokeping +- +-=item RRDTool Perl bindings +- +-=item Getopt::Long +- +-=back +- +-Set up your libraries: +- +- use lib "/usr/local/smokeping/lib"; +- use lib "/usr/local/rrdtool-1.0.39/lib/perl"; +- +-Point to your Smokeping B file +- +- my $cfgfile = "/usr/local/smokeping/etc/config"; +- + Modify the Smokeping config file to include a path for tmail in the +-General section: ++General section, if not already present: + +- tmail = /usr/local/smokeping/etc/tmail ++ tmail = /etc/smokeping/tmail ++ ++Modify the HTML template file, B, to your liking. + + =head1 COPYRIGHT + +diff -urNad smokeping-2.2.4~/etc/basepage.html.dist smokeping-2.2.4/etc/basepage.html.dist +--- smokeping-2.2.4~/etc/basepage.html.dist 2007-09-17 11:04:25.000000000 +0300 ++++ smokeping-2.2.4/etc/basepage.html.dist 2007-09-17 11:04:29.000000000 +0300 +@@ -43,10 +43,10 @@ + --> + + +- +- +- +- ++ ++ ++ ++ + + + +diff -urNad smokeping-2.2.4~/htdocs/smokeping.cgi.dist smokeping-2.2.4/htdocs/smokeping.cgi.dist +--- smokeping-2.2.4~/htdocs/smokeping.cgi.dist 2007-09-17 11:04:25.000000000 +0300 ++++ smokeping-2.2.4/htdocs/smokeping.cgi.dist 2007-09-17 11:04:29.000000000 +0300 +@@ -1,13 +1,12 @@ +-#!/usr/sepp/bin/speedy -w ++#!/usr/bin/speedy -w + # -*-perl-*- + +-use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); +-use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib); ++use lib qw(/usr/share/smokeping/lib); + use CGI::Carp qw(fatalsToBrowser); + + use Smokeping 2.003006; + +-Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config"); ++Smokeping::cgi("/etc/smokeping/config"); + + =head1 NAME + --- smokeping-2.3.6.orig/debian/patches/00list +++ smokeping-2.3.6/debian/patches/00list @@ -0,0 +1,4 @@ +10_path_changes.dpatch +15_clean_makefile.dpatch +20_html-parser.dpatch +30_cve-2012-0790.dpatch --- smokeping-2.3.6.orig/debian/patches/30_cve-2012-0790.dpatch +++ smokeping-2.3.6/debian/patches/30_cve-2012-0790.dpatch @@ -0,0 +1,74 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## cve-2012-0790.dpatch by Vincent Danen, ported to 2.3 by Antoine Beaupré +## add additional fixes on the regexp from smokeping 2.6.9 +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix for CVE-2012-0790 + +@DPATCH@ +diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm +index d29a547..b74c3fc 100644 +--- a/lib/Smokeping.pm ++++ b/lib/Smokeping.pm +@@ -134,8 +134,10 @@ sub cgiurl { + sub hierarchy ($){ + my $q = shift; + my $hierarchy = ''; ++ my $h = $q->param('hierarchy'); + if ($q->param('hierarchy')){ +- $hierarchy = 'hierarchy='.$q->param('hierarchy').';'; ++ $h =~ s/[<>%&'";]/./g; ++ $hierarchy = 'hierarchy='.$h.';'; + }; + return $hierarchy; + } +@@ -176,6 +178,7 @@ sub update_dynaddr ($$){ + my $address = $ENV{REMOTE_ADDR}; + my $targetptr = $cfg->{Targets}; + foreach my $step (@target){ ++ $step =~ s/[<>%&'";]/./g; + return "Error: Unknown target $step" + unless defined $targetptr->{$step}; + $targetptr = $targetptr->{$step}; +@@ -979,6 +982,7 @@ sub get_detail ($$$$;$){ + my $open = shift; + my $mode = shift || $q->param('displaymode') || 's'; + ++ $mode =~ s/[<>%&'";]/./g; + my $phys_tree = $tree; + my $phys_open = $open; + if ($tree->{__tree_link}){ +@@ -1376,13 +1380,15 @@ sub get_detail ($$$$;$){ + } elsif ($mode eq 's') { # classic mode + $startstr =~ s/\s/%20/g; + $endstr =~ s/\s/%20/g; ++ my $t = $q->param('target'); ++ $t =~ s/[<>%&'";]/./g; + for my $slave (@slaves){ + my $s = $slave ? "~$slave" : ""; + $page .= "
"; + # $page .= (time-$timer_start)."
"; + # $page .= join " ",map {"'$_'"} @task; + $page .= "
"; +- $page .= ( qq{param('target').$s.'">' ++ $page .= ( qq{' + . qq{}."" ); #" + $page .= "
"; + } +@@ -1525,8 +1531,15 @@ sub hierarchy_switcher($$){ + sub display_webpage($$){ + my $cfg = shift; + my $q = shift; +- my ($path,$slave) = split(/~/,$q->param('target') || ''); ++ my $targ = ''; ++ my $t = $q->param('target'); ++ if ( $t and $t !~ /\.\./ and $t =~ /(\S+)/){ ++ $targ = $1; ++ $targ =~ s/[<>%&'";]/./g; ++ } ++ my ($path,$slave) = split(/~/,$targ); + my $hierarchy = $q->param('hierarchy'); ++ $hierarchy =~ s/[<>%&'";]/./g; + die "ERROR: unknown hierarchy $hierarchy\n" + if $hierarchy and not $cfg->{Presentation}{hierarchies}{$hierarchy}; + my $open = [ (split /\./,$path||'') ];