[Glibc-bsd-commits] r2862 - trunk/kfreebsd-8/debian/patches

Aurelien Jarno aurel32 at alioth.debian.org
Thu Nov 26 03:02:48 UTC 2009 

Author: aurel32
Date: 2009-11-26 03:02:47 +0000 (Thu, 26 Nov 2009)
New Revision: 2862

Modified:
   trunk/kfreebsd-8/debian/patches/000_rename.diff
   trunk/kfreebsd-8/debian/patches/001_misc.diff
   trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff
   trunk/kfreebsd-8/debian/patches/004_xargs.diff
   trunk/kfreebsd-8/debian/patches/007_clone_signals.diff
   trunk/kfreebsd-8/debian/patches/008_config.diff
   trunk/kfreebsd-8/debian/patches/009_disable_duped_modules.diff
   trunk/kfreebsd-8/debian/patches/013_ip_packed.diff
   trunk/kfreebsd-8/debian/patches/020_linker.diff
   trunk/kfreebsd-8/debian/patches/102_POLL_HUP.diff
   trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff
   trunk/kfreebsd-8/debian/patches/902_version.diff
   trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
   trunk/kfreebsd-8/debian/patches/904_dev_full.diff
   trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff
   trunk/kfreebsd-8/debian/patches/907_cpu_class.diff
   trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff
   trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff
   trunk/kfreebsd-8/debian/patches/912_binutils.diff
   trunk/kfreebsd-8/debian/patches/913_uudecode.diff
   trunk/kfreebsd-8/debian/patches/914_psm.diff
   trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
   trunk/kfreebsd-8/debian/patches/999_config.diff
Log:
Refresh all patches



Modified: trunk/kfreebsd-8/debian/patches/000_rename.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_rename.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/000_rename.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -11,8 +11,8 @@
   EINVAL.
 
 
---- head/sys/kern/vfs_lookup.c	2009/07/29 07:44:43	195939
-+++ head/sys/kern/vfs_lookup.c	2009/11/10 11:50:37	199137
+--- a/sys/kern/vfs_lookup.c
++++ b/sys/kern/vfs_lookup.c
 @@ -552,6 +552,12 @@
  	else
  		cnp->cn_flags &= ~ISLASTCN;

Modified: trunk/kfreebsd-8/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/001_misc.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/001_misc.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -2,10 +2,10 @@
 Status: chflags is BSD-specific.  We could add it to freebsd-utils.
   The rest has been rejected (kern/93502)
 
---- src.orig/sys/conf/kern.mk
-+++ src/sys/conf/kern.mk
+--- a/sys/conf/kern.mk
++++ b/sys/conf/kern.mk
 @@ -1,5 +1,9 @@
- # $FreeBSD: src/sys/conf/kern.mk,v 1.59 2009/03/03 18:53:47 imp Exp $
+ # $FreeBSD$
  
 +.if !defined(OPSYS)
 +OPSYS!=		uname -s

Modified: trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,5 +1,5 @@
---- src.orig/sys/dev/aic7xxx/aicasm/Makefile
-+++ src/sys/dev/aic7xxx/aicasm/Makefile
+--- a/sys/dev/aic7xxx/aicasm/Makefile
++++ b/sys/dev/aic7xxx/aicasm/Makefile
 @@ -14,7 +14,7 @@
  SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
  CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
@@ -23,10 +23,10 @@
  .ifdef MAKESRCPATH
  CFLAGS+= -I${MAKESRCPATH}
  .endif
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm.h
-+++ src/sys/dev/aic7xxx/aicasm/aicasm.h
+--- a/sys/dev/aic7xxx/aicasm/aicasm.h
++++ b/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 $
+  * $FreeBSD$
   */
  
 -#ifdef __linux__
@@ -37,8 +37,8 @@
  #else
  #include <sys/queue.h>
  #endif
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_gram.y
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_gram.y
+--- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
++++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
 @@ -52,8 +52,9 @@
  #include <string.h>
  #include <sysexits.h>
