From a50214976d916feed6795bbf18e679a55d1d0379 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Tue, 25 Feb 2020 01:49:54 +0000 Subject: [PATCH] Import dropwatch_1.5.1-2+rpi1.debian.tar.xz [dgit import tarball dropwatch 1.5.1-2+rpi1 dropwatch_1.5.1-2+rpi1.debian.tar.xz] --- changelog | 17 +++ clean | 2 + compat | 1 + control | 49 ++++++++ copyright | 69 ++++++++++++ docs | 1 + manpages | 1 + patches/0001-spelling-corrections.patch | 142 ++++++++++++++++++++++++ patches/series | 1 + rules | 14 +++ source/format | 1 + upstream/metadata | 3 + watch | 10 ++ 13 files changed, 311 insertions(+) create mode 100644 changelog create mode 100644 clean create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 docs create mode 100644 manpages create mode 100644 patches/0001-spelling-corrections.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 upstream/metadata create mode 100644 watch diff --git a/changelog b/changelog new file mode 100644 index 0000000..b2cecb4 --- /dev/null +++ b/changelog @@ -0,0 +1,17 @@ +dropwatch (1.5.1-2+rpi1) bullseye-staging; urgency=medium + + * Disable testsuite, it seems to hang on some of our autobuilders. + + -- Peter Michael Green Tue, 25 Feb 2020 01:49:54 +0000 + +dropwatch (1.5.1-2) unstable; urgency=medium + + * Upload to unstable. + + -- Dmitry Smirnov Sun, 01 Dec 2019 22:16:03 +1100 + +dropwatch (1.5.1-1) unstable; urgency=medium + + * Initial release (Closes: #914577). + + -- Dmitry Smirnov Mon, 04 Nov 2019 04:11:01 +1100 diff --git a/clean b/clean new file mode 100644 index 0000000..bcaae98 --- /dev/null +++ b/clean @@ -0,0 +1,2 @@ +## Debian CI: +debian/.gitlab-ci.yml diff --git a/compat b/compat new file mode 100644 index 0000000..48082f7 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +12 diff --git a/control b/control new file mode 100644 index 0000000..9e67fe3 --- /dev/null +++ b/control @@ -0,0 +1,49 @@ +Source: dropwatch +Section: net +Priority: optional +Standards-Version: 4.4.1 +Maintainer: Dmitry Smirnov +Build-Depends: debhelper (>= 12~) + ,automake + ,binutils-dev + ,libnl-genl-3-dev + ,libreadline-dev + ,pkgconf | pkg-config +Rules-Requires-Root: no +Homepage: https://github.com/nhorman/dropwatch +Vcs-Git: https://salsa.debian.org/debian/dropwatch.git +Vcs-Browser: https://salsa.debian.org/debian/dropwatch + +Package: dropwatch +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: tool for detecting and diagnosing dropped network packets + Dropwatch is a utility to help developers and system administrators to + diagnose problems in the Linux Networking stack, specifically their + ability to diagnose where packets are getting dropped. Dropwatch aims to + improve on the following shortcomings: + . + 1) Consolidation, or lack thereof. Currently, to check the status of + dropped packets in the kernel, one needs to check at least 3 places, and + possibly more: The /proc/net/snmp file, the netstat utility, the tc + utility, and ethtool. Dropwatch aims to consolidate several of those + checks into one tool, making it easier for a sysadmin or developer to + detect lost packets + . + 2) Clarity of information. Dropped packets are not obvious. A sysadmin + needs to be intimately familiar with each of the above tools to + understand which events or statistics correlate to a dropped packet and + which do not. While that is often self evident, it is also often not. + Dropwatch aims to improve that clarity. + . + 3) Ambiguity. Even when a dropped packet is detected, the causes for + those dropped packets are not always clear. Does a UDPInError mean the + application receive buffer was full, or does it mean its checksum was + bad? Dropwatch attempts to disambiguate the causes for dropped packets. + . + 4) Performance. Utilities can be written to aggregate the data in the + various other utilities to solve some of these problems, but such + solutions require periodic polling of several interfaces, which is far + from optimal, especially when lost packets are rare. This solution + improves on the performance aspect by implementing a kernel feature which + allows asynchronous notification of dropped packets when they happen. diff --git a/copyright b/copyright new file mode 100644 index 0000000..4a72357 --- /dev/null +++ b/copyright @@ -0,0 +1,69 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: dropwatch +Source: https://github.com/nhorman/dropwatch + +Files: * +Copyright: + 2009-2018 Neil Horman +License: GPL-2 + +Files: + Makefile.am +Copyright: + 2009-2018 Neil Horman +License: LGPL-2.1+ + +Files: debian/* +Copyright: + 2019 Dmitry Smirnov +License: Expat + +License: Expat + 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. +Comment: + This license also known as "MIT" or "MIT X11" however FSF considers + "MIT" labelling ambiguous and copyright-format specification recommend + to mark such license as "Expat". + +License: GPL-2 + 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, version 2 of the License. + ․ + 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. + ․ + On Debian systems, the complete text of the GNU General Public + License Version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + ․ + This library 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 + Lesser General Public License for more details. + ․ + On Debian systems, the complete text of the GNU Lesser General Public + License Version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". diff --git a/docs b/docs new file mode 100644 index 0000000..ab1a32b --- /dev/null +++ b/docs @@ -0,0 +1 @@ +README* diff --git a/manpages b/manpages new file mode 100644 index 0000000..43e261f --- /dev/null +++ b/manpages @@ -0,0 +1 @@ +doc/*.1 diff --git a/patches/0001-spelling-corrections.patch b/patches/0001-spelling-corrections.patch new file mode 100644 index 0000000..e9cc211 --- /dev/null +++ b/patches/0001-spelling-corrections.patch @@ -0,0 +1,142 @@ +Last-Update: 2019-11-04 +Forwarded: https://github.com/nhorman/dropwatch/pull/13 +Applied-Upstream: https://github.com/nhorman/dropwatch/commit/dca5a6a18491f59611a72766694030ea0e0c0479 +Author: Dmitry Smirnov +Subject: spelling corrections + +--- a/README.md ++++ b/README.md +@@ -9,9 +9,9 @@ + Dropwatch is a project I started in an effort to improve the ability for + developers and system administrator to diagnose problems in the Linux Networking + stack, specifically in our ability to diagnose where packets are getting + dropped. From my probing, I've come to the conclusion that there are four main +-shortcommings in our current environment: ++shortcomings in our current environment: + + 1) Consolidation, or lack thereof. Currently, if you would like to check on the + status of dropped packets in the kernel, you need to check at least 3 places, + and possibly more: The /proc/net/snmp file, the netstat utility, the tc utility, +@@ -28,13 +28,13 @@ + dropped packets are not always clear. Does a UDPInError mean the application + receive buffer was full, or does it mean its checksum was bad? Dropwatch + attempts to disambiguate the causes for dropped packets. + +-4) Performance. Utilties can be written to aggregate the data in the various ++4) Performance. Utilities can be written to aggregate the data in the various + other utilities to solve some of these problems, but such solutions require + periodic polling of several interfaces, which is far from optimal, especially + when lost packets are rare. This solution improves on the performance aspect by +-implementing a kernel feature which allows asyncronous notification of dropped ++implementing a kernel feature which allows asynchronous notification of dropped + packets when they happen. + + Building Dropwatch + Dropwatch uses the autotools suite (autoconf/automake) to build. To build and install the utility run the following commands: +--- a/src/lookup.c ++++ b/src/lookup.c +@@ -19,9 +19,9 @@ + + /* + * This is a translator. given an input address, this will convert it into a + * function and offset. Unless overridden, it will automatically determine +- * tranlations using the following methods, in order of priority: ++ * translations using the following methods, in order of priority: + * 1) /usr/lib/debug/ using libbfd + * 2) /proc/kallsyms + */ + #include +@@ -39,9 +39,9 @@ + extern struct lookup_methods kallsym_methods; + + static int lookup_null_init(void) + { +- printf("Initalizing null lookup method\n"); ++ printf("Initializing null lookup method\n"); + return 0; + } + + static int lookup_null_sym(void *pc, struct loc_result *location) +--- a/src/lookup.h ++++ b/src/lookup.h +@@ -19,9 +19,9 @@ + + /* + * This is a translator. given an input address, this will convert it into a + * function and offset. Unless overridden, it will automatically determine +- * tranlations using the following methods, in order of priority: ++ * translations using the following methods, in order of priority: + * 1) /usr/lib/debug/ using libbfd + * 2) /proc/kallsyms + */ + +@@ -29,18 +29,18 @@ + #include + + + /* +- * Initalization routine ++ * Initialization routine + * INPUTS: + * method - enum describing how to do translation + * * METHOD_NULL : Just print pc values, not symbols + * * METHOD_AUTO : automatic search for best method + * * METHOD_DEBUGINFO : use debuginfo package + * * METHOD_KALLSYMS : use /proc/kallsyms + * returns: +- * * 0 : initalization succeded +- * * < 0 : initalization failed ++ * * 0 : initialization succeeded ++ * * < 0 : initialization failed + */ + typedef enum { + METHOD_NULL = 0, + METHOD_AUTO, +--- a/src/lookup_kas.c ++++ b/src/lookup_kas.c +@@ -136,9 +136,9 @@ + } + + static int lookup_kas_init(void) + { +- printf("Initalizing kallsyms db\n"); ++ printf("Initializing kallsyms db\n"); + + return 0; + } + +--- a/src/main.c ++++ b/src/main.c +@@ -42,9 +42,9 @@ + #include "net_dropmon.h" + #include "lookup.h" + + /* +- * This is just in place until the kernel changes get comitted ++ * This is just in place until the kernel changes get committed + */ + #ifndef NETLINK_DRPMON + #define NETLINK_DRPMON 20 + #endif +@@ -419,9 +419,9 @@ + printf("Command Syntax:\n"); + printf("exit\t\t\t\t - Quit dropwatch\n"); + printf("help\t\t\t\t - Display this message\n"); + printf("set:\n"); +- printf("\talertlimit \t - caputre only this many alert packets\n"); ++ printf("\talertlimit \t - capture only this many alert packets\n"); + printf("start\t\t\t\t - start capture\n"); + printf("stop\t\t\t\t - stop capture\n"); + } + +@@ -598,9 +598,9 @@ + } + + + /* +- * Initalize our lookup library ++ * Initialize our lookup library + */ + init_lookup(meth); + + enter_state_loop(); diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..a2faf5e --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +0001-spelling-corrections.patch diff --git a/rules b/rules new file mode 100755 index 0000000..dba5bf7 --- /dev/null +++ b/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +#include /usr/share/dpkg/pkg-info.mk + +%: + dh $@ + +override_dh_auto_test: + echo testsuite disabled diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/upstream/metadata b/upstream/metadata new file mode 100644 index 0000000..ff38951 --- /dev/null +++ b/upstream/metadata @@ -0,0 +1,3 @@ +Homepage: https://github.com/nhorman/dropwatch +Bug-Database: https://github.com/nhorman/dropwatch/issues +Bug-Submit: https://github.com/nhorman/dropwatch/issues/new diff --git a/watch b/watch new file mode 100644 index 0000000..1d21bfc --- /dev/null +++ b/watch @@ -0,0 +1,10 @@ +# https://salsa.debian.org/snippets/95 +# uscan(1) configuration file. +version=4 + +opts="\ +pgpmode=none,\ +repack,compression=xz,repacksuffix=+dfsg,\ +dversionmangle=s{[+~]dfsg\d*}{},\ +" https://github.com/nhorman/dropwatch/releases \ + .*/archive/v?(\d[\d\.]+)\.tar\.gz -- 2.30.2