[Glibc-bsd-commits] r4469 - in trunk/kfreebsd-10/debian: . patches

Petr Salinger ps-guest at alioth.debian.org
Tue May 21 16:37:52 UTC 2013 

Author: ps-guest
Date: 2013-05-21 16:37:52 +0000 (Tue, 21 May 2013)
New Revision: 4469

Added:
   trunk/kfreebsd-10/debian/patches/cc_version.diff
   trunk/kfreebsd-10/debian/patches/debugger.diff
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/000_cxgbe.diff
   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/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:
snapshot of kfreebsd-10



Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/changelog	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,3 +1,17 @@
+kfreebsd-10 (10.0~svn250856-1) UNRELEASED; urgency=low
+
+  * Update to SVN 250856
+
+  [Petr Salinger]   
+  * refresh all patches
+  * switch to gcc-4.8
+  * disable 901_disable_optimization_2.diff
+
+  [Steven McDonald]
+  * temporary patches debugger.diff and cc_version.diff
+
+ -- Christoph Egger <christoph at debian.org>  Tue, 21 May 2013 18:13:53 +0200
+
 kfreebsd-10 (10.0~svn242489-1) experimental; urgency=low
 
   * Update to SVN 242489

Modified: trunk/kfreebsd-10/debian/patches/000_cxgbe.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/000_cxgbe.diff	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/000_cxgbe.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,8 +1,6 @@
-Index: modules/cxgbe/Makefile
-===================================================================
---- a/sys/modules/cxgbe/Makefile	(revision 242489)
-+++ b/sys/modules/cxgbe/Makefile	(working copy)
-@@ -2,8 +2,14 @@
+--- a/sys/modules/cxgbe/Makefile
++++ b/sys/modules/cxgbe/Makefile
+@@ -2,9 +2,15 @@
  # $FreeBSD$
  #
  
@@ -11,7 +9,8 @@
  SUBDIR = if_cxgbe
 +
 +.if ${MK_SOURCELESS_UCODE} != "no"
- SUBDIR+= firmware
+ SUBDIR+= t4_firmware
+ #SUBDIR+= t5_firmware
 +.endif
 +
  SUBDIR+= ${_tom}

Modified: trunk/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/001_misc.diff	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/001_misc.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,32 +1,26 @@
 
 Co-authored by Nali Toja
 
-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 @@
+--- a/sys/conf/kern.mk
++++ b/sys/conf/kern.mk
+@@ -1,5 +1,15 @@
  # $FreeBSD$
  
 +FREEBSD_CC!=   ${CC} -dM -E -</dev/null | awk '/__FreeBSD_cc_version/ { print $$3 }' || true
 +
- #
- # Warning flags for compiling the kernel and components of the kernel:
- #
 +.if ${FREEBSD_CC}
 +# FreeBSD extensions
 +format_extensions=     -fformat-extensions
 +no_align_long_strings= -mno-align-long-strings
++.else
++MK_FORMAT_EXTENSIONS=no
 +.endif
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		-Wundef -Wno-pointer-sign -fformat-extensions \
-+		-Wundef -Wno-pointer-sign ${format_extensions} \
- 		-Wmissing-include-dirs -fdiagnostics-show-option \
- 		${CWARNEXTRA}
++
  #
-@@ -53,7 +60,7 @@
+ # Warning flags for compiling the kernel and components of the kernel:
  #
+@@ -61,7 +71,7 @@
+ #
  .if ${MACHINE_CPUARCH} == "i386"
  .if ${COMPILER_TYPE} != "clang"
 -CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2

Modified: trunk/kfreebsd-10/debian/patches/002_maxpathlen.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/002_maxpathlen.diff	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/002_maxpathlen.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,7 +1,5 @@
-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
+--- a/usr.sbin/config/main.c
++++ b/usr.sbin/config/main.c
 @@ -60,6 +60,10 @@
  #include "config.h"
  #include "configvers.h"
@@ -13,10 +11,8 @@
  #ifndef TRUE
  #define TRUE	(1)
  #endif
-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
+--- a/usr.sbin/config/mkmakefile.c
++++ b/usr.sbin/config/mkmakefile.c
 @@ -50,6 +50,10 @@
  #include "config.h"
  #include "configvers.h"
