Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Jeremy Bícha
|
6bcb76b03e | ||
|
Jeremy Bícha
|
a76e348377 | ||
 Jeremy Bicha
|
f9ad2dfb5b | ||
|
Jeremy Bicha
|
fa0be4c6ce | ||
|
Jeremy Bicha
|
207a43da75 |
-16
@@ -1,16 +0,0 @@
|
|||||||
# A simulation of Subversion default ignores, generated by reposurgeon.
|
|
||||||
*.o
|
|
||||||
*.lo
|
|
||||||
*.la
|
|
||||||
*.al
|
|
||||||
.libs
|
|
||||||
*.so
|
|
||||||
*.so.[0-9]*
|
|
||||||
*.a
|
|
||||||
*.pyc
|
|
||||||
*.pyo
|
|
||||||
*.rej
|
|
||||||
*~
|
|
||||||
.#*
|
|
||||||
.*.swp
|
|
||||||
.DS_store
|
|
||||||
Vendored
-554
@@ -1,554 +0,0 @@
|
|||||||
libgtop2 (2.26.1-1) unstable; urgency=low
|
|
||||||
|
|
||||||
[ Luca Bruno ]
|
|
||||||
* New upstream release.
|
|
||||||
* debian/copyright:
|
|
||||||
- Specify GPL version 2.
|
|
||||||
- Don't mention /usr/share/doc/libgtop2*/AUTHORS, all upstream authors
|
|
||||||
are already listed here.
|
|
||||||
* debian/control.in:
|
|
||||||
- Updated Standards-Version to 3.8.1, no additional changes needed.
|
|
||||||
- Add ${misc:Depends} to all packages.
|
|
||||||
|
|
||||||
[ Josselin Mouette ]
|
|
||||||
* Fix incorrect Replaces:.
|
|
||||||
* Remove the FreeBSD-specific libraries from the -dev dependencies,
|
|
||||||
they are not needed to build libgtop2-based applications.
|
|
||||||
* Add missing build-dependencies.
|
|
||||||
|
|
||||||
-- Josselin Mouette <joss@debian.org> Thu, 11 Jun 2009 09:15:19 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.24.3-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream bugfix release.
|
|
||||||
|
|
||||||
-- Josselin Mouette <joss@debian.org> Wed, 04 Mar 2009 17:47:56 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.24.0-1) experimental; urgency=low
|
|
||||||
|
|
||||||
* New upstream release.
|
|
||||||
* Bump shlibs version to 2.23.2.
|
|
||||||
* Bump intltool requirement to 0.35.0.
|
|
||||||
|
|
||||||
-- Josselin Mouette <joss@debian.org> Fri, 21 Nov 2008 19:18:22 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.22.3-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream bugfix release.
|
|
||||||
* debian/control.in:
|
|
||||||
+ Updated Standards-Version to 3.8.0, no additional changes needed.
|
|
||||||
+ Build depend on intltool as it's now required.
|
|
||||||
|
|
||||||
-- Sebastian Dröge <slomo@debian.org> Tue, 01 Jul 2008 10:11:55 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.22.2-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream bugfix release:
|
|
||||||
+ Fixes parsing of large /proc/stat on Linux.
|
|
||||||
|
|
||||||
-- Sebastian Dröge <slomo@debian.org> Sun, 25 May 2008 17:00:32 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.22.1-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream bugfix release:
|
|
||||||
+ Fixes build on non-Linux archs (Closes: #473211).
|
|
||||||
* debian/rules,
|
|
||||||
debian/control.in:
|
|
||||||
+ Patch by Petr Salinger to let the -dev package depend on all required
|
|
||||||
packages on GNU/kFreeBSD.
|
|
||||||
|
|
||||||
-- Sebastian Dröge <slomo@debian.org> Fri, 04 Apr 2008 21:08:49 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.22.0-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream stable release.
|
|
||||||
|
|
||||||
-- Sebastian Dröge <slomo@debian.org> Fri, 14 Mar 2008 11:55:57 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.20.2-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream bugfix release:
|
|
||||||
+ Fixes smaps parsing with Linux kernel >= 2.6.24.
|
|
||||||
|
|
||||||
-- Sebastian Dröge <slomo@debian.org> Sat, 08 Mar 2008 05:02:09 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.20.1-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream bugfix release.
|
|
||||||
|
|
||||||
-- Sebastian Dröge <slomo@debian.org> Tue, 08 Jan 2008 14:07:50 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.20.0-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* debian/patches/01_kfreebsd.patch,
|
|
||||||
debian/control.in:
|
|
||||||
+ Fix FTBFS on GNU/kFreeBSD. Thanks to Petr Salinger for the patch
|
|
||||||
(Closes: #456936).
|
|
||||||
* debian/control.in:
|
|
||||||
+ Update Standards-Version to 3.7.3, no additional changes needed.
|
|
||||||
* debian/patches/99_ltmain_as-needed.patch,
|
|
||||||
debian/rules:
|
|
||||||
+ Link with --as-needed to remove some unnecessary dependencies.
|
|
||||||
|
|
||||||
-- Sebastian Dröge <slomo@debian.org> Sat, 05 Jan 2008 07:14:55 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.20.0-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release, with some API additions.
|
|
||||||
* debian/control.in:
|
|
||||||
+ Remove libpopt-dev from build-depends.
|
|
||||||
* debian/rules:
|
|
||||||
+ Bump shlibs to >= 2.20.0.
|
|
||||||
|
|
||||||
-- Sebastian Dröge <slomo@debian.org> Mon, 17 Sep 2007 06:21:20 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.14.9-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream stable release, with some API and ABI removals of
|
|
||||||
glibtop_init_*() functions which shouldn't have been public and are not
|
|
||||||
known to be used by anything else.
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Wed, 20 Jun 2007 15:16:55 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.14.8-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Upload to unstable; drop check-dist include.
|
|
||||||
* Add CVE id, GNOME bug id, and SVN rev to 2.14.8-1.
|
|
||||||
* Bump up Debhelper compatibility level to 5; fix bogus /usr/include/gnome
|
|
||||||
in libgtop2-dev.install.
|
|
||||||
* Update watch file to track all stable branches and use HTTP.
|
|
||||||
* Drop useless debian/libgtop-dev.postinst; cleanups.
|
|
||||||
* Wrap build-deps and deps.
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Wed, 11 Apr 2007 16:13:37 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.14.8-1) experimental; urgency=low
|
|
||||||
|
|
||||||
* Include the new check-dist Makefile to prevent accidental uploads to
|
|
||||||
unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
|
|
||||||
* New upstream stable releases.
|
|
||||||
- 2.14.7 fixed CVE-2007-0235; GNOME #396477; SVN r2546.
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Sun, 11 Mar 2007 17:05:45 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.14.6-1) experimental; urgency=low
|
|
||||||
|
|
||||||
* Add a get-orig-source target to retrieve the upstream tarball.
|
|
||||||
* New upstream release; no API or ABI change.
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Sun, 14 Jan 2007 20:56:18 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.14.5-1) experimental; urgency=low
|
|
||||||
|
|
||||||
* New upstream release.
|
|
||||||
- Target at experimental.
|
|
||||||
- Drop patch 10_kfreebsd, merged upstream.
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Sun, 7 Jan 2007 18:27:40 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.14.4-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* New patch, 10_kfreebsd, to build-depend and depend on libkvm-dev on
|
|
||||||
kfreebsd, to update the m4 macros to detect __FreeBSD_kernel__, and to
|
|
||||||
update configure; thanks Petr Salinger; closes: #399270.
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Sun, 19 Nov 2006 10:59:47 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.14.4-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release; no API change.
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Sun, 17 Sep 2006 11:23:28 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.14.3-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release; no API changes.
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Wed, 6 Sep 2006 15:55:02 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.14.2-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Build-depend on libxml-parser-perl.
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Wed, 9 Aug 2006 11:30:23 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.14.2-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release, with API additions.
|
|
||||||
- Bump shlibs to >= 2.14.2.
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Sat, 29 Jul 2006 22:16:12 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.14.1-3) unstable; urgency=low
|
|
||||||
|
|
||||||
* Let libgtop2-common also replace the venerable libgtop2. (Closes: #380350)
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Sat, 29 Jul 2006 18:57:02 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.14.1-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Make libgtop2-common arch: all instead of arch: any.
|
|
||||||
|
|
||||||
-- Dafydd Harries <daf@debian.org> Tue, 4 Jul 2006 18:04:14 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.14.1-1) unstable; urgency=low
|
|
||||||
|
|
||||||
[ Loic Minier ]
|
|
||||||
* Stop shipping *.la files in libgtop2-dev.
|
|
||||||
[debian/libgtop2-dev.install]
|
|
||||||
|
|
||||||
[ Josselin Mouette ]
|
|
||||||
* New upstream release.
|
|
||||||
+ Fix for proc_state.h reference in documentation (closes: #353596).
|
|
||||||
* Bump glib build-dependency.
|
|
||||||
* Standards version is 3.7.2.
|
|
||||||
* New library package name.
|
|
||||||
* Split the translations in a separate package.
|
|
||||||
* Use dpkg-dev 1.13.19 for NMU-safety.
|
|
||||||
* Rework package descriptions.
|
|
||||||
* libgtop2-5.docs: removed, added automatically by cdbs.
|
|
||||||
* libgtop2-5.post*: removed, duplicates dh_makeshlibs.
|
|
||||||
* rules: enable xauth.
|
|
||||||
* libgtop-config.1: removed, unused.
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Wed, 28 Jun 2006 22:38:06 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.12.2-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release
|
|
||||||
* Upload to unstable
|
|
||||||
* debian/copyright:
|
|
||||||
- change 'downloaded from' address to the correct location
|
|
||||||
* debian/control.in:
|
|
||||||
- build-depends updated to not b-d on xlibs-dev, libxau-dev added
|
|
||||||
|
|
||||||
-- Gustavo Noronha Silva <kov@debian.org> Sat, 7 Jan 2006 20:31:56 -0200
|
|
||||||
|
|
||||||
libgtop2 (2.12.0-2) experimental; urgency=high
|
|
||||||
|
|
||||||
* Bump shlibs to >= 2.12.0 since the #define'd functions of the API are now
|
|
||||||
real symbols. (Closes: #336736) [debian/rules]
|
|
||||||
* Add CDBS' utils. [debian/rules]
|
|
||||||
* Fix license. [debian/copyright]
|
|
||||||
* Bump up Standards-Version to 3.6.2. [debian/control, debian/control.in]
|
|
||||||
|
|
||||||
-- Loic Minier <lool@dooz.org> Tue, 1 Nov 2005 12:44:28 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.12.0-1) experimental; urgency=low
|
|
||||||
|
|
||||||
* New upstream version.
|
|
||||||
* debian/patches/02_fix_link.patch:
|
|
||||||
- fixed with the new version.
|
|
||||||
* debian/watch:
|
|
||||||
- updated
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Tue, 18 Oct 2005 12:08:17 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.10.2-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream version:
|
|
||||||
- fix the build on sparc (Closes: #313477).
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Tue, 14 Jun 2005 00:43:16 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.10.1-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Upload to unstable.
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Thu, 9 Jun 2005 23:16:51 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.10.1-1) experimental; urgency=low
|
|
||||||
|
|
||||||
* New upstream version.
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Thu, 14 Apr 2005 12:35:26 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.10.0-1) experimental; urgency=low
|
|
||||||
|
|
||||||
* New upstream version.
|
|
||||||
* Update for the soname changes.
|
|
||||||
* debian/control.in:
|
|
||||||
- dropped libgtop2-daemon to follow upstream changes.
|
|
||||||
- updated for the soname change.
|
|
||||||
* debian/patches/10_relibtoolize.patch:
|
|
||||||
- dropped, the new version is fine.
|
|
||||||
* debian/rules:
|
|
||||||
- updated the shlibs.
|
|
||||||
* debian/watch:
|
|
||||||
- updated.
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Sat, 9 Apr 2005 15:31:19 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.6.0-4) unstable; urgency=low
|
|
||||||
|
|
||||||
* debian/patches/10_relibtoolize.patch:
|
|
||||||
- remade patch to help fix dpkg-shlibdeps problem
|
|
||||||
* debian/libgtop2-2.shlibs:
|
|
||||||
- removed, should be auto-generated, which definately
|
|
||||||
fixes the problem of dpkg-shlibdeps not being able
|
|
||||||
to find information about this library
|
|
||||||
|
|
||||||
-- Gustavo Noronha Silva <kov@debian.org> Sat, 29 May 2004 01:46:40 -0300
|
|
||||||
|
|
||||||
libgtop2 (2.6.0-3) unstable; urgency=low
|
|
||||||
|
|
||||||
* GNOME Team upload.
|
|
||||||
* Uploaded to Sid.
|
|
||||||
|
|
||||||
-- Jose Carlos Garcia Sogo <jsogo@debian.org> Tue, 25 May 2004 20:52:38 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.6.0-2) experimental; urgency=low
|
|
||||||
|
|
||||||
* GNOME Team upload.
|
|
||||||
* Added texinfo to Build-Depends, as this fixes a problem with pregenerated
|
|
||||||
.info file having the same timestamp than macros. (Closes: #244010)
|
|
||||||
* debian/control: Conflicts && Replaces libgtop2 package. (Closes: #241471)
|
|
||||||
|
|
||||||
-- Jose Carlos Garcia Sogo <jsogo@debian.org> Sat, 1 May 2004 14:51:13 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.6.0-1) experimental; urgency=low
|
|
||||||
|
|
||||||
* Upgraded to new upstream version.
|
|
||||||
* debian/watch: added
|
|
||||||
* debian/patches:
|
|
||||||
- Removed unneeded patches.
|
|
||||||
- CDBS don't use dpatch, so remove the part before @DPATCH@ in .dpatches
|
|
||||||
- 10_relibtoolize.patch: new
|
|
||||||
* Fixed installation of info file. (Closes: #244010)
|
|
||||||
|
|
||||||
-- Jose Carlos Garcia Sogo <jsogo@debian.org> Sun, 18 Apr 2004 16:42:13 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.5.2-4) experimental; urgency=low
|
|
||||||
|
|
||||||
* GNOME Team upload. The "Oskuro's bitching" release.
|
|
||||||
* libgtop2-2 package conflicts with old libgtop2 package. (Closes: #243400)
|
|
||||||
* moved info file from library package to -dev package.
|
|
||||||
* cleaned Build-Depends field.
|
|
||||||
|
|
||||||
-- Jose Carlos Garcia Sogo <jsogo@debian.org> Tue, 13 Apr 2004 23:53:06 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.5.2-3) experimental; urgency=low
|
|
||||||
|
|
||||||
* GNOME Team upload.
|
|
||||||
* Added shlibs information to proper .shlibs file.
|
|
||||||
* Removed dpatch from Build-Depends as it's no longer needed.
|
|
||||||
|
|
||||||
-- Jose Carlos Garcia Sogo <jsogo@debian.org> Tue, 6 Apr 2004 18:26:56 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.5.2-2) experimental; urgency=low
|
|
||||||
|
|
||||||
* Changed package name to reflect new soname (Closes: #240578)
|
|
||||||
* debian/control.in:
|
|
||||||
+ Changed to reflect new package name.
|
|
||||||
+ Changed ligtop2-dev dependencies to be in sync with changes.
|
|
||||||
* Moved debian/libgtop2.* files to debian/libgtop2-2.* to reflect package
|
|
||||||
name change.
|
|
||||||
|
|
||||||
-- Jose Carlos Garcia Sogo <jsogo@debian.org> Sun, 28 Mar 2004 17:23:33 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.5.2-1) experimental; urgency=low
|
|
||||||
|
|
||||||
* Marc Dequènes (Duck):
|
|
||||||
- New upstream release
|
|
||||||
- Corrected patch 'fix_link' to apply on new sources, as it is still
|
|
||||||
needed.
|
|
||||||
- Deactivated all other patches, they *should* not be useful anymore.
|
|
||||||
|
|
||||||
* Jose Carlos:
|
|
||||||
- Converted to cdbs.
|
|
||||||
- debian/:
|
|
||||||
+ Moved .files to .install
|
|
||||||
- debian/control.in:
|
|
||||||
+ Removed automake and autoconf Build-Dependencies.
|
|
||||||
+ libgtop2-dev package should depend only on libglib2.0-dev instead
|
|
||||||
of libgtk+2.0-dev
|
|
||||||
|
|
||||||
-- Jose Carlos Garcia Sogo <jsogo@debian.org> Sat, 27 Mar 2004 16:03:56 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.8-7) unstable; urgency=low
|
|
||||||
|
|
||||||
* debian/patches/05_cpu_values.dpatch:
|
|
||||||
+ new version of the patch.
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Fri, 13 Feb 2004 19:59:16 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.8-6) unstable; urgency=low
|
|
||||||
|
|
||||||
* debian/patches/05_cpu_values.dpatch:
|
|
||||||
+ new patch to CPU usage with 2.6 kernels (Closes: #231079)
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Thu, 12 Feb 2004 23:00:09 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.8-5) unstable; urgency=low
|
|
||||||
|
|
||||||
* debian/patches/04_mem_values2.dpatch:
|
|
||||||
+ should really fix memory values (Closes: #224371).
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Wed, 28 Jan 2004 00:39:38 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.8-4) unstable; urgency=low
|
|
||||||
|
|
||||||
* debian/patches/03_mem_values.dpatch:
|
|
||||||
+ patch to fix wrong memory values (Closes: #224371).
|
|
||||||
* debian/libgtop2.info:
|
|
||||||
+ include libgtop2.info file (Closes: #225546).
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Thu, 1 Jan 2004 13:31:21 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.8-3) unstable; urgency=low
|
|
||||||
|
|
||||||
* debian/patches/02_fix_link.dpatch, debian/rules:
|
|
||||||
+ patch from Christian Marillat to fix the link problem (Closes: #194108).
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Tue, 30 Dec 2003 21:45:51 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.8-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Added missing Build-Depends on libpopt-dev and texinfo (Closes: #224928).
|
|
||||||
* Changed libgtop2-daemon section to utils.
|
|
||||||
* Updated for the Gnome Team.
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Thu, 25 Dec 2003 18:28:31 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.8-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream release (Closes: #224613).
|
|
||||||
* debian/patches/01_kernel26-headers.dpatch:
|
|
||||||
+ removed since changes are included in the new version.
|
|
||||||
* debian/patches/01_libgtop2-kernel2.6.dpatch:
|
|
||||||
+ new patch to build with 2.6 headers (Closes: #223027).
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Sat, 20 Dec 2003 18:28:19 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.5-4) unstable; urgency=low
|
|
||||||
|
|
||||||
* Added patch from Steve Fosdick <dbugs@pelvoux.nildram.co.uk> to fix
|
|
||||||
memory stats on 2.6 kernels (Closes: #137603, #201876, #216385).
|
|
||||||
* Removed empty libgtop2.info.gz (Closes: #213720).
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Mon, 20 Oct 2003 02:11:48 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.0.5-3) unstable; urgency=low
|
|
||||||
|
|
||||||
* Updated libtool (Closes: #212506).
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Wed, 24 Sep 2003 12:22:29 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.0.5-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Upload in unstable (Closes: #211969).
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Mon, 22 Sep 2003 15:19:57 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.0.5-1) experimental; urgency=low
|
|
||||||
|
|
||||||
* New maintainer.
|
|
||||||
* New upstream version
|
|
||||||
+ GNOME 2.4 upload in experimental.
|
|
||||||
* NMU acknowledge
|
|
||||||
(Closes: #195454, #195623, #195625, #195665, #195819, #195867, #196044).
|
|
||||||
* debian/control
|
|
||||||
+ Changed sections.
|
|
||||||
+ Updated Standards-Version to 3.6.1.0.
|
|
||||||
* debian/rules
|
|
||||||
+ Updated to debhelper 4.
|
|
||||||
|
|
||||||
-- Sebastien Bacher <seb128@debian.org> Sat, 13 Sep 2003 16:18:25 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.0.2.is.2.0.1-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* NMU with maintainer's knowledge, altough Noel will assuredly not like the
|
|
||||||
way i did the upload, experimenting and Christian Marillat's and Coling
|
|
||||||
Walters's advice showed me there is no other elegant solution. So i
|
|
||||||
reverted the package to 2.0.1-4, applied the src/daemon/gnuserv.c buffer
|
|
||||||
overflow fix from 2.0.2, and made a fake 2.0.2 package. Other alternative
|
|
||||||
would have been using an epoch, which i consider ugly. The problem with
|
|
||||||
2.0.2 is that buggy (even if Christian thinks it is a feature) libtool
|
|
||||||
apparently did increase the soname, which is not needed here. Also
|
|
||||||
the libgtop2 build system is broken, probably due to libtool too, because
|
|
||||||
it will link libraries with already installed libraries and not with the
|
|
||||||
ones currently building. This is mostly ok, but breaks when the soname
|
|
||||||
changes.
|
|
||||||
(Closes: #195454, #195623, #195625, #195665, #195819, #195867, #196044)
|
|
||||||
|
|
||||||
-- Sven Luther <luther@debian.org> Sun, 8 Jun 2003 21:21:07 +0200
|
|
||||||
|
|
||||||
libgtop2 (2.0.2-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* new upstream from 2003-05-15
|
|
||||||
|
|
||||||
-- Noel Koethe <noel@debian.org> Thu, 29 May 2003 23:03:00 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.1-4) unstable; urgency=low
|
|
||||||
|
|
||||||
* updated config.guess and config.sub for mips
|
|
||||||
(closes: Bug#180126)
|
|
||||||
|
|
||||||
-- Noel Koethe <noel@debian.org> Sat, 8 Feb 2003 12:20:00 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.1-3) unstable; urgency=low
|
|
||||||
|
|
||||||
* updated libtool files for mips/mipsel
|
|
||||||
(closes: Bug#179112)
|
|
||||||
|
|
||||||
-- Noel Koethe <noel@debian.org> Thu, 7 Feb 2003 00:59:00 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.1-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* added missing lib in last upload
|
|
||||||
(closes: Bug#178989)
|
|
||||||
|
|
||||||
-- Noel Koethe <noel@debian.org> Thu, 30 Jan 2003 10:09:00 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.1-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* new upstream version from 2003-01-13
|
|
||||||
(closes: Bug#178932)
|
|
||||||
* updated Standards-Version
|
|
||||||
|
|
||||||
-- Noel Koethe <noel@debian.org> Wed, 29 Jan 2003 18:16:00 +0100
|
|
||||||
|
|
||||||
libgtop2 (2.0.0-0) unstable; urgency=low
|
|
||||||
|
|
||||||
* new upstream version from 2002-06-10
|
|
||||||
(closes: Bug#150134)
|
|
||||||
|
|
||||||
-- Noel Koethe <noel@debian.org> Sun, 16 Jun 2002 16:20:00 +0200
|
|
||||||
|
|
||||||
libgtop2 (1.90.2-5) unstable; urgency=low
|
|
||||||
|
|
||||||
* added missing usr/lib/pkgconfig/libgtop-2.0.pc to -dev
|
|
||||||
package
|
|
||||||
(closes: Bug#146737)
|
|
||||||
|
|
||||||
-- Noel Koethe <noel@debian.org> Thu, 16 May 2002 20:17:00 +0200
|
|
||||||
|
|
||||||
libgtop2 (1.90.2-4) unstable; urgency=low
|
|
||||||
|
|
||||||
* corrected libgtop2-dev Depends line to libgtk2.0-dev
|
|
||||||
(closes: Bug#140589)
|
|
||||||
|
|
||||||
-- Noel Koethe <noel@debian.org> Thu, 11 Apr 2002 17:40:00 +0200
|
|
||||||
|
|
||||||
libgtop2 (1.90.2-3) unstable; urgency=low
|
|
||||||
|
|
||||||
* recompiled against libgtk2.0
|
|
||||||
(closes: Bug#140589)
|
|
||||||
|
|
||||||
-- Noel Koethe <noel@debian.org> Sat, 6 Apr 2002 15:38:00 +0200
|
|
||||||
|
|
||||||
libgtop2 (1.90.2-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* recompiled against glib/gtk 1.3.15
|
|
||||||
(closes: Bug#137074)
|
|
||||||
|
|
||||||
-- Noel Koethe <noel@debian.org> Wed, 6 Mar 2002 15:42:00 +0100
|
|
||||||
|
|
||||||
libgtop2 (1.90.2-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* Initial Release.
|
|
||||||
(closes: Bug#133219)
|
|
||||||
|
|
||||||
-- Noel Koethe <noel@debian.org> Sat, 16 Feb 2002 13:16:00 +0100
|
|
||||||
|
|
||||||
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
5
|
|
||||||
Vendored
-59
@@ -1,59 +0,0 @@
|
|||||||
Source: libgtop2
|
|
||||||
Section: libs
|
|
||||||
Priority: optional
|
|
||||||
Maintainer: Sebastien Bacher <seb128@debian.org>
|
|
||||||
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
|
|
||||||
Build-Depends: debhelper (>= 5),
|
|
||||||
gettext,
|
|
||||||
pkg-config,
|
|
||||||
libxau-dev,
|
|
||||||
libglib2.0-dev (>= 2.6.0),
|
|
||||||
gnome-pkg-tools (>= 0.10),
|
|
||||||
cdbs,
|
|
||||||
texinfo,
|
|
||||||
dpkg-dev (>= 1.13.19),
|
|
||||||
intltool (>= 0.35.0),
|
|
||||||
libxt-dev,
|
|
||||||
libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
|
|
||||||
libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
|
|
||||||
libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
|
|
||||||
gtk-doc-tools (>= 1.4)
|
|
||||||
Standards-Version: 3.8.1
|
|
||||||
|
|
||||||
Package: libgtop2-7
|
|
||||||
Architecture: any
|
|
||||||
Section: libs
|
|
||||||
Depends: ${shlibs:Depends}, ${misc:Depends},
|
|
||||||
libgtop2-common (>= ${source:Version})
|
|
||||||
Description: gtop system monitoring library
|
|
||||||
The gtop library reads information about processes and the state of the
|
|
||||||
system. It is used by the GNOME desktop environment.
|
|
||||||
.
|
|
||||||
This package contains the shared library.
|
|
||||||
|
|
||||||
Package: libgtop2-dev
|
|
||||||
Architecture: any
|
|
||||||
Section: libdevel
|
|
||||||
Depends: ${misc:Depends},
|
|
||||||
libgtop2-7 (= ${binary:Version}),
|
|
||||||
libglib2.0-dev
|
|
||||||
Description: gtop system monitoring library
|
|
||||||
The gtop library reads information about processes and the state of the
|
|
||||||
system. It is used by the GNOME desktop environment.
|
|
||||||
.
|
|
||||||
This package contains the static library, development headers, and
|
|
||||||
documentation.
|
|
||||||
|
|
||||||
Package: libgtop2-common
|
|
||||||
Architecture: all
|
|
||||||
Section: libs
|
|
||||||
Depends: ${misc:Depends},
|
|
||||||
Replaces: libgtop2-5,
|
|
||||||
libgtop2-4,
|
|
||||||
libgtop2-2,
|
|
||||||
libgtop2
|
|
||||||
Description: common files for the gtop system monitoring library
|
|
||||||
The gtop library reads information about processes and the state of the
|
|
||||||
system. It is used by the GNOME desktop environment.
|
|
||||||
.
|
|
||||||
This package contains the translations.
|
|
||||||
Vendored
-59
@@ -1,59 +0,0 @@
|
|||||||
Source: libgtop2
|
|
||||||
Section: libs
|
|
||||||
Priority: optional
|
|
||||||
Maintainer: Sebastien Bacher <seb128@debian.org>
|
|
||||||
Uploaders: @GNOME_TEAM@
|
|
||||||
Build-Depends: debhelper (>= 5),
|
|
||||||
gettext,
|
|
||||||
pkg-config,
|
|
||||||
libxau-dev,
|
|
||||||
libglib2.0-dev (>= 2.6.0),
|
|
||||||
gnome-pkg-tools (>= 0.10),
|
|
||||||
cdbs,
|
|
||||||
texinfo,
|
|
||||||
dpkg-dev (>= 1.13.19),
|
|
||||||
intltool (>= 0.35.0),
|
|
||||||
libxt-dev,
|
|
||||||
libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
|
|
||||||
libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
|
|
||||||
libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
|
|
||||||
gtk-doc-tools (>= 1.4)
|
|
||||||
Standards-Version: 3.8.1
|
|
||||||
|
|
||||||
Package: libgtop2-7
|
|
||||||
Architecture: any
|
|
||||||
Section: libs
|
|
||||||
Depends: ${shlibs:Depends}, ${misc:Depends},
|
|
||||||
libgtop2-common (>= ${source:Version})
|
|
||||||
Description: gtop system monitoring library
|
|
||||||
The gtop library reads information about processes and the state of the
|
|
||||||
system. It is used by the GNOME desktop environment.
|
|
||||||
.
|
|
||||||
This package contains the shared library.
|
|
||||||
|
|
||||||
Package: libgtop2-dev
|
|
||||||
Architecture: any
|
|
||||||
Section: libdevel
|
|
||||||
Depends: ${misc:Depends},
|
|
||||||
libgtop2-7 (= ${binary:Version}),
|
|
||||||
libglib2.0-dev
|
|
||||||
Description: gtop system monitoring library
|
|
||||||
The gtop library reads information about processes and the state of the
|
|
||||||
system. It is used by the GNOME desktop environment.
|
|
||||||
.
|
|
||||||
This package contains the static library, development headers, and
|
|
||||||
documentation.
|
|
||||||
|
|
||||||
Package: libgtop2-common
|
|
||||||
Architecture: all
|
|
||||||
Section: libs
|
|
||||||
Depends: ${misc:Depends},
|
|
||||||
Replaces: libgtop2-5,
|
|
||||||
libgtop2-4,
|
|
||||||
libgtop2-2,
|
|
||||||
libgtop2
|
|
||||||
Description: common files for the gtop system monitoring library
|
|
||||||
The gtop library reads information about processes and the state of the
|
|
||||||
system. It is used by the GNOME desktop environment.
|
|
||||||
.
|
|
||||||
This package contains the translations.
|
|
||||||
Vendored
-31
@@ -1,31 +0,0 @@
|
|||||||
This package was debianized by Jim Pick <jim@jimpick.com>
|
|
||||||
then Martin Schulze <joey@debian.org> in October 1998
|
|
||||||
then Ian Lynagh <igloo@debian.org> in November 1998
|
|
||||||
then Noel Koethe <noel@debian.org> in December 2001
|
|
||||||
|
|
||||||
It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libgtop/
|
|
||||||
|
|
||||||
Upstream Authors and Copyright Holders:
|
|
||||||
Martin Baulig (martin@home-of-linux.org)
|
|
||||||
Drazen Kacar (dave@srce.hr)
|
|
||||||
Benoît Dejean (tazforever@dlfp.org)
|
|
||||||
|
|
||||||
License:
|
|
||||||
|
|
||||||
This package 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 package 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 package; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
|
|
||||||
On Debian systems, the complete text of the GNU General
|
|
||||||
Public License can be found in `/usr/share/common-licenses/GPL-2'.
|
|
||||||
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
debian/tmp/usr/lib/*.so.*
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
debian/tmp/usr/share/locale
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
doc/libgtop2.info
|
|
||||||
Vendored
-4
@@ -1,4 +0,0 @@
|
|||||||
debian/tmp/usr/include/libgtop-2.0
|
|
||||||
debian/tmp/usr/lib/libgtop-2.0.a
|
|
||||||
debian/tmp/usr/lib/libgtop-2.0.so
|
|
||||||
debian/tmp/usr/lib/pkgconfig
|
|
||||||
Vendored
-643
@@ -1,643 +0,0 @@
|
|||||||
--- libgtop2-2.14.4.orig/sysdeps/freebsd/procsignal.c
|
|
||||||
+++ libgtop2-2.14.4/sysdeps/freebsd/procsignal.c
|
|
||||||
@@ -70,7 +70,7 @@
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
|
|
||||||
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
|
|
||||||
|
|
||||||
#define PROC_SIGLIST ki_siglist
|
|
||||||
#define PROC_SIGMASK ki_sigmask
|
|
||||||
@@ -92,7 +92,7 @@
|
|
||||||
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
|
|
||||||
buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0];
|
|
||||||
#elif (defined(__NetBSD__) && (NSIG > 32)) || \
|
|
||||||
- (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
|
|
||||||
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
|
|
||||||
buf->signal [0] = pinfo [0].PROC_SIGLIST.__bits[0];
|
|
||||||
#else
|
|
||||||
buf->signal [0] = pinfo [0].kp_proc.p_siglist;
|
|
||||||
@@ -104,7 +104,7 @@
|
|
||||||
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
|
|
||||||
buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0];
|
|
||||||
#elif (defined(__NetBSD__) && (NSIG > 32)) || \
|
|
||||||
- (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
|
|
||||||
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
|
|
||||||
buf->blocked [0] = pinfo [0].PROC_SIGMASK.__bits[0];
|
|
||||||
#else
|
|
||||||
buf->blocked [0] = pinfo [0].kp_proc.p_sigmask;
|
|
||||||
@@ -116,7 +116,7 @@
|
|
||||||
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
|
|
||||||
buf->sigignore [0] = pinfo [0].kp_proc.p_sigctx.ps_sigignore.__bits[0];
|
|
||||||
#elif (defined(__NetBSD__) && (NSIG > 32)) || \
|
|
||||||
- (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
|
|
||||||
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
|
|
||||||
buf->sigignore [0] = pinfo [0].PROC_SIGIGNORE.__bits[0];
|
|
||||||
#else
|
|
||||||
buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore;
|
|
||||||
@@ -128,7 +128,7 @@
|
|
||||||
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
|
|
||||||
buf->sigcatch [0] = pinfo [0].kp_proc.p_sigctx.ps_sigcatch.__bits[0];
|
|
||||||
#elif (defined(__NetBSD__) && (NSIG > 32)) || \
|
|
||||||
- (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
|
|
||||||
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
|
|
||||||
buf->sigcatch [0] = pinfo [0].PROC_SIGCATCH.__bits[0];
|
|
||||||
#else
|
|
||||||
buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch;
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/sysdeps/freebsd/mem.c
|
|
||||||
+++ libgtop2-2.14.4/sysdeps/freebsd/mem.c
|
|
||||||
@@ -43,7 +43,7 @@
|
|
||||||
(1L << GLIBTOP_MEM_FREE) +
|
|
||||||
(1L << GLIBTOP_MEM_SHARED) +
|
|
||||||
(1L << GLIBTOP_MEM_BUFFER) +
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
(1L << GLIBTOP_MEM_CACHED) +
|
|
||||||
#endif
|
|
||||||
(1L << GLIBTOP_MEM_USER) + (1L << GLIBTOP_MEM_LOCKED);
|
|
||||||
@@ -66,7 +66,7 @@
|
|
||||||
#else
|
|
||||||
#if defined(__bsdi__)
|
|
||||||
{ "_bufcachemem" },
|
|
||||||
-#elif defined(__FreeBSD__)
|
|
||||||
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
{ "_bufspace" },
|
|
||||||
#else
|
|
||||||
{ "_bufpages" },
|
|
||||||
@@ -171,7 +171,7 @@
|
|
||||||
|
|
||||||
/* convert memory stats to Kbytes */
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__)
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
v_total_count = vmm.v_page_count;
|
|
||||||
#else
|
|
||||||
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
|
|
||||||
@@ -198,7 +198,7 @@
|
|
||||||
buf->used = (guint64) pagetok (v_used_count) << LOG1024;
|
|
||||||
buf->free = (guint64) pagetok (v_free_count) << LOG1024;
|
|
||||||
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
buf->cached = (guint64) pagetok (vmm.v_cache_count) << LOG1024;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -210,7 +210,7 @@
|
|
||||||
|
|
||||||
buf->shared = (guint64) pagetok (vmt.t_rmshr) << LOG1024;
|
|
||||||
|
|
||||||
-#if __FreeBSD__
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
buf->buffer = (guint64) bufspace;
|
|
||||||
#else
|
|
||||||
buf->buffer = (guint64) pagetok (bufspace) << LOG1024;
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/sysdeps/freebsd/procstate.c
|
|
||||||
+++ libgtop2-2.14.4/sysdeps/freebsd/procstate.c
|
|
||||||
@@ -73,7 +73,7 @@
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
|
|
||||||
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
|
|
||||||
#define PROC_COMM ki_comm
|
|
||||||
#define PROC_SVUID ki_svuid
|
|
||||||
#define PROC_SVGID ki_svgid
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/sysdeps/freebsd/fsusage.c
|
|
||||||
+++ libgtop2-2.14.4/sysdeps/freebsd/fsusage.c
|
|
||||||
@@ -46,9 +46,9 @@
|
|
||||||
if (result == -1) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+#if !defined(__FreeBSD_kernel__)
|
|
||||||
buf->read = sfs.f_syncreads + sfs.f_asyncreads;
|
|
||||||
buf->write = sfs.f_syncwrites + sfs.f_asyncwrites;
|
|
||||||
-
|
|
||||||
+#endif
|
|
||||||
buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
|
|
||||||
}
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/sysdeps/freebsd/swap.c
|
|
||||||
+++ libgtop2-2.14.4/sysdeps/freebsd/swap.c
|
|
||||||
@@ -33,13 +33,13 @@
|
|
||||||
(1L << GLIBTOP_SWAP_FREE) + (1L << GLIBTOP_SWAP_PAGEIN) +
|
|
||||||
(1L << GLIBTOP_SWAP_PAGEOUT);
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) || defined(__bsdi__)
|
|
||||||
+#if defined(__FreeBSD__) || defined(__bsdi__) || defined(__FreeBSD_kernel__)
|
|
||||||
|
|
||||||
#include <sys/conf.h>
|
|
||||||
#ifdef __bsdi__
|
|
||||||
#include <vm/swap_pager.h>
|
|
||||||
#else
|
|
||||||
-#if __FreeBSD_version < 400005
|
|
||||||
+#if (__FreeBSD_version < 400005) && !defined(__FreeBSD_kernel__)
|
|
||||||
#include <sys/rlist.h>
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
@@ -94,7 +94,7 @@
|
|
||||||
void
|
|
||||||
glibtop_init_swap_p (glibtop *server)
|
|
||||||
{
|
|
||||||
-#if defined(__FreeBSD__) || defined(__bsdi__)
|
|
||||||
+#if defined(__FreeBSD__) || defined(__bsdi__) || defined(__FreeBSD_kernel__)
|
|
||||||
#if __FreeBSD__ < 4 || defined(__bsdi__)
|
|
||||||
if (kvm_nlist (server->machine.kd, nlst) < 0) {
|
|
||||||
glibtop_warn_io_r (server, "kvm_nlist (swap)");
|
|
||||||
@@ -130,9 +130,9 @@
|
|
||||||
void
|
|
||||||
glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
|
|
||||||
{
|
|
||||||
-#if defined(__FreeBSD__)
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
|
|
||||||
-# if __FreeBSD__ < 4
|
|
||||||
+# if (__FreeBSD__ < 4) && !defined(__FreeBSD_kernel__)
|
|
||||||
char *header;
|
|
||||||
int hlen, nswdev, dmmax;
|
|
||||||
int div, nfree, npfree;
|
|
||||||
@@ -194,7 +194,7 @@
|
|
||||||
buf->pagein = 0;
|
|
||||||
buf->pageout = 0;
|
|
||||||
} else {
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
buf->pagein = vmm.v_swappgsin - swappgsin;
|
|
||||||
buf->pageout = vmm.v_swappgsout - swappgsout;
|
|
||||||
#else
|
|
||||||
@@ -208,7 +208,7 @@
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
swappgsin = vmm.v_swappgsin;
|
|
||||||
swappgsout = vmm.v_swappgsout;
|
|
||||||
#else
|
|
||||||
@@ -221,9 +221,9 @@
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__)
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
|
|
||||||
-#if __FreeBSD__ < 4
|
|
||||||
+#if (__FreeBSD__ < 4) && !defined(__FreeBSD_kernel__)
|
|
||||||
|
|
||||||
/* Size of largest swap device. */
|
|
||||||
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/sysdeps/freebsd/procmap.c
|
|
||||||
+++ libgtop2-2.14.4/sysdeps/freebsd/procmap.c
|
|
||||||
@@ -41,18 +41,18 @@
|
|
||||||
#else
|
|
||||||
#include <vm/vm_object.h>
|
|
||||||
#include <vm/vm_map.h>
|
|
||||||
-#if (__FreeBSD_version >= 400011)
|
|
||||||
+#if (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__)
|
|
||||||
#include <vm/vm.h>
|
|
||||||
#else
|
|
||||||
#include <vm/vm_prot.h>
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
#define _KVM_VNODE
|
|
||||||
#endif
|
|
||||||
#include <sys/vnode.h>
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
#undef _KVM_VNODE
|
|
||||||
#endif
|
|
||||||
#include <sys/mount.h>
|
|
||||||
@@ -109,9 +109,9 @@
|
|
||||||
struct vm_object object;
|
|
||||||
#endif
|
|
||||||
glibtop_map_entry *maps;
|
|
||||||
-#if defined __FreeBSD__
|
|
||||||
+#if (defined __FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
struct vnode vnode;
|
|
||||||
-#if __FreeBSD_version < 500039
|
|
||||||
+#if (__FreeBSD_version < 500039) && !defined(__FreeBSD_kernel__)
|
|
||||||
struct inode inode;
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
@@ -137,7 +137,7 @@
|
|
||||||
/* Now we get the memory maps. */
|
|
||||||
|
|
||||||
if (kvm_read (server->machine.kd,
|
|
||||||
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
|
|
||||||
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
|
|
||||||
(unsigned long) pinfo [0].ki_vmspace,
|
|
||||||
#else
|
|
||||||
(unsigned long) pinfo [0].kp_proc.p_vmspace,
|
|
||||||
@@ -179,8 +179,8 @@
|
|
||||||
update = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
-#if __FreeBSD__ >= 4
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
+#if (__FreeBSD__ >= 4) || defined(__FreeBSD_kernel__)
|
|
||||||
if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP))
|
|
||||||
continue;
|
|
||||||
#else
|
|
||||||
@@ -256,7 +256,7 @@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
/* If the object is of type vnode, add its size */
|
|
||||||
|
|
||||||
if (object.type != OBJT_VNODE)
|
|
||||||
@@ -270,10 +270,10 @@
|
|
||||||
&vnode, sizeof (vnode)) != sizeof (vnode))
|
|
||||||
glibtop_error_io_r (server, "kvm_read (vnode)");
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500039)
|
|
||||||
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500039)) || defined(__FreeBSD_kernel__)
|
|
||||||
switch (vnode.v_type) {
|
|
||||||
case VREG:
|
|
||||||
-#if __FreeBSD_version < 600006
|
|
||||||
+#if (__FreeBSD_version < 600006) && !defined(__FreeBSD_kernel__)
|
|
||||||
maps [i-1].inode = vnode.v_cachedid;
|
|
||||||
maps [i-1].device = vnode.v_cachedfs;
|
|
||||||
#endif
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/sysdeps/freebsd/procmem.c
|
|
||||||
+++ libgtop2-2.14.4/sysdeps/freebsd/procmem.c
|
|
||||||
@@ -73,7 +73,7 @@
|
|
||||||
static const unsigned long _glibtop_sysdeps_proc_mem_share =
|
|
||||||
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
|
|
||||||
(1L << GLIBTOP_PROC_MEM_SHARE);
|
|
||||||
-#elif defined(__FreeBSD__)
|
|
||||||
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
(1L << GLIBTOP_PROC_MEM_SHARE);
|
|
||||||
#else
|
|
||||||
0;
|
|
||||||
@@ -126,7 +126,7 @@
|
|
||||||
#else
|
|
||||||
struct vm_object object;
|
|
||||||
#endif
|
|
||||||
-#if !defined(__FreeBSD__) || (__FreeBSD_version < 500013)
|
|
||||||
+#if (!defined(__FreeBSD__) || (__FreeBSD_version < 500013)) && !defined(__FreeBSD_kernel__)
|
|
||||||
struct plimit plimit;
|
|
||||||
#endif
|
|
||||||
int count;
|
|
||||||
@@ -147,7 +147,7 @@
|
|
||||||
glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
|
|
||||||
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
|
|
||||||
|
|
||||||
#define PROC_VMSPACE ki_vmspace
|
|
||||||
|
|
||||||
@@ -214,8 +214,8 @@
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
-#if __FreeBSD__ >= 4
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
+#if (__FreeBSD__ >= 4) || defined(__FreeBSD_kernel__)
|
|
||||||
if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP))
|
|
||||||
continue;
|
|
||||||
#else
|
|
||||||
@@ -282,7 +282,7 @@
|
|
||||||
#endif /* __NetBSD_Version__ >= 105250000 */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
if (object.type != OBJT_VNODE)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/sysdeps/freebsd/prockernel.c
|
|
||||||
+++ libgtop2-2.14.4/sysdeps/freebsd/prockernel.c
|
|
||||||
@@ -36,7 +36,7 @@
|
|
||||||
#include <sys/user.h>
|
|
||||||
#endif
|
|
||||||
#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && \
|
|
||||||
- !defined(__NetBSD__)
|
|
||||||
+ !defined(__NetBSD__)
|
|
||||||
#include <machine/pcb.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -94,7 +94,7 @@
|
|
||||||
pid_t pid)
|
|
||||||
{
|
|
||||||
struct kinfo_proc *pinfo;
|
|
||||||
-#ifndef __FreeBSD__
|
|
||||||
+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
|
|
||||||
struct user *u_addr = (struct user *)USRSTACK;
|
|
||||||
struct pstats pstats;
|
|
||||||
struct pcb pcb;
|
|
||||||
@@ -119,7 +119,7 @@
|
|
||||||
if ((pinfo == NULL) || (count != 1))
|
|
||||||
glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
|
|
||||||
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
|
|
||||||
|
|
||||||
#define PROC_WCHAN ki_wchan
|
|
||||||
#define PROC_WMESG ki_wmesg
|
|
||||||
@@ -147,7 +147,7 @@
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#ifndef __FreeBSD__
|
|
||||||
+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
|
|
||||||
|
|
||||||
/* Taken from `saveuser ()' in `/usr/src/bin/ps/ps.c'. */
|
|
||||||
|
|
||||||
@@ -203,9 +203,9 @@
|
|
||||||
(unsigned long) &u_addr->u_pcb,
|
|
||||||
(char *) &pcb, sizeof (pcb)) == sizeof (pcb))
|
|
||||||
{
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
#ifndef __alpha__
|
|
||||||
-#if (__FreeBSD_version >= 300003)
|
|
||||||
+#if (__FreeBSD_version >= 300003) || defined(__FreeBSD_kernel__)
|
|
||||||
buf->kstk_esp = (guint64) pcb.pcb_esp;
|
|
||||||
buf->kstk_eip = (guint64) pcb.pcb_eip;
|
|
||||||
#else
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/sysdeps/freebsd/procuid.c
|
|
||||||
+++ libgtop2-2.14.4/sysdeps/freebsd/procuid.c
|
|
||||||
@@ -77,7 +77,7 @@
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
|
|
||||||
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
|
|
||||||
|
|
||||||
#define PROC_RUID ki_ruid
|
|
||||||
#define PROC_SVUID ki_svuid
|
|
||||||
@@ -87,12 +87,8 @@
|
|
||||||
#define PROC_PGID ki_pgid
|
|
||||||
#define PROC_TPGID ki_tpgid
|
|
||||||
#define PROC_NICE ki_nice
|
|
||||||
-#if __FreeBSD_version >= 500013
|
|
||||||
#define PROC_PRIORITY ki_pri.pri_user
|
|
||||||
#else
|
|
||||||
-#define PROC_PRIORITY ki_priority
|
|
||||||
-#endif
|
|
||||||
-#else
|
|
||||||
|
|
||||||
#define PROC_RUID kp_eproc.e_pcred.p_ruid
|
|
||||||
#define PROC_SVUID kp_eproc.e_pcred.p_svuid
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/sysdeps/freebsd/proclist.c
|
|
||||||
+++ libgtop2-2.14.4/sysdeps/freebsd/proclist.c
|
|
||||||
@@ -86,7 +86,7 @@
|
|
||||||
pids = g_realloc (pids, count * sizeof (unsigned));
|
|
||||||
/* Copy the pids over to this chain */
|
|
||||||
for (i=j=0; i < count; i++) {
|
|
||||||
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
|
|
||||||
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
|
|
||||||
#define PROC_STAT ki_stat
|
|
||||||
#define PROC_RUID ki_ruid
|
|
||||||
#define PROC_PID ki_pid
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/sysdeps/freebsd/proctime.c
|
|
||||||
+++ libgtop2-2.14.4/sysdeps/freebsd/proctime.c
|
|
||||||
@@ -58,9 +58,8 @@
|
|
||||||
* system, and interrupt time usage.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#ifndef __FreeBSD__
|
|
||||||
+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
|
|
||||||
|
|
||||||
-#ifndef __FreeBSD__
|
|
||||||
static void
|
|
||||||
calcru(p, up, sp, ip)
|
|
||||||
struct proc *p;
|
|
||||||
@@ -109,8 +108,6 @@
|
|
||||||
ip->tv_usec = it % 1000000;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#endif /* !__FreeBSD__ */
|
|
||||||
|
|
||||||
/* Provides detailed information about a process. */
|
|
||||||
@@ -145,7 +142,7 @@
|
|
||||||
if ((pinfo == NULL) || (count != 1))
|
|
||||||
glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
|
|
||||||
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
|
|
||||||
buf->rtime = pinfo [0].ki_runtime;
|
|
||||||
#elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013)
|
|
||||||
buf->rtime = pinfo [0].kp_proc.p_runtime;
|
|
||||||
@@ -182,8 +179,8 @@
|
|
||||||
|
|
||||||
buf->flags |= _glibtop_sysdeps_proc_time_user;
|
|
||||||
#else
|
|
||||||
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
|
|
||||||
-#if __FreeBSD_version >= 500016
|
|
||||||
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
|
|
||||||
+#if (__FreeBSD_version >= 500016) || defined(__FreeBSD_kernel__)
|
|
||||||
if ((pinfo [0].ki_flag & PS_INMEM)) {
|
|
||||||
#else
|
|
||||||
if ((pinfo [0].ki_flag & P_INMEM)) {
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/libgtop-sysdeps.m4
|
|
||||||
+++ libgtop2-2.14.4/libgtop-sysdeps.m4
|
|
||||||
@@ -64,7 +64,7 @@
|
|
||||||
libgtop_have_sysinfo=yes
|
|
||||||
libgtop_need_server=no
|
|
||||||
;;
|
|
||||||
- freebsd*|netbsd*|openbsd*|bsdi*)
|
|
||||||
+ freebsd*|netbsd*|openbsd*|bsdi*|kfreebsd*)
|
|
||||||
libgtop_sysdeps_dir=freebsd
|
|
||||||
libgtop_use_machine_h=yes
|
|
||||||
libgtop_need_server=yes
|
|
||||||
@@ -122,7 +122,13 @@
|
|
||||||
|
|
||||||
case "$host_os" in
|
|
||||||
*bsd*)
|
|
||||||
- AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
|
|
||||||
+ case "$host_os" in
|
|
||||||
+ *kfreebsd*)
|
|
||||||
+ AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS="-lkvm -lfreebsd -lbsd", KVM_LIBS=, -lfreebsd -lbsd);;
|
|
||||||
+ *)
|
|
||||||
+ AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=);;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
AC_SUBST(KVM_LIBS)
|
|
||||||
|
|
||||||
AC_CHECK_HEADERS(net/if_var.h)
|
|
||||||
@@ -141,7 +147,7 @@
|
|
||||||
#include <net/netisr.h>
|
|
||||||
#include <net/route.h>
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) || defined(__NetBSD__)
|
|
||||||
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
#include <net/if_sppp.h>
|
|
||||||
#else
|
|
||||||
#include <i4b/sppp/if_sppp.h>
|
|
||||||
@@ -167,7 +173,7 @@
|
|
||||||
#include <net/netisr.h>
|
|
||||||
#include <net/route.h>
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) || defined(__NetBSD__)
|
|
||||||
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
#include <net/if_sppp.h>
|
|
||||||
#else
|
|
||||||
#include <i4b/sppp/if_sppp.h>
|
|
||||||
only in patch2:
|
|
||||||
unchanged:
|
|
||||||
--- libgtop2-2.14.4.orig/configure
|
|
||||||
+++ libgtop2-2.14.4/configure
|
|
||||||
@@ -21504,7 +21504,7 @@
|
|
||||||
libgtop_have_sysinfo=yes
|
|
||||||
libgtop_need_server=no
|
|
||||||
;;
|
|
||||||
- freebsd*|netbsd*|openbsd*|bsdi*)
|
|
||||||
+ freebsd*|netbsd*|openbsd*|bsdi*|kfreebsd*)
|
|
||||||
libgtop_sysdeps_dir=freebsd
|
|
||||||
libgtop_use_machine_h=yes
|
|
||||||
libgtop_need_server=yes
|
|
||||||
@@ -21563,7 +21563,93 @@
|
|
||||||
|
|
||||||
case "$host_os" in
|
|
||||||
*bsd*)
|
|
||||||
- { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
|
|
||||||
+ case "$host_os" in
|
|
||||||
+ *kfreebsd*)
|
|
||||||
+ { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
|
|
||||||
+echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; }
|
|
||||||
+if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
|
|
||||||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
+else
|
|
||||||
+ ac_check_lib_save_LIBS=$LIBS
|
|
||||||
+LIBS="-lkvm -lfreebsd -lbsd $LIBS"
|
|
||||||
+cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
+/* confdefs.h. */
|
|
||||||
+_ACEOF
|
|
||||||
+cat confdefs.h >>conftest.$ac_ext
|
|
||||||
+cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
+/* end confdefs.h. */
|
|
||||||
+
|
|
||||||
+/* Override any GCC internal prototype to avoid an error.
|
|
||||||
+ Use char because int might match the return type of a GCC
|
|
||||||
+ builtin and then its argument prototype would still apply. */
|
|
||||||
+#ifdef __cplusplus
|
|
||||||
+extern "C"
|
|
||||||
+#endif
|
|
||||||
+char kvm_open ();
|
|
||||||
+int
|
|
||||||
+main ()
|
|
||||||
+{
|
|
||||||
+return kvm_open ();
|
|
||||||
+ ;
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+_ACEOF
|
|
||||||
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
||||||
+if { (ac_try="$ac_link"
|
|
||||||
+case "(($ac_try" in
|
|
||||||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
+ *) ac_try_echo=$ac_try;;
|
|
||||||
+esac
|
|
||||||
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
||||||
+ (eval "$ac_link") 2>conftest.er1
|
|
||||||
+ ac_status=$?
|
|
||||||
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
||||||
+ rm -f conftest.er1
|
|
||||||
+ cat conftest.err >&5
|
|
||||||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
+ (exit $ac_status); } &&
|
|
||||||
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
||||||
+ { (case "(($ac_try" in
|
|
||||||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
+ *) ac_try_echo=$ac_try;;
|
|
||||||
+esac
|
|
||||||
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
||||||
+ (eval "$ac_try") 2>&5
|
|
||||||
+ ac_status=$?
|
|
||||||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
+ (exit $ac_status); }; } &&
|
|
||||||
+ { ac_try='test -s conftest$ac_exeext'
|
|
||||||
+ { (case "(($ac_try" in
|
|
||||||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
+ *) ac_try_echo=$ac_try;;
|
|
||||||
+esac
|
|
||||||
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
||||||
+ (eval "$ac_try") 2>&5
|
|
||||||
+ ac_status=$?
|
|
||||||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
+ (exit $ac_status); }; }; then
|
|
||||||
+ ac_cv_lib_kvm_kvm_open=yes
|
|
||||||
+else
|
|
||||||
+ echo "$as_me: failed program was:" >&5
|
|
||||||
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
+
|
|
||||||
+ ac_cv_lib_kvm_kvm_open=no
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
||||||
+ conftest$ac_exeext conftest.$ac_ext
|
|
||||||
+LIBS=$ac_check_lib_save_LIBS
|
|
||||||
+fi
|
|
||||||
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5
|
|
||||||
+echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6; }
|
|
||||||
+if test $ac_cv_lib_kvm_kvm_open = yes; then
|
|
||||||
+ KVM_LIBS="-lkvm -lfreebsd -lbsd"
|
|
||||||
+else
|
|
||||||
+ KVM_LIBS=
|
|
||||||
+fi
|
|
||||||
+;;
|
|
||||||
+ *)
|
|
||||||
+ { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
|
|
||||||
echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; }
|
|
||||||
if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
@@ -21645,6 +21731,8 @@
|
|
||||||
else
|
|
||||||
KVM_LIBS=
|
|
||||||
fi
|
|
||||||
+;;
|
|
||||||
+ esac
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -21839,7 +21927,7 @@
|
|
||||||
#include <net/netisr.h>
|
|
||||||
#include <net/route.h>
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) || defined(__NetBSD__)
|
|
||||||
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
#include <net/if_sppp.h>
|
|
||||||
#else
|
|
||||||
#include <i4b/sppp/if_sppp.h>
|
|
||||||
@@ -21928,7 +22016,7 @@
|
|
||||||
#include <net/netisr.h>
|
|
||||||
#include <net/route.h>
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) || defined(__NetBSD__)
|
|
||||||
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
|
|
||||||
#include <net/if_sppp.h>
|
|
||||||
#else
|
|
||||||
#include <i4b/sppp/if_sppp.h>
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
Index: sysdeps/linux/procmap.c
|
|
||||||
===================================================================
|
|
||||||
--- sysdeps/linux/procmap.c (révision 2545)
|
|
||||||
+++ sysdeps/linux/procmap.c (révision 2546)
|
|
||||||
@@ -38,7 +38,7 @@
|
|
||||||
#define SMAPS_FILE "/proc/%u/smaps"
|
|
||||||
|
|
||||||
|
|
||||||
-#define PROC_MAPS_FORMAT "%16llx-%16llx %4c %16llx %02hx:%02hx %llu%*[ ]%[^\n]\n"
|
|
||||||
+#define PROC_MAPS_FORMAT "%16llx-%16llx %4c %16llx %02hx:%02hx %llu%*[ ]%n"
|
|
||||||
|
|
||||||
|
|
||||||
static const unsigned long _glibtop_sysdeps_proc_map =
|
|
||||||
@@ -132,6 +132,8 @@
|
|
||||||
FILE *maps;
|
|
||||||
const char *filename;
|
|
||||||
gboolean has_smaps;
|
|
||||||
+ char *line = NULL;
|
|
||||||
+ size_t line_size = 0;
|
|
||||||
|
|
||||||
glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_MAP, 0);
|
|
||||||
|
|
||||||
@@ -152,33 +154,29 @@
|
|
||||||
|
|
||||||
while(TRUE)
|
|
||||||
{
|
|
||||||
- char line[1024];
|
|
||||||
-
|
|
||||||
unsigned long perm = 0;
|
|
||||||
- int rv;
|
|
||||||
guint len;
|
|
||||||
+ int line_end;
|
|
||||||
|
|
||||||
unsigned short dev_major, dev_minor;
|
|
||||||
guint64 start, end, offset, inode;
|
|
||||||
char flags[4];
|
|
||||||
- char filename [GLIBTOP_MAP_FILENAME_LEN+1];
|
|
||||||
+ char *filename;
|
|
||||||
|
|
||||||
glibtop_map_entry *entry;
|
|
||||||
|
|
||||||
- if (!fgets(line, sizeof line, maps))
|
|
||||||
+ if (getline(&line, &line_size, maps) == -1)
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* 8 arguments */
|
|
||||||
- rv = sscanf(line, PROC_MAPS_FORMAT,
|
|
||||||
- &start, &end, flags, &offset,
|
|
||||||
- &dev_major, &dev_minor, &inode, filename);
|
|
||||||
+ if (sscanf(line, PROC_MAPS_FORMAT,
|
|
||||||
+ &start, &end, flags, &offset,
|
|
||||||
+ &dev_major, &dev_minor, &inode, &line_end) != 7)
|
|
||||||
+ break;
|
|
||||||
|
|
||||||
- if(rv == EOF || rv < 7)
|
|
||||||
- break;
|
|
||||||
+ filename = line + line_end;
|
|
||||||
+ g_strstrip(filename);
|
|
||||||
|
|
||||||
- if(rv == 7) /* no filename */
|
|
||||||
- filename[0] = '\0';
|
|
||||||
-
|
|
||||||
/* Compute access permissions. */
|
|
||||||
|
|
||||||
if (flags [0] == 'r')
|
|
||||||
@@ -217,6 +215,7 @@
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
+ free(line);
|
|
||||||
fclose (maps);
|
|
||||||
|
|
||||||
buf->flags = _glibtop_sysdeps_proc_map;
|
|
||||||
Index: sysdeps/linux/procopenfiles.c
|
|
||||||
===================================================================
|
|
||||||
--- sysdeps/linux/procopenfiles.c (révision 2545)
|
|
||||||
+++ sysdeps/linux/procopenfiles.c (révision 2546)
|
|
||||||
@@ -58,7 +58,8 @@
|
|
||||||
parse_file(const char *filename, LineParser parser, GHashTable *dict)
|
|
||||||
{
|
|
||||||
FILE *f;
|
|
||||||
- char line[1024];
|
|
||||||
+ char *line = NULL;
|
|
||||||
+ size_t size = 0;
|
|
||||||
|
|
||||||
f = fopen(filename, "r");
|
|
||||||
|
|
||||||
@@ -67,15 +68,16 @@
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
+
|
|
||||||
/* skip the first line */
|
|
||||||
- if(!fgets(line, sizeof line, f)) goto eof;
|
|
||||||
+ if (getline(&line, &size, f) == -1)
|
|
||||||
+ goto eof;
|
|
||||||
|
|
||||||
- while(fgets(line, sizeof line, f))
|
|
||||||
- {
|
|
||||||
+ while (getline(&line, &size, f) != -1)
|
|
||||||
parser(dict, line);
|
|
||||||
- }
|
|
||||||
|
|
||||||
eof:
|
|
||||||
+ free(line);
|
|
||||||
fclose(f);
|
|
||||||
}
|
|
||||||
|
|
||||||
-30
@@ -1,30 +0,0 @@
|
|||||||
--- ltmain.sh.old 2007-10-09 07:38:25.000000000 +0200
|
|
||||||
+++ ltmain.sh 2007-10-09 07:39:25.000000000 +0200
|
|
||||||
@@ -1794,6 +1794,11 @@
|
|
||||||
arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -Wl,--as-needed)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-Wl,*)
|
|
||||||
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
|
|
||||||
arg=
|
|
||||||
@@ -2137,6 +2142,15 @@
|
|
||||||
lib=
|
|
||||||
found=no
|
|
||||||
case $deplib in
|
|
||||||
+ -Wl,--as-needed)
|
|
||||||
+ if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
+ compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
+ finalize_deplibs="$deplib $finalize_deplibs"
|
|
||||||
+ else
|
|
||||||
+ deplibs="$deplib $deplibs"
|
|
||||||
+ fi
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
|
||||||
if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
Vendored
-13
@@ -1,13 +0,0 @@
|
|||||||
#!/usr/bin/make -f
|
|
||||||
|
|
||||||
include /usr/share/cdbs/1/rules/debhelper.mk
|
|
||||||
include /usr/share/cdbs/1/rules/simple-patchsys.mk
|
|
||||||
include /usr/share/cdbs/1/rules/utils.mk
|
|
||||||
include /usr/share/cdbs/1/class/gnome.mk
|
|
||||||
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
|
|
||||||
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
|
|
||||||
|
|
||||||
GNOME_MODULE := libgtop
|
|
||||||
|
|
||||||
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
|
|
||||||
DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.23.2)'
|
|
||||||
Vendored
-4
@@ -1,4 +0,0 @@
|
|||||||
version=2
|
|
||||||
http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+)[02468]/ \
|
|
||||||
libgtop-(.*)\.tar\.gz \
|
|
||||||
debian uupdate
|
|
||||||
Binary file not shown.
@@ -0,0 +1 @@
|
|||||||
|
35a6c38ac1294ebae8ee302a3f3ff3917e251560
|
||||||
Binary file not shown.
@@ -0,0 +1 @@
|
|||||||
|
aa21959d7a3cf23d96a6ed9292b58a10e727f096
|
||||||
Binary file not shown.
@@ -0,0 +1 @@
|
|||||||
|
bb0b7cb04af8d647b47198c4beeaeb21e6e82d6a
|
||||||
Binary file not shown.
@@ -0,0 +1 @@
|
|||||||
|
57c959fabb5e65fe617201f5eb176fb04c1b7787
|
||||||
Binary file not shown.
@@ -0,0 +1 @@
|
|||||||
|
45eec5ab9ace05995d7c23369e7893a570a9b4cc
|
||||||
Reference in New Issue
Block a user