[Glibc-bsd-commits] r4368 - in trunk/kfreebsd-10/debian: . installer/amd64/modules/kfreebsd-amd64 installer/i386/modules/kfreebsd-i386 installer/modules patches

Christoph Egger christoph at alioth.debian.org
Sat Nov 3 01:41:18 UTC 2012 

Author: christoph
Date: 2012-11-03 01:41:18 +0000 (Sat, 03 Nov 2012)
New Revision: 4368

Added:
   trunk/kfreebsd-10/debian/patches/000_cxgbe.diff
Removed:
   trunk/kfreebsd-10/debian/installer/amd64/modules/kfreebsd-amd64/ntfs-modules
   trunk/kfreebsd-10/debian/installer/amd64/modules/kfreebsd-amd64/xfs-modules
   trunk/kfreebsd-10/debian/installer/i386/modules/kfreebsd-i386/ntfs-modules
   trunk/kfreebsd-10/debian/installer/i386/modules/kfreebsd-i386/xfs-modules
   trunk/kfreebsd-10/debian/installer/modules/ntfs-modules
   trunk/kfreebsd-10/debian/installer/modules/xfs-modules
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/control.in
   trunk/kfreebsd-10/debian/patches/001_misc.diff
   trunk/kfreebsd-10/debian/patches/002_maxpathlen.diff
   trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff
   trunk/kfreebsd-10/debian/patches/004_xargs.diff
   trunk/kfreebsd-10/debian/patches/107_mount_update.diff
   trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff
   trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff
   trunk/kfreebsd-10/debian/patches/902_version.diff
   trunk/kfreebsd-10/debian/patches/904_dev_full.diff
   trunk/kfreebsd-10/debian/patches/906_grow_sysv_ipc_limits.diff
   trunk/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff
   trunk/kfreebsd-10/debian/patches/910_GENERIC_hints.diff
   trunk/kfreebsd-10/debian/patches/913_uudecode.diff
   trunk/kfreebsd-10/debian/patches/914_psm.diff
   trunk/kfreebsd-10/debian/patches/915_ip6.v6only.diff
   trunk/kfreebsd-10/debian/patches/916_NKPT_amd64.diff
   trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
   trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff
   trunk/kfreebsd-10/debian/patches/919_delete_key.diff
   trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
   trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff
   trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
   trunk/kfreebsd-10/debian/patches/999_config.diff
   trunk/kfreebsd-10/debian/patches/series
   trunk/kfreebsd-10/debian/rules
Log:
Update to SVN revision 242489

 * Drop ntfs and xfs modules that are currently disabled upstream
 * Refresh patches
 * Adapt so WITHOUT_SOURCELESS is correctly triggered as make variable as well
 * Disable cxgbe firmware on WITHOUT_SOURCELESS builds



Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/changelog	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,5 +1,13 @@
-kfreebsd-10 (10.0~svn238475-3) experimental; urgency=low
+kfreebsd-10 (10.0~svn242489-1) experimental; urgency=low
 
