Compare commits

..

5 Commits

Author SHA1 Message Date
Jeremy Bícha 6bcb76b03e pristine-tar data for libgtop2_2.41.3.orig.tar.xz 2024-02-16 13:10:48 -05:00
Jeremy Bícha a76e348377 pristine-tar data for libgtop2_2.41.2.orig.tar.xz 2024-01-11 10:28:29 -05:00
Jeremy Bicha f9ad2dfb5b pristine-tar data for libgtop2_2.40.0.orig.tar.xz 2019-03-16 09:51:38 -04:00
Jeremy Bicha fa0be4c6ce pristine-tar data for libgtop2_2.39.90.orig.tar.xz 2019-02-07 21:52:46 -05:00
Jeremy Bicha 207a43da75 pristine-tar data for libgtop2_2.38.0.orig.tar.xz 2017-12-18 17:12:31 -05:00
37 changed files with 5 additions and 2224 deletions
-16
View File
@@ -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
-690
View File
@@ -1,690 +0,0 @@
libgtop2 (2.28.4-3) unstable; urgency=low
* debian/patches/06_kfreebsd_sys_pipe.patch: Don't include sys/pipe.h on
kFreeBSD. Defining _KERNEL to include sys/pipe.h subsequently breaks
sys/conf.h; since sys/pipe.h is not meant to be used in userland, and
libgtop2 builds anyway on kFreeBSD without it, don't include it.
Thanks to Steven Chamberlain for the patch. Closes: #667984
* Update Vcs-* URLs.
* Drop Build-Depends on gir1.2-glib-2.0 and let libgirepository1.0-dev pull
this dependency.
* Bump Standards-Version to 3.9.3.
-- Michael Biebl <biebl@debian.org> Fri, 13 Apr 2012 20:13:21 +0200
libgtop2 (2.28.4-2) unstable; urgency=low
* debian/watch: Track .xz tarballs.
* Bump debhelper compatibility level to 8.
- Strip debian/tmp/ from .install files.
- Bump Build-Depends on debhelper.
* debian/control.in:
- Drop obsolete versioned Build-Depends on dpkg-dev.
- Tighten dependency between libgtop2-dev and gir1.2-gtop-2.0.
- Change section of gir1.2-gtop-2.0 to introspection.
- Drop obsolete Replaces.
- Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer.
* debian/libgtop2-7.symbols:
- Add symbols file for improved shlibs dependencies.
-- Michael Biebl <biebl@debian.org> Wed, 14 Dec 2011 21:20:53 +0100
libgtop2 (2.28.4-1) unstable; urgency=low
[ Martin Pitt ]
* New upstream bug fix release.
* 03_kfreebsd_installdirs.patch, 05_kfreebsd_8.0.patch,
99_ltmain_as-needed.patch: Update for new version.
* debian/control.in: Fix section of gir1.2-gtop-2.0, should be "libs" (and
was set like that by ftpmasters).
* debian/watch: Fix regexp syntax, and watch for *.tar.bz2.
* debian/source/format, debian/control, debian/rules: Switch to "3.0
(quilt)" source format to support bzip2 orig tarballs. Drop quilt build
dependency and usage in debian/rules.
[ Josselin Mouette ]
* Use kfreebsd-any wildcard. Closes: #634623.
-- Martin Pitt <mpitt@debian.org> Tue, 06 Sep 2011 14:19:01 +0200
libgtop2 (2.28.3-2) unstable; urgency=low
* debian/control.in, debian/gir1.2-gtop-2.0.install: Add gir1.2-gtop-2.0
package to add GI support.
* debian/libgtop2-dev.install: Install .gir.
* debian/control.in: Bump Standards-Version to 3.9.2. No changes necessary.
-- Martin Pitt <mpitt@debian.org> Fri, 27 May 2011 09:56:48 +0200
libgtop2 (2.28.3-1) unstable; urgency=low
* Team upload.
* New upstream release.
- Fixes linking with strict linkers (Closes: #555183)
* Use dh-autoreconf instead of manually updating 90_autotools.patch
* Add Vcs fields to debian/control*
-- Andreas Henriksson <andreas@fatal.se> Mon, 02 May 2011 16:00:40 +0200
libgtop2 (2.28.1-1) unstable; urgency=low
[ Emilio Pozuelo Monfort ]
* debian/patches/02_hurd_stub_backend.patch,
debian/patches/03_kfreebsd_installdirs.patch,
debian/patches/04_kfreebsd_version_check.patch,
debian/patches/05_kfreebsd_8.0.patch:
- Add headers.
[ Sebastian Dröge ]
* New upstream stable release:
+ debian/patches/90_autotools.patch:
- Regenerated for the new version.
-- Sebastian Dröge <slomo@debian.org> Sat, 10 Apr 2010 06:56:34 +0200
libgtop2 (2.28.0-4) unstable; urgency=low
[ Josselin Mouette ]
* 05_kfreebsd_8.0.patch: modified patch from Petr Salinger to make
libgtop2 work correctly with kFreeBSD 8.0. Closes: #559291.
-- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 15 Dec 2009 12:16:51 +0100
libgtop2 (2.28.0-3) unstable; urgency=low
* Switch to quilt for patch management.
* 02_hurd_stub_backend.patch: re-add an implementation of the stub
backend, for the Hurd. Closes: #557446.
* 03_kfreebsd_installdirs.patch: patch to install binaries in
libexecdir so that we can version the installation directory. Also
use DESTDIR in the installation hooks.
* 04_kfreebsd_version_check.patch: drop brain-dead runtime version
check.
* Rename 90_autoconf.patch to 90_autotools.patch, re-run all the
autotools on top of that.
* Pass a versioned libexecdir to the configure arguments.
* Install the server binary on kfreebsd.
* Exclude it from dh_fixperms.
-- Josselin Mouette <joss@debian.org> Sun, 22 Nov 2009 21:17:18 +0100
libgtop2 (2.28.0-2) unstable; urgency=low
* debian/patches/01_kfreebsd_kvm_libs.patch:
- Patch from Petr Salinger to let libgtop2 build on kFreeBSD again.
Closes: #555316.
* debian/patches/90_autoconf.patch:
- Run autoconf on top of the above patch.
-- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 09 Nov 2009 23:04:50 +0100
libgtop2 (2.28.0-1) unstable; urgency=low
* New upstream release.
* Add a new libgtop2-doc package and ship the html documentation on it.
Also move the info document from the -dev package to the new -doc one.
* debian/watch: Don't uupdate.
* debian/control.in:
- Standards-Version is 3.8.3, no changes needed.
- Let libgtop2-7 and libgtop2-common inherit the section from the source
stanza.
- Unduplicate some short descriptions.
* debian/copyright: Updated.
-- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 21 Sep 2009 23:51:39 +0200
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
-1
View File
@@ -1 +0,0 @@
8
-87
View File
@@ -1,87 +0,0 @@
# This file is autogenerated. DO NOT EDIT!
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
Source: libgtop2
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
Build-Depends: debhelper (>= 8),
gettext,
pkg-config,
libxau-dev,
libglib2.0-dev (>= 2.6.0),
gnome-pkg-tools (>= 0.10),
dh-autoreconf,
cdbs,
texinfo,
intltool (>= 0.35.0),
libxt-dev,
libgeom-dev [kfreebsd-any],
libdevstat-dev [kfreebsd-any],
libkvm-dev [kfreebsd-any],
gtk-doc-tools (>= 1.4),
gobject-introspection (>= 0.6.7),
libgirepository1.0-dev (>= 0.10.7-1~)
Standards-Version: 3.9.3
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
Package: libgtop2-7
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
libgtop2-common (>= ${source:Version})
Description: gtop system monitoring library (shared)
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}),
gir1.2-gtop-2.0 (= ${binary:Version}),
libglib2.0-dev
Description: gtop system monitoring library (devel)
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 and development headers.
Package: libgtop2-common
Architecture: all
Depends: ${misc:Depends},
Description: gtop system monitoring library (common)
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.
Package: libgtop2-doc
Architecture: all
Section: doc
Depends: ${misc:Depends},
Replaces: libgtop2-dev (<< 2.28.0-1)
Description: gtop system monitoring library (documentation)
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 documentation.
Package: gir1.2-gtop-2.0
Architecture: any
Section: introspection
Depends: ${misc:Depends},
${gir:Depends}
Description: gtop system monitoring library (gir bindings)
The gtop library reads information about processes and the state of the
system. It is used by the GNOME desktop environment.
.
This package can be used by other packages using the GIRepository format to
generate dynamic bindings.
-82
View File
@@ -1,82 +0,0 @@
Source: libgtop2
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 8),
gettext,
pkg-config,
libxau-dev,
libglib2.0-dev (>= 2.6.0),
gnome-pkg-tools (>= 0.10),
dh-autoreconf,
cdbs,
texinfo,
intltool (>= 0.35.0),
libxt-dev,
libgeom-dev [kfreebsd-any],
libdevstat-dev [kfreebsd-any],
libkvm-dev [kfreebsd-any],
gtk-doc-tools (>= 1.4),
gobject-introspection (>= 0.6.7),
libgirepository1.0-dev (>= 0.10.7-1~)
Standards-Version: 3.9.3
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
Package: libgtop2-7
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
libgtop2-common (>= ${source:Version})
Description: gtop system monitoring library (shared)
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}),
gir1.2-gtop-2.0 (= ${binary:Version}),
libglib2.0-dev
Description: gtop system monitoring library (devel)
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 and development headers.
Package: libgtop2-common
Architecture: all
Depends: ${misc:Depends},
Description: gtop system monitoring library (common)
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.
Package: libgtop2-doc
Architecture: all
Section: doc
Depends: ${misc:Depends},
Replaces: libgtop2-dev (<< 2.28.0-1)
Description: gtop system monitoring library (documentation)
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 documentation.
Package: gir1.2-gtop-2.0
Architecture: any
Section: introspection
Depends: ${misc:Depends},
${gir:Depends}
Description: gtop system monitoring library (gir bindings)
The gtop library reads information about processes and the state of the
system. It is used by the GNOME desktop environment.
.
This package can be used by other packages using the GIRepository format to
generate dynamic bindings.
-74
View File
@@ -1,74 +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:
Martin Baulig (martin@home-of-linux.org)
Drazen Kacar (dave@srce.hr)
Benoît Dejean (tazforever@dlfp.org)
Copyright:
1998-99 Martin Baulig
2004 Nicolás Lichtmaier
2007 Joe Marcus Clarke
1996 Charles Blake <cblake@bbn.com>
1998 Joshua Sled
1999 Drazen Kacar
1998-2007 Benoît Dejean
2006-2007 Henry Zhang
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'.
misc/i4b_acct.h is licensed under the following terms:
Copyright (c) 1997 Joerg Wunsch. All rights reserved.
Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the author nor the names of any co-contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
4. Altered versions must be plainly marked as such, and must not be
misrepresented as being the original software and/or documentation.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-1
View File
@@ -1 +0,0 @@
usr/lib/girepository-*
-1
View File
@@ -1 +0,0 @@
usr/lib/*.so.*
-71
View File
@@ -1,71 +0,0 @@
libgtop-2.0.so.7 libgtop2-7 #MINVER#
glibtop_call_l@Base 2.22.3
glibtop_close@Base 2.22.3
glibtop_close_r@Base 2.22.3
glibtop_get_cpu@Base 2.22.3
glibtop_get_cpu_l@Base 2.22.3
glibtop_get_fsusage@Base 2.22.3
glibtop_get_fsusage_l@Base 2.22.3
glibtop_get_loadavg@Base 2.22.3
glibtop_get_loadavg_l@Base 2.22.3
glibtop_get_mem@Base 2.22.3
glibtop_get_mem_l@Base 2.22.3
glibtop_get_mountlist@Base 2.22.3
glibtop_get_mountlist_l@Base 2.22.3
glibtop_get_msg_limits@Base 2.22.3
glibtop_get_msg_limits_l@Base 2.22.3
glibtop_get_netlist@Base 2.22.3
glibtop_get_netlist_l@Base 2.22.3
glibtop_get_netload@Base 2.22.3
glibtop_get_netload_l@Base 2.22.3
glibtop_get_parameter_l@Base 2.22.3
glibtop_get_ppp@Base 2.22.3
glibtop_get_ppp_l@Base 2.22.3
glibtop_get_proc_affinity@Base 2.24.0
glibtop_get_proc_affinity_l@Base 2.24.0
glibtop_get_proc_args@Base 2.22.3
glibtop_get_proc_args_l@Base 2.22.3
glibtop_get_proc_argv@Base 2.22.3
glibtop_get_proc_argv_l@Base 2.22.3
glibtop_get_proc_kernel@Base 2.22.3
glibtop_get_proc_kernel_l@Base 2.22.3
glibtop_get_proc_map@Base 2.22.3
glibtop_get_proc_map_l@Base 2.22.3
glibtop_get_proc_mem@Base 2.22.3
glibtop_get_proc_mem_l@Base 2.22.3
glibtop_get_proc_open_files@Base 2.22.3
glibtop_get_proc_open_files_l@Base 2.22.3
glibtop_get_proc_segment@Base 2.22.3
glibtop_get_proc_segment_l@Base 2.22.3
glibtop_get_proc_signal@Base 2.22.3
glibtop_get_proc_signal_l@Base 2.22.3
glibtop_get_proc_state@Base 2.22.3
glibtop_get_proc_state_l@Base 2.22.3
glibtop_get_proc_time@Base 2.22.3
glibtop_get_proc_time_l@Base 2.22.3
glibtop_get_proc_uid@Base 2.22.3
glibtop_get_proc_uid_l@Base 2.22.3
glibtop_get_proc_wd@Base 2.22.3
glibtop_get_proc_wd_l@Base 2.22.3
glibtop_get_proclist@Base 2.22.3
glibtop_get_proclist_l@Base 2.22.3
glibtop_get_sem_limits@Base 2.22.3
glibtop_get_sem_limits_l@Base 2.22.3
glibtop_get_shm_limits@Base 2.22.3
glibtop_get_shm_limits_l@Base 2.22.3
glibtop_get_swap@Base 2.22.3
glibtop_get_swap_l@Base 2.22.3
glibtop_get_sysdeps@Base 2.22.3
glibtop_get_sysdeps_r@Base 2.22.3
glibtop_get_sysinfo@Base 2.22.3
glibtop_get_uptime@Base 2.22.3
glibtop_get_uptime_l@Base 2.22.3
glibtop_global_server@Base 2.22.3
glibtop_init@Base 2.22.3
glibtop_init_r@Base 2.22.3
glibtop_internet_addr@Base 2.22.3
glibtop_make_connection@Base 2.22.3
glibtop_open_l@Base 2.22.3
glibtop_server_features@Base 2.22.3
glibtop_set_parameter_l@Base 2.22.3
glibtop_sys_siglist@Base 2.22.3
-1
View File
@@ -1 +0,0 @@
usr/share/locale
-5
View File
@@ -1,5 +0,0 @@
usr/include/libgtop-2.0
usr/lib/libgtop-2.0.a
usr/lib/libgtop-2.0.so
usr/lib/pkgconfig
usr/share/gir-*
-11
View File
@@ -1,11 +0,0 @@
Document: libgtop2
Title: libsoup Reference Manual
Author: Martin Baulig, Germán Póo-Caamaño
Abstract: This manual documents the interfaces of the libgtop
library and has some short notes to help get you up to speed
with using the library.
Section: Programming
Format: HTML
Index: /usr/share/gtk-doc/html/libgtop/index.html
Files: /usr/share/gtk-doc/html/libgtop/*html
-1
View File
@@ -1 +0,0 @@
doc/libgtop2.info
-1
View File
@@ -1 +0,0 @@
usr/share/gtk-doc
-23
View File
@@ -1,23 +0,0 @@
Description: FTBFS on GNU/kFreeBSD
Bug-Debian: http://bugs.debian.org/555316
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=601319
Author: Petr Salinger <Petr.Salinger@seznam.cz>
diff -Nur -x '*.orig' -x '*~' libgtop2-2.28.0/libgtop-sysdeps.m4 libgtop2-2.28.0.new/libgtop-sysdeps.m4
--- libgtop2-2.28.0/libgtop-sysdeps.m4 2009-07-10 14:14:18.000000000 +0200
+++ libgtop2-2.28.0.new/libgtop-sysdeps.m4 2009-11-09 22:20:31.000000000 +0100
@@ -148,13 +148,7 @@
case "$host_os" in
*bsd*)
- 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_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
AC_SUBST(KVM_LIBS)
case "$host_os" in
-178
View File
@@ -1,178 +0,0 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602662
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557446
Author: Samuel Thibault <sthibault@debian.org>
Fix the stub backend to build again, making libgtop build on the Hurd.
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/Makefile.am libgtop2-2.28.0/sysdeps/stub/Makefile.am
--- libgtop2-2.28.0.sav/sysdeps/stub/Makefile.am 2009-04-18 23:29:49.000000000 +0000
+++ libgtop2-2.28.0/sysdeps/stub/Makefile.am 2009-11-22 01:07:39.000000000 +0000
@@ -8,7 +8,8 @@
sem_limits.c proclist.c procstate.c procuid.c \
proctime.c procmem.c procsignal.c prockernel.c \
procsegment.c procargs.c procmap.c netload.c \
- ppp.c netlist.c procopenfiles.c
+ ppp.c netlist.c procopenfiles.c procwd.c \
+ procaffinity.c sysinfo.c
libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/glibtop_server.h libgtop2-2.28.0/sysdeps/stub/glibtop_server.h
--- libgtop2-2.28.0.sav/sysdeps/stub/glibtop_server.h 2009-04-18 23:29:49.000000000 +0000
+++ libgtop2-2.28.0/sysdeps/stub/glibtop_server.h 2009-11-22 01:02:16.000000000 +0000
@@ -45,6 +45,8 @@
#define GLIBTOP_SUID_NETLOAD 0
#define GLIBTOP_SUID_NETLIST 0
#define GLIBTOP_SUID_PPP 0
+#define GLIBTOP_SUID_PROC_WD 0
+#define GLIBTOP_SUID_PROC_AFFINITY 0
G_END_DECLS
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/procaffinity.c libgtop2-2.28.0/sysdeps/stub/procaffinity.c
--- libgtop2-2.28.0.sav/sysdeps/stub/procaffinity.c 1970-01-01 00:00:00.000000000 +0000
+++ libgtop2-2.28.0/sysdeps/stub/procaffinity.c 2009-11-22 01:06:58.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+
+ This file is part of LibGTop 2.
+
+ LibGTop 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.
+
+ LibGTop 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 LibGTop; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+#include <config.h>
+#include <glibtop/procaffinity.h>
+#include <glibtop/error.h>
+
+#include <sys/param.h>
+
+void
+_glibtop_init_proc_affinity_s(glibtop *server)
+{
+ server->sysdeps.proc_affinity =
+ (1 << GLIBTOP_PROC_AFFINITY_NUMBER) |
+ (1 << GLIBTOP_PROC_AFFINITY_ALL);
+
+}
+
+
+guint16 *
+glibtop_get_proc_affinity_s(glibtop *server, glibtop_proc_affinity *buf, pid_t pid)
+{
+ memset(buf, 0, sizeof *buf);
+
+ return NULL;
+}
+
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/proclist.c libgtop2-2.28.0/sysdeps/stub/proclist.c
--- libgtop2-2.28.0.sav/sysdeps/stub/proclist.c 2009-04-18 23:29:49.000000000 +0000
+++ libgtop2-2.28.0/sysdeps/stub/proclist.c 2009-11-22 01:30:53.000000000 +0000
@@ -42,7 +42,7 @@
* On success, it returnes a pointer to a list of buf->number elements
* each buf->size big. The total size is stored in buf->total. */
-unsigned *
+pid_t *
glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
gint64 which, gint64 arg)
{
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/procwd.c libgtop2-2.28.0/sysdeps/stub/procwd.c
--- libgtop2-2.28.0.sav/sysdeps/stub/procwd.c 1970-01-01 00:00:00.000000000 +0000
+++ libgtop2-2.28.0/sysdeps/stub/procwd.c 2009-11-22 01:46:06.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+ This file is part of LibGTop 2.0.
+
+ LibGTop 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.
+
+ LibGTop 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 LibGTop; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+#include <config.h>
+#include <glibtop/procwd.h>
+#include <glibtop/error.h>
+
+#include <unistd.h>
+#include <dirent.h>
+#include <sys/types.h>
+
+static const unsigned long _glibtop_sysdeps_proc_wd = 0;
+
+/* Init function. */
+
+void
+_glibtop_init_proc_wd_s (glibtop *server)
+{
+ server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd;
+}
+
+/* Provides detailed information about a process. */
+
+char **
+glibtop_get_proc_wd_s (glibtop *server, glibtop_proc_wd *buf,
+ pid_t pid)
+{
+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_WD, 0);
+
+ memset (buf, 0, sizeof (glibtop_proc_wd));
+ return NULL;
+}
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/sysinfo.c libgtop2-2.28.0/sysdeps/stub/sysinfo.c
--- libgtop2-2.28.0.sav/sysdeps/stub/sysinfo.c 1970-01-01 00:00:00.000000000 +0000
+++ libgtop2-2.28.0/sysdeps/stub/sysinfo.c 2009-11-22 02:08:44.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+ This file is part of LibGTop 2.0.
+
+ LibGTop 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.
+
+ LibGTop 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 LibGTop; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+#include <config.h>
+#include <glibtop/cpu.h>
+#include <glibtop/sysinfo.h>
+
+static glibtop_sysinfo sysinfo = { };
+const glibtop_sysinfo *
+glibtop_get_sysinfo_s (glibtop *server)
+{
+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
+
+ return &sysinfo;
+}
-82
View File
@@ -1,82 +0,0 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602664
Author: Josselin Mouette <joss@debian.org>
The libgtop_server2 binary is launched by the library itself, and has no use
being launched directly. Therefore, it should go in $(libexecdir) instead.
The patch also adds some missing $(DESTDIR) references in the installation
hooks.
Index: libgtop2/libgtop-sysdeps.m4
===================================================================
--- libgtop2.orig/libgtop-sysdeps.m4 2011-09-06 14:12:33.925874923 +0200
+++ libgtop2/libgtop-sysdeps.m4 2011-09-06 14:12:37.175874943 +0200
@@ -73,7 +73,7 @@
libgtop_sysdeps_dir=bsd
libgtop_use_machine_h=yes
libgtop_need_server=yes
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
;;
openbsd*)
libgtop_sysdeps_dir=openbsd
@@ -87,27 +87,27 @@
libgtop_need_server=yes
libgtop_sysdeps_private_mountlist=yes
libgtop_sysdeps_private_fsusage=yes
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
;;
solaris*)
libgtop_sysdeps_dir=solaris
libgtop_use_machine_h=yes
libgtop_need_server=yes
- libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+ libgtop_postinstall='chgrp sys $(DESTDIR)$(libexecdir)/libgtop_server && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server'
;;
aix*)
libgtop_sysdeps_dir=aix
libgtop_use_machine_h=yes
libgtop_need_server=yes
libgtop_have_sysinfo=yes
- libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
+ libgtop_postinstall='chgrp system $(DESTDIR)$(libexecdir)/libgtop_server && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2'
;;
darwin*)
libgtop_sysdeps_dir=darwin
libgtop_use_machine_h=yes
libgtop_need_server=yes
libgtop_have_sysinfo=yes
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2'
+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2'
;;
cygwin*)
libgtop_sysdeps_dir=cygwin
Index: libgtop2/src/daemon/Makefile.am
===================================================================
--- libgtop2.orig/src/daemon/Makefile.am 2011-06-01 17:40:47.000000000 +0200
+++ libgtop2/src/daemon/Makefile.am 2011-09-06 14:12:37.175874943 +0200
@@ -28,7 +28,7 @@
suid_common =
endif
-bin_PROGRAMS = libgtop_daemon2 @server_programs@
+libexec_PROGRAMS = libgtop_daemon2 @server_programs@
EXTRA_PROGRAMS = libgtop_server2
Index: libgtop2/configure.in
===================================================================
--- libgtop2.orig/configure.in 2011-08-30 13:25:29.000000000 +0200
+++ libgtop2/configure.in 2011-09-06 14:12:37.175874943 +0200
@@ -290,8 +290,8 @@
libgtop_save_exec_prefix="$exec_prefix"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-LIBGTOP_BINDIR=`eval echo "${bindir}"`
-LIBGTOP_SERVER=`eval echo "${bindir}/libgtop_server2"`
+LIBGTOP_BINDIR=`eval echo "${libexecdir}"`
+LIBGTOP_SERVER=`eval echo "${libexecdir}/libgtop_server2"`
prefix="$libgtop_save_prefix"
exec_prefix="$libgtop_save_exec_prefix"
-28
View File
@@ -1,28 +0,0 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602666
Author: Josselin Mouette <joss@debian.org>
The server binary refuses to start when it is not run on the same hardware as
the one where it was built on. This check is utterly and absolutely useless,
and makes it impossible to produce working binary packages.
Index: libgtop-2.28.0/src/daemon/server.c
===================================================================
--- libgtop-2.28.0.orig/src/daemon/server.c 2009-11-22 21:14:47.613184919 +0100
+++ libgtop-2.28.0/src/daemon/server.c 2009-11-22 21:15:02.673188074 +0100
@@ -86,16 +86,6 @@ main(int argc, char *argv[])
LIBGTOP_COMPILE_RELEASE);
_exit (1);
}
-#else
- if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
- strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
- strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
- fprintf (stderr, "Can only run on %s %s %s\n",
- LIBGTOP_COMPILE_SYSTEM,
- LIBGTOP_COMPILE_RELEASE,
- LIBGTOP_COMPILE_MACHINE);
- _exit (1);
- }
#endif
glibtop_init_p (glibtop_global_server, 0, 0);
-28
View File
@@ -1,28 +0,0 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608518
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559291
Author: Petr Salinger <Petr.Salinger@seznam.cz>
Fix a couple of checks for the kFreeBSD kernel.
Index: libgtop2/sysdeps/freebsd/procmap.c
===================================================================
--- libgtop2.orig/sysdeps/freebsd/procmap.c 2011-07-24 21:13:56.000000000 +0200
+++ libgtop2/sysdeps/freebsd/procmap.c 2011-09-06 14:03:04.705871157 +0200
@@ -42,7 +42,7 @@
#include <sys/pipe.h>
#include <sys/conf.h>
#undef _KERNEL
-#if __FreeBSD_version >= 800038
+#if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038)
#define _WANT_FILE
#include <sys/file.h>
#undef _WANT_FILE
@@ -113,7 +113,7 @@
return;
}
-#if __FreeBSD_version >= 800039
+#if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039)
if (kvm_read (server->machine.kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv,
sizeof (priv))
#else
-22
View File
@@ -1,22 +0,0 @@
Description: Don't include sys/pipe.h on kFreeBSD
Defining _KERNEL to include sys/pipe.h subsequently breaks sys/conf.h;
since sys/pipe.h is not meant to be used in userland, and libgtop2 builds
anyway on kFreeBSD without it, don't include it.
Author: Steven Chamberlain <steven@pyro.eu.org>
Bug-Debian: http://bugs.debian.org/667984
Index: libgtop2-2.28.4/sysdeps/freebsd/procmap.c
===================================================================
--- libgtop2-2.28.4.orig/sysdeps/freebsd/procmap.c 2012-04-07 22:49:20.000000000 +0100
+++ libgtop2-2.28.4/sysdeps/freebsd/procmap.c 2012-04-07 22:51:00.163079809 +0100
@@ -38,10 +38,7 @@
#include <sys/vnode.h>
#undef _KVM_VNODE
-#define _KERNEL
-#include <sys/pipe.h>
#include <sys/conf.h>
-#undef _KERNEL
#if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038)
#define _WANT_FILE
#include <sys/file.h>
-643
View File
@@ -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);
}
-32
View File
@@ -1,32 +0,0 @@
Index: libgtop2/ltmain.sh
===================================================================
--- libgtop2.orig/ltmain.sh 2011-08-30 13:25:39.000000000 +0200
+++ libgtop2/ltmain.sh 2011-09-06 14:12:45.695875002 +0200
@@ -5787,6 +5787,11 @@
arg=$func_stripname_result
;;
+ -Wl,--as-needed)
+ deplibs="$deplibs $arg"
+ continue
+ ;;
+
-Wl,*)
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
@@ -6150,6 +6155,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"
-7
View File
@@ -1,7 +0,0 @@
01_kfreebsd_kvm_libs.patch
02_hurd_stub_backend.patch
03_kfreebsd_installdirs.patch
04_kfreebsd_version_check.patch
05_kfreebsd_8.0.patch
06_kfreebsd_sys_pipe.patch
99_ltmain_as-needed.patch
-27
View File
@@ -1,27 +0,0 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.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
include /usr/share/cdbs/1/rules/autoreconf.mk
GNOME_MODULE := libgtop
SHARED_PKG := libgtop2-7
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.24.0)'
DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)
DEB_FIXPERMS_EXCLUDE += libgtop_server2
ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
install/$(SHARED_PKG)::
# The server is only necessary on kFreeBSD
dh_install --autodest -p$(SHARED_PKG) \
--ignore=debian/$(SHARED_PKG).install \
debian/tmp/usr/lib/*/libgtop_server2
endif
-1
View File
@@ -1 +0,0 @@
3.0 (quilt)
-3
View File
@@ -1,3 +0,0 @@
version=3
http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+[02468])/ \
libgtop-(.*)\.tar\.xz
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
35a6c38ac1294ebae8ee302a3f3ff3917e251560
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
aa21959d7a3cf23d96a6ed9292b58a10e727f096
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
bb0b7cb04af8d647b47198c4beeaeb21e6e82d6a
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
57c959fabb5e65fe617201f5eb176fb04c1b7787
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
45eec5ab9ace05995d7c23369e7893a570a9b4cc