[Glibc-bsd-commits] r2285 - in trunk/kfreebsd-6/debian: . patches

aurel32 at alioth.debian.org aurel32 at alioth.debian.org
Wed Aug 6 15:23:27 UTC 2008 

Author: aurel32
Date: 2008-08-06 15:23:26 +0000 (Wed, 06 Aug 2008)
New Revision: 2285

Added:
   trunk/kfreebsd-6/debian/patches/920_gcc4.diff
Modified:
   trunk/kfreebsd-6/debian/changelog
   trunk/kfreebsd-6/debian/control.in
   trunk/kfreebsd-6/debian/patches/000_nfe.diff
   trunk/kfreebsd-6/debian/patches/000_sendfile.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/030_abi_cld.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
   trunk/kfreebsd-6/debian/patches/series
   trunk/kfreebsd-6/debian/rules
Log:
  * Bumped Standards-Version to 3.8.0 (no changes).
  * debian/patches/*: convert to patchlevel p1 as requested by the new 
    dpkg-source.



Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/changelog	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,4 +1,4 @@
-kfreebsd-6 (6.3-5) UNSTABLE; urgency=low
+kfreebsd-6 (6.3-5) unstable; urgency=low
 
   [ Petr Salinger ]
   * libdb-dev is now a real package, build-depend only on it.
@@ -6,8 +6,13 @@
     Closes: #474761.
   * add Vcs-* fields into debian/control.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 05 Aug 2008 00:51:59 +0100
+  [ Aurelien Jarno ]
+  * Bumped Standards-Version to 3.8.0 (no changes).
+  * debian/patches/*: convert to patchlevel p1 as requested by the new 
+    dpkg-source.
 
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 05 Aug 2008 14:35:22 +0200
+
 kfreebsd-6 (6.3-4) unstable; urgency=low
 
   * 030_abi_cld.diff: new patch to clear the direction flag before calling 

Modified: trunk/kfreebsd-6/debian/control.in
===================================================================
--- trunk/kfreebsd-6/debian/control.in	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/control.in	2008-08-06 15:23:26 UTC (rev 2285)
@@ -6,7 +6,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
 Build-Depends: debhelper (>= 4.1.0), bzip2, quilt, freebsd-buildutils (>= @major@) [kfreebsd-i386 kfreebsd-amd64] | freebsd6-buildutils (>=  6.2) [kfreebsd-i386 kfreebsd-amd64], libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-3.4 [kfreebsd-i386 kfreebsd-amd64], sharutils
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: kfreebsd-source- at version@
 Architecture: all

Modified: trunk/kfreebsd-6/debian/patches/000_nfe.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/000_nfe.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/000_nfe.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/dev/nfe/if_nfe.c
+Index: src/sys/dev/nfe/if_nfe.c
 ===================================================================
---- /dev/null
-+++ sys/dev/nfe/if_nfe.c
+--- src//dev/null
++++ src/sys/dev/nfe/if_nfe.c
 @@ -0,0 +1,2231 @@
 +/*	$OpenBSD: if_nfe.c,v 1.54 2006/04/07 12:38:12 jsg Exp $	*/
 +
@@ -2234,10 +2234,10 @@
 +
 +	return;
 +}
-Index: sys/dev/nfe/if_nfereg.h
+Index: src/sys/dev/nfe/if_nfereg.h
 ===================================================================
---- /dev/null
-+++ sys/dev/nfe/if_nfereg.h
+--- src//dev/null
++++ src/sys/dev/nfe/if_nfereg.h
 @@ -0,0 +1,248 @@
 +/*	$OpenBSD: if_nfereg.h,v 1.16 2006/02/22 19:23:44 damien Exp $	*/
 +
@@ -2487,10 +2487,10 @@
 +#define NFE_DEBUG_BROKEN	0x0080
 +#define NFE_DEBUG_MII		0x0100
 +#define NFE_DEBUG_ALL		0xFFFF
-Index: sys/dev/nfe/if_nfevar.h
+Index: src/sys/dev/nfe/if_nfevar.h
 ===================================================================
---- /dev/null
-+++ sys/dev/nfe/if_nfevar.h
+--- src//dev/null
++++ src/sys/dev/nfe/if_nfevar.h
 @@ -0,0 +1,124 @@
 +/*	$OpenBSD: if_nfevar.h,v 1.11 2006/02/19 13:57:02 damien Exp $	*/
 +
@@ -2616,10 +2616,10 @@
 +	u_int16_t	dev_id;
 +	char		*name;
 +};
-Index: sys/modules/nfe/Makefile
+Index: src/sys/modules/nfe/Makefile
 ===================================================================
---- /dev/null
-+++ sys/modules/nfe/Makefile
+--- src//dev/null
++++ src/sys/modules/nfe/Makefile
 @@ -0,0 +1,6 @@
 +.PATH: ${.CURDIR}/../../dev/nfe
 +
@@ -2627,10 +2627,10 @@
 +SRCS=	if_nfe.c miibus_if.h opt_bdg.h device_if.h bus_if.h pci_if.h
 +
 +.include <bsd.kmod.mk>
-Index: sys/modules/Makefile
+Index: src/sys/modules/Makefile
 ===================================================================
---- sys/modules/Makefile.orig
-+++ sys/modules/Makefile
+--- src/sys/modules/Makefile.orig
++++ src/sys/modules/Makefile
 @@ -176,6 +176,7 @@
  	${_ncv} \
  	${_ndis} \
@@ -2639,10 +2639,10 @@
  	nfsclient \
  	nfsserver \
  	nge \
-Index: sys/amd64/conf/GENERIC
+Index: src/sys/amd64/conf/GENERIC
 ===================================================================
---- sys/amd64/conf/GENERIC.orig
-+++ sys/amd64/conf/GENERIC
+--- src/sys/amd64/conf/GENERIC.orig
++++ src/sys/amd64/conf/GENERIC
 @@ -189,6 +189,7 @@
  device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
  device		lge		# Level 1 LXT1001 gigabit Ethernet
@@ -2651,10 +2651,10 @@
  device		nge		# NatSemi DP83820 gigabit Ethernet
  device		nve		# nVidia nForce MCP on-board Ethernet Networking
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
-Index: sys/i386/conf/GENERIC
+Index: src/sys/i386/conf/GENERIC
 ===================================================================
---- sys/i386/conf/GENERIC.orig
-+++ sys/i386/conf/GENERIC
+--- src/sys/i386/conf/GENERIC.orig
++++ src/sys/i386/conf/GENERIC
 @@ -198,6 +198,7 @@
  device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
  device		lge		# Level 1 LXT1001 gigabit Ethernet
@@ -2663,10 +2663,10 @@
  device		nge		# NatSemi DP83820 gigabit Ethernet
  device		nve		# nVidia nForce MCP on-board Ethernet Networking
  device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
-Index: sys/pc98/conf/GENERIC
+Index: src/sys/pc98/conf/GENERIC
 ===================================================================
---- sys/pc98/conf/GENERIC.orig
-+++ sys/pc98/conf/GENERIC
+--- src/sys/pc98/conf/GENERIC.orig
++++ src/sys/pc98/conf/GENERIC
 @@ -167,6 +167,7 @@
  device		dc		# DEC/Intel 21143 and various workalikes
  device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
@@ -2675,10 +2675,10 @@
  device		nge		# NatSemi DP83820 gigabit Ethernet
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'lnc')
  device		re		# RealTek 8139C+/8169/8169S/8110S
-Index: sys/conf/files
+Index: src/sys/conf/files
 ===================================================================
---- sys/conf/files.orig
-+++ sys/conf/files
+--- src/sys/conf/files.orig
++++ src/sys/conf/files
 @@ -794,6 +794,7 @@
  dev/my/if_my.c			optional my
  dev/ncv/ncr53c500.c		optional ncv

Modified: trunk/kfreebsd-6/debian/patches/000_sendfile.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/000_sendfile.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/000_sendfile.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,10 +1,10 @@
-Index: sys/kern/kern_descrip.c
+Index: src/sys/kern/kern_descrip.c
 ===================================================================
 RCS file: /home/ncvs/src/sys/kern/kern_descrip.c,v
 retrieving revision 1.313
 diff -u -d -r1.313 kern_descrip.c
