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

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Mon Nov 19 10:25:53 UTC 2007 

Author: ps-guest
Date: 2007-11-19 10:25:53 +0000 (Mon, 19 Nov 2007)
New Revision: 2038

Added:
   trunk/kfreebsd-6/debian/patches/series
Removed:
   trunk/kfreebsd-6/debian/patches/000_ipv6.diff
Modified:
   trunk/kfreebsd-6/debian/changelog
   trunk/kfreebsd-6/debian/control.flavor.in
   trunk/kfreebsd-6/debian/control.in
   trunk/kfreebsd-6/debian/patches/000_nfe.diff
   trunk/kfreebsd-6/debian/patches/005_binutils.diff
   trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff
   trunk/kfreebsd-6/debian/rules
   trunk/kfreebsd-6/fetch
Log:
* merge packaging changes from kfreebsd-7 into kfreebsd-6
+ update some patches for new upstream snapshot from RELENG_6



Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog	2007-11-19 10:21:58 UTC (rev 2037)
+++ trunk/kfreebsd-6/debian/changelog	2007-11-19 10:25:53 UTC (rev 2038)
@@ -1,3 +1,11 @@
+kfreebsd-6 (6.3~cvs200711xx-1) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * New upstream snapshot (RELENG_6)
+  * Backport packaging changes from kfreebsd-7
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 11 Nov 2007 05:12:02 +0200
+
 kfreebsd-6 (6.2-3) unreleased; urgency=low
 
   * debian/rules:

Modified: trunk/kfreebsd-6/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-6/debian/control.flavor.in	2007-11-19 10:21:58 UTC (rev 2037)
+++ trunk/kfreebsd-6/debian/control.flavor.in	2007-11-19 10:25:53 UTC (rev 2038)
@@ -32,7 +32,7 @@
 Architecture: kfreebsd- at arch@
 Section: devel
 Provides: kfreebsd-headers- at major@
-Depends: kfreebsd-headers- at version@- at abiname@ (= ${Source-Version})
+Depends: kfreebsd-headers- at version@- at abiname@ (= ${binary:Version})
 Description: header files for kernel of FreeBSD @version@
  This package provides the header files for kernel of FreeBSD @version@, generally 
  used for building out-of-tree kernel modules. These files are going to be 

Modified: trunk/kfreebsd-6/debian/control.in
===================================================================
--- trunk/kfreebsd-6/debian/control.in	2007-11-19 10:21:58 UTC (rev 2037)
+++ trunk/kfreebsd-6/debian/control.in	2007-11-19 10:25:53 UTC (rev 2038)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 4.1.0), bzip2, freebsd at major@-buildutils, libdb4.4-dev | libdb-dev, flex-old | flex, libbsd-dev
+Build-Depends: debhelper (>= 4.1.0), bzip2, quilt, freebsd at major@-buildutils [kfreebsd-i386 kfreebsd-amd64] , libdb4.4-dev | libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64]
 Standards-Version: 3.7.2
 
 Package: kfreebsd-source- at version@
@@ -18,7 +18,6 @@
 Package: kfreebsd-headers- at version@- at abiname@
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Section: devel
-Depends: coreutils
 Description: Common architecture-specific header files for kernel of FreeBSD @version@
  This package provides the architecture-specific common kernel header files for 
  kernel of FreeBSD @version@, generally used for building out-of-tree kernel 

