[Glibc-bsd-commits] r2571 - trunk/freebsd-libs/debian/patches

Aurelien Jarno aurel32 at alioth.debian.org
Sat Jun 6 18:58:35 UTC 2009 

Author: aurel32
Date: 2009-06-06 18:58:35 +0000 (Sat, 06 Jun 2009)
New Revision: 2571

Modified:
   trunk/freebsd-libs/debian/patches/00_fbsdid.diff
   trunk/freebsd-libs/debian/patches/01_sys_cam.diff
   trunk/freebsd-libs/debian/patches/02_libcam.diff
   trunk/freebsd-libs/debian/patches/04_libkvm.diff
   trunk/freebsd-libs/debian/patches/05_libipx.diff
   trunk/freebsd-libs/debian/patches/06_libgeom.diff
   trunk/freebsd-libs/debian/patches/07_libkiconv.diff
   trunk/freebsd-libs/debian/patches/08_libdevstat.diff
Log:
Update patches wrt libbsd changes. Kills some warnings


Modified: trunk/freebsd-libs/debian/patches/00_fbsdid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/00_fbsdid.diff	2009-06-03 08:03:40 UTC (rev 2570)
+++ trunk/freebsd-libs/debian/patches/00_fbsdid.diff	2009-06-06 18:58:35 UTC (rev 2571)
@@ -4,8 +4,51 @@
    find sys -type f  -exec sed -i {} -e "/^__FBSDID/d" \;
    find lib -type f  -exec sed -i {} -e "/^__FBSDID/d" \;
 
-Index: b/lib/libcam/camlib.c
-===================================================================
+---
+ lib/libcam/camlib.c             |    1 -
+ lib/libcam/scsi_cmdparse.c      |    1 -
+ lib/libdevstat/devstat.c        |    1 -
+ lib/libgeom/geom_util.c         |    1 -
+ lib/libipx/ipx_addr.c           |    1 -
+ lib/libipx/ipx_ntoa.c           |    1 -
+ lib/libkvm/kvm.c                |    1 -
+ lib/libkvm/kvm_amd64.c          |    1 -
+ lib/libkvm/kvm_arm.c            |    1 -
+ lib/libkvm/kvm_cptime.c         |    1 -
+ lib/libkvm/kvm_file.c           |    1 -
+ lib/libkvm/kvm_getloadavg.c     |    1 -
+ lib/libkvm/kvm_getswapinfo.c    |    1 -
+ lib/libkvm/kvm_i386.c           |    1 -
+ lib/libkvm/kvm_minidump_amd64.c |    1 -
+ lib/libkvm/kvm_minidump_i386.c  |    1 -
+ lib/libkvm/kvm_pcpu.c           |    1 -
+ lib/libkvm/kvm_proc.c           |    1 -
+ lib/libkvm/kvm_sparc.c          |    1 -
+ lib/libkvm/kvm_sparc64.c        |    1 -
+ lib/libusbhid/data.c            |    1 -
+ lib/libusbhid/descr.c           |    1 -
+ lib/libusbhid/parse.c           |    1 -
+ lib/libusbhid/usage.c           |    1 -
+ sys/cam/cam.c                   |    1 -
+ sys/cam/cam_periph.c            |    1 -
+ sys/cam/cam_queue.c             |    1 -
+ sys/cam/cam_sim.c               |    1 -
+ sys/cam/cam_xpt.c               |    1 -
+ sys/cam/scsi/scsi_all.c         |    1 -
+ sys/cam/scsi/scsi_cd.c          |    1 -
+ sys/cam/scsi/scsi_da.c          |    1 -
+ sys/cam/scsi/scsi_low.c         |    1 -
+ sys/cam/scsi/scsi_low_pisa.c    |    1 -
+ sys/cam/scsi/scsi_pass.c        |    1 -
+ sys/cam/scsi/scsi_pt.c          |    1 -
+ sys/cam/scsi/scsi_sa.c          |    1 -
+ sys/cam/scsi/scsi_ses.c         |    1 -
+ sys/cam/scsi/scsi_sg.c          |    1 -
+ sys/cam/scsi/scsi_targ_bh.c     |    1 -
+ sys/cam/scsi/scsi_target.c      |    1 -
+ sys/kern/subr_sbuf.c            |    1 -
+ 42 files changed, 42 deletions(-)
+
 --- a/lib/libcam/camlib.c
 +++ b/lib/libcam/camlib.c
 @@ -24,7 +24,6 @@