---- sys/kern/kern_descrip.c	6 Aug 2007 14:26:00 -0000	1.313
-+++ sys/kern/kern_descrip.c	4 Feb 2008 19:05:42 -0000
+--- src/sys/kern/kern_descrip.c	6 Aug 2007 14:26:00 -0000	1.313
++++ src/sys/kern/kern_descrip.c	4 Feb 2008 19:05:42 -0000
 @@ -2046,7 +2046,7 @@
  	int error;
  
@@ -14,13 +14,13 @@
  		return (error);
  	if (fp->f_vnode == NULL) {
  		error = EINVAL;
-Index: sys/kern/uipc_syscalls.c
+Index: src/sys/kern/uipc_syscalls.c
 ===================================================================
 RCS file: /home/ncvs/src/sys/kern/uipc_syscalls.c,v
 retrieving revision 1.259.2.1
 diff -u -d -r1.259.2.1 uipc_syscalls.c
---- sys/kern/uipc_syscalls.c	1 Feb 2008 22:51:39 -0000	1.259.2.1
-+++ sys/kern/uipc_syscalls.c	4 Feb 2008 19:05:42 -0000
+--- src/sys/kern/uipc_syscalls.c	1 Feb 2008 22:51:39 -0000	1.259.2.1
++++ src/sys/kern/uipc_syscalls.c	4 Feb 2008 19:05:42 -0000
 @@ -1796,20 +1796,23 @@
  		goto out;
  	vfslocked = VFS_LOCK_GIANT(vp->v_mount);

Modified: trunk/kfreebsd-6/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/001_misc.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/001_misc.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -2,10 +2,10 @@
 Status: chflags is BSD-specific.  We could add it to freebsd-utils.
   The rest has been rejected (kern/93502)
 
-Index: sys/conf/kern.mk
+Index: src/sys/conf/kern.mk
 ===================================================================
---- sys/conf/kern.mk.orig
-+++ sys/conf/kern.mk
+--- src/sys/conf/kern.mk.orig
++++ src/sys/conf/kern.mk
 @@ -1,5 +1,9 @@
  # $FreeBSD: src/sys/conf/kern.mk,v 1.45 2005/03/31 22:53:58 peter Exp $
  
@@ -48,10 +48,10 @@
  INLINE_LIMIT?=	8000
  .endif
  
-Index: sys/conf/kern.post.mk
+Index: src/sys/conf/kern.post.mk
 ===================================================================
---- sys/conf/kern.post.mk.orig
-+++ sys/conf/kern.post.mk
+--- src/sys/conf/kern.post.mk.orig
++++ src/sys/conf/kern.post.mk
 @@ -1,5 +1,15 @@
  # $FreeBSD: src/sys/conf/kern.post.mk,v 1.83.2.3 2006/11/01 18:55:32 ru Exp $
  

Modified: trunk/kfreebsd-6/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/003_glibc_dev_aicasm.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/003_glibc_dev_aicasm.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/dev/aic7xxx/aicasm/Makefile
+Index: src/sys/dev/aic7xxx/aicasm/Makefile
 ===================================================================
---- sys/dev/aic7xxx/aicasm/Makefile.orig
-+++ sys/dev/aic7xxx/aicasm/Makefile
+--- src/sys/dev/aic7xxx/aicasm/Makefile.orig
++++ src/sys/dev/aic7xxx/aicasm/Makefile
 @@ -14,7 +14,7 @@
  SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
  CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
@@ -25,10 +25,10 @@
  .ifdef MAKESRCPATH
  CFLAGS+= -I${MAKESRCPATH}
  .endif
-Index: sys/dev/aic7xxx/aicasm/aicasm.h
+Index: src/sys/dev/aic7xxx/aicasm/aicasm.h
 ===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm.h.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm.h
+--- src/sys/dev/aic7xxx/aicasm/aicasm.h.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm.h
 @@ -42,8 +42,9 @@
   * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.17 2005/01/06 01:42:27 imp Exp $
   */
@@ -41,10 +41,10 @@
  #else
  #include <sys/queue.h>
  #endif
-Index: sys/dev/aic7xxx/aicasm/aicasm_gram.y
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_gram.y
 ===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_gram.y.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_gram.y
+--- src/sys/dev/aic7xxx/aicasm/aicasm_gram.y.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_gram.y
 @@ -52,8 +52,9 @@
  #include <string.h>
  #include <sysexits.h>
@@ -57,10 +57,10 @@
  #else
  #include <sys/queue.h>
  #endif
-Index: sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
 ===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+--- src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
 @@ -52,8 +52,9 @@
  #include <string.h>
  #include <sysexits.h>
@@ -73,10 +73,10 @@
  #else
  #include <sys/queue.h>
  #endif
-Index: sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
 ===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+--- src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
 @@ -51,8 +51,10 @@
  #include <stdio.h>
  #include <string.h>
@@ -90,10 +90,10 @@
  #else
  #include <sys/queue.h>
  #endif
-Index: sys/dev/aic7xxx/aicasm/aicasm_scan.l
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_scan.l
 ===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_scan.l.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_scan.l
+--- src/sys/dev/aic7xxx/aicasm/aicasm_scan.l.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_scan.l
 @@ -51,8 +51,10 @@
  #include <stdio.h>
  #include <string.h>
@@ -107,10 +107,10 @@
  #else
  #include <sys/queue.h>
  #endif
-Index: sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
 ===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_symbol.c.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+--- src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
 @@ -44,10 +44,11 @@
  
  #include <sys/types.h>
@@ -126,10 +126,10 @@
  #endif
  #include <fcntl.h>
  #include <inttypes.h>
-Index: sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
 ===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_symbol.h.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+--- src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
 @@ -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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/004_xargs.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,10 +1,10 @@
 
 Status: xargs -J option requested to both upstream and debian.
 
-Index: sys/conf/kmod.mk
+Index: src/sys/conf/kmod.mk
 ===================================================================
---- sys/conf/kmod.mk.orig
-+++ sys/conf/kmod.mk
+--- src/sys/conf/kmod.mk.orig
++++ src/sys/conf/kmod.mk
 @@ -206,7 +206,7 @@
  	grep -v '^#' < ${EXPORT_SYMS} > export_syms
  .endif
@@ -14,10 +14,10 @@
  .endif
  .endif
  .if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
-Index: sys/contrib/dev/acpica/acpica_prep.sh
+Index: src/sys/contrib/dev/acpica/acpica_prep.sh
 ===================================================================
---- sys/contrib/dev/acpica/acpica_prep.sh.orig
-+++ sys/contrib/dev/acpica/acpica_prep.sh
+--- src/sys/contrib/dev/acpica/acpica_prep.sh.orig
++++ src/sys/contrib/dev/acpica/acpica_prep.sh
 @@ -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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/005_binutils.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,10 +1,10 @@
 
 Status: Reported as kern/93331
 
-Index: sys/i386/i386/locore.s
+Index: src/sys/i386/i386/locore.s
 ===================================================================
---- sys/i386/i386/locore.s.orig
-+++ sys/i386/i386/locore.s
+--- src/sys/i386/i386/locore.s.orig
++++ src/sys/i386/i386/locore.s
 @@ -358,7 +358,7 @@
  	pushl	%eax
  	testl	$PSL_VM,UC_EFLAGS(%eax)
@@ -32,10 +32,10 @@
  9:
  	movl	$103,%eax		/* 3.x SYS_sigreturn */
  	pushl	%eax			/* junk to fake return addr. */
-Index: sys/i386/i386/swtch.s
+Index: src/sys/i386/i386/swtch.s
 ===================================================================
---- sys/i386/i386/swtch.s.orig
-+++ sys/i386/i386/swtch.s
+--- src/sys/i386/i386/swtch.s.orig
++++ src/sys/i386/i386/swtch.s
 @@ -111,7 +111,7 @@
  	movl	%ebp,PCB_EBP(%edx)
  	movl	%esi,PCB_ESI(%edx)
@@ -63,10 +63,10 @@
  	pushfl
  	popl	PCB_PSL(%ecx)
  
-Index: sys/i386/include/cpufunc.h
+Index: src/sys/i386/include/cpufunc.h
 ===================================================================
---- sys/i386/include/cpufunc.h.orig
-+++ sys/i386/include/cpufunc.h
+--- src/sys/i386/include/cpufunc.h.orig
++++ src/sys/i386/include/cpufunc.h
 @@ -452,7 +452,7 @@
  rfs(void)
  {
@@ -109,10 +109,10 @@
  }
  
  static __inline void
-Index: sys/i386/linux/linux_locore.s
+Index: src/sys/i386/linux/linux_locore.s
 ===================================================================
---- sys/i386/linux/linux_locore.s.orig
-+++ sys/i386/linux/linux_locore.s
+--- src/sys/i386/linux/linux_locore.s.orig
++++ src/sys/i386/linux/linux_locore.s
 @@ -8,7 +8,7 @@
  NON_GPROF_ENTRY(linux_sigcode)
  	call	*LINUX_SIGF_HANDLER(%esp)
@@ -131,10 +131,10 @@
  	push	%eax				/* fake ret addr */
  	movl	$LINUX_SYS_linux_rt_sigreturn,%eax   /* linux_rt_sigreturn() */
  	int	$0x80				/* enter kernel with args */
-Index: sys/compat/ndis/winx32_wrap.S
+Index: src/sys/compat/ndis/winx32_wrap.S
 ===================================================================
---- sys/compat/ndis/winx32_wrap.S.orig
-+++ sys/compat/ndis/winx32_wrap.S
+--- src/sys/compat/ndis/winx32_wrap.S.orig
++++ src/sys/compat/ndis/winx32_wrap.S
 @@ -364,7 +364,7 @@
  	ret
  
@@ -144,10 +144,10 @@
  	ret
  
  ENTRY(x86_gettid)
-Index: sys/amd64/amd64/cpu_switch.S
+Index: src/sys/amd64/amd64/cpu_switch.S
 ===================================================================
---- sys/amd64/amd64/cpu_switch.S.orig
-+++ sys/amd64/amd64/cpu_switch.S
+--- src/sys/amd64/amd64/cpu_switch.S.orig
++++ src/sys/amd64/amd64/cpu_switch.S
 @@ -105,10 +105,10 @@
  	jz	1f				/* no, skip over */
  
@@ -182,10 +182,10 @@
  	wrmsr
  	jmp	2f
  1:
-Index: sys/amd64/ia32/ia32_signal.c
+Index: src/sys/amd64/ia32/ia32_signal.c
 ===================================================================
---- sys/amd64/ia32/ia32_signal.c.orig
-+++ sys/amd64/ia32/ia32_signal.c
+--- src/sys/amd64/ia32/ia32_signal.c.orig
++++ src/sys/amd64/ia32/ia32_signal.c
 @@ -360,8 +360,8 @@
  	sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
  	sf.sf_uc.uc_mcontext.mc_gs = rgs();
@@ -208,10 +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;
-Index: sys/amd64/include/cpufunc.h
+Index: src/sys/amd64/include/cpufunc.h
 ===================================================================
---- sys/amd64/include/cpufunc.h.orig
-+++ sys/amd64/include/cpufunc.h
+--- src/sys/amd64/include/cpufunc.h.orig
++++ src/sys/amd64/include/cpufunc.h
 @@ -482,7 +482,7 @@
  rfs(void)
  {
@@ -288,10 +288,10 @@
  }
  #endif
  
-Index: sys/amd64/linux32/linux32_sysvec.c
+Index: src/sys/amd64/linux32/linux32_sysvec.c
 ===================================================================
---- sys/amd64/linux32/linux32_sysvec.c.orig
-+++ sys/amd64/linux32/linux32_sysvec.c
+--- src/sys/amd64/linux32/linux32_sysvec.c.orig
++++ src/sys/amd64/linux32/linux32_sysvec.c
 @@ -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();
@@ -315,10 +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;
-Index: sys/amd64/ia32/ia32_sigtramp.S
+Index: src/sys/amd64/ia32/ia32_sigtramp.S
 ===================================================================
---- sys/amd64/ia32/ia32_sigtramp.S.orig
-+++ sys/amd64/ia32/ia32_sigtramp.S
+--- src/sys/amd64/ia32/ia32_sigtramp.S.orig
++++ src/sys/amd64/ia32/ia32_sigtramp.S
 @@ -45,8 +45,8 @@
  	calll	*IA32_SIGF_HANDLER(%esp)
  	leal	IA32_SIGF_UC(%esp),%eax	/* get ucontext */
@@ -341,10 +341,10 @@
  	movl	$344,%eax		/* 4.x SYS_sigreturn */
  	pushl	%eax			/* junk to fake return addr. */
  	int	$0x80			/* enter kernel with args */
-Index: sys/amd64/linux32/linux32_locore.s
+Index: src/sys/amd64/linux32/linux32_locore.s
 ===================================================================
---- sys/amd64/linux32/linux32_locore.s.orig
-+++ sys/amd64/linux32/linux32_locore.s
+--- src/sys/amd64/linux32/linux32_locore.s.orig
++++ src/sys/amd64/linux32/linux32_locore.s
 @@ -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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/007_clone_signals.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/kern/kern_fork.c
+Index: src/sys/kern/kern_fork.c
 ===================================================================
---- sys/kern/kern_fork.c.orig
-+++ sys/kern/kern_fork.c
+--- src/sys/kern/kern_fork.c.orig
++++ src/sys/kern/kern_fork.c
 @@ -511,7 +511,11 @@
  		p2->p_sigacts = newsigacts;
  	}