Deleted: trunk/kfreebsd-6/debian/patches/000_ipv6.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/000_ipv6.diff	2007-11-19 10:21:58 UTC (rev 2037)
+++ trunk/kfreebsd-6/debian/patches/000_ipv6.diff	2007-11-19 10:25:53 UTC (rev 2038)
@@ -1,66 +0,0 @@
-Index: sys/netinet6/in6.h
-===================================================================
-RCS file: /sources/FreeBSD-CVS/src/sys/netinet6/in6.h,v
-retrieving revision 1.36.2.7
-diff -u -r1.36.2.7 in6.h
---- sys/netinet6/in6.h	20 Aug 2006 19:28:43 -0000	1.36.2.7
-+++ sys/netinet6/in6.h	24 Apr 2007 03:11:29 -0000
-@@ -574,5 +574,6 @@
- #define IPV6CTL_STEALTH		45
--#define IPV6CTL_MAXID		46
-+#define IPV6CTL_RTHDR0_ALLOWED  46
-+#define IPV6CTL_MAXID		47
- #endif /* __BSD_VISIBLE */
- 
- /*
-Index: sys/netinet6/in6_proto.c
-===================================================================
-RCS file: /sources/FreeBSD-CVS/src/sys/netinet6/in6_proto.c,v
-retrieving revision 1.32.2.5
-diff -u -r1.32.2.5 in6_proto.c
---- sys/netinet6/in6_proto.c	16 Oct 2006 15:11:18 -0000	1.32.2.5
-+++ sys/netinet6/in6_proto.c	24 Apr 2007 07:46:54 -0000
-@@ -376,6 +376,8 @@
- #ifdef IPSTEALTH
- int	ip6stealth = 0;
- #endif
-+int     ip6_rthdr0_allowed = 0; /* Disallow use of routing header 0 */
-+				/* by default. */
- 
- /* icmp6 */
- /*
-@@ -519,6 +521,9 @@
- SYSCTL_INT(_net_inet6_ip6, IPV6CTL_STEALTH, stealth, CTLFLAG_RW,
- 	&ip6stealth, 0, "");
- #endif
-+SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTHDR0_ALLOWED, 
-+	   rthdr0_allowed, CTLFLAG_RW, &ip6_rthdr0_allowed, 0, "");
-+
- 
- /* net.inet6.icmp6 */
- SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT,
-Index: sys/netinet6/route6.c
-===================================================================
-RCS file: /sources/FreeBSD-CVS/src/sys/netinet6/route6.c,v
-retrieving revision 1.11.2.1
-diff -u -r1.11.2.1 route6.c
---- sys/netinet6/route6.c	4 Nov 2005 20:26:15 -0000	1.11.2.1
-+++ sys/netinet6/route6.c	24 Apr 2007 08:06:00 -0000
-@@ -49,6 +49,8 @@
- 
- #include <netinet/icmp6.h>
- 
-+extern int ip6_rthdr0_allowed;
-+
- static int ip6_rthdr0 __P((struct mbuf *, struct ip6_hdr *,
-     struct ip6_rthdr0 *));
- 
-@@ -88,6 +90,8 @@
- 
- 	switch (rh->ip6r_type) {
- 	case IPV6_RTHDR_TYPE_0:
-+		if (!ip6_rthdr0_allowed)
-+			return (IPPROTO_DONE);
- 		rhlen = (rh->ip6r_len + 1) << 3;
- #ifndef PULLDOWN_TEST
- 		/*

Modified: trunk/kfreebsd-6/debian/patches/000_nfe.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/000_nfe.diff	2007-11-19 10:21:58 UTC (rev 2037)
+++ trunk/kfreebsd-6/debian/patches/000_nfe.diff	2007-11-19 10:25:53 UTC (rev 2038)
@@ -1,6 +1,7 @@
-diff -Nurd sys/dev/nfe/if_nfe.c sys/dev/nfe/if_nfe.c
---- sys/dev/nfe/if_nfe.c	1970-01-01 01:00:00.000000000 +0100
-+++ sys/dev/nfe/if_nfe.c	2006-09-05 07:01:26.000000000 +0200
+Index: sys/dev/nfe/if_nfe.c
+===================================================================
+--- /dev/null
++++ sys/dev/nfe/if_nfe.c
 @@ -0,0 +1,2231 @@
 +/*	$OpenBSD: if_nfe.c,v 1.54 2006/04/07 12:38:12 jsg Exp $	*/
 +
@@ -2233,9 +2234,10 @@
 +
 +	return;
 +}
-diff -Nurd sys/dev/nfe/if_nfereg.h sys/dev/nfe/if_nfereg.h
---- sys/dev/nfe/if_nfereg.h	1970-01-01 01:00:00.000000000 +0100
-+++ sys/dev/nfe/if_nfereg.h	2006-09-05 07:01:26.000000000 +0200
+Index: sys/dev/nfe/if_nfereg.h
+===================================================================
+--- /dev/null
++++ sys/dev/nfe/if_nfereg.h
 @@ -0,0 +1,248 @@
 +/*	$OpenBSD: if_nfereg.h,v 1.16 2006/02/22 19:23:44 damien Exp $	*/
 +
@@ -2485,9 +2487,10 @@
 +#define NFE_DEBUG_BROKEN	0x0080
 +#define NFE_DEBUG_MII		0x0100
 +#define NFE_DEBUG_ALL		0xFFFF
-diff -Nurd sys/dev/nfe/if_nfevar.h sys/dev/nfe/if_nfevar.h
---- sys/dev/nfe/if_nfevar.h	1970-01-01 01:00:00.000000000 +0100
-+++ sys/dev/nfe/if_nfevar.h	2006-09-05 07:01:26.000000000 +0200
+Index: sys/dev/nfe/if_nfevar.h
+===================================================================
+--- /dev/null
++++ sys/dev/nfe/if_nfevar.h
 @@ -0,0 +1,124 @@
 +/*	$OpenBSD: if_nfevar.h,v 1.11 2006/02/19 13:57:02 damien Exp $	*/
 +