@@ -28,10 +24,8 @@
  #define next_word(fp, wd) \
  	{ char *word = get_word(fp); \
  	  if (word == (char *)EOF) \
-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
+--- a/usr.sbin/config/mkoptions.c
++++ b/usr.sbin/config/mkoptions.c
 @@ -48,6 +48,10 @@
  #include "config.h"
  #include "y.tab.h"
@@ -43,10 +37,8 @@
  static	struct users {
  	int	u_default;
  	int	u_min;
-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
+--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
++++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
 @@ -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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,10 +1,8 @@
 
 Partially sent to freebsd-hackers (2011-07-02)
 
-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
+--- a/sys/dev/aic7xxx/aicasm/Makefile
++++ b/sys/dev/aic7xxx/aicasm/Makefile
 @@ -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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/004_xargs.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -4,10 +4,8 @@
 
 http://savannah.gnu.org/patch/?4916
 
-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
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
 @@ -215,7 +215,7 @@
  	grep -v '^#' < ${EXPORT_SYMS} > export_syms
  .endif
@@ -17,10 +15,8 @@
  .endif
  .endif
  .if !defined(DEBUG_FLAGS) && ${__KLD_SHARED} == no
-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
+--- a/sys/contrib/dev/acpica/acpica_prep.sh
++++ b/sys/contrib/dev/acpica/acpica_prep.sh
 @@ -58,10 +58,10 @@
  # copy files
  echo copying full dirs
@@ -34,10 +30,8 @@
  
  # canonify include paths
  for H in ${src_headers}; do
-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
+--- a/sys/conf/kern.post.mk
++++ b/sys/conf/kern.post.mk
 @@ -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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/107_mount_update.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -5,10 +5,8 @@
 
 Also see PR kern/150206
 
-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
+--- a/sys/kern/vfs_mount.c
++++ b/sys/kern/vfs_mount.c
 @@ -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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,7 +1,5 @@
-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
+--- a/sys/conf/options.mips
++++ b/sys/conf/options.mips
 @@ -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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -3,10 +3,8 @@
 I could find that doesn't cause kernel panics CPU triple-faults or
 other kind of severe breakage.
 
-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
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
 @@ -47,6 +47,9 @@
  .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
  COPTFLAGS+= -fno-strict-aliasing
@@ -17,10 +15,8 @@
  .if !defined(NO_CPU_COPTFLAGS)
  COPTFLAGS+= ${_CPUCFLAGS}
  .endif
-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
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
 @@ -87,6 +87,9 @@
  .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
  CFLAGS+=	-fno-strict-aliasing

Modified: trunk/kfreebsd-10/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/902_version.diff	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/902_version.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,8 +1,6 @@
-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 @@
+--- a/sys/conf/newvers.sh
++++ b/sys/conf/newvers.sh
+@@ -155,7 +155,7 @@
  cat << EOF > vers.c
  $COPYRIGHT
  #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${p4version}: ${t}"

Modified: trunk/kfreebsd-10/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/904_dev_full.diff	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/904_dev_full.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -2,10 +2,8 @@
 Status: FIONBIO/FIOASYNC is in http://www.freebsd.org/cgi/query-pr.cgi?pr=138526
 	/dev/full already rejected in upstream (kern/68961)
 
-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
+--- a/sys/dev/null/null.c
++++ b/sys/dev/null/null.c
 @@ -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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/906_grow_sysv_ipc_limits.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -21,11 +21,9 @@
     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: 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 @@
+--- a/sys/amd64/conf/GENERIC
++++ b/sys/amd64/conf/GENERIC
+@@ -59,6 +59,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores
@@ -37,11 +35,9 @@
  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
-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 @@
+--- a/sys/i386/conf/GENERIC
++++ b/sys/i386/conf/GENERIC
+@@ -60,6 +60,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores

Modified: trunk/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,8 +1,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 @@
+--- a/sys/compat/linprocfs/linprocfs.c
++++ b/sys/compat/linprocfs/linprocfs.c
+@@ -356,10 +356,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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/910_GENERIC_hints.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,7 +1,5 @@
-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
+--- a/sys/i386/conf/GENERIC.hints
++++ b/sys/i386/conf/GENERIC.hints
 @@ -18,6 +18,7 @@
  hint.atkbd.0.at="atkbdc"
  hint.atkbd.0.irq="1"
@@ -10,10 +8,8 @@
  hint.psm.0.irq="12"
  hint.sc.0.at="isa"
  hint.sc.0.flags="0x100"
-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
+--- a/sys/amd64/conf/GENERIC.hints
++++ b/sys/amd64/conf/GENERIC.hints
 @@ -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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/913_uudecode.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,17 +1,13 @@
-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
+--- a/sys/modules/ralfw/Makefile.inc
++++ b/sys/modules/ralfw/Makefile.inc
 @@ -12,4 +12,4 @@
  FIRMWS=	${_FIRM}:${KMOD}
  
  ${_FIRM}: ${.CURDIR}/../../../contrib/dev/ral/${_FIRM}.uu
 -	uudecode -p $? > ${.TARGET}
 +	uudecode -o- $? > ${.TARGET}
-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
+--- a/sys/modules/mwlfw/Makefile
++++ b/sys/modules/mwlfw/Makefile
 @@ -6,9 +6,9 @@
  CLEANFILES+= mw88W8363.fw mwlboot.fw
  
@@ -24,10 +20,8 @@
 +	uudecode -o- $? > ${.TARGET}
  
  .include <bsd.kmod.mk>
-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
+--- a/sys/modules/ipwfw/ipw_bss/Makefile
++++ b/sys/modules/ipwfw/ipw_bss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	ipw_bss
  
@@ -37,10 +31,8 @@
  
  .include <bsd.kmod.mk>
  
-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
+--- a/sys/modules/ipwfw/ipw_ibss/Makefile
++++ b/sys/modules/ipwfw/ipw_ibss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	ipw_ibss
  
@@ -50,25 +42,19 @@
  
  .include <bsd.kmod.mk>
  
-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 @@
- 
+--- a/sys/modules/ipwfw/ipw_monitor/Makefile
++++ b/sys/modules/ipwfw/ipw_monitor/Makefile
+@@ -9,7 +9,7 @@
  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}
-+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}
++	uudecode -o- ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu > ${.TARGET}
  
  .include <bsd.kmod.mk>
  