@@ -15,10 +15,10 @@
  	else
  	        p2->p_sigparent = SIGCHLD;
  
-Index: sys/sys/unistd.h
+Index: src/sys/sys/unistd.h
 ===================================================================
---- sys/sys/unistd.h.orig
-+++ sys/sys/unistd.h
+--- src/sys/sys/unistd.h.orig
++++ src/sys/sys/unistd.h
 @@ -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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/008_config.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -3,10 +3,10 @@
 Status: gotta uncomment WARNS (see #351366), and find a portable way to add
   "-lbsd".  after this it can be sent upstream.
 
-Index: usr.sbin/config/Makefile
+Index: src/usr.sbin/config/Makefile
 ===================================================================
---- usr.sbin/config/Makefile.orig
-+++ usr.sbin/config/Makefile
+--- src/usr.sbin/config/Makefile.orig
++++ src/usr.sbin/config/Makefile
 @@ -6,11 +6,11 @@
  SRCS=	config.y main.c lang.l mkmakefile.c mkheaders.c \
  	mkoptions.c y.tab.h
@@ -22,10 +22,10 @@
  
  mkmakefile.o: configvers.h
  
-Index: usr.sbin/config/main.c
+Index: src/usr.sbin/config/main.c
 ===================================================================
---- usr.sbin/config/main.c.orig
-+++ usr.sbin/config/main.c
+--- src/usr.sbin/config/main.c.orig
++++ src/usr.sbin/config/main.c
 @@ -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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,10 +1,10 @@
 
 Status: in upstream BTS
 
-Index: sys/conf/Makefile.alpha
+Index: src/sys/conf/Makefile.alpha
 ===================================================================
---- sys/conf/Makefile.alpha.orig
-+++ sys/conf/Makefile.alpha
+--- src/sys/conf/Makefile.alpha.orig
++++ src/sys/conf/Makefile.alpha
 @@ -28,6 +28,8 @@
  .endif
  .include "$S/conf/kern.pre.mk"
@@ -14,10 +14,10 @@
  %BEFORE_DEPEND
  
  %OBJS
-Index: sys/conf/Makefile.amd64
+Index: src/sys/conf/Makefile.amd64
 ===================================================================
---- sys/conf/Makefile.amd64.orig
-+++ sys/conf/Makefile.amd64
+--- src/sys/conf/Makefile.amd64.orig
++++ src/sys/conf/Makefile.amd64
 @@ -38,6 +38,8 @@
  
  MKMODULESENV+= MACHINE=amd64
@@ -27,10 +27,10 @@
  %BEFORE_DEPEND
  
  %OBJS
-Index: sys/conf/Makefile.arm
+Index: src/sys/conf/Makefile.arm
 ===================================================================
---- sys/conf/Makefile.arm.orig
-+++ sys/conf/Makefile.arm
+--- src/sys/conf/Makefile.arm.orig
++++ src/sys/conf/Makefile.arm
 @@ -102,6 +102,8 @@
  	rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
  	inflate-tramp.o
@@ -40,10 +40,10 @@
  %BEFORE_DEPEND
  
  %OBJS
-Index: sys/conf/Makefile.i386
+Index: src/sys/conf/Makefile.i386
 ===================================================================
---- sys/conf/Makefile.i386.orig
-+++ sys/conf/Makefile.i386
+--- src/sys/conf/Makefile.i386.orig
++++ src/sys/conf/Makefile.i386
 @@ -32,6 +32,8 @@
  
  MKMODULESENV+= MACHINE=i386
@@ -53,10 +53,10 @@
  %BEFORE_DEPEND
  
  %OBJS
-Index: sys/conf/Makefile.ia64
+Index: src/sys/conf/Makefile.ia64
 ===================================================================
---- sys/conf/Makefile.ia64.orig
-+++ sys/conf/Makefile.ia64
+--- src/sys/conf/Makefile.ia64.orig
++++ src/sys/conf/Makefile.ia64
 @@ -38,6 +38,8 @@
  
  ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
@@ -66,10 +66,10 @@
  %BEFORE_DEPEND
  
  %OBJS
-Index: sys/conf/Makefile.pc98
+Index: src/sys/conf/Makefile.pc98
 ===================================================================
---- sys/conf/Makefile.pc98.orig
-+++ sys/conf/Makefile.pc98
+--- src/sys/conf/Makefile.pc98.orig
++++ src/sys/conf/Makefile.pc98
 @@ -32,6 +32,8 @@
  
  MKMODULESENV+=	MACHINE=pc98
@@ -79,10 +79,10 @@
  %BEFORE_DEPEND
  
  %OBJS
-Index: sys/conf/Makefile.powerpc
+Index: src/sys/conf/Makefile.powerpc
 ===================================================================
---- sys/conf/Makefile.powerpc.orig
-+++ sys/conf/Makefile.powerpc
+--- src/sys/conf/Makefile.powerpc.orig
++++ src/sys/conf/Makefile.powerpc
 @@ -37,6 +37,8 @@
  CFLAGS+=	-fno-omit-frame-pointer
  .endif
@@ -92,10 +92,10 @@
  %BEFORE_DEPEND
  
  %OBJS
-Index: sys/conf/Makefile.sparc64
+Index: src/sys/conf/Makefile.sparc64
 ===================================================================
---- sys/conf/Makefile.sparc64.orig
-+++ sys/conf/Makefile.sparc64
+--- src/sys/conf/Makefile.sparc64.orig
++++ src/sys/conf/Makefile.sparc64
 @@ -32,6 +32,8 @@
  
  MDOBJS=	exception.o interrupt.o
@@ -105,10 +105,10 @@
  %BEFORE_DEPEND
  
  %OBJS
-Index: usr.sbin/config/mkmakefile.c
+Index: src/usr.sbin/config/mkmakefile.c
 ===================================================================
---- usr.sbin/config/mkmakefile.c.orig
-+++ usr.sbin/config/mkmakefile.c
+--- src/usr.sbin/config/mkmakefile.c.orig
++++ src/usr.sbin/config/mkmakefile.c
 @@ -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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,9 +1,9 @@
 
 
-Index: sys/kern/imgact_elf.c
+Index: src/sys/kern/imgact_elf.c
 ===================================================================
---- sys/kern/imgact_elf.c.orig
-+++ sys/kern/imgact_elf.c
+--- src/sys/kern/imgact_elf.c.orig
++++ src/sys/kern/imgact_elf.c
 @@ -615,6 +615,8 @@
  	char *path;
  	struct thread *td = curthread;

Modified: trunk/kfreebsd-6/debian/patches/013_ip_packed.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/013_ip_packed.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/013_ip_packed.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/netinet/ip.h
+Index: src/sys/netinet/ip.h
 ===================================================================
---- sys/netinet/ip.h.orig
-+++ sys/netinet/ip.h
+--- src/sys/netinet/ip.h.orig
++++ src/sys/netinet/ip.h
 @@ -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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/017_oss_compat.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/dev/sound/pcm/mixer.c
+Index: src/sys/dev/sound/pcm/mixer.c
 ===================================================================
---- sys/dev/sound/pcm/mixer.c.orig
-+++ sys/dev/sound/pcm/mixer.c
+--- src/sys/dev/sound/pcm/mixer.c.orig
++++ src/sys/dev/sound/pcm/mixer.c
 @@ -629,6 +629,9 @@
  
      	if ((cmd & MIXER_READ(0)) == MIXER_READ(0)) {
@@ -12,10 +12,10 @@
      		case SOUND_MIXER_DEVMASK:
      		case SOUND_MIXER_CAPS:
      		case SOUND_MIXER_STEREODEVS:
-Index: sys/sys/soundcard.h
+Index: src/sys/sys/soundcard.h
 ===================================================================
---- sys/sys/soundcard.h.orig
-+++ sys/sys/soundcard.h
+--- src/sys/sys/soundcard.h.orig
++++ src/sys/sys/soundcard.h
 @@ -54,11 +54,14 @@
    */
  

Modified: trunk/kfreebsd-6/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/020_linker.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/020_linker.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -4,10 +4,10 @@
   for details see http://sourceware.org/bugzilla/show_bug.cgi?id=5391
 
 
-Index: sys/conf/kern.post.mk
+Index: src/sys/conf/kern.post.mk
 ===================================================================
---- sys/conf/kern.post.mk.orig
-+++ sys/conf/kern.post.mk
+--- src/sys/conf/kern.post.mk.orig
++++ src/sys/conf/kern.post.mk
 @@ -92,7 +92,9 @@
  ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
  	@rm -f ${.TARGET}
@@ -19,10 +19,10 @@
  .if !defined(DEBUG)
  	${OBJCOPY} --strip-debug ${.TARGET}
  .endif
-Index: sys/conf/kmod.mk
+Index: src/sys/conf/kmod.mk
 ===================================================================
---- sys/conf/kmod.mk.orig
-+++ sys/conf/kmod.mk
+--- src/sys/conf/kmod.mk.orig
++++ src/sys/conf/kmod.mk
 @@ -179,7 +179,8 @@
  
  .if ${MACHINE_ARCH} != amd64

Modified: trunk/kfreebsd-6/debian/patches/030_abi_cld.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/030_abi_cld.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/030_abi_cld.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,6 +1,6 @@
 diff -Nurd sys/amd64/amd64/machdep.c sys/amd64/amd64/machdep.c
---- sys/amd64/amd64/machdep.c	2007-12-19 22:08:33.000000000 +0100
-+++ sys/amd64/amd64/machdep.c	2008-03-06 00:39:32.000000000 +0100
+--- src/sys/amd64/amd64/machdep.c	2007-12-19 22:08:33.000000000 +0100
++++ src/sys/amd64/amd64/machdep.c	2008-03-06 00:39:32.000000000 +0100
 @@ -353,7 +353,7 @@
  
  	regs->tf_rsp = (long)sfp;
@@ -11,8 +11,8 @@
  	PROC_LOCK(p);
  	mtx_lock(&psp->ps_mtx);
 diff -Nurd sys/amd64/ia32/ia32_signal.c sys/amd64/ia32/ia32_signal.c
---- sys/amd64/ia32/ia32_signal.c	2007-05-03 13:13:58.000000000 +0200
-+++ sys/amd64/ia32/ia32_signal.c	2008-03-06 00:40:44.000000000 +0100
+--- src/sys/amd64/ia32/ia32_signal.c	2007-05-03 13:13:58.000000000 +0200
++++ src/sys/amd64/ia32/ia32_signal.c	2008-03-06 00:40:44.000000000 +0100
 @@ -424,7 +424,7 @@
  
  	regs->tf_rsp = (uintptr_t)sfp;
@@ -32,8 +32,8 @@
  	regs->tf_ss = _udatasel;
  	load_ds(_udatasel);
 diff -Nurd sys/amd64/linux32/linux32_sysvec.c sys/amd64/linux32/linux32_sysvec.c
---- sys/amd64/linux32/linux32_sysvec.c	2007-09-03 15:18:42.000000000 +0200
-+++ sys/amd64/linux32/linux32_sysvec.c	2008-03-06 00:43:15.000000000 +0100
+--- src/sys/amd64/linux32/linux32_sysvec.c	2007-09-03 15:18:42.000000000 +0200
++++ src/sys/amd64/linux32/linux32_sysvec.c	2008-03-06 00:43:15.000000000 +0100
 @@ -390,7 +390,7 @@
  	regs->tf_rsp = PTROUT(fp);
  	regs->tf_rip = LINUX32_PS_STRINGS - *(p->p_sysent->sv_szsigcode) +
@@ -53,8 +53,8 @@
  	regs->tf_ss = _udatasel;
  	load_ds(_udatasel);
 diff -Nurd sys/i386/i386/machdep.c sys/i386/i386/machdep.c
---- sys/i386/i386/machdep.c	2007-12-19 22:05:43.000000000 +0100
-+++ sys/i386/i386/machdep.c	2008-03-06 00:38:25.000000000 +0100
+--- src/sys/i386/i386/machdep.c	2007-12-19 22:05:43.000000000 +0100
++++ src/sys/i386/i386/machdep.c	2008-03-06 00:38:25.000000000 +0100
 @@ -412,7 +412,7 @@
  
  	regs->tf_esp = (int)fp;
@@ -83,8 +83,8 @@
  	regs->tf_ds = _udatasel;
  	regs->tf_es = _udatasel;
 diff -Nurd sys/i386/linux/linux_sysvec.c sys/i386/linux/linux_sysvec.c
---- sys/i386/linux/linux_sysvec.c	2007-09-03 15:18:42.000000000 +0200
-+++ sys/i386/linux/linux_sysvec.c	2008-03-06 00:42:12.000000000 +0100
+--- src/sys/i386/linux/linux_sysvec.c	2007-09-03 15:18:42.000000000 +0200
++++ src/sys/i386/linux/linux_sysvec.c	2008-03-06 00:42:12.000000000 +0100
 @@ -380,7 +380,7 @@
  	regs->tf_esp = (int)fp;
  	regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode) +
@@ -104,8 +104,8 @@
  	regs->tf_ds = _udatasel;
  	regs->tf_es = _udatasel;
 diff -Nurd sys/i386/svr4/svr4_machdep.c sys/i386/svr4/svr4_machdep.c
---- sys/i386/svr4/svr4_machdep.c	2005-01-06 23:18:17.000000000 +0100
-+++ sys/i386/svr4/svr4_machdep.c	2008-03-06 00:41:36.000000000 +0100
+--- src/sys/i386/svr4/svr4_machdep.c	2005-01-06 23:18:17.000000000 +0100
++++ src/sys/i386/svr4/svr4_machdep.c	2008-03-06 00:41:36.000000000 +0100
 @@ -494,13 +494,13 @@
  	     svr4_szsigcode);
  	tf->tf_cs = GSEL(GUSERLDT_SEL, SEL_UPL);
