[Glibc-bsd-commits] r2487 - in trunk/freebsd-libs/debian: . patches
Petr Salinger
ps-guest at alioth.debian.org
Mon May 4 10:59:28 UTC 2009
Author: ps-guest
Date: 2009-05-04 10:59:27 +0000 (Mon, 04 May 2009)
New Revision: 2487
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/freebsd-libs/debian/patches/00_fbsdid.diff
trunk/freebsd-libs/debian/patches/04_libkvm.diff
trunk/freebsd-libs/debian/rules
Log:
freebsd-libs based on FreeBSD 7.2
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2009-05-04 10:58:31 UTC (rev 2486)
+++ trunk/freebsd-libs/debian/changelog 2009-05-04 10:59:27 UTC (rev 2487)
@@ -1,11 +1,15 @@
-freebsd-libs (7.1-3) UNRELEASED; urgency=low
+freebsd-libs (7.2-1) UNSTABLE; urgency=low
+ [ Guillem Jover ]
* Use $(filter ...) instead of $(findstring ...) to extract space separated
options from DEB_BUILD_OPTIONS.
* Line wrap Build-Depends and Depends fields longer than 80 chars.
- -- Guillem Jover <guillem at debian.org> Sat, 18 Apr 2009 01:52:52 +0200
+ [ Petr Salinger ]
+ * based on FreeBSD 7.2
+ -- Guillem Jover <guillem at debian.org> Mon, 04 May 2009 12:00:00 +0200
+
freebsd-libs (7.1-2) unstable; urgency=low
* Upload to unstable.
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2009-05-04 10:58:31 UTC (rev 2486)
+++ trunk/freebsd-libs/debian/control 2009-05-04 10:59:27 UTC (rev 2487)
@@ -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,
- libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.31), libexpat-dev
+ libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.34), libexpat-dev
# libexpat-dev: aka bsdxml. needed by libgeom
Standards-Version: 3.8.1
Modified: trunk/freebsd-libs/debian/patches/00_fbsdid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/00_fbsdid.diff 2009-05-04 10:58:31 UTC (rev 2486)
+++ trunk/freebsd-libs/debian/patches/00_fbsdid.diff 2009-05-04 10:59:27 UTC (rev 2487)
@@ -1,465 +1,510 @@
----
- 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(-)
+ equal to:
+
+ 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
+===================================================================
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -24,7 +24,6 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.16.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.16.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libcam/scsi_cmdparse.c,v 1.7.32.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libcam/scsi_cmdparse.c,v 1.7.34.1 2009/04/15 03:14:26 kensmith Exp $");
#include <sys/types.h>
+Index: b/lib/libdevstat/devstat.c
+===================================================================
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
@@ -27,7 +27,6 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.29.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.29.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.1.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libipx/ipx_addr.c,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libipx/ipx_addr.c,v 1.9.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libipx/ipx_ntoa.c,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libipx/ipx_ntoa.c,v 1.7.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#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 $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.31.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#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 $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.22.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_arm.c,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_arm.c,v 1.4.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_cptime.c,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_cptime.c,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_file.c,v 1.18.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_file.c,v 1.18.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getloadavg.c,v 1.10.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getloadavg.c,v 1.10.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getswapinfo.c,v 1.27.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getswapinfo.c,v 1.27.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.21.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.21.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_amd64.c,v 1.2.8.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_amd64.c,v 1.2.10.1 2009/04/15 03:14:26 kensmith Exp $");
/*
* 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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_i386.c,v 1.2.8.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_i386.c,v 1.2.10.1 2009/04/15 03:14:26 kensmith Exp $");
/*
* 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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_pcpu.c,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_pcpu.c,v 1.1.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
#endif
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.94.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.94.2.1.2.1 2009/04/15 03:14:26 kensmith Exp $");
/*
* 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 @@
*/
#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_sparc.c,v 1.7.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#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_sparc64.c,v 1.9.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.6.30.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.6.32.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.8.30.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.8.32.1 2009/04/15 03:14:26 kensmith Exp $");
#include <sys/types.h>
+Index: b/lib/libusbhid/parse.c
+===================================================================
--- a/lib/libusbhid/parse.c
+++ b/lib/libusbhid/parse.c
@@ -27,7 +27,6 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libusbhid/parse.c,v 1.10.26.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libusbhid/parse.c,v 1.10.28.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/lib/libusbhid/usage.c,v 1.8.30.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/lib/libusbhid/usage.c,v 1.8.32.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.11.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.11.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.69.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.69.2.5.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.9.18.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.9.20.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.11.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.11.2.2.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.190.2.6.2.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.190.2.19.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.51.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.51.2.3.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.102.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.102.2.3.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.224.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.224.2.6.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
/* $NetBSD$ */
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.29.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.29.2.1.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.c,v 1.8.18.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.c,v 1.8.20.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.48.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.48.2.2.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.47.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.47.2.1.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.113.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.113.2.1.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.35.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.35.2.2.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.9.2.3.2.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.25.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.25.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.73.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.73.8.1 2009/04/15 03:14:26 kensmith Exp $");
#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 @@
*/
#include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/sys/kern/subr_sbuf.c,v 1.30.6.1 2008/11/25 02:59:29 kensmith Exp $");
+-__FBSDID("$FreeBSD: src/sys/kern/subr_sbuf.c,v 1.30.8.1 2009/04/15 03:14:26 kensmith Exp $");
#include <sys/param.h>
Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff 2009-05-04 10:58:31 UTC (rev 2486)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff 2009-05-04 10:59:27 UTC (rev 2487)
@@ -10,10 +10,12 @@
lib/libkvm/kvm_proc.c | 3 +++
9 files changed, 48 insertions(+), 6 deletions(-)
+Index: b/lib/libkvm/Makefile
+===================================================================
--- 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 $
+ # $FreeBSD: src/lib/libkvm/Makefile,v 1.17.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $
LIB= kvm
+LDADD= -lbsd -lfreebsd
@@ -22,6 +24,8 @@
.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 @@
@@ -67,6 +71,8 @@
int flag;
const char *errstr;
{
+Index: b/lib/libkvm/kvm_file.c
+===================================================================
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
@@ -59,7 +59,7 @@
@@ -110,6 +116,8 @@
+#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 @@
@@ -132,6 +140,8 @@
/*
* kvm_getloadavg() -- Get system load averages, from live or dead kernels.
*
+Index: b/lib/libkvm/kvm_getswapinfo.c
+===================================================================
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -209,8 +209,10 @@
@@ -145,6 +155,8 @@
}
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 @@
@@ -163,6 +175,8 @@
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 @@
@@ -182,6 +196,8 @@
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 @@
@@ -202,9 +218,20 @@
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
-@@ -99,6 +99,7 @@
+@@ -53,7 +53,7 @@
+ #include <sys/_lock.h>
+ #include <sys/_mutex.h>
+ #include <sys/_task.h>
+-#include <sys/cpuset.h>
++
+ #include <sys/user.h>
+ #include <sys/proc.h>
+ #define _WANT_PRISON /* make jail.h give us 'struct prison' */
+@@ -100,6 +100,7 @@
struct kinfo_proc *bp;
int maxcnt;
{
@@ -212,7 +239,7 @@
int cnt = 0;
struct kinfo_proc kinfo_proc, *kp;
struct pgrp pgrp;
-@@ -418,6 +419,8 @@
+@@ -419,6 +420,8 @@
++cnt;
}
return (cnt);
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2009-05-04 10:58:31 UTC (rev 2486)
+++ trunk/freebsd-libs/debian/rules 2009-05-04 10:59:27 UTC (rev 2487)
@@ -18,8 +18,8 @@
endif
ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_7_1_0_RELEASE
-VERSION=7.1
+RELENG=RELENG_7_2_0_RELEASE
+VERSION=7.2
PATH:=/usr/lib/freebsd:$(PATH)
DESTDIR=$(CURDIR)/debian/tmp
PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
More information about the Glibc-bsd-commits
mailing list