@@ -2613,9 +2616,10 @@
 +	u_int16_t	dev_id;
 +	char		*name;
 +};
-diff -Nurd sys/modules/nfe/Makefile sys/modules/nfe/Makefile
---- sys/modules/nfe/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ sys/modules/nfe/Makefile	2006-11-03 08:53:03.000000000 +0100
+Index: sys/modules/nfe/Makefile
+===================================================================
+--- /dev/null
++++ sys/modules/nfe/Makefile
 @@ -0,0 +1,6 @@
 +.PATH: ${.CURDIR}/../../dev/nfe
 +
@@ -2623,10 +2627,11 @@
 +SRCS=	if_nfe.c miibus_if.h opt_bdg.h device_if.h bus_if.h pci_if.h
 +
 +.include <bsd.kmod.mk>
-diff -Nurd sys/modules/Makefile sys/modules/Makefile 
---- sys/modules/Makefile	2006-11-03 13:44:50.000000000 +0100
-+++ sys/modules/Makefile	2006-11-03 15:29:22.000000000 +0100
-@@ -161,6 +161,7 @@
+Index: sys/modules/Makefile
+===================================================================
+--- sys/modules/Makefile.orig
++++ sys/modules/Makefile
+@@ -176,6 +176,7 @@
  	${_ncv} \
  	${_ndis} \
  	netgraph \
@@ -2634,32 +2639,35 @@
  	nfsclient \
  	nfsserver \
  	nge \
-diff -Nurd sys/amd64/conf/GENERIC sys/amd64/conf/GENERIC
---- sys/amd64/conf/GENERIC	2006-11-03 21:20:25.000000000 +0100
-+++ sys/amd64/conf/GENERIC	2006-11-03 21:21:04.000000000 +0100
-@@ -181,6 +181,7 @@
- device		dc		# DEC/Intel 21143 and various workalikes
+Index: sys/amd64/conf/GENERIC
+===================================================================
+--- sys/amd64/conf/GENERIC.orig
++++ sys/amd64/conf/GENERIC
+@@ -189,6 +189,7 @@
  device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
  device		lge		# Level 1 LXT1001 gigabit Ethernet
-+device		nfe		# NVIDIA nForce MCP Ethernet
+ device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
++device		nfe		# nVidia nForce MCP on-board Ethernet Networking
  device		nge		# NatSemi DP83820 gigabit Ethernet
- device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
- device		re		# RealTek 8139C+/8169/8169S/8110S
-diff -Nurd sys/i386/conf/GENERIC sys/i386/conf/GENERIC
---- sys/i386/conf/GENERIC	2006-11-03 09:00:17.000000000 +0100
-+++ sys/i386/conf/GENERIC	2006-11-03 08:55:46.000000000 +0100
-@@ -193,6 +193,7 @@
- device		dc		# DEC/Intel 21143 and various workalikes
+ device		nve		# nVidia nForce MCP on-board Ethernet Networking
+ device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
+Index: sys/i386/conf/GENERIC
+===================================================================
+--- sys/i386/conf/GENERIC.orig
++++ sys/i386/conf/GENERIC
+@@ -198,6 +198,7 @@
  device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
  device		lge		# Level 1 LXT1001 gigabit Ethernet
-+device		nfe		# NVidia nForce MCP Ethernet
+ device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
++device		nfe		# nVidia nForce MCP on-board Ethernet Networking
  device		nge		# NatSemi DP83820 gigabit Ethernet
+ device		nve		# nVidia nForce MCP on-board Ethernet Networking
  device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
- device		re		# RealTek 8139C+/8169/8169S/8110S
-diff -Nurd sys/pc98/conf/GENERIC sys/pc98/conf/GENERIC
---- sys/pc98/conf/GENERIC	2006-11-03 09:00:04.000000000 +0100
-+++ sys/pc98/conf/GENERIC	2006-11-03 08:55:51.000000000 +0100
-@@ -168,6 +168,7 @@
+Index: sys/pc98/conf/GENERIC
+===================================================================
+--- sys/pc98/conf/GENERIC.orig
++++ sys/pc98/conf/GENERIC
+@@ -167,6 +167,7 @@
  device		dc		# DEC/Intel 21143 and various workalikes
  device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
  device		lge		# Level 1 LXT1001 gigabit Ethernet
@@ -2667,10 +2675,11 @@
  device		nge		# NatSemi DP83820 gigabit Ethernet
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'lnc')
  device		re		# RealTek 8139C+/8169/8169S/8110S