@@ -123,8 +123,8 @@
  	tf->tf_ds = _udatasel;
  	tf->tf_es = _udatasel;
 diff -Nurd sys/pc98/pc98/machdep.c sys/pc98/pc98/machdep.c
---- sys/pc98/pc98/machdep.c	2007-10-31 12:53:17.000000000 +0100
-+++ sys/pc98/pc98/machdep.c	2008-03-06 00:44:31.000000000 +0100
+--- src/sys/pc98/pc98/machdep.c	2007-10-31 12:53:17.000000000 +0100
++++ src/sys/pc98/pc98/machdep.c	2008-03-06 00:44:31.000000000 +0100
 @@ -384,7 +384,7 @@
  
  	regs->tf_esp = (int)fp;

Modified: trunk/kfreebsd-6/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/902_version.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/902_version.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/conf/newvers.sh
+Index: src/sys/conf/newvers.sh
 ===================================================================
---- sys/conf/newvers.sh.orig
-+++ sys/conf/newvers.sh
+--- src/sys/conf/newvers.sh.orig
++++ src/sys/conf/newvers.sh
 @@ -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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/conf/files
+Index: src/sys/conf/files
 ===================================================================
---- sys/conf/files.orig
-+++ sys/conf/files
+--- src/sys/conf/files.orig
++++ src/sys/conf/files
 @@ -440,18 +440,6 @@
  dev/ata/atapi-cd.c		optional atapicd
  dev/ata/atapi-fd.c		optional atapifd
