diff options
| -rw-r--r-- | debian/changelog | 519 | ||||
| -rw-r--r-- | debian/clean | 2 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 30 | ||||
| -rw-r--r-- | debian/copyright | 34 | ||||
| -rw-r--r-- | debian/docs | 2 | ||||
| -rw-r--r-- | debian/install | 1 | ||||
| -rw-r--r-- | debian/patches/601-openvz-new-ctid-vpid.patch | 106 | ||||
| -rw-r--r-- | debian/patches/fix-isalnum-crash.patch | 18 | ||||
| -rw-r--r-- | debian/patches/fix-ldflags.patch | 17 | ||||
| -rw-r--r-- | debian/patches/fix-small-terminals.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 4 | ||||
| -rwxr-xr-x | debian/rules | 23 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/watch | 3 |
15 files changed, 779 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..efcc673 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,519 @@ +htop (2.1.0-3) unstable; urgency=medium + + * Fix case of dyscalculia in changelog entry for 2.1.0-1 + * Update Daniel Lange's email address + * Add debian/clean to remove autogenerated headers + * Refresh debian/patches/601-openvz-new-ctid-vpid.patch + * Fix issue with small terminals (Closes: #889693) + * Fix preservation of LDFLAGS value during configure script + * Handle unexpected values for character passed to isalnum + + -- Graham Inggs <ginggs@debian.org> Sat, 17 Feb 2018 18:27:46 +0000 + +htop (2.1.0-2) unstable; urgency=medium + + * Add missing build-dependency on pkg-config + + -- Graham Inggs <ginggs@debian.org> Mon, 05 Feb 2018 16:59:56 +0000 + +htop (2.1.0-1) unstable; urgency=medium + + [ Graham Inggs ] + * New upstream release 2.1.0 (Closes: #889634) + * Refresh debian/patches/601-openvz-new-ctid-vpid.patch + * Update Vcs-* URIs for move to salsa.debian.org + * Turn debhelper up to 11 + * Update debian/copyright + * Remove trailing whitespace from debian/changelog + * Use secure URI in Homepage and debian/watch + * Bump Standards-Version to 4.1.3, no changes + + [ Helmut Grohne ] + * Fix FTCBFS: Annotate python-minimal build dependency with :native. + (Closes: #864672) + + -- Graham Inggs <ginggs@debian.org> Mon, 05 Feb 2018 13:22:25 +0000 + +htop (2.0.2-1) unstable; urgency=medium + + * Update to upstream version 2.0.2 + - Use SOURCE_DATE_EPOCH instead of current year in copyright message + to make build reproducible. (Closes: #822963) + - Fix build to detect the Hurd as a Linux platform. (Closes: #821747) + - Fix crash when setting CPU affinity and -fPIE. (LP: #1589549) + * Bump Standards to 3.9.8 (no changes required) + + -- Daniel Lange <dl.ml1@usrlocal.de> Mon, 25 Jul 2016 19:46:17 +0200 + +htop (2.0.1-1) unstable; urgency=medium + + * New upstream release 2.0.1. (Closes: #814401, #783893, #774930) + * Clean up patches from 1.0.3 -> 2.0.1 + * Update compat -> 9, rules -> debhelper/9 + * Update debian/copyright to copyright-format/1.0 (Closes: #749850) + * Add lsof as suggested (Closes: #817918) + * Change maintainership jackyf -> DLange, jackyf and ginggs will + co-maintain. Jackyf: Thank you very much for 8 years of htop + maintenance! + + -- Daniel Lange <dl.ml1@usrlocal.de> Thu, 14 Apr 2016 10:25:45 +0200 + +htop (1.0.3-1) unstable; urgency=low + + * New upstream release. + * debian/watch: + - Updated to use new download location (http://hisham.hm/htop/releases). + * debian/patches: + - 600-openvz-veid-on-kernels-gt-2.6.18.patch: refreshed. + - 610-io-priority-only-on-linux.patch: ported to new upstream version. + - 700-ltrace-support.patch: ported to new upstream version. + * debian/control: + - Bumped Standards-Version to 3.9.5, no changes needed. + - Updated Homepage to 'http://hisham.hm/htop/'. + + -- Eugene V. Lyubimkin <jackyf@debian.org> Thu, 01 May 2014 13:16:56 +0300 + +htop (1.0.2-3) unstable; urgency=low + + * debian/patches: + - New patch 610-io-priority-only-on-linux.patch which should fix building + on non-Linux kernels. + + -- Eugene V. Lyubimkin <jackyf@debian.org> Sat, 05 Oct 2013 13:17:13 +0300 + +htop (1.0.2-2) unstable; urgency=low + + * Upload to unstable. + + -- Eugene V. Lyubimkin <jackyf@debian.org> Sat, 29 Jun 2013 22:25:41 +0300 + +htop (1.0.2-1) experimental; urgency=low + + * New upstream release. + - Ability to update process names on refreshes. (Closes: #475254) + - More precise value of CPU%. (Closes: #668410) + - Columns line up properly even when for more-than-5-digits process ids. + (Closes: #687280) + * debian/control: + - Bumped Standards-Version to 3.9.4, no changes needed. + * debian/patches: + - Deleted 200-dont-delete-htoprc-if-symlink.patch, applied upstream. + - 700-ltrace-support.patch: ported to new upstream version. + + -- Eugene V. Lyubimkin <jackyf@debian.org> Sat, 01 Dec 2012 11:55:43 +0200 + +htop (1.0.1-4) unstable; urgency=low + + * debian/rules: + - Retrieve and pass also CPPFLAGS and LDFLAGS. Patch by Simon Ruderich. + (Closes: #685670) + + -- Eugene V. Lyubimkin <jackyf@debian.org> Sat, 01 Sep 2012 14:29:59 +0300 + +htop (1.0.1-3) unstable; urgency=low + + * debian/rules: + - Retrieve CFLAGS from dpkg-buildflags as dpkg-buildpackage stopped to + export them. Thanks to Felix Geyer and Cyril Brulebois. + (Closes: #685670) + * debian/control: + - Build-depend on dpkg (>= 1.16.1) for using dpkg-buildflags. + + -- Eugene V. Lyubimkin <jackyf@debian.org> Mon, 27 Aug 2012 19:51:54 +0300 + +htop (1.0.1-2) unstable; urgency=low + + * debian/patches: + - New patch 200-dont-delete-htoprc-if-symlink.patch from upstream VCS. + (Closes: #662087) + + -- Eugene V. Lyubimkin <jackyf@debian.org> Mon, 30 Jul 2012 19:12:16 +0300 + +htop (1.0.1-1) unstable; urgency=low + + * New upstream release. + - Don't crash when trying to kill already finished process. + (Closes: #652563, 657675) + + -- Eugene V. Lyubimkin <jackyf@debian.org> Sun, 19 Feb 2012 10:24:46 +0200 + +htop (1.0-1) unstable; urgency=low + + * New upstream release. + - Don't die after a terminal resize. (Closes: #464852) + - Don't abort when a number of processes are removed from the list at + once. (Closes: #541417) + - Fixed the inconsistency in the documentation about "[" and "]" keys. + (Closes: #610329) + * debian/patches: + - 100-fix-cgroups-crash.patch: deleted, upstream fixed it in a different + way. + - 600-openvz-veid-on-kernels-gt-2.6.18.patch: ported to new upstream + version. + - 700-ltrace-support.patch: ported to new upstream version. + - 700-ltrace-support.patch: ltrace hotkey is 'L', not 'l'. + * debian/control: + - Add libhwloc-dev to Build-Depends on non-linux architectures. + - Add libncursesw5-dev to Build-Depends, enabling unicode support. + * debian/rules: + - Enable native affinity functions on linux architectures and use hwloc + library everywhere else. + * debian/copyright: + - Updated upstream copyright years. + + -- Eugene V. Lyubimkin <jackyf@debian.org> Sat, 26 Nov 2011 15:58:33 +0200 + +htop (0.9-4) unstable; urgency=low + + * debian/rules: + - Added 'build-arch' and 'build-indep' targets as suggested by Lintian. + * debian/patches: + - New patch 100-fix-cgroups-crash.patch fixing a crash when htop receives + an unexpected input from a cgroups file. (Closes: #628040) + + -- Eugene V. Lyubimkin <jackyf@debian.org> Wed, 21 Sep 2011 21:17:17 +0300 + +htop (0.9-3) unstable; urgency=low + + * debian/rules: + - Enable cgroups support. (Closes: #627545) + * debian/README.source: + - added with standard instructions how to use quilt. + * debian/control: + - Fixed spelling as suggested by lintian. + - Bumped Standards-Version to 3.9.2, no changes needed. + + -- Eugene V. Lyubimkin <jackyf@debian.org> Sun, 22 May 2011 12:05:09 +0300 + +htop (0.9-2) unstable; urgency=low + + * Upload to unstable. + + -- Eugene V. Lyubimkin <jackyf@debian.org> Sun, 13 Feb 2011 10:41:53 +0200 + +htop (0.9-1) experimental; urgency=low + + * New upstream release. (Closes: #610229) + - Fixed by-process IO stats in some cases. (Closes: #526070) + - Do not display nan% as CPU load sometimes. (Closes: #590535) + * debian/patches: + - 600-openvz-veid-on-kernels-gt-2.6.18.patch: ported to new upstream + version. + - 700-ltrace-support.patch: refreshed. + * debian/control: + - Bumped Standards-Version to 3.9.1, no changes needed. + - Updated my mail address. + - Removed 'DM-Upload-Allowed' flag as not needed anymore. + * debian/copyright: + - Updated author copyright years. + * debian/watch: + - Removed 'uupdate' option, not needed for my workflow. + + -- Eugene V. Lyubimkin <jackyf@debian.org> Sun, 16 Jan 2011 19:36:07 +0200 + +htop (0.8.3-1) unstable; urgency=low + + * New upstream release: + - 0.8.2 (LP: #385862): + - Integrated lsof output. (Closes: #426003) + - Handling of absend CPU should work now. (Closes: #494057, #476273) + - Fixed a crash when sorting by USER column. (Closes: #526362) + - Fixed display of gigabyte-sized values. + - Fixed incremental search. (Closes: #521376) + - Option to display hostname in the meters area. + - 0.8.3 + * debian/control: + - Suggested strace and ltrace. (Closes: #530449) + - Bumped Standards-Version to 3.8.2, no changes needed. + * debian/patches: + - 700-ltrace-support.patch: modified to not contradict with new upstream + release, the hotkey for ltrace output changed from 'l' to 'L'. + * debian/README: + - Added with note about ltrace support. + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Mon, 29 Jun 2009 13:08:39 +0300 + +htop (0.8.1+svn149-2) unstable; urgency=low + + * debian/rules: + - Build with VServer support. (Closes: #522905) + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 17 Apr 2009 21:54:45 +0300 + +htop (0.8.1+svn149-1) unstable; urgency=low + + * New upstream development snapshot: + - Allow building without PLPA support. (Closes: #521861) + * debian/patches: + - 010-make-desktop-file-valid.patch: deleted, merged upstream. + - 100-upstream-sort-by-processor-and-session.patch: deleted, merged + upstream. + - 110-upstream-fix-page-size-on-BSD.patch: deleted, merged upstream. + - 120-upstream-explain-cpu-bars-in-monochrome-mode.patch: deleted, merged + upstream. + - 200-filter-non-printable-characters.patch: deleted, upstream has own + version of this patch. + - 610-rename-veid-to-ctid.patch: deleted, merged upstream. + - 600-openvz-veid-on-kernels-gt-2.6.18.patch: refreshed. + - 800-tree-view-without-userland-threads.patch: deleted, merged upstream. + - 700-ltrace-support.patch: refreshed, added the description. + * debian/rules: + - Deal more robustly with config.{sub,guess} files, thanks to Roger Leigh. + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sun, 05 Apr 2009 11:51:34 +0300 + +htop (0.8.1-6) unstable; urgency=low + + * debian/patches: + - debian/patches/110-upstream-fix-page-size-on-BSD.patch was accidentally + incorrectly applied, causing zeroes in memory columns. Fixed. + * debian/rules: + - File Process.c somewhy is not regenerated during normal build process. + Regenerate it by hand. + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sun, 29 Mar 2009 22:37:49 +0300 + +htop (0.8.1-5) unstable; urgency=low + + * debian/patches: + - New 100-upstream-sort-by-processor-and-session.patch, cherry-picked from + upstream svn: allow sorting by 'processor' and 'session' columns. + (Closes: #501317) + - New debian/patches/110-upstream-fix-page-size-on-BSD.patch, + cherry-picked from upstream svn: fix page size on BSD systems. + (Closes: #485277) + - New debian/patches/120-upstream-explain-cpu-bars-in-monochrome-mode.patch, + cherry-picked from upstream svn: document meanings of chars in CPU bars + in monochrome mode. (Closes: #477222) + - 600-openvz-veid-on-kernels-gt-2.6.18.patch: added a description. + - 610-rename-veid-to-ctid.patch: added a description. + - 800-tree-view-without-userland-threads.patch: added a description. + * debian/control: + - Bump 'Standards-Version' to 3.8.1, no changes needed. + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sun, 29 Mar 2009 19:49:53 +0300 + +htop (0.8.1-4) unstable; urgency=low + + * debian/patches: + - New 600-openvz-veid-on-kernels-gt-2.6.18.patch: fix determining veid on + openvz-enabled kernels greater than 2.6.18. Patch by + Thorsten Schifferdecker <tsd@debian.systs.org>. (Closes: #516846) + - New 610-rename-veid-to-ctid.patch: openvz: renames 'veid' -> 'ctid' since + it's now a preferred term. Patch by + Thorsten Schifferdecker <tsd@debian.systs.org>. (Closes: #516847) + - New 700-ltrace-support.patch: add ltrace(1) support in addition to strace + support. Patch by <knotor@users.sourceforge.net>. + - New 800-tree-view-with-userland-threads.patch: patch to fix tree view when + userland threads are hidden, taken from Ubuntu. + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Mon, 02 Mar 2009 23:17:04 +0200 + +htop (0.8.1-3) unstable; urgency=low + + * debian/rules: + - Don't ship empty directories in the package. + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sun, 15 Feb 2009 13:56:41 +0200 + +htop (0.8.1-2) experimental; urgency=low + + * Disabled unicode support, it has both build and work problems yet. + (Closes: #507423) + * debian/patches: + - New patch 200-filter-non-printable-characters.patch to filter + non-printable characters in process names. Thanks to Josh Triplett + and Andrew O. Shadoura. (Closes: #504144) + - 010-make-desktop-file-valid.patch: comment added. + * debian/control: + - Added '${misc:Depends}' to 'Depends', fixes lintian warning. + - Added 'python-minimal' to 'Build-Depends' for MakeHeader.py. + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sat, 06 Dec 2008 11:03:18 +0200 + +htop (0.8.1-1) experimental; urgency=low + + * New maintainer. Thanks for work, Bartosz Fenski! + * New upstream release: + - Changes in 0.8.1 (Closes: #499928): + - Linux-VServer support. + - Battery meter (Closes: #484771). + - Fixed collection of IO stats in multithreaded processes. + - Removed assertion that fails on hardened kernels. + - Changes in 0.8.0 (Closes: #494646, #486213): + - Ability to change sort column with the mouse by + clicking column titles. + - Added support for Linux per-process IO statistics. + - Added Unicode support. + - Fixed display of CPU count for threaded processes. + - Avoid crashing when using many meters. + - Other fixes: + - Significantly increased line length limit (to 65535). + (Closes: #470280) + * debian/control: + - Bumped 'Standards-Version' to 3.8.0, no changes needed. + - Changed Build-Depends on debhelper to (>= 7) and 'libncurses5-dev' -> + 'libncursesw5-dev'. Added dependency on quilt (>= 0.40). + * debian/rules: + - Some cleanup, used debhelper v7 commands. + - Pass '--enable-taskstats' and '--enable-unicode' options to configure. + - Pass '--enable-openvz' to configure. (Closes: #480541) + * debian/patches: + - New 010-make-desktop-file-valid.patch: makes desktop file valid. + Thanks to Nathan Handler <nathan.handler@gmail.com> (Closes: #488912) + * debian/copyright: + - Fixed path for GPLv2 license. + * debian/menu: + - Set proper section, removed hint (now useless). + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sun, 16 Nov 2008 20:36:18 +0200 + +htop (0.7-1) unstable; urgency=low + + * New upstrem version. (Closes: #452634) + * Move URL to homepage header. + * Bumped Standards-Version (no changes needed). + * Fixed watch file. (Closes: #449631) + + -- Bartosz Fenski <fenio@debian.org> Sat, 26 Apr 2008 13:57:14 +0200 + +htop (0.6.6+svn20070915-1) unstable; urgency=low + + * New upstream snapshot with dedication to Nico Golde + (Closes: #410398, #410391, #427127) + - fixes problems with trailing newline in confi (Closes: #420856) + - fixes segfault on missing command line args (Closes: #435651) + - fixes FTBS with GCC 4.3 branch (Closes: #416852) + + -- Bartosz Fenski <fenio@debian.org> Sat, 15 Sep 2007 14:37:41 +0200 + +htop (0.6.3-1) unstable; urgency=low + + * New upstream version. + - allows to rekill tagged group of processes (Closes: #375219) + * Bumped Standards-Version to 3.7.2 (no changes needed). + + -- Bartosz Fenski <fenio@debian.org> Mon, 14 Aug 2006 13:03:15 +0200 + +htop (0.6.2-1) unstable; urgency=low + + * New upstream version. + - doesn't segfault running as root. (Closes: #354258) + + -- Bartosz Fenski <fenio@debian.org> Tue, 4 Jul 2006 07:53:58 +0200 + +htop (0.6-1) unstable; urgency=low + + * New upstream version. + - doesn't show pipe when some value is equal to zero. (Closes: #325058) + - allows renicing group of processes. (Closes: #317391) + + -- Bartosz Fenski <fenio@debian.org> Thu, 29 Dec 2005 13:22:07 +0100 + +htop (0.5.4-1) unstable; urgency=low + + * New upstream version. + - does not leave cruft on console on exit. (Closes: #334657) + + -- Bartosz Fenski <fenio@debian.org> Fri, 4 Nov 2005 17:25:27 +0100 + +htop (0.5.3-1) unstable; urgency=low + + * New upstream version. + * Bumped Standards-Version to 3.6.2 (no changes needed). + + -- Bartosz Fenski <fenio@debian.org> Tue, 20 Sep 2005 10:49:52 +0200 + +htop (0.5.2-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Bartosz Fenski <fenio@debian.org> Wed, 8 Jun 2005 20:02:19 +0200 + +htop (0.5.1-1) unstable; urgency=low + + * New upstream version. + - correctly honors limits for nice values (Closes: #291502) + + -- Bartosz Fenski <fenio@debian.org> Sun, 10 Apr 2005 17:49:12 +0200 + +htop (0.5-2) unstable; urgency=low + + * watch file changed a little to handle weird upstream versions + * s/fenio@o2.pl/fenio@debian.org/ + + -- Bartosz Fenski <fenio@debian.org> Thu, 7 Apr 2005 12:00:11 +0200 + +htop (0.5-1) unstable; urgency=low + + * New upstream version. + - fixes problem with wrongly displayed CPU bar (Closes: #283212) + + -- Bartosz Fenski <fenio@o2.pl> Sat, 27 Nov 2004 10:10:17 +0100 + +htop (0.4.1-3) unstable; urgency=low + + * Fixed handling of non-alphanumeric chars during search. + Thanks to Gian Piero Carrubba for noticing it (Closes: #269060) + * Added description of recursive search of processes to the manpage. + Should be now clear how does it work so (Closes: #269061) + + -- Bartosz Fenski <fenio@o2.pl> Tue, 31 Aug 2004 21:40:15 +0200 + +htop (0.4.1-2) unstable; urgency=low + + * Included updated manpage. (Closes: #269064) + Thanks to Gian Piero Carrubba for provided patch. + + -- Bartosz Fenski <fenio@o2.pl> Tue, 31 Aug 2004 21:08:13 +0200 + +htop (0.4.1-1) unstable; urgency=low + + * New upstream version. + - fixes FTBFS on some archs (Closes: #268373) + + -- Bartosz Fenski <fenio@o2.pl> Fri, 27 Aug 2004 14:01:11 +0200 + +htop (0.4-1) unstable; urgency=low + + * New upstream version. + * Added debian/menu file. + + -- Bartosz Fenski <fenio@o2.pl> Sun, 22 Aug 2004 13:09:12 +0200 + +htop (0.3.3-1) unstable; urgency=low + + * New upstream version. + * Added debian/watch file. + + -- Bartosz Fenski <fenio@o2.pl> Sun, 20 Jun 2004 10:33:13 +0200 + +htop (0.3.1-1) unstable; urgency=low + + * New upstream version. + * Hopefully first official Debian release. (Closes: #248939) + Thanks for sponsoring goes to Cedric Delfosse. + * debian/rules: + - removed dh_installman, cause it's now included by upstream. + + -- Bartosz Fenski <fenio@o2.pl> Mon, 31 May 2004 05:37:15 +0200 + +htop (0.3-1) unstable; urgency=low + + * New upstream version. + + -- Bartosz Fenski <fenio@o2.pl> Thu, 20 May 2004 01:15:05 +0200 + +htop (0.2.1-1) unstable; urgency=low + + * New upstream version. + * Some updates to manual page. + + -- Bartosz Fenski <fenio@o2.pl> Sat, 15 May 2004 10:15:03 +0200 + +htop (0.2-1) unstable; urgency=low + + * Initial Release. + + -- Bartosz Fenski <fenio@o2.pl> Fri, 14 May 2004 10:37:04 +0200 + diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..29ab033 --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +*.h +*/*.h diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +11 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..4001e44 --- /dev/null +++ b/debian/control @@ -0,0 +1,30 @@ +Source: htop +Section: utils +Priority: optional +Maintainer: Daniel Lange <DLange@debian.org> +Uploaders: Eugene V. Lyubimkin <jackyf@debian.org>, + Graham Inggs <ginggs@debian.org> +Build-Depends: debhelper (>= 11), + dpkg-dev (>= 1.16.1.1), + libhwloc-dev [!linux-any], + libkvm-dev [kfreebsd-any], + libncurses5-dev, + libncursesw5-dev, + pkg-config, + python-minimal:native +Standards-Version: 4.1.3 +Homepage: https://hisham.hm/htop/ +Vcs-Browser: https://salsa.debian.org/debian/htop +Vcs-Git: https://salsa.debian.org/debian/htop.git + +Package: htop +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Suggests: lsof, strace +Description: interactive processes viewer + Htop is an ncursed-based process viewer similar to top, but it + allows one to scroll the list vertically and horizontally to see + all processes and their full command lines. + . + Tasks related to processes (killing, renicing) can be done without + entering their PIDs. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..bc6662e --- /dev/null +++ b/debian/copyright @@ -0,0 +1,34 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: htop +Upstream-Contact: Hisham Muhammad <lode@gobolinux.org> +Source: http://hisham.hm/htop/releases/ + +Files: * +License: GPL-2+ +Copyright: 2004-2018 Hisham Muhammad + +Files: debian/* +License: GPL-2+ +Copyright: 2016 Daniel Lange + 2018 Graham Inggs + 2008-2016 Eugene V. Lyubimkin + 2004-2008 Bartosz Fenski + +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; 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 Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..6f12db5 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..f502e6a --- /dev/null +++ b/debian/install @@ -0,0 +1 @@ +htop usr/bin diff --git a/debian/patches/601-openvz-new-ctid-vpid.patch b/debian/patches/601-openvz-new-ctid-vpid.patch new file mode 100644 index 0000000..40ffbd2 --- /dev/null +++ b/debian/patches/601-openvz-new-ctid-vpid.patch @@ -0,0 +1,106 @@ +This replaces the old 600-openvz-veid-on-kernels-gt-2.6.18.patch +Source: https://patch-diff.githubusercontent.com/raw/hishamhm/htop/pull/464.patch +From: Alexander Pisarev <apisarev@virtuozzo.com> +Date: Wed, 6 Apr 2016 14:47:28 +0300 +Subject: [PATCH] Add support of UUID CTID used in the new version of OpenVZ + +In the new version of OpenVZ (Virtuozzo 7), containers could be identified by UUIDs and integer numbers like before (so called legacy CTID). Existing support of OpenVZ can't work with UUIDs. This patch fix it. + +CTIDs and VPIDs are now read from /proc/[id]/status instead of /proc/[id]/stat because of the following reasons: +* the /proc/[id]/status has named fields and OpenVZ kernel writes either CTID or UUID to envID field (depending on which type is used); +* OpenVZ kernel appends own data to /proc/[id]/stat file, a change in parameters reported by vanilla kernel would also shift the position of OpenVZ data so it would not be read correctly. + +As UUIDs are much longer than old numerical CTIDs, the UUID strings will get truncated in output (although sorting is still done using complete UUIDs). + +--- a/linux/LinuxProcess.c ++++ b/linux/LinuxProcess.c +@@ -119,7 +119,7 @@ + double io_rate_write_bps; + #endif + #ifdef HAVE_OPENVZ +- unsigned int ctid; ++ char* ctid; + unsigned int vpid; + #endif + #ifdef HAVE_VSERVER +@@ -271,6 +271,9 @@ + void Process_delete(Object* cast) { + LinuxProcess* this = (LinuxProcess*) cast; + Process_done((Process*)cast); ++#ifdef HAVE_OPENVZ ++ free(this->ctid); ++#endif + #ifdef HAVE_CGROUP + free(this->cgroup); + #endif +@@ -361,7 +364,7 @@ + } + #endif + #ifdef HAVE_OPENVZ +- case CTID: xSnprintf(buffer, n, "%7u ", lp->ctid); break; ++ case CTID: xSnprintf(buffer, n, "%8.8s ", lp->ctid); break; + case VPID: xSnprintf(buffer, n, Process_pidFormat, lp->vpid); break; + #endif + #ifdef HAVE_VSERVER +@@ -441,7 +444,7 @@ + #endif + #ifdef HAVE_OPENVZ + case CTID: +- return (p2->ctid - p1->ctid); ++ return strcmp(p1->ctid ?: "", p2->ctid ?: ""); + case VPID: + return (p2->vpid - p1->vpid); + #endif +--- a/linux/LinuxProcessList.c ++++ b/linux/LinuxProcessList.c +@@ -480,27 +480,35 @@ + #ifdef HAVE_OPENVZ + + static void LinuxProcessList_readOpenVZData(LinuxProcess* process, const char* dirname, const char* name) { +- if ( (access("/proc/vz", R_OK) != 0)) { +- process->vpid = process->super.pid; +- process->ctid = 0; ++ process->vpid = process->super.pid; ++ free(process->ctid); ++ process->ctid = xStrdup("0"); ++ if ( (access("/proc/vz", R_OK) != 0)) + return; +- } + char filename[MAX_NAME+1]; +- xSnprintf(filename, MAX_NAME, "%s/%s/stat", dirname, name); ++ xSnprintf(filename, MAX_NAME, "%s/%s/status", dirname, name); + FILE* file = fopen(filename, "r"); + if (!file) + return; +- (void) fscanf(file, +- "%*32u %*32s %*1c %*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %32u %32u", +- &process->vpid, &process->ctid); ++ char buffer[PROC_LINE_LENGTH + 1]; ++ while (fgets(buffer, PROC_LINE_LENGTH, file)) { ++ if (String_startsWith(buffer, "envID:")) { ++ char ctid[PROC_LINE_LENGTH + 1]; ++ int ok = sscanf(buffer, "envID:\t%36s", ctid); ++ if (ok == 1) { ++ free(process->ctid); ++ process->ctid = xStrdup(ctid); ++ } ++ } ++ else if (String_startsWith(buffer, "VPid:")) { ++ unsigned int vpid; ++ int ok = sscanf(buffer, "VPid:\t%32u", &vpid); ++ if (ok == 1) { ++ process->vpid = vpid; ++ } ++ } ++ } + fclose(file); +- return; + } + + #endif diff --git a/debian/patches/fix-isalnum-crash.patch b/debian/patches/fix-isalnum-crash.patch new file mode 100644 index 0000000..c74cab7 --- /dev/null +++ b/debian/patches/fix-isalnum-crash.patch @@ -0,0 +1,18 @@ +Description: Handle unexpected values for character passed to isalnum +Bug: https://github.com/hishamhm/htop/issues/711 +Origin: upstream,https://github.com/hishamhm/htop/commit/03f17688ada3800bdd344ec4397f81289977b153 +Author: Hisham Muhammad <hisham@gobolinux.org> +Last-Update: 2018-02-05 + +--- a/Panel.c ++++ b/Panel.c +@@ -469,7 +469,7 @@ HandlerResult Panel_selectByTyping(Panel* this, int ch) { + this->eventHandlerState = xCalloc(100, sizeof(char)); + char* buffer = this->eventHandlerState; + +- if (ch < 255 && isalnum(ch)) { ++ if (ch > 0 && ch < 255 && isalnum(ch)) { + int len = strlen(buffer); + if (len < 99) { + buffer[len] = ch; + diff --git a/debian/patches/fix-ldflags.patch b/debian/patches/fix-ldflags.patch new file mode 100644 index 0000000..5e27815 --- /dev/null +++ b/debian/patches/fix-ldflags.patch @@ -0,0 +1,17 @@ +Description: Fix preservation of LDFLAGS value during configure script +Bug: https://github.com/hishamhm/htop/issues/738 +Origin: upstream,https://github.com/hishamhm/htop/commit/df9922a67eb8e02ab4cf1ff8f24b40f14094e699 +Author: Hisham Muhammad <hisham@gobolinux.org> +Last-Update: 2018-02-17 + +--- a/configure.ac ++++ b/configure.ac +@@ -167,7 +167,7 @@ + LIBS="$htop_config_script $LIBS " + htop_script_success=yes + ], []) +- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$htop_save_LDFLAGS" + fi + if test "x$htop_script_success" = xno; then + [$5] diff --git a/debian/patches/fix-small-terminals.patch b/debian/patches/fix-small-terminals.patch new file mode 100644 index 0000000..4f03732 --- /dev/null +++ b/debian/patches/fix-small-terminals.patch @@ -0,0 +1,18 @@ +Description: Fix issue with small terminals +Bug: https://github.com/hishamhm/htop/issues/733 +Bug-Debian: https://bugs.debian.org/889693 +Origin: upstream,https://github.com/hishamhm/htop/commit/b544c22c72613d561180738d8c31c97712b3c0ef +Author: Hisham Muhammad <hisham@gobolinux.org> +Last-Update: 2018-02-13 + +--- a/Meter.c ++++ b/Meter.c +@@ -287,7 +287,7 @@ + + int blockSizes[10]; + +- xSnprintf(bar, w + 1, "%*s", w, buffer); ++ xSnprintf(bar, w + 1, "%*.*s", w, w, buffer); + + // First draw in the bar[] buffer... + int offset = 0; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a9f7fd9 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +601-openvz-new-ctid-vpid.patch +fix-small-terminals.patch +fix-ldflags.patch +fix-isalnum-crash.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..d5bcbe3 --- /dev/null +++ b/debian/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +ifeq (linux,$(DEB_HOST_ARCH_OS)) + ARCH_DEPENDENT_CONFIGURE_PARAMS = --enable-linux-affinity +else + ARCH_DEPENDENT_CONFIGURE_PARAMS = --enable-hwloc +endif + +%: + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + --enable-taskstats \ + --enable-openvz \ + --enable-vserver \ + --enable-cgroup \ + --enable-unicode \ + $(ARCH_DEPENDENT_CONFIGURE_PARAMS) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..3ce5c6f --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=dversionmangle=s/\+svn(.*)// \ +https://hisham.hm/htop/releases/([\d\.]+)/htop-([\d\.]+)\.tar\.gz |