From ca9bbcb1a8b01845a2190a50d49f0084ba51a527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sat, 13 Jan 2007 22:39:41 +0000 Subject: [PATCH 01/21] * Add a get-orig-source target to retrieve the upstream tarball. --- debian/changelog | 6 ++++++ debian/rules | 3 +++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 62eb15ce..0fd17d6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtop2 (2.14.4-3) UNRELEASED; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + + -- Loic Minier Sat, 13 Jan 2007 23:33:24 +0100 + libgtop2 (2.14.4-2) unstable; urgency=low * New patch, 10_kfreebsd, to build-depend and depend on libkvm-dev on diff --git a/debian/rules b/debian/rules index dad7756f..33355acb 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,9 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +GNOME_MODULE := libgtop DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-7 (>= 2.14.2)' From 06442f17118af3a44fdf528a5ff443a1e5db5724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sun, 14 Jan 2007 20:28:37 +0000 Subject: [PATCH 02/21] =?UTF-8?q?*=20Urgency=20high=20for=20etch-targetted?= =?UTF-8?q?=20bugfix.=20*=20New=20patch,=2020=5Fglibtop=5Fget=5Fproc=5Fmap?= =?UTF-8?q?-stack-overflow,=20fixes=20a=20stack=20overflow=20=20=20in=20ge?= =?UTF-8?q?t=5Fproc=5Fmap-stack();=20from=20upstream=20SVN=20r2546;=20than?= =?UTF-8?q?ks=20Beno=C3=AEt=20Dejean.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 7 +- ..._glibtop_get_proc_map-stack-overflow.patch | 108 ++++++++++++++++++ 2 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 debian/patches/20_glibtop_get_proc_map-stack-overflow.patch diff --git a/debian/changelog b/debian/changelog index 0fd17d6c..12604ef7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -libgtop2 (2.14.4-3) UNRELEASED; urgency=low +libgtop2 (2.14.4-3) unstable; urgency=high + * Urgency high for etch-targetted bugfix. * Add a get-orig-source target to retrieve the upstream tarball. + * New patch, 20_glibtop_get_proc_map-stack-overflow, fixes a stack overflow + in get_proc_map-stack(); from upstream SVN r2546; thanks Benoît Dejean. - -- Loic Minier Sat, 13 Jan 2007 23:33:24 +0100 + -- Loic Minier Sun, 14 Jan 2007 21:18:52 +0100 libgtop2 (2.14.4-2) unstable; urgency=low diff --git a/debian/patches/20_glibtop_get_proc_map-stack-overflow.patch b/debian/patches/20_glibtop_get_proc_map-stack-overflow.patch new file mode 100644 index 00000000..ad3fbb33 --- /dev/null +++ b/debian/patches/20_glibtop_get_proc_map-stack-overflow.patch @@ -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); + } + From 5ee03a0fb3eeb66701e0dc1d9071e1c55fba1abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sun, 14 Jan 2007 21:13:28 +0000 Subject: [PATCH 03/21] * Add GNOME bug id to 2.14.4-3. --- debian/changelog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 12604ef7..a4dbee33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ +libgtop2 (2.14.4-4) UNRELEASED; urgency=low + + * Add GNOME bug id to 2.14.4-3. + + -- Loic Minier Sun, 14 Jan 2007 22:12:53 +0100 + libgtop2 (2.14.4-3) unstable; urgency=high * Urgency high for etch-targetted bugfix. * Add a get-orig-source target to retrieve the upstream tarball. * New patch, 20_glibtop_get_proc_map-stack-overflow, fixes a stack overflow - in get_proc_map-stack(); from upstream SVN r2546; thanks Benoît Dejean. + in get_proc_map-stack(); from upstream SVN r2546; GNOME #396477; + thanks Benoît Dejean. -- Loic Minier Sun, 14 Jan 2007 21:18:52 +0100 From b3b413a5038eabea9ae21b88536fe099414d378e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Thu, 25 Jan 2007 10:27:20 +0000 Subject: [PATCH 04/21] * Add CVE id to 2.14.4-3. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4dbee33..bdbe5fa8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ libgtop2 (2.14.4-4) UNRELEASED; urgency=low * Add GNOME bug id to 2.14.4-3. + * Add CVE id to 2.14.4-3. - -- Loic Minier Sun, 14 Jan 2007 22:12:53 +0100 + -- Loic Minier Thu, 25 Jan 2007 11:26:56 +0100 libgtop2 (2.14.4-3) unstable; urgency=high @@ -10,7 +11,7 @@ libgtop2 (2.14.4-3) unstable; urgency=high * Add a get-orig-source target to retrieve the upstream tarball. * New patch, 20_glibtop_get_proc_map-stack-overflow, fixes a stack overflow in get_proc_map-stack(); from upstream SVN r2546; GNOME #396477; - thanks Benoît Dejean. + CVE-2007-0235; thanks Benoît Dejean. -- Loic Minier Sun, 14 Jan 2007 21:18:52 +0100 From 54530998a0ae836500b23f5266575d299c8c4c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 11 Apr 2007 14:00:13 +0000 Subject: [PATCH 05/21] * Upload to unstable; drop check-dist include. --- debian/changelog | 6 ++++++ debian/rules | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e2a6ac6c..b2aab76c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtop2 (2.14.8-2) UNRELEASED; urgency=low + + * Upload to unstable; drop check-dist include. + + -- Loic Minier Wed, 11 Apr 2007 15:59:59 +0200 + libgtop2 (2.14.8-1) experimental; urgency=low * Include the new check-dist Makefile to prevent accidental uploads to diff --git a/debian/rules b/debian/rules index c30e97be..33355acb 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,6 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk -include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk GNOME_MODULE := libgtop From 4a2d1fa97209cdcf5ce957299ca38dab1c8176e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 11 Apr 2007 14:01:21 +0000 Subject: [PATCH 06/21] * Add CVE id, GNOME bug id, and SVN rev to 2.14.8-1. --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b2aab76c..f8797092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,16 @@ libgtop2 (2.14.8-2) UNRELEASED; urgency=low * Upload to unstable; drop check-dist include. + * Add CVE id, GNOME bug id, and SVN rev to 2.14.8-1. - -- Loic Minier Wed, 11 Apr 2007 15:59:59 +0200 + -- Loic Minier Wed, 11 Apr 2007 16:00:19 +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 Sun, 11 Mar 2007 17:05:45 +0100 From a2b8c57c405c20a17d3fb787628d16562e064f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 11 Apr 2007 14:11:02 +0000 Subject: [PATCH 07/21] * Bump up Debhelper compatibility level to 5; fix bogus /usr/include/gnome in libgtop2-dev.install. --- debian/changelog | 4 +++- debian/compat | 2 +- debian/control.in | 2 +- debian/libgtop2-dev.install | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8797092..9344270b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ libgtop2 (2.14.8-2) UNRELEASED; 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. - -- Loic Minier Wed, 11 Apr 2007 16:00:19 +0200 + -- Loic Minier Wed, 11 Apr 2007 16:09:38 +0200 libgtop2 (2.14.8-1) experimental; urgency=low diff --git a/debian/compat b/debian/compat index b8626c4c..7ed6ff82 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control.in b/debian/control.in index 775880de..ef6a6269 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, libkvm-dev [kfreebsd-i386 kfreebsd-amd64] +Build-Depends: debhelper (>= 5), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, libkvm-dev [kfreebsd-i386 kfreebsd-amd64] Standards-Version: 3.7.2 Package: libgtop2-7 diff --git a/debian/libgtop2-dev.install b/debian/libgtop2-dev.install index acea1177..22cac424 100644 --- a/debian/libgtop2-dev.install +++ b/debian/libgtop2-dev.install @@ -1,5 +1,4 @@ debian/tmp/usr/include/libgtop-2.0/* debian/tmp/usr/lib/libgtop-2.0.a debian/tmp/usr/lib/libgtop-2.0.so -debian/tmp/usr/include/gnome/* debian/tmp/usr/lib/pkgconfig/* From 0fdba0e2098882d7a742643d0979bf6d96572c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 11 Apr 2007 14:11:48 +0000 Subject: [PATCH 08/21] * Update watch file to track all stable branches and use HTTP. --- debian/changelog | 3 ++- debian/watch | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9344270b..07015dba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ libgtop2 (2.14.8-2) UNRELEASED; urgency=low * 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. - -- Loic Minier Wed, 11 Apr 2007 16:09:38 +0200 + -- Loic Minier Wed, 11 Apr 2007 16:11:28 +0200 libgtop2 (2.14.8-1) experimental; urgency=low diff --git a/debian/watch b/debian/watch index 5ff75a7e..bc8f5233 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=2 -ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.14/ \ +http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+)[02468]/ \ libgtop-(.*)\.tar\.gz \ debian uupdate From 47be7b5f8c72314d992ccedb7de4e98e6f10d087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 11 Apr 2007 14:13:03 +0000 Subject: [PATCH 09/21] * Drop useless debian/libgtop-dev.postinst; cleanups. --- debian/changelog | 3 ++- debian/libgtop-dev.postinst | 4 ---- debian/libgtop2-dev.install | 4 ++-- debian/rules | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 debian/libgtop-dev.postinst diff --git a/debian/changelog b/debian/changelog index 07015dba..49a877e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ libgtop2 (2.14.8-2) UNRELEASED; urgency=low * 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. - -- Loic Minier Wed, 11 Apr 2007 16:11:28 +0200 + -- Loic Minier Wed, 11 Apr 2007 16:12:32 +0200 libgtop2 (2.14.8-1) experimental; urgency=low diff --git a/debian/libgtop-dev.postinst b/debian/libgtop-dev.postinst deleted file mode 100644 index dadbb97d..00000000 --- a/debian/libgtop-dev.postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -#DEBHELPER# - diff --git a/debian/libgtop2-dev.install b/debian/libgtop2-dev.install index 22cac424..cb9832cb 100644 --- a/debian/libgtop2-dev.install +++ b/debian/libgtop2-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libgtop-2.0/* +debian/tmp/usr/include/libgtop-2.0 debian/tmp/usr/lib/libgtop-2.0.a debian/tmp/usr/lib/libgtop-2.0.so -debian/tmp/usr/lib/pkgconfig/* +debian/tmp/usr/lib/pkgconfig diff --git a/debian/rules b/debian/rules index 33355acb..b6026bb9 100755 --- a/debian/rules +++ b/debian/rules @@ -9,9 +9,9 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk GNOME_MODULE := libgtop -DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-7 (>= 2.14.2)' +DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.14.2)' ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) -DEB_DH_GENCONTROL_ARGS = -- -Vlibkvm-dev=libkvm-dev +DEB_DH_GENCONTROL_ARGS += -- -Vlibkvm-dev=libkvm-dev endif From e2ff896d265de8882d04f8f18d5544a22772ab6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 11 Apr 2007 14:14:22 +0000 Subject: [PATCH 10/21] * Wrap build-deps and deps. --- debian/changelog | 5 +++-- debian/control | 27 ++++++++++++++++++++++----- debian/control.in | 25 +++++++++++++++++++++---- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 49a877e7..a6e380bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libgtop2 (2.14.8-2) UNRELEASED; urgency=low +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. @@ -6,8 +6,9 @@ libgtop2 (2.14.8-2) UNRELEASED; urgency=low 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 Wed, 11 Apr 2007 16:12:32 +0200 + -- Loic Minier Wed, 11 Apr 2007 16:13:37 +0200 libgtop2 (2.14.8-1) experimental; urgency=low diff --git a/debian/control b/debian/control index a6e1db0c..317d47d5 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,26 @@ Source: libgtop2 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Kilian Krause , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sjoerd Simons -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, libkvm-dev [kfreebsd-i386 kfreebsd-amd64] +Uploaders: Debian GNOME Maintainers , Loic Minier +Build-Depends: debhelper (>= 5), + gettext, + pkg-config, + libpopt-dev, + libxau-dev, + libglib2.0-dev (>= 2.6.0), + gnome-pkg-tools (>= 0.10), + cdbs, + texinfo, + dpkg-dev (>= 1.13.19), + libxml-parser-perl, + libkvm-dev [kfreebsd-i386 kfreebsd-amd64] Standards-Version: 3.7.2 Package: libgtop2-7 Architecture: any Section: libs -Depends: ${shlibs:Depends}, libgtop2-common (>= ${source:Version}) +Depends: ${shlibs:Depends}, + libgtop2-common (>= ${source:Version}) Description: gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. @@ -19,7 +31,9 @@ Description: gtop system monitoring library Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev, ${libkvm-dev} +Depends: libgtop2-7 (= ${binary:Version}), + libglib2.0-dev, + ${libkvm-dev} Description: gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. @@ -30,7 +44,10 @@ Description: gtop system monitoring library Package: libgtop2-common Architecture: all Section: libs -Replaces: libgtop2-5, libgtop2-4, libgtop2-2, libgtop2 +Replaces: libgtop2-5, + libgtop2-4, + libgtop2-2, + libgtop2 Description: common files for the gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. diff --git a/debian/control.in b/debian/control.in index ef6a6269..0dd9eacb 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,13 +3,25 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 5), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, libkvm-dev [kfreebsd-i386 kfreebsd-amd64] +Build-Depends: debhelper (>= 5), + gettext, + pkg-config, + libpopt-dev, + libxau-dev, + libglib2.0-dev (>= 2.6.0), + gnome-pkg-tools (>= 0.10), + cdbs, + texinfo, + dpkg-dev (>= 1.13.19), + libxml-parser-perl, + libkvm-dev [kfreebsd-i386 kfreebsd-amd64] Standards-Version: 3.7.2 Package: libgtop2-7 Architecture: any Section: libs -Depends: ${shlibs:Depends}, libgtop2-common (>= ${source:Version}) +Depends: ${shlibs:Depends}, + libgtop2-common (>= ${source:Version}) Description: gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. @@ -19,7 +31,9 @@ Description: gtop system monitoring library Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev, ${libkvm-dev} +Depends: libgtop2-7 (= ${binary:Version}), + libglib2.0-dev, + ${libkvm-dev} Description: gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. @@ -30,7 +44,10 @@ Description: gtop system monitoring library Package: libgtop2-common Architecture: all Section: libs -Replaces: libgtop2-5, libgtop2-4, libgtop2-2, libgtop2 +Replaces: libgtop2-5, + libgtop2-4, + libgtop2-2, + libgtop2 Description: common files for the gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. From e1f901c90584a4f185bd5096f7c2d602936ac84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 20 Jun 2007 13:28:22 +0000 Subject: [PATCH 11/21] * 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. --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index a6e380bc..cf5b4de3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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 Wed, 20 Jun 2007 15:16:55 +0200 + libgtop2 (2.14.8-2) unstable; urgency=low * Upload to unstable; drop check-dist include. From 557490bab5f5e09c78e16b07af85fc87a0ca3826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 17 Sep 2007 04:31:39 +0000 Subject: [PATCH 12/21] * New upstream release, with some API additions. * debian/control.in: + Remove libpopt-dev from build-depends. * debian/rules: + Bump shlibs to >= 2.20.0. --- debian/changelog | 10 ++++++++++ debian/control.in | 1 - debian/rules | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cf5b4de3..f39ef153 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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 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 diff --git a/debian/control.in b/debian/control.in index 0dd9eacb..6d2bd480 100644 --- a/debian/control.in +++ b/debian/control.in @@ -6,7 +6,6 @@ Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 5), gettext, pkg-config, - libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), diff --git a/debian/rules b/debian/rules index b6026bb9..e8460ad7 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk GNOME_MODULE := libgtop -DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.14.2)' +DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.20.0)' ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) DEB_DH_GENCONTROL_ARGS += -- -Vlibkvm-dev=libkvm-dev From 874801bc1f2ca04a3ead86ea1bcd2503b2caeac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 17 Sep 2007 04:32:03 +0000 Subject: [PATCH 13/21] * regenrate configure --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 317d47d5..bba32032 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,10 @@ Source: libgtop2 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Loic Minier +Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Dröge Build-Depends: debhelper (>= 5), gettext, pkg-config, - libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), From 107b884da3fda24932514df0f73c0fc2a479e22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 5 Jan 2008 06:20:22 +0000 Subject: [PATCH 14/21] * 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. --- debian/changelog | 14 +++++++++++ debian/control | 4 +++- debian/control.in | 4 +++- debian/patches/01_kfreebsd.patch | 16 +++++++++++++ debian/patches/99_ltmain_as-needed.patch | 30 ++++++++++++++++++++++++ debian/rules | 1 + 6 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 debian/patches/01_kfreebsd.patch create mode 100644 debian/patches/99_ltmain_as-needed.patch diff --git a/debian/changelog b/debian/changelog index f39ef153..902a7bba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +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 Sat, 05 Jan 2008 07:14:55 +0100 + libgtop2 (2.20.0-1) unstable; urgency=low * New upstream release, with some API additions. diff --git a/debian/control b/debian/control index bba32032..bd558f82 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,10 @@ Build-Depends: debhelper (>= 5), texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, + libgeom-dev [kfreebsd-i386 kfreebsd-amd64], + libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], libkvm-dev [kfreebsd-i386 kfreebsd-amd64] -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: libgtop2-7 Architecture: any diff --git a/debian/control.in b/debian/control.in index 6d2bd480..76051a95 100644 --- a/debian/control.in +++ b/debian/control.in @@ -13,8 +13,10 @@ Build-Depends: debhelper (>= 5), texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, + libgeom-dev [kfreebsd-i386 kfreebsd-amd64], + libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], libkvm-dev [kfreebsd-i386 kfreebsd-amd64] -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: libgtop2-7 Architecture: any diff --git a/debian/patches/01_kfreebsd.patch b/debian/patches/01_kfreebsd.patch new file mode 100644 index 00000000..37590cb9 --- /dev/null +++ b/debian/patches/01_kfreebsd.patch @@ -0,0 +1,16 @@ +--- libgtop2-2.20.0.orig/sysdeps/freebsd/open.c ++++ libgtop2-2.20.0/sysdeps/freebsd/open.c +@@ -63,9 +63,11 @@ + server->machine.euid = geteuid (); + server->machine.gid = getgid (); + server->machine.egid = getegid (); +- ++#if defined(__FreeBSD_kernel__) ++ server->os_version_code = __FreeBSD_kernel_version; ++#else + server->os_version_code = __FreeBSD_version; +- ++#endif + /* Setup machine-specific data */ + server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open"); + diff --git a/debian/patches/99_ltmain_as-needed.patch b/debian/patches/99_ltmain_as-needed.patch new file mode 100644 index 00000000..7a8a274f --- /dev/null +++ b/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,30 @@ +--- ltmain.sh.old 2007-10-09 07:38:25.000000000 +0200 ++++ ltmain.sh 2007-10-09 07:39:25.000000000 +0200 +@@ -1794,6 +1794,11 @@ + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` + arg= +@@ -2137,6 +2142,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" diff --git a/debian/rules b/debian/rules index e8460ad7..876b2aaa 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk GNOME_MODULE := libgtop +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.20.0)' ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) From 1fded9a13647e13de9d2db3cdf36f13d5cad7603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 8 Jan 2008 13:09:03 +0000 Subject: [PATCH 15/21] * New upstream bugfix release. --- debian/changelog | 6 ++++++ debian/patches/01_kfreebsd.patch | 16 ---------------- 2 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 debian/patches/01_kfreebsd.patch diff --git a/debian/changelog b/debian/changelog index 902a7bba..b84915f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtop2 (2.20.1-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Tue, 08 Jan 2008 14:07:50 +0100 + libgtop2 (2.20.0-2) unstable; urgency=low * debian/patches/01_kfreebsd.patch, diff --git a/debian/patches/01_kfreebsd.patch b/debian/patches/01_kfreebsd.patch deleted file mode 100644 index 37590cb9..00000000 --- a/debian/patches/01_kfreebsd.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- libgtop2-2.20.0.orig/sysdeps/freebsd/open.c -+++ libgtop2-2.20.0/sysdeps/freebsd/open.c -@@ -63,9 +63,11 @@ - server->machine.euid = geteuid (); - server->machine.gid = getgid (); - server->machine.egid = getegid (); -- -+#if defined(__FreeBSD_kernel__) -+ server->os_version_code = __FreeBSD_kernel_version; -+#else - server->os_version_code = __FreeBSD_version; -- -+#endif - /* Setup machine-specific data */ - server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open"); - From 41b4a64aab681d0728ebf7a1bf8669d092dc25d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 8 Mar 2008 04:04:10 +0000 Subject: [PATCH 16/21] * New upstream bugfix release: + Fixes smaps parsing with Linux kernel >= 2.6.24. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index b84915f9..3836bf4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libgtop2 (2.20.2-1) unstable; urgency=low + + * New upstream bugfix release: + + Fixes smaps parsing with Linux kernel >= 2.6.24. + + -- Sebastian Dröge Sat, 08 Mar 2008 05:02:09 +0100 + libgtop2 (2.20.1-1) unstable; urgency=low * New upstream bugfix release. From 587b473b02251e39f086b7abf787425da3b6014b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 14 Mar 2008 10:58:56 +0000 Subject: [PATCH 17/21] * New upstream stable release. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3836bf4b..e8577a60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtop2 (2.22.0-1) unstable; urgency=low + + * New upstream stable release. + + -- Sebastian Dröge Fri, 14 Mar 2008 11:55:57 +0100 + libgtop2 (2.20.2-1) unstable; urgency=low * New upstream bugfix release: From 25dda6fd8b7ca309c2abdb6b7a591fa1d807802e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 4 Apr 2008 19:11:25 +0000 Subject: [PATCH 18/21] * 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. --- debian/changelog | 11 +++++++++++ debian/control | 2 +- debian/control.in | 2 +- debian/rules | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e8577a60..631f773c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +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 Fri, 04 Apr 2008 21:08:49 +0200 + libgtop2 (2.22.0-1) unstable; urgency=low * New upstream stable release. diff --git a/debian/control b/debian/control index bd558f82..ac6310bb 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Architecture: any Section: libdevel Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev, - ${libkvm-dev} + ${os-specific-dev} Description: gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. diff --git a/debian/control.in b/debian/control.in index 76051a95..a853aa22 100644 --- a/debian/control.in +++ b/debian/control.in @@ -34,7 +34,7 @@ Architecture: any Section: libdevel Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev, - ${libkvm-dev} + ${os-specific-dev} Description: gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. diff --git a/debian/rules b/debian/rules index 876b2aaa..823effed 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,6 @@ LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.20.0)' ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) -DEB_DH_GENCONTROL_ARGS += -- -Vlibkvm-dev=libkvm-dev +DEB_DH_GENCONTROL_ARGS += -- -Vos-specific-dev="libkvm-dev, libgeom-dev, libdevstat-dev" endif From c724104c12320b1b40b1cb6fc78f1aaeada859ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 25 May 2008 15:02:22 +0000 Subject: [PATCH 19/21] * New upstream bugfix release: + Fixes parsing of large /proc/stat on Linux. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 631f773c..3cbf23f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libgtop2 (2.22.2-1) unstable; urgency=low + + * New upstream bugfix release: + + Fixes parsing of large /proc/stat on Linux. + + -- Sebastian Dröge Sun, 25 May 2008 17:00:32 +0200 + libgtop2 (2.22.1-1) unstable; urgency=low * New upstream bugfix release: From 39eead20a1a9a5a51ded236919d4c1846d4c18d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 1 Jul 2008 08:13:59 +0000 Subject: [PATCH 20/21] * New upstream bugfix release. * debian/control.in: + Updated Standards-Version to 3.8.0, no additional changes needed. --- debian/changelog | 8 ++++++++ debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3cbf23f6..dca7256c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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. + + -- Sebastian Dröge Tue, 01 Jul 2008 10:11:55 +0200 + libgtop2 (2.22.2-1) unstable; urgency=low * New upstream bugfix release: diff --git a/debian/control b/debian/control index ac6310bb..ef16bfe7 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5), libgeom-dev [kfreebsd-i386 kfreebsd-amd64], libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], libkvm-dev [kfreebsd-i386 kfreebsd-amd64] -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Package: libgtop2-7 Architecture: any diff --git a/debian/control.in b/debian/control.in index a853aa22..2d78ef39 100644 --- a/debian/control.in +++ b/debian/control.in @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5), libgeom-dev [kfreebsd-i386 kfreebsd-amd64], libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], libkvm-dev [kfreebsd-i386 kfreebsd-amd64] -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Package: libgtop2-7 Architecture: any From 13d07b49354e7457901fdd7721176e37060d977b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 1 Jul 2008 08:34:11 +0000 Subject: [PATCH 21/21] Build depend on intltool as it's now required. --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dca7256c..5d8aefb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ 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 Tue, 01 Jul 2008 10:11:55 +0200 diff --git a/debian/control b/debian/control index ef16bfe7..421e865b 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 5), cdbs, texinfo, dpkg-dev (>= 1.13.19), - libxml-parser-perl, + intltool, libgeom-dev [kfreebsd-i386 kfreebsd-amd64], libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], libkvm-dev [kfreebsd-i386 kfreebsd-amd64] diff --git a/debian/control.in b/debian/control.in index 2d78ef39..45419100 100644 --- a/debian/control.in +++ b/debian/control.in @@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 5), cdbs, texinfo, dpkg-dev (>= 1.13.19), - libxml-parser-perl, + intltool, libgeom-dev [kfreebsd-i386 kfreebsd-amd64], libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], libkvm-dev [kfreebsd-i386 kfreebsd-amd64]