[Glibc-bsd-commits] r4666 - trunk/kfreebsd-10/debian/patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-07-02 08:22:13 +0000 (Tue, 02 Jul 2013)
New Revision: 4666

Modified:
   trunk/kfreebsd-10/debian/patches/000_cxgbe.diff
   trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
   trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
   trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
   trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
Refresh all patches

Modified: trunk/kfreebsd-10/debian/patches/000_cxgbe.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/000_cxgbe.diff	2013-07-02 08:22:00 UTC (rev 4665)
+++ trunk/kfreebsd-10/debian/patches/000_cxgbe.diff	2013-07-02 08:22:13 UTC (rev 4666)
@@ -1,6 +1,6 @@
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -80,7 +80,7 @@
+@@ -81,7 +81,7 @@
  	${_ctau} \
  	ctl \
  	${_cxgb} \
@@ -9,7 +9,7 @@
  	${_cyclic} \
  	dc \
  	dcons \
-@@ -383,6 +383,10 @@
+@@ -384,6 +384,10 @@
  .endif
  .endif
  

Modified: trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2013-07-02 08:22:00 UTC (rev 4665)
+++ trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2013-07-02 08:22:13 UTC (rev 4666)
@@ -1,6 +1,6 @@
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -169,8 +169,6 @@
+@@ -170,8 +170,6 @@
  	jme \
  	joy \
  	kbdmux \

Modified: trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff	2013-07-02 08:22:00 UTC (rev 4665)
+++ trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff	2013-07-02 08:22:13 UTC (rev 4666)
@@ -5,7 +5,7 @@
 
 --- a/sys/conf/kern.pre.mk
 +++ b/sys/conf/kern.pre.mk
-@@ -97,6 +97,8 @@
+@@ -94,6 +94,8 @@
  .endif
  WERROR?= -Werror
  
@@ -16,7 +16,7 @@
  
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -95,6 +95,8 @@
+@@ -92,6 +92,8 @@
  CFLAGS+=	-D_KERNEL
  CFLAGS+=	-DKLD_MODULE
  

Modified: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2013-07-02 08:22:00 UTC (rev 4665)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2013-07-02 08:22:13 UTC (rev 4666)
@@ -14,7 +14,7 @@
  .if !defined(DEBUG)
 --- a/sys/conf/kern.pre.mk
 +++ b/sys/conf/kern.pre.mk
-@@ -148,7 +148,7 @@
+@@ -145,7 +145,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-07-02 08:22:00 UTC (rev 4665)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2013-07-02 08:22:13 UTC (rev 4666)
@@ -30,7 +30,7 @@
  # ATA controllers
  device		ahci		# AHCI-compatible SATA controllers
  device		ata		# Legacy ATA/SATA controllers
-@@ -200,9 +197,6 @@
+@@ -201,9 +198,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -40,7 +40,7 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -300,10 +294,7 @@
+@@ -301,10 +295,7 @@
  options 	RDRAND_RNG	# Intel Bull Mountain RNG
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -96,7 +96,7 @@
  # ATA controllers
  device		ahci		# AHCI-compatible SATA controllers
  device		ata		# Legacy ATA/SATA controllers
-@@ -211,9 +210,6 @@
+@@ -212,9 +211,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -106,7 +106,7 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -314,10 +310,7 @@
+@@ -315,10 +311,7 @@
  options 	RDRAND_RNG	# Intel Bull Mountain RNG
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support