@@ -60,8 +60,8 @@
  {
  	struct macro_arg *marg;
  	int retval;
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
++++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
 @@ -52,8 +52,9 @@
  #include <string.h>
  #include <sysexits.h>
@@ -74,8 +74,8 @@
  #else
  #include <sys/queue.h>
  #endif
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
++++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
 @@ -51,8 +51,10 @@
  #include <stdio.h>
  #include <string.h>
@@ -89,8 +89,8 @@
  #else
  #include <sys/queue.h>
  #endif
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
++++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
 @@ -51,8 +51,10 @@
  #include <stdio.h>
  #include <string.h>
@@ -104,8 +104,8 @@
  #else
  #include <sys/queue.h>
  #endif
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
++++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
 @@ -44,10 +44,11 @@
  
  #include <sys/types.h>
@@ -121,10 +121,10 @@
  #endif
  #include <ctype.h>
  #include <fcntl.h>
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
++++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
 @@ -42,8 +42,9 @@
-  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.18 2009/06/01 18:42:16 delphij Exp $
+  * $FreeBSD$
   */
  
 -#ifdef __linux__

Modified: trunk/kfreebsd-8/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/004_xargs.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/004_xargs.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,8 +1,8 @@
 
 Status: xargs -J option requested to both upstream and debian.
 
---- src.orig/sys/conf/kmod.mk
-+++ src/sys/conf/kmod.mk
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
 @@ -203,7 +203,7 @@
  	grep -v '^#' < ${EXPORT_SYMS} > export_syms
  .endif
@@ -12,8 +12,8 @@
  .endif
  .endif
  .if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
---- src.orig/sys/contrib/dev/acpica/acpica_prep.sh
-+++ src/sys/contrib/dev/acpica/acpica_prep.sh
+--- 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

Modified: trunk/kfreebsd-8/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/007_clone_signals.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/007_clone_signals.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,6 +1,6 @@
---- src.orig/sys/kern/kern_fork.c
-+++ src/sys/kern/kern_fork.c
-@@ -561,7 +561,13 @@
+--- a/sys/kern/kern_fork.c
++++ b/sys/kern/kern_fork.c
+@@ -562,7 +562,13 @@
  		p2->p_sigacts = newsigacts;
  	}
  	if (flags & RFLINUXTHPN) 
@@ -15,8 +15,8 @@
  	else
  	        p2->p_sigparent = SIGCHLD;
  
---- src.orig/sys/sys/unistd.h
-+++ src/sys/sys/unistd.h
+--- a/sys/sys/unistd.h
++++ b/sys/sys/unistd.h
 @@ -182,6 +182,10 @@
  #define	RFHIGHPID	(1<<18)	/* use a pid higher than 10 (idleproc) */
  #define	RFPPWAIT	(1<<31)	/* parent sleeps until child exits (vfork) */