@@ -16,8 +59,6 @@
  
  #include <sys/types.h>
  #include <sys/param.h>
-Index: b/lib/libcam/scsi_cmdparse.c
-===================================================================
 --- a/lib/libcam/scsi_cmdparse.c
 +++ b/lib/libcam/scsi_cmdparse.c
 @@ -35,7 +35,6 @@
@@ -28,8 +69,6 @@
  
  #include <sys/types.h>
  
-Index: b/lib/libdevstat/devstat.c
-===================================================================
 --- a/lib/libdevstat/devstat.c
 +++ b/lib/libdevstat/devstat.c
 @@ -27,7 +27,6 @@
@@ -40,8 +79,6 @@
  
  #include <sys/types.h>
  #include <sys/sysctl.h>
-Index: b/lib/libgeom/geom_util.c
-===================================================================
 --- a/lib/libgeom/geom_util.c
 +++ b/lib/libgeom/geom_util.c
 @@ -25,7 +25,6 @@
@@ -52,8 +89,6 @@
  
  #include <sys/param.h>
  #include <sys/disk.h>
-Index: b/lib/libipx/ipx_addr.c
-===================================================================
 --- a/lib/libipx/ipx_addr.c
 +++ b/lib/libipx/ipx_addr.c
 @@ -31,7 +31,6 @@
@@ -64,8 +99,6 @@
  
  #if defined(LIBC_SCCS) && !defined(lint)
  static char sccsid[] = "@(#)ipx_addr.c";
-Index: b/lib/libipx/ipx_ntoa.c
-===================================================================
 --- a/lib/libipx/ipx_ntoa.c
 +++ b/lib/libipx/ipx_ntoa.c
 @@ -28,7 +28,6 @@
@@ -76,8 +109,6 @@
  
  #if defined(LIBC_SCCS) && !defined(lint)
  static char sccsid[] = "@(#)ipx_ntoa.c";
-Index: b/lib/libkvm/kvm.c
-===================================================================
 --- a/lib/libkvm/kvm.c
 +++ b/lib/libkvm/kvm.c
 @@ -32,7 +32,6 @@
@@ -88,8 +119,6 @@
  
  #if defined(LIBC_SCCS) && !defined(lint)
  #if 0
-Index: b/lib/libkvm/kvm_amd64.c
-===================================================================
 --- a/lib/libkvm/kvm_amd64.c
 +++ b/lib/libkvm/kvm_amd64.c
 @@ -32,7 +32,6 @@
@@ -100,8 +129,6 @@
  
  #if defined(LIBC_SCCS) && !defined(lint)
  #if 0
-Index: b/lib/libkvm/kvm_arm.c
-===================================================================
 --- a/lib/libkvm/kvm_arm.c
 +++ b/lib/libkvm/kvm_arm.c
 @@ -36,7 +36,6 @@
@@ -112,8 +139,6 @@
  
  #include <sys/param.h>
  #include <sys/elf32.h>
-Index: b/lib/libkvm/kvm_cptime.c
-===================================================================
 --- a/lib/libkvm/kvm_cptime.c
 +++ b/lib/libkvm/kvm_cptime.c
 @@ -29,7 +29,6 @@
@@ -124,8 +149,6 @@
  
  #include <sys/param.h>
  #include <sys/pcpu.h>
-Index: b/lib/libkvm/kvm_file.c
-===================================================================
 --- a/lib/libkvm/kvm_file.c
 +++ b/lib/libkvm/kvm_file.c
 @@ -28,7 +28,6 @@
@@ -136,8 +159,6 @@
  
  #if defined(LIBC_SCCS) && !defined(lint)
  #if 0
