[Glibc-bsd-commits] r2075 - in trunk/kfreebsd-6/debian: . patches
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Sun Dec 9 12:46:57 UTC 2007
Author: aurel32
Date: 2007-12-09 12:46:57 +0000 (Sun, 09 Dec 2007)
New Revision: 2075
Modified:
trunk/kfreebsd-6/debian/changelog
trunk/kfreebsd-6/debian/patches/000_nfe.diff
trunk/kfreebsd-6/debian/patches/001_misc.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/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/010_ET_DYN.diff
trunk/kfreebsd-6/debian/patches/013_ip_packed.diff
trunk/kfreebsd-6/debian/patches/017_oss_compat.diff
trunk/kfreebsd-6/debian/patches/020_linker.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/911_no_werror.diff
trunk/kfreebsd-6/debian/patches/912_binutils.diff
trunk/kfreebsd-6/debian/patches/913_uudecode.diff
trunk/kfreebsd-6/debian/patches/999_config.diff
Log:
* Refresh all patches.
Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/changelog 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,3 +1,10 @@
+kfreebsd-6 (6.3~cvs20071209-2) UNRELEASED; urgency=low
+
+ [ Aurelien Jarno ]
+ * Refresh all patches.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sun, 09 Dec 2007 13:46:22 +0100
+
kfreebsd-6 (6.3~cvs20071209-1) experimental; urgency=low
[ Petr Salinger ]
Modified: trunk/kfreebsd-6/debian/patches/000_nfe.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/000_nfe.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/000_nfe.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,7 +1,7 @@
Index: sys/dev/nfe/if_nfe.c
===================================================================
---- /dev/null
-+++ sys/dev/nfe/if_nfe.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sys/dev/nfe/if_nfe.c 2007-12-09 00:43:15.000000000 +0100
@@ -0,0 +1,2231 @@
+/* $OpenBSD: if_nfe.c,v 1.54 2006/04/07 12:38:12 jsg Exp $ */
+
@@ -2236,8 +2236,8 @@
+}
Index: sys/dev/nfe/if_nfereg.h
===================================================================
---- /dev/null
-+++ sys/dev/nfe/if_nfereg.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sys/dev/nfe/if_nfereg.h 2007-12-09 00:43:15.000000000 +0100
@@ -0,0 +1,248 @@
+/* $OpenBSD: if_nfereg.h,v 1.16 2006/02/22 19:23:44 damien Exp $ */
+
@@ -2489,8 +2489,8 @@
+#define NFE_DEBUG_ALL 0xFFFF
Index: sys/dev/nfe/if_nfevar.h
===================================================================
---- /dev/null
-+++ sys/dev/nfe/if_nfevar.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sys/dev/nfe/if_nfevar.h 2007-12-09 00:43:15.000000000 +0100
@@ -0,0 +1,124 @@
+/* $OpenBSD: if_nfevar.h,v 1.11 2006/02/19 13:57:02 damien Exp $ */
+
@@ -2618,8 +2618,8 @@
+};
Index: sys/modules/nfe/Makefile
===================================================================
---- /dev/null
-+++ sys/modules/nfe/Makefile
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sys/modules/nfe/Makefile 2007-12-09 00:43:15.000000000 +0100
@@ -0,0 +1,6 @@
+.PATH: ${.CURDIR}/../../dev/nfe
+
@@ -2629,8 +2629,8 @@
+.include <bsd.kmod.mk>
Index: sys/modules/Makefile
===================================================================
---- sys/modules/Makefile.orig
-+++ sys/modules/Makefile
+--- sys/modules/Makefile.orig 2007-12-09 00:42:53.000000000 +0100
++++ sys/modules/Makefile 2007-12-09 13:44:56.657300000 +0100
@@ -176,6 +176,7 @@
${_ncv} \
${_ndis} \
@@ -2641,8 +2641,8 @@
nge \
Index: sys/amd64/conf/GENERIC
===================================================================
---- sys/amd64/conf/GENERIC.orig
-+++ sys/amd64/conf/GENERIC
+--- sys/amd64/conf/GENERIC.orig 2007-12-09 00:42:01.000000000 +0100
++++ sys/amd64/conf/GENERIC 2007-12-09 13:44:56.712637000 +0100
@@ -189,6 +189,7 @@
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device lge # Level 1 LXT1001 gigabit Ethernet
@@ -2653,8 +2653,8 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
Index: sys/i386/conf/GENERIC
===================================================================
---- sys/i386/conf/GENERIC.orig
-+++ sys/i386/conf/GENERIC
+--- sys/i386/conf/GENERIC.orig 2007-12-09 00:42:43.000000000 +0100
++++ sys/i386/conf/GENERIC 2007-12-09 13:44:56.615779000 +0100
@@ -198,6 +198,7 @@
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device lge # Level 1 LXT1001 gigabit Ethernet
@@ -2665,8 +2665,8 @@
device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc')
Index: sys/pc98/conf/GENERIC
===================================================================
---- sys/pc98/conf/GENERIC.orig
-+++ sys/pc98/conf/GENERIC
+--- sys/pc98/conf/GENERIC.orig 2007-12-09 00:43:07.000000000 +0100
++++ sys/pc98/conf/GENERIC 2007-12-09 00:43:15.000000000 +0100
@@ -167,6 +167,7 @@
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
@@ -2677,8 +2677,8 @@
device re # RealTek 8139C+/8169/8169S/8110S
Index: sys/conf/files
===================================================================
---- sys/conf/files.orig
-+++ sys/conf/files
+--- sys/conf/files.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/files 2007-12-09 13:44:56.459542000 +0100
@@ -794,6 +794,7 @@
dev/my/if_my.c optional my
dev/ncv/ncr53c500.c optional ncv
Modified: trunk/kfreebsd-6/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/001_misc.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/001_misc.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -4,8 +4,8 @@
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
+--- sys/conf/kern.mk.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/kern.mk 2007-12-09 00:43:15.000000000 +0100
@@ -1,5 +1,9 @@
# $FreeBSD: src/sys/conf/kern.mk,v 1.45 2005/03/31 22:53:58 peter Exp $
@@ -50,10 +50,10 @@
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
+--- sys/conf/kern.post.mk.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/kern.post.mk 2007-12-09 13:44:58.232674000 +0100
@@ -1,5 +1,15 @@
- # $FreeBSD: src/sys/conf/kern.post.mk,v 1.83.2.1 2005/11/16 10:03:02 ru Exp $
+ # $FreeBSD: src/sys/conf/kern.post.mk,v 1.83.2.3 2006/11/01 18:55:32 ru Exp $
+.if !defined(OPSYS)
+OPSYS!= uname -s
Modified: trunk/kfreebsd-6/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/003_glibc_dev_aicasm.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/003_glibc_dev_aicasm.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,7 +1,7 @@
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
+--- sys/dev/aic7xxx/aicasm/Makefile.orig 2007-12-09 00:42:18.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/Makefile 2007-12-09 00:43:15.000000000 +0100
@@ -14,7 +14,7 @@
SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
@@ -27,8 +27,8 @@
.endif
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
+--- sys/dev/aic7xxx/aicasm/aicasm.h.orig 2007-12-09 00:42:18.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm.h 2007-12-09 00:43:15.000000000 +0100
@@ -42,8 +42,9 @@
* $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.17 2005/01/06 01:42:27 imp Exp $
*/
@@ -43,8 +43,8 @@
#endif
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
+--- sys/dev/aic7xxx/aicasm/aicasm_gram.y.orig 2007-12-09 00:42:18.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_gram.y 2007-12-09 00:43:15.000000000 +0100
@@ -52,8 +52,9 @@
#include <string.h>
#include <sysexits.h>
@@ -59,8 +59,8 @@
#endif
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
+--- sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y.orig 2007-12-09 00:42:18.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y 2007-12-09 00:43:15.000000000 +0100
@@ -52,8 +52,9 @@
#include <string.h>
#include <sysexits.h>
@@ -75,8 +75,8 @@
#endif
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
+--- sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l.orig 2007-12-09 00:42:18.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l 2007-12-09 00:43:15.000000000 +0100
@@ -51,8 +51,10 @@
#include <stdio.h>
#include <string.h>
@@ -92,8 +92,8 @@
#endif
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
+--- sys/dev/aic7xxx/aicasm/aicasm_scan.l.orig 2007-12-09 00:42:19.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_scan.l 2007-12-09 00:43:15.000000000 +0100
@@ -51,8 +51,10 @@
#include <stdio.h>
#include <string.h>
@@ -109,8 +109,8 @@
#endif
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
+--- sys/dev/aic7xxx/aicasm/aicasm_symbol.c.orig 2007-12-09 00:42:19.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_symbol.c 2007-12-09 00:43:15.000000000 +0100
@@ -44,10 +44,11 @@
#include <sys/types.h>
@@ -128,8 +128,8 @@
#include <inttypes.h>
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
+--- sys/dev/aic7xxx/aicasm/aicasm_symbol.h.orig 2007-12-09 00:42:19.000000000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_symbol.h 2007-12-09 00:43:15.000000000 +0100
@@ -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 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/004_xargs.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -3,8 +3,8 @@
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
+--- sys/conf/kmod.mk.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/kmod.mk 2007-12-09 13:44:58.285072000 +0100
@@ -206,7 +206,7 @@
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
@@ -16,8 +16,8 @@
.if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
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
+--- sys/contrib/dev/acpica/acpica_prep.sh.orig 2007-12-09 00:42:12.000000000 +0100
++++ sys/contrib/dev/acpica/acpica_prep.sh 2007-12-09 00:43:15.000000000 +0100
@@ -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 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/005_binutils.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -3,8 +3,8 @@
Index: sys/i386/i386/locore.s
===================================================================
---- sys/i386/i386/locore.s.orig
-+++ sys/i386/i386/locore.s
+--- sys/i386/i386/locore.s.orig 2007-12-09 00:42:43.000000000 +0100
++++ sys/i386/i386/locore.s 2007-12-09 00:43:15.000000000 +0100
@@ -358,7 +358,7 @@
pushl %eax
testl $PSL_VM,UC_EFLAGS(%eax)
@@ -34,8 +34,8 @@
pushl %eax /* junk to fake return addr. */
Index: sys/i386/i386/swtch.s
===================================================================
---- sys/i386/i386/swtch.s.orig
-+++ sys/i386/i386/swtch.s
+--- sys/i386/i386/swtch.s.orig 2007-12-09 00:42:44.000000000 +0100
++++ sys/i386/i386/swtch.s 2007-12-09 00:43:15.000000000 +0100
@@ -111,7 +111,7 @@
movl %ebp,PCB_EBP(%edx)
movl %esi,PCB_ESI(%edx)
@@ -65,8 +65,8 @@
Index: sys/i386/include/cpufunc.h
===================================================================
---- sys/i386/include/cpufunc.h.orig
-+++ sys/i386/include/cpufunc.h
+--- sys/i386/include/cpufunc.h.orig 2007-12-09 00:42:44.000000000 +0100
++++ sys/i386/include/cpufunc.h 2007-12-09 00:43:15.000000000 +0100
@@ -452,7 +452,7 @@
rfs(void)
{
@@ -111,8 +111,8 @@
static __inline void
Index: sys/i386/linux/linux_locore.s
===================================================================
---- sys/i386/linux/linux_locore.s.orig
-+++ sys/i386/linux/linux_locore.s
+--- sys/i386/linux/linux_locore.s.orig 2007-12-09 00:42:45.000000000 +0100
++++ sys/i386/linux/linux_locore.s 2007-12-09 00:43:15.000000000 +0100
@@ -8,7 +8,7 @@
NON_GPROF_ENTRY(linux_sigcode)
call *LINUX_SIGF_HANDLER(%esp)
@@ -133,8 +133,8 @@
int $0x80 /* enter kernel with args */
Index: sys/compat/ndis/winx32_wrap.S
===================================================================
---- sys/compat/ndis/winx32_wrap.S.orig
-+++ sys/compat/ndis/winx32_wrap.S
+--- sys/compat/ndis/winx32_wrap.S.orig 2007-12-09 00:42:10.000000000 +0100
++++ sys/compat/ndis/winx32_wrap.S 2007-12-09 00:43:15.000000000 +0100
@@ -364,7 +364,7 @@
ret
@@ -146,8 +146,8 @@
ENTRY(x86_gettid)
Index: sys/amd64/amd64/cpu_switch.S
===================================================================
---- sys/amd64/amd64/cpu_switch.S.orig
-+++ sys/amd64/amd64/cpu_switch.S
+--- sys/amd64/amd64/cpu_switch.S.orig 2007-12-09 00:42:01.000000000 +0100
++++ sys/amd64/amd64/cpu_switch.S 2007-12-09 00:43:15.000000000 +0100
@@ -105,10 +105,10 @@
jz 1f /* no, skip over */
@@ -184,8 +184,8 @@
1:
Index: sys/amd64/ia32/ia32_signal.c
===================================================================
---- sys/amd64/ia32/ia32_signal.c.orig
-+++ sys/amd64/ia32/ia32_signal.c
+--- sys/amd64/ia32/ia32_signal.c.orig 2007-12-09 00:42:01.000000000 +0100
++++ sys/amd64/ia32/ia32_signal.c 2007-12-09 00:43:15.000000000 +0100
@@ -360,8 +360,8 @@
sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
sf.sf_uc.uc_mcontext.mc_gs = rgs();
@@ -210,8 +210,8 @@
sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
Index: sys/amd64/include/cpufunc.h
===================================================================
---- sys/amd64/include/cpufunc.h.orig
-+++ sys/amd64/include/cpufunc.h
+--- sys/amd64/include/cpufunc.h.orig 2007-12-09 00:42:02.000000000 +0100
++++ sys/amd64/include/cpufunc.h 2007-12-09 00:43:15.000000000 +0100
@@ -482,7 +482,7 @@
rfs(void)
{
@@ -290,8 +290,8 @@
Index: sys/amd64/linux32/linux32_sysvec.c
===================================================================
---- sys/amd64/linux32/linux32_sysvec.c.orig
-+++ sys/amd64/linux32/linux32_sysvec.c
+--- sys/amd64/linux32/linux32_sysvec.c.orig 2007-12-09 00:42:02.000000000 +0100
++++ sys/amd64/linux32/linux32_sysvec.c 2007-12-09 00:43:15.000000000 +0100
@@ -344,9 +344,9 @@
frame.sf_sc.uc_mcontext.sc_mask = frame.sf_sc.uc_sigmask.__bits[0];
frame.sf_sc.uc_mcontext.sc_gs = rgs();
@@ -317,8 +317,8 @@
frame.sf_sc.sc_ebp = regs->tf_rbp;
Index: sys/amd64/ia32/ia32_sigtramp.S
===================================================================
---- sys/amd64/ia32/ia32_sigtramp.S.orig
-+++ sys/amd64/ia32/ia32_sigtramp.S
+--- sys/amd64/ia32/ia32_sigtramp.S.orig 2007-12-09 00:42:01.000000000 +0100
++++ sys/amd64/ia32/ia32_sigtramp.S 2007-12-09 00:43:15.000000000 +0100
@@ -45,8 +45,8 @@
calll *IA32_SIGF_HANDLER(%esp)
leal IA32_SIGF_UC(%esp),%eax /* get ucontext */
@@ -343,8 +343,8 @@
int $0x80 /* enter kernel with args */
Index: sys/amd64/linux32/linux32_locore.s
===================================================================
---- sys/amd64/linux32/linux32_locore.s.orig
-+++ sys/amd64/linux32/linux32_locore.s
+--- sys/amd64/linux32/linux32_locore.s.orig 2007-12-09 00:42:02.000000000 +0100
++++ sys/amd64/linux32/linux32_locore.s 2007-12-09 00:43:15.000000000 +0100
@@ -11,10 +11,10 @@
NON_GPROF_ENTRY(linux_sigcode)
call *LINUX_SIGF_HANDLER(%esp)
Modified: trunk/kfreebsd-6/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/007_clone_signals.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/007_clone_signals.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,8 +1,8 @@
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 @@
+--- sys/kern/kern_fork.c.orig 2007-12-09 00:42:49.000000000 +0100
++++ sys/kern/kern_fork.c 2007-12-09 00:43:15.000000000 +0100
+@@ -511,7 +511,11 @@
p2->p_sigacts = newsigacts;
}
if (flags & RFLINUXTHPN)
@@ -17,8 +17,8 @@
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
+--- sys/sys/unistd.h.orig 2007-12-09 00:43:13.000000000 +0100
++++ sys/sys/unistd.h 2007-12-09 00:43:15.000000000 +0100
@@ -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 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/008_config.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -5,8 +5,8 @@
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
+--- usr.sbin/config/Makefile.orig 2007-12-09 00:43:15.000000000 +0100
++++ usr.sbin/config/Makefile 2007-12-09 00:43:16.000000000 +0100
@@ -6,11 +6,11 @@
SRCS= config.y main.c lang.l mkmakefile.c mkheaders.c \
mkoptions.c y.tab.h
@@ -24,8 +24,8 @@
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
+--- usr.sbin/config/main.c.orig 2007-12-09 00:43:15.000000000 +0100
++++ usr.sbin/config/main.c 2007-12-09 00:43:16.000000000 +0100
@@ -45,13 +45,19 @@
#include <sys/stat.h>
#include <sys/file.h>
Modified: trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -3,8 +3,8 @@
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
+--- sys/conf/Makefile.alpha.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/Makefile.alpha 2007-12-09 00:43:16.000000000 +0100
@@ -28,6 +28,8 @@
.endif
.include "$S/conf/kern.pre.mk"
@@ -16,8 +16,8 @@
%OBJS
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
+--- sys/conf/Makefile.amd64.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/Makefile.amd64 2007-12-09 00:43:16.000000000 +0100
@@ -38,6 +38,8 @@
MKMODULESENV+= MACHINE=amd64
@@ -29,9 +29,9 @@
%OBJS
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
-@@ -101,6 +101,8 @@
+--- sys/conf/Makefile.arm.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/Makefile.arm 2007-12-09 00:43:16.000000000 +0100
+@@ -102,6 +102,8 @@
rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
inflate-tramp.o
@@ -42,8 +42,8 @@
%OBJS
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
+--- sys/conf/Makefile.i386.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/Makefile.i386 2007-12-09 00:43:16.000000000 +0100
@@ -32,6 +32,8 @@
MKMODULESENV+= MACHINE=i386
@@ -55,8 +55,8 @@
%OBJS
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
+--- sys/conf/Makefile.ia64.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/Makefile.ia64 2007-12-09 00:43:16.000000000 +0100
@@ -38,6 +38,8 @@
ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
@@ -68,8 +68,8 @@
%OBJS
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
+--- sys/conf/Makefile.pc98.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/Makefile.pc98 2007-12-09 00:43:16.000000000 +0100
@@ -32,6 +32,8 @@
MKMODULESENV+= MACHINE=pc98
@@ -81,8 +81,8 @@
%OBJS
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
+--- sys/conf/Makefile.powerpc.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/Makefile.powerpc 2007-12-09 00:43:16.000000000 +0100
@@ -37,6 +37,8 @@
CFLAGS+= -fno-omit-frame-pointer
.endif
@@ -94,8 +94,8 @@
%OBJS
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
+--- sys/conf/Makefile.sparc64.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/Makefile.sparc64 2007-12-09 00:43:16.000000000 +0100
@@ -32,6 +32,8 @@
MDOBJS= exception.o interrupt.o
@@ -107,8 +107,8 @@
%OBJS
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
+--- usr.sbin/config/mkmakefile.c.orig 2007-12-09 00:43:15.000000000 +0100
++++ usr.sbin/config/mkmakefile.c 2007-12-09 00:43:16.000000000 +0100
@@ -70,6 +70,7 @@
static void do_rules(FILE *);
static void do_xxfiles(char *, FILE *);
Modified: trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -2,9 +2,9 @@
Index: sys/kern/imgact_elf.c
===================================================================
---- sys/kern/imgact_elf.c.orig 2006-03-16 01:25:31.000000000 +0100
-+++ sys/kern/imgact_elf.c 2006-06-24 17:37:23.000000000 +0200
-@@ -610,6 +610,8 @@
+--- sys/kern/imgact_elf.c.orig 2007-12-09 00:42:49.000000000 +0100
++++ sys/kern/imgact_elf.c 2007-12-09 00:43:16.000000000 +0100
+@@ -615,6 +615,8 @@
char *path;
struct thread *td = curthread;
struct sysentvec *sv;
@@ -13,7 +13,7 @@
/*
* Do we have a valid ELF header ?
-@@ -649,10 +651,26 @@
+@@ -656,10 +658,26 @@
hdr->e_ident[EI_OSABI]);
return (ENOEXEC);
}
@@ -41,7 +41,7 @@
interp = brand_info->interp_newpath;
/*
-@@ -693,7 +711,7 @@
+@@ -701,7 +719,7 @@
if ((error = __elfN(load_section)(vmspace,
imgp->object, phdr[i].p_offset,
@@ -50,7 +50,7 @@
phdr[i].p_memsz, phdr[i].p_filesz, prot,
sv->sv_pagesize)) != 0)
return (error);
-@@ -707,11 +725,12 @@
+@@ -715,11 +733,12 @@
if (phdr[i].p_offset == 0 &&
hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize
<= phdr[i].p_filesz)
@@ -64,7 +64,7 @@
/*
* Is this .text or .data? We can't use
-@@ -733,7 +752,7 @@
+@@ -741,7 +760,7 @@
phdr[i].p_memsz)) {
text_size = seg_size;
text_addr = seg_addr;
@@ -73,7 +73,7 @@
} else {
data_size = seg_size;
data_addr = seg_addr;
-@@ -741,7 +760,7 @@
+@@ -749,7 +768,7 @@
total_size += seg_size;
break;
case PT_PHDR: /* Program header table info */
Modified: trunk/kfreebsd-6/debian/patches/013_ip_packed.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/013_ip_packed.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/013_ip_packed.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,7 +1,7 @@
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
+--- sys/netinet/ip.h.orig 2007-12-09 00:43:03.000000000 +0100
++++ sys/netinet/ip.h 2007-12-09 00:43:16.000000000 +0100
@@ -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 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/017_oss_compat.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,8 +1,8 @@
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 @@
+--- sys/dev/sound/pcm/mixer.c.orig 2007-12-09 00:42:36.000000000 +0100
++++ sys/dev/sound/pcm/mixer.c 2007-12-09 00:43:16.000000000 +0100
+@@ -629,6 +629,9 @@
if ((cmd & MIXER_READ(0)) == MIXER_READ(0)) {
switch (j) {
@@ -14,8 +14,8 @@
case SOUND_MIXER_STEREODEVS:
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
+--- sys/sys/soundcard.h.orig 2007-12-09 00:43:13.000000000 +0100
++++ sys/sys/soundcard.h 2007-12-09 00:43:16.000000000 +0100
@@ -54,11 +54,14 @@
*/
Modified: trunk/kfreebsd-6/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/020_linker.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/020_linker.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -4,10 +4,11 @@
for details see http://sourceware.org/bugzilla/show_bug.cgi?id=5391
-diff -u sys/conf/kern.post.mk sys/conf/kern.post.mk
---- sys/conf/kern.post.mk
-+++ sys/conf/kern.post.mk
-@@ -82,7 +92,9 @@
+Index: sys/conf/kern.post.mk
+===================================================================
+--- sys/conf/kern.post.mk.orig 2007-12-09 00:43:15.000000000 +0100
++++ sys/conf/kern.post.mk 2007-12-09 00:43:16.000000000 +0100
+@@ -92,7 +92,9 @@
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@rm -f ${.TARGET}
@echo linking ${.TARGET}
@@ -18,9 +19,10 @@
.if !defined(DEBUG)
${OBJCOPY} --strip-debug ${.TARGET}
.endif
-diff -u sys/conf/kmod.mk sys/conf/kmod.mk
---- sys/conf/kmod.mk
-+++ sys/conf/kmod.mk
+Index: sys/conf/kmod.mk
+===================================================================
+--- sys/conf/kmod.mk.orig 2007-12-09 00:43:15.000000000 +0100
++++ sys/conf/kmod.mk 2007-12-09 00:43:16.000000000 +0100
@@ -179,7 +179,8 @@
.if ${MACHINE_ARCH} != amd64
Modified: trunk/kfreebsd-6/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/902_version.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/902_version.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,7 +1,7 @@
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
+--- sys/conf/newvers.sh.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/newvers.sh 2007-12-09 00:43:16.000000000 +0100
@@ -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 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,7 +1,7 @@
Index: sys/conf/files
===================================================================
---- sys/conf/files.orig
-+++ sys/conf/files
+--- sys/conf/files.orig 2007-12-09 00:43:15.000000000 +0100
++++ sys/conf/files 2007-12-09 00:43:16.000000000 +0100
@@ -440,18 +440,6 @@
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
@@ -23,8 +23,8 @@
dev/awi/if_awi_pccard.c optional awi pccard
Index: sys/conf/files.i386
===================================================================
---- sys/conf/files.i386.orig
-+++ sys/conf/files.i386
+--- sys/conf/files.i386.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/files.i386 2007-12-09 00:43:16.000000000 +0100
@@ -46,42 +46,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
@@ -96,8 +96,8 @@
dev/sbni/if_sbni_pci.c optional sbni pci
Index: sys/conf/kern.pre.mk
===================================================================
---- sys/conf/kern.pre.mk.orig
-+++ sys/conf/kern.pre.mk
+--- sys/conf/kern.pre.mk.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/kern.pre.mk 2007-12-09 00:43:16.000000000 +0100
@@ -58,9 +58,6 @@
# ... and the same for pf
INCLUDES+= -I$S/contrib/pf
@@ -110,8 +110,8 @@
Index: sys/i386/conf/GENERIC
===================================================================
---- sys/i386/conf/GENERIC.orig
-+++ sys/i386/conf/GENERIC
+--- sys/i386/conf/GENERIC.orig 2007-12-09 00:43:15.000000000 +0100
++++ sys/i386/conf/GENERIC 2007-12-09 13:44:47.719404000 +0100
@@ -117,8 +117,6 @@
device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
@@ -131,8 +131,8 @@
device rl # RealTek 8129/8139
Index: sys/modules/Makefile
===================================================================
---- sys/modules/Makefile.orig
-+++ sys/modules/Makefile
+--- sys/modules/Makefile.orig 2007-12-09 00:43:15.000000000 +0100
++++ sys/modules/Makefile 2007-12-09 00:43:16.000000000 +0100
@@ -26,11 +26,6 @@
${_arl} \
${_asr} \
@@ -228,8 +228,8 @@
_smbfs= smbfs
Index: sys/amd64/conf/GENERIC
===================================================================
---- sys/amd64/conf/GENERIC.orig
-+++ sys/amd64/conf/GENERIC
+--- sys/amd64/conf/GENERIC.orig 2007-12-09 00:43:15.000000000 +0100
++++ sys/amd64/conf/GENERIC 2007-12-09 13:44:47.773178000 +0100
@@ -116,8 +116,6 @@
device arcmsr # Areca SATA II RAID
device ciss # Compaq Smart RAID 5*
@@ -249,8 +249,8 @@
device rl # RealTek 8129/8139
Index: sys/conf/files.amd64
===================================================================
---- sys/conf/files.amd64.orig
-+++ sys/conf/files.amd64
+--- sys/conf/files.amd64.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/files.amd64 2007-12-09 00:43:16.000000000 +0100
@@ -47,35 +47,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
Modified: trunk/kfreebsd-6/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/904_dev_full.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/904_dev_full.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -3,8 +3,8 @@
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
+--- sys/dev/null/null.c.orig 2007-12-09 00:42:32.000000000 +0100
++++ sys/dev/null/null.c 2007-12-09 00:43:16.000000000 +0100
@@ -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 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/905_grow_arg_max.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -4,8 +4,8 @@
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
+--- sys/sys/syslimits.h.orig 2007-12-09 00:43:13.000000000 +0100
++++ sys/sys/syslimits.h 2007-12-09 00:43:16.000000000 +0100
@@ -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 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/906_grow_sysv_ipc_limits.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -24,9 +24,9 @@
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 @@
+--- sys/i386/conf/GENERIC.orig 2007-12-09 00:43:16.000000000 +0100
++++ sys/i386/conf/GENERIC 2007-12-09 13:44:30.249158000 +0100
+@@ -52,8 +52,14 @@
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
@@ -40,12 +40,12 @@
+options SEMMAP=256
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
+ options ADAPTIVE_GIANT # Giant mutex is adaptive.
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 @@
+--- sys/amd64/conf/GENERIC.orig 2007-12-09 00:43:16.000000000 +0100
++++ sys/amd64/conf/GENERIC 2007-12-09 13:44:30.196688000 +0100
+@@ -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
@@ -59,4 +59,4 @@
+options SEMMAP=256
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
+ options ADAPTIVE_GIANT # Giant mutex is adaptive.
Modified: trunk/kfreebsd-6/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/907_cpu_class.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/907_cpu_class.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -3,9 +3,9 @@
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 @@
+--- sys/i386/i386/identcpu.c.orig 2007-12-09 00:42:43.000000000 +0100
++++ sys/i386/i386/identcpu.c 2007-12-09 00:43:16.000000000 +0100
+@@ -628,6 +628,7 @@
#if defined(I486_CPU)
case CPUCLASS_486:
printf("486");
@@ -13,7 +13,7 @@
bzero_vector = i486_bzero;
break;
#endif
-@@ -621,6 +622,7 @@
+@@ -638,6 +639,7 @@
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("586");
@@ -21,7 +21,7 @@
break;
#endif
#if defined(I686_CPU)
-@@ -630,6 +632,7 @@
+@@ -647,6 +649,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 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/908_linprocfs_is_not_proc.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,8 +1,8 @@
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 @@
+--- sys/compat/linprocfs/linprocfs.c.orig 2007-12-09 00:42:10.000000000 +0100
++++ sys/compat/linprocfs/linprocfs.c 2007-12-09 00:43:16.000000000 +0100
+@@ -412,10 +412,6 @@
/* determine fs type */
fstype = mp->mnt_stat.f_fstypename;
@@ -11,5 +11,5 @@
- else if (strcmp(fstype, "procfs") == 0)
- continue;
- sbuf_printf(sb, "%s %s %s %s", mntfrom, mntto, fstype,
- mp->mnt_stat.f_flags & MNT_RDONLY ? "ro" : "rw");
+ if (strcmp(fstype, "linsysfs") == 0) {
+ sbuf_printf(sb, "/sys %s sysfs %s", mntto,
Modified: trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,7 +1,7 @@
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
+--- sys/i386/conf/GENERIC.hints.orig 2007-12-09 00:42:43.000000000 +0100
++++ sys/i386/conf/GENERIC.hints 2007-12-09 00:43:16.000000000 +0100
@@ -27,6 +27,7 @@
hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
@@ -12,10 +12,10 @@
hint.sc.0.flags="0x100"
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"
+--- sys/amd64/conf/GENERIC.hints.orig 2007-12-09 00:42:01.000000000 +0100
++++ sys/amd64/conf/GENERIC.hints 2007-12-09 00:43:16.000000000 +0100
+@@ -13,6 +13,7 @@
+ hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
hint.psm.0.irq="12"
+hint.psm.0.flags="0x100"
Modified: trunk/kfreebsd-6/debian/patches/911_no_werror.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/911_no_werror.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/911_no_werror.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -2,8 +2,8 @@
Index: sys/modules/hwpmc/Makefile
===================================================================
---- sys/modules/hwpmc/Makefile.orig 2006-06-25 11:03:50.000000000 +0200
-+++ sys/modules/hwpmc/Makefile 2006-06-25 11:04:06.000000000 +0200
+--- sys/modules/hwpmc/Makefile.orig 2007-12-09 00:42:54.000000000 +0100
++++ sys/modules/hwpmc/Makefile 2007-12-09 00:43:16.000000000 +0100
@@ -9,6 +9,7 @@
SRCS= hwpmc_mod.c hwpmc_logging.c vnode_if.h
Modified: trunk/kfreebsd-6/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/912_binutils.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/912_binutils.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,13 +1,14 @@
---- sys/conf/ldscript.amd64.orig 2007-01-01 23:54:36.000000000 +0100
-+++ sys/conf/ldscript.amd64 2007-01-01 23:55:05.000000000 +0100
-@@ -1,5 +1,5 @@
+Index: sys/conf/ldscript.amd64
+===================================================================
+--- sys/conf/ldscript.amd64.orig 2007-12-09 00:42:11.000000000 +0100
++++ sys/conf/ldscript.amd64 2007-12-09 00:43:16.000000000 +0100
+@@ -1,12 +1,12 @@
/* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9 2004/05/29 01:09:00 tjr Exp $ */
-OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
+OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
OUTPUT_ARCH(i386:x86-64)
ENTRY(btext)
SEARCH_DIR("/usr/lib");
-@@ -6,7 +6,7 @@
SECTIONS
{
/* Read-only sections, merged into text segment: */
Modified: trunk/kfreebsd-6/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/913_uudecode.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/913_uudecode.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,6 +1,7 @@
-diff -ur sys.orig/modules/cxgb/Makefile sys/modules/cxgb/Makefile
---- sys.orig/modules/cxgb/Makefile 2007-05-30 18:42:07.000000000 +0200
-+++ sys/modules/cxgb/Makefile
+Index: sys/modules/cxgb/Makefile
+===================================================================
+--- sys/modules/cxgb/Makefile.orig 2007-12-09 00:42:54.000000000 +0100
++++ sys/modules/cxgb/Makefile 2007-12-09 00:43:17.000000000 +0100
@@ -15,7 +15,7 @@
.if ${MACHINE_ARCH} != "ia64"
# ld is broken on ia64
Modified: trunk/kfreebsd-6/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/999_config.diff 2007-12-09 12:44:05 UTC (rev 2074)
+++ trunk/kfreebsd-6/debian/patches/999_config.diff 2007-12-09 12:46:57 UTC (rev 2075)
@@ -1,9 +1,9 @@
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
+--- sys/amd64/conf/GENERIC.orig 2007-12-09 00:43:16.000000000 +0100
++++ sys/amd64/conf/GENERIC 2007-12-09 00:43:17.000000000 +0100
@@ -19,13 +19,9 @@
- # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.9.2.2 2006/05/01 00:15:12 scottl Exp $
+ # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.18 2007/03/27 02:33:00 yongari Exp $
machine amd64
-cpu HAMMER
@@ -15,9 +15,9 @@
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+hints "GENERIC.hints" # Default places to look for devices.
- #options SCHED_ULE # ULE scheduler
options SCHED_4BSD # 4BSD scheduler
-@@ -44,6 +40,7 @@
+ options PREEMPTION # Enable kernel thread preemption
+@@ -43,6 +39,7 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -25,7 +25,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_GPT # GUID Partition Tables.
options COMPAT_43 # Needed by COMPAT_LINUX32
-@@ -51,7 +48,7 @@
+@@ -50,7 +47,7 @@
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_LINUX32 # Compatible with i386 linux binaries
@@ -33,8 +33,8 @@
+options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
- options SYSVMSG # SYSV-style message queues
-@@ -67,16 +64,10 @@
+ options SHMMAXPGS=4096
+@@ -68,16 +65,10 @@
# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
device atpic # 8259A compatability
@@ -51,7 +51,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -84,6 +75,8 @@
+@@ -85,6 +76,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -60,7 +60,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -162,10 +155,6 @@
+@@ -165,10 +158,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -71,7 +71,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -215,9 +215,6 @@
+@@ -226,9 +215,6 @@
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device an # Aironet 4500/4800 802.11 wireless NICs.
@@ -81,7 +81,7 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-@@ -228,13 +217,8 @@
+@@ -237,13 +223,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -95,7 +95,7 @@
# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
-@@ -250,12 +234,8 @@
+@@ -259,12 +240,8 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -108,7 +108,7 @@
# USB Ethernet, requires miibus
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
-@@ -268,3 +248,11 @@
+@@ -277,3 +254,11 @@
device firewire # FireWire bus code
device sbp # SCSI over FireWire (Requires scbus and da)
device fwe # Ethernet over FireWire (non-standard!)
@@ -122,10 +122,10 @@
+options ALTQ_PRIQ # Priority Queuing (PRIQ)
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
+--- sys/i386/conf/GENERIC.orig 2007-12-09 00:43:16.000000000 +0100
++++ sys/i386/conf/GENERIC 2007-12-09 00:43:17.000000000 +0100
@@ -19,15 +19,9 @@
- # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.7.2.2 2006/05/01 00:15:12 scottl Exp $
+ # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.14 2007/03/27 02:33:00 yongari Exp $
machine i386
-cpu I486_CPU
@@ -139,9 +139,9 @@
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+hints "GENERIC.hints" # Default places to look for devices.
- #options SCHED_ULE # ULE scheduler
options SCHED_4BSD # 4BSD scheduler
-@@ -45,12 +39,14 @@
+ options PREEMPTION # Enable kernel thread preemption
+@@ -44,12 +38,14 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -157,7 +157,7 @@
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
options SHMMAXPGS=4096
-@@ -75,9 +71,6 @@
+@@ -70,9 +66,6 @@
device eisa
device pci
@@ -167,7 +167,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -85,6 +78,8 @@
+@@ -80,6 +73,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -176,7 +176,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -177,10 +172,6 @@
+@@ -175,10 +170,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -187,7 +187,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -228,9 +228,6 @@
+@@ -238,9 +229,6 @@
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device an # Aironet 4500/4800 802.11 wireless NICs.
@@ -197,7 +197,7 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-@@ -243,13 +234,8 @@
+@@ -250,13 +238,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -211,7 +211,7 @@
# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
-@@ -265,12 +251,8 @@
+@@ -272,12 +255,8 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -224,7 +224,7 @@
# USB Ethernet, requires miibus
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
-@@ -283,3 +265,11 @@
+@@ -290,3 +269,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