Modified: trunk/kfreebsd-8/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/008_config.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/008_config.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -3,8 +3,8 @@
 Status: gotta uncomment WARNS (see #351366), and find a portable way to add
   "-lbsd".  after this it can be sent upstream.
 
---- src.orig/usr.sbin/config/Makefile
-+++ src/usr.sbin/config/Makefile
+--- a/usr.sbin/config/Makefile
++++ b/usr.sbin/config/Makefile
 @@ -9,11 +9,11 @@
  kernconf.c: kernconf.tmpl
  	file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
@@ -20,10 +20,10 @@
  
  CLEANFILES+=	kernconf.c
  
---- src.orig/usr.sbin/config/main.c
-+++ src/usr.sbin/config/main.c
+--- a/usr.sbin/config/main.c
++++ b/usr.sbin/config/main.c
 @@ -41,12 +41,18 @@
-   "$FreeBSD: src/usr.sbin/config/main.c,v 1.81 2009/02/07 11:40:47 wkoszek Exp $";
+   "$FreeBSD$";
  #endif /* not lint */
  
 +#include <stdarg.h>

Modified: trunk/kfreebsd-8/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/009_disable_duped_modules.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/009_disable_duped_modules.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,8 +1,8 @@
 
 Status: in upstream BTS
 
---- src.orig/sys/conf/Makefile.amd64
-+++ src/sys/conf/Makefile.amd64
+--- a/sys/conf/Makefile.amd64
++++ b/sys/conf/Makefile.amd64
 @@ -40,6 +40,8 @@
  
  MKMODULESENV+= MACHINE=amd64
@@ -12,8 +12,8 @@
  %BEFORE_DEPEND
  
  %OBJS
---- src.orig/sys/conf/Makefile.arm
-+++ src/sys/conf/Makefile.arm
+--- a/sys/conf/Makefile.arm
++++ b/sys/conf/Makefile.arm
 @@ -121,6 +121,8 @@
  
  MKMODULESENV+=	MACHINE=${MACHINE}
@@ -23,8 +23,8 @@
  %BEFORE_DEPEND
  
  %OBJS
---- src.orig/sys/conf/Makefile.i386
-+++ src/sys/conf/Makefile.i386
+--- a/sys/conf/Makefile.i386
++++ b/sys/conf/Makefile.i386
 @@ -34,6 +34,8 @@
  
  MKMODULESENV+=	MACHINE=${MACHINE}
@@ -34,8 +34,8 @@
  %BEFORE_DEPEND
  
  %OBJS
---- src.orig/sys/conf/Makefile.ia64
-+++ src/sys/conf/Makefile.ia64
+--- a/sys/conf/Makefile.ia64
++++ b/sys/conf/Makefile.ia64
 @@ -36,6 +36,8 @@
  
  ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
@@ -45,8 +45,8 @@
  %BEFORE_DEPEND
  
  %OBJS
---- src.orig/sys/conf/Makefile.pc98
-+++ src/sys/conf/Makefile.pc98
+--- a/sys/conf/Makefile.pc98
++++ b/sys/conf/Makefile.pc98
 @@ -34,6 +34,8 @@
  
  MKMODULESENV+=	MACHINE=${MACHINE}
@@ -56,8 +56,8 @@
  %BEFORE_DEPEND
  
  %OBJS
---- src.orig/sys/conf/Makefile.powerpc
-+++ src/sys/conf/Makefile.powerpc
+--- a/sys/conf/Makefile.powerpc
++++ b/sys/conf/Makefile.powerpc
 @@ -37,6 +37,8 @@
  CFLAGS+=	-fno-omit-frame-pointer
  .endif
@@ -67,8 +67,8 @@
  %BEFORE_DEPEND
  
  %OBJS
---- src.orig/sys/conf/Makefile.sparc64
-+++ src/sys/conf/Makefile.sparc64
+--- a/sys/conf/Makefile.sparc64
++++ b/sys/conf/Makefile.sparc64
 @@ -32,6 +32,8 @@
  
  MDOBJS=	exception.o interrupt.o
@@ -78,8 +78,8 @@
  %BEFORE_DEPEND
  
  %OBJS
---- src.orig/usr.sbin/config/mkmakefile.c
-+++ src/usr.sbin/config/mkmakefile.c
+--- a/usr.sbin/config/mkmakefile.c
++++ b/usr.sbin/config/mkmakefile.c
 @@ -70,6 +70,7 @@
  static void do_rules(FILE *);
  static void do_xxfiles(char *, FILE *);

Modified: trunk/kfreebsd-8/debian/patches/013_ip_packed.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/013_ip_packed.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/013_ip_packed.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,5 +1,5 @@
---- src.orig/sys/netinet/ip.h
-+++ src/sys/netinet/ip.h
+--- a/sys/netinet/ip.h
++++ b/sys/netinet/ip.h
 @@ -67,7 +67,7 @@
  	u_char	ip_p;			/* protocol */
  	u_short	ip_sum;			/* checksum */

Modified: trunk/kfreebsd-8/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/020_linker.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/020_linker.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -4,8 +4,8 @@
   for details see http://sourceware.org/bugzilla/show_bug.cgi?id=5391
 
 
---- src.orig/sys/conf/kern.post.mk
-+++ src/sys/conf/kern.post.mk
+--- a/sys/conf/kern.post.mk
++++ b/sys/conf/kern.post.mk
 @@ -85,7 +85,9 @@
  ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
  	@rm -f ${.TARGET}
@@ -17,8 +17,8 @@
  .if defined(CTFMERGE)
  	${SYSTEM_CTFMERGE}
  .endif
---- src.orig/sys/conf/kmod.mk
-+++ src/sys/conf/kmod.mk
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
 @@ -176,7 +176,9 @@
  
  .if ${MACHINE_ARCH} != amd64

Modified: trunk/kfreebsd-8/debian/patches/102_POLL_HUP.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/102_POLL_HUP.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/102_POLL_HUP.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -6,8 +6,8 @@
 http://www.freebsd.org/cgi/query-pr.cgi?pr=126076
 
 
---- src.orig/sys/sys/signal.h
-+++ src/sys/sys/signal.h
+--- a/sys/sys/signal.h
++++ b/sys/sys/signal.h
 @@ -284,7 +284,7 @@
  #define POLL_MSG	3	/* Input message available		*/
  #define POLL_ERR	4	/* I/O Error				*/

Modified: trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,6 +1,6 @@
---- src.orig/sys/kern/sys_pipe.c
-+++ src/sys/kern/sys_pipe.c
-@@ -1384,6 +1384,8 @@
+--- a/sys/kern/sys_pipe.c
++++ b/sys/kern/sys_pipe.c
+@@ -1405,6 +1405,8 @@
  	struct thread *td;
  {
  	struct pipe *pipe = fp->f_data;
@@ -9,7 +9,7 @@
  #ifdef MAC
  	int error;
  
-@@ -1410,6 +1412,8 @@
+@@ -1431,6 +1433,8 @@
  	 * Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen.
  	 * XXX (st_dev, st_ino) should be unique.
  	 */

Modified: trunk/kfreebsd-8/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/902_version.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/902_version.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,6 +1,6 @@
---- src.orig/sys/conf/newvers.sh
-+++ src/sys/conf/newvers.sh
-@@ -114,7 +114,7 @@
+--- a/sys/conf/newvers.sh
++++ b/sys/conf/newvers.sh
+@@ -110,7 +110,7 @@
  cat << EOF > vers.c
  $COPYRIGHT
  #define SCCSSTR "@(#)${VERSION} #${v}${svn}: ${t}"

Modified: trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,5 +1,5 @@
---- src.orig/sys/conf/files.i386
-+++ src/sys/conf/files.i386
+--- a/sys/conf/files.i386
++++ b/sys/conf/files.i386
 @@ -46,27 +46,6 @@
  	no-obj no-implicit-rule before-depend				\
  	clean		"ukbdmap.h"
@@ -51,9 +51,9 @@
  dev/nvram/nvram.c		optional nvram isa
  dev/pcf/pcf_isa.c		optional pcf
  dev/random/nehemiah.c		optional random
---- src.orig/sys/i386/conf/GENERIC
-+++ src/sys/i386/conf/GENERIC
-@@ -152,8 +152,6 @@
+--- a/sys/i386/conf/GENERIC
++++ b/sys/i386/conf/GENERIC
+@@ -142,8 +142,6 @@
  device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
  device		ciss		# Compaq Smart RAID 5*
  device		dpt		# DPT Smartcache III, IV - See NOTES for options
@@ -62,8 +62,8 @@
  device		iir		# Intel Integrated RAID
  device		ips		# IBM (Adaptec) ServeRAID
  device		mly		# Mylex AcceleRAID/eXtremeRAID
---- src.orig/sys/modules/Makefile
-+++ src/sys/modules/Makefile
+--- a/sys/modules/Makefile
++++ b/sys/modules/Makefile
 @@ -97,8 +97,6 @@
  	hifn \
  	hme \
@@ -73,7 +73,7 @@
  	hwpmc \
  	${_i2c} \
  	${_ibcs2} \
-@@ -202,7 +200,6 @@
+@@ -203,7 +201,6 @@
  	ntfs \
  	ntfs_iconv \
  	nullfs \
@@ -81,7 +81,7 @@
  	${_nvram} \
  	${_nwfs} \
  	${_nxge} \
-@@ -422,8 +411,6 @@
+@@ -424,8 +421,6 @@
  _dpt=		dpt
  _ex=		ex
  _hptiop=	hptiop
@@ -90,7 +90,7 @@
  _ichwd=		ichwd
  _ida=		ida
  _iir=		iir
-@@ -438,7 +425,6 @@
+@@ -440,7 +435,6 @@
  _ixgb=		ixgb
  _mly=		mly
  _nfe=		nfe
@@ -98,7 +98,7 @@
  _nvram=		nvram
  _nxge=		nxge
  _wpi=		wpi
-@@ -487,8 +473,6 @@
+@@ -489,8 +483,6 @@
  _exca=		exca
  _ext2fs=	ext2fs
  _hptiop=	hptiop
@@ -107,7 +107,7 @@
  _i2c=		i2c
  _ichwd=		ichwd
  _ida=		ida
-@@ -509,7 +493,6 @@
+@@ -511,7 +503,6 @@
  _mly=		mly
  _ndis=		ndis
  _nfe=		nfe
@@ -115,9 +115,9 @@
  _nvram=		nvram
  _nxge=		nxge
  .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
---- src.orig/sys/amd64/conf/GENERIC
-+++ src/sys/amd64/conf/GENERIC
-@@ -145,8 +145,6 @@
+--- a/sys/amd64/conf/GENERIC
++++ b/sys/amd64/conf/GENERIC
+@@ -135,8 +135,6 @@
  #device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
  device		ciss		# Compaq Smart RAID 5*
  device		dpt		# DPT Smartcache III, IV - See NOTES for options
@@ -126,8 +126,8 @@
  device		iir		# Intel Integrated RAID
  device		ips		# IBM (Adaptec) ServeRAID
  device		mly		# Mylex AcceleRAID/eXtremeRAID
---- src.orig/sys/conf/files.amd64
-+++ src/sys/conf/files.amd64
+--- a/sys/conf/files.amd64
++++ b/sys/conf/files.amd64
 @@ -47,26 +47,6 @@
  	no-obj no-implicit-rule before-depend				\
  	clean		"ukbdmap.h"

Modified: trunk/kfreebsd-8/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/904_dev_full.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/904_dev_full.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -2,8 +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)
 
---- src.orig/sys/dev/null/null.c
-+++ src/sys/dev/null/null.c
+--- a/sys/dev/null/null.c
++++ b/sys/dev/null/null.c
 @@ -43,13 +43,16 @@
  
  /* For use with destroy_dev(9). */
@@ -62,7 +62,7 @@
  	if (cmd != DIOCSKERNELDUMP)
  		return (ENOIOCTL);
  	error = priv_check(td, PRIV_SETDUMPER);
-@@ -117,12 +137,15 @@
+@@ -117,12 +142,15 @@
  		zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
  		null_dev = make_dev(&null_cdevsw, NULL_MINOR, UID_ROOT,
  			GID_WHEEL, 0666, "null");

Modified: trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -21,8 +21,8 @@
     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>
 
---- src.orig/sys/amd64/conf/GENERIC
-+++ src/sys/amd64/conf/GENERIC
+--- a/sys/amd64/conf/GENERIC
++++ b/sys/amd64/conf/GENERIC
 @@ -63,8 +63,14 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
@@ -38,8 +38,8 @@
  options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
  options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
  options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
---- src.orig/sys/i386/conf/GENERIC
-+++ src/sys/i386/conf/GENERIC
+--- a/sys/i386/conf/GENERIC
++++ b/sys/i386/conf/GENERIC
 @@ -64,8 +64,14 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support

Modified: trunk/kfreebsd-8/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/907_cpu_class.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/907_cpu_class.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,8 +1,8 @@
 
 Status: Rejected in upstream (kern/77355).
 
---- src.orig/sys/i386/i386/identcpu.c
-+++ src/sys/i386/i386/identcpu.c
+--- a/sys/i386/i386/identcpu.c
++++ b/sys/i386/i386/identcpu.c
 @@ -634,6 +634,7 @@
  #if defined(I486_CPU)
  	case CPUCLASS_486:

Modified: trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,6 +1,6 @@
---- src.orig/sys/compat/linprocfs/linprocfs.c
-+++ src/sys/compat/linprocfs/linprocfs.c
-@@ -352,10 +352,6 @@
+--- a/sys/compat/linprocfs/linprocfs.c
++++ b/sys/compat/linprocfs/linprocfs.c
+@@ -351,10 +351,6 @@
  
  		/* determine fs type */
  		fstype = mp->mnt_stat.f_fstypename;

Modified: trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,5 +1,5 @@
---- src.orig/sys/i386/conf/GENERIC.hints
-+++ src/sys/i386/conf/GENERIC.hints
+--- 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"
@@ -8,8 +8,8 @@
  hint.psm.0.irq="12"
  hint.sc.0.at="isa"
  hint.sc.0.flags="0x100"
---- src.orig/sys/amd64/conf/GENERIC.hints
-+++ src/sys/amd64/conf/GENERIC.hints
+--- 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-8/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/912_binutils.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/912_binutils.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,5 +1,5 @@
---- src.orig/sys/conf/ldscript.amd64
-+++ src/sys/conf/ldscript.amd64
+--- a/sys/conf/ldscript.amd64
++++ b/sys/conf/ldscript.amd64
 @@ -1,12 +1,12 @@
  /* $FreeBSD$ */
 -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")

Modified: trunk/kfreebsd-8/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/913_uudecode.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/913_uudecode.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,13 +1,13 @@
---- src.orig/sys/modules/ralfw/Makefile.inc
-+++ src/sys/modules/ralfw/Makefile.inc
+--- 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}
---- src.orig/sys/modules/mwlfw/Makefile
-+++ src/sys/modules/mwlfw/Makefile
+--- a/sys/modules/mwlfw/Makefile
++++ b/sys/modules/mwlfw/Makefile
 @@ -6,9 +6,9 @@
  CLEANFILES+= mw88W8363.fw mwlboot.fw
  
