[Glibc-bsd-commits] r3703 - in trunk/kfreebsd-9/debian: . patches

Fri Sep 16 20:17:11 UTC 2011

Author: rmh
Date: 2011-09-16 20:17:10 +0000 (Fri, 16 Sep 2011)
New Revision: 3703

Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
   trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff
   trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff
   trunk/kfreebsd-9/debian/patches/999_config.diff
   trunk/kfreebsd-9/debian/patches/999_firmware.diff
Log:
New upstream snapshot

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================

--- trunk/kfreebsd-9/debian/changelog	2011-09-15 19:52:00 UTC (rev 3702)
+++ trunk/kfreebsd-9/debian/changelog	2011-09-16 20:17:10 UTC (rev 3703)
@@ -1,3 +1,9 @@
+kfreebsd-9 (9.0~svn225586-1) experimental; urgency=low
+
+  * New upstream snapshot.
+
+ -- Robert Millan <rmh at debian.org>  Thu, 15 Sep 2011 21:52:09 +0200
+
 kfreebsd-9 (9.0~svn225237-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff	2011-09-15 19:52:00 UTC (rev 3702)
+++ trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff	2011-09-16 20:17:10 UTC (rev 3703)
@@ -81,7 +81,7 @@
  	${_nvram} \
  	${_nwfs} \
  	${_nxge} \
-@@ -498,8 +495,6 @@
+@@ -500,8 +497,6 @@
  _dpt=		dpt
  _ex=		ex
  _hptiop=	hptiop
@@ -90,7 +90,7 @@
  _ichwd=		ichwd
  _ida=		ida
  _iir=		iir
-@@ -515,7 +510,6 @@
+@@ -517,7 +512,6 @@
  _ixgbe=		ixgbe
  _mly=		mly
  _nfe=		nfe
@@ -98,7 +98,7 @@
  _nvram=		nvram
  _nxge=		nxge
  _tpm=		tpm
-@@ -571,8 +565,6 @@
+@@ -573,8 +567,6 @@
  _exca=		exca
  _ext2fs=	ext2fs
  _hptiop=	hptiop
@@ -107,7 +107,7 @@
  _i2c=		i2c
  _ichwd=		ichwd
  _ida=		ida
-@@ -603,7 +595,6 @@
+@@ -605,7 +597,6 @@
  .endif
  _ndis=		ndis
  _nfe=		nfe

Modified: trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff	2011-09-15 19:52:00 UTC (rev 3702)
+++ trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff	2011-09-16 20:17:10 UTC (rev 3703)
@@ -8,8 +8,8 @@
 +VNET_DEFINE(int, ip6_accept_rtadv) = 1;
  VNET_DEFINE(int, ip6_no_radr) = 0;
  VNET_DEFINE(int, ip6_norbit_raif) = 0;
- VNET_DEFINE(int, ip6_maxfragpackets);	/* initialized in frag6.c:frag6_init() */
-@@ -411,7 +411,7 @@
+ VNET_DEFINE(int, ip6_rfc6204w3) = 0;
+@@ -412,7 +412,7 @@
  VNET_DEFINE(int, ip6_rr_prune) = 5;	/* router renumbering prefix
  					 * walk list every 5 sec. */
  VNET_DEFINE(int, ip6_mcast_pmtu) = 0;	/* enable pMTU discovery for multicast? */

Modified: trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff	2011-09-15 19:52:00 UTC (rev 3702)
+++ trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff	2011-09-16 20:17:10 UTC (rev 3703)
@@ -3,7 +3,7 @@
 
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -357,12 +357,11 @@
+@@ -358,12 +358,11 @@
  .endif
  .endif
  
@@ -18,7 +18,7 @@
  _if_carp=	if_carp
  .endif
  
-@@ -374,8 +373,7 @@
+@@ -375,8 +374,7 @@
  _netgraph=	netgraph
  .endif
  
@@ -28,7 +28,7 @@
  _pf=		pf
  _pflog=		pflog
  .if ${MK_INET_SUPPORT} != "no"
-@@ -434,7 +432,7 @@
+@@ -435,7 +433,7 @@
  _linsysfs=	linsysfs
  _linux=		linux
  _mse=		mse
@@ -37,7 +37,7 @@
  _mlx4=		mlx4
  _mlx4ib=	mlx4ib
  _mlxen=		mlxen
-@@ -585,7 +583,7 @@
+@@ -587,7 +585,7 @@
  _linsysfs=	linsysfs
  _linux=		linux
  _mly=		mly

Modified: trunk/kfreebsd-9/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_config.diff	2011-09-15 19:52:00 UTC (rev 3702)
+++ trunk/kfreebsd-9/debian/patches/999_config.diff	2011-09-16 20:17:10 UTC (rev 3703)
@@ -162,7 +162,7 @@
 -device		upgt		# Conexant/Intersil PrismGT wireless NICs.
 -device		ural		# Ralink Technology RT2500USB wireless NICs
 -device		urtw		# Realtek RTL8187B/L wireless NICs
--device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
+-device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
  
  # FireWire support
  device		firewire	# FireWire bus code
@@ -361,7 +361,7 @@
 -device		upgt		# Conexant/Intersil PrismGT wireless NICs.
 -device		ural		# Ralink Technology RT2500USB wireless NICs
 -device		urtw		# Realtek RTL8187B/L wireless NICs
--device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
+-device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
  
  # FireWire support
  device		firewire	# FireWire bus code

Modified: trunk/kfreebsd-9/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_firmware.diff	2011-09-15 19:52:00 UTC (rev 3702)
+++ trunk/kfreebsd-9/debian/patches/999_firmware.diff	2011-09-16 20:17:10 UTC (rev 3703)
@@ -662,7 +662,7 @@
  	uart \
  	ubsec \
  	udf \
-@@ -325,7 +307,6 @@
+@@ -326,7 +308,6 @@
  	wlan_wep \
  	wlan_xauth \
  	${_wpi} \
@@ -670,7 +670,7 @@
  	${_x86bios} \
  	${_xe} \
  	xfs \
-@@ -397,9 +378,7 @@
+@@ -398,9 +379,7 @@
  _bxe=		bxe
  _cardbus=	cardbus
  _cbb=		cbb
@@ -680,7 +680,7 @@
  _cpuctl=	cpuctl
  _cpufreq=	cpufreq
  _cs=		cs
-@@ -497,11 +476,8 @@
+@@ -499,11 +478,8 @@
  _ipmi=		ipmi
  _ips=		ips
  _ipw=		ipw
@@ -692,7 +692,7 @@
  _ixgb=		ixgb
  _ixgbe=		ixgbe
  _mly=		mly
-@@ -510,7 +486,6 @@
+@@ -512,7 +488,6 @@
  _nxge=		nxge
  _tpm=		tpm
  _wpi=		wpi
@@ -700,7 +700,7 @@
  .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
  _padlock=	padlock
  .endif
-@@ -571,11 +546,8 @@
+@@ -573,11 +548,8 @@
  _ipmi=		ipmi
  _ips=		ips
  _ipw=		ipw
@@ -712,7 +712,7 @@
  _ixgb=		ixgb
  _ixgbe=		ixgbe
  _lindev=	lindev
-@@ -615,7 +587,6 @@
+@@ -618,7 +590,6 @@
  _x86bios=	x86bios
  _wi=		wi
  _wpi=		wpi


