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

Robert Millan rmh at alioth.debian.org
Mon Oct 10 20:05:38 UTC 2011 

Author: rmh
Date: 2011-10-10 20:05:37 +0000 (Mon, 10 Oct 2011)
New Revision: 3729

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/103_stat_pipe.diff
   trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
   trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
   trunk/kfreebsd-10/debian/patches/999_config.diff
   trunk/kfreebsd-10/debian/patches/999_firmware.diff
Log:
New upstream snapshot.

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2011-10-10 19:38:55 UTC (rev 3728)
+++ trunk/kfreebsd-10/debian/changelog	2011-10-10 20:05:37 UTC (rev 3729)
@@ -1,5 +1,11 @@
-kfreebsd-10  (10.0~svn225709-1) experimental; urgency=low
+kfreebsd-10 (10.0~svn226224-1) UNRELEASED; urgency=low
 
+  * New upstream snapshot.
+
+ -- Robert Millan <rmh at debian.org>  Mon, 10 Oct 2011 21:43:50 +0200
+
+kfreebsd-10 (10.0~svn225709-1) experimental; urgency=low
+
   * New upstream snapshot.  Begin tracking 10-CURRENT.
 
   [ Robert Millan ]

Modified: trunk/kfreebsd-10/debian/patches/103_stat_pipe.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/103_stat_pipe.diff	2011-10-10 19:38:55 UTC (rev 3728)
+++ trunk/kfreebsd-10/debian/patches/103_stat_pipe.diff	2011-10-10 20:05:37 UTC (rev 3729)
@@ -1,6 +1,6 @@
 --- a/sys/kern/sys_pipe.c
 +++ b/sys/kern/sys_pipe.c