-Index: b/lib/libkvm/kvm_getloadavg.c
-===================================================================
 --- a/lib/libkvm/kvm_getloadavg.c
 +++ b/lib/libkvm/kvm_getloadavg.c
 @@ -28,7 +28,6 @@
@@ -148,8 +169,6 @@
  
  #if defined(LIBC_SCCS) && !defined(lint)
  #if 0
-Index: b/lib/libkvm/kvm_getswapinfo.c
-===================================================================
 --- a/lib/libkvm/kvm_getswapinfo.c
 +++ b/lib/libkvm/kvm_getswapinfo.c
 @@ -25,7 +25,6 @@
@@ -160,8 +179,6 @@
  
  #include <sys/param.h>
  #include <sys/time.h>
-Index: b/lib/libkvm/kvm_i386.c
-===================================================================
 --- a/lib/libkvm/kvm_i386.c
 +++ b/lib/libkvm/kvm_i386.c
 @@ -32,7 +32,6 @@
@@ -172,8 +189,6 @@
  
  #if defined(LIBC_SCCS) && !defined(lint)
  #if 0
-Index: b/lib/libkvm/kvm_minidump_amd64.c
-===================================================================
 --- a/lib/libkvm/kvm_minidump_amd64.c
 +++ b/lib/libkvm/kvm_minidump_amd64.c
 @@ -24,7 +24,6 @@