@@ -21,10 +21,10 @@
  dev/awi/am79c930.c		optional awi
  dev/awi/awi.c			optional awi
  dev/awi/if_awi_pccard.c		optional awi pccard
-Index: sys/conf/files.i386
+Index: src/sys/conf/files.i386
 ===================================================================
---- sys/conf/files.i386.orig
-+++ sys/conf/files.i386
+--- src/sys/conf/files.i386.orig
++++ src/sys/conf/files.i386
 @@ -46,47 +46,6 @@
  	no-obj no-implicit-rule before-depend				\
  	clean		"ukbdmap.h"
@@ -102,10 +102,10 @@
  dev/sbni/if_sbni.c		optional sbni
  dev/sbni/if_sbni_isa.c		optional sbni isa
  dev/sbni/if_sbni_pci.c		optional sbni pci
-Index: sys/conf/kern.pre.mk
+Index: src/sys/conf/kern.pre.mk
 ===================================================================
---- sys/conf/kern.pre.mk.orig
-+++ sys/conf/kern.pre.mk
+--- src/sys/conf/kern.pre.mk.orig
++++ src/sys/conf/kern.pre.mk
 @@ -58,9 +58,6 @@
  # ... and the same for pf
  INCLUDES+= -I$S/contrib/pf
@@ -116,10 +116,10 @@
  # ... and the same for the NgATM stuff
  INCLUDES+= -I$S/contrib/ngatm
  
-Index: sys/i386/conf/GENERIC
+Index: src/sys/i386/conf/GENERIC
 ===================================================================
---- sys/i386/conf/GENERIC.orig
-+++ sys/i386/conf/GENERIC
+--- src/sys/i386/conf/GENERIC.orig
++++ src/sys/i386/conf/GENERIC
 @@ -117,9 +117,6 @@
  device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
  device		ciss		# Compaq Smart RAID 5*
@@ -138,10 +138,10 @@
  device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
-Index: sys/modules/Makefile
+Index: src/sys/modules/Makefile
 ===================================================================
---- sys/modules/Makefile.orig
-+++ sys/modules/Makefile
+--- src/sys/modules/Makefile.orig
++++ src/sys/modules/Makefile
 @@ -26,11 +26,6 @@
  	${_arl} \
  	${_asr} \
@@ -237,10 +237,10 @@
  _safe=		safe
  _scsi_low=	scsi_low
  _smbfs=		smbfs
-Index: sys/amd64/conf/GENERIC
+Index: src/sys/amd64/conf/GENERIC
 ===================================================================
---- sys/amd64/conf/GENERIC.orig
-+++ sys/amd64/conf/GENERIC
+--- src/sys/amd64/conf/GENERIC.orig
++++ src/sys/amd64/conf/GENERIC
 @@ -116,9 +116,6 @@
  device		arcmsr		# Areca SATA II RAID
  device		ciss		# Compaq Smart RAID 5*
@@ -259,10 +259,10 @@
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
-Index: sys/conf/files.amd64
+Index: src/sys/conf/files.amd64
 ===================================================================
---- sys/conf/files.amd64.orig
-+++ sys/conf/files.amd64
+--- src/sys/conf/files.amd64.orig
++++ src/sys/conf/files.amd64
 @@ -47,41 +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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/904_dev_full.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,10 +1,10 @@
 
 Status: Rejected in upstream (kern/68961)
 
