Compare commits
15 Commits
debian/2.2
...
debian/2.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
08f62afc37 | ||
|
|
3b6277fbbe | ||
|
|
b563f6694c | ||
|
|
7e93937adf | ||
|
|
d853b62da1 | ||
|
|
858746c513 | ||
|
|
9cd39e5117 | ||
|
|
01f63fdbb2 | ||
|
|
00cfea0843 | ||
|
|
9efea94f78 | ||
|
|
525688acd0 | ||
|
|
71565cbc4b | ||
|
|
494041b3b4 | ||
|
|
ce56513640 | ||
|
|
865c9d3d02 |
104
debian/changelog
vendored
104
debian/changelog
vendored
@@ -1,3 +1,107 @@
|
||||
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.
|
||||
|
||||
48
debian/control
vendored
48
debian/control
vendored
@@ -1,29 +1,39 @@
|
||||
# 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: Sebastien Bacher <seb128@debian.org>
|
||||
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
|
||||
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@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),
|
||||
dh-autoreconf,
|
||||
cdbs,
|
||||
quilt,
|
||||
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]
|
||||
Standards-Version: 3.8.0
|
||||
libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
|
||||
gtk-doc-tools (>= 1.4)
|
||||
Standards-Version: 3.8.3
|
||||
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
|
||||
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgtop2
|
||||
|
||||
Package: libgtop2-7
|
||||
Architecture: any
|
||||
Section: libs
|
||||
Depends: ${shlibs:Depends},
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||
libgtop2-common (>= ${source:Version})
|
||||
Description: gtop system monitoring library
|
||||
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.
|
||||
.
|
||||
@@ -32,25 +42,35 @@ Description: gtop system monitoring library
|
||||
Package: libgtop2-dev
|
||||
Architecture: any
|
||||
Section: libdevel
|
||||
Depends: libgtop2-7 (= ${binary:Version}),
|
||||
libglib2.0-dev,
|
||||
${os-specific-dev}
|
||||
Description: gtop system monitoring library
|
||||
Depends: ${misc:Depends},
|
||||
libgtop2-7 (= ${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, development headers, and
|
||||
documentation.
|
||||
This package contains the static library and development headers.
|
||||
|
||||
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
|
||||
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.
|
||||
|
||||
41
debian/control.in
vendored
41
debian/control.in
vendored
@@ -9,21 +9,26 @@ Build-Depends: debhelper (>= 5),
|
||||
libxau-dev,
|
||||
libglib2.0-dev (>= 2.6.0),
|
||||
gnome-pkg-tools (>= 0.10),
|
||||
dh-autoreconf,
|
||||
cdbs,
|
||||
quilt,
|
||||
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]
|
||||
Standards-Version: 3.8.0
|
||||
libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
|
||||
gtk-doc-tools (>= 1.4)
|
||||
Standards-Version: 3.8.3
|
||||
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
|
||||
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgtop2
|
||||
|
||||
Package: libgtop2-7
|
||||
Architecture: any
|
||||
Section: libs
|
||||
Depends: ${shlibs:Depends},
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||
libgtop2-common (>= ${source:Version})
|
||||
Description: gtop system monitoring library
|
||||
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.
|
||||
.
|
||||
@@ -32,25 +37,35 @@ Description: gtop system monitoring library
|
||||
Package: libgtop2-dev
|
||||
Architecture: any
|
||||
Section: libdevel
|
||||
Depends: libgtop2-7 (= ${binary:Version}),
|
||||
libglib2.0-dev,
|
||||
${os-specific-dev}
|
||||
Description: gtop system monitoring library
|
||||
Depends: ${misc:Depends},
|
||||
libgtop2-7 (= ${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, development headers, and
|
||||
documentation.
|
||||
This package contains the static library and development headers.
|
||||
|
||||
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
|
||||
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.
|
||||
|
||||
48
debian/copyright
vendored
48
debian/copyright
vendored
@@ -5,11 +5,20 @@ 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:
|
||||
Upstream Authors:
|
||||
Martin Baulig (martin@home-of-linux.org)
|
||||
Drazen Kacar (dave@srce.hr)
|
||||
Benoît Dejean (tazforever@dlfp.org)
|
||||
(The full list is in /usr/share/doc/libgtop2*/AUTHORS.)
|
||||
|
||||
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:
|
||||
|
||||
@@ -28,5 +37,38 @@ License:
|
||||
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'.
|
||||
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.
|
||||
|
||||
34
debian/libgtop-config.1
vendored
34
debian/libgtop-config.1
vendored
@@ -1,34 +0,0 @@
|
||||
.TH GTOP l "15 September 1999"
|
||||
.SH NAME
|
||||
\fBlibgtop-config\fP \- libgtop libraries and component information retrieval.
|
||||
.SH SYNTAX
|
||||
.B libgtop-config
|
||||
.RI [ --version ]
|
||||
.RI [ --config ]
|
||||
.RI [ --features-def-file ]
|
||||
.SH DESCRIPTION
|
||||
.B libgtop-config
|
||||
is used to retrieve information from installed libraries in the system.
|
||||
|
||||
This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page.
|
||||
.LP
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
.B \-\-version
|
||||
.PD
|
||||
Prints the version of libgtop that you're using.
|
||||
.TP
|
||||
.B \-\-config
|
||||
.PD
|
||||
Prints the location of libgtopConf.sh.
|
||||
.TP
|
||||
.B \-\-version
|
||||
.PD
|
||||
Prints the location of libgtop-features.def.
|
||||
.SH BUGS
|
||||
None known
|
||||
|
||||
.SH AUTHORS
|
||||
Martin Baulig (martin@home-of-linux.org)
|
||||
.TP
|
||||
Josh Sled (jsled@scam.XCF.Berkeley.EDU)
|
||||
4
debian/libgtop-dev.postinst
vendored
4
debian/libgtop-dev.postinst
vendored
@@ -1,4 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
3
debian/libgtop2-5.docs
vendored
3
debian/libgtop2-5.docs
vendored
@@ -1,3 +0,0 @@
|
||||
README
|
||||
NEWS
|
||||
AUTHORS
|
||||
2
debian/libgtop2-5.install
vendored
2
debian/libgtop2-5.install
vendored
@@ -1,2 +0,0 @@
|
||||
debian/tmp/usr/share/locale/*
|
||||
debian/tmp/usr/lib/*.so.*
|
||||
8
debian/libgtop2-5.postinst
vendored
8
debian/libgtop2-5.postinst
vendored
@@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ "$1" = "configure" ]; then
|
||||
ldconfig
|
||||
fi
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
8
debian/libgtop2-5.postrm
vendored
8
debian/libgtop2-5.postrm
vendored
@@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ "$1" = "remove" ]; then
|
||||
ldconfig
|
||||
fi
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
11
debian/libgtop2-doc.doc-base
vendored
Normal file
11
debian/libgtop2-doc.doc-base
vendored
Normal file
@@ -0,0 +1,11 @@
|
||||
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
debian/libgtop2-doc.install
vendored
Normal file
1
debian/libgtop2-doc.install
vendored
Normal file
@@ -0,0 +1 @@
|
||||
debian/tmp/usr/share/gtk-doc
|
||||
23
debian/patches/01_kfreebsd_kvm_libs.patch
vendored
Normal file
23
debian/patches/01_kfreebsd_kvm_libs.patch
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
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
debian/patches/02_hurd_stub_backend.patch
vendored
Normal file
178
debian/patches/02_hurd_stub_backend.patch
vendored
Normal file
@@ -0,0 +1,178 @@
|
||||
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
debian/patches/03_kfreebsd_installdirs.patch
vendored
Normal file
82
debian/patches/03_kfreebsd_installdirs.patch
vendored
Normal file
@@ -0,0 +1,82 @@
|
||||
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: libgtop-2.28.0/libgtop-sysdeps.m4
|
||||
===================================================================
|
||||
--- libgtop-2.28.0.orig/libgtop-sysdeps.m4 2009-11-22 17:31:01.861694527 +0100
|
||||
+++ libgtop-2.28.0/libgtop-sysdeps.m4 2009-11-22 17:33:11.877189288 +0100
|
||||
@@ -73,7 +73,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
|
||||
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'
|
||||
;;
|
||||
freebsd*|kfreebsd*)
|
||||
libgtop_sysdeps_dir=freebsd
|
||||
@@ -81,27 +81,27 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
|
||||
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: libgtop-2.28.0/src/daemon/Makefile.am
|
||||
===================================================================
|
||||
--- libgtop-2.28.0.orig/src/daemon/Makefile.am 2009-11-22 17:29:07.097688961 +0100
|
||||
+++ libgtop-2.28.0/src/daemon/Makefile.am 2009-11-22 17:29:46.589689603 +0100
|
||||
@@ -28,7 +28,7 @@ suid_sysdeps =
|
||||
suid_common =
|
||||
endif
|
||||
|
||||
-bin_PROGRAMS = libgtop_daemon2 @server_programs@
|
||||
+libexec_PROGRAMS = libgtop_daemon2 @server_programs@
|
||||
|
||||
EXTRA_PROGRAMS = libgtop_server2
|
||||
|
||||
Index: libgtop-2.28.0/configure.in
|
||||
===================================================================
|
||||
--- libgtop-2.28.0.orig/configure.in 2009-11-22 17:36:21.481188616 +0100
|
||||
+++ libgtop-2.28.0/configure.in 2009-11-22 17:36:35.733188858 +0100
|
||||
@@ -287,8 +287,8 @@ libgtop_save_prefix="$prefix"
|
||||
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
debian/patches/04_kfreebsd_version_check.patch
vendored
Normal file
28
debian/patches/04_kfreebsd_version_check.patch
vendored
Normal file
@@ -0,0 +1,28 @@
|
||||
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
debian/patches/05_kfreebsd_8.0.patch
vendored
Normal file
28
debian/patches/05_kfreebsd_8.0.patch
vendored
Normal file
@@ -0,0 +1,28 @@
|
||||
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: libgtop-2.28.0/sysdeps/freebsd/procmap.c
|
||||
===================================================================
|
||||
--- libgtop-2.28.0.orig/sysdeps/freebsd/procmap.c 2009-12-03 13:59:57.866694125 +0100
|
||||
+++ libgtop-2.28.0/sysdeps/freebsd/procmap.c 2009-12-03 14:03:16.298688337 +0100
|
||||
@@ -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 @@ _glibtop_sysdeps_freebsd_dev_inode (glib
|
||||
|
||||
if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si,
|
||||
sizeof (si)) != sizeof (si) ||
|
||||
-#if __FreeBSD_version >= 800039
|
||||
+#if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039)
|
||||
kvm_read (server->machine.kd, (gulong) cdev2priv(&si), (char *) &priv,
|
||||
sizeof (priv))
|
||||
#else
|
||||
643
debian/patches/10_kfreebsd.patch
vendored
Normal file
643
debian/patches/10_kfreebsd.patch
vendored
Normal file
@@ -0,0 +1,643 @@
|
||||
--- 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>
|
||||
108
debian/patches/20_glibtop_get_proc_map-stack-overflow.patch
vendored
Normal file
108
debian/patches/20_glibtop_get_proc_map-stack-overflow.patch
vendored
Normal file
@@ -0,0 +1,108 @@
|
||||
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);
|
||||
}
|
||||
|
||||
16
debian/patches/99_ltmain_as-needed.patch
vendored
16
debian/patches/99_ltmain_as-needed.patch
vendored
@@ -1,7 +1,9 @@
|
||||
--- 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/^ //"`
|
||||
Index: libgtop-2.28.0/ltmain.sh
|
||||
===================================================================
|
||||
--- libgtop-2.28.0.orig/ltmain.sh 2009-09-21 09:54:29.000000000 +0200
|
||||
+++ libgtop-2.28.0/ltmain.sh 2009-11-22 17:17:07.677688108 +0100
|
||||
@@ -4716,6 +4716,11 @@ func_mode_link ()
|
||||
arg=$func_stripname_result
|
||||
;;
|
||||
|
||||
+ -Wl,--as-needed)
|
||||
@@ -10,9 +12,9 @@
|
||||
+ ;;
|
||||
+
|
||||
-Wl,*)
|
||||
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
|
||||
arg=
|
||||
@@ -2137,6 +2142,15 @@
|
||||
func_stripname '-Wl,' '' "$arg"
|
||||
args=$func_stripname_result
|
||||
@@ -5070,6 +5075,15 @@ func_mode_link ()
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
|
||||
6
debian/patches/series
vendored
Normal file
6
debian/patches/series
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
01_kfreebsd_kvm_libs.patch
|
||||
02_hurd_stub_backend.patch
|
||||
03_kfreebsd_installdirs.patch
|
||||
04_kfreebsd_version_check.patch
|
||||
05_kfreebsd_8.0.patch
|
||||
99_ltmain_as-needed.patch
|
||||
20
debian/rules
vendored
20
debian/rules
vendored
@@ -1,18 +1,28 @@
|
||||
#!/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/patchsys-quilt.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 'libgtop2-7 (>= 2.23.2)'
|
||||
DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.23.2)'
|
||||
|
||||
ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
|
||||
DEB_DH_GENCONTROL_ARGS += -- -Vos-specific-dev="libkvm-dev, libgeom-dev, libdevstat-dev"
|
||||
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
|
||||
|
||||
|
||||
3
debian/watch
vendored
3
debian/watch
vendored
@@ -1,4 +1,3 @@
|
||||
version=2
|
||||
http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+)[02468]/ \
|
||||
libgtop-(.*)\.tar\.gz \
|
||||
debian uupdate
|
||||
libgtop-(.*)\.tar\.gz
|
||||
|
||||
Reference in New Issue
Block a user