[Glibc-bsd-commits] r4227 - in trunk/freebsd-libs/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-04-21 21:20:59 +0000 (Sat, 21 Apr 2012)
New Revision: 4227

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/patches/04_libkvm.diff
Log:
04_libkvm.diff: Remove struct loadavg kludge, B-D on libc0.1-dev (>= 2.13-31) instead.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2012-04-21 21:07:03 UTC (rev 4226)
+++ trunk/freebsd-libs/debian/changelog	2012-04-21 21:20:59 UTC (rev 4227)
@@ -1,3 +1,10 @@
+freebsd-libs (9.0+ds1-3) UNRELEASED; urgency=low
+
+  * 04_libkvm.diff: Remove struct loadavg kludge, B-D on libc0.1-dev (>=
+    2.13-31) instead.
+
+ -- Robert Millan <rmh at debian.org>  Sat, 21 Apr 2012 23:20:51 +0200
+
 freebsd-libs (9.0+ds1-2) unstable; urgency=low
 
   * kvm.h: Use <bsd/nlist.h> rather than <nlist.h>. (Closes: #657772)

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2012-04-21 21:07:03 UTC (rev 4226)
+++ trunk/freebsd-libs/debian/control	2012-04-21 21:20:59 UTC (rev 4227)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7), pkg-config,
  freebsd-buildutils (>= 9.0-3~),
  libbsd-dev (>= 0.3.0),
- libc0.1-dev (>= 2.13-0exp2) [kfreebsd-any],
+ libc0.1-dev (>= 2.13-31) [kfreebsd-any],
  libgdbm-dev [kfreebsd-any],
  kfreebsd-kernel-headers (>= 0.73) [kfreebsd-any],
 # libexpat-dev: aka bsdxml. needed by libgeom

Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff	2012-04-21 21:07:03 UTC (rev 4226)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff	2012-04-21 21:20:59 UTC (rev 4227)
@@ -1,18 +1,3 @@
----
- lib/libkvm/Makefile             |    2 +-
- lib/libkvm/kvm.c                |   23 +++++++++++++++++++----
- lib/libkvm/kvm_cptime.c         |    4 ++--
- lib/libkvm/kvm_file.c           |    7 ++++++-
- lib/libkvm/kvm_getloadavg.c     |   12 +++++++++---
- lib/libkvm/kvm_getswapinfo.c    |    8 +++++---
- lib/libkvm/kvm_minidump_amd64.c |    9 +++++++++
- lib/libkvm/kvm_minidump_i386.c  |   10 ++++++++++
- lib/libkvm/kvm_pcpu.c           |    6 +++---
- lib/libkvm/kvm_private.h        |    6 ++++--
- lib/libkvm/kvm_proc.c           |    5 ++++-
- lib/libkvm/kvm_vnet.c           |   14 +++++++-------
- 12 files changed, 79 insertions(+), 27 deletions(-)
-
 --- a/lib/libkvm/Makefile
 +++ b/lib/libkvm/Makefile
 @@ -2,8 +2,8 @@
@@ -108,21 +93,6 @@
 +#endif
 +	return 0;
  }
---- a/lib/libkvm/kvm_getloadavg.c
-+++ b/lib/libkvm/kvm_getloadavg.c
-@@ -55,6 +55,12 @@
- 	{ .n_name = "" },
- };
- 
-+#include <sys/_types.h>
-+struct loadavg {
-+	__fixpt_t       ldavg[3];
-+	long            fscale;
-+};
-+
- /*
-  * kvm_getloadavg() -- Get system load averages, from live or dead kernels.
-  *
 --- a/lib/libkvm/kvm_getswapinfo.c
 +++ b/lib/libkvm/kvm_getswapinfo.c
 @@ -200,8 +200,10 @@