[Glibc-bsd-commits] r2408 - in trunk/freebsd-libs/debian: . patches
Aurelien Jarno
aurel32 at alioth.debian.org
Tue Apr 7 10:00:05 UTC 2009
Author: aurel32
Date: 2009-04-07 10:00:04 +0000 (Tue, 07 Apr 2009)
New Revision: 2408
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/patches/00_fbsdid.diff
trunk/freebsd-libs/debian/patches/00_kernel.diff
trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff
trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff
trunk/freebsd-libs/debian/patches/05_glibc_libipx.diff
trunk/freebsd-libs/debian/patches/06_libgeom.diff
trunk/freebsd-libs/debian/patches/07_libkiconv.diff
trunk/freebsd-libs/debian/patches/08_devstat.diff
trunk/freebsd-libs/debian/patches/09_libusbhid.diff
trunk/freebsd-libs/debian/patches/series
Log:
* Refresh all patches
* Change patch level to -p1.
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2009-04-07 09:53:29 UTC (rev 2407)
+++ trunk/freebsd-libs/debian/changelog 2009-04-07 10:00:04 UTC (rev 2408)
@@ -7,6 +7,7 @@
- Use quilt to manage patches.
- Remove build-depends on kfreebsd-source-7.1.
- Update patches accordingly.
+ * Change patch level to -p1.
-- Aurelien Jarno <aurel32 at debian.org> Sun, 05 Apr 2009 15:45:14 +0200
Modified: trunk/freebsd-libs/debian/patches/00_fbsdid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/00_fbsdid.diff 2009-04-07 09:53:29 UTC (rev 2407)
+++ trunk/freebsd-libs/debian/patches/00_fbsdid.diff 2009-04-07 10:00:04 UTC (rev 2408)
@@ -1,6 +1,52 @@
-diff -Nurd freebsd-libs-7.1.orig/lib/libcam/camlib.c freebsd-libs-7.1/lib/libcam/camlib.c
---- freebsd-libs-7.1.orig/lib/libcam/camlib.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libcam/camlib.c 2009-04-07 11:07:26 +0200
+---
+ 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_powerpc.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_ch.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 -
+ 44 files changed, 44 deletions(-)
+
+--- a/lib/libcam/camlib.c
++++ b/lib/libcam/camlib.c
@@ -24,7 +24,6 @@
*/
@@ -9,9 +55,8 @@
#include <sys/types.h>
#include <sys/param.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libcam/scsi_cmdparse.c freebsd-libs-7.1/lib/libcam/scsi_cmdparse.c
---- freebsd-libs-7.1.orig/lib/libcam/scsi_cmdparse.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libcam/scsi_cmdparse.c 2009-04-07 11:07:26 +0200
+--- a/lib/libcam/scsi_cmdparse.c
++++ b/lib/libcam/scsi_cmdparse.c
@@ -35,7 +35,6 @@
*/
@@ -20,9 +65,8 @@
#include <sys/types.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libdevstat/devstat.c freebsd-libs-7.1/lib/libdevstat/devstat.c
---- freebsd-libs-7.1.orig/lib/libdevstat/devstat.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libdevstat/devstat.c 2009-04-07 11:07:26 +0200
+--- a/lib/libdevstat/devstat.c
++++ b/lib/libdevstat/devstat.c
@@ -27,7 +27,6 @@
*/
@@ -31,9 +75,8 @@
#include <sys/types.h>
#include <sys/sysctl.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libgeom/geom_util.c freebsd-libs-7.1/lib/libgeom/geom_util.c
---- freebsd-libs-7.1.orig/lib/libgeom/geom_util.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libgeom/geom_util.c 2009-04-07 11:07:26 +0200
+--- a/lib/libgeom/geom_util.c
++++ b/lib/libgeom/geom_util.c
@@ -25,7 +25,6 @@
*/
@@ -42,9 +85,8 @@
#include <sys/param.h>
#include <sys/disk.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libipx/ipx_addr.c freebsd-libs-7.1/lib/libipx/ipx_addr.c
---- freebsd-libs-7.1.orig/lib/libipx/ipx_addr.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libipx/ipx_addr.c 2009-04-07 11:07:26 +0200
+--- a/lib/libipx/ipx_addr.c
++++ b/lib/libipx/ipx_addr.c
@@ -31,7 +31,6 @@
*/
@@ -53,9 +95,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)ipx_addr.c";
-diff -Nurd freebsd-libs-7.1.orig/lib/libipx/ipx_ntoa.c freebsd-libs-7.1/lib/libipx/ipx_ntoa.c
---- freebsd-libs-7.1.orig/lib/libipx/ipx_ntoa.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libipx/ipx_ntoa.c 2009-04-07 11:07:26 +0200
+--- a/lib/libipx/ipx_ntoa.c
++++ b/lib/libipx/ipx_ntoa.c
@@ -28,7 +28,6 @@
*/
@@ -64,20 +105,28 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)ipx_ntoa.c";
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_amd64.c freebsd-libs-7.1/lib/libkvm/kvm_amd64.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_amd64.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_amd64.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm.c
++++ b/lib/libkvm/kvm.c
@@ -32,7 +32,6 @@
*/
#include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.31.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #if defined(LIBC_SCCS) && !defined(lint)
+ #if 0
+--- a/lib/libkvm/kvm_amd64.c
++++ b/lib/libkvm/kvm_amd64.c
+@@ -32,7 +32,6 @@
+ */
+
+ #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.22.6.1 2008/11/25 02:59:29 kensmith Exp $");
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_arm.c freebsd-libs-7.1/lib/libkvm/kvm_arm.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_arm.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_arm.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm_arm.c
++++ b/lib/libkvm/kvm_arm.c
@@ -36,7 +36,6 @@
*/
@@ -86,20 +135,8 @@
#include <sys/param.h>
#include <sys/elf32.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm.c freebsd-libs-7.1/lib/libkvm/kvm.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm.c 2009-04-07 11:07:26 +0200
-@@ -32,7 +32,6 @@
- */
-
- #include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.31.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
-
- #if defined(LIBC_SCCS) && !defined(lint)
- #if 0
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_cptime.c freebsd-libs-7.1/lib/libkvm/kvm_cptime.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_cptime.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_cptime.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm_cptime.c
++++ b/lib/libkvm/kvm_cptime.c
@@ -29,7 +29,6 @@
*/
@@ -108,9 +145,8 @@
#include <sys/param.h>
#include <sys/pcpu.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_file.c freebsd-libs-7.1/lib/libkvm/kvm_file.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_file.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_file.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm_file.c
++++ b/lib/libkvm/kvm_file.c
@@ -28,7 +28,6 @@
*/
@@ -119,9 +155,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_getloadavg.c freebsd-libs-7.1/lib/libkvm/kvm_getloadavg.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_getloadavg.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_getloadavg.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm_getloadavg.c
++++ b/lib/libkvm/kvm_getloadavg.c
@@ -28,7 +28,6 @@
*/
@@ -130,9 +165,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_getswapinfo.c freebsd-libs-7.1/lib/libkvm/kvm_getswapinfo.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_getswapinfo.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_getswapinfo.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm_getswapinfo.c
++++ b/lib/libkvm/kvm_getswapinfo.c
@@ -25,7 +25,6 @@
*/
@@ -141,9 +175,8 @@
#include <sys/param.h>
#include <sys/time.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_i386.c freebsd-libs-7.1/lib/libkvm/kvm_i386.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_i386.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_i386.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm_i386.c
++++ b/lib/libkvm/kvm_i386.c
@@ -32,7 +32,6 @@
*/
@@ -152,9 +185,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_minidump_amd64.c freebsd-libs-7.1/lib/libkvm/kvm_minidump_amd64.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_minidump_amd64.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_minidump_amd64.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm_minidump_amd64.c
++++ b/lib/libkvm/kvm_minidump_amd64.c
@@ -24,7 +24,6 @@
*/
@@ -163,9 +195,8 @@
/*
* AMD64 machine dependent routines for kvm and minidumps.
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_minidump_i386.c freebsd-libs-7.1/lib/libkvm/kvm_minidump_i386.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_minidump_i386.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_minidump_i386.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm_minidump_i386.c
++++ b/lib/libkvm/kvm_minidump_i386.c
@@ -24,7 +24,6 @@
*/
@@ -174,9 +205,8 @@
/*
* AMD64 machine dependent routines for kvm and minidumps.
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_pcpu.c freebsd-libs-7.1/lib/libkvm/kvm_pcpu.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_pcpu.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_pcpu.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm_pcpu.c
++++ b/lib/libkvm/kvm_pcpu.c
@@ -29,7 +29,6 @@
*/
@@ -185,9 +215,8 @@
#include <sys/param.h>
#include <sys/pcpu.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_powerpc.c freebsd-libs-7.1/lib/libkvm/kvm_powerpc.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_powerpc.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_powerpc.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm_powerpc.c
++++ b/lib/libkvm/kvm_powerpc.c
@@ -36,7 +36,6 @@
*/
@@ -196,9 +225,8 @@
#include <sys/param.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_proc.c freebsd-libs-7.1/lib/libkvm/kvm_proc.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_proc.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_proc.c 2009-04-07 11:07:26 +0200
+--- a/lib/libkvm/kvm_proc.c
++++ b/lib/libkvm/kvm_proc.c
@@ -38,7 +38,6 @@
#endif
@@ -207,31 +235,28 @@
/*
* Proc traversal interface for kvm. ps and w are (probably) the exclusive
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_sparc64.c freebsd-libs-7.1/lib/libkvm/kvm_sparc64.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_sparc64.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_sparc64.c 2009-04-07 11:07:26 +0200
-@@ -34,7 +34,6 @@
+--- a/lib/libkvm/kvm_sparc.c
++++ b/lib/libkvm/kvm_sparc.c
+@@ -32,7 +32,6 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc64.c,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc.c,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $");
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
-diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_sparc.c freebsd-libs-7.1/lib/libkvm/kvm_sparc.c
---- freebsd-libs-7.1.orig/lib/libkvm/kvm_sparc.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libkvm/kvm_sparc.c 2009-04-07 11:07:26 +0200
-@@ -32,7 +32,6 @@
+--- a/lib/libkvm/kvm_sparc64.c
++++ b/lib/libkvm/kvm_sparc64.c
+@@ -34,7 +34,6 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc.c,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc64.c,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $");
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
-diff -Nurd freebsd-libs-7.1.orig/lib/libusbhid/data.c freebsd-libs-7.1/lib/libusbhid/data.c
---- freebsd-libs-7.1.orig/lib/libusbhid/data.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libusbhid/data.c 2009-04-07 11:07:26 +0200
+--- a/lib/libusbhid/data.c
++++ b/lib/libusbhid/data.c
@@ -27,7 +27,6 @@
*/
@@ -240,9 +265,8 @@
#include <assert.h>
#include <stdlib.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libusbhid/descr.c freebsd-libs-7.1/lib/libusbhid/descr.c
---- freebsd-libs-7.1.orig/lib/libusbhid/descr.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libusbhid/descr.c 2009-04-07 11:07:26 +0200
+--- a/lib/libusbhid/descr.c
++++ b/lib/libusbhid/descr.c
@@ -27,7 +27,6 @@
*/
@@ -251,9 +275,8 @@
#include <sys/types.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libusbhid/parse.c freebsd-libs-7.1/lib/libusbhid/parse.c
---- freebsd-libs-7.1.orig/lib/libusbhid/parse.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libusbhid/parse.c 2009-04-07 11:07:26 +0200
+--- a/lib/libusbhid/parse.c
++++ b/lib/libusbhid/parse.c
@@ -27,7 +27,6 @@
*/
@@ -262,9 +285,8 @@
#include <assert.h>
#include <stdlib.h>
-diff -Nurd freebsd-libs-7.1.orig/lib/libusbhid/usage.c freebsd-libs-7.1/lib/libusbhid/usage.c
---- freebsd-libs-7.1.orig/lib/libusbhid/usage.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/lib/libusbhid/usage.c 2009-04-07 11:07:26 +0200
+--- a/lib/libusbhid/usage.c
++++ b/lib/libusbhid/usage.c
@@ -27,7 +27,6 @@
*/
@@ -273,9 +295,8 @@
#include <assert.h>
#include <ctype.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/cam.c freebsd-libs-7.1/sys/cam/cam.c
---- freebsd-libs-7.1.orig/sys/cam/cam.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/cam.c 2009-04-07 11:07:27 +0200
+--- a/sys/cam/cam.c
++++ b/sys/cam/cam.c
@@ -27,7 +27,6 @@
*/
@@ -284,9 +305,8 @@
#include <sys/param.h>
#ifdef _KERNEL
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/cam_periph.c freebsd-libs-7.1/sys/cam/cam_periph.c
---- freebsd-libs-7.1.orig/sys/cam/cam_periph.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/cam_periph.c 2009-04-07 11:07:27 +0200
+--- a/sys/cam/cam_periph.c
++++ b/sys/cam/cam_periph.c
@@ -28,7 +28,6 @@
*/
@@ -295,9 +315,8 @@
#include <sys/param.h>
#include <sys/systm.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/cam_queue.c freebsd-libs-7.1/sys/cam/cam_queue.c
---- freebsd-libs-7.1.orig/sys/cam/cam_queue.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/cam_queue.c 2009-04-07 11:07:27 +0200
+--- a/sys/cam/cam_queue.c
++++ b/sys/cam/cam_queue.c
@@ -27,7 +27,6 @@
*/
@@ -306,9 +325,8 @@
#include <sys/param.h>
#include <sys/systm.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/cam_sim.c freebsd-libs-7.1/sys/cam/cam_sim.c
---- freebsd-libs-7.1.orig/sys/cam/cam_sim.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/cam_sim.c 2009-04-07 11:07:27 +0200
+--- a/sys/cam/cam_sim.c
++++ b/sys/cam/cam_sim.c
@@ -27,7 +27,6 @@
*/
@@ -317,9 +335,8 @@
#include <sys/param.h>
#include <sys/systm.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/cam_xpt.c freebsd-libs-7.1/sys/cam/cam_xpt.c
---- freebsd-libs-7.1.orig/sys/cam/cam_xpt.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/cam_xpt.c 2009-04-07 11:07:27 +0200
+--- a/sys/cam/cam_xpt.c
++++ b/sys/cam/cam_xpt.c
@@ -28,7 +28,6 @@
*/
@@ -328,9 +345,8 @@
#include <sys/param.h>
#include <sys/bus.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_all.c freebsd-libs-7.1/sys/cam/scsi/scsi_all.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_all.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_all.c 2009-04-07 11:07:26 +0200
+--- a/sys/cam/scsi/scsi_all.c
++++ b/sys/cam/scsi/scsi_all.c
@@ -28,7 +28,6 @@
*/
@@ -339,9 +355,8 @@
#include <sys/param.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_cd.c freebsd-libs-7.1/sys/cam/scsi/scsi_cd.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_cd.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_cd.c 2009-04-07 11:07:26 +0200
+--- a/sys/cam/scsi/scsi_cd.c
++++ b/sys/cam/scsi/scsi_cd.c
@@ -46,7 +46,6 @@
*/
@@ -350,9 +365,8 @@
#include "opt_cd.h"
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_ch.c freebsd-libs-7.1/sys/cam/scsi/scsi_ch.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_ch.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_ch.c 2009-04-07 11:07:26 +0200
+--- a/sys/cam/scsi/scsi_ch.c
++++ b/sys/cam/scsi/scsi_ch.c
@@ -68,7 +68,6 @@
*/
@@ -361,9 +375,8 @@
#include <sys/param.h>
#include <sys/queue.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_da.c freebsd-libs-7.1/sys/cam/scsi/scsi_da.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_da.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_da.c 2009-04-07 11:07:26 +0200
+--- a/sys/cam/scsi/scsi_da.c
++++ b/sys/cam/scsi/scsi_da.c
@@ -27,7 +27,6 @@
*/
@@ -372,9 +385,8 @@
#include <sys/param.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_low.c freebsd-libs-7.1/sys/cam/scsi/scsi_low.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_low.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_low.c 2009-04-07 11:07:26 +0200
+--- a/sys/cam/scsi/scsi_low.c
++++ b/sys/cam/scsi/scsi_low.c
@@ -2,7 +2,6 @@
/* $NetBSD$ */
@@ -383,9 +395,8 @@
#define SCSI_LOW_STATICS
#define SCSI_LOW_DEBUG
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_low_pisa.c freebsd-libs-7.1/sys/cam/scsi/scsi_low_pisa.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_low_pisa.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_low_pisa.c 2009-04-07 11:07:26 +0200
+--- a/sys/cam/scsi/scsi_low_pisa.c
++++ b/sys/cam/scsi/scsi_low_pisa.c
@@ -32,7 +32,6 @@
*/
@@ -394,9 +405,8 @@
#ifdef __NetBSD__
#include <sys/param.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_pass.c freebsd-libs-7.1/sys/cam/scsi/scsi_pass.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_pass.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_pass.c 2009-04-07 11:07:26 +0200
+--- a/sys/cam/scsi/scsi_pass.c
++++ b/sys/cam/scsi/scsi_pass.c
@@ -26,7 +26,6 @@
*/
@@ -405,9 +415,8 @@
#include <sys/param.h>
#include <sys/systm.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_pt.c freebsd-libs-7.1/sys/cam/scsi/scsi_pt.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_pt.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_pt.c 2009-04-07 11:07:26 +0200
+--- a/sys/cam/scsi/scsi_pt.c
++++ b/sys/cam/scsi/scsi_pt.c
@@ -27,7 +27,6 @@
*/
@@ -416,9 +425,8 @@
#include <sys/param.h>
#include <sys/queue.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_sa.c freebsd-libs-7.1/sys/cam/scsi/scsi_sa.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_sa.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_sa.c 2009-04-07 11:07:27 +0200
+--- a/sys/cam/scsi/scsi_sa.c
++++ b/sys/cam/scsi/scsi_sa.c
@@ -27,7 +27,6 @@
*/
@@ -427,9 +435,8 @@
#include <sys/param.h>
#include <sys/queue.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_ses.c freebsd-libs-7.1/sys/cam/scsi/scsi_ses.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_ses.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_ses.c 2009-04-07 11:07:27 +0200
+--- a/sys/cam/scsi/scsi_ses.c
++++ b/sys/cam/scsi/scsi_ses.c
@@ -25,7 +25,6 @@
*/
@@ -438,9 +445,8 @@
#include <sys/param.h>
#include <sys/queue.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_sg.c freebsd-libs-7.1/sys/cam/scsi/scsi_sg.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_sg.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_sg.c 2009-04-07 11:07:27 +0200
+--- a/sys/cam/scsi/scsi_sg.c
++++ b/sys/cam/scsi/scsi_sg.c
@@ -30,7 +30,6 @@
*/
@@ -449,9 +455,8 @@
#include <sys/param.h>
#include <sys/systm.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_targ_bh.c freebsd-libs-7.1/sys/cam/scsi/scsi_targ_bh.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_targ_bh.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_targ_bh.c 2009-04-07 11:07:27 +0200
+--- a/sys/cam/scsi/scsi_targ_bh.c
++++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -27,7 +27,6 @@
*/
@@ -460,9 +465,8 @@
#include <sys/param.h>
#include <sys/queue.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_target.c freebsd-libs-7.1/sys/cam/scsi/scsi_target.c
---- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_target.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/cam/scsi/scsi_target.c 2009-04-07 11:07:27 +0200
+--- a/sys/cam/scsi/scsi_target.c
++++ b/sys/cam/scsi/scsi_target.c
@@ -28,7 +28,6 @@
*/
@@ -471,9 +475,8 @@
#include <sys/param.h>
-diff -Nurd freebsd-libs-7.1.orig/sys/kern/subr_sbuf.c freebsd-libs-7.1/sys/kern/subr_sbuf.c
---- freebsd-libs-7.1.orig/sys/kern/subr_sbuf.c 2008-11-25 03:59:29 +0100
-+++ freebsd-libs-7.1/sys/kern/subr_sbuf.c 2009-04-07 11:07:27 +0200
+--- a/sys/kern/subr_sbuf.c
++++ b/sys/kern/subr_sbuf.c
@@ -27,7 +27,6 @@
*/
Modified: trunk/freebsd-libs/debian/patches/00_kernel.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/00_kernel.diff 2009-04-07 09:53:29 UTC (rev 2407)
+++ trunk/freebsd-libs/debian/patches/00_kernel.diff 2009-04-07 10:00:04 UTC (rev 2408)
@@ -1,6 +1,13 @@
---- a/sys/cam/cam.c 2003-06-15 00:17:38.000000000 +0200
-+++ b/sys/cam/cam.c 2005-08-15 08:18:42.000000000 +0200
-@@ -37,6 +37,7 @@
+---
+ sys/cam/cam.c | 1 +
+ sys/cam/cam_xpt.c | 2 +-
+ sys/cam/scsi/scsi_all.c | 1 +
+ sys/cam/scsi/scsi_all.h | 2 ++
+ 4 files changed, 5 insertions(+), 1 deletion(-)
+
+--- a/sys/cam/cam.c
++++ b/sys/cam/cam.c
+@@ -35,6 +35,7 @@
#include <sys/sysctl.h>
#else /* _KERNEL */
#include <stdlib.h>
@@ -8,9 +15,20 @@
#include <stdio.h>
#endif /* _KERNEL */
---- a/sys/cam/scsi/scsi_all.c 2004-08-13 20:45:04.000000000 +0200
-+++ b/sys/cam/scsi/scsi_all.c 2005-08-15 08:21:32.000000000 +0200
-@@ -41,6 +41,7 @@
+--- a/sys/cam/cam_xpt.c
++++ b/sys/cam/cam_xpt.c
+@@ -779,7 +779,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;
+-static void xpt_release_simq_timeout(void *arg) __unused;
++static void xpt_release_simq_timeout(void *arg);
+ static void xpt_release_bus(struct cam_eb *bus);
+ static void xpt_release_devq_device(struct cam_ed *dev, u_int count,
+ int run_queue);
+--- a/sys/cam/scsi/scsi_all.c
++++ b/sys/cam/scsi/scsi_all.c
+@@ -40,6 +40,7 @@
#include <sys/sysctl.h>
#else
#include <errno.h>
@@ -18,8 +36,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
---- a/sys/cam/scsi/scsi_all.h 2003-04-30 02:35:22.000000000 +0200
-+++ b/sys/cam/scsi/scsi_all.h 2005-08-15 08:22:30.000000000 +0200
+--- a/sys/cam/scsi/scsi_all.h
++++ b/sys/cam/scsi/scsi_all.h
@@ -32,6 +32,8 @@
* bus reset.
*/
@@ -29,14 +47,3 @@
#endif /* _KERNEL */
/*
---- a/sys/cam/cam_xpt.c.orig 2009-04-07 11:48:37 +0200
-+++ b/sys/cam/cam_xpt.c 2009-04-07 11:48:51 +0200
-@@ -779,7 +779,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;
--static void xpt_release_simq_timeout(void *arg) __unused;
-+static void xpt_release_simq_timeout(void *arg);
- static void xpt_release_bus(struct cam_eb *bus);
- static void xpt_release_devq_device(struct cam_ed *dev, u_int count,
- int run_queue);
Modified: trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff 2009-04-07 09:53:29 UTC (rev 2407)
+++ trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff 2009-04-07 10:00:04 UTC (rev 2408)
@@ -1,6 +1,10 @@
-diff -ur lib.old/libcam/Makefile lib/libcam/Makefile
---- lib.old/libcam/Makefile 2006-04-19 09:40:00.000000000 +0200
-+++ lib/libcam/Makefile 2006-04-19 09:40:19.000000000 +0200
+---
+ lib/libcam/Makefile | 3 +--
+ lib/libcam/camlib.h | 9 +++------
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+--- a/lib/libcam/Makefile
++++ b/lib/libcam/Makefile
@@ -5,8 +5,7 @@
SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c
INCS= camlib.h
@@ -11,9 +15,8 @@
MAN= cam.3 cam_cdbparse.3
-diff -ur lib.old/libcam/camlib.h lib/libcam/camlib.h
---- lib.old/libcam/camlib.h 2006-04-19 09:40:00.000000000 +0200
-+++ lib/libcam/camlib.h 2006-04-19 09:38:34.000000000 +0200
+--- a/lib/libcam/camlib.h
++++ b/lib/libcam/camlib.h
@@ -150,13 +150,11 @@
/*
* Buffer encoding/decoding routines, from the old SCSI library.
@@ -40,4 +43,3 @@
int buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
int (*arg_get)(void *hook, char *field_name),
void *gethook);
-
Modified: trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff 2009-04-07 09:53:29 UTC (rev 2407)
+++ trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff 2009-04-07 10:00:04 UTC (rev 2408)
@@ -1,18 +1,30 @@
-diff -ur lib.old/libkvm/Makefile lib/libkvm/Makefile
---- lib.old/libkvm/Makefile 2006-04-19 09:43:10.000000000 +0200
-+++ lib/libkvm/Makefile 2006-04-19 09:42:15.000000000 +0200
-@@ -3,7 +3,6 @@
+---
+ lib/libkvm/Makefile | 2 +-
+ lib/libkvm/kvm.c | 10 ++++++++--
+ 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_minidump_i386.c | 10 ++++++++++
+ lib/libkvm/kvm_private.h | 4 ++--
+ lib/libkvm/kvm_proc.c | 3 +++
+ 9 files changed, 48 insertions(+), 6 deletions(-)
+
+--- a/lib/libkvm/Makefile
++++ b/lib/libkvm/Makefile
+@@ -2,8 +2,8 @@
+ # $FreeBSD: src/lib/libkvm/Makefile,v 1.17.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
LIB= kvm
++LDADD= -lbsd -lfreebsd
SHLIBDIR?= /lib
-CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
.if ${MACHINE} == "sun4v"
CFLAGS+=-DSUN4V
-diff -ur lib.old/libkvm/kvm.c lib/libkvm/kvm.c
---- lib.old/libkvm/kvm.c 2006-04-19 09:43:10.000000000 +0200
-+++ lib/libkvm/kvm.c 2006-04-19 09:38:34.000000000 +0200
-@@ -50,6 +50,7 @@
+--- a/lib/libkvm/kvm.c
++++ b/lib/libkvm/kvm.c
+@@ -46,6 +46,7 @@
#include <sys/stat.h>
#include <sys/sysctl.h>
#include <sys/linker.h>
@@ -20,7 +32,7 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
-@@ -62,11 +63,16 @@
+@@ -58,11 +59,16 @@
#include <limits.h>
#include <nlist.h>
#include <paths.h>
@@ -37,10 +49,27 @@
#include "kvm_private.h"
/* from src/lib/libc/gen/nlist.c */
-diff -ur lib.old/libkvm/kvm_file.c lib/libkvm/kvm_file.c
---- lib.old/libkvm/kvm_file.c 2006-04-19 09:43:10.000000000 +0200
-+++ lib/libkvm/kvm_file.c 2006-04-19 09:38:34.000000000 +0200
-@@ -63,7 +63,7 @@
+@@ -237,7 +243,7 @@
+ kvm_openfiles(uf, mf, sf, flag, errout)
+ const char *uf;
+ const char *mf;
+- const char *sf __unused;
++ const char *sf;
+ int flag;
+ char *errout;
+ {
+@@ -256,7 +262,7 @@
+ kvm_open(uf, mf, sf, flag, errstr)
+ const char *uf;
+ const char *mf;
+- const char *sf __unused;
++ const char *sf;
+ int flag;
+ const char *errstr;
+ {
+--- a/lib/libkvm/kvm_file.c
++++ b/lib/libkvm/kvm_file.c
+@@ -59,7 +59,7 @@
#include <sys/sysctl.h>
#include <limits.h>
@@ -49,7 +78,7 @@
#include <paths.h>
#include "kvm_private.h"
-@@ -80,6 +80,7 @@
+@@ -76,6 +76,7 @@
int op, arg, nfiles;
long filehead_o;
{
@@ -57,7 +86,7 @@
int buflen = kd->arglen, n = 0;
struct file *fp;
char *where = kd->argspc;
-@@ -117,6 +118,8 @@
+@@ -113,6 +114,8 @@
return (0);
}
return (nfiles);
@@ -66,7 +95,7 @@
}
char *
-@@ -125,6 +128,7 @@
+@@ -121,6 +124,7 @@
int op, arg;
int *cnt;
{
@@ -74,17 +103,16 @@
int mib[2], st, nfiles;
size_t size;
struct file *fp, *fplim;
-@@ -188,4 +192,6 @@
+@@ -184,4 +188,6 @@
}
*cnt = nfiles;
return (kd->argspc);
+#endif
+ return 0;
}
-diff -ur lib.old/libkvm/kvm_getloadavg.c lib/libkvm/kvm_getloadavg.c
---- lib.old/libkvm/kvm_getloadavg.c 2006-04-19 09:43:10.000000000 +0200
-+++ lib/libkvm/kvm_getloadavg.c 2006-04-19 09:38:34.000000000 +0200
-@@ -47,6 +47,7 @@
+--- a/lib/libkvm/kvm_getloadavg.c
++++ b/lib/libkvm/kvm_getloadavg.c
+@@ -43,6 +43,7 @@
#include <limits.h>
#include <nlist.h>
#include <kvm.h>
@@ -92,7 +120,7 @@
#include "kvm_private.h"
-@@ -58,6 +59,11 @@
+@@ -54,6 +55,11 @@
{ "" },
};
@@ -104,10 +132,9 @@
/*
* kvm_getloadavg() -- Get system load averages, from live or dead kernels.
*
-diff -ur lib.old/libkvm/kvm_getswapinfo.c lib/libkvm/kvm_getswapinfo.c
---- lib.old/libkvm/kvm_getswapinfo.c 2006-04-19 09:43:10.000000000 +0200
-+++ lib/libkvm/kvm_getswapinfo.c 2006-04-19 09:38:34.000000000 +0200
-@@ -150,8 +150,10 @@
+--- a/lib/libkvm/kvm_getswapinfo.c
++++ b/lib/libkvm/kvm_getswapinfo.c
+@@ -209,8 +209,10 @@
swap_ary[unswdev].ksw_total = ttl;
swap_ary[unswdev].ksw_used = xsd.xsw_used;
swap_ary[unswdev].ksw_flags = xsd.xsw_flags;
@@ -118,10 +145,9 @@
}
tot.ksw_total += ttl;
tot.ksw_used += xsd.xsw_used;
-diff -ur lib.old/libkvm/kvm_minidump_amd64.c lib/libkvm/kvm_minidump_amd64.c
---- lib.old/libkvm/kvm_minidump_amd64.c 2007-01-12 23:21:02.000000000 +0100
-+++ lib/libkvm/kvm_minidump_amd64.c 2007-01-12 23:21:02.000000000 +0100
-@@ -98,6 +98,15 @@
+--- a/lib/libkvm/kvm_minidump_amd64.c
++++ b/lib/libkvm/kvm_minidump_amd64.c
+@@ -99,6 +99,15 @@
return (-1);
}
@@ -137,10 +163,9 @@
static int
inithash(kvm_t *kd, uint64_t *base, int len, off_t off)
{
-diff -ur lib.old/libkvm/kvm_minidump_i386.c lib/libkvm/kvm_minidump_i386.c
---- lib.old/libkvm/kvm_minidump_i386.c 2007-01-12 23:06:57.000000000 +0100
-+++ lib/libkvm/kvm_minidump_i386.c 2007-01-12 23:06:57.000000000 +0100
-@@ -100,6 +100,16 @@
+--- a/lib/libkvm/kvm_minidump_i386.c
++++ b/lib/libkvm/kvm_minidump_i386.c
+@@ -101,6 +101,16 @@
return (-1);
}
@@ -157,10 +182,9 @@
static int
inithash(kvm_t *kd, uint32_t *base, int len, off_t off)
{
-diff -ur lib.old/libkvm/kvm_private.h lib/libkvm/kvm_private.h
---- lib.old/libkvm/kvm_private.h 2006-04-19 09:43:10.000000000 +0200
-+++ lib/libkvm/kvm_private.h 2006-04-19 09:38:34.000000000 +0200
-@@ -71,7 +71,7 @@
+--- a/lib/libkvm/kvm_private.h
++++ b/lib/libkvm/kvm_private.h
+@@ -68,7 +68,7 @@
* Functions used internally by kvm, but across kvm modules.
*/
void _kvm_err(kvm_t *kd, const char *program, const char *fmt, ...)
@@ -169,17 +193,18 @@
void _kvm_freeprocs(kvm_t *kd);
void _kvm_freevtop(kvm_t *);
int _kvm_initvtop(kvm_t *);
-@@ -79,5 +79,5 @@
+@@ -76,7 +76,7 @@
void *_kvm_malloc(kvm_t *kd, size_t);
void *_kvm_realloc(kvm_t *kd, void *, size_t);
void _kvm_syserr (kvm_t *kd, const char *program, const char *fmt, ...)
- __printflike(3, 4);
+ __attribute__((format(printf,3,4)));
int _kvm_uvatop(kvm_t *, const struct proc *, u_long, u_long *);
-diff -ur lib.old/libkvm/kvm_proc.c lib/libkvm/kvm_proc.c
---- lib.old/libkvm/kvm_proc.c 2006-04-19 09:43:10.000000000 +0200
-+++ lib/libkvm/kvm_proc.c 2006-04-19 09:38:34.000000000 +0200
-@@ -93,6 +93,7 @@
+
+ #if defined(__amd64__) || defined(__i386__)
+--- a/lib/libkvm/kvm_proc.c
++++ b/lib/libkvm/kvm_proc.c
+@@ -99,6 +99,7 @@
struct kinfo_proc *bp;
int maxcnt;
{
@@ -187,7 +212,7 @@
int cnt = 0;
struct kinfo_proc kinfo_proc, *kp;
struct pgrp pgrp;
-@@ -413,6 +414,8 @@
+@@ -418,6 +419,8 @@
++cnt;
}
return (cnt);
@@ -196,33 +221,3 @@
}
/*
---- lib/libkvm/kvm.c.orig 2009-04-07 11:40:09 +0200
-+++ lib/libkvm/kvm.c 2009-04-07 11:40:32 +0200
-@@ -243,7 +243,7 @@
- kvm_openfiles(uf, mf, sf, flag, errout)
- const char *uf;
- const char *mf;
-- const char *sf __unused;
-+ const char *sf;
- int flag;
- char *errout;
- {
-@@ -262,7 +262,7 @@
- kvm_open(uf, mf, sf, flag, errstr)
- const char *uf;
- const char *mf;
-- const char *sf __unused;
-+ const char *sf;
- int flag;
- const char *errstr;
- {
---- lib/libkvm/Makefile.orig 2009-04-07 11:42:07 +0200
-+++ lib/libkvm/Makefile 2009-04-07 11:42:27 +0200
-@@ -2,6 +2,7 @@
- # $FreeBSD: src/lib/libkvm/Makefile,v 1.17.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
-
- LIB= kvm
-+LDADD= -lbsd -lfreebsd
- SHLIBDIR?= /lib
-
- .if ${MACHINE} == "sun4v"
Modified: trunk/freebsd-libs/debian/patches/05_glibc_libipx.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/05_glibc_libipx.diff 2009-04-07 09:53:29 UTC (rev 2407)
+++ trunk/freebsd-libs/debian/patches/05_glibc_libipx.diff 2009-04-07 10:00:04 UTC (rev 2408)
@@ -1,8 +1,11 @@
-diff -ur lib.old/libipx/Makefile lib/libipx/Makefile
---- lib.old/libipx/Makefile 2006-04-19 09:43:54.000000000 +0200
-+++ lib/libipx/Makefile 2006-04-19 09:38:34.000000000 +0200
+---
+ lib/libipx/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/lib/libipx/Makefile
++++ b/lib/libipx/Makefile
@@ -1,6 +1,7 @@
- # $FreeBSD: src/lib/libipx/Makefile,v 1.7 2003/08/18 15:25:38 obrien Exp $
+ # $FreeBSD: src/lib/libipx/Makefile,v 1.7.28.1 2008/11/25 02:59:29 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-04-07 09:53:29 UTC (rev 2407)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff 2009-04-07 10:00:04 UTC (rev 2408)
@@ -1,7 +1,13 @@
-diff -ur lib.old/libgeom/Makefile lib/libgeom/Makefile
---- lib.old/libgeom/Makefile 2006-04-18 19:56:50.000000000 +0200
-+++ lib/libgeom/Makefile 2006-04-18 19:57:22.000000000 +0200
-@@ -13,7 +13,7 @@
+---
+ lib/libgeom/Makefile | 2 +-
+ lib/libgeom/geom_ctl.c | 3 +++
+ lib/libgeom/geom_stats.c | 2 +-
+ lib/libgeom/geom_xml2tree.c | 2 +-
+ 4 files changed, 6 insertions(+), 3 deletions(-)
+
+--- a/lib/libgeom/Makefile
++++ b/lib/libgeom/Makefile
+@@ -14,7 +14,7 @@
WARNS?= 3
DPADD= ${LIBBSDXML} ${LIBSBUF}
@@ -10,9 +16,8 @@
MAN= libgeom.3
-diff -ur lib.old/libgeom/geom_ctl.c lib/libgeom/geom_ctl.c
---- lib.old/libgeom/geom_ctl.c 2006-04-18 19:56:50.000000000 +0200
-+++ lib/libgeom/geom_ctl.c 2006-04-18 19:57:22.000000000 +0200
+--- a/lib/libgeom/geom_ctl.c
++++ b/lib/libgeom/geom_ctl.c
@@ -158,6 +158,9 @@
ap->name = strdup(name);
gctl_check_alloc(req, ap->name);
@@ -23,9 +28,8 @@
ap->value = __DECONST(void *, value);
ap->flag = GCTL_PARAM_RD;
if (len >= 0)
-diff -ur lib.old/libgeom/geom_stats.c lib/libgeom/geom_stats.c
---- lib.old/libgeom/geom_stats.c 2006-04-18 19:56:50.000000000 +0200
-+++ lib/libgeom/geom_stats.c 2006-04-18 19:57:22.000000000 +0200
+--- a/lib/libgeom/geom_stats.c
++++ b/lib/libgeom/geom_stats.c
@@ -34,11 +34,11 @@
#include <fcntl.h>
#include <stdlib.h>
@@ -39,9 +43,8 @@
#include <sys/types.h>
#include <sys/devicestat.h>
-diff -ur lib.old/libgeom/geom_xml2tree.c lib/libgeom/geom_xml2tree.c
---- lib.old/libgeom/geom_xml2tree.c 2006-04-18 19:56:50.000000000 +0200
-+++ lib/libgeom/geom_xml2tree.c 2006-04-18 19:57:22.000000000 +0200
+--- a/lib/libgeom/geom_xml2tree.c
++++ b/lib/libgeom/geom_xml2tree.c
@@ -43,7 +43,7 @@
#include <sys/sbuf.h>
#include <sys/sysctl.h>
Modified: trunk/freebsd-libs/debian/patches/07_libkiconv.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/07_libkiconv.diff 2009-04-07 09:53:29 UTC (rev 2407)
+++ trunk/freebsd-libs/debian/patches/07_libkiconv.diff 2009-04-07 10:00:04 UTC (rev 2408)
@@ -1,19 +1,24 @@
---- lib.old/libkiconv/quirks.h 2006-05-03 22:13:59.000000000 +0200
-+++ lib/libkiconv/quirks.h 2006-05-03 22:15:09.000000000 +0200
+---
+ lib/libkiconv/Makefile | 1 +
+ lib/libkiconv/quirks.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/lib/libkiconv/Makefile
++++ b/lib/libkiconv/Makefile
+@@ -14,5 +14,6 @@
+ kiconv.3 kiconv_add_xlat16_table.3
+
+ CFLAGS+= -I${.CURDIR}/../../sys
++LDADD= -ldl -lfreebsd
+
+ .include <bsd.lib.mk>
+--- a/lib/libkiconv/quirks.h
++++ b/lib/libkiconv/quirks.h
@@ -25,6 +25,7 @@
*
- * $FreeBSD: src/lib/libkiconv/quirks.h,v 1.1 2003/09/26 20:26:20 fjoe Exp $
+ * $FreeBSD: src/lib/libkiconv/quirks.h,v 1.1.28.1 2008/11/25 02:59:29 kensmith Exp $
*/
+#include <stdint.h>
#ifndef _KICONV_QUIRKS_H_
#define _KICONV_QUIRKS_H_
---- lib/libkiconv/Makefile~ 2006-05-04 17:21:35.000000000 +0200
-+++ lib/libkiconv/Makefile 2006-05-04 17:22:35.000000000 +0200
-@@ -14,5 +14,6 @@
- kiconv.3 kiconv_add_xlat16_table.3
-
- CFLAGS+= -I${.CURDIR}/../../sys
-+LDADD= -ldl -lfreebsd
-
- .include <bsd.lib.mk>
Modified: trunk/freebsd-libs/debian/patches/08_devstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_devstat.diff 2009-04-07 09:53:29 UTC (rev 2407)
+++ trunk/freebsd-libs/debian/patches/08_devstat.diff 2009-04-07 10:00:04 UTC (rev 2408)
@@ -1,6 +1,10 @@
-diff -u lib.old/libdevstat/Makefile lib/libdevstat/Makefile
---- lib.old/libdevstat/Makefile 2007-12-18 15:47:44.000000000 +0100
-+++ lib/libdevstat/Makefile 2007-12-18 16:11:58.000000000 +0100
+---
+ lib/libdevstat/Makefile | 4 ++--
+ lib/libdevstat/devstat.c | 6 +++++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+--- a/lib/libdevstat/Makefile
++++ b/lib/libdevstat/Makefile
@@ -8,7 +8,7 @@
INCS= devstat.h
@@ -19,9 +23,8 @@
WARNS?= 2
-diff -u lib.old/libdevstat/devstat.c lib/libdevstat/devstat.c
---- lib.old/libdevstat/devstat.c 2007-12-18 15:47:44.000000000 +0100
-+++ lib/libdevstat/devstat.c 2007-12-18 15:57:12.000000000 +0100
+--- a/lib/libdevstat/devstat.c
++++ b/lib/libdevstat/devstat.c
@@ -44,6 +44,7 @@
#include <stdarg.h>
#include <kvm.h>
@@ -38,7 +41,7 @@
if ((num_devs = devstat_getnumdevs(kd)) <= 0)
return(NULL);
-@@ -1616,9 +1618,11 @@
+@@ -1615,9 +1617,11 @@
return(NULL);
}
nds = &ds;
Modified: trunk/freebsd-libs/debian/patches/09_libusbhid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/09_libusbhid.diff 2009-04-07 09:53:29 UTC (rev 2407)
+++ trunk/freebsd-libs/debian/patches/09_libusbhid.diff 2009-04-07 10:00:04 UTC (rev 2408)
@@ -1,5 +1,9 @@
---- lib/libusbhid/Makefile.orig 2009-04-07 11:33:47 +0200
-+++ lib/libusbhid/Makefile 2009-04-07 11:35:09 +0200
+---
+ lib/libusbhid/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/lib/libusbhid/Makefile
++++ b/lib/libusbhid/Makefile
@@ -4,6 +4,7 @@
LIB= usbhid
MAN= usbhid.3
Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series 2009-04-07 09:53:29 UTC (rev 2407)
+++ trunk/freebsd-libs/debian/patches/series 2009-04-07 10:00:04 UTC (rev 2408)
@@ -1,9 +1,9 @@
00_fbsdid.diff
00_kernel.diff
-01_glibc_libcam.diff -p0
-04_glibc_libkvm.diff -p0
-05_glibc_libipx.diff -p0
-06_libgeom.diff -p0
-07_libkiconv.diff -p0
-08_devstat.diff -p0
-09_libusbhid.diff -p0
+01_glibc_libcam.diff
+04_glibc_libkvm.diff
+05_glibc_libipx.diff
+06_libgeom.diff
+07_libkiconv.diff
+08_devstat.diff
+09_libusbhid.diff
More information about the Glibc-bsd-commits
mailing list