-Index: sys/dev/null/null.c
+Index: src/sys/dev/null/null.c
 ===================================================================
---- sys/dev/null/null.c.orig
-+++ sys/dev/null/null.c
+--- src/sys/dev/null/null.c.orig
++++ src/sys/dev/null/null.c
 @@ -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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/905_grow_arg_max.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -2,10 +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
 
-Index: sys/sys/syslimits.h
+Index: src/sys/sys/syslimits.h
 ===================================================================
---- sys/sys/syslimits.h.orig
-+++ sys/sys/syslimits.h
+--- src/sys/sys/syslimits.h.orig
++++ src/sys/sys/syslimits.h
 @@ -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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/906_grow_sysv_ipc_limits.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -22,10 +22,10 @@
     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>
 
-Index: sys/i386/conf/GENERIC
+Index: src/sys/i386/conf/GENERIC
 ===================================================================
---- sys/i386/conf/GENERIC.orig
-+++ sys/i386/conf/GENERIC
+--- src/sys/i386/conf/GENERIC.orig
++++ src/sys/i386/conf/GENERIC
 @@ -52,8 +52,14 @@
  options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
  options 	KTRACE			# ktrace(1) support
@@ -41,10 +41,10 @@
  options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
  options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
  options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
-Index: sys/amd64/conf/GENERIC
+Index: src/sys/amd64/conf/GENERIC
 ===================================================================
---- sys/amd64/conf/GENERIC.orig
-+++ sys/amd64/conf/GENERIC
+--- src/sys/amd64/conf/GENERIC.orig
++++ src/sys/amd64/conf/GENERIC
 @@ -53,8 +53,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	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/907_cpu_class.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,10 +1,10 @@
 
 Status: Rejected in upstream (kern/77355).
 
-Index: sys/i386/i386/identcpu.c
+Index: src/sys/i386/i386/identcpu.c
 ===================================================================
---- sys/i386/i386/identcpu.c.orig
-+++ sys/i386/i386/identcpu.c
+--- src/sys/i386/i386/identcpu.c.orig
++++ src/sys/i386/i386/identcpu.c
 @@ -628,6 +628,7 @@
  #if defined(I486_CPU)
  	case CPUCLASS_486:

Modified: trunk/kfreebsd-6/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/908_linprocfs_is_not_proc.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/908_linprocfs_is_not_proc.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/compat/linprocfs/linprocfs.c
+Index: src/sys/compat/linprocfs/linprocfs.c
 ===================================================================
---- sys/compat/linprocfs/linprocfs.c.orig
-+++ sys/compat/linprocfs/linprocfs.c
+--- src/sys/compat/linprocfs/linprocfs.c.orig
++++ src/sys/compat/linprocfs/linprocfs.c
 @@ -412,10 +412,6 @@
  
  		/* determine fs type */

Modified: trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/i386/conf/GENERIC.hints
+Index: src/sys/i386/conf/GENERIC.hints
 ===================================================================
---- sys/i386/conf/GENERIC.hints.orig
-+++ sys/i386/conf/GENERIC.hints
+--- src/sys/i386/conf/GENERIC.hints.orig
++++ src/sys/i386/conf/GENERIC.hints
 @@ -27,6 +27,7 @@
  hint.atkbd.0.irq="1"
  hint.psm.0.at="atkbdc"
@@ -10,10 +10,10 @@
  hint.vga.0.at="isa"
  hint.sc.0.at="isa"
  hint.sc.0.flags="0x100"
-Index: sys/amd64/conf/GENERIC.hints
+Index: src/sys/amd64/conf/GENERIC.hints
 ===================================================================
---- sys/amd64/conf/GENERIC.hints.orig
-+++ sys/amd64/conf/GENERIC.hints
+--- src/sys/amd64/conf/GENERIC.hints.orig
++++ src/sys/amd64/conf/GENERIC.hints
 @@ -13,6 +13,7 @@
  hint.atkbd.0.irq="1"
  hint.psm.0.at="atkbdc"

Modified: trunk/kfreebsd-6/debian/patches/911_no_werror.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/911_no_werror.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/911_no_werror.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,14 +1,25 @@
 
 
-Index: sys/modules/hwpmc/Makefile
+Index: src/sys/modules/hwpmc/Makefile
 ===================================================================
---- sys/modules/hwpmc/Makefile.orig
-+++ sys/modules/hwpmc/Makefile
+--- src/sys/modules/hwpmc/Makefile.orig
++++ src/sys/modules/hwpmc/Makefile
 @@ -9,6 +9,7 @@
  SRCS=	hwpmc_mod.c hwpmc_logging.c vnode_if.h
  
  WARNS?=	2
 +NO_WERROR?= 1
  
- .if ${MACHINE_ARCH} == "alpha"
- SRCS+=	hwpmc_alpha.c
+ .if ${MACHINE_ARCH} == "amd64"
+ SRCS+=	hwpmc_amd.c hwpmc_piv.c hwpmc_x86.c
+Index: src/sys/modules/geom/geom_eli/Makefile
+===================================================================
+--- src/sys/modules/geom/geom_eli/Makefile.orig
++++ src/sys/modules/geom/geom_eli/Makefile
+@@ -12,5 +12,6 @@
+ SRCS+=	pkcs5v2.c
+ SRCS+=	vnode_if.h
+ WARNS?=	2
++NO_WERROR?= 1
+ 
+ .include <bsd.kmod.mk>

Modified: trunk/kfreebsd-6/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/912_binutils.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/912_binutils.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/conf/ldscript.amd64
+Index: src/sys/conf/ldscript.amd64
 ===================================================================
---- sys/conf/ldscript.amd64.orig
-+++ sys/conf/ldscript.amd64
+--- src/sys/conf/ldscript.amd64.orig
++++ src/sys/conf/ldscript.amd64
 @@ -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")

Modified: trunk/kfreebsd-6/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/913_uudecode.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/913_uudecode.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/modules/cxgb/Makefile
+Index: src/sys/modules/cxgb/Makefile
 ===================================================================
---- sys/modules/cxgb/Makefile.orig
-+++ sys/modules/cxgb/Makefile
+--- src/sys/modules/cxgb/Makefile.orig
++++ src/sys/modules/cxgb/Makefile
 @@ -15,7 +15,7 @@
  .if ${MACHINE_ARCH} != "ia64"
  # ld is broken on ia64