+  * Update to SVN 242489
+    * Includes Upstream fix for SCTP DoS (Closes: #686963)
+    * Drop xfs and ntfs modules not build upstream currently
+
+ -- Christoph Egger <christoph at debian.org>  Sun, 30 Sep 2012 18:13:53 -0700
+
+kfreebsd-10 (10.0~svn240469-1) experimental; urgency=low
+
   * Add byacc to Build-Depends.
 
  -- Robert Millan <rmh at debian.org>  Wed, 25 Jul 2012 19:00:45 +0200

Modified: trunk/kfreebsd-10/debian/control.in
===================================================================
--- trunk/kfreebsd-10/debian/control.in	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/control.in	2012-11-03 01:41:18 UTC (rev 4368)
@@ -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 (>= 5.0.0), bzip2, sharutils, flex-old | flex,
- freebsd-buildutils (>= 10~svn237137-1~),
+ freebsd-buildutils (>= 10~svn241078-1~),
  byacc,
  @kernel_cc@, libdb-dev,
  libbsd-dev (>= 0.3.0), pkg-config,

Deleted: trunk/kfreebsd-10/debian/installer/amd64/modules/kfreebsd-amd64/ntfs-modules
===================================================================
--- trunk/kfreebsd-10/debian/installer/amd64/modules/kfreebsd-amd64/ntfs-modules	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/installer/amd64/modules/kfreebsd-amd64/ntfs-modules	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1 +0,0 @@
-#include <ntfs-modules>

Deleted: trunk/kfreebsd-10/debian/installer/amd64/modules/kfreebsd-amd64/xfs-modules
===================================================================
--- trunk/kfreebsd-10/debian/installer/amd64/modules/kfreebsd-amd64/xfs-modules	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/installer/amd64/modules/kfreebsd-amd64/xfs-modules	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1 +0,0 @@
-#include <xfs-modules>

Deleted: trunk/kfreebsd-10/debian/installer/i386/modules/kfreebsd-i386/ntfs-modules
===================================================================
--- trunk/kfreebsd-10/debian/installer/i386/modules/kfreebsd-i386/ntfs-modules	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/installer/i386/modules/kfreebsd-i386/ntfs-modules	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1 +0,0 @@
-#include <ntfs-modules>

Deleted: trunk/kfreebsd-10/debian/installer/i386/modules/kfreebsd-i386/xfs-modules
===================================================================
--- trunk/kfreebsd-10/debian/installer/i386/modules/kfreebsd-i386/xfs-modules	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/installer/i386/modules/kfreebsd-i386/xfs-modules	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1 +0,0 @@
-#include <xfs-modules>

Deleted: trunk/kfreebsd-10/debian/installer/modules/ntfs-modules
===================================================================
--- trunk/kfreebsd-10/debian/installer/modules/ntfs-modules	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/installer/modules/ntfs-modules	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,2 +0,0 @@
-ntfs_iconv
-ntfs

Deleted: trunk/kfreebsd-10/debian/installer/modules/xfs-modules
===================================================================
--- trunk/kfreebsd-10/debian/installer/modules/xfs-modules	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/installer/modules/xfs-modules	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1 +0,0 @@
-xfs

Added: trunk/kfreebsd-10/debian/patches/000_cxgbe.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/000_cxgbe.diff	                        (rev 0)
+++ trunk/kfreebsd-10/debian/patches/000_cxgbe.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -0,0 +1,19 @@
+Index: modules/cxgbe/Makefile
+===================================================================
+--- a/sys/modules/cxgbe/Makefile	(revision 242489)
++++ b/sys/modules/cxgbe/Makefile	(working copy)
+@@ -2,8 +2,14 @@
+ # $FreeBSD$
+ #
+ 
++.include <bsd.own.mk>
++
+ SUBDIR = if_cxgbe
++
++.if ${MK_SOURCELESS_UCODE} != "no"
+ SUBDIR+= firmware
++.endif
++
+ SUBDIR+= ${_tom}
+ 
+ .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"

Modified: trunk/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/001_misc.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/001_misc.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,8 +1,10 @@
 
 Co-authored by Nali Toja
 
---- a/sys/conf/kern.mk
-+++ b/sys/conf/kern.mk
+Index: kfreebsd-10/sys/conf/kern.mk
+===================================================================
+--- kfreebsd-10.orig/sys/conf/kern.mk	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/conf/kern.mk	2012-11-02 12:57:45.699217540 -0700
 @@ -1,11 +1,18 @@
  # $FreeBSD$
  
@@ -23,10 +25,10 @@
  		-Wmissing-include-dirs -fdiagnostics-show-option \
  		${CWARNEXTRA}
  #
-@@ -52,7 +59,7 @@
+@@ -53,7 +60,7 @@
  #
  .if ${MACHINE_CPUARCH} == "i386"
- .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
+ .if ${COMPILER_TYPE} != "clang"
 -CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2
 +CFLAGS+=	${no_align_long_strings} -mpreferred-stack-boundary=2
  .else

Modified: trunk/kfreebsd-10/debian/patches/002_maxpathlen.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/002_maxpathlen.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/002_maxpathlen.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,5 +1,7 @@
---- a/usr.sbin/config/main.c
-+++ b/usr.sbin/config/main.c
+Index: kfreebsd-10/usr.sbin/config/main.c
+===================================================================
+--- kfreebsd-10.orig/usr.sbin/config/main.c	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/usr.sbin/config/main.c	2012-11-02 12:57:46.099211664 -0700
 @@ -60,6 +60,10 @@
  #include "config.h"
  #include "configvers.h"
@@ -11,8 +13,10 @@
  #ifndef TRUE
  #define TRUE	(1)
  #endif
---- a/usr.sbin/config/mkmakefile.c
-+++ b/usr.sbin/config/mkmakefile.c
+Index: kfreebsd-10/usr.sbin/config/mkmakefile.c
+===================================================================
+--- kfreebsd-10.orig/usr.sbin/config/mkmakefile.c	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/usr.sbin/config/mkmakefile.c	2012-11-02 12:57:46.099211664 -0700
 @@ -50,6 +50,10 @@
  #include "config.h"
  #include "configvers.h"
@@ -24,8 +28,10 @@
  #define next_word(fp, wd) \
  	{ char *word = get_word(fp); \
  	  if (word == (char *)EOF) \
---- a/usr.sbin/config/mkoptions.c
-+++ b/usr.sbin/config/mkoptions.c
+Index: kfreebsd-10/usr.sbin/config/mkoptions.c
+===================================================================
+--- kfreebsd-10.orig/usr.sbin/config/mkoptions.c	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/usr.sbin/config/mkoptions.c	2012-11-02 12:57:46.099211664 -0700
 @@ -48,6 +48,10 @@
  #include "config.h"
  #include "y.tab.h"
@@ -37,8 +43,10 @@
  static	struct users {
  	int	u_default;
  	int	u_min;
---- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+Index: kfreebsd-10/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+===================================================================
+--- kfreebsd-10.orig/sys/dev/aic7xxx/aicasm/aicasm_scan.l	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/dev/aic7xxx/aicasm/aicasm_scan.l	2012-11-02 12:57:46.099211664 -0700
 @@ -57,6 +57,10 @@
  #include "aicasm_symbol.h"
  #include "aicasm_gram.h"

Modified: trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,8 +1,10 @@
 
 Partially sent to freebsd-hackers (2011-07-02)
 
---- a/sys/dev/aic7xxx/aicasm/Makefile
-+++ b/sys/dev/aic7xxx/aicasm/Makefile
+Index: kfreebsd-10/sys/dev/aic7xxx/aicasm/Makefile
+===================================================================
+--- kfreebsd-10.orig/sys/dev/aic7xxx/aicasm/Makefile	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/dev/aic7xxx/aicasm/Makefile	2012-11-02 12:57:46.319210733 -0700
 @@ -16,6 +16,9 @@
  DPADD=	${LIBL}
  LDADD=	-ll

Modified: trunk/kfreebsd-10/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/004_xargs.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/004_xargs.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -4,9 +4,11 @@
 
 http://savannah.gnu.org/patch/?4916
 
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -214,7 +214,7 @@
+Index: kfreebsd-10/sys/conf/kmod.mk
+===================================================================
+--- kfreebsd-10.orig/sys/conf/kmod.mk	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/conf/kmod.mk	2012-11-02 12:57:46.469212125 -0700
+@@ -215,7 +215,7 @@
  	grep -v '^#' < ${EXPORT_SYMS} > export_syms
  .endif
  	awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -15,9 +17,11 @@
  .endif
  .endif
  .if !defined(DEBUG_FLAGS) && ${__KLD_SHARED} == no
---- a/sys/contrib/dev/acpica/acpica_prep.sh
-+++ b/sys/contrib/dev/acpica/acpica_prep.sh
-@@ -56,10 +56,10 @@
+Index: kfreebsd-10/sys/contrib/dev/acpica/acpica_prep.sh
+===================================================================
+--- kfreebsd-10.orig/sys/contrib/dev/acpica/acpica_prep.sh	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/contrib/dev/acpica/acpica_prep.sh	2012-11-02 12:57:46.469212125 -0700
+@@ -58,10 +58,10 @@
  # copy files
  echo copying full dirs
  for i in ${fulldirs}; do
@@ -30,8 +34,10 @@
  
  # canonify include paths
  for H in ${src_headers}; do
---- a/sys/conf/kern.post.mk
-+++ b/sys/conf/kern.post.mk
+Index: kfreebsd-10/sys/conf/kern.post.mk
+===================================================================
+--- kfreebsd-10.orig/sys/conf/kern.post.mk	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/conf/kern.post.mk	2012-11-02 12:57:46.469212125 -0700
 @@ -199,12 +199,9 @@
  	rm -f .newdep
  	${MAKE} -V CFILES_NOZFS -V SYSTEM_CFILES -V GEN_CFILES | \

Modified: trunk/kfreebsd-10/debian/patches/107_mount_update.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/107_mount_update.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/107_mount_update.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -5,8 +5,10 @@
 
 Also see PR kern/150206
 
---- a/sys/kern/vfs_mount.c
-+++ b/sys/kern/vfs_mount.c
+Index: kfreebsd-10/sys/kern/vfs_mount.c
+===================================================================
+--- kfreebsd-10.orig/sys/kern/vfs_mount.c	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/kern/vfs_mount.c	2012-11-02 12:57:46.609212205 -0700
 @@ -652,6 +652,24 @@
  	}
  

Modified: trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,6 +1,8 @@
---- a/sys/conf/options.mips
-+++ b/sys/conf/options.mips
-@@ -51,6 +51,9 @@
+Index: kfreebsd-10/sys/conf/options.mips
+===================================================================
+--- kfreebsd-10.orig/sys/conf/options.mips	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/conf/options.mips	2012-11-02 12:57:46.749210745 -0700
+@@ -63,6 +63,9 @@
  TICK_USE_YAMON_FREQ	opt_global.h
  TICK_USE_MALTA_RTC	opt_global.h
  

Modified: trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -3,9 +3,11 @@
 I could find that doesn't cause kernel panics CPU triple-faults or
 other kind of severe breakage.
 
---- a/sys/conf/kern.pre.mk
-+++ b/sys/conf/kern.pre.mk
-@@ -45,6 +45,9 @@
+Index: kfreebsd-10/sys/conf/kern.pre.mk
+===================================================================
+--- kfreebsd-10.orig/sys/conf/kern.pre.mk	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/conf/kern.pre.mk	2012-11-02 12:57:46.879211260 -0700
+@@ -47,6 +47,9 @@
  .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
  COPTFLAGS+= -fno-strict-aliasing
  .endif
@@ -15,9 +17,11 @@
  .if !defined(NO_CPU_COPTFLAGS)
  COPTFLAGS+= ${_CPUCFLAGS}
  .endif
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -86,6 +86,9 @@
+Index: kfreebsd-10/sys/conf/kmod.mk
+===================================================================
+--- kfreebsd-10.orig/sys/conf/kmod.mk	2012-11-02 12:57:46.469212125 -0700
++++ kfreebsd-10/sys/conf/kmod.mk	2012-11-02 12:57:46.879211260 -0700
+@@ -87,6 +87,9 @@
  .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
  CFLAGS+=	-fno-strict-aliasing
  .endif

Modified: trunk/kfreebsd-10/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/902_version.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/902_version.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,10 +1,12 @@
---- a/sys/conf/newvers.sh
-+++ b/sys/conf/newvers.sh
-@@ -135,7 +135,7 @@
+Index: kfreebsd-10/sys/conf/newvers.sh
+===================================================================
+--- kfreebsd-10.orig/sys/conf/newvers.sh	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/conf/newvers.sh	2012-11-02 12:57:47.019211750 -0700
+@@ -154,7 +154,7 @@
  cat << EOF > vers.c
  $COPYRIGHT
- #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"
--#define VERSTR "${VERSION} #${v}${svn}${git}: ${t}\\n    ${u}@${h}:${d}\\n"
+ #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${p4version}: ${t}"
+-#define VERSTR "${VERSION} #${v}${svn}${git}${p4version}: ${t}\\n    ${u}@${h}:${d}\\n"
 +#define VERSTR "#${v} ${t}\\n"
  #define RELSTR "${RELEASE}"
  

Modified: trunk/kfreebsd-10/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/904_dev_full.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/904_dev_full.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -2,8 +2,10 @@
 Status: FIONBIO/FIOASYNC is in http://www.freebsd.org/cgi/query-pr.cgi?pr=138526
 	/dev/full already rejected in upstream (kern/68961)
 
---- a/sys/dev/null/null.c
-+++ b/sys/dev/null/null.c
+Index: kfreebsd-10/sys/dev/null/null.c
+===================================================================
+--- kfreebsd-10.orig/sys/dev/null/null.c	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/dev/null/null.c	2012-11-02 12:57:47.169211704 -0700
 @@ -46,9 +46,11 @@
  
  /* For use with destroy_dev(9). */

Modified: trunk/kfreebsd-10/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/906_grow_sysv_ipc_limits.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/906_grow_sysv_ipc_limits.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -21,8 +21,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>
 
---- a/sys/amd64/conf/GENERIC
-+++ b/sys/amd64/conf/GENERIC
+Index: kfreebsd-10/sys/amd64/conf/GENERIC
+===================================================================
+--- kfreebsd-10.orig/sys/amd64/conf/GENERIC	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/amd64/conf/GENERIC	2012-11-02 12:57:47.299210575 -0700
 @@ -58,6 +58,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues
@@ -35,8 +37,10 @@
  options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
  options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
  options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
---- a/sys/i386/conf/GENERIC
-+++ b/sys/i386/conf/GENERIC
+Index: kfreebsd-10/sys/i386/conf/GENERIC
+===================================================================
+--- kfreebsd-10.orig/sys/i386/conf/GENERIC	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/i386/conf/GENERIC	2012-11-02 12:57:47.299210575 -0700
 @@ -59,6 +59,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues

Modified: trunk/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,6 +1,8 @@
---- a/sys/compat/linprocfs/linprocfs.c
-+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -361,10 +361,6 @@
+Index: kfreebsd-10/sys/compat/linprocfs/linprocfs.c
+===================================================================
+--- kfreebsd-10.orig/sys/compat/linprocfs/linprocfs.c	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/compat/linprocfs/linprocfs.c	2012-11-02 12:57:47.439210964 -0700
+@@ -360,10 +360,6 @@
  
  		/* determine fs type */
  		fstype = mp->mnt_stat.f_fstypename;

Modified: trunk/kfreebsd-10/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/910_GENERIC_hints.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/910_GENERIC_hints.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,5 +1,7 @@
---- a/sys/i386/conf/GENERIC.hints
-+++ b/sys/i386/conf/GENERIC.hints
+Index: kfreebsd-10/sys/i386/conf/GENERIC.hints
+===================================================================
+--- kfreebsd-10.orig/sys/i386/conf/GENERIC.hints	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/i386/conf/GENERIC.hints	2012-11-02 12:57:47.569210554 -0700
 @@ -18,6 +18,7 @@
  hint.atkbd.0.at="atkbdc"
  hint.atkbd.0.irq="1"
@@ -8,8 +10,10 @@
  hint.psm.0.irq="12"
  hint.sc.0.at="isa"
  hint.sc.0.flags="0x100"
---- a/sys/amd64/conf/GENERIC.hints
-+++ b/sys/amd64/conf/GENERIC.hints
+Index: kfreebsd-10/sys/amd64/conf/GENERIC.hints
+===================================================================
+--- kfreebsd-10.orig/sys/amd64/conf/GENERIC.hints	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/amd64/conf/GENERIC.hints	2012-11-02 12:57:47.569210554 -0700
 @@ -12,6 +12,7 @@
  hint.atkbd.0.at="atkbdc"
  hint.atkbd.0.irq="1"

Modified: trunk/kfreebsd-10/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/913_uudecode.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/913_uudecode.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,13 +1,17 @@
---- a/sys/modules/ralfw/Makefile.inc
-+++ b/sys/modules/ralfw/Makefile.inc
+Index: kfreebsd-10-10.0~svn242489/sys/modules/ralfw/Makefile.inc
+===================================================================
+--- kfreebsd-10-10.0~svn242489.orig/sys/modules/ralfw/Makefile.inc	2008-04-20 13:35:46.000000000 -0700
++++ kfreebsd-10-10.0~svn242489/sys/modules/ralfw/Makefile.inc	2012-11-02 13:05:40.379258875 -0700
 @@ -12,4 +12,4 @@
  FIRMWS=	${_FIRM}:${KMOD}
  
  ${_FIRM}: ${.CURDIR}/../../../contrib/dev/ral/${_FIRM}.uu
 -	uudecode -p $? > ${.TARGET}
 +	uudecode -o- $? > ${.TARGET}
---- a/sys/modules/mwlfw/Makefile
-+++ b/sys/modules/mwlfw/Makefile
+Index: kfreebsd-10-10.0~svn242489/sys/modules/mwlfw/Makefile
+===================================================================
+--- kfreebsd-10-10.0~svn242489.orig/sys/modules/mwlfw/Makefile	2009-06-01 11:07:01.000000000 -0700
++++ kfreebsd-10-10.0~svn242489/sys/modules/mwlfw/Makefile	2012-11-02 13:05:40.429272420 -0700
 @@ -6,9 +6,9 @@
  CLEANFILES+= mw88W8363.fw mwlboot.fw
  
@@ -20,8 +24,10 @@
 +	uudecode -o- $? > ${.TARGET}
  
  .include <bsd.kmod.mk>
---- a/sys/modules/ipwfw/ipw_bss/Makefile
-+++ b/sys/modules/ipwfw/ipw_bss/Makefile
+Index: kfreebsd-10-10.0~svn242489/sys/modules/ipwfw/ipw_bss/Makefile
+===================================================================
+--- kfreebsd-10-10.0~svn242489.orig/sys/modules/ipwfw/ipw_bss/Makefile	2007-03-02 03:42:56.000000000 -0800
++++ kfreebsd-10-10.0~svn242489/sys/modules/ipwfw/ipw_bss/Makefile	2012-11-02 13:05:40.489224406 -0700
 @@ -9,7 +9,7 @@
  CLEANFILES=	ipw_bss
  
@@ -31,8 +37,10 @@
  
  .include <bsd.kmod.mk>
  
---- a/sys/modules/ipwfw/ipw_ibss/Makefile
-+++ b/sys/modules/ipwfw/ipw_ibss/Makefile
+Index: kfreebsd-10-10.0~svn242489/sys/modules/ipwfw/ipw_ibss/Makefile
+===================================================================
+--- kfreebsd-10-10.0~svn242489.orig/sys/modules/ipwfw/ipw_ibss/Makefile	2007-03-02 03:42:56.000000000 -0800
++++ kfreebsd-10-10.0~svn242489/sys/modules/ipwfw/ipw_ibss/Makefile	2012-11-02 13:05:40.519214575 -0700
 @@ -9,7 +9,7 @@
  CLEANFILES=	ipw_ibss
  
@@ -42,19 +50,25 @@
  
  .include <bsd.kmod.mk>
  
---- a/sys/modules/ipwfw/ipw_monitor/Makefile
-+++ b/sys/modules/ipwfw/ipw_monitor/Makefile
-@@ -9,7 +9,7 @@
+Index: kfreebsd-10-10.0~svn242489/sys/modules/ipwfw/ipw_monitor/Makefile
+===================================================================
+--- kfreebsd-10-10.0~svn242489.orig/sys/modules/ipwfw/ipw_monitor/Makefile	2007-03-02 03:42:56.000000000 -0800
++++ kfreebsd-10-10.0~svn242489/sys/modules/ipwfw/ipw_monitor/Makefile	2012-11-02 13:05:40.549216559 -0700
+@@ -8,8 +8,8 @@
+ 
  CLEANFILES=	ipw_monitor
  
- ipw_monitor: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu
+-ipw_monitor: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu
 -	uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu > ${.TARGET}
-+	uudecode -o- ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu > ${.TARGET}
++ipw_monitor: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-o-.fw.uu
++	uudecode -o- ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-o-.fw.uu > ${.TARGET}
  
  .include <bsd.kmod.mk>
  
---- a/sys/modules/iwifw/iwi_bss/Makefile
-+++ b/sys/modules/iwifw/iwi_bss/Makefile
+Index: kfreebsd-10-10.0~svn242489/sys/modules/iwifw/iwi_bss/Makefile
+===================================================================
+--- kfreebsd-10-10.0~svn242489.orig/sys/modules/iwifw/iwi_bss/Makefile	2007-03-02 03:42:56.000000000 -0800
++++ kfreebsd-10-10.0~svn242489/sys/modules/iwifw/iwi_bss/Makefile	2012-11-02 13:05:40.569230894 -0700
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_bss
  
@@ -64,8 +78,10 @@
  
  .include <bsd.kmod.mk>
  
---- a/sys/modules/iwifw/iwi_ibss/Makefile
-+++ b/sys/modules/iwifw/iwi_ibss/Makefile
+Index: kfreebsd-10-10.0~svn242489/sys/modules/iwifw/iwi_ibss/Makefile
+===================================================================
+--- kfreebsd-10-10.0~svn242489.orig/sys/modules/iwifw/iwi_ibss/Makefile	2007-03-02 03:42:56.000000000 -0800
++++ kfreebsd-10-10.0~svn242489/sys/modules/iwifw/iwi_ibss/Makefile	2012-11-02 13:05:40.589247592 -0700
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_fw
  
@@ -75,8 +91,10 @@
  
  .include <bsd.kmod.mk>
  
---- a/sys/modules/iwifw/iwi_monitor/Makefile
-+++ b/sys/modules/iwifw/iwi_monitor/Makefile
+Index: kfreebsd-10-10.0~svn242489/sys/modules/iwifw/iwi_monitor/Makefile
+===================================================================
+--- kfreebsd-10-10.0~svn242489.orig/sys/modules/iwifw/iwi_monitor/Makefile	2007-03-02 03:42:56.000000000 -0800
++++ kfreebsd-10-10.0~svn242489/sys/modules/iwifw/iwi_monitor/Makefile	2012-11-02 13:05:40.619214236 -0700
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_monitor
  
@@ -86,8 +104,10 @@
  
  .include <bsd.kmod.mk>
  
---- a/sys/modules/wpifw/Makefile
-+++ b/sys/modules/wpifw/Makefile
+Index: kfreebsd-10-10.0~svn242489/sys/modules/wpifw/Makefile
+===================================================================
+--- kfreebsd-10-10.0~svn242489.orig/sys/modules/wpifw/Makefile	2010-12-19 03:37:44.000000000 -0800
++++ kfreebsd-10-10.0~svn242489/sys/modules/wpifw/Makefile	2012-11-02 13:05:40.639213265 -0700
 @@ -8,6 +8,6 @@
  CLEANFILES=	iwlwifi-3945-15.32.2.9.fw
  
@@ -96,16 +116,20 @@
 +	uudecode -o- ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu > ${.TARGET}
  
  .include <bsd.kmod.mk>
---- a/sys/modules/iwnfw/Makefile.inc
-+++ b/sys/modules/iwnfw/Makefile.inc
+Index: kfreebsd-10-10.0~svn242489/sys/modules/iwnfw/Makefile.inc
+===================================================================
+--- kfreebsd-10-10.0~svn242489.orig/sys/modules/iwnfw/Makefile.inc	2010-05-27 05:54:42.000000000 -0700
++++ kfreebsd-10-10.0~svn242489/sys/modules/iwnfw/Makefile.inc	2012-11-02 13:05:40.659224312 -0700
 @@ -15,4 +15,4 @@
  #FIRMWARE_LICENSE=
  
  ${_FIRM}: ${.CURDIR}/../../../contrib/dev/iwn/${_FIRM}.uu
 -	uudecode -p $? > ${.TARGET}
 +	uudecode -o- $? > ${.TARGET}
---- a/sys/modules/runfw/Makefile
-+++ b/sys/modules/runfw/Makefile
+Index: kfreebsd-10-10.0~svn242489/sys/modules/runfw/Makefile
+===================================================================
+--- kfreebsd-10-10.0~svn242489.orig/sys/modules/runfw/Makefile	2010-01-28 19:35:01.000000000 -0800
++++ kfreebsd-10-10.0~svn242489/sys/modules/runfw/Makefile	2012-11-02 13:05:40.689225577 -0700
 @@ -6,6 +6,6 @@
  CLEANFILES=	runfw
  

Modified: trunk/kfreebsd-10/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/914_psm.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/914_psm.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -5,8 +5,10 @@
 | 
 | This makes Xorg happy if you aren't using moused.
 
---- a/sys/dev/atkbdc/psm.c
-+++ b/sys/dev/atkbdc/psm.c
+Index: kfreebsd-10/sys/dev/atkbdc/psm.c
+===================================================================
+--- kfreebsd-10.orig/sys/dev/atkbdc/psm.c	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/dev/atkbdc/psm.c	2012-11-02 12:57:47.849210714 -0700
 @@ -70,10 +70,7 @@
  #include <sys/module.h>
  #include <sys/bus.h>
@@ -26,7 +28,7 @@
  };
  static devclass_t psm_devclass;
  
-@@ -1515,7 +1511,6 @@
+@@ -1518,7 +1514,6 @@
  	sc->mode.level = sc->dflt_mode.level;
  	sc->mode.protocol = sc->dflt_mode.protocol;
  	sc->watchdog = FALSE;
@@ -34,7 +36,7 @@
  
  	/* flush the event queue */
  	sc->queue.count = 0;
-@@ -1657,12 +1652,6 @@
+@@ -1659,12 +1654,6 @@
  	/* remove anything left in the output buffer */
  	empty_aux_buffer(sc->kbdc, 10);
  
@@ -47,7 +49,7 @@
  	/* close is almost always successful */
  	sc->state &= ~PSM_OPEN;
  	kbdc_lock(sc->kbdc, FALSE);
-@@ -2224,15 +2213,6 @@
+@@ -2226,15 +2215,6 @@
  		break;
  #endif /* MOUSE_GETHWID */
  
@@ -63,7 +65,7 @@
  	default:
  		return (ENOTTY);
  	}