@@ -184,8 +199,6 @@
  
  /*
   * AMD64 machine dependent routines for kvm and minidumps. 
-Index: b/lib/libkvm/kvm_minidump_i386.c
-===================================================================
 --- a/lib/libkvm/kvm_minidump_i386.c
 +++ b/lib/libkvm/kvm_minidump_i386.c
 @@ -24,7 +24,6 @@
@@ -196,8 +209,6 @@
  
  /*
   * AMD64 machine dependent routines for kvm and minidumps. 
-Index: b/lib/libkvm/kvm_pcpu.c
-===================================================================
 --- a/lib/libkvm/kvm_pcpu.c
 +++ b/lib/libkvm/kvm_pcpu.c
 @@ -29,7 +29,6 @@
@@ -208,8 +219,6 @@
  
  #include <sys/param.h>
  #include <sys/pcpu.h>
-Index: b/lib/libkvm/kvm_proc.c
-===================================================================
 --- a/lib/libkvm/kvm_proc.c
 +++ b/lib/libkvm/kvm_proc.c
 @@ -38,7 +38,6 @@
@@ -220,8 +229,6 @@
  
  /*
   * Proc traversal interface for kvm.  ps and w are (probably) the exclusive
-Index: b/lib/libkvm/kvm_sparc.c
-===================================================================
 --- a/lib/libkvm/kvm_sparc.c
 +++ b/lib/libkvm/kvm_sparc.c
 @@ -32,7 +32,6 @@
@@ -232,8 +239,6 @@
  
  #if defined(LIBC_SCCS) && !defined(lint)
  #if 0
-Index: b/lib/libkvm/kvm_sparc64.c
-===================================================================
 --- a/lib/libkvm/kvm_sparc64.c
 +++ b/lib/libkvm/kvm_sparc64.c
 @@ -34,7 +34,6 @@
@@ -244,8 +249,6 @@
  
  #if defined(LIBC_SCCS) && !defined(lint)
  #if 0
-Index: b/lib/libusbhid/data.c
-===================================================================
 --- a/lib/libusbhid/data.c
 +++ b/lib/libusbhid/data.c
 @@ -27,7 +27,6 @@
@@ -256,8 +259,6 @@
  
  #include <assert.h>
  #include <stdlib.h>
-Index: b/lib/libusbhid/descr.c
-===================================================================
 --- a/lib/libusbhid/descr.c
 +++ b/lib/libusbhid/descr.c
 @@ -27,7 +27,6 @@
@@ -268,8 +269,6 @@
  
  #include <sys/types.h>
  
-Index: b/lib/libusbhid/parse.c
-===================================================================
 --- a/lib/libusbhid/parse.c
 +++ b/lib/libusbhid/parse.c
 @@ -27,7 +27,6 @@
@@ -280,8 +279,6 @@
  
  #include <assert.h>
  #include <stdlib.h>
-Index: b/lib/libusbhid/usage.c
-===================================================================
 --- a/lib/libusbhid/usage.c
 +++ b/lib/libusbhid/usage.c
 @@ -27,7 +27,6 @@
@@ -292,8 +289,6 @@
  
  #include <assert.h>
  #include <ctype.h>
-Index: b/sys/cam/cam.c
-===================================================================
 --- a/sys/cam/cam.c
 +++ b/sys/cam/cam.c
 @@ -27,7 +27,6 @@
@@ -304,8 +299,6 @@
  
  #include <sys/param.h>
  #ifdef _KERNEL
-Index: b/sys/cam/cam_periph.c
-===================================================================
 --- a/sys/cam/cam_periph.c
 +++ b/sys/cam/cam_periph.c
 @@ -28,7 +28,6 @@
@@ -316,8 +309,6 @@
  
  #include <sys/param.h>
  #include <sys/systm.h>
-Index: b/sys/cam/cam_queue.c
-===================================================================
 --- a/sys/cam/cam_queue.c
 +++ b/sys/cam/cam_queue.c
 @@ -27,7 +27,6 @@
@@ -328,8 +319,6 @@
  
  #include <sys/param.h>
  #include <sys/systm.h>
-Index: b/sys/cam/cam_sim.c
-===================================================================
 --- a/sys/cam/cam_sim.c
 +++ b/sys/cam/cam_sim.c
 @@ -27,7 +27,6 @@
@@ -340,8 +329,6 @@
  
  #include <sys/param.h>
  #include <sys/systm.h>
-Index: b/sys/cam/cam_xpt.c
-===================================================================
 --- a/sys/cam/cam_xpt.c
 +++ b/sys/cam/cam_xpt.c
 @@ -28,7 +28,6 @@
@@ -352,8 +339,6 @@
  
  #include <sys/param.h>
  #include <sys/bus.h>
-Index: b/sys/cam/scsi/scsi_all.c
-===================================================================
 --- a/sys/cam/scsi/scsi_all.c
 +++ b/sys/cam/scsi/scsi_all.c
 @@ -28,7 +28,6 @@
@@ -364,8 +349,6 @@
  
  #include <sys/param.h>
  
-Index: b/sys/cam/scsi/scsi_cd.c
-===================================================================
 --- a/sys/cam/scsi/scsi_cd.c
 +++ b/sys/cam/scsi/scsi_cd.c
 @@ -46,7 +46,6 @@
@@ -376,8 +359,6 @@
  
  #include "opt_cd.h"
  
-Index: b/sys/cam/scsi/scsi_da.c
-===================================================================
 --- a/sys/cam/scsi/scsi_da.c
 +++ b/sys/cam/scsi/scsi_da.c
 @@ -27,7 +27,6 @@
@@ -388,8 +369,6 @@
  
  #include <sys/param.h>
  
-Index: b/sys/cam/scsi/scsi_low.c
-===================================================================
 --- a/sys/cam/scsi/scsi_low.c
 +++ b/sys/cam/scsi/scsi_low.c
 @@ -2,7 +2,6 @@
@@ -400,8 +379,6 @@
  
  #define	SCSI_LOW_STATICS
  #define	SCSI_LOW_DEBUG
-Index: b/sys/cam/scsi/scsi_low_pisa.c
-===================================================================
 --- a/sys/cam/scsi/scsi_low_pisa.c
 +++ b/sys/cam/scsi/scsi_low_pisa.c
 @@ -32,7 +32,6 @@
@@ -412,8 +389,6 @@
  
  #ifdef	__NetBSD__
  #include <sys/param.h>
-Index: b/sys/cam/scsi/scsi_pass.c
-===================================================================
 --- a/sys/cam/scsi/scsi_pass.c
 +++ b/sys/cam/scsi/scsi_pass.c
 @@ -26,7 +26,6 @@
@@ -424,8 +399,6 @@
  
  #include <sys/param.h>
  #include <sys/systm.h>
-Index: b/sys/cam/scsi/scsi_pt.c
-===================================================================
 --- a/sys/cam/scsi/scsi_pt.c
 +++ b/sys/cam/scsi/scsi_pt.c
 @@ -27,7 +27,6 @@
@@ -436,8 +409,6 @@
  
  #include <sys/param.h>
  #include <sys/queue.h>
-Index: b/sys/cam/scsi/scsi_sa.c
-===================================================================
 --- a/sys/cam/scsi/scsi_sa.c
 +++ b/sys/cam/scsi/scsi_sa.c
 @@ -27,7 +27,6 @@
@@ -448,8 +419,6 @@
  
  #include <sys/param.h>
  #include <sys/queue.h>
-Index: b/sys/cam/scsi/scsi_ses.c
-===================================================================
 --- a/sys/cam/scsi/scsi_ses.c
 +++ b/sys/cam/scsi/scsi_ses.c
 @@ -25,7 +25,6 @@
@@ -460,8 +429,6 @@
  
  #include <sys/param.h>
  #include <sys/queue.h>
-Index: b/sys/cam/scsi/scsi_sg.c
-===================================================================
 --- a/sys/cam/scsi/scsi_sg.c
 +++ b/sys/cam/scsi/scsi_sg.c
 @@ -30,7 +30,6 @@
@@ -472,8 +439,6 @@
  
  #include <sys/param.h>
  #include <sys/systm.h>
-Index: b/sys/cam/scsi/scsi_targ_bh.c
-===================================================================
 --- a/sys/cam/scsi/scsi_targ_bh.c
 +++ b/sys/cam/scsi/scsi_targ_bh.c
 @@ -27,7 +27,6 @@
@@ -484,8 +449,6 @@
  
  #include <sys/param.h>
  #include <sys/queue.h>
-Index: b/sys/cam/scsi/scsi_target.c
-===================================================================
 --- a/sys/cam/scsi/scsi_target.c
 +++ b/sys/cam/scsi/scsi_target.c
 @@ -28,7 +28,6 @@
@@ -496,8 +459,6 @@
  
  
  #include <sys/param.h>
-Index: b/sys/kern/subr_sbuf.c
-===================================================================
 --- a/sys/kern/subr_sbuf.c
 +++ b/sys/kern/subr_sbuf.c
 @@ -27,7 +27,6 @@

Modified: trunk/freebsd-libs/debian/patches/01_sys_cam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/01_sys_cam.diff	2009-06-03 08:03:40 UTC (rev 2570)
+++ trunk/freebsd-libs/debian/patches/01_sys_cam.diff	2009-06-06 18:58:35 UTC (rev 2571)
@@ -17,7 +17,7 @@
  
 --- a/sys/cam/cam_xpt.c
 +++ b/sys/cam/cam_xpt.c
-@@ -779,7 +779,7 @@
+@@ -766,7 +766,7 @@
  static void	 xpt_run_dev_allocq(struct cam_eb *bus);
  static void	 xpt_run_dev_sendq(struct cam_eb *bus);
  static timeout_t xpt_release_devq_timeout;

Modified: trunk/freebsd-libs/debian/patches/02_libcam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/02_libcam.diff	2009-06-03 08:03:40 UTC (rev 2570)
+++ trunk/freebsd-libs/debian/patches/02_libcam.diff	2009-06-06 18:58:35 UTC (rev 2571)
@@ -1,7 +1,8 @@
 ---
  lib/libcam/Makefile |    3 +--
+ lib/libcam/camlib.c |    1 +
  lib/libcam/camlib.h |    9 +++------
- 2 files changed, 4 insertions(+), 8 deletions(-)
+ 3 files changed, 5 insertions(+), 8 deletions(-)
 
 --- a/lib/libcam/Makefile
 +++ b/lib/libcam/Makefile
@@ -43,3 +44,13 @@
  int buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
  		      int (*arg_get)(void *hook, char *field_name),
  		      void *gethook);
+--- a/lib/libcam/camlib.c
++++ b/lib/libcam/camlib.c
+@@ -34,6 +34,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <ctype.h>
++#include <bsd/string.h>
+ 
+ #include <cam/cam.h>
+ #include <cam/scsi/scsi_all.h>

Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff	2009-06-03 08:03:40 UTC (rev 2570)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff	2009-06-06 18:58:35 UTC (rev 2571)
@@ -1,17 +1,18 @@
 ---
  lib/libkvm/Makefile             |    2 +-
- lib/libkvm/kvm.c                |   10 ++++++++--
+ lib/libkvm/kvm.c                |   16 ++++++++++++----
+ lib/libkvm/kvm_amd64.c          |    9 +++++----
+ lib/libkvm/kvm_cptime.c         |    5 +++--
  lib/libkvm/kvm_file.c           |    8 +++++++-
- lib/libkvm/kvm_getloadavg.c     |    6 ++++++
- lib/libkvm/kvm_getswapinfo.c    |    2 ++
- lib/libkvm/kvm_minidump_amd64.c |    9 +++++++++
+ lib/libkvm/kvm_getloadavg.c     |   14 ++++++++++----
+ lib/libkvm/kvm_getswapinfo.c    |   13 +++++++++----
+ lib/libkvm/kvm_minidump_amd64.c |   10 ++++++++++
  lib/libkvm/kvm_minidump_i386.c  |   10 ++++++++++
+ lib/libkvm/kvm_pcpu.c           |    6 +++---
  lib/libkvm/kvm_private.h        |    4 ++--
- lib/libkvm/kvm_proc.c           |    3 +++
- 9 files changed, 48 insertions(+), 6 deletions(-)
+ lib/libkvm/kvm_proc.c           |   19 +++++++++++--------
+ 12 files changed, 83 insertions(+), 33 deletions(-)
 
-Index: b/lib/libkvm/Makefile
-===================================================================
 --- a/lib/libkvm/Makefile
 +++ b/lib/libkvm/Makefile
 @@ -2,8 +2,8 @@
@@ -24,8 +25,6 @@
  
  .if ${MACHINE} == "sun4v"
  CFLAGS+=-DSUN4V
-Index: b/lib/libkvm/kvm.c
-===================================================================
 --- a/lib/libkvm/kvm.c
 +++ b/lib/libkvm/kvm.c
 @@ -46,6 +46,7 @@
@@ -36,7 +35,7 @@
  
  #include <vm/vm.h>
  #include <vm/vm_param.h>
-@@ -58,11 +59,16 @@
+@@ -58,10 +59,17 @@
  #include <limits.h>
  #include <nlist.h>
  #include <paths.h>
@@ -45,15 +44,16 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
- 
++#include <bsd/string.h>
++#include <freebsd/paths.h>
++
 +#ifndef _PATH_FWMEM
 +#define _PATH_FWMEM     "/dev/fwmem"
 +#endif
-+
+ 
  #include "kvm_private.h"
  
- /* from src/lib/libc/gen/nlist.c */
-@@ -237,7 +243,7 @@
+@@ -237,7 +245,7 @@
  kvm_openfiles(uf, mf, sf, flag, errout)
  	const char *uf;
  	const char *mf;