-@@ -1386,6 +1386,8 @@
+@@ -1399,6 +1399,8 @@
  	struct thread *td;
  {
  	struct pipe *pipe = fp->f_data;
@@ -9,9 +9,9 @@
  #ifdef MAC
  	int error;
  
-@@ -1412,6 +1414,8 @@
- 	 * Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen.
- 	 * XXX (st_dev, st_ino) should be unique.
+@@ -1426,6 +1428,8 @@
+ 	/*
+ 	 * Left as 0: st_nlink, st_rdev, st_flags, st_gen.
  	 */
 +	hash = (unsigned long) (pipe->pipe_pair);
 +	ub->st_ino = (((hash >> 31) ^ hash) & 0x7FFFFFFF); 

Modified: trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff	2011-10-10 19:38:55 UTC (rev 3728)
+++ trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff	2011-10-10 20:05:37 UTC (rev 3729)
@@ -81,7 +81,7 @@
  	${_nvram} \
  	${_nwfs} \
  	${_nxge} \
-@@ -500,8 +497,6 @@
+@@ -501,8 +498,6 @@
  _dpt=		dpt
  _ex=		ex
  _hptiop=	hptiop
@@ -90,7 +90,7 @@
  _ichwd=		ichwd
  _ida=		ida
  _iir=		iir
-@@ -517,7 +512,6 @@
+@@ -518,7 +513,6 @@
  _ixgbe=		ixgbe
  _mly=		mly
  _nfe=		nfe
@@ -98,7 +98,7 @@
  _nvram=		nvram
  _nxge=		nxge
  _tpm=		tpm
-@@ -573,8 +567,6 @@
+@@ -574,8 +568,6 @@
  _exca=		exca
  _ext2fs=	ext2fs
  _hptiop=	hptiop
@@ -107,7 +107,7 @@
  _i2c=		i2c
  _ichwd=		ichwd
  _ida=		ida
-@@ -605,7 +597,6 @@
+@@ -606,7 +598,6 @@
  .endif
  _ndis=		ndis
  _nfe=		nfe

Modified: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2011-10-10 19:38:55 UTC (rev 3728)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2011-10-10 20:05:37 UTC (rev 3729)
@@ -3,7 +3,7 @@
 
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -358,12 +358,11 @@
+@@ -359,12 +359,11 @@
  .endif
  .endif
  
@@ -18,7 +18,7 @@
  _if_carp=	if_carp
  .endif
  
-@@ -375,8 +374,7 @@
+@@ -376,8 +375,7 @@
  _netgraph=	netgraph
  .endif
  
@@ -28,7 +28,7 @@
  _pf=		pf
  _pflog=		pflog
  .if ${MK_INET_SUPPORT} != "no"
-@@ -435,7 +433,7 @@
+@@ -436,7 +434,7 @@
  _linsysfs=	linsysfs
  _linux=		linux
  _mse=		mse
@@ -37,7 +37,7 @@
  _mlx4=		mlx4
  _mlx4ib=	mlx4ib
  _mlxen=		mlxen
-@@ -587,7 +585,7 @@
+@@ -588,7 +586,7 @@
  _linsysfs=	linsysfs
  _linux=		linux
  _mly=		mly

Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff	2011-10-10 19:38:55 UTC (rev 3728)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2011-10-10 20:05:37 UTC (rev 3729)
@@ -52,7 +52,7 @@
  device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
  device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
  
-@@ -184,10 +182,6 @@
+@@ -185,10 +183,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -63,7 +63,7 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -198,8 +192,6 @@
+@@ -199,8 +193,6 @@
  device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
  device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
  device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
@@ -72,7 +72,7 @@
  device		vx		# 3Com 3c590, 3c595 (``Vortex'')
  
  # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -209,12 +201,10 @@
+@@ -210,12 +202,10 @@
  device		age		# Attansic/Atheros L1 Gigabit Ethernet
  device		alc		# Atheros AR8131/AR8132 Ethernet
  device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@@ -85,7 +85,7 @@
  device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
  device		lge		# Level 1 LXT1001 gigabit Ethernet
  device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -224,7 +214,6 @@
+@@ -225,7 +215,6 @@
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
@@ -93,7 +93,7 @@
  device		sge		# Silicon Integrated Systems SiS190/191
  device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
  device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -244,7 +233,6 @@
+@@ -245,7 +234,6 @@
  device		ex		# Intel EtherExpress Pro/10 and Pro/10+
  device		ep		# Etherlink III based cards
  device		fe		# Fujitsu MB8696x based cards
@@ -101,7 +101,7 @@
  device		xe		# Xircom pccard Ethernet
  
  # Wireless NIC cards
-@@ -264,12 +252,7 @@
+@@ -265,12 +253,7 @@
  device		ath_rate_sample	# SampleRate tx rate control for ath
  #device		bwi		# Broadcom BCM430x/BCM431x wireless NICs.
  #device		bwn		# Broadcom BCM43xx wireless NICs.
@@ -114,7 +114,7 @@
  device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
  device		wpi		# Intel 3945ABG wireless NICs.
  
-@@ -278,11 +261,8 @@
+@@ -279,11 +262,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -126,7 +126,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -297,39 +277,9 @@
+@@ -298,39 +278,9 @@
  device		ehci		# EHCI PCI->USB interface (USB 2.0)
  device		xhci		# XHCI PCI->USB interface (USB 3.0)
  device		usb		# USB Bus (required)
@@ -166,7 +166,7 @@
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -339,10 +289,10 @@
+@@ -340,10 +290,10 @@
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
  
@@ -251,7 +251,7 @@
  device		aha		# Adaptec 154x SCSI adapters
  device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
  device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
-@@ -194,10 +194,6 @@
+@@ -195,10 +195,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -262,7 +262,7 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -208,8 +204,6 @@
+@@ -209,8 +205,6 @@
  device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
  device		ixgb		# Intel PRO/10GbE Ethernet Card
  device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
@@ -271,7 +271,7 @@
  device		vx		# 3Com 3c590, 3c595 (``Vortex'')
  
  # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -219,12 +213,10 @@
+@@ -220,12 +214,10 @@
  device		age		# Attansic/Atheros L1 Gigabit Ethernet
  device		alc		# Atheros AR8131/AR8132 Ethernet
  device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@@ -284,7 +284,7 @@
  device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
  device		lge		# Level 1 LXT1001 gigabit Ethernet
  device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -234,7 +226,6 @@
+@@ -235,7 +227,6 @@
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
@@ -292,7 +292,7 @@
  device		sge		# Silicon Integrated Systems SiS190/191
  device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
  device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -256,7 +247,6 @@
+@@ -257,7 +248,6 @@
  device		ep		# Etherlink III based cards
  device		fe		# Fujitsu MB8696x based cards
  device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -300,7 +300,7 @@
  device		xe		# Xircom pccard Ethernet
  
  # Wireless NIC cards
-@@ -276,12 +266,7 @@
+@@ -277,12 +267,7 @@
  device		ath_rate_sample	# SampleRate tx rate control for ath
  #device		bwi		# Broadcom BCM430x/BCM431x wireless NICs.
  #device		bwn		# Broadcom BCM43xx wireless NICs.
@@ -313,7 +313,7 @@
  device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
  #device		wl		# Older non 802.11 Wavelan wireless NIC.
  device		wpi		# Intel 3945ABG wireless NICs.
-@@ -291,11 +276,8 @@
+@@ -292,11 +277,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -325,7 +325,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -310,39 +292,9 @@
+@@ -311,39 +293,9 @@
  device		ehci		# EHCI PCI->USB interface (USB 2.0)
  device		xhci		# XHCI PCI->USB interface (USB 3.0)
  device		usb		# USB Bus (required)
@@ -365,7 +365,7 @@
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -352,10 +304,10 @@
+@@ -353,10 +305,10 @@
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
  

Modified: trunk/kfreebsd-10/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_firmware.diff	2011-10-10 19:38:55 UTC (rev 3728)
+++ trunk/kfreebsd-10/debian/patches/999_firmware.diff	2011-10-10 20:05:37 UTC (rev 3729)
@@ -98,15 +98,16 @@
  dev/drm/savage_bci.c		optional savagedrm
  dev/drm/savage_drv.c		optional savagedrm
  dev/drm/savage_state.c		optional savagedrm
-@@ -1091,7 +1031,6 @@
+@@ -1091,8 +1031,6 @@
  dev/firewire/sbp_targ.c		optional sbp_targ
  dev/flash/at45d.c		optional at45d
  dev/flash/mx25l.c		optional mx25l
 -dev/fxp/if_fxp.c		optional fxp
+-dev/fxp/inphy.c			optional fxp
  dev/gem/if_gem.c		optional gem
  dev/gem/if_gem_pci.c		optional gem pci
  dev/gem/if_gem_sbus.c		optional gem sbus
-@@ -1148,49 +1087,6 @@
+@@ -1149,49 +1087,6 @@
  dev/ips/ips_disk.c		optional ips
  dev/ips/ips_ioctl.c		optional ips
  dev/ips/ips_pci.c		optional ips pci
@@ -156,7 +157,7 @@
  dev/iscsi/initiator/iscsi.c	optional iscsi_initiator scbus
  dev/iscsi/initiator/iscsi_subr.c	optional iscsi_initiator scbus
  dev/iscsi/initiator/isc_cam.c	optional iscsi_initiator scbus
-@@ -1203,163 +1099,6 @@
+@@ -1204,163 +1099,6 @@
  dev/isp/isp_pci.c		optional isp pci
  dev/isp/isp_sbus.c		optional isp sbus
  dev/isp/isp_target.c		optional isp
@@ -320,7 +321,7 @@
  dev/ixgb/if_ixgb.c		optional ixgb
  dev/ixgb/ixgb_ee.c		optional ixgb
  dev/ixgb/ixgb_hw.c		optional ixgb
-@@ -1474,33 +1213,6 @@
+@@ -1469,33 +1207,6 @@
  dev/mvs/mvs.c			optional mvs
  dev/mvs/mvs_if.m		optional mvs
  dev/mvs/mvs_pci.c		optional mvs pci
@@ -354,7 +355,7 @@
  dev/mxge/if_mxge.c		optional mxge pci
  dev/mxge/mxge_lro.c		optional mxge pci
  dev/mxge/mxge_eth_z8e.c		optional mxge pci
-@@ -1590,65 +1302,6 @@
+@@ -1585,65 +1296,6 @@
  dev/puc/puc_pci.c		optional puc pci
  dev/puc/pucdata.c		optional puc pci
  dev/quicc/quicc_core.c		optional quicc
@@ -420,7 +421,7 @@
  dev/random/harvest.c		standard
  dev/random/hash.c		optional random
  dev/random/probe.c		optional random
-@@ -1673,14 +1326,7 @@
+@@ -1668,14 +1320,7 @@
  dev/scd/scd.c			optional scd isa
  dev/scd/scd_isa.c		optional scd isa
  dev/sdhci/sdhci.c		optional sdhci pci
@@ -435,7 +436,7 @@
  dev/siba/siba_bwn.c		optional siba_bwn pci
  dev/siba/siba_core.c		optional siba_bwn pci
  dev/siis/siis.c			optional siis pci
-@@ -1691,9 +1337,6 @@
+@@ -1686,9 +1331,6 @@
  dev/smbus/smbus.c		optional smbus
  dev/smbus/smbus_if.m		optional smbus
  dev/smc/if_smc.c		optional smc
@@ -445,7 +446,7 @@
  dev/snp/snp.c			optional snp
  dev/sound/clone.c		optional sound
  dev/sound/unit.c		optional sound
-@@ -1709,10 +1352,6 @@
+@@ -1704,10 +1346,6 @@
  dev/sound/pci/atiixp.c		optional snd_atiixp pci
  dev/sound/pci/cmi.c		optional snd_cmi pci
  dev/sound/pci/cs4281.c		optional snd_cs4281 pci
@@ -456,7 +457,7 @@
  dev/sound/pci/emu10k1.c		optional snd_emu10k1 pci \
  	dependency "emu10k1-alsa%diked.h" \
  	warning "kernel contains GPL contaminated emu10k1 headers"
-@@ -1735,8 +1374,6 @@
+@@ -1730,8 +1368,6 @@
  dev/sound/pci/fm801.c		optional snd_fm801 pci
  dev/sound/pci/ich.c		optional snd_ich pci
  dev/sound/pci/maestro.c		optional snd_maestro pci
@@ -465,7 +466,7 @@
  dev/sound/pci/neomagic.c	optional snd_neomagic pci
  dev/sound/pci/solo.c		optional snd_solo pci
  dev/sound/pci/spicds.c		optional snd_spicds pci
-@@ -1816,7 +1453,6 @@
+@@ -1811,7 +1447,6 @@
  dev/syscons/warp/warp_saver.c	optional warp_saver
  dev/tdfx/tdfx_linux.c		optional tdfx_linux tdfx compat_linux
  dev/tdfx/tdfx_pci.c		optional tdfx pci
@@ -473,15 +474,15 @@
  dev/tl/if_tl.c			optional tl pci
  dev/trm/trm.c			optional trm
  dev/twa/tw_cl_init.c		optional twa \
-@@ -1834,7 +1470,6 @@
- dev/twe/twe.c			optional twe
- dev/twe/twe_freebsd.c		optional twe
+@@ -1834,7 +1469,6 @@
+ dev/tws/tws_services.c		optional tws
+ dev/tws/tws_user.c		optional tws
  dev/tx/if_tx.c			optional tx
 -dev/txp/if_txp.c		optional txp
  dev/uart/uart_bus_acpi.c	optional uart acpi
  #dev/uart/uart_bus_cbus.c	optional uart cbus
  dev/uart/uart_bus_ebus.c	optional uart ebus
-@@ -1914,18 +1549,16 @@
+@@ -1914,19 +1548,17 @@
  dev/usb/net/if_cdce.c		optional cdce
  dev/usb/net/if_cue.c		optional cue
  dev/usb/net/if_ipheth.c		optional ipheth
@@ -490,6 +491,7 @@
  dev/usb/net/if_rue.c		optional rue
  dev/usb/net/if_udav.c		optional udav
  dev/usb/net/if_usie.c		optional usie
+ dev/usb/net/ruephy.c		optional rue
 -dev/usb/net/usb_ethernet.c	optional aue | axe | cdce | cue | kue | mos | \
 +dev/usb/net/usb_ethernet.c	optional aue | axe | cdce | cue | mos | \
  					 rue | udav
@@ -501,7 +503,7 @@
  dev/usb/wlan/if_run.c		optional run
  runfw.c				optional runfw							\
  	compile-with	"${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw -c${.TARGET}"	\
-@@ -1941,11 +1574,9 @@
+@@ -1942,11 +1574,9 @@
  	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/run/rt2870.fw.uu"		\
  	no-obj no-implicit-rule									\
  	clean		"runfw"
@@ -654,15 +656,15 @@
  	tl \
  	tmpfs \
  	${_tpm} \
-@@ -298,7 +281,6 @@
- 	${_twa} \
+@@ -299,7 +282,6 @@
  	twe \
+ 	tws \
  	tx \
 -	txp \
  	uart \
  	ubsec \
  	udf \
-@@ -326,7 +308,6 @@
+@@ -327,7 +309,6 @@
  	wlan_wep \
  	wlan_xauth \
  	${_wpi} \
@@ -670,7 +672,7 @@
  	${_x86bios} \
  	${_xe} \
  	xfs \
-@@ -398,9 +379,7 @@
+@@ -399,9 +380,7 @@
  _bxe=		bxe
  _cardbus=	cardbus
  _cbb=		cbb
@@ -680,7 +682,7 @@
  _cpuctl=	cpuctl
  _cpufreq=	cpufreq
  _cs=		cs
-@@ -499,11 +478,8 @@
+@@ -500,11 +479,8 @@
  _ipmi=		ipmi
  _ips=		ips
  _ipw=		ipw
@@ -692,7 +694,7 @@
  _ixgb=		ixgb
  _ixgbe=		ixgbe
  _mly=		mly
-@@ -512,7 +488,6 @@
+@@ -513,7 +489,6 @@
  _nxge=		nxge
  _tpm=		tpm
  _wpi=		wpi
@@ -700,7 +702,7 @@
  .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
  _padlock=	padlock
  .endif
-@@ -573,11 +548,8 @@
+@@ -574,11 +549,8 @@
  _ipmi=		ipmi
  _ips=		ips
  _ipw=		ipw
@@ -712,7 +714,7 @@
  _ixgb=		ixgb
  _ixgbe=		ixgbe
  _lindev=	lindev
-@@ -618,7 +590,6 @@
+@@ -619,7 +591,6 @@
  _x86bios=	x86bios
  _wi=		wi
  _wpi=		wpi

More information about the Glibc-bsd-commits mailing list