-@@ -3499,9 +3479,6 @@
+@@ -3501,9 +3481,6 @@
  		wakeup(sc);
  	}
  	selwakeuppri(&sc->rsel, PZERO);

Modified: trunk/kfreebsd-10/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/915_ip6.v6only.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/915_ip6.v6only.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,5 +1,7 @@
---- a/sys/netinet6/in6_proto.c
-+++ b/sys/netinet6/in6_proto.c
+Index: kfreebsd-10/sys/netinet6/in6_proto.c
+===================================================================
+--- kfreebsd-10.orig/sys/netinet6/in6_proto.c	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/netinet6/in6_proto.c	2012-11-02 12:57:47.979210715 -0700
 @@ -396,7 +396,7 @@
  VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
  VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;

Modified: trunk/kfreebsd-10/debian/patches/916_NKPT_amd64.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/916_NKPT_amd64.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/916_NKPT_amd64.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -3,8 +3,10 @@
 
 Also see #596577.
 
---- a/sys/amd64/include/pmap.h
-+++ b/sys/amd64/include/pmap.h
+Index: kfreebsd-10/sys/amd64/include/pmap.h
+===================================================================
+--- kfreebsd-10.orig/sys/amd64/include/pmap.h	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/amd64/include/pmap.h	2012-11-02 12:57:48.129211080 -0700
 @@ -115,7 +115,7 @@
  
  /* Initial number of kernel page tables. */