-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
+--- a/sys/modules/iwifw/iwi_bss/Makefile
++++ b/sys/modules/iwifw/iwi_bss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_bss
  
@@ -78,10 +64,8 @@
  
  .include <bsd.kmod.mk>
  
-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
+--- a/sys/modules/iwifw/iwi_ibss/Makefile
++++ b/sys/modules/iwifw/iwi_ibss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_fw
  
@@ -91,10 +75,8 @@
  
  .include <bsd.kmod.mk>
  
-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
+--- a/sys/modules/iwifw/iwi_monitor/Makefile
++++ b/sys/modules/iwifw/iwi_monitor/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_monitor
  
@@ -104,10 +86,8 @@
  
  .include <bsd.kmod.mk>
  
-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
+--- a/sys/modules/wpifw/Makefile
++++ b/sys/modules/wpifw/Makefile
 @@ -8,6 +8,6 @@
  CLEANFILES=	iwlwifi-3945-15.32.2.9.fw
  
@@ -116,20 +96,16 @@
 +	uudecode -o- ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu > ${.TARGET}
  
  .include <bsd.kmod.mk>
-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
+--- a/sys/modules/iwnfw/Makefile.inc
++++ b/sys/modules/iwnfw/Makefile.inc
 @@ -15,4 +15,4 @@
  #FIRMWARE_LICENSE=
  
  ${_FIRM}: ${.CURDIR}/../../../contrib/dev/iwn/${_FIRM}.uu
 -	uudecode -p $? > ${.TARGET}
 +	uudecode -o- $? > ${.TARGET}
-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
+--- a/sys/modules/runfw/Makefile
++++ b/sys/modules/runfw/Makefile
 @@ -6,6 +6,6 @@
  CLEANFILES=	runfw
  

Modified: trunk/kfreebsd-10/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/914_psm.diff	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/914_psm.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -5,10 +5,8 @@
 | 
 | This makes Xorg happy if you aren't using moused.
 
