[Glibc-bsd-commits] r2592 - in trunk/freebsd-libs/debian: . patches
Aurelien Jarno
aurel32 at alioth.debian.org
Mon Jun 15 13:56:13 UTC 2009
Author: aurel32
Date: 2009-06-15 13:56:12 +0000 (Mon, 15 Jun 2009)
New Revision: 2592
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/freebsd-libs/debian/patches/04_libkvm.diff
trunk/freebsd-libs/debian/patches/08_libdevstat.diff
Log:
* Tighten build-depends on kfreebsd-kernel-headers.
* Remove n_un union workarounds.
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2009-06-15 09:12:13 UTC (rev 2591)
+++ trunk/freebsd-libs/debian/changelog 2009-06-15 13:56:12 UTC (rev 2592)
@@ -1,3 +1,10 @@
+freebsd-libs (7.2-2) unstable; urgency=low
+
+ * Tighten build-depends on kfreebsd-kernel-headers.
+ * Remove n_un union workarounds.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 15 Jun 2009 10:47:08 +0200
+
freebsd-libs (7.2-1) unstable; urgency=low
[ Guillem Jover ]
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2009-06-15 09:12:13 UTC (rev 2591)
+++ trunk/freebsd-libs/debian/control 2009-06-15 13:56:12 UTC (rev 2592)
@@ -4,7 +4,7 @@
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>
Build-Depends: debhelper (>= 5.0.0), quilt, freebsd-buildutils, libbsd-dev (>= 0.1.4),
- libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.33), libexpat-dev
+ libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.34), libexpat-dev
# libexpat-dev: aka bsdxml. needed by libgeom
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-libs/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-libs/
Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff 2009-06-15 09:12:13 UTC (rev 2591)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff 2009-06-15 13:56:12 UTC (rev 2592)
@@ -71,18 +71,6 @@
int flag;
const char *errstr;
{
-@@ -322,9 +330,9 @@
- * and look it up with a kldsym(2) syscall.
- */
- nvalid = 0;
-- for (p = nl; p->n_name && p->n_name[0]; ++p) {
-+ for (p = nl; p->n_un.n_name && p->n_un.n_name[0]; ++p) {
- lookup.version = sizeof(lookup);
-- lookup.symname = p->n_name;
-+ lookup.symname = p->n_un.n_name;
- lookup.symvalue = 0;
- lookup.symsize = 0;
-
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
@@ -59,7 +59,7 @@
@@ -153,15 +141,6 @@
};
/*
-@@ -76,7 +82,7 @@
- if (kvm_nlist(kd, nl) != 0) {
- for (p = nl; p->n_type != 0; ++p);
- _kvm_err(kd, kd->program,
-- "%s: no such symbol", p->n_name);
-+ "%s: no such symbol", p->n_un.n_name);
- return (-1);
- }
-
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -46,13 +46,16 @@
@@ -184,15 +163,6 @@
};
#define NL_SWTAILQ 0
-@@ -70,7 +73,7 @@
- #define KREAD(kd, addr, obj) \
- (kvm_read(kd, addr, (char *)(obj), sizeof(*obj)) != sizeof(*obj))
- #define KGET(idx, var) \
-- KGET2(kvm_swap_nl[(idx)].n_value, var, kvm_swap_nl[(idx)].n_name)
-+ KGET2(kvm_swap_nl[(idx)].n_value, var, kvm_swap_nl[(idx)].n_un.n_name)
- #define KGET2(addr, var, msg) \
- if (KREAD(kd, (u_long)(addr), (var))) { \
- _kvm_err(kd, kd->program, "cannot read %s", msg); \
@@ -209,8 +212,10 @@
swap_ary[unswdev].ksw_total = ttl;
swap_ary[unswdev].ksw_used = xsd.xsw_used;
@@ -297,32 +267,6 @@
}
/*
-@@ -540,18 +543,18 @@
- } else {
- struct nlist nl[6], *p;
-
-- nl[0].n_name = "_nprocs";
-- nl[1].n_name = "_allproc";
-- nl[2].n_name = "_zombproc";
-- nl[3].n_name = "_ticks";
-- nl[4].n_name = "_hz";
-- nl[5].n_name = 0;
-+ nl[0].n_un.n_name = "_nprocs";
-+ nl[1].n_un.n_name = "_allproc";
-+ nl[2].n_un.n_name = "_zombproc";
-+ nl[3].n_un.n_name = "_ticks";
-+ nl[4].n_un.n_name = "_hz";
-+ nl[5].n_un.n_name = 0;
-
- if (kvm_nlist(kd, nl) != 0) {
- for (p = nl; p->n_type != 0; ++p)
- ;
- _kvm_err(kd, kd->program,
-- "%s: no such symbol", p->n_name);
-+ "%s: no such symbol", p->n_un.n_name);
- return (0);
- }
- if (KREAD(kd, nl[0].n_value, &nprocs)) {
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -51,6 +51,7 @@
@@ -333,28 +277,6 @@
#include <nlist.h>
#include <kvm.h>
-@@ -174,8 +175,8 @@
- return (-1);
- }
-
-- nlist[0].n_name = "kernbase";
-- nlist[1].n_name = 0;
-+ nlist[0].n_un.n_name = "kernbase";
-+ nlist[1].n_un.n_name = 0;
-
- if (kvm_nlist(kd, nlist) != 0) {
- _kvm_err(kd, kd->program, "bad namelist - no kernbase");
-@@ -183,8 +184,8 @@
- }
- kernbase = nlist[0].n_value;
-
-- nlist[0].n_name = "KPML4phys";
-- nlist[1].n_name = 0;
-+ nlist[0].n_un.n_name = "KPML4phys";
-+ nlist[1].n_un.n_name = 0;
-
- if (kvm_nlist(kd, nlist) != 0) {
- _kvm_err(kd, kd->program, "bad namelist - no KPML4phys");
--- a/lib/libkvm/kvm_cptime.c
+++ b/lib/libkvm/kvm_cptime.c
@@ -38,12 +38,13 @@
Modified: trunk/freebsd-libs/debian/patches/08_libdevstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2009-06-15 09:12:13 UTC (rev 2591)
+++ trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2009-06-15 13:56:12 UTC (rev 2592)
@@ -33,17 +33,6 @@
#include "devstat.h"
-@@ -1562,8 +1563,8 @@
- {
- struct nlist nl[2];
-
-- nl[0].n_name = (char *)name;
-- nl[1].n_name = NULL;
-+ nl[0].n_un.n_name = (char *)name;
-+ nl[1].n_un.n_name = NULL;
-
- if (kvm_nlist(kd, nl) == -1) {
- snprintf(devstat_errbuf, sizeof(devstat_errbuf),
@@ -1588,6 +1589,7 @@
struct devstatlist dhead;
int num_devs;
More information about the Glibc-bsd-commits
mailing list