Modified: trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,6 +1,8 @@
---- a/sys/modules/Makefile
-+++ b/sys/modules/Makefile
-@@ -166,8 +166,6 @@
+Index: kfreebsd-10/sys/modules/Makefile
+===================================================================
+--- kfreebsd-10.orig/sys/modules/Makefile	2012-11-02 12:57:20.000000000 -0700
++++ kfreebsd-10/sys/modules/Makefile	2012-11-02 12:57:48.279210520 -0700
+@@ -167,8 +167,6 @@
  	jme \
  	joy \
  	kbdmux \

Modified: trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -6,9 +6,11 @@
 Userland compatibility was added in glibc 2.13-22 (glibc-bsd r3739). This
 patch can be removed when we no longer care about supporting older glibc.
 
---- a/sys/kern/uipc_usrreq.c
-+++ b/sys/kern/uipc_usrreq.c
-@@ -464,7 +464,12 @@
+Index: kfreebsd-10/sys/kern/uipc_usrreq.c
+===================================================================
+--- kfreebsd-10.orig/sys/kern/uipc_usrreq.c	2012-11-02 12:57:19.000000000 -0700
++++ kfreebsd-10/sys/kern/uipc_usrreq.c	2012-11-02 12:57:48.409210418 -0700
+@@ -465,7 +465,12 @@
  	KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
  
  	if (soun->sun_len > sizeof(struct sockaddr_un))