@@ -20,8 +20,8 @@
 +	uudecode -o- $? > ${.TARGET}
  
  .include <bsd.kmod.mk>
---- src.orig/sys/modules/ipwfw/ipw_bss/Makefile
-+++ src/sys/modules/ipwfw/ipw_bss/Makefile
+--- a/sys/modules/ipwfw/ipw_bss/Makefile
++++ b/sys/modules/ipwfw/ipw_bss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	ipw_bss
  
@@ -31,8 +31,8 @@
  
  .include <bsd.kmod.mk>
  
---- src.orig/sys/modules/ipwfw/ipw_ibss/Makefile
-+++ src/sys/modules/ipwfw/ipw_ibss/Makefile
+--- a/sys/modules/ipwfw/ipw_ibss/Makefile
++++ b/sys/modules/ipwfw/ipw_ibss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	ipw_ibss
  
@@ -42,8 +42,8 @@
  
  .include <bsd.kmod.mk>
  
---- src.orig/sys/modules/ipwfw/ipw_monitor/Makefile
-+++ src/sys/modules/ipwfw/ipw_monitor/Makefile
+--- a/sys/modules/ipwfw/ipw_monitor/Makefile
++++ b/sys/modules/ipwfw/ipw_monitor/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	ipw_monitor
  
@@ -53,8 +53,8 @@
  
  .include <bsd.kmod.mk>
  