-diff -Nurd sys/conf/files sys/conf/files
---- sys/conf/files	2006-11-03 21:26:25.000000000 +0100
-+++ sys/conf/files	2006-11-03 21:30:19.000000000 +0100
-@@ -693,6 +693,7 @@
+Index: sys/conf/files
+===================================================================
+--- sys/conf/files.orig
++++ sys/conf/files
+@@ -794,6 +794,7 @@
  dev/my/if_my.c			optional my
  dev/ncv/ncr53c500.c		optional ncv
  dev/ncv/ncr53c500_pccard.c	optional ncv pccard

Modified: trunk/kfreebsd-6/debian/patches/005_binutils.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/005_binutils.diff	2007-11-19 10:21:58 UTC (rev 2037)
+++ trunk/kfreebsd-6/debian/patches/005_binutils.diff	2007-11-19 10:25:53 UTC (rev 2038)
@@ -3,8 +3,8 @@
 
 Index: sys/i386/i386/locore.s
 ===================================================================
---- sys/i386/i386/locore.s.orig	2005-05-16 11:47:53.000000000 +0200
-+++ sys/i386/i386/locore.s	2006-06-24 17:32:27.000000000 +0200
+--- sys/i386/i386/locore.s.orig
++++ sys/i386/i386/locore.s
 @@ -358,7 +358,7 @@
  	pushl	%eax
  	testl	$PSL_VM,UC_EFLAGS(%eax)
@@ -34,8 +34,8 @@
  	pushl	%eax			/* junk to fake return addr. */
 Index: sys/i386/i386/swtch.s
 ===================================================================
---- sys/i386/i386/swtch.s.orig	2005-04-14 00:57:17.000000000 +0200
-+++ sys/i386/i386/swtch.s	2006-06-24 17:32:27.000000000 +0200
+--- sys/i386/i386/swtch.s.orig
++++ sys/i386/i386/swtch.s
 @@ -111,7 +111,7 @@
  	movl	%ebp,PCB_EBP(%edx)
  	movl	%esi,PCB_ESI(%edx)
@@ -65,8 +65,8 @@
  
 Index: sys/i386/include/cpufunc.h
 ===================================================================