@@ -21,7 +23,7 @@
  	namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
  	if (namelen <= 0)
  		return (EINVAL);
-@@ -1256,7 +1261,12 @@
+@@ -1247,7 +1252,12 @@
  	KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
  
  	if (nam->sa_len > sizeof(struct sockaddr_un))

Modified: trunk/kfreebsd-10/debian/patches/919_delete_key.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/919_delete_key.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/919_delete_key.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -3,8 +3,10 @@
 The (Linux) console is configured to make <-- generate DEL, and Delete generate ESC [ 3 ~.
 
 
---- a/sys/dev/kbd/kbdtables.h
-+++ b/sys/dev/kbd/kbdtables.h
+Index: kfreebsd-10/sys/dev/kbd/kbdtables.h
+===================================================================
+--- kfreebsd-10.orig/sys/dev/kbd/kbdtables.h	2012-11-02 12:57:19.000000000 -0700
++++ kfreebsd-10/sys/dev/kbd/kbdtables.h	2012-11-02 12:57:48.549213888 -0700
 @@ -56,7 +56,7 @@
  /*0b*/{{  '0',   ')',   NOP,   NOP,   '0',   ')',   NOP,   NOP, }, 0x33,0x00 },
  /*0c*/{{  '-',   '_',  0x1F,  0x1F,   '-',   '_',  0x1F,  0x1F, }, 0x00,0x00 },

Modified: trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -3,9 +3,11 @@
 
 http://lists.freebsd.org/pipermail/freebsd-hackers/2011-July/thread.html#35854
 
---- a/sys/conf/kern.pre.mk
-+++ b/sys/conf/kern.pre.mk
-@@ -101,6 +101,8 @@
+Index: kfreebsd-10/sys/conf/kern.pre.mk
+===================================================================
+--- kfreebsd-10.orig/sys/conf/kern.pre.mk	2012-11-02 12:57:46.879211260 -0700
++++ kfreebsd-10/sys/conf/kern.pre.mk	2012-11-02 12:57:48.679211527 -0700
+@@ -97,6 +97,8 @@
  .endif
  WERROR?= -Werror
  
@@ -14,9 +16,11 @@
  # XXX LOCORE means "don't declare C stuff" not "for locore.s".
  ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
  
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -94,6 +94,8 @@
+Index: kfreebsd-10/sys/conf/kmod.mk
+===================================================================
+--- kfreebsd-10.orig/sys/conf/kmod.mk	2012-11-02 12:57:46.879211260 -0700
++++ kfreebsd-10/sys/conf/kmod.mk	2012-11-02 12:57:48.679211527 -0700
+@@ -95,6 +95,8 @@
  CFLAGS+=	-D_KERNEL
  CFLAGS+=	-DKLD_MODULE
  

Modified: trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -11,8 +11,10 @@
 
   - The spares in struct sigevent are claimed by upstream (see #666454).
 
---- a/sys/sys/signal.h
-+++ b/sys/sys/signal.h
+Index: kfreebsd-10/sys/sys/signal.h
+===================================================================
+--- kfreebsd-10.orig/sys/sys/signal.h	2012-11-02 12:57:19.000000000 -0700
++++ kfreebsd-10/sys/sys/signal.h	2012-11-02 12:57:48.819211401 -0700
 @@ -108,11 +108,7 @@
  #define	SIGUSR1		30	/* user defined signal 1 */
  #define	SIGUSR2		31	/* user defined signal 2 */
@@ -35,8 +37,10 @@
  		long __spare__[8];
  	} _sigev_un;
  };