---- src.orig/sys/modules/iwifw/iwi_bss/Makefile
-+++ src/sys/modules/iwifw/iwi_bss/Makefile
+--- a/sys/modules/iwifw/iwi_bss/Makefile
++++ b/sys/modules/iwifw/iwi_bss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_bss
  
@@ -64,8 +64,8 @@
  
  .include <bsd.kmod.mk>
  
---- src.orig/sys/modules/iwifw/iwi_ibss/Makefile
-+++ src/sys/modules/iwifw/iwi_ibss/Makefile
+--- a/sys/modules/iwifw/iwi_ibss/Makefile
++++ b/sys/modules/iwifw/iwi_ibss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_fw
  
@@ -75,8 +75,8 @@
  
  .include <bsd.kmod.mk>
  
---- src.orig/sys/modules/iwifw/iwi_monitor/Makefile
-+++ src/sys/modules/iwifw/iwi_monitor/Makefile
+--- a/sys/modules/iwifw/iwi_monitor/Makefile
++++ b/sys/modules/iwifw/iwi_monitor/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_monitor
  
@@ -86,8 +86,8 @@
  
  .include <bsd.kmod.mk>
  
---- src.orig/sys/modules/wpifw/Makefile
-+++ src/sys/modules/wpifw/Makefile
+--- a/sys/modules/wpifw/Makefile
++++ b/sys/modules/wpifw/Makefile
 @@ -8,6 +8,6 @@
  CLEANFILES=	iwlwifi-3945-2.14.4.fw
  
