debian/0000775000000000000000000000000012761470756007207 5ustar debian/TODO0000664000000000000000000000064112121206210007644 0ustar The following issues need to be fixed: * fast-cgi should be default * review upstream changes since last release, esp. config changes * do not prompt for modifications on the files: - Slaves - General - basepage.html - this is very hard. we would need to fix the checksum in /var/lib/dpkg/status, which doesn't seem to be doable programmatically. See dpkg/src/configure.c:336 to see how this works better. debian/docs0000664000000000000000000000000712121206210010023 0ustar README debian/preinst0000664000000000000000000000241512121206210010564 0ustar #!/bin/sh # preinst script for #PACKAGE# # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `install' # * `install' # * `upgrade' # * `abort-upgrade' # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in install|upgrade) IFS=":" ucfq -w /etc/smokeping/basepage.html \ /etc/smokeping/smokemail \ /etc/smokeping/config.d/Alerts \ /etc/smokeping/config.d/Presentation \ /etc/smokeping/config.d/pathnames \ /etc/smokeping/config.d/Targets \ /etc/smokeping/config.d/General \ /etc/smokeping/config.d/Slaves \ | while read file package exists changed; do if [ "$package" = "smokeping" -a "$changed" = "No" ]; then rm -f "$file" fi done ;; abort-upgrade) ;; *) echo "preinst 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 debian/init.d0000664000000000000000000001177512121206210010276 0ustar #!/bin/sh # # /etc/init.d/smokeping # ### BEGIN INIT INFO # Provides: smokeping # Required-Start: $syslog $network $remote_fs # Should-Start: sshd apache # Required-Stop: $syslog $network $remote_fs # 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="--config=$CONFIG" # 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 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 $DAEMON_ARGS | 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 debian/rules0000775000000000000000000000353412761470524010265 0ustar #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # # Modified to make a template file for a multi-binary package with separated # build-arch and build-indep targets by Bill Allombert 2001 # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS # smokeping doesn't like building with your locale unexport LC_ALL TMP=$(CURDIR)/debian/smokeping override_dh_auto_configure: ./configure --prefix=/usr --with-htdocs-dir=/usr/share/smokeping/www --bindir=/usr/sbin --sysconfdir=/usr/share/doc/smokeping/ override_dh_auto_install: dh_auto_install rm -r $(TMP)/usr/share/smokeping/www/cropper 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/$$d; \ done install -m 644 $(CURDIR)/htdocs/cropper/smokeping-zoom.js $(TMP)/usr/share/smokeping/www mv $(TMP)/usr/share/doc/smokeping/*.dist $(TMP)/etc/smokeping/ rename 's/\.dist$$//' $(TMP)/etc/smokeping/*.dist $(TMP)/usr/share/smokeping/smokeping.fcgi.dist rm -f $(TMP)/usr/share/perl5/BER.pm $(TMP)/usr/share/perl5/SNMP_* mv $(TMP)/usr/sbin/smokeping_cgi $(TMP)/usr/share/smokeping/smokeping.cgi install -m 755 $(CURDIR)/debian/smokeping.cgi $(TMP)/usr/lib/cgi-bin/smokeping.cgi install -m 644 $(CURDIR)/debian/apache2.conf $(TMP)/etc/smokeping $(CURDIR)/debian/split_config $(TMP) install -m 644 $(CURDIR)/debian/default-config $(TMP)/etc/smokeping/config %: dh $@ --with autoreconf debian/copyright0000664000000000000000000002045412121206210011113 0ustar 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-2 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 debian/README.source0000664000000000000000000000042712121206210011335 0ustar smokeping for Debian -------------------- This package is maintained through git, but patches are applied through quilt, in debian/patches/. To update to the new upstream, use git-import-orig --uscan. -- Antoine Beaupré , Sat, 26 Feb 2012 13:20:51 -0500 debian/README.Debian0000664000000000000000000000255412121206210011222 0ustar 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 debian/changelog0000664000000000000000000007314212761470560011061 0ustar smokeping (2.6.8-2+deb7u1ubuntu0.14.04.1) trusty-security; urgency=medium * Security merge from Debian. -- Steve Beattie Tue, 30 Aug 2016 22:55:37 -0700 smokeping (2.6.8-2+deb7u1) oldstable-security; urgency=high * security fix for CVE-2015-0859: code execution via CGI arguments due to Debian Apache configuration -- Antoine Beaupré Tue, 10 Nov 2015 13:51:56 -0500 smokeping (2.6.8-2ubuntu1) trusty; urgency=medium * Use dh-autoreconf to install missing files and fix FTBFS: "error: required file 'conftools/compile' not found" * Apply patch from upstream git to fix groff error: "alternative text 'the master/slave mode' contains non-escaped | or /" -- Andreas Moog Tue, 28 Jan 2014 21:09:44 +0100 smokeping (2.6.8-2) unstable; urgency=high * Acknowledge gregor's NMU, thanks! * Urgency high to fix CVE-2012-0790 again (Closes: #659899) -- Antoine Beaupré Sat, 16 Mar 2013 20:19:34 -0400 smokeping (2.6.8-1.1) unstable; urgency=low * Non-maintainer upload. * Fix "fails to install, remove, distupgrade, and install again": remove ucf config files also on install (not only on upgrade); cf. the changelog entry for 2.6.5-2 and #655968. (Closes: #668383) * Remove Niko Tyni from Uploaders as per his request in #668383. -- gregor herrmann Mon, 30 Jul 2012 21:02:52 +0200 smokeping (2.6.8-1) unstable; urgency=low * New upstream release -- Antoine Beaupré Sun, 26 Feb 2012 13:25:13 -0500 smokeping (2.6.7-1) unstable; urgency=high * New upstream release to fix CVE-2012-0790 (Closes: #659899) -- Antoine Beaupré Tue, 14 Feb 2012 13:30:29 -0500 smokeping (2.6.5-2) unstable; urgency=low * Bug fix: "prompting due to modified conffiles which where not modified by the user", thanks to Holger Levsen (Closes: #655968). This is done by simply removing ucf config files that were not changed before installing them. * fix lintian warning by refering explicitly to GPL-2 * update standards version to 3.9.2, no change * unset locale (LC_ALL) when building to please the build process -- Antoine Beaupré Sun, 15 Jan 2012 18:17:16 -0500 smokeping (2.6.5-1) unstable; urgency=low * fix pathnames -- Antoine Beaupré Mon, 21 Nov 2011 22:26:40 -0500 smokeping (2.6.5-1~experimental1) experimental; urgency=low * fix reload in startup script * forgot in previous changelog: stop using ucf now that we generate config files during build, which leads to extra prompts during upgrades. -- Antoine Beaupré Wed, 16 Nov 2011 11:59:33 -0500 smokeping (2.6.5-1~experimental0) experimental; urgency=low * new upstream release (Closes: #485977). * take over maintainership, leaving previous maintainer as uploader (Closes: #568742). * remove patches: * 15_clean_makefile.dpatch - makefile is now clean * 20_html-parser.dpatch - obsolete * strip down patch: * 10_path_changes.dpatch - only fix the HTML paths * add patches: * fcgi_destdir - setup the fcgi script properly * fix-conf-path-cgi - hardcode the path to the config in the CGI script * fix-conf-paths - fix paths in main config * fix-perl-lib - fix path to PERLIB * proper-sample-conf - have a proper sample config * typo_642197 - fix typo in mail template (Closes: #642197) * fix-400d-graph - fix long term graph (Closes: #618851) * rewrite debian/rules with debhelper 7 * remove our custom config.d files, instead we split the upstream config in multiple files during the build, our modifications are now patches to the default config (Closes: #589679) * remove old (pre 2.3.6) compatibility code, now that even oldstable is running that release * switch to 3.0 (quilt) format -- Antoine Beaupré Mon, 07 Nov 2011 00:15:53 -0500 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 debian/NEWS0000664000000000000000000000705712121206210007663 0ustar smokeping (2.6.5-1~experimental0) experimental; urgency=low Instead of bundling our own configuration which constantly had to be maintained in sync with upstream, we ship modified versions of the upstream configuration files, which are now automatically split in separate sections during build. This will lead to false positive in configuration file changes, but just this one time, as we transition away from ucf for config file management. . If you are upgrading from versions previous to 2.3.6-5 (in Lenny!), you may have problems migrating your configuration. Make sure you at least hit 2.3.6 packages to have a smooth upgrade as some compatibility bits have been removed. -- Antoine Beaupré Sun, 13 Nov 2011 18:28:22 -0500 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 debian/control0000664000000000000000000000321112272005213010562 0ustar Source: smokeping Section: net Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Antoine Beaupré Uploaders: Jose Carlos Garcia Sogo Build-Depends: debhelper (>= 7.0.50~), autoconf, automake Build-Depends-Indep: librrds-perl, groff-base, libhtml-parser-perl, libdigest-hmac-perl, libwww-perl, liburi-perl, libcgi-fast-perl, libconfig-grammar-perl, dh-autoreconf Standards-Version: 3.9.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), libcgi-fast-perl, 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. debian/postinst0000664000000000000000000000543312121206210010766 0ustar #! /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'. 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 chown smokeping:smokeping /etc/smokeping/smokeping_secrets chmod 640 /etc/smokeping/smokeping_secrets } 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 } # 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 [ -z "$2" ] then setup_apache fi setup_permissions ;; 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 debian/apache2.conf0000664000000000000000000000027712121206210011333 0ustar ScriptAlias /smokeping/smokeping.cgi /usr/lib/cgi-bin/smokeping.cgi Alias /smokeping /usr/share/smokeping/www Options FollowSymLinks debian/default-config0000664000000000000000000000044212121206210011765 0ustar @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 debian/smokeping.default0000664000000000000000000000070012121206210012512 0ustar # /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 debian/postrm0000664000000000000000000000334612121206210010430 0ustar #! /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 debian/patches/0000775000000000000000000000000012272006574010624 5ustar debian/patches/proper-sample-conf0000664000000000000000000000260112121206210014235 0ustar Description: setup a proper sample configuration This disables slaves and setups targets that are sure to work (no slaves, localhost). It also sets up utf8 Author: Antoine Beaupré --- smokeping-2.6.5.orig/etc/config.dist.in +++ smokeping-2.6.5/etc/config.dist.in @@ -48,6 +48,7 @@ *** Presentation *** template = @prefix@/etc/basepage.html.dist +charset = utf-8 + charts @@ -109,13 +109,13 @@ binary = /usr/sbin/fping *** Slaves *** secrets=@prefix@/etc/smokeping_secrets.dist -+boomer -display_name=boomer -color=0000ff +#+boomer +#display_name=boomer +#color=0000ff -+slave2 -display_name=another -color=00ff00 +#+slave2 +#display_name=another +#color=00ff00 *** Targets *** @@ -126,21 +126,16 @@ title = Network Latency Grapher remark = Welcome to the SmokePing website of xxx Company. \ Here you will learn all about the latency of our network. -+ Test -menu= Targets -#parents = owner:/Test/James location:/ ++ Local -++ James +menu = Local +title = Local Network +#parents = owner:/Test/James location:/ -menu = James -title =James -alerts = someloss -slaves = boomer slave2 -host = james.address - -++ MultiHost - -menu = Multihost -title = James and James as seen from Boomer -host = /Test/James /Test/James~boomer +++ LocalMachine +menu = Local Machine +title = This host +host = localhost +#alerts = someloss +#slaves = boomer slave2 debian/patches/fcgi_destdir0000664000000000000000000000106512121206210013155 0ustar Description: use DESTDIR, not PREFIX for /etc --- smokeping-2.6.5.orig/htdocs/Makefile.am +++ smokeping-2.6.5/htdocs/Makefile.am @@ -28,5 +28,5 @@ nobase_js_DATA = $(JS) install-data-local: $(MKDIR) -p $(DESTDIR)$(HTDOCSDIR) $(ECHO) "#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist - $(ECHO) "$(prefix)/bin/smokeping_cgi $(prefix)/etc/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist + $(ECHO) "$(prefix)/bin/smokeping_cgi /etc/smokeping/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist debian/patches/series0000664000000000000000000000024012272006574012035 0ustar path_changes fix-perl-lib fcgi_destdir proper-sample-conf fix-conf-paths fix-conf-path-cgi typo_642197 fix-400d-graph CVE-2012-0790.patch fix-groff-error.patch debian/patches/path_changes0000664000000000000000000000165712121206210013162 0ustar Description: fix the paths to javascript files Author: Antoine Beaupré --- smokeping-2.6.5.orig/etc/basepage.html.dist +++ smokeping-2.6.5/etc/basepage.html.dist @@ -53,10 +53,10 @@ a.menulink:hover { --> - - - - + + + + debian/patches/fix-perl-lib0000664000000000000000000000051212121206210013015 0ustar Description: fix path for perl libs --- smokeping-2.6.5.orig/lib/Makefile.am +++ smokeping-2.6.5/lib/Makefile.am @@ -31,5 +31,5 @@ MATCH := $(wildcard Smokeping/matchers/* EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH) -perllibdir = $(prefix)/lib +perllibdir = $(prefix)/share/perl5 nobase_perllib_DATA = $(EXTRA_DIST) debian/patches/typo_6421970000664000000000000000000000132312121206210012353 0ustar Description: fix typo in mail template Author: Patrik Schindler Origin: debian Bug-Debian: http://bugs.debian.org/642197 Forwarded: no Last-Update: 2011-09-20 --- smokeping-2.6.5.orig/etc/smokemail.dist +++ smokeping-2.6.5/etc/smokemail.dist @@ -9,7 +9,7 @@ your IP with SmokePing. You have to reru your IP changes. You can run the script as often as you want. The script is written in Perl. If you don't have Perl available on your -system, you must have a Windows Box. You can easily fix this prolem by +system, you must have a Windows Box. You can easily fix this problem by downloading ActivePerl from www.activestate.com As soon as you have run the SmokePing Agent, the SmokePing server will debian/patches/fix-conf-path-cgi0000664000000000000000000000062112121206210013727 0ustar Description: hardcode the path to the config file in CGI Author: Antoine Beaupré Forwarded: no --- smokeping-2.6.5.orig/bin/smokeping_cgi +++ smokeping-2.6.5/bin/smokeping_cgi @@ -18,7 +18,7 @@ use Smokeping; use CGI::Fast; -my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config"; +my $cfg = (shift @ARGV) || "/etc/smokeping/config"; while (my $q = new CGI::Fast) { debian/patches/fix-400d-graph0000664000000000000000000000145112121206210013060 0ustar Description: fix default yearly display Default Database configuration file is defined so that only 360 days of data could be stored: . max(steps * total) / (secs_in_a_day / step) = 144 * 720 / (86400 / 300) = 360 . But Presentation configuration file defines the 4th graph as 400d, thus making it always missing 40 oldest days of data. Author: Dmitry Semyonov Origin: debian BTS Bug-Debian: http://bugs.debian.org/618851 Forwarded: no Reviewed-By: Antoine Beaupré Last-Update: 2011-03-19 --- smokeping-2.6.5.orig/etc/config.dist.in +++ smokeping-2.6.5/etc/config.dist.in @@ -94,7 +94,7 @@ unison_tolerance = 2 "Last 3 Hours" 3h "Last 30 Hours" 30h "Last 10 Days" 10d -"Last 400 Days" 400d +"Last 360 Days" 360d #+ hierarchies #++ owner debian/patches/fix-groff-error.patch0000664000000000000000000000137412272006646014670 0ustar Description: Apply patch from upstream git to fix groff error: "alternative text 'the master/slave mode' contains non-escaped | or /" Origin: upstream, https://github.com/oetiker/SmokePing/commit/fec626d9e26dbdce91db6eed42d898eb671a7906.patch --- smokeping-2.6.8.orig/lib/Smokeping.pm +++ smokeping-2.6.8/lib/Smokeping.pm @@ -2612,7 +2612,7 @@ DOC The base directory where SmokePing keeps the files related to the DYNAMIC function. This directory must be writeable by the WWW server. It is also used for temporary storage of slave polling results by the master in -L. +Lslave mode|smokeping_master_slave>. If this variable is not specified, the value of C will be used instead. DOC debian/patches/CVE-2012-0790.patch0000664000000000000000000000527712121206210013232 0ustar Index: smokeping-2.6.8/lib/Smokeping.pm =================================================================== --- smokeping-2.6.8.orig/lib/Smokeping.pm 2012-02-26 18:19:45.000000000 +0000 +++ smokeping-2.6.8/lib/Smokeping.pm 2013-03-16 23:07:00.000000000 +0000 @@ -28,6 +28,8 @@ # make sure we do not end up with , in odd places where one would expect a '.' # we set the environment variable so that our 'kids' get the benefit too +my $xssBadRx = qr/[<>%&'";]/; + $ENV{'LC_NUMERIC'}='C'; if (setlocale(LC_NUMERIC,"") ne "C") { if ($ENV{'LC_ALL'} eq 'C') { @@ -170,7 +172,7 @@ my $hierarchy = ''; my $h = $q->param('hierarchy'); if ($q->param('hierarchy')){ - $h =~ s/[<>&%]/./g; + $h =~ s/$xssBadRx/_/g; $hierarchy = 'hierarchy='.$h.';'; }; return $hierarchy; @@ -212,7 +214,7 @@ my $address = $ENV{REMOTE_ADDR}; my $targetptr = $cfg->{Targets}; foreach my $step (@target){ - $step =~ s/[<>&%]/./g; + $step =~ s/$xssBadRx/_/g; return "Error: Unknown target $step" unless defined $targetptr->{$step}; $targetptr = $targetptr->{$step}; @@ -1024,6 +1026,7 @@ sub parse_datetime($){ my $in = shift; for ($in){ + $in =~ s/$xssBadRx/_/g; /^(\d+)$/ && do { my $value = $1; $value = time if $value > 2**32; return $value}; /^\s*(\d{4})-(\d{1,2})-(\d{1,2})(?:\s+(\d{1,2}):(\d{2})(?::(\d{2}))?)?\s*$/ && return POSIX::mktime($6||0,$5||0,$4||0,$3,$2-1,$1-1900,0,0,-1); @@ -1047,7 +1050,7 @@ my $tree = shift; my $open = shift; my $mode = shift || $q->param('displaymode') || 's'; - $mode =~ s/[<>&%]/./g; + $mode =~ s/$xssBadRx/_/g; my $phys_tree = $tree; my $phys_open = $open; if ($tree->{__tree_link}){ @@ -1447,7 +1450,7 @@ $startstr =~ s/\s/%20/g; $endstr =~ s/\s/%20/g; my $t = $q->param('target'); - $t =~ s/[<>&%]/./g; + $t =~ s/$xssBadRx/_/g; for my $slave (@slaves){ my $s = $slave ? "~$slave" : ""; $page .= "
"; @@ -1601,7 +1604,7 @@ my $t = $q->param('target'); if ( $t and $t !~ /\.\./ and $t =~ /(\S+)/){ $targ = $1; - $targ =~ s/[<>;%]/./g; + $targ =~ s/$xssBadRx/_/g; } my ($path,$slave) = split(/~/,$targ); if ($slave and $slave =~ /(\S+)/){ @@ -1610,7 +1613,7 @@ $slave = $1; } my $hierarchy = $q->param('hierarchy'); - $hierarchy =~ s/[<>;%]/./g; + $hierarchy =~ s/$xssBadRx/_/g; die "ERROR: unknown hierarchy $hierarchy\n" if $hierarchy and not $cfg->{Presentation}{hierarchies}{$hierarchy}; my $open = [ (split /\./,$path||'') ]; debian/patches/fix-conf-paths0000664000000000000000000000257212121206210013361 0ustar Description: use Debian paths instead of silly ones This doesn't need to be sent upstream --- smokeping-2.6.5.orig/etc/config.dist.in +++ smokeping-2.6.5/etc/config.dist.in @@ -3,17 +3,17 @@ owner = Peter Random contact = some@address.nowhere mailhost = my.mail.host -sendmail = @SENDMAIL@ +sendmail = /usr/sbin/sendmail # NOTE: do not put the Image Cache below cgi-bin # since all files under cgi-bin will be executed ... this is not # good for images. -imgcache = @prefix@/cache -imgurl = cache -datadir = @prefix@/data -piddir = @prefix@/var +imgcache = /var/cache/smokeping/images +imgurl = ../smokeping/images +datadir = /var/lib/smokeping +piddir = /var/run/smokeping cgiurl = http://some.url/smokeping.cgi -smokemail = @prefix@/etc/smokemail.dist -tmail = @prefix@/etc/tmail.dist +smokemail = /etc/smokeping/smokemail +tmail = /etc/smokeping/tmail # specify this to get syslog logging syslogfacility = local0 # each probe is now run in its own process @@ -47,7 +47,7 @@ *** Presentation *** -template = @prefix@/etc/basepage.html.dist +template = /etc/smokeping/basepage.html charset = utf-8 + charts @@ -105,10 +105,10 @@ unison_tolerance = 2 + FPing -binary = /usr/sbin/fping +binary = /usr/bin/fping *** Slaves *** -secrets=@prefix@/etc/smokeping_secrets.dist +secrets=/etc/smokeping/smokeping_secrets #+boomer #display_name=boomer #color=0000ff debian/smokeping.cgi0000664000000000000000000000011112761470524011651 0ustar #!/bin/sh exec /usr/share/smokeping/smokeping.cgi /etc/smokeping/config debian/watch0000664000000000000000000000010712121206210010202 0ustar version=3 http://oss.oetiker.ch/smokeping/pub/ smokeping-(.+)\.tar\.gz debian/compat0000664000000000000000000000000212121206210010351 0ustar 5 debian/dirs0000664000000000000000000000023412121206210010036 0ustar etc/smokeping etc/smokeping/config.d usr/sbin usr/share/smokeping/www/ var/cache/smokeping/images var/lib/smokeping var/lib/smokeping/__cgi usr/lib/cgi-bin debian/source/0000775000000000000000000000000012121206210010453 5ustar debian/source/format0000664000000000000000000000001412121206210011661 0ustar 3.0 (quilt) debian/examples0000664000000000000000000000005212121206210010711 0ustar doc/examples/* etc/smokeping_secrets.dist debian/split_config0000775000000000000000000000140712121206210011563 0ustar #!/bin/sh set -e DESTDIR=$1 echo "splitting the monolithic config into separate sections..." 1>&2 for sec in General Alerts Database Presentation Probes Slaves Targets do if [ ! -f ${DESTDIR}/etc/smokeping/config.d/$sec ]; then sed -n "0,/^\*\*\* $sec \*\*\*/{h;d}; \${g;p;q}; /^\*\*\*/{g;p;q}; H" \ < ${DESTDIR}/etc/smokeping/config > ${DESTDIR}/etc/smokeping/config.d/$sec fi done egrep 'sendmail|imgcache|imgurl|datadir|piddir|smokemail|tmail' ${DESTDIR}/etc/smokeping/config.d/General > ${DESTDIR}/etc/smokeping/config.d/pathnames sed -i '/sendmail\|imgcache\|imgurl\|datadir\|piddir\|smokemail\|tmail/d' ${DESTDIR}/etc/smokeping/config.d/General echo '@include /etc/smokeping/config.d/pathnames' >> ${DESTDIR}/etc/smokeping/config.d/General