Added: trunk/kfreebsd-6/debian/patches/920_gcc4.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/920_gcc4.diff	                        (rev 0)
+++ trunk/kfreebsd-6/debian/patches/920_gcc4.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -0,0 +1,299 @@
+--- src/sys/fs/ntfs/ntfs.h.orig	2008-01-29 15:06:36.000000000 +0100
++++ src/sys/fs/ntfs/ntfs.h	2008-01-30 05:52:22.000000000 +0100
+@@ -25,7 +25,7 @@
+  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  * SUCH DAMAGE.
+  *
+- * $FreeBSD: src/sys/fs/ntfs/ntfs.h,v 1.19 2004/12/06 20:22:16 phk Exp $
++ * $FreeBSD: src/sys/fs/ntfs/ntfs.h,v 1.20 2005/09/11 15:57:07 rodrigc Exp $
+  */
+ 
+ /*#define NTFS_DEBUG 1*/
+@@ -285,7 +285,6 @@
+ #define	ntfs_bpbl	(daddr_t)((ntmp)->ntm_bps)
+ 
+ #ifdef MALLOC_DECLARE
+-MALLOC_DECLARE(M_NTFSMNT);
+ MALLOC_DECLARE(M_NTFSNTNODE);
+ MALLOC_DECLARE(M_NTFSFNODE);
+ MALLOC_DECLARE(M_NTFSDIR);
+--- src/sys/conf/kern.pre.mk.orig	2008-01-29 15:06:42.000000000 +0100
++++ src/sys/conf/kern.pre.mk	2008-01-30 05:57:22.000000000 +0100
+@@ -46,7 +46,7 @@
+ NOSTDINC= -nostdinc
+ .endif
+ 
+-INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S
++INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S
+ 
+ # This hack lets us use the OpenBSD altq code without spamming a new
+ # include path into contrib'ed source files.
+--- src/sys/conf/kmod.mk.orig	2008-01-29 15:06:42.000000000 +0100
++++ src/sys/conf/kmod.mk	2008-01-30 05:57:29.000000000 +0100
+@@ -87,7 +87,7 @@
+ .else
+ NOSTDINC=	-nostdinc
+ .endif
+-CFLAGS:=	${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*}
++CFLAGS:=	${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*}
+ .if defined(KERNBUILDDIR)
+ CFLAGS+=	-DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h
+ .endif
+--- src/sys/kern/kern_tc.c.orig	2008-01-30 06:18:10.000000000 +0100
++++ src/sys/kern/kern_tc.c	2008-01-30 06:17:38.000000000 +0100
+@@ -61,7 +61,7 @@
+ 	struct timehands	*th_next;
+ };
+ 
+-extern struct timehands th0;
++static struct timehands th0;
+ static struct timehands th9 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th0};
+ static struct timehands th8 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th9};
+ static struct timehands th7 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th8};
+--- src/sys/sys/proc.h.orig	2008-01-30 06:24:23.000000000 +0100
++++ src/sys/sys/proc.h	2008-01-30 06:24:28.000000000 +0100
+@@ -857,7 +857,6 @@
+ extern int nprocs, maxproc;		/* Current and max number of procs. */
+ extern int maxprocperuid;		/* Max procs per uid. */
+ extern u_long ps_arg_cache_limit;
+-extern int sched_quantum;		/* Scheduling quantum in ticks. */
+ 
+ LIST_HEAD(proclist, proc);
+ TAILQ_HEAD(procqueue, proc);
+--- src/sys/net/rtsock.c.orig	2008-01-30 06:34:14.000000000 +0100
++++ src/sys/net/rtsock.c	2008-01-30 06:34:21.000000000 +0100
+@@ -1262,7 +1262,7 @@
+  * Definitions of protocols supported in the ROUTE domain.
+  */
+ 
+-extern struct domain routedomain;		/* or at least forward */
++static struct domain routedomain;		/* or at least forward */
+ 
+ static struct protosw routesw[] = {
+ {
+--- src/sys/sys/protosw.h.orig	2008-01-30 06:45:55.000000000 +0100
++++ src/sys/sys/protosw.h	2008-01-30 06:46:13.000000000 +0100
+@@ -249,7 +249,6 @@
+  * The dummy protocol specific user requests function pointer array is
+  * initialized to the functions below.  All functions return EOPNOTSUPP.
+  */
+-extern	struct pr_usrreqs nousrreqs;
+ 
+ int	pru_abort_notsupp(struct socket *so);
+ int	pru_accept_notsupp(struct socket *so, struct sockaddr **nam);
+--- src/sys/netinet/in_proto.c.orig	2008-01-30 06:53:33.000000000 +0100
++++ src/sys/netinet/in_proto.c	2008-01-30 06:53:48.000000000 +0100
+@@ -69,6 +69,8 @@
+  * TCP/IP protocol family: IP, ICMP, UDP, TCP.
+  */
+ 
++static struct pr_usrreqs nousrreqs;
++
+ #ifdef IPSEC
+ #include <netinet6/ipsec.h>
+ #include <netinet6/ah.h>
+--- src/sys/netinet6/pim6_var.h.orig	2008-01-30 07:01:04.000000000 +0100
++++ src/sys/netinet6/pim6_var.h	2008-01-30 07:01:09.000000000 +0100
+@@ -52,8 +52,6 @@
+ };
+ 
+ #if (defined(KERNEL)) || (defined(_KERNEL))
+-extern struct pim6stat pim6stat;
+-
+ int pim6_input __P((struct mbuf **, int*, int));
+ #endif /* KERNEL */
+
+--- src/sys/net/zlib.c.orig	2008-01-31 17:09:43.000000000 +0100
++++ src/sys/net/zlib.c	2008-01-31 17:09:50.000000000 +0100
+@@ -94,7 +94,7 @@
+ typedef ush FAR ushf;
+ typedef unsigned long  ulg;
+ 
+-extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
++static const char *z_errmsg[10]; /* indexed by 2-zlib_error */
+ /* (size given to avoid silly warnings with Visual C++) */
+ 
+ #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+--- src/sys/amd64/include/md_var.h.orig	2008-01-31 23:25:08.000000000 +0100
++++ src/sys/amd64/include/md_var.h	2008-01-31 23:25:12.000000000 +0100
+@@ -57,8 +57,6 @@
+ extern	uint64_t *vm_page_dump;
+ extern	int	vm_page_dump_size;
+ 
+-extern	struct pcpu __pcpu[];
+-
+ typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss);
+ struct	thread;
+ struct	reg;
+--- src/sys/modules/fdc/Makefile.orig	2008-01-31 23:35:35.000000000 +0100
++++ src/sys/modules/fdc/Makefile	2008-01-31 23:35:38.000000000 +0100
+@@ -1,7 +1,6 @@
+ # $FreeBSD: src/sys/modules/fdc/Makefile,v 1.14 2005/05/10 12:02:15 nyan Exp $
+ 
+ KMOD=	fdc
+-WARNS?=	2
+ 
+ .if ${MACHINE} == "pc98"
+ .PATH:  ${.CURDIR}/../../pc98/cbus
+--- src/sys/modules/cpufreq/Makefile.orig	2008-01-31 23:35:21.000000000 +0100
++++ src/sys/modules/cpufreq/Makefile	2008-01-31 23:35:27.000000000 +0100
+@@ -4,7 +4,6 @@
+ 	${.CURDIR}/../../${MACHINE_ARCH}/cpufreq
+ 
+ KMOD=	cpufreq
+-WARNS?=	2
+ SRCS=	ichss.c
+ SRCS+=	bus_if.h cpufreq_if.h device_if.h pci_if.h
+ 
+--- src/sys/fs/fdescfs/fdesc_vnops.c.orig	2008-02-01 00:17:41.000000000 +0100
++++ src/sys/fs/fdescfs/fdesc_vnops.c	2008-02-01 00:17:57.000000000 +0100
+@@ -74,7 +74,19 @@
+ static vop_reclaim_t	fdesc_reclaim;
+ static vop_setattr_t	fdesc_setattr;
+ 
+-extern struct vop_vector fdesc_vnodeops;
++static struct vop_vector fdesc_vnodeops = {
++	.vop_default =		&default_vnodeops,
++
++	.vop_access =		VOP_NULL,
++	.vop_getattr =		fdesc_getattr,
++	.vop_inactive =		fdesc_inactive,
++	.vop_lookup =		fdesc_lookup,
++	.vop_open =		fdesc_open,
++	.vop_pathconf =		vop_stdpathconf,
++	.vop_readdir =		fdesc_readdir,
++	.vop_reclaim =		fdesc_reclaim,
++	.vop_setattr =		fdesc_setattr,
++};
+ 
+ /*
+  * Initialise cache headers
+@@ -516,16 +528,3 @@
+ 	return (0);
+ }
+ 
+-static struct vop_vector fdesc_vnodeops = {
+-	.vop_default =		&default_vnodeops,
+-
+-	.vop_access =		VOP_NULL,
+-	.vop_getattr =		fdesc_getattr,
+-	.vop_inactive =		fdesc_inactive,
+-	.vop_lookup =		fdesc_lookup,
+-	.vop_open =		fdesc_open,
+-	.vop_pathconf =		vop_stdpathconf,
+-	.vop_readdir =		fdesc_readdir,
+-	.vop_reclaim =		fdesc_reclaim,
+-	.vop_setattr =		fdesc_setattr,
+-};
+--- src/sys/dev/iicbus/iicbus.c.orig	2008-02-01 00:26:25.000000000 +0100
++++ src/sys/dev/iicbus/iicbus.c	2008-02-01 00:26:38.000000000 +0100
+@@ -45,8 +45,6 @@
+ 
+ #define DEVTOIICBUS(dev) ((struct iicbus_device*)device_get_ivars(dev))
+ 
+-static devclass_t iicbus_devclass;
+-
+ /* See comments below for why auto-scanning is a bad idea. */
+ #define SCAN_IICBUS 0
+ 
+@@ -194,6 +192,8 @@
+ 	return (IIC_ENOTSUPP);
+ }
+ 
++devclass_t iicbus_devclass;
++
+ DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_devclass, 0, 0);
+ DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_devclass, 0, 0);
+ DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_devclass, 0, 0);
+--- src/./sys/amd64/include/smp.h.orig	2008-02-01 10:37:18.000000000 +0100
++++ src/./sys/amd64/include/smp.h	2008-02-01 10:37:27.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include <machine/frame.h>
+ #include <machine/intr_machdep.h>
+ #include <machine/apicvar.h>
++#include <machine/pcb.h>
+ 
+ /* global symbols in mpboot.S */
+ extern char			mptramp_start[];
+--- src/sys/amd64/amd64/mp_machdep.c.orig	2008-02-01 11:27:17.000000000 +0100
++++ src/sys/amd64/amd64/mp_machdep.c	2008-02-01 11:27:32.000000000 +0100
+@@ -82,6 +82,8 @@
+ int	boot_cpu_id = -1;	/* designated BSP */
+ extern	int nkpt;
+ 
++extern  struct pcpu __pcpu[];
++
+ /*
+  * CPU topology map datastructures for HTT.
+  */
+--- src//dev/null	2008-02-01 17:26:01.000000000 +0100
++++ src/sys/libkern/memset.c	2008-02-01 17:26:42.000000000 +0100
+@@ -0,0 +1,40 @@
++/*-
++ * Copyright (C) 1992-2007 The FreeBSD Project. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++#include <sys/cdefs.h>
++#include <sys/types.h>
++__FBSDID("$FreeBSD: src/sys/libkern/memset.c,v 1.2 2007/04/06 00:06:26 kan Exp $");
++
++void *memset(void *, int, size_t);
++
++
++void *
++memset(void *b, int c, size_t len)
++{
++	char *bb;
++
++	for (bb = (char *)b; len--; )
++		*bb++ = c;
++	return (b);
++}
+--- src/sys/conf/files.i386.orig	2008-02-01 17:27:21.000000000 +0100
++++ src/sys/conf/files.i386	2008-02-01 17:28:44.000000000 +0100
+@@ -435,6 +435,7 @@
+ libkern/divdi3.c		standard
+ libkern/ffsl.c			standard
+ libkern/flsl.c			standard
++libkern/memset.c		standard
+ libkern/moddi3.c		standard
+ libkern/qdivrem.c		standard
+ libkern/ucmpdi2.c		standard
+--- src/sys/conf/files.amd64.orig	2008-02-01 17:27:11.000000000 +0100
++++ src/sys/conf/files.amd64	2008-02-01 17:29:45.000000000 +0100
+@@ -234,3 +234,5 @@
+ i386/cpufreq/powernow.c		optional	cpufreq
+ i386/cpufreq/est.c		optional	cpufreq
+ i386/cpufreq/p4tcc.c		optional	cpufreq
++#
++libkern/memset.c		standard
+--- src/sys/modules/acpi/acpi/Makefile.orig	2008-02-01 22:17:07.000000000 +0100
++++ src/sys/modules/acpi/acpi/Makefile	2008-02-01 22:17:16.000000000 +0100
+@@ -15,7 +15,6 @@
+        ${.CURDIR}/../../../${MACHINE_ARCH}/acpica
+ 
+ KMOD=	acpi
+-WARNS?=	2
+ 
+ # ACPI CA sources
+ CFLAGS+=   -I${.CURDIR}/../../../contrib/dev/acpica

Modified: trunk/kfreebsd-6/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/999_config.diff	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/999_config.diff	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,7 +1,7 @@
-Index: sys/amd64/conf/GENERIC
+Index: src/sys/amd64/conf/GENERIC
 ===================================================================
---- sys/amd64/conf/GENERIC.orig
-+++ sys/amd64/conf/GENERIC
+--- src/sys/amd64/conf/GENERIC.orig
++++ src/sys/amd64/conf/GENERIC
 @@ -19,13 +19,9 @@
  # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.18 2007/03/27 02:33:00 yongari Exp $
  
@@ -120,10 +120,10 @@
 +options		ALTQ_RIO	# RED In/Out
 +options		ALTQ_HFSC	# Hierarchical Packet Scheduler (HFSC)
 +options		ALTQ_PRIQ	# Priority Queuing (PRIQ)
-Index: sys/i386/conf/GENERIC
+Index: src/sys/i386/conf/GENERIC
 ===================================================================
---- sys/i386/conf/GENERIC.orig
-+++ sys/i386/conf/GENERIC
+--- src/sys/i386/conf/GENERIC.orig
++++ src/sys/i386/conf/GENERIC
 @@ -19,15 +19,9 @@
  # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.14 2007/03/27 02:33:00 yongari Exp $
  

Modified: trunk/kfreebsd-6/debian/patches/series
===================================================================
--- trunk/kfreebsd-6/debian/patches/series	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/patches/series	2008-08-06 15:23:26 UTC (rev 2285)
@@ -1,26 +1,27 @@
-000_sendfile.diff -p0
-000_nfe.diff -p0
-001_misc.diff -p0
-003_glibc_dev_aicasm.diff -p0
-004_xargs.diff -p0
-005_binutils.diff -p0
-007_clone_signals.diff -p0
-008_config.diff -p0
-009_disable_duped_modules.diff -p0
-010_ET_DYN.diff -p0
-013_ip_packed.diff -p0
-017_oss_compat.diff -p0
-020_linker.diff -p0
-030_abi_cld.diff -p0
-902_version.diff -p0
-903_disable_non-free_drivers.diff -p0
-904_dev_full.diff -p0
-905_grow_arg_max.diff -p0
-906_grow_sysv_ipc_limits.diff -p0
-907_cpu_class.diff -p0
-908_linprocfs_is_not_proc.diff -p0
-910_GENERIC_hints.diff -p0
-911_no_werror.diff -p0
-912_binutils.diff -p0
-913_uudecode.diff -p0
-999_config.diff -p0
+000_sendfile.diff -p1
+000_nfe.diff -p1
+001_misc.diff -p1
+003_glibc_dev_aicasm.diff -p1
+004_xargs.diff -p1
+005_binutils.diff -p1
+007_clone_signals.diff -p1
+008_config.diff -p1
+009_disable_duped_modules.diff -p1
+010_ET_DYN.diff -p1
+013_ip_packed.diff -p1
+017_oss_compat.diff -p1
+020_linker.diff -p1
+030_abi_cld.diff -p1
+902_version.diff -p1
+903_disable_non-free_drivers.diff -p1
+904_dev_full.diff -p1
+905_grow_arg_max.diff -p1
+906_grow_sysv_ipc_limits.diff -p1
+907_cpu_class.diff -p1
+908_linprocfs_is_not_proc.diff -p1
+910_GENERIC_hints.diff -p1
+911_no_werror.diff -p1
+920_gcc4.diff -p1
+912_binutils.diff -p1
+913_uudecode.diff -p1
+999_config.diff -p1

Modified: trunk/kfreebsd-6/debian/rules
===================================================================
--- trunk/kfreebsd-6/debian/rules	2008-08-06 15:21:58 UTC (rev 2284)
+++ trunk/kfreebsd-6/debian/rules	2008-08-06 15:23:26 UTC (rev 2285)
@@ -28,7 +28,7 @@
 HEADERS_DIR	:= kfreebsd-headers-$(version)-$(abiname)
 FLAVOR_DIR	:= flavor-$(version)-$(abiname)
 
-MAKE		:= make MACHINE_ARCH=$(cpu) CC=gcc-3.4 WERROR= 
+MAKE		:= make MACHINE_ARCH=$(cpu) CC=gcc-4.3 WERROR= 
 PATH		:= $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
 
 control: clean

More information about the Glibc-bsd-commits mailing list