@@ -96,8 +96,8 @@
 +	uudecode -o- ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu > ${.TARGET}
  
  .include <bsd.kmod.mk>
---- src.orig/sys/modules/iwnfw/Makefile
-+++ src/sys/modules/iwnfw/Makefile
+--- a/sys/modules/iwnfw/Makefile
++++ b/sys/modules/iwnfw/Makefile
 @@ -8,6 +8,6 @@
  CLEANFILES=	iwlwifi-4965-4.44.17.fw
  

Modified: trunk/kfreebsd-8/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/914_psm.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/914_psm.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -5,8 +5,8 @@
 | 
 | This makes Xorg happy if you aren't using moused.
 
---- src.orig/sys/dev/atkbdc/psm.c
-+++ src/sys/dev/atkbdc/psm.c
+--- a/sys/dev/atkbdc/psm.c
++++ b/sys/dev/atkbdc/psm.c
 @@ -70,10 +70,7 @@
  #include <sys/module.h>
  #include <sys/bus.h>
@@ -18,7 +18,7 @@
  #include <sys/syslog.h>
  #include <machine/bus.h>
  #include <sys/rman.h>
-@@ -215,7 +212,6 @@
+@@ -302,7 +299,6 @@
  	struct cdev	*bdev;
  	int		lasterr;
  	int		cmdcount;