@@ -62,7 +62,7 @@
  	int flag;
  	char *errout;
  {
-@@ -256,7 +262,7 @@
+@@ -256,7 +264,7 @@
  kvm_open(uf, mf, sf, flag, errstr)
  	const char *uf;
  	const char *mf;
@@ -71,8 +71,18 @@
  	int flag;
  	const char *errstr;
  {
-Index: b/lib/libkvm/kvm_file.c
-===================================================================
+@@ -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 @@
@@ -116,11 +126,9 @@
 +#endif
 +	return 0;
  }
-Index: b/lib/libkvm/kvm_getloadavg.c
-===================================================================
 --- a/lib/libkvm/kvm_getloadavg.c
 +++ b/lib/libkvm/kvm_getloadavg.c
-@@ -43,6 +43,7 @@
+@@ -43,15 +43,21 @@
  #include <limits.h>
  #include <nlist.h>
  #include <kvm.h>
@@ -128,23 +136,64 @@
  
  #include "kvm_private.h"
  
-@@ -54,6 +55,11 @@
- 	{ "" },
- };
- 
+ static struct nlist nl[] = {
+-	{ "_averunnable" },
++	{ { "_averunnable" } },
+ #define	X_AVERUNNABLE	0
+-	{ "_fscale" },
++	{ { "_fscale" } },
+ #define	X_FSCALE	1
+-	{ "" },
++	{ { "" } },
++};
++
 +struct loadavg {
 +	__fixpt_t       ldavg[3];
 +	long            fscale;
-+};
-+
+ };
+ 
  /*
-  * kvm_getloadavg() -- Get system load averages, from live or dead kernels.
-  *
-Index: b/lib/libkvm/kvm_getswapinfo.c
-===================================================================
+@@ -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
-@@ -209,8 +209,10 @@
+@@ -46,13 +46,16 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <limits.h>
++#include <bsd/string.h>
++
++#include <freebsd/paths.h>
+ 
+ #include "kvm_private.h"
+ 
+ static struct nlist kvm_swap_nl[] = {
+-	{ "_swtailq" },		/* list of swap devices and sizes */
+-	{ "_dmmax" },		/* maximum size of a swap block */
+-	{ NULL }
++	{ { "_swtailq" } },		/* list of swap devices and sizes */
++	{ { "_dmmax" } },		/* maximum size of a swap block */
++	{ { NULL } }
+ };
+ 
+ #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;
  			swap_ary[unswdev].ksw_flags = xsd.xsw_flags;