---- a/sys/kern/kern_prot.c
-+++ b/sys/kern/kern_prot.c
+Index: kfreebsd-10/sys/kern/kern_prot.c
+===================================================================
+--- kfreebsd-10.orig/sys/kern/kern_prot.c	2012-11-02 12:57:19.000000000 -0700
++++ kfreebsd-10/sys/kern/kern_prot.c	2012-11-02 12:57:48.819211401 -0700
 @@ -1557,8 +1557,8 @@
  	 * pretty safe to do since the only way to create two processes
  	 * with the same p_leader is via rfork(2).
@@ -48,8 +52,10 @@
  		return (0);
  
  	return (cr_cansignal(td->td_ucred, p, signum));
---- a/sys/sys/rctl.h
-+++ b/sys/sys/rctl.h
+Index: kfreebsd-10/sys/sys/rctl.h
+===================================================================
+--- kfreebsd-10.orig/sys/sys/rctl.h	2012-11-02 12:57:19.000000000 -0700
++++ kfreebsd-10/sys/sys/rctl.h	2012-11-02 12:57:48.819211401 -0700
 @@ -124,7 +124,7 @@
  #define	RCTL_ACTION_SIGINFO		SIGINFO
  #define	RCTL_ACTION_SIGUSR1		SIGUSR1