@@ -26,7 +26,7 @@
  };
  static devclass_t psm_devclass;
  #define	PSM_SOFTC(unit)	\
-@@ -1387,7 +1383,6 @@
+@@ -1494,7 +1490,6 @@
  	sc->mode.level = sc->dflt_mode.level;
  	sc->mode.protocol = sc->dflt_mode.protocol;
  	sc->watchdog = FALSE;
@@ -34,7 +34,7 @@
  
  	/* flush the event queue */
  	sc->queue.count = 0;
-@@ -1527,12 +1522,6 @@
+@@ -1634,12 +1629,6 @@
  	/* remove anything left in the output buffer */
  	empty_aux_buffer(sc->kbdc, 10);
  
@@ -47,7 +47,7 @@
  	/* close is almost always successful */
  	sc->state &= ~PSM_OPEN;
  	kbdc_lock(sc->kbdc, FALSE);
-@@ -2094,15 +2083,6 @@
+@@ -2201,15 +2190,6 @@
  		break;
  #endif /* MOUSE_GETHWID */
  
@@ -63,7 +63,7 @@
  	default:
  		return (ENOTTY);
  	}
-@@ -2992,9 +2972,6 @@
+@@ -3474,9 +3454,6 @@
  		wakeup(sc);
  	}
  	selwakeuppri(&sc->rsel, PZERO);

Modified: trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -6,9 +6,9 @@
    - different init order 
    - ...
 