@@ -155,11 +204,17 @@
  		}
  		tot.ksw_total += ttl;
  		tot.ksw_used += xsd.xsw_used;
-Index: b/lib/libkvm/kvm_minidump_amd64.c
-===================================================================
 --- a/lib/libkvm/kvm_minidump_amd64.c
 +++ b/lib/libkvm/kvm_minidump_amd64.c
-@@ -99,6 +99,15 @@
+@@ -37,6 +37,7 @@
+ #include <sys/fnv_hash.h>
+ #include <stdlib.h>
+ #include <strings.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <nlist.h>
+ #include <kvm.h>
+@@ -99,6 +100,15 @@
  	return (-1);
  }
  
@@ -171,12 +226,10 @@
 +	__asm __volatile("bsfq %1,%0" : "=r" (result) : "rm" (mask));
 +	return (result);
 +}
-+                        
++
  static int
  inithash(kvm_t *kd, uint64_t *base, int len, off_t off)
  {
-Index: b/lib/libkvm/kvm_minidump_i386.c
-===================================================================
 --- a/lib/libkvm/kvm_minidump_i386.c
 +++ b/lib/libkvm/kvm_minidump_i386.c
 @@ -101,6 +101,16 @@
@@ -191,13 +244,11 @@
 +	__asm __volatile("bsfl %1,%0" : "=r" (result) : "rm" (mask));
 +	return (result);
 +}