Modified: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,8 +1,10 @@
 
 freebsd-buildutils 9.0 doesn't define MK_CTF.
 
---- a/sys/conf/kern.post.mk
-+++ b/sys/conf/kern.post.mk
+Index: kfreebsd-10/sys/conf/kern.post.mk
+===================================================================
+--- kfreebsd-10.orig/sys/conf/kern.post.mk	2012-11-02 12:57:46.469212125 -0700
++++ kfreebsd-10/sys/conf/kern.post.mk	2012-11-02 12:57:48.969213512 -0700
 @@ -125,7 +125,7 @@
  	@rm -f ${.TARGET}
  	@echo linking ${.TARGET}
@@ -12,8 +14,10 @@
  	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
  .endif
  .if !defined(DEBUG)
---- a/sys/conf/kern.pre.mk
-+++ b/sys/conf/kern.pre.mk
+Index: kfreebsd-10/sys/conf/kern.pre.mk
+===================================================================
+--- kfreebsd-10.orig/sys/conf/kern.pre.mk	2012-11-02 12:57:48.679211527 -0700
++++ kfreebsd-10/sys/conf/kern.pre.mk	2012-11-02 12:57:48.969213512 -0700
 @@ -142,7 +142,7 @@
  ZFS_C=		${CC} -c ${ZFS_CFLAGS} ${WERROR} ${PROF} ${.IMPSRC}
  ZFS_S=		${CC} -c ${ZFS_ASM_CFLAGS} ${WERROR} ${.IMPSRC}

Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,5 +1,7 @@
---- a/sys/amd64/conf/GENERIC
-+++ b/sys/amd64/conf/GENERIC
+Index: kfreebsd-10/sys/amd64/conf/GENERIC
+===================================================================
+--- kfreebsd-10.orig/sys/amd64/conf/GENERIC	2012-11-02 12:57:47.299210575 -0700
++++ kfreebsd-10/sys/amd64/conf/GENERIC	2012-11-02 12:57:49.109210819 -0700
 @@ -18,11 +18,11 @@
  #
  # $FreeBSD$