---- src.orig/sys/conf/kern.mk
-+++ src/sys/conf/kern.mk
-@@ -113,5 +125,5 @@
+--- a/sys/conf/kern.mk
++++ b/sys/conf/kern.mk
+@@ -125,5 +125,5 @@
  #
  .if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_ARCH} != "ia64" && \
  	${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"

Modified: trunk/kfreebsd-8/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_config.diff	2009-11-26 02:58:06 UTC (rev 2861)
+++ trunk/kfreebsd-8/debian/patches/999_config.diff	2009-11-26 03:02:47 UTC (rev 2862)
@@ -1,8 +1,8 @@
---- src.orig/sys/amd64/conf/GENERIC
-+++ src/sys/amd64/conf/GENERIC
+--- a/sys/amd64/conf/GENERIC
++++ b/sys/amd64/conf/GENERIC
 @@ -18,11 +18,11 @@
  #
- # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.531 2009/07/11 15:02:45 rpaulo Exp $
+ # $FreeBSD$
  
 -cpu		HAMMER
 -ident		GENERIC
@@ -24,7 +24,7 @@
  
  options 	SCHED_ULE		# ULE scheduler
  options 	PREEMPTION		# Enable kernel thread preemption
-@@ -59,7 +61,7 @@
+@@ -59,7 +59,7 @@
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
  options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
  options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
@@ -33,8 +33,8 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -93,7 +95,7 @@
- options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+@@ -83,7 +83,7 @@
+ #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
  
  # Make an SMP-capable kernel by default
 -options 	SMP			# Symmetric MultiProcessor Kernel
@@ -42,7 +42,7 @@
  
  # CPU frequency control
  device		cpufreq
-@@ -102,9 +104,6 @@
+@@ -92,9 +92,6 @@
  device		acpi
  device		pci
  
@@ -52,7 +52,7 @@
  # ATA and ATAPI devices
  device		ata
  device		atadisk		# ATA disk drives
-@@ -112,6 +111,8 @@
+@@ -102,6 +99,8 @@
  device		atapicd		# ATAPI CDROM drives
  device		atapifd		# ATAPI floppy drives
  device		atapist		# ATAPI tape drives
@@ -61,7 +61,7 @@
  options 	ATA_STATIC_ID	# Static device numbering
  
  # SCSI Controllers
-@@ -194,10 +195,6 @@
+@@ -184,10 +183,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -72,7 +72,7 @@
  
  # If you've got a "dumb" serial or parallel PCI card that is
  # supported by the puc(4) glue driver, uncomment the following
-@@ -279,11 +276,8 @@
+@@ -269,11 +264,8 @@
  device		loop		# Network loopback
  device		random		# Entropy device
  device		ether		# Ethernet support
@@ -84,7 +84,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -299,14 +293,12 @@
+@@ -289,14 +281,12 @@
  #device		udbp		# USB Double Bulk Pipe devices
  device		uhid		# "Human Interface Devices"
  device		ukbd		# Keyboard
@@ -99,7 +99,7 @@
  # USB Serial devices
  device		uark		# Technologies ARK3116 based serial adapters
  device		ubsa		# Belkin F5U103 and compatible serial adapters
-@@ -332,3 +324,11 @@
+@@ -322,3 +312,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
@@ -111,11 +111,11 @@
 +options		ALTQ_RIO	# RED In/Out
 +options		ALTQ_HFSC	# Hierarchical Packet Scheduler (HFSC)
 +options		ALTQ_PRIQ	# Priority Queuing (PRIQ)
---- src.orig/sys/i386/conf/GENERIC
-+++ src/sys/i386/conf/GENERIC
+--- a/sys/i386/conf/GENERIC
++++ b/sys/i386/conf/GENERIC
 @@ -18,13 +18,13 @@
  #
- # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.519 2009/07/11 15:02:45 rpaulo Exp $
+ # $FreeBSD$
  
 -cpu		I486_CPU
 -cpu		I586_CPU
@@ -159,8 +159,8 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -93,7 +95,7 @@
- options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+@@ -83,7 +85,7 @@
+ #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
  
  # To make an SMP kernel, the next two lines are needed
 -options 	SMP			# Symmetric MultiProcessor Kernel
@@ -168,7 +168,7 @@
  device		apic			# I/O APIC
  
  # CPU frequency control
-@@ -104,9 +106,6 @@
+@@ -94,9 +96,6 @@
  device		eisa
  device		pci
  
@@ -178,7 +178,7 @@
  # ATA and ATAPI devices
  device		ata
  device		atadisk		# ATA disk drives
-@@ -114,6 +113,8 @@
+@@ -104,6 +103,8 @@
  device		atapicd		# ATAPI CDROM drives
  device		atapifd		# ATAPI floppy drives
  device		atapist		# ATAPI tape drives
@@ -187,7 +187,7 @@
  options 	ATA_STATIC_ID	# Static device numbering
  
  # SCSI Controllers
-@@ -205,10 +206,6 @@
+@@ -195,10 +196,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -198,7 +198,7 @@
  
  # If you've got a "dumb" serial or parallel PCI card that is
  # supported by the puc(4) glue driver, uncomment the following
-@@ -292,11 +289,8 @@
+@@ -282,11 +279,8 @@
  device		loop		# Network loopback
  device		random		# Entropy device
  device		ether		# Ethernet support
@@ -210,7 +210,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -312,14 +306,12 @@
+@@ -302,14 +296,12 @@
  #device		udbp		# USB Double Bulk Pipe devices
  device		uhid		# "Human Interface Devices"
  device		ukbd		# Keyboard
@@ -225,7 +225,7 @@
  # USB Serial devices
  device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
  device		uark		# Technologies ARK3116 based serial adapters
-@@ -346,3 +338,11 @@
+@@ -336,3 +328,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons

More information about the Glibc-bsd-commits mailing list