-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
+--- a/sys/dev/atkbdc/psm.c
++++ b/sys/dev/atkbdc/psm.c
 @@ -70,10 +70,7 @@
  #include <sys/module.h>
  #include <sys/bus.h>
@@ -20,7 +18,7 @@
  #include <sys/syslog.h>
  #include <machine/bus.h>
  #include <sys/rman.h>
-@@ -297,7 +294,6 @@
+@@ -335,7 +332,6 @@
  	struct cdev	*bdev;
  	int		lasterr;
  	int		cmdcount;
@@ -28,7 +26,7 @@
  };
  static devclass_t psm_devclass;
  
-@@ -1518,7 +1514,6 @@
+@@ -1565,7 +1561,6 @@
  	sc->mode.level = sc->dflt_mode.level;
  	sc->mode.protocol = sc->dflt_mode.protocol;
  	sc->watchdog = FALSE;
@@ -36,7 +34,7 @@
  
  	/* flush the event queue */
  	sc->queue.count = 0;
-@@ -1659,12 +1654,6 @@
+@@ -1706,12 +1701,6 @@
  	/* remove anything left in the output buffer */
  	empty_aux_buffer(sc->kbdc, 10);
  
@@ -49,7 +47,7 @@
  	/* close is almost always successful */
  	sc->state &= ~PSM_OPEN;
  	kbdc_lock(sc->kbdc, FALSE);
-@@ -2226,15 +2215,6 @@
+@@ -2273,15 +2262,6 @@
  		break;
  #endif /* MOUSE_GETHWID */
  
@@ -65,7 +63,7 @@
  	default:
  		return (ENOTTY);
  	}
-@@ -3501,9 +3481,6 @@
+@@ -3549,9 +3529,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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/915_ip6.v6only.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,7 +1,5 @@
-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
+--- a/sys/netinet6/in6_proto.c
++++ b/sys/netinet6/in6_proto.c
 @@ -396,7 +396,7 @@
  VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
  VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;

Modified: trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,8 +1,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 @@
+--- a/sys/modules/Makefile
++++ b/sys/modules/Makefile
+@@ -169,8 +169,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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -6,11 +6,9 @@
 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.
 
-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 @@
+--- a/sys/kern/uipc_usrreq.c
++++ b/sys/kern/uipc_usrreq.c
+@@ -470,7 +470,12 @@
  	KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
  
  	if (soun->sun_len > sizeof(struct sockaddr_un))
@@ -23,7 +21,7 @@
  	namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
  	if (namelen <= 0)
  		return (EINVAL);
-@@ -1247,7 +1252,12 @@
+@@ -1287,7 +1292,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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/919_delete_key.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -3,10 +3,8 @@
 The (Linux) console is configured to make <-- generate DEL, and Delete generate ESC [ 3 ~.
 
 
-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
+--- a/sys/dev/kbd/kbdtables.h
++++ b/sys/dev/kbd/kbdtables.h
 @@ -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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -3,10 +3,8 @@
 
 http://lists.freebsd.org/pipermail/freebsd-hackers/2011-July/thread.html#35854
 
-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
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
 @@ -97,6 +97,8 @@
  .endif
  WERROR?= -Werror
@@ -16,10 +14,8 @@
  # XXX LOCORE means "don't declare C stuff" not "for locore.s".
  ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
  
-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
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
 @@ -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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -11,10 +11,8 @@
 
   - The spares in struct sigevent are claimed by upstream (see #666454).
 
-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
+--- a/sys/sys/signal.h
++++ b/sys/sys/signal.h
 @@ -108,11 +108,7 @@
  #define	SIGUSR1		30	/* user defined signal 1 */
  #define	SIGUSR2		31	/* user defined signal 2 */
@@ -37,10 +35,8 @@
  		long __spare__[8];
  	} _sigev_un;
  };
-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
+--- a/sys/kern/kern_prot.c
++++ b/sys/kern/kern_prot.c
 @@ -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).
@@ -52,10 +48,8 @@
  		return (0);
  
  	return (cr_cansignal(td->td_ucred, p, signum));
-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
+--- a/sys/sys/rctl.h
++++ b/sys/sys/rctl.h
 @@ -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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,10 +1,8 @@
 
 freebsd-buildutils 9.0 doesn't define MK_CTF.
 
