[Glibc-bsd-commits] r1611 - trunk/kfreebsd-6/debian/patches
Petr Salinger
ps-guest at costa.debian.org
Sat Jun 24 18:13:37 UTC 2006
Author: ps-guest
Date: 2006-06-24 18:12:41 +0000 (Sat, 24 Jun 2006)
New Revision: 1611
Modified:
trunk/kfreebsd-6/debian/patches/001_misc.diff
trunk/kfreebsd-6/debian/patches/002_glibc_dev_isp.diff
trunk/kfreebsd-6/debian/patches/003_glibc_dev_aicasm.diff
trunk/kfreebsd-6/debian/patches/004_xargs.diff
trunk/kfreebsd-6/debian/patches/005_binutils.diff
trunk/kfreebsd-6/debian/patches/006_proc_mounts.diff
trunk/kfreebsd-6/debian/patches/007_clone_signals.diff
trunk/kfreebsd-6/debian/patches/008_config.diff
trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff
trunk/kfreebsd-6/debian/patches/013_ip_packed.diff
trunk/kfreebsd-6/debian/patches/017_oss_compat.diff
trunk/kfreebsd-6/debian/patches/902_version.diff
trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-6/debian/patches/904_dev_full.diff
trunk/kfreebsd-6/debian/patches/905_grow_arg_max.diff
trunk/kfreebsd-6/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-6/debian/patches/907_cpu_class.diff
trunk/kfreebsd-6/debian/patches/908_linprocfs_is_not_proc.diff
trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff
trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff
trunk/kfreebsd-6/debian/patches/999_config.diff
Log:
- FreeBSD 6.1: update remaining patches (with great help from quilt)
Modified: trunk/kfreebsd-6/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/001_misc.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/001_misc.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -2,9 +2,10 @@
Status: chflags is BSD-specific. We could add it to freebsd-utils.
The rest has been rejected (kern/93502)
-diff -ur sys/conf.old/kern.mk sys/conf/kern.mk
---- sys/conf.old/kern.mk 2006-02-17 19:04:05.000000000 +0100
-+++ sys/conf/kern.mk 2006-02-17 19:05:07.000000000 +0100
+Index: sys/conf/kern.mk
+===================================================================
+--- sys/conf/kern.mk.orig 2005-04-01 00:53:58.000000000 +0200
++++ sys/conf/kern.mk 2006-06-24 17:25:17.000000000 +0200
@@ -1,5 +1,9 @@
# $FreeBSD: src/sys/conf/kern.mk,v 1.45 2005/03/31 22:53:58 peter Exp $
@@ -47,11 +48,12 @@
INLINE_LIMIT?= 8000
.endif
-diff -ur sys/conf.old/kern.post.mk sys/conf/kern.post.mk
---- sys/conf.old/kern.post.mk 2006-02-17 19:04:05.000000000 +0100
-+++ sys/conf/kern.post.mk 2006-02-17 19:04:12.000000000 +0100
+Index: sys/conf/kern.post.mk
+===================================================================
+--- sys/conf/kern.post.mk.orig 2005-11-16 11:03:02.000000000 +0100
++++ sys/conf/kern.post.mk 2006-06-24 17:25:17.000000000 +0200
@@ -1,5 +1,15 @@
- # $FreeBSD: src/sys/conf/kern.post.mk,v 1.83 2005/06/09 05:38:18 imp Exp $
+ # $FreeBSD: src/sys/conf/kern.post.mk,v 1.83.2.1 2005/11/16 10:03:02 ru Exp $
+.if !defined(OPSYS)
+OPSYS!= uname -s
@@ -66,7 +68,7 @@
# Part of a unified Makefile for building kernels. This part includes all
# the definitions that need to be after all the % directives except %RULES
# and ones that act like they are part of %RULES.
-@@ -193,11 +203,9 @@
+@@ -189,11 +199,9 @@
.if exists(${DESTDIR}${KODIR})
-thiskernel=`sysctl -n kern.bootfile` ; \
if [ ! "`dirname "$$thiskernel"`" -ef ${DESTDIR}${KODIR} ] ; then \
@@ -78,7 +80,7 @@
rm -rf ${DESTDIR}${KODIR}.old ; \
fi ; \
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \
-@@ -206,17 +214,16 @@
+@@ -202,17 +210,16 @@
.endif
mkdir -p ${DESTDIR}${KODIR}
.if defined(DEBUG) && defined(INSTALL_DEBUG)
Modified: trunk/kfreebsd-6/debian/patches/002_glibc_dev_isp.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/002_glibc_dev_isp.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/002_glibc_dev_isp.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -5,9 +5,11 @@
headers. But since ispvar.h is exported to userland we need to patch it.
(maybe we should move this to kfreebsd-kernel-headers?)
---- sys.old/dev/isp/ispvar.h 2005-05-10 20:22:17.000000000 -0400
-+++ sys/dev/isp/ispvar.h 2005-09-03 16:09:08.000000000 -0400
-@@ -62,20 +62,20 @@
+Index: sys/dev/isp/ispvar.h
+===================================================================
+--- sys/dev/isp/ispvar.h.orig 2006-02-03 15:43:57.000000000 +0100
++++ sys/dev/isp/ispvar.h 2006-06-24 17:31:48.000000000 +0200
+@@ -61,20 +61,20 @@
struct ispsoftc;
struct ispmdvec {
int (*dv_rd_isr)
@@ -36,7 +38,7 @@
};
/*
-@@ -90,9 +90,9 @@
+@@ -89,9 +89,9 @@
* 'Types'
*/
#ifdef ISP_DAC_SUPPORTED
@@ -48,7 +50,7 @@
#endif
/*
-@@ -188,14 +188,14 @@
+@@ -186,14 +186,14 @@
isp_fast_mttr : 1, /* fast sram */
isp_initiator_id : 4,
isp_async_data_setup : 4;
@@ -66,11 +68,11 @@
+ uint8_t isp_retry_delay;
struct {
- u_int32_t
-+ uint32_t
++ uint32_t
exc_throttle : 8,
: 1,
dev_enable : 1, /* ignored */
-@@ -204,12 +204,12 @@
+@@ -202,12 +202,12 @@
actv_offset : 4,
goal_offset : 4,
nvrm_offset : 4;
@@ -89,24 +91,25 @@
} isp_devparam[MAX_TARGETS];
} sdparam;
-@@ -254,7 +254,7 @@
+@@ -251,7 +251,7 @@
#endif
typedef struct {
-- u_int32_t isp_fwoptions : 16,
-+ uint32_t isp_fwoptions : 16,
- isp_gbspeed : 2,
+- u_int32_t : 13,
++ uint32_t : 13,
+ isp_gbspeed : 3,
+ : 2,
isp_iid_set : 1,
- loop_seen_once : 1,
-@@ -263,20 +263,20 @@
+@@ -261,20 +261,20 @@
isp_gotdparms : 1,
isp_topo : 3,
isp_onfabric : 1;
-- u_int8_t isp_iid; /* 'initiator' id */
-- u_int8_t isp_loopid; /* hard loop id */
-- u_int8_t isp_alpa; /* ALPA */
-- u_int32_t isp_portid;
-- volatile u_int16_t isp_lipseq; /* LIP sequence # */
+- u_int32_t : 8,
++ uint32_t : 8,
+ isp_portid : 24; /* S_ID */
+- u_int16_t isp_fwoptions;
+- u_int16_t isp_iid; /* 'initiator' id */
+- u_int16_t isp_loopid; /* hard loop id */
- u_int16_t isp_fwattr; /* firmware attributes */
- u_int8_t isp_execthrottle;
- u_int8_t isp_retry_delay;
@@ -116,16 +119,14 @@
- u_int16_t isp_maxfrmlen;
- u_int64_t isp_nodewwn;
- u_int64_t isp_portwwn;
-+ uint8_t isp_iid; /* 'initiator' id */
-+ uint8_t isp_loopid; /* hard loop id */
-+ uint8_t isp_alpa; /* ALPA */
-+ uint32_t isp_portid;
-+ volatile uint16_t isp_lipseq; /* LIP sequence # */
++ uint16_t isp_fwoptions;
++ uint16_t isp_iid; /* 'initiator' id */
++ uint16_t isp_loopid; /* hard loop id */
+ uint16_t isp_fwattr; /* firmware attributes */
-+ uint8_t isp_execthrottle;
-+ uint8_t isp_retry_delay;
-+ uint8_t isp_retry_count;
-+ uint8_t isp_reserved;
++ uint8_t isp_execthrottle;
++ uint8_t isp_retry_delay;
++ uint8_t isp_retry_count;
++ uint8_t isp_reserved;
+ uint16_t isp_maxalloc;
+ uint16_t isp_maxfrmlen;
+ uint64_t isp_nodewwn;
@@ -133,29 +134,30 @@
/*
* Port Data Base. This is indexed by 'target', which is invariate.
* However, elements within can move around due to loop changes,
-@@ -287,7 +287,7 @@
+@@ -285,7 +285,7 @@
* to move around.
*/
struct lportdb {
-- u_int32_t
-+ uint32_t
- port_type : 8,
- loopid : 8,
+- u_int32_t loopid : 16,
++ uint32_t loopid : 16,
+ : 2,
fc4_type : 4,
-@@ -300,9 +300,9 @@
- loggedin : 1,
+ last_fabric_dev : 1,
+@@ -297,10 +297,10 @@
roles : 2,
+ tvalid : 1,
valid : 1;
-- u_int32_t portid;
+- u_int32_t port_type : 8,
++ uint32_t port_type : 8,
+ portid : 24;
- u_int64_t node_wwn;
- u_int64_t port_wwn;
-+ uint32_t portid;
+ uint64_t node_wwn;
+ uint64_t port_wwn;
} portdb[MAX_FC_TARG], tport[FC_PORT_ID];
/*
-@@ -311,7 +311,7 @@
+@@ -309,7 +309,7 @@
caddr_t isp_scratch;
isp_dma_addr_t isp_scdma;
#ifdef ISP_FW_CRASH_DUMP
@@ -164,7 +166,7 @@
#endif
} fcparam;
-@@ -360,14 +360,14 @@
+@@ -358,14 +358,14 @@
*/
void * isp_param; /* type specific */
@@ -186,7 +188,7 @@
: 4,
isp_port : 1, /* 23XX only */
isp_failed : 1, /* board failed */
-@@ -378,47 +378,47 @@
+@@ -376,24 +376,24 @@
isp_role : 2, /* roles supported */
isp_dblev : 12; /* debug log mask */
@@ -224,13 +226,7 @@
/*
* Volatile state
- */
-
-- volatile u_int32_t
-+ volatile uint32_t
- isp_obits : 8, /* mailbox command output */
- isp_mboxbsy : 1, /* mailbox command active */
- isp_state : 3,
+@@ -406,17 +406,17 @@
isp_sendmarker : 2, /* send a marker entry */
isp_update : 2, /* update parameters */
isp_nactive : 16; /* how many commands active */
@@ -240,7 +236,7 @@
- volatile u_int16_t isp_resodx; /* index of next result */
- volatile u_int16_t isp_rspbsy;
- volatile u_int16_t isp_lasthdls; /* last handle seed */
-- volatile u_int16_t isp_mboxtmp[MAX_MAILBOX];
+- volatile u_int16_t isp_mboxtmp[MAILBOX_STORAGE];
- volatile u_int16_t isp_lastmbxcmd; /* last mbox command sent */
- volatile u_int16_t isp_mbxwrk0;
- volatile u_int16_t isp_mbxwrk1;
@@ -251,7 +247,7 @@
+ volatile uint16_t isp_resodx; /* index of next result */
+ volatile uint16_t isp_rspbsy;
+ volatile uint16_t isp_lasthdls; /* last handle seed */
-+ volatile uint16_t isp_mboxtmp[MAX_MAILBOX];
++ volatile uint16_t isp_mboxtmp[MAILBOX_STORAGE];
+ volatile uint16_t isp_lastmbxcmd; /* last mbox command sent */
+ volatile uint16_t isp_mbxwrk0;
+ volatile uint16_t isp_mbxwrk1;
@@ -259,7 +255,7 @@
void * isp_mbxworkp;
/*
-@@ -622,7 +622,7 @@
+@@ -625,7 +625,7 @@
* semaphore register and first mailbox register (if appropriate). This also
* means that most spurious/bogus interrupts not for us can be filtered first.
*/
Modified: trunk/kfreebsd-6/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/003_glibc_dev_aicasm.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/003_glibc_dev_aicasm.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,6 +1,7 @@
-diff -ur sys/dev/aic7xxx/aicasm.old/Makefile sys/dev/aic7xxx/aicasm/Makefile
---- sys/dev/aic7xxx/aicasm.old/Makefile 2004-12-21 09:47:19.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/Makefile 2006-02-15 15:53:20.000000000 +0100
+Index: sys/dev/aic7xxx/aicasm/Makefile
+===================================================================
+--- sys/dev/aic7xxx/aicasm/Makefile.orig 2005-12-27 22:35:40.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/Makefile 2006-06-24 17:31:56.000000000 +0200
@@ -14,7 +14,7 @@
SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
@@ -11,7 +12,7 @@
# Correct path for kernel builds
# Don't rely on the kernel's .depend file
@@ -23,13 +23,6 @@
- DEPENDFILE=
+ DEPENDFILE= .depend_aicasm
.endif
-.if ${CC} == "icc"
@@ -24,9 +25,10 @@
.ifdef MAKESRCPATH
CFLAGS+= -I${MAKESRCPATH}
.endif
-diff -ur sys/dev/aic7xxx/aicasm.old/aicasm.h sys/dev/aic7xxx/aicasm/aicasm.h
---- sys/dev/aic7xxx/aicasm.old/aicasm.h 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm.h 2006-02-15 15:48:34.000000000 +0100
+Index: sys/dev/aic7xxx/aicasm/aicasm.h
+===================================================================
+--- sys/dev/aic7xxx/aicasm/aicasm.h.orig 2005-01-06 02:42:27.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm.h 2006-06-24 17:31:56.000000000 +0200
@@ -42,8 +42,9 @@
* $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.17 2005/01/06 01:42:27 imp Exp $
*/
@@ -39,9 +41,10 @@
#else
#include <sys/queue.h>
#endif
-diff -ur sys/dev/aic7xxx/aicasm.old/aicasm_gram.y sys/dev/aic7xxx/aicasm/aicasm_gram.y
---- sys/dev/aic7xxx/aicasm.old/aicasm_gram.y 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_gram.y 2006-02-15 15:49:18.000000000 +0100
+Index: sys/dev/aic7xxx/aicasm/aicasm_gram.y
+===================================================================
+--- sys/dev/aic7xxx/aicasm/aicasm_gram.y.orig 2005-01-06 02:42:27.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_gram.y 2006-06-24 17:31:56.000000000 +0200
@@ -52,8 +52,9 @@
#include <string.h>
#include <sysexits.h>
@@ -54,9 +57,10 @@
#else
#include <sys/queue.h>
#endif
-diff -ur sys/dev/aic7xxx/aicasm.old/aicasm_macro_gram.y sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
---- sys/dev/aic7xxx/aicasm.old/aicasm_macro_gram.y 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y 2006-02-15 15:49:28.000000000 +0100
+Index: sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+===================================================================
+--- sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y.orig 2005-01-06 02:42:27.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y 2006-06-24 17:31:56.000000000 +0200
@@ -52,8 +52,9 @@
#include <string.h>
#include <sysexits.h>
@@ -69,9 +73,10 @@
#else
#include <sys/queue.h>
#endif
-diff -ur sys/dev/aic7xxx/aicasm.old/aicasm_macro_scan.l sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
---- sys/dev/aic7xxx/aicasm.old/aicasm_macro_scan.l 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l 2006-02-15 15:47:58.000000000 +0100
+Index: sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+===================================================================
+--- sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l.orig 2005-01-06 02:42:27.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l 2006-06-24 17:31:56.000000000 +0200
@@ -51,8 +51,10 @@
#include <stdio.h>
#include <string.h>
@@ -85,9 +90,10 @@
#else
#include <sys/queue.h>
#endif
-diff -ur sys/dev/aic7xxx/aicasm.old/aicasm_scan.l sys/dev/aic7xxx/aicasm/aicasm_scan.l
---- sys/dev/aic7xxx/aicasm.old/aicasm_scan.l 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_scan.l 2006-02-15 15:50:41.000000000 +0100
+Index: sys/dev/aic7xxx/aicasm/aicasm_scan.l
+===================================================================
+--- sys/dev/aic7xxx/aicasm/aicasm_scan.l.orig 2005-01-06 02:42:27.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_scan.l 2006-06-24 17:31:56.000000000 +0200
@@ -51,8 +51,10 @@
#include <stdio.h>
#include <string.h>
@@ -101,9 +107,10 @@
#else
#include <sys/queue.h>
#endif
-diff -ur sys/dev/aic7xxx/aicasm.old/aicasm_symbol.c sys/dev/aic7xxx/aicasm/aicasm_symbol.c
---- sys/dev/aic7xxx/aicasm.old/aicasm_symbol.c 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_symbol.c 2006-02-15 15:52:13.000000000 +0100
+Index: sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+===================================================================
+--- sys/dev/aic7xxx/aicasm/aicasm_symbol.c.orig 2005-01-06 02:42:27.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_symbol.c 2006-06-24 17:31:56.000000000 +0200
@@ -44,10 +44,11 @@
#include <sys/types.h>
@@ -119,9 +126,10 @@
#endif
#include <fcntl.h>
#include <inttypes.h>
-diff -ur sys/dev/aic7xxx/aicasm.old/aicasm_symbol.h sys/dev/aic7xxx/aicasm/aicasm_symbol.h
---- sys/dev/aic7xxx/aicasm.old/aicasm_symbol.h 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_symbol.h 2006-02-15 15:52:56.000000000 +0100
+Index: sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+===================================================================
+--- sys/dev/aic7xxx/aicasm/aicasm_symbol.h.orig 2005-01-06 02:42:27.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_symbol.h 2006-06-24 17:31:56.000000000 +0200
@@ -42,8 +42,9 @@
* $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.17 2005/01/06 01:42:27 imp Exp $
*/
Modified: trunk/kfreebsd-6/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/004_xargs.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/004_xargs.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,9 +1,11 @@
Status: xargs -J option requested to both upstream and debian.
---- sys.old/conf/kmod.mk 2005-04-22 13:39:58.000000000 -0400
-+++ sys/conf/kmod.mk 2005-09-03 16:11:36.000000000 -0400
-@@ -180,7 +180,7 @@
+Index: sys/conf/kmod.mk
+===================================================================
+--- sys/conf/kmod.mk.orig 2006-02-23 03:13:31.000000000 +0100
++++ sys/conf/kmod.mk 2006-06-24 17:32:07.000000000 +0200
+@@ -206,7 +206,7 @@
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -12,9 +14,10 @@
.endif
.endif
.if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
-diff -ur sys.old/contrib/dev/acpica/acpica_prep.sh sys/contrib/dev/acpica/acpica_prep.sh
---- sys.old/contrib/dev/acpica/acpica_prep.sh 2004-04-14 04:03:33.000000000 +0200
-+++ sys/contrib/dev/acpica/acpica_prep.sh 2004-11-16 18:22:34.000000000 +0100
+Index: sys/contrib/dev/acpica/acpica_prep.sh
+===================================================================
+--- sys/contrib/dev/acpica/acpica_prep.sh.orig 2004-04-14 04:03:33.000000000 +0200
++++ sys/contrib/dev/acpica/acpica_prep.sh 2006-06-24 17:32:07.000000000 +0200
@@ -52,12 +52,12 @@
echo copying full dirs
Modified: trunk/kfreebsd-6/debian/patches/005_binutils.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/005_binutils.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/005_binutils.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,8 +1,10 @@
Status: Reported as kern/93331
---- sys.old/i386/i386/locore.s.orig 2005-09-05 22:35:16.000000000 +0200
-+++ sys/i386/i386/locore.s 2005-09-05 22:35:58.000000000 +0200
+Index: sys/i386/i386/locore.s
+===================================================================
+--- sys/i386/i386/locore.s.orig 2005-05-16 11:47:53.000000000 +0200
++++ sys/i386/i386/locore.s 2006-06-24 17:32:27.000000000 +0200
@@ -358,7 +358,7 @@
pushl %eax
testl $PSL_VM,UC_EFLAGS(%eax)
@@ -30,8 +32,10 @@
9:
movl $103,%eax /* 3.x SYS_sigreturn */
pushl %eax /* junk to fake return addr. */
---- sys.old/i386/i386/swtch.s 2005-09-06 14:47:02.000000000 +0200
-+++ sys/i386/i386/swtch.s 2005-09-06 14:47:33.000000000 +0200
+Index: sys/i386/i386/swtch.s
+===================================================================
+--- sys/i386/i386/swtch.s.orig 2005-04-14 00:57:17.000000000 +0200
++++ sys/i386/i386/swtch.s 2006-06-24 17:32:27.000000000 +0200
@@ -111,7 +111,7 @@
movl %ebp,PCB_EBP(%edx)
movl %esi,PCB_ESI(%edx)
@@ -58,10 +62,21 @@
+ movw %gs,PCB_GS(%ecx)
pushfl
popl PCB_PSL(%ecx)
-
---- sys.old/i386/include/cpufunc.h 2005-09-06 17:32:18.000000000 +0200
-+++ sys/i386/include/cpufunc.h 2005-09-06 17:32:42.000000000 +0200
-@@ -456,7 +456,7 @@
+
+Index: sys/i386/include/cpufunc.h
+===================================================================
+--- sys/i386/include/cpufunc.h.orig 2005-05-13 02:05:56.000000000 +0200
++++ sys/i386/include/cpufunc.h 2006-06-24 17:32:27.000000000 +0200
+@@ -452,7 +452,7 @@
+ rfs(void)
+ {
+ u_int sel;
+- __asm __volatile("movl %%fs,%0" : "=rm" (sel));
++ __asm __volatile("mov %%fs,%0" : "=rm" (sel));
+ return (sel);
+ }
+
+@@ -460,7 +460,7 @@
rgs(void)
{
u_int sel;
@@ -70,8 +85,23 @@
return (sel);
}
-@@ -477,7 +477,7 @@
+@@ -468,20 +468,20 @@
+ rss(void)
+ {
+ u_int sel;
+- __asm __volatile("movl %%ss,%0" : "=rm" (sel));
++ __asm __volatile("mov %%ss,%0" : "=rm" (sel));
+ return (sel);
+ }
+
static __inline void
+ load_fs(u_int sel)
+ {
+- __asm __volatile("movl %0,%%fs" : : "rm" (sel));
++ __asm __volatile("mov %0,%%fs" : : "rm" (sel));
+ }
+
+ static __inline void
load_gs(u_int sel)
{
- __asm __volatile("movl %0,%%gs" : : "rm" (sel));
@@ -79,8 +109,10 @@
}
static __inline void
---- sys.old/i386/linux/linux_locore.s 2005-09-06 20:28:47.000000000 +0200
-+++ sys/i386/linux/linux_locore.s 2005-09-06 20:29:05.000000000 +0200
+Index: sys/i386/linux/linux_locore.s
+===================================================================
+--- sys/i386/linux/linux_locore.s.orig 2001-02-25 07:29:01.000000000 +0100
++++ sys/i386/linux/linux_locore.s 2006-06-24 17:32:27.000000000 +0200
@@ -8,7 +8,7 @@
NON_GPROF_ENTRY(linux_sigcode)
call *LINUX_SIGF_HANDLER(%esp)
@@ -99,9 +131,11 @@
push %eax /* fake ret addr */
movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */
int $0x80 /* enter kernel with args */
---- sys.old/compat/ndis/winx32_wrap.S 2005-09-06 21:47:21.000000000 +0200
-+++ sys/compat/ndis/winx32_wrap.S 2005-09-06 21:47:48.000000000 +0200
-@@ -348,7 +348,7 @@
+Index: sys/compat/ndis/winx32_wrap.S
+===================================================================
+--- sys/compat/ndis/winx32_wrap.S.orig 2005-11-06 04:52:25.000000000 +0100
++++ sys/compat/ndis/winx32_wrap.S 2006-06-24 17:32:27.000000000 +0200
+@@ -364,7 +364,7 @@
ret
ENTRY(x86_setfs)
@@ -110,9 +144,11 @@
ret
ENTRY(x86_gettid)
---- sys/amd64/amd64/cpu_switch.S.old 2006-03-01 20:12:04.000000000 +0100
-+++ sys/amd64/amd64/cpu_switch.S 2006-03-01 20:04:59.000000000 +0100
-@@ -107,10 +107,10 @@
+Index: sys/amd64/amd64/cpu_switch.S
+===================================================================
+--- sys/amd64/amd64/cpu_switch.S.orig 2005-11-15 01:25:59.000000000 +0100
++++ sys/amd64/amd64/cpu_switch.S 2006-06-24 17:33:03.000000000 +0200
+@@ -105,10 +105,10 @@
jz 1f /* no, skip over */
/* Save segment selector numbers */
@@ -124,10 +160,10 @@
+ movw %es,PCB_ES(%r8)
+ movw %fs,PCB_FS(%r8)
+ movw %gs,PCB_GS(%r8)
- jmp 2f
1:
-
-@@ -191,14 +191,14 @@
+ /* Test if debug registers should be saved. */
+ testl $PCB_DBREGS,PCB_FLAGS(%r8)
+@@ -174,14 +174,14 @@
jz 1f /* no, skip over */
/* Restore segment selector numbers */
@@ -146,8 +182,10 @@
wrmsr
jmp 2f
1:
---- sys/amd64/ia32/ia32_signal.c~ 2006-03-01 22:23:22.000000000 +0100
-+++ sys/amd64/ia32/ia32_signal.c 2006-03-01 22:44:47.000000000 +0100
+Index: sys/amd64/ia32/ia32_signal.c
+===================================================================
+--- sys/amd64/ia32/ia32_signal.c.orig 2004-04-06 01:55:14.000000000 +0200
++++ sys/amd64/ia32/ia32_signal.c 2006-06-24 17:32:27.000000000 +0200
@@ -197,8 +197,8 @@
sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
sf.sf_uc.uc_mcontext.mc_gs = rgs();
@@ -170,8 +208,10 @@
sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi;
sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi;
sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
---- sys/amd64/include/cpufunc.h~ 2006-03-02 00:05:29.000000000 +0100
-+++ sys/amd64/include/cpufunc.h 2006-03-02 11:11:34.000000000 +0100
+Index: sys/amd64/include/cpufunc.h
+===================================================================
+--- sys/amd64/include/cpufunc.h.orig 2005-05-13 02:05:55.000000000 +0200
++++ sys/amd64/include/cpufunc.h 2006-06-24 17:32:27.000000000 +0200
@@ -482,7 +482,7 @@
rfs(void)
{
@@ -248,8 +288,10 @@
}
#endif
---- sys/amd64/linux32/linux32_sysvec.c~ 2006-03-02 00:05:31.000000000 +0100
-+++ sys/amd64/linux32/linux32_sysvec.c 2006-03-02 11:14:09.000000000 +0100
+Index: sys/amd64/linux32/linux32_sysvec.c
+===================================================================
+--- sys/amd64/linux32/linux32_sysvec.c.orig 2005-12-22 22:25:19.000000000 +0100
++++ sys/amd64/linux32/linux32_sysvec.c 2006-06-24 17:32:27.000000000 +0200
@@ -345,9 +345,9 @@
frame.sf_sc.uc_mcontext.sc_mask = frame.sf_sc.uc_sigmask.__bits[0];
frame.sf_sc.uc_mcontext.sc_gs = rgs();
@@ -273,36 +315,10 @@
frame.sf_sc.sc_edi = regs->tf_rdi;
frame.sf_sc.sc_esi = regs->tf_rsi;
frame.sf_sc.sc_ebp = regs->tf_rbp;
---- sys/i386/include/cpufunc.h~ 2006-03-02 00:09:10.000000000 +0100
-+++ sys/i386/include/cpufunc.h 2006-03-02 11:16:41.000000000 +0100
-@@ -452,7 +452,7 @@
- rfs(void)
- {
- u_int sel;
-- __asm __volatile("movl %%fs,%0" : "=rm" (sel));
-+ __asm __volatile("mov %%fs,%0" : "=rm" (sel));
- return (sel);
- }
-
-@@ -468,14 +468,14 @@
- rss(void)
- {
- u_int sel;
-- __asm __volatile("movl %%ss,%0" : "=rm" (sel));
-+ __asm __volatile("mov %%ss,%0" : "=rm" (sel));
- return (sel);
- }
-
- static __inline void
- load_fs(u_int sel)
- {
-- __asm __volatile("movl %0,%%fs" : : "rm" (sel));
-+ __asm __volatile("mov %0,%%fs" : : "rm" (sel));
- }
-
- static __inline void
---- sys/amd64/ia32/ia32_sigtramp.S~ 2006-03-02 11:21:40.000000000 +0100
-+++ sys/amd64/ia32/ia32_sigtramp.S 2006-03-02 11:50:52.000000000 +0100
+Index: sys/amd64/ia32/ia32_sigtramp.S
+===================================================================
+--- sys/amd64/ia32/ia32_sigtramp.S.orig 2003-08-23 01:19:02.000000000 +0200
++++ sys/amd64/ia32/ia32_sigtramp.S 2006-06-24 17:32:27.000000000 +0200
@@ -45,10 +45,10 @@
calll *IA32_SIGF_HANDLER(%esp)
leal IA32_SIGF_UC(%esp),%eax /* get ucontext */
@@ -333,8 +349,10 @@
movl $344,%eax /* 4.x SYS_sigreturn */
pushl %eax /* junk to fake return addr. */
int $0x80 /* enter kernel with args */
---- sys/amd64/linux32/linux32_locore.s~ 2006-03-02 11:21:42.000000000 +0100
-+++ sys/amd64/linux32/linux32_locore.s 2006-03-02 11:51:44.000000000 +0100
+Index: sys/amd64/linux32/linux32_locore.s
+===================================================================
+--- sys/amd64/linux32/linux32_locore.s.orig 2004-08-16 09:55:06.000000000 +0200
++++ sys/amd64/linux32/linux32_locore.s 2006-06-24 17:32:27.000000000 +0200
@@ -11,10 +11,10 @@
NON_GPROF_ENTRY(linux_sigcode)
call *LINUX_SIGF_HANDLER(%esp)
Modified: trunk/kfreebsd-6/debian/patches/006_proc_mounts.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/006_proc_mounts.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/006_proc_mounts.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,8 +1,10 @@
Status: Reported as kern/78464.
---- sys.old/compat/linprocfs/linprocfs.c 2005-03-03 12:44:21.000000000 +0100
-+++ sys/compat/linprocfs/linprocfs.c 2005-03-05 19:47:40.000000000 +0100
+Index: sys/compat/linprocfs/linprocfs.c
+===================================================================
+--- sys/compat/linprocfs/linprocfs.c.orig 2005-12-14 20:06:48.000000000 +0100
++++ sys/compat/linprocfs/linprocfs.c 2006-06-24 17:33:15.000000000 +0200
@@ -345,13 +345,11 @@
#endif /* __i386__ || __amd64__ */
@@ -28,7 +30,7 @@
sbuf_printf(sb, " 0 0\n");
}
mtx_unlock(&mountlist_mtx);
-@@ -1031,7 +1029,7 @@
+@@ -1032,7 +1030,7 @@
pfs_create_file(root, "modules", &linprocfs_domodules,
NULL, NULL, PFS_RD);
#endif
Modified: trunk/kfreebsd-6/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/007_clone_signals.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/007_clone_signals.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,6 +1,8 @@
---- sys/kern/kern_fork.c 2005-04-27 13:32:23.000000000 +0200
-+++ sys/kern/kern_fork.c 2005-11-08 17:17:43.000000000 +0100
-@@ -502,7 +502,11 @@
+Index: sys/kern/kern_fork.c
+===================================================================
+--- sys/kern/kern_fork.c.orig 2006-03-19 00:37:36.000000000 +0100
++++ sys/kern/kern_fork.c 2006-06-24 17:33:20.000000000 +0200
+@@ -517,7 +517,11 @@
p2->p_sigacts = newsigacts;
}
if (flags & RFLINUXTHPN)
@@ -13,8 +15,10 @@
else
p2->p_sigparent = SIGCHLD;
---- sys/sys/unistd.h 2005-02-01 00:26:57.000000000 +0100
-+++ sys/sys/unistd.h 2005-11-08 17:14:12.000000000 +0100
+Index: sys/sys/unistd.h
+===================================================================
+--- sys/sys/unistd.h.orig 2005-01-07 03:29:24.000000000 +0100
++++ sys/sys/unistd.h 2006-06-24 17:33:20.000000000 +0200
@@ -173,6 +173,10 @@
#define RFHIGHPID (1<<18) /* use a pid higher then 10 (idleproc) */
#define RFPPWAIT (1<<31) /* parent sleeps until child exits (vfork) */
Modified: trunk/kfreebsd-6/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/008_config.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/008_config.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -3,9 +3,10 @@
Status: gotta uncomment WARNS (see #351366), and find a portable way to add
"-lbsd". after this it can be sent upstream.
-diff -ur usr.sbin.old/config/Makefile usr.sbin/config/Makefile
---- usr.sbin.old/config/Makefile 2005-12-09 07:46:40.000000000 +0100
-+++ usr.sbin/config/Makefile 2006-02-04 13:54:08.000000000 +0100
+Index: usr.sbin/config/Makefile
+===================================================================
+--- usr.sbin/config/Makefile.orig 2004-05-11 17:42:44.000000000 +0200
++++ usr.sbin/config/Makefile 2006-06-24 17:33:24.000000000 +0200
@@ -6,11 +6,11 @@
SRCS= config.y main.c lang.l mkmakefile.c mkheaders.c \
mkoptions.c y.tab.h
@@ -21,9 +22,10 @@
mkmakefile.o: configvers.h
-diff -ur usr.sbin.old/config/main.c usr.sbin/config/main.c
---- usr.sbin.old/config/main.c 2006-01-14 09:12:25.000000000 +0100
-+++ usr.sbin/config/main.c 2006-02-04 13:40:37.000000000 +0100
+Index: usr.sbin/config/main.c
+===================================================================
+--- usr.sbin/config/main.c.orig 2005-10-28 21:04:03.000000000 +0200
++++ usr.sbin/config/main.c 2006-06-24 17:33:24.000000000 +0200
@@ -45,13 +45,19 @@
#include <sys/stat.h>
#include <sys/file.h>
@@ -45,7 +47,7 @@
#include "y.tab.h"
#include "config.h"
#include "configvers.h"
-@@ -474,7 +480,11 @@
+@@ -455,7 +461,11 @@
if ((dirp = opendir(p)) == NULL)
err(EX_OSERR, "opendir %s", p);
while ((dp = readdir(dirp)) != NULL) {
Modified: trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,9 +1,10 @@
Status: in upstream BTS
-diff -ur sys/conf.old/Makefile.alpha sys/conf/Makefile.alpha
---- sys/conf.old/Makefile.alpha 2006-04-25 18:41:51.000000000 +0200
-+++ sys/conf/Makefile.alpha 2006-04-25 18:51:49.000000000 +0200
+Index: sys/conf/Makefile.alpha
+===================================================================
+--- sys/conf/Makefile.alpha.orig 2005-10-28 21:04:02.000000000 +0200
++++ sys/conf/Makefile.alpha 2006-06-24 17:33:28.000000000 +0200
@@ -28,6 +28,8 @@
.endif
.include "$S/conf/kern.pre.mk"
@@ -13,9 +14,10 @@
%BEFORE_DEPEND
%OBJS
-diff -ur sys/conf.old/Makefile.amd64 sys/conf/Makefile.amd64
---- sys/conf.old/Makefile.amd64 2006-04-25 18:41:51.000000000 +0200
-+++ sys/conf/Makefile.amd64 2006-04-25 18:51:49.000000000 +0200
+Index: sys/conf/Makefile.amd64
+===================================================================
+--- sys/conf/Makefile.amd64.orig 2005-10-28 21:04:03.000000000 +0200
++++ sys/conf/Makefile.amd64 2006-06-24 17:33:28.000000000 +0200
@@ -38,6 +38,8 @@
MKMODULESENV+= MACHINE=amd64
@@ -25,9 +27,10 @@
%BEFORE_DEPEND
%OBJS
-diff -ur sys/conf.old/Makefile.arm sys/conf/Makefile.arm
---- sys/conf.old/Makefile.arm 2006-04-25 18:41:51.000000000 +0200
-+++ sys/conf/Makefile.arm 2006-04-25 18:51:49.000000000 +0200
+Index: sys/conf/Makefile.arm
+===================================================================
+--- sys/conf/Makefile.arm.orig 2005-10-28 21:04:03.000000000 +0200
++++ sys/conf/Makefile.arm 2006-06-24 17:33:28.000000000 +0200
@@ -44,6 +44,9 @@
.if !defined(DEBUG)
CFLAGS += -mno-apcs-frame
@@ -38,9 +41,10 @@
%BEFORE_DEPEND
%OBJS
-diff -ur sys/conf.old/Makefile.i386 sys/conf/Makefile.i386
---- sys/conf.old/Makefile.i386 2006-04-25 18:41:51.000000000 +0200
-+++ sys/conf/Makefile.i386 2006-04-25 18:51:49.000000000 +0200
+Index: sys/conf/Makefile.i386
+===================================================================
+--- sys/conf/Makefile.i386.orig 2005-10-28 21:04:03.000000000 +0200
++++ sys/conf/Makefile.i386 2006-06-24 17:33:28.000000000 +0200
@@ -32,6 +32,8 @@
MKMODULESENV+= MACHINE=i386
@@ -50,9 +54,10 @@
%BEFORE_DEPEND
%OBJS
-diff -ur sys/conf.old/Makefile.ia64 sys/conf/Makefile.ia64
---- sys/conf.old/Makefile.ia64 2006-04-25 18:41:51.000000000 +0200
-+++ sys/conf/Makefile.ia64 2006-04-25 18:51:49.000000000 +0200
+Index: sys/conf/Makefile.ia64
+===================================================================
+--- sys/conf/Makefile.ia64.orig 2005-10-28 21:04:03.000000000 +0200
++++ sys/conf/Makefile.ia64 2006-06-24 17:33:28.000000000 +0200
@@ -38,6 +38,8 @@
ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
@@ -62,9 +67,10 @@
%BEFORE_DEPEND
%OBJS
-diff -ur sys/conf.old/Makefile.pc98 sys/conf/Makefile.pc98
---- sys/conf.old/Makefile.pc98 2006-04-25 18:41:51.000000000 +0200
-+++ sys/conf/Makefile.pc98 2006-04-25 18:51:49.000000000 +0200
+Index: sys/conf/Makefile.pc98
+===================================================================
+--- sys/conf/Makefile.pc98.orig 2005-10-28 21:04:03.000000000 +0200
++++ sys/conf/Makefile.pc98 2006-06-24 17:33:28.000000000 +0200
@@ -32,6 +32,8 @@
MKMODULESENV+= MACHINE=pc98
@@ -74,9 +80,10 @@
%BEFORE_DEPEND
%OBJS
-diff -ur sys/conf.old/Makefile.powerpc sys/conf/Makefile.powerpc
---- sys/conf.old/Makefile.powerpc 2006-04-25 18:41:51.000000000 +0200
-+++ sys/conf/Makefile.powerpc 2006-04-25 18:51:49.000000000 +0200
+Index: sys/conf/Makefile.powerpc
+===================================================================
+--- sys/conf/Makefile.powerpc.orig 2005-10-28 21:04:03.000000000 +0200
++++ sys/conf/Makefile.powerpc 2006-06-24 17:33:28.000000000 +0200
@@ -37,6 +37,8 @@
CFLAGS+= -fno-omit-frame-pointer
.endif
@@ -86,9 +93,10 @@
%BEFORE_DEPEND
%OBJS
-diff -ur sys/conf.old/Makefile.sparc64 sys/conf/Makefile.sparc64
---- sys/conf.old/Makefile.sparc64 2006-04-25 18:41:51.000000000 +0200
-+++ sys/conf/Makefile.sparc64 2006-04-25 18:51:49.000000000 +0200
+Index: sys/conf/Makefile.sparc64
+===================================================================
+--- sys/conf/Makefile.sparc64.orig 2005-10-28 21:04:03.000000000 +0200
++++ sys/conf/Makefile.sparc64 2006-06-24 17:33:28.000000000 +0200
@@ -32,6 +32,8 @@
MDOBJS= exception.o interrupt.o
@@ -98,9 +106,10 @@
%BEFORE_DEPEND
%OBJS
-diff -ur usr.sbin/config.old/mkmakefile.c usr.sbin/config/mkmakefile.c
---- usr.sbin/config.old/mkmakefile.c 2006-04-25 18:44:15.000000000 +0200
-+++ usr.sbin/config/mkmakefile.c 2006-04-25 18:51:59.000000000 +0200
+Index: usr.sbin/config/mkmakefile.c
+===================================================================
+--- usr.sbin/config/mkmakefile.c.orig 2004-08-31 01:03:56.000000000 +0200
++++ usr.sbin/config/mkmakefile.c 2006-06-24 17:33:28.000000000 +0200
@@ -70,6 +70,7 @@
static void do_rules(FILE *);
static void do_xxfiles(char *, FILE *);
Modified: trunk/kfreebsd-6/debian/patches/013_ip_packed.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/013_ip_packed.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/013_ip_packed.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,5 +1,7 @@
---- sys/netinet/ip.h.orig 2005-06-02 17:27:37.000000000 +0200
-+++ sys/netinet/ip.h 2005-06-02 17:27:46.000000000 +0200
+Index: sys/netinet/ip.h
+===================================================================
+--- sys/netinet/ip.h.orig 2005-01-07 02:45:44.000000000 +0100
++++ sys/netinet/ip.h 2006-06-24 17:38:11.000000000 +0200
@@ -65,7 +65,7 @@
u_char ip_p; /* protocol */
u_short ip_sum; /* checksum */
Modified: trunk/kfreebsd-6/debian/patches/017_oss_compat.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/017_oss_compat.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/017_oss_compat.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,7 +1,8 @@
-diff -ur sys/dev/sound/pcm/mixer.c sys/dev/sound/pcm/mixer.c
---- sys/dev/sound/pcm/mixer.c 2004-06-25 18:34:33.000000000 +0200
-+++ sys/dev/sound/pcm/mixer.c 2005-08-09 13:56:21.000000000 +0200
-@@ -459,6 +459,9 @@
+Index: sys/dev/sound/pcm/mixer.c
+===================================================================
+--- sys/dev/sound/pcm/mixer.c.orig 2006-04-04 19:43:48.000000000 +0200
++++ sys/dev/sound/pcm/mixer.c 2006-06-24 17:38:16.000000000 +0200
+@@ -492,6 +492,9 @@
if ((cmd & MIXER_READ(0)) == MIXER_READ(0)) {
switch (j) {
@@ -11,10 +12,11 @@
case SOUND_MIXER_DEVMASK:
case SOUND_MIXER_CAPS:
case SOUND_MIXER_STEREODEVS:
-diff -ur sys/sys/soundcard.h sys/sys/soundcard.h
---- sys/sys/soundcard.h 2005-08-09 13:39:26.000000000 +0200
-+++ sys/sys/soundcard.h 2005-08-09 13:53:15.000000000 +0200
-@@ -52,11 +52,14 @@
+Index: sys/sys/soundcard.h
+===================================================================
+--- sys/sys/soundcard.h.orig 2005-12-30 20:55:52.000000000 +0100
++++ sys/sys/soundcard.h 2006-06-24 17:38:44.000000000 +0200
+@@ -54,11 +54,14 @@
*/
/*
@@ -33,7 +35,7 @@
#define VOXWARE /* does this have any use ? */
/*
-@@ -93,6 +96,7 @@
+@@ -95,6 +98,7 @@
#define SNDCARD_NSS 26
#define SNDCARD_UART16550 27
#define SNDCARD_OPL 28
@@ -41,7 +43,7 @@
#include <sys/types.h>
#include <machine/endian.h>
-@@ -803,6 +807,8 @@
+@@ -809,6 +813,8 @@
/* Has a coprocessor, sometimes it's a DSP but usually not */
#define DSP_CAP_TRIGGER 0x00001000 /* Supports SETTRIGGER */
#define DSP_CAP_MMAP 0x00002000 /* Supports mmap() */
@@ -50,17 +52,17 @@
/*
* What do these function do ?
-@@ -1088,6 +1094,13 @@
- #define LEFT_CHN 0
+@@ -1095,6 +1101,13 @@
#define RIGHT_CHN 1
-+/*
+ /*
+ * An ioctl for identifying the driver version. It will return value
+ * of the SOUND_VERSION macro used when compiling the driver.
+ * This call was introduced for compatibility with OSS version 3.6.
+ */
+#define OSS_GETVERSION _IOR('M', 118, int)
+
- /*
++/*
* Level 2 event types for /dev/sequencer
*/
+
Modified: trunk/kfreebsd-6/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/902_version.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/902_version.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,5 +1,7 @@
---- sys/conf/newvers.sh~ 2006-02-16 20:03:49.000000000 +0100
-+++ sys/conf/newvers.sh 2006-02-16 20:17:04.000000000 +0100
+Index: sys/conf/newvers.sh
+===================================================================
+--- sys/conf/newvers.sh.orig 2006-06-24 17:10:55.000000000 +0200
++++ sys/conf/newvers.sh 2006-06-24 17:38:49.000000000 +0200
@@ -89,7 +89,7 @@
cat << EOF > vers.c
$COPYRIGHT
Modified: trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,6 +1,7 @@
-diff -ur ../src.old/sys/conf/files sys/conf/files
---- ../src.old/sys/conf/files 2006-02-11 13:08:03.000000000 +0000
-+++ sys/conf/files 2006-02-11 12:58:15.000000000 +0000
+Index: sys/conf/files
+===================================================================
+--- sys/conf/files.orig 2006-04-12 20:09:27.000000000 +0200
++++ sys/conf/files 2006-06-24 17:52:40.380469000 +0200
@@ -240,7 +240,6 @@
contrib/dev/acpica/utmisc.c optional acpi
contrib/dev/acpica/utobject.c optional acpi
@@ -9,7 +10,7 @@
contrib/ipfilter/netinet/fil.c optional ipfilter inet
contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet
contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet
-@@ -429,11 +428,6 @@
+@@ -431,11 +430,6 @@
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
dev/ata/atapi-tape.c optional atapist
@@ -21,9 +22,10 @@
dev/awi/am79c930.c optional awi
dev/awi/awi.c optional awi
dev/awi/if_awi_pccard.c optional awi pccard
-diff -ur ../src.old/sys/conf/files.i386 sys/conf/files.i386
---- ../src.old/sys/conf/files.i386 2006-02-11 13:08:03.000000000 +0000
-+++ sys/conf/files.i386 2006-02-11 13:08:56.000000000 +0000
+Index: sys/conf/files.i386
+===================================================================
+--- sys/conf/files.i386.orig 2006-05-01 02:15:12.000000000 +0200
++++ sys/conf/files.i386 2006-06-24 17:52:40.356469000 +0200
@@ -46,36 +46,12 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
@@ -59,9 +61,9 @@
- compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \
- no-implicit-rule
#
- #
- compat/linux/linux_file.c optional compat_linux
-@@ -173,11 +149,6 @@
+ rr232x_lib.o optional rr232x \
+ dependency "$S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \
+@@ -181,11 +157,6 @@
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
dev/fe/if_fe_isa.c optional fe isa
@@ -73,7 +75,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_pentium.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
-@@ -198,7 +169,6 @@
+@@ -206,7 +177,6 @@
dev/mem/memutil.c optional mem
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
@@ -81,10 +83,11 @@
dev/ppc/ppc.c optional ppc
dev/ppc/ppc_puc.c optional ppc puc pci
dev/random/nehemiah.c optional random
-diff -ur ../src.old/sys/conf/kern.pre.mk sys/conf/kern.pre.mk
---- ../src.old/sys/conf/kern.pre.mk 2006-02-11 13:08:03.000000000 +0000
-+++ sys/conf/kern.pre.mk 2006-02-11 12:58:15.000000000 +0000
-@@ -61,9 +61,6 @@
+Index: sys/conf/kern.pre.mk
+===================================================================
+--- sys/conf/kern.pre.mk.orig 2005-11-07 10:55:47.000000000 +0100
++++ sys/conf/kern.pre.mk 2006-06-24 17:39:05.000000000 +0200
+@@ -58,9 +58,6 @@
# ... and the same for pf
INCLUDES+= -I$S/contrib/pf
@@ -94,18 +97,19 @@
# ... and the same for the NgATM stuff
INCLUDES+= -I$S/contrib/ngatm
-diff -ur ../src.old/sys/i386/conf/GENERIC sys/i386/conf/GENERIC
---- ../src.old/sys/i386/conf/GENERIC 2006-02-11 13:08:03.000000000 +0000
-+++ sys/i386/conf/GENERIC 2006-02-11 13:08:27.000000000 +0000
-@@ -124,7 +124,6 @@
+Index: sys/i386/conf/GENERIC
+===================================================================
+--- sys/i386/conf/GENERIC.orig 2006-05-01 02:15:12.000000000 +0200
++++ sys/i386/conf/GENERIC 2006-06-24 17:53:28.000000000 +0200
+@@ -118,7 +118,6 @@
device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
-device hptmv # Highpoint RocketRAID 182x
+ device rr232x # Highpoint RocketRAID 232x
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
- device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -200,7 +199,6 @@
+@@ -199,7 +198,6 @@
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device lge # Level 1 LXT1001 gigabit Ethernet
device nge # NatSemi DP83820 gigabit Ethernet
@@ -113,22 +117,23 @@
device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
-diff -ur ../src.old/sys/modules/Makefile sys/modules/Makefile
---- ../src.old/sys/modules/Makefile 2006-02-11 13:08:03.000000000 +0000
-+++ sys/modules/Makefile 2006-02-11 12:58:15.000000000 +0000
-@@ -25,11 +25,6 @@
+Index: sys/modules/Makefile
+===================================================================
+--- sys/modules/Makefile.orig 2006-04-12 20:09:28.000000000 +0200
++++ sys/modules/Makefile 2006-06-24 17:52:40.442507000 +0200
+@@ -26,11 +26,6 @@
${_arl} \
${_asr} \
ata \
- ath \
- ${_ath_hal} \
- ath_rate_amrr \
+- ath_rate_onoe \
- ath_rate_sample \
-- ath_rate_onoe \
aue \
${_auxio} \
${_awi} \
-@@ -90,7 +85,6 @@
+@@ -94,7 +89,6 @@
${_hfa} \
hifn \
hme \
@@ -136,22 +141,17 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -164,14 +158,12 @@
- nfsclient \
- nfsserver \
- nge \
-- ${_nve} \
- nmdm \
- ${_nsp} \
+@@ -175,9 +169,7 @@
ntfs \
ntfs_iconv \
nullfs \
+- ${_nve} \
${_nwfs} \
- ${_oltr} \
${_osf1} \
${_padlock} \
patm \
-@@ -318,7 +310,6 @@
+@@ -328,7 +320,6 @@
_apm= apm
_ar= ar
_arcnet= arcnet
@@ -159,7 +159,7 @@
_awi= awi
_bktr= bktr
_cardbus= cardbus
-@@ -350,7 +341,6 @@
+@@ -361,7 +352,6 @@
_ndis= ndis
_nsp= nsp
_nwfs= nwfs
@@ -167,7 +167,7 @@
_pccard= pccard
_pcfclock= pcfclock
_pecoff= pecoff
-@@ -387,14 +377,12 @@
+@@ -398,14 +388,12 @@
_dpt= dpt
_el= el
_ex= ex
@@ -182,7 +182,7 @@
.if !defined(NO_CRYPT) || defined(ALL_MODULES)
.if exists(${.CURDIR}/../crypto/via)
_padlock= padlock
-@@ -427,14 +415,12 @@
+@@ -438,14 +426,12 @@
#_acpi= acpi # doesn't work on amd64 yet
_agp= agp
_arcmsr= arcmsr
@@ -197,7 +197,7 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -445,7 +431,6 @@
+@@ -456,7 +442,6 @@
#_lnc= lnc
_mly= mly
_ndis= ndis
@@ -205,18 +205,19 @@
_safe= safe
_scsi_low= scsi_low
_smbfs= smbfs
-diff -ur sys.old/amd64/conf/GENERIC sys/amd64/conf/GENERIC
---- sys.old/amd64/conf/GENERIC 2006-02-27 10:04:33.000000000 +0100
-+++ sys/amd64/conf/GENERIC 2006-02-27 09:57:22.000000000 +0100
+Index: sys/amd64/conf/GENERIC
+===================================================================
+--- sys/amd64/conf/GENERIC.orig 2006-05-01 02:15:12.000000000 +0200
++++ sys/amd64/conf/GENERIC 2006-06-24 17:52:55.886830000 +0200
@@ -117,7 +117,6 @@
device arcmsr # Areca SATA II RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
-device hptmv # Highpoint RocketRAID 182x
+ device rr232x # Highpoint RocketRAID 232x
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
- device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -184,7 +183,6 @@
+@@ -189,7 +188,6 @@
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device lge # Level 1 LXT1001 gigabit Ethernet
device nge # NatSemi DP83820 gigabit Ethernet
@@ -224,10 +225,11 @@
device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
-diff -ur sys.old/conf/files.amd64 sys/conf/files.amd64
---- sys.old/conf/files.amd64 2006-02-27 10:04:53.000000000 +0100
-+++ sys/conf/files.amd64 2006-02-27 09:56:50.000000000 +0100
-@@ -47,32 +47,6 @@
+Index: sys/conf/files.amd64
+===================================================================
+--- sys/conf/files.amd64.orig 2006-05-01 02:15:11.000000000 +0200
++++ sys/conf/files.amd64 2006-06-24 17:52:40.407973000 +0200
+@@ -47,31 +47,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -256,11 +258,10 @@
- dependency "$S/dev/hptmv/amd64-elf.raid.o.uu" \
- compile-with "uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \
- no-implicit-rule
--#
- amd64/acpica/OsdEnvironment.c optional acpi
- amd64/acpica/acpi_machdep.c optional acpi
- amd64/acpica/acpi_wakeup.c optional acpi
-@@ -156,11 +130,6 @@
+ rr232x_lib.o optional rr232x \
+ dependency "$S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \
+ compile-with "uudecode < $S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \
+@@ -160,11 +135,6 @@
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
@@ -272,11 +273,11 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
-@@ -168,7 +137,6 @@
+@@ -172,7 +142,6 @@
dev/kbd/kbd.c optional sc
dev/kbd/kbd.c optional ukbd
dev/mem/memutil.c optional mem
-dev/nve/if_nve.c optional nve pci
- dev/ppc/ppc.c optional ppc
- dev/ppc/ppc_puc.c optional ppc puc
- dev/sio/sio.c optional sio
+ dev/rr232x/os_bsd.c optional rr232x
+ dev/rr232x/osm_bsd.c optional rr232x
+ dev/rr232x/rr232x_config.c optional rr232x
Modified: trunk/kfreebsd-6/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/904_dev_full.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/904_dev_full.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,8 +1,10 @@
Status: Rejected in upstream (kern/68961)
---- /usr/local/src/sys/dev/null/null.c 2005-02-27 17:00:45.000000000 -0500
-+++ sys/dev/null/null.c 2005-09-03 20:03:19.000000000 -0400
+Index: sys/dev/null/null.c
+===================================================================
+--- sys/dev/null/null.c.orig 2005-02-27 23:00:45.000000000 +0100
++++ sys/dev/null/null.c 2006-06-24 17:42:51.000000000 +0200
@@ -42,13 +42,16 @@
/* For use with destroy_dev(9). */
Modified: trunk/kfreebsd-6/debian/patches/905_grow_arg_max.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/905_grow_arg_max.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/905_grow_arg_max.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -2,8 +2,10 @@
I'm growing this variable to match with Linux's because too many packages
assume it too big and fail to build or run. -- rmh
---- sys/sys/syslimits.h~ 2005-12-17 13:58:47.000000000 +0100
-+++ sys/sys/syslimits.h 2005-12-17 14:04:07.000000000 +0100
+Index: sys/sys/syslimits.h
+===================================================================
+--- sys/sys/syslimits.h.orig 2005-03-02 22:33:29.000000000 +0100
++++ sys/sys/syslimits.h 2006-06-24 17:42:56.000000000 +0200
@@ -47,7 +47,7 @@
* the file for why.)
*/
Modified: trunk/kfreebsd-6/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/906_grow_sysv_ipc_limits.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/906_grow_sysv_ipc_limits.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -22,10 +22,12 @@
You might also want to configure your kernel to lock shared memory into RAM and prevent it from being paged out to swap. Use the sysctl setting kern.ipc.shm_use_phys.
</quote>
---- sys/i386/conf/GENERIC~ 2005-02-01 21:44:25.000000000 +0100
-+++ sys/i386/conf/GENERIC 2005-02-01 21:47:12.000000000 +0100
-@@ -49,8 +49,14 @@
- options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI
+Index: sys/i386/conf/GENERIC
+===================================================================
+--- sys/i386/conf/GENERIC.orig 2006-06-24 17:39:05.000000000 +0200
++++ sys/i386/conf/GENERIC 2006-06-24 17:42:59.000000000 +0200
+@@ -53,8 +53,14 @@
+ options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
+options SHMMAXPGS=4096
@@ -39,8 +41,10 @@
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
---- sys.old/amd64/conf/GENERIC 2006-02-27 10:18:19.000000000 +0100
-+++ sys/amd64/conf/GENERIC 2006-02-27 10:18:57.000000000 +0100
+Index: sys/amd64/conf/GENERIC
+===================================================================
+--- sys/amd64/conf/GENERIC.orig 2006-06-24 17:41:46.000000000 +0200
++++ sys/amd64/conf/GENERIC 2006-06-24 17:42:59.000000000 +0200
@@ -54,8 +54,14 @@
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
Modified: trunk/kfreebsd-6/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/907_cpu_class.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/907_cpu_class.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,9 +1,11 @@
Status: Rejected in upstream (kern/77355).
---- sys/i386/i386/identcpu.c.old 2005-02-08 05:02:33.000000000 +0100
-+++ sys/i386/i386/identcpu.c 2005-02-08 05:05:09.000000000 +0100
-@@ -604,6 +604,7 @@
+Index: sys/i386/i386/identcpu.c
+===================================================================
+--- sys/i386/i386/identcpu.c.orig 2006-04-24 20:24:30.000000000 +0200
++++ sys/i386/i386/identcpu.c 2006-06-24 17:43:03.000000000 +0200
+@@ -611,6 +611,7 @@
#if defined(I486_CPU)
case CPUCLASS_486:
printf("486");
@@ -11,7 +13,7 @@
bzero_vector = i486_bzero;
break;
#endif
-@@ -614,6 +615,7 @@
+@@ -621,6 +622,7 @@
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("586");
@@ -19,7 +21,7 @@
break;
#endif
#if defined(I686_CPU)
-@@ -623,6 +625,7 @@
+@@ -630,6 +632,7 @@
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("686");
Modified: trunk/kfreebsd-6/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/908_linprocfs_is_not_proc.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/908_linprocfs_is_not_proc.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,5 +1,7 @@
---- sys/compat/linprocfs/linprocfs.c~ 2005-08-01 01:20:40.000000000 +0200
-+++ sys/compat/linprocfs/linprocfs.c 2005-08-01 01:40:21.000000000 +0200
+Index: sys/compat/linprocfs/linprocfs.c
+===================================================================
+--- sys/compat/linprocfs/linprocfs.c.orig 2006-06-24 17:33:15.000000000 +0200
++++ sys/compat/linprocfs/linprocfs.c 2006-06-24 17:43:07.000000000 +0200
@@ -381,10 +381,6 @@
/* determine fs type */
Modified: trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,5 +1,7 @@
---- sys/i386/conf/GENERIC.hints.orig
-+++ sys/i386/conf/GENERIC.hints
+Index: sys/i386/conf/GENERIC.hints
+===================================================================
+--- sys/i386/conf/GENERIC.hints.orig 2005-01-14 07:54:59.000000000 +0100
++++ sys/i386/conf/GENERIC.hints 2006-06-24 17:43:10.000000000 +0200
@@ -27,6 +27,7 @@
hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
@@ -8,8 +10,10 @@
hint.vga.0.at="isa"
hint.sc.0.at="isa"
hint.sc.0.flags="0x100"
---- sys.old/amd64/conf/GENERIC.hints 2006-02-27 10:04:33.000000000 +0100
-+++ sys/amd64/conf/GENERIC.hints 2006-02-27 10:19:52.000000000 +0100
+Index: sys/amd64/conf/GENERIC.hints
+===================================================================
+--- sys/amd64/conf/GENERIC.hints.orig 2004-07-23 00:28:34.000000000 +0200
++++ sys/amd64/conf/GENERIC.hints 2006-06-24 17:43:10.000000000 +0200
@@ -14,6 +14,7 @@
hint.atkbd.0.flags="0x1"
hint.psm.0.at="atkbdc"
Modified: trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,9 +1,11 @@
Disabled because of FTBFS. Needless to say, it should be eventualy reenabled.
---- sys/conf/files.i386~ 2005-12-16 23:24:04.000000000 +0100
-+++ sys/conf/files.i386 2005-12-16 23:24:52.000000000 +0100
-@@ -160,11 +160,6 @@
+Index: sys/conf/files.i386
+===================================================================
+--- sys/conf/files.i386.orig 2006-06-24 17:39:05.000000000 +0200
++++ sys/conf/files.i386 2006-06-24 17:43:13.000000000 +0200
+@@ -157,11 +157,6 @@
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
dev/fe/if_fe_isa.c optional fe isa
@@ -15,9 +17,11 @@
dev/ichwd/ichwd.c optional ichwd
dev/if_ndis/if_ndis.c optional ndis
dev/if_ndis/if_ndis_pccard.c optional ndis pccard
---- sys/conf/files~ 2005-12-17 14:11:01.000000000 +0100
-+++ sys/conf/files 2005-12-17 19:36:16.000000000 +0100
-@@ -579,8 +579,6 @@
+Index: sys/conf/files
+===================================================================
+--- sys/conf/files.orig 2006-06-24 17:39:05.000000000 +0200
++++ sys/conf/files 2006-06-24 17:43:13.000000000 +0200
+@@ -590,8 +590,6 @@
dev/hme/if_hme.c optional hme
dev/hme/if_hme_pci.c optional hme pci
dev/hme/if_hme_sbus.c optional hme sbus
@@ -26,9 +30,11 @@
dev/ichsmb/ichsmb.c optional ichsmb
dev/ichsmb/ichsmb_pci.c optional ichsmb pci
dev/ida/ida.c optional ida
---- sys/modules/Makefile~ 2005-12-17 20:03:14.000000000 +0100
-+++ sys/modules/Makefile 2005-12-18 11:11:40.000000000 +0100
-@@ -85,7 +85,6 @@
+Index: sys/modules/Makefile
+===================================================================
+--- sys/modules/Makefile.orig 2006-06-24 17:40:30.000000000 +0200
++++ sys/modules/Makefile 2006-06-24 17:43:13.000000000 +0200
+@@ -89,7 +89,6 @@
${_hfa} \
hifn \
hme \
@@ -36,9 +42,11 @@
${_i2c} \
${_ibcs2} \
${_ichwd} \
---- sys/conf/files.amd64~ 2006-02-27 09:56:50.000000000 +0100
-+++ sys/conf/files.amd64 2006-02-27 10:21:10.000000000 +0100
-@@ -130,9 +130,6 @@
+Index: sys/conf/files.amd64
+===================================================================
+--- sys/conf/files.amd64.orig 2006-06-24 17:42:39.000000000 +0200
++++ sys/conf/files.amd64 2006-06-24 17:43:13.000000000 +0200
+@@ -135,9 +135,6 @@
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
Modified: trunk/kfreebsd-6/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/999_config.diff 2006-06-24 18:11:31 UTC (rev 1610)
+++ trunk/kfreebsd-6/debian/patches/999_config.diff 2006-06-24 18:12:41 UTC (rev 1611)
@@ -1,8 +1,9 @@
-diff -ur sys.old/amd64/conf/GENERIC sys/amd64/conf/GENERIC
---- sys.old/amd64/conf/GENERIC 2006-04-28 11:25:35.000000000 +0200
-+++ sys/amd64/conf/GENERIC 2006-04-28 11:36:55.000000000 +0200
+Index: sys/amd64/conf/GENERIC
+===================================================================
+--- sys/amd64/conf/GENERIC.orig 2006-06-24 17:57:48.000000000 +0200
++++ sys/amd64/conf/GENERIC 2006-06-24 17:57:48.000000000 +0200
@@ -19,13 +19,9 @@
- # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.6.2.1 2005/10/28 19:22:41 jhb Exp $
+ # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.9.2.2 2006/05/01 00:15:12 scottl Exp $
machine amd64
-cpu HAMMER
@@ -60,7 +61,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -163,10 +157,6 @@
+@@ -167,10 +161,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -71,7 +72,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -227,13 +217,8 @@
+@@ -232,13 +222,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -85,7 +86,7 @@
# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
-@@ -249,12 +234,8 @@
+@@ -254,12 +239,8 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -98,7 +99,7 @@
# USB Ethernet, requires miibus
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
-@@ -267,3 +248,11 @@
+@@ -272,3 +253,11 @@
device firewire # FireWire bus code
device sbp # SCSI over FireWire (Requires scbus and da)
device fwe # Ethernet over FireWire (non-standard!)
@@ -110,11 +111,12 @@
+options ALTQ_RIO # RED In/Out
+options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC)
+options ALTQ_PRIQ # Priority Queuing (PRIQ)
-diff -ur sys.old/i386/conf/GENERIC sys/i386/conf/GENERIC
---- sys.old/i386/conf/GENERIC 2006-04-28 11:25:35.000000000 +0200
-+++ sys/i386/conf/GENERIC 2006-04-28 11:36:47.000000000 +0200
+Index: sys/i386/conf/GENERIC
+===================================================================
+--- sys/i386/conf/GENERIC.orig 2006-06-24 17:57:48.000000000 +0200
++++ sys/i386/conf/GENERIC 2006-06-24 17:57:48.000000000 +0200
@@ -19,15 +19,9 @@
- # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.3.2.1 2005/10/28 19:22:41 jhb Exp $
+ # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.7.2.2 2006/05/01 00:15:12 scottl Exp $
machine i386
-cpu I486_CPU
@@ -165,7 +167,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -173,10 +168,6 @@
+@@ -177,10 +172,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -176,7 +178,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -241,13 +232,8 @@
+@@ -243,13 +234,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -190,7 +192,7 @@
# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
-@@ -263,12 +249,8 @@
+@@ -265,12 +251,8 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -203,7 +205,7 @@
# USB Ethernet, requires miibus
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
-@@ -281,3 +263,11 @@
+@@ -283,3 +265,11 @@
device firewire # FireWire bus code
device sbp # SCSI over FireWire (Requires scbus and da)
device fwe # Ethernet over FireWire (non-standard!)
More information about the Glibc-bsd-commits
mailing list