---- sys/i386/include/cpufunc.h.orig	2005-05-13 02:05:56.000000000 +0200
-+++ sys/i386/include/cpufunc.h	2006-06-24 17:32:27.000000000 +0200
+--- sys/i386/include/cpufunc.h.orig
++++ sys/i386/include/cpufunc.h
 @@ -452,7 +452,7 @@
  rfs(void)
  {
@@ -111,8 +111,8 @@
  static __inline void
 Index: sys/i386/linux/linux_locore.s
 ===================================================================
---- sys/i386/linux/linux_locore.s.orig	2001-02-25 07:29:01.000000000 +0100
-+++ sys/i386/linux/linux_locore.s	2006-06-24 17:32:27.000000000 +0200
+--- sys/i386/linux/linux_locore.s.orig
++++ sys/i386/linux/linux_locore.s
 @@ -8,7 +8,7 @@
  NON_GPROF_ENTRY(linux_sigcode)
  	call	*LINUX_SIGF_HANDLER(%esp)
@@ -133,8 +133,8 @@
  	int	$0x80				/* enter kernel with args */
 Index: sys/compat/ndis/winx32_wrap.S
 ===================================================================
---- sys/compat/ndis/winx32_wrap.S.orig	2005-11-06 04:52:25.000000000 +0100
-+++ sys/compat/ndis/winx32_wrap.S	2006-06-24 17:32:27.000000000 +0200
+--- sys/compat/ndis/winx32_wrap.S.orig
++++ sys/compat/ndis/winx32_wrap.S
 @@ -364,7 +364,7 @@
  	ret
  
@@ -146,8 +146,8 @@
  ENTRY(x86_gettid)
 Index: sys/amd64/amd64/cpu_switch.S
 ===================================================================
---- sys/amd64/amd64/cpu_switch.S.orig	2005-11-15 01:25:59.000000000 +0100
-+++ sys/amd64/amd64/cpu_switch.S	2006-06-24 17:33:03.000000000 +0200
+--- sys/amd64/amd64/cpu_switch.S.orig
++++ sys/amd64/amd64/cpu_switch.S
 @@ -105,10 +105,10 @@
  	jz	1f				/* no, skip over */
  
@@ -184,9 +184,9 @@
  1:
 Index: sys/amd64/ia32/ia32_signal.c
 ===================================================================
---- sys/amd64/ia32/ia32_signal.c.orig	2004-04-06 01:55:14.000000000 +0200
-+++ sys/amd64/ia32/ia32_signal.c	2006-06-24 17:32:27.000000000 +0200
-@@ -197,8 +197,8 @@
+--- sys/amd64/ia32/ia32_signal.c.orig
++++ sys/amd64/ia32/ia32_signal.c
+@@ -360,8 +360,8 @@
  	sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
  	sf.sf_uc.uc_mcontext.mc_gs = rgs();
  	sf.sf_uc.uc_mcontext.mc_fs = rfs();
@@ -197,7 +197,7 @@
  	sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi;
  	sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi;
  	sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
-@@ -309,8 +309,8 @@
+@@ -472,8 +472,8 @@
  	sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
  	sf.sf_uc.uc_mcontext.mc_gs = rgs();
  	sf.sf_uc.uc_mcontext.mc_fs = rfs();
@@ -210,8 +210,8 @@
  	sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
 Index: sys/amd64/include/cpufunc.h
 ===================================================================
---- sys/amd64/include/cpufunc.h.orig	2005-05-13 02:05:55.000000000 +0200
-+++ sys/amd64/include/cpufunc.h	2006-06-24 17:32:27.000000000 +0200
+--- sys/amd64/include/cpufunc.h.orig
++++ sys/amd64/include/cpufunc.h
 @@ -482,7 +482,7 @@
  rfs(void)
  {
@@ -290,9 +290,9 @@
  
 Index: sys/amd64/linux32/linux32_sysvec.c
 ===================================================================
---- sys/amd64/linux32/linux32_sysvec.c.orig	2005-12-22 22:25:19.000000000 +0100
-+++ sys/amd64/linux32/linux32_sysvec.c	2006-06-24 17:32:27.000000000 +0200
-@@ -345,9 +345,9 @@
+--- sys/amd64/linux32/linux32_sysvec.c.orig
++++ sys/amd64/linux32/linux32_sysvec.c
+@@ -344,9 +344,9 @@
  	frame.sf_sc.uc_mcontext.sc_mask   = frame.sf_sc.uc_sigmask.__bits[0];
          frame.sf_sc.uc_mcontext.sc_gs     = rgs();
          frame.sf_sc.uc_mcontext.sc_fs     = rfs();
@@ -317,33 +317,25 @@
  	frame.sf_sc.sc_ebp    = regs->tf_rbp;
 Index: sys/amd64/ia32/ia32_sigtramp.S
 ===================================================================
---- sys/amd64/ia32/ia32_sigtramp.S.orig	2003-08-23 01:19:02.000000000 +0200
-+++ sys/amd64/ia32/ia32_sigtramp.S	2006-06-24 17:32:27.000000000 +0200
-@@ -45,10 +45,10 @@
+--- sys/amd64/ia32/ia32_sigtramp.S.orig
++++ sys/amd64/ia32/ia32_sigtramp.S
+@@ -45,8 +45,8 @@
  	calll	*IA32_SIGF_HANDLER(%esp)
  	leal	IA32_SIGF_UC(%esp),%eax	/* get ucontext */
  	pushl	%eax
--	movl	IA32_UC_GS(%eax),%gs	/* restore %gs */
--	movl	IA32_UC_FS(%eax),%fs	/* restore %fs */
 -	movl	IA32_UC_ES(%eax),%es	/* restore %es */
 -	movl	IA32_UC_DS(%eax),%ds	/* restore %ds */
-+	mov	IA32_UC_GS(%eax),%gs	/* restore %gs */
-+	mov	IA32_UC_FS(%eax),%fs	/* restore %fs */
 +	mov	IA32_UC_ES(%eax),%es	/* restore %es */
 +	mov	IA32_UC_DS(%eax),%ds	/* restore %ds */
  	movl	$SYS_sigreturn,%eax
  	pushl	%eax			/* junk to fake return addr. */
  	int	$0x80			/* enter kernel with args */
-@@ -62,10 +62,10 @@
+@@ -60,8 +60,8 @@
  	calll	*IA32_SIGF_HANDLER(%esp)
  	leal	IA32_SIGF_UC4(%esp),%eax/* get ucontext */
  	pushl	%eax
--	movl	IA32_UC4_GS(%eax),%gs	/* restore %gs */
--	movl	IA32_UC4_FS(%eax),%fs	/* restore %fs */
 -	movl	IA32_UC4_ES(%eax),%es	/* restore %es */
 -	movl	IA32_UC4_DS(%eax),%ds	/* restore %ds */
-+	mov	IA32_UC4_GS(%eax),%gs	/* restore %gs */
-+	mov	IA32_UC4_FS(%eax),%fs	/* restore %fs */
 +	mov	IA32_UC4_ES(%eax),%es	/* restore %es */
 +	mov	IA32_UC4_DS(%eax),%ds	/* restore %ds */
  	movl	$344,%eax		/* 4.x SYS_sigreturn */
@@ -351,8 +343,8 @@
  	int	$0x80			/* enter kernel with args */
 Index: sys/amd64/linux32/linux32_locore.s
 ===================================================================
---- sys/amd64/linux32/linux32_locore.s.orig	2004-08-16 09:55:06.000000000 +0200
-+++ sys/amd64/linux32/linux32_locore.s	2006-06-24 17:32:27.000000000 +0200
+--- sys/amd64/linux32/linux32_locore.s.orig
++++ sys/amd64/linux32/linux32_locore.s
 @@ -11,10 +11,10 @@
  NON_GPROF_ENTRY(linux_sigcode)
  	call	*LINUX_SIGF_HANDLER(%esp)

Modified: trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff	2007-11-19 10:21:58 UTC (rev 2037)
+++ trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff	2007-11-19 10:25:53 UTC (rev 2038)
@@ -1,8 +1,8 @@
 Index: sys/conf/files
 ===================================================================
---- sys/conf/files.orig	2006-06-25 11:13:23.564594000 +0200
-+++ sys/conf/files	2006-06-25 11:13:30.000000000 +0200
-@@ -438,18 +437,6 @@
+--- sys/conf/files.orig
++++ sys/conf/files
+@@ -440,18 +440,6 @@
  dev/ata/atapi-cd.c		optional atapicd
  dev/ata/atapi-fd.c		optional atapifd
  dev/ata/atapi-tape.c		optional atapist
@@ -23,8 +23,8 @@
  dev/awi/if_awi_pccard.c		optional awi pccard
 Index: sys/conf/files.i386
 ===================================================================
---- sys/conf/files.i386.orig	2006-06-25 11:13:23.586857000 +0200
-+++ sys/conf/files.i386	2006-06-25 11:13:30.000000000 +0200
+--- sys/conf/files.i386.orig
++++ sys/conf/files.i386
 @@ -46,42 +46,6 @@
  	no-obj no-implicit-rule before-depend				\
  	clean		"ukbdmap.h"
@@ -68,7 +68,7 @@
  #
  compat/linux/linux_file.c	optional compat_linux
  compat/linux/linux_getcwd.c	optional compat_linux
-@@ -181,11 +145,6 @@
+@@ -185,11 +149,6 @@
  dev/fdc/fdc_isa.c		optional fdc isa
  dev/fdc/fdc_pccard.c		optional fdc pccard
  dev/fe/if_fe_isa.c		optional fe isa
@@ -80,10 +80,10 @@
  dev/hwpmc/hwpmc_amd.c		optional hwpmc
  dev/hwpmc/hwpmc_pentium.c	optional hwpmc
  dev/hwpmc/hwpmc_piv.c		optional hwpmc
-@@ -206,13 +165,9 @@
- dev/mem/memutil.c		optional mem
- dev/mse/mse.c			optional mse
- dev/mse/mse_isa.c		optional mse isa
+@@ -224,13 +183,9 @@
+ dev/mxge/mxge_eth_z8e.c		optional mxge pci
+ dev/mxge/mxge_ethp_z8e.c	optional mxge pci
+ net/zlib.c			optional mxge
 -dev/nve/if_nve.c		optional nve pci
  dev/ppc/ppc.c			optional ppc
  dev/ppc/ppc_puc.c		optional ppc puc pci
@@ -96,8 +96,8 @@
  dev/sbni/if_sbni_pci.c		optional sbni pci
 Index: sys/conf/kern.pre.mk
 ===================================================================
---- sys/conf/kern.pre.mk.orig	2006-06-25 11:13:23.609486000 +0200
-+++ sys/conf/kern.pre.mk	2006-06-25 11:13:30.000000000 +0200
+--- sys/conf/kern.pre.mk.orig
++++ sys/conf/kern.pre.mk
 @@ -58,9 +58,6 @@
  # ... and the same for pf
  INCLUDES+= -I$S/contrib/pf
@@ -110,9 +110,9 @@
  
 Index: sys/i386/conf/GENERIC
 ===================================================================
---- sys/i386/conf/GENERIC.orig	2006-06-25 11:13:23.666760000 +0200
-+++ sys/i386/conf/GENERIC	2006-06-25 11:16:32.056882000 +0200
-@@ -118,8 +118,6 @@
+--- sys/i386/conf/GENERIC.orig
++++ sys/i386/conf/GENERIC
+@@ -117,8 +117,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
@@ -121,9 +121,9 @@
  device		iir		# Intel Integrated RAID
  device		ips		# IBM (Adaptec) ServeRAID
  device		mly		# Mylex AcceleRAID/eXtremeRAID
-@@ -199,7 +197,6 @@
- device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
- device		lge		# Level 1 LXT1001 gigabit Ethernet
+@@ -200,7 +198,6 @@
+ device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
+ device		nfe		# nVidia nForce MCP on-board Ethernet Networking
  device		nge		# NatSemi DP83820 gigabit Ethernet
 -device		nve		# nVidia nForce MCP on-board Ethernet Networking
  device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
@@ -131,8 +131,8 @@
  device		rl		# RealTek 8129/8139
 Index: sys/modules/Makefile
 ===================================================================
---- sys/modules/Makefile.orig	2006-06-25 11:13:23.693634000 +0200
-+++ sys/modules/Makefile	2006-06-25 11:13:30.000000000 +0200
+--- sys/modules/Makefile.orig
++++ sys/modules/Makefile
 @@ -26,11 +26,6 @@
  	${_arl} \
  	${_asr} \
@@ -145,7 +145,7 @@
  	aue \
  	${_auxio} \
  	${_awi} \
-@@ -94,7 +89,6 @@
+@@ -96,7 +91,6 @@
  	${_hfa} \
  	hifn \
  	hme \
@@ -153,7 +153,7 @@
  	hwpmc \
  	${_i2c} \
  	${_ibcs2} \
-@@ -175,9 +169,7 @@
+@@ -185,9 +179,7 @@
  	ntfs \
  	ntfs_iconv \
  	nullfs \
@@ -163,7 +163,7 @@
  	${_osf1} \
  	${_padlock} \
  	patm \
-@@ -328,7 +320,6 @@
+@@ -343,7 +335,6 @@
  _apm=		apm
  _ar=		ar
  _arcnet=	arcnet
@@ -171,7 +171,7 @@
  _awi=		awi
  _bktr=		bktr
  _cardbus=	cardbus
-@@ -361,7 +352,6 @@
+@@ -377,7 +368,6 @@
  _ndis=		ndis
  _nsp=		nsp
  _nwfs=		nwfs
@@ -179,7 +179,7 @@
  _pccard=	pccard
  _pcfclock=	pcfclock
  _pecoff=	pecoff
-@@ -406,7 +396,6 @@
+@@ -415,7 +405,6 @@
  _dpt=		dpt
  _el=		el
  _ex=		ex
@@ -187,10 +187,10 @@
  _ichwd=		ichwd
  _ida=		ida
  _idt=		idt
-@@ -417,14 +406,12 @@
- _iwi=		iwi
+@@ -427,14 +416,12 @@
  _ixgb=  	ixgb
  _mly=		mly
+ _mxge=		mxge
 -_nve=		nve
  .if !defined(NO_CRYPT) || defined(ALL_MODULES)
  .if exists(${.CURDIR}/../crypto/via)
@@ -202,14 +202,15 @@
  _s3=		s3
  _twa=		twa
  _vesa=		vesa
-@@ -438,14 +426,12 @@
+@@ -461,7 +448,6 @@
  #_acpi=		acpi		# doesn't work on amd64 yet
  _agp=		agp
  _arcmsr=	arcmsr
 -_ath_hal=	ath_hal
  _ciss=		ciss
+ _coretemp=	coretemp
  _cpufreq=	cpufreq
- _digi=		digi
+@@ -469,7 +455,6 @@
  _drm=		drm
  _em=		em
  _ext2fs=	ext2fs
@@ -217,9 +218,9 @@
  _i2c=		i2c
  _ichwd=		ichwd
  _ida=		ida
-@@ -476,7 +461,6 @@
- _mly=		mly
+@@ -486,7 +471,6 @@
  _ndis=		ndis
+ _nve=		nve
  _ppc=		ppc
 -_rr232x=	rr232x
  _safe=		safe
@@ -227,9 +228,9 @@
  _smbfs=		smbfs
 Index: sys/amd64/conf/GENERIC
 ===================================================================
---- sys/amd64/conf/GENERIC.orig	2006-06-25 11:13:23.731156000 +0200
-+++ sys/amd64/conf/GENERIC	2006-06-25 11:16:32.094195000 +0200
-@@ -117,8 +117,6 @@
+--- sys/amd64/conf/GENERIC.orig
++++ sys/amd64/conf/GENERIC
+@@ -116,8 +116,6 @@
  device		arcmsr		# Areca SATA II RAID
  device		ciss		# Compaq Smart RAID 5*
  device		dpt		# DPT Smartcache III, IV - See NOTES for options
@@ -238,18 +239,18 @@
  device		iir		# Intel Integrated RAID
  device		ips		# IBM (Adaptec) ServeRAID
  device		mly		# Mylex AcceleRAID/eXtremeRAID
-@@ -189,7 +187,6 @@
- device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
- device		lge		# Level 1 LXT1001 gigabit Ethernet
+@@ -191,7 +189,6 @@
+ device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
+ device		nfe		# nVidia nForce MCP on-board Ethernet Networking
  device		nge		# NatSemi DP83820 gigabit Ethernet
 -device		nve		# nVidia nForce MCP on-board Ethernet Networking
- device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
+ device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
 Index: sys/conf/files.amd64
 ===================================================================
---- sys/conf/files.amd64.orig	2006-06-25 11:13:23.636572000 +0200
-+++ sys/conf/files.amd64	2006-06-25 11:13:30.000000000 +0200
+--- sys/conf/files.amd64.orig
++++ sys/conf/files.amd64
 @@ -47,35 +47,6 @@
  	no-obj no-implicit-rule before-depend				\
  	clean		"ukbdmap.h"
@@ -286,7 +287,7 @@
  #
  amd64/acpica/OsdEnvironment.c	optional	acpi
  amd64/acpica/acpi_machdep.c	optional	acpi
-@@ -160,11 +131,6 @@
+@@ -172,11 +143,6 @@
  dev/fdc/fdc_acpi.c		optional	fdc
  dev/fdc/fdc_isa.c		optional	fdc isa
  dev/fdc/fdc_pccard.c		optional	fdc pccard
@@ -298,10 +299,10 @@
  dev/hwpmc/hwpmc_amd.c		optional	hwpmc
  dev/hwpmc/hwpmc_piv.c		optional	hwpmc
  dev/hwpmc/hwpmc_x86.c		optional	hwpmc
-@@ -172,10 +138,6 @@
- dev/kbd/kbd.c			optional	sc
- dev/kbd/kbd.c			optional	ukbd
- dev/mem/memutil.c		optional	mem
+@@ -189,10 +155,6 @@
+ dev/mxge/mxge_eth_z8e.c		optional	mxge pci
+ dev/mxge/mxge_ethp_z8e.c	optional	mxge pci
+ net/zlib.c			optional	mxge
 -dev/nve/if_nve.c		optional	nve pci
 -dev/rr232x/os_bsd.c		optional	rr232x
 -dev/rr232x/osm_bsd.c		optional	rr232x

Added: trunk/kfreebsd-6/debian/patches/series
===================================================================
--- trunk/kfreebsd-6/debian/patches/series	                        (rev 0)
+++ trunk/kfreebsd-6/debian/patches/series	2007-11-19 10:25:53 UTC (rev 2038)
@@ -0,0 +1,23 @@
+000_nfe.diff -p0
+001_misc.diff -p0
+003_glibc_dev_aicasm.diff -p0
+004_xargs.diff -p0
+005_binutils.diff -p0
+007_clone_signals.diff -p0
+008_config.diff -p0
+009_disable_duped_modules.diff -p0
+010_ET_DYN.diff -p0
+013_ip_packed.diff -p0
+017_oss_compat.diff -p0
+018_genassym_MAXCPU.diff -p0
+902_version.diff -p0
+903_disable_non-free_drivers.diff -p0
+904_dev_full.diff -p0
+905_grow_arg_max.diff -p0
+906_grow_sysv_ipc_limits.diff -p0
+907_cpu_class.diff -p0
+908_linprocfs_is_not_proc.diff -p0
+910_GENERIC_hints.diff -p0
+911_no_werror.diff -p0
+912_binutils.diff -p0
+999_config.diff -p0

Modified: trunk/kfreebsd-6/debian/rules
===================================================================
--- trunk/kfreebsd-6/debian/rules	2007-11-19 10:21:58 UTC (rev 2037)
+++ trunk/kfreebsd-6/debian/rules	2007-11-19 10:25:53 UTC (rev 2038)
@@ -8,7 +8,7 @@
 #export DH_VERBOSE=1
 
 full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
-version		:= $(shell echo $(full_version) | sed -e 's/[+-~].*//g')
+version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
 major           := $(shell echo $(version) | sed -e 's/\..*//g')
 revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
 
@@ -72,11 +72,7 @@
 		-e 's,#\( \|\t\)*include\( \|\t\)*\(<\|"\)pflog.h\(>\|"\),,g' \
 	; done)
 	
-	set -e ; for i in $(CURDIR)/debian/patches/*.diff ; do \
-		echo "--- Patch $$i ---" ; \
-		patch -p0 -d src/ --dry-run < $$i ; \
-		patch -p0 -d src/ < $$i >/dev/null ; \
-	done
+	set -e ; cd $(CURDIR)/src ; QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a ; cd $(CURDIR)
 
 	touch src-stamp
 

Modified: trunk/kfreebsd-6/fetch
===================================================================
--- trunk/kfreebsd-6/fetch	2007-11-19 10:21:58 UTC (rev 2037)
+++ trunk/kfreebsd-6/fetch	2007-11-19 10:25:53 UTC (rev 2038)
@@ -2,7 +2,7 @@
 set -ex
 
 ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_6_2_0_RELEASE
+RELENG=RELENG_6
 
 rm -rf src

More information about the Glibc-bsd-commits mailing list