-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
+--- a/sys/conf/kern.post.mk
++++ b/sys/conf/kern.post.mk
 @@ -125,7 +125,7 @@
  	@rm -f ${.TARGET}
  	@echo linking ${.TARGET}
@@ -14,11 +12,9 @@
  	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
  .endif
  .if !defined(DEBUG)
-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 @@
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -148,7 +148,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	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -1,7 +1,5 @@
-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
+--- a/sys/amd64/conf/GENERIC
++++ b/sys/amd64/conf/GENERIC
 @@ -18,11 +18,11 @@
  #
  # $FreeBSD$
@@ -18,7 +16,7 @@
  
  options 	SCHED_ULE		# ULE scheduler
  options 	PREEMPTION		# Enable kernel thread preemption
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
  options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
  options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
@@ -27,7 +25,7 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -71,9 +71,9 @@
+@@ -72,9 +72,9 @@
  options 	CAPABILITY_MODE		# Capsicum capability mode
  options 	CAPABILITIES		# Capsicum capabilities
  options 	MAC			# TrustedBSD MAC Framework
@@ -40,7 +38,7 @@
  options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
  
  # Debugging support.  Always need this:
-@@ -100,9 +100,6 @@
+@@ -101,9 +101,6 @@
  device		acpi
  device		pci
  
@@ -50,18 +48,17 @@
  # ATA controllers
  device		ahci		# AHCI-compatible SATA controllers
  device		ata		# Legacy ATA/SATA controllers
-@@ -200,10 +197,6 @@
+@@ -200,9 +197,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
 -device		lpt		# Printer
--device		plip		# TCP/IP over parallel
 -device		ppi		# Parallel port interface device
 -#device		vpo		# Requires scbus and da
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -301,10 +294,7 @@
+@@ -300,10 +294,7 @@
  options 	RDRAND_RNG	# Intel Bull Mountain RNG
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -72,10 +69,8 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-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
+--- a/sys/i386/conf/GENERIC
++++ b/sys/i386/conf/GENERIC
 @@ -18,13 +18,13 @@
  #
  # $FreeBSD$
@@ -96,7 +91,7 @@
  
  options 	SCHED_ULE		# ULE scheduler
  options 	PREEMPTION		# Enable kernel thread preemption
-@@ -45,6 +45,8 @@
+@@ -46,6 +46,8 @@
  options 	MSDOSFS			# MSDOS Filesystem
  options 	CD9660			# ISO 9660 Filesystem
  options 	PROCFS			# Process filesystem (requires PSEUDOFS)
@@ -105,7 +100,7 @@
  options 	PSEUDOFS		# Pseudo-filesystem framework
  options 	GEOM_PART_GPT		# GUID Partition Tables.
  options 	GEOM_RAID		# Soft RAID functionality.
-@@ -53,7 +55,7 @@
+@@ -54,7 +56,7 @@
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
  options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
  options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
@@ -114,7 +109,7 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -72,8 +74,8 @@
+@@ -73,8 +75,8 @@
  options 	CAPABILITY_MODE		# Capsicum capability mode
  options 	CAPABILITIES		# Capsicum capabilities
  options 	MAC			# TrustedBSD MAC Framework
@@ -125,7 +120,7 @@
  options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
  
  # Debugging support.  Always need this:
-@@ -102,9 +104,6 @@
+@@ -103,9 +105,6 @@
  device		eisa
  device		pci
  
@@ -135,18 +130,17 @@
  # ATA controllers
  device		ahci		# AHCI-compatible SATA controllers
  device		ata		# Legacy ATA/SATA controllers
-@@ -211,10 +210,6 @@
+@@ -211,9 +210,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
 -device		lpt		# Printer
--device		plip		# TCP/IP over parallel
 -device		ppi		# Parallel port interface device
 -#device		vpo		# Requires scbus and da
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -315,10 +310,7 @@
+@@ -314,10 +310,7 @@
  options 	RDRAND_RNG	# Intel Bull Mountain RNG
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -157,10 +151,8 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-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
+--- /dev/null
++++ b/sys/conf/DEBIAN
 @@ -0,0 +1,52 @@
 +# Common options to all Debian GNU/kFreeBSD kernels
 +