-+                                                
 +
++
  static int
  inithash(kvm_t *kd, uint32_t *base, int len, off_t off)
  {
-Index: b/lib/libkvm/kvm_private.h
-===================================================================
 --- a/lib/libkvm/kvm_private.h
 +++ b/lib/libkvm/kvm_private.h
 @@ -68,7 +68,7 @@
@@ -218,8 +269,6 @@
  int	 _kvm_uvatop(kvm_t *, const struct proc *, u_long, u_long *);
  
  #if defined(__amd64__) || defined(__i386__)
-Index: b/lib/libkvm/kvm_proc.c
-===================================================================
 --- a/lib/libkvm/kvm_proc.c
 +++ b/lib/libkvm/kvm_proc.c
 @@ -53,7 +53,7 @@
@@ -248,3 +297,94 @@
  }
  
  /*
+@@ -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 @@
+ #include <sys/mman.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ #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 @@
+ #include <kvm.h>
+ #include <limits.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "kvm_private.h"
+ 
+ static struct nlist kvm_cp_time_nl[] = {
+-	{ "_cp_time" },			/* (deprecated) */
+-	{ NULL },
++	{ { "_cp_time" } },			/* (deprecated) */
++	{ { NULL } },
+ };
+ 
+ #define	NL_CP_TIME		0
+--- a/lib/libkvm/kvm_pcpu.c
++++ b/lib/libkvm/kvm_pcpu.c
+@@ -40,9 +40,9 @@
+ #include "kvm_private.h"
+ 
+ static struct nlist kvm_pcpu_nl[] = {
+-	{ "_cpuid_to_pcpu" },
+-	{ "_mp_maxcpus" },
+-	{ NULL },
++	{ { "_cpuid_to_pcpu" } },
++	{ { "_mp_maxcpus" } },
++	{ { NULL } },
+ };
+ 
+ /*

Modified: trunk/freebsd-libs/debian/patches/05_libipx.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/05_libipx.diff	2009-06-03 08:03:40 UTC (rev 2570)
+++ trunk/freebsd-libs/debian/patches/05_libipx.diff	2009-06-06 18:58:35 UTC (rev 2571)
@@ -5,7 +5,7 @@
 --- a/lib/libipx/Makefile
 +++ b/lib/libipx/Makefile
 @@ -1,6 +1,7 @@
- # $FreeBSD: src/lib/libipx/Makefile,v 1.7.28.1 2008/11/25 02:59:29 kensmith Exp $
+ # $FreeBSD: src/lib/libipx/Makefile,v 1.7.30.1 2009/04/15 03:14:26 kensmith Exp $
  
  LIB=	ipx
 +SHLIB_MAJOR=    2

Modified: trunk/freebsd-libs/debian/patches/06_libgeom.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/06_libgeom.diff	2009-06-03 08:03:40 UTC (rev 2570)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff	2009-06-06 18:58:35 UTC (rev 2571)
@@ -2,8 +2,9 @@
  lib/libgeom/Makefile        |    2 +-
  lib/libgeom/geom_ctl.c      |    3 +++
  lib/libgeom/geom_stats.c    |    2 +-
+ lib/libgeom/geom_util.c     |    1 +
  lib/libgeom/geom_xml2tree.c |    2 +-
- 4 files changed, 6 insertions(+), 3 deletions(-)
+ 5 files changed, 7 insertions(+), 3 deletions(-)
 
 --- a/lib/libgeom/Makefile
 +++ b/lib/libgeom/Makefile
@@ -54,3 +55,13 @@
  #include <libgeom.h>
  
  struct mystate {
+--- a/lib/libgeom/geom_util.c
++++ b/lib/libgeom/geom_util.c
+@@ -38,6 +38,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <paths.h>
++#include <bsd/string.h>
+ 
+ #include <libgeom.h>
+ 

Modified: trunk/freebsd-libs/debian/patches/07_libkiconv.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/07_libkiconv.diff	2009-06-03 08:03:40 UTC (rev 2570)
+++ trunk/freebsd-libs/debian/patches/07_libkiconv.diff	2009-06-06 18:58:35 UTC (rev 2571)
@@ -16,7 +16,7 @@
 +++ b/lib/libkiconv/quirks.h
 @@ -25,6 +25,7 @@
   *
-  * $FreeBSD: src/lib/libkiconv/quirks.h,v 1.1.28.1 2008/11/25 02:59:29 kensmith Exp $
+  * $FreeBSD: src/lib/libkiconv/quirks.h,v 1.1.30.1 2009/04/15 03:14:26 kensmith Exp $
   */
 +#include <stdint.h>
  

Modified: trunk/freebsd-libs/debian/patches/08_libdevstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_libdevstat.diff	2009-06-03 08:03:40 UTC (rev 2570)
+++ trunk/freebsd-libs/debian/patches/08_libdevstat.diff	2009-06-06 18:58:35 UTC (rev 2571)
@@ -1,7 +1,7 @@
 ---
  lib/libdevstat/Makefile  |    4 ++--
- lib/libdevstat/devstat.c |    6 +++++-
- 2 files changed, 7 insertions(+), 3 deletions(-)
+ lib/libdevstat/devstat.c |   10 +++++++---
+ 2 files changed, 9 insertions(+), 5 deletions(-)
 
 --- a/lib/libdevstat/Makefile
 +++ b/lib/libdevstat/Makefile
@@ -33,6 +33,17 @@
  
  #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