@@ -48,7 +50,7 @@
  # ATA controllers
  device		ahci		# AHCI-compatible SATA controllers
  device		ata		# Legacy ATA/SATA controllers
-@@ -199,10 +196,6 @@
+@@ -200,10 +197,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -59,8 +61,8 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -298,10 +291,7 @@
- device		random		# Entropy device
+@@ -301,10 +294,7 @@
+ options 	RDRAND_RNG	# Intel Bull Mountain RNG
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
 -device		tun		# Packet tunnel.
@@ -70,8 +72,10 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
---- a/sys/i386/conf/GENERIC
-+++ b/sys/i386/conf/GENERIC
+Index: kfreebsd-10/sys/i386/conf/GENERIC
+===================================================================
+--- kfreebsd-10.orig/sys/i386/conf/GENERIC	2012-11-02 12:57:47.299210575 -0700
++++ kfreebsd-10/sys/i386/conf/GENERIC	2012-11-02 12:57:49.109210819 -0700
 @@ -18,13 +18,13 @@
  #
  # $FreeBSD$
@@ -131,7 +135,7 @@
  # ATA controllers
  device		ahci		# AHCI-compatible SATA controllers
  device		ata		# Legacy ATA/SATA controllers
-@@ -209,10 +208,6 @@
+@@ -211,10 +210,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -142,8 +146,8 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -311,10 +306,7 @@
- device		random		# Entropy device
+@@ -315,10 +310,7 @@
+ options 	RDRAND_RNG	# Intel Bull Mountain RNG
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
 -device		tun		# Packet tunnel.
@@ -153,8 +157,10 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
---- /dev/null
-+++ b/sys/conf/DEBIAN
+Index: kfreebsd-10/sys/conf/DEBIAN
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ kfreebsd-10/sys/conf/DEBIAN	2012-11-02 12:57:49.109210819 -0700
 @@ -0,0 +1,52 @@
 +# Common options to all Debian GNU/kFreeBSD kernels
 +

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/patches/series	2012-11-03 01:41:18 UTC (rev 4368)
@@ -1,6 +1,7 @@
 # Patches from (or merged in) upstream
 
 # Other patches that might or might not be mergeable
+000_cxgbe.diff
 001_misc.diff
 002_maxpathlen.diff
 003_glibc_dev_aicasm.diff

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2012-09-30 21:15:04 UTC (rev 4367)
+++ trunk/kfreebsd-10/debian/rules	2012-11-03 01:41:18 UTC (rev 4368)
@@ -43,7 +43,7 @@
 FLAVOR_DIR	:= flavor-$(version)-$(abiname)
 ORIG_DIR	:= kfreebsd-$(major)-$(tar_version)
 ORIG_TAR	:= kfreebsd-$(major)_$(tar_version).orig.tar.gz
-MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) WERROR= -DWITHOUT_SOURCELESS
+MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) WERROR= WITHOUT_SOURCELESS=true
 PATH		:= $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
 
 # Disable install of *.ko.symbols files (their presence would trigger an

More information about the Glibc-bsd-commits mailing list