Added: trunk/kfreebsd-10/debian/patches/cc_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/cc_version.diff	                        (rev 0)
+++ trunk/kfreebsd-10/debian/patches/cc_version.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -0,0 +1,14 @@
+Ensure we don't accidentally match lines with 'version' as a substring in
+some other term (such as a compiler flag) when grepping for the compiler
+version.
+--- a/sys/conf/newvers.sh
++++ b/sys/conf/newvers.sh
+@@ -86,7 +86,7 @@
+ touch version
+ v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
+ i=`${MAKE:-make} -V KERN_IDENT`
+-compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
++compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep ' version ')
+ 
+ for dir in /bin /usr/bin /usr/local/bin; do
+ 	if [ -x "${dir}/svnversion" ] && [ -z ${svnversion} ] ; then

Added: trunk/kfreebsd-10/debian/patches/debugger.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/debugger.diff	                        (rev 0)
+++ trunk/kfreebsd-10/debian/patches/debugger.diff	2013-05-21 16:37:52 UTC (rev 4469)
@@ -0,0 +1,33 @@
+--- a/sys/conf/DEBIAN
++++ b/sys/conf/DEBIAN
+@@ -17,28 +17,8 @@
+ # but unfortunetely glibc doesn't support pts(4) yet (see #667448).
+ device		pty
+ 
+-# Full debugger support is disabled by upstream when a branch is close to
+-# release.  Unfortunately this can trigger the appearance of heisenbugs
+-# which were previously hidden (we've been hit by this already, see #651624).
+-#
+-# This disables full debugger support in advance, so that the build
+-# configuration which is going to be used for release is tested during the
+-# whole release cycle.  If you need a debug kernel, simply remove/comment
+-# the following lines:
+-
+-nooption 	DDB			# Support DDB.
+-nooption 	GDB			# Support remote GDB.
+-nooption 	DEADLKRES		# Enable the deadlock resolver
+-nooption 	INVARIANTS		# Enable calls of extra sanity checking
+-nooption 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
+-nooption 	WITNESS			# Enable checks to detect deadlocks and cycles
+-nooption 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+-nooption 	MALLOC_DEBUG_MAXZONES	# Separate malloc(9) zones
+-
+-# Usually when full debugger is enabled, minimum debugger support is disabled.
+-# Bring it back:
+-
+-options 	KDB_TRACE		# Print a stack trace for a panic.
++# Build with GDB debugging symbols.
++makeoptions	DEBUG=-g
+ 
+ # Alternate queueing
+ options		ALTQ

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/patches/series	2013-05-21 16:37:52 UTC (rev 4469)
@@ -13,7 +13,7 @@
 109_linprocfs_non_x86.diff
 
 # Patches that are likely to be Debian-specific
-901_disable_optimization_2.diff
+#901_disable_optimization_2.diff
 902_version.diff
 904_dev_full.diff
 906_grow_sysv_ipc_limits.diff
@@ -22,7 +22,7 @@
 913_uudecode.diff
 914_psm.diff
 915_ip6.v6only.diff
-916_NKPT_amd64.diff
+#916_NKPT_amd64.diff
 917_disable_kgssapi.diff
 918_unix_socket_overflow.diff
 919_delete_key.diff
@@ -30,3 +30,7 @@
 921_signal_watchdog.diff
 951_disable_mk_magic.diff
 999_config.diff
+
+# temporary
+debugger.diff
+cc_version.diff

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-05-20 15:57:41 UTC (rev 4468)
+++ trunk/kfreebsd-10/debian/rules	2013-05-21 16:37:52 UTC (rev 4469)
@@ -22,7 +22,7 @@
 configfile	:= DEBCUSTOM
 abiname		:= 0
 ld_target	:= $(shell ld --help | sed -ne "s/[^ :]*: supported targets: \([^ ]*\) .*/\1/p")
-kernel_cc	:= gcc-4.6
+kernel_cc	:= gcc-4.8
 
 ifeq ($(cpu), mipsel)
 kfreebsd_cpu	:= mips

More information about the Glibc-bsd-commits mailing list