[Glibc-bsd-commits] r3916 - in trunk/kfreebsd-8/debian: . patches

Robert Millan rmh at alioth.debian.org
Sat Dec 3 18:44:55 UTC 2011 

Author: rmh
Date: 2011-12-03 18:44:55 +0000 (Sat, 03 Dec 2011)
New Revision: 3916

Added:
   trunk/kfreebsd-8/debian/patches/917_disable_kgssapi.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/control.flavor.in
   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/021_superpages_i386.diff
   trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff
   trunk/kfreebsd-8/debian/patches/107_mount_update.diff
   trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.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/915_ip6.v6only.diff
   trunk/kfreebsd-8/debian/patches/917_track_alignment.diff
   trunk/kfreebsd-8/debian/patches/918_unix_socket_overflow.diff
   trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
   trunk/kfreebsd-8/debian/patches/999_config.diff
   trunk/kfreebsd-8/debian/patches/999_firmware.diff
   trunk/kfreebsd-8/debian/patches/series
   trunk/kfreebsd-8/debian/rules
Log:
New upstream snapshot

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/changelog	2011-12-03 18:44:55 UTC (rev 3916)
@@ -1,5 +1,8 @@
-kfreebsd-8 (8.2-16) UNRELEASED; urgency=low
+kfreebsd-8 (8.3~svn228231-1) UNRELEASED; urgency=low
 
+  * New upstream snapshot.
+
+  [ Robert Millan ]
   * 108_teken_utf8_table.diff: Fix sockets over nullfs.
 
  -- Robert Millan <rmh at debian.org>  Sat, 03 Dec 2011 17:36:42 +0100

Modified: trunk/kfreebsd-8/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-8/debian/control.flavor.in	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/control.flavor.in	2011-12-03 18:44:55 UTC (rev 3916)
@@ -6,6 +6,11 @@
 # Policy-conformant keyboard mappings (see #605777)
  kbdcontrol (>= 8.2+ds2-6) [kfreebsd-any],
 Conflicts: kfreebsd-loader (<< 5.4-1.3)
+Breaks:
+# Missing support for RFTSIGZMB (see 007_clone_signals.diff)
+ libc0.1 (<< 2.13-11) [kfreebsd-any],
+# Require ZFS v28 userland
+ zfsutils (<< 8.3~) [kfreebsd-any],
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@
 Description: kernel of FreeBSD @version@ image

Modified: trunk/kfreebsd-8/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/004_xargs.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/004_xargs.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -8,7 +8,7 @@
 
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -207,7 +207,7 @@
+@@ -214,7 +214,7 @@
  	grep -v '^#' < ${EXPORT_SYMS} > export_syms
  .endif
  	awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \

Modified: trunk/kfreebsd-8/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/007_clone_signals.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/007_clone_signals.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -1,14 +1,14 @@
----
- sys/kern/kern_fork.c |    8 +++++++-
- sys/sys/unistd.h     |    4 ++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
 
+Starting with r223966 in 9-CURRENT, a new interface is available
+(RFTSIGZMB).  It is supported in eglibc 2.13-11 or later.  Use this
+patch if you need support for older eglibc.
+
 --- a/sys/kern/kern_fork.c
 +++ b/sys/kern/kern_fork.c
-@@ -564,7 +564,13 @@
- 		p2->p_sigacts = newsigacts;
- 	}
- 	if (flags & RFLINUXTHPN) 
+@@ -480,7 +480,13 @@
+ 	if (flags & RFTSIGZMB)
+ 	        p2->p_sigparent = RFTSIGNUM(flags);
+ 	else if (flags & RFLINUXTHPN)
 -	        p2->p_sigparent = SIGUSR1;
 +	{
 +		int sig;
@@ -20,16 +20,38 @@
  	else
  	        p2->p_sigparent = SIGCHLD;
  
+@@ -723,12 +729,16 @@
+ 	static struct timeval lastfail;
+ 
+ 	/* Check for the undefined or unimplemented flags. */
+-	if ((flags & ~(RFFLAGS | RFTSIGFLAGS(RFTSIGMASK))) != 0)
++	if ((flags & ~(RFFLAGS | RFTSIGFLAGS(RFTSIGMASK) | (RFTHPNMASK << RFTHPNSHIFT))) != 0)
+ 		return (EINVAL);
+ 
+-	/* Signal value requires RFTSIGZMB. */
+-	if ((flags & RFTSIGFLAGS(RFTSIGMASK)) != 0 && (flags & RFTSIGZMB) == 0)
+-		return (EINVAL);
++	/* Signal value requires either RFTSIGZMB or RFLINUXTHPN. */
++	if ((flags & RFTSIGZMB) == 0 && (flags & RFLINUXTHPN) == 0) {
++		if ((flags & RFTSIGFLAGS(RFTSIGMASK)) != 0)
++			return (EINVAL);
++		if ((flags & (RFTHPNMASK << RFTHPNSHIFT)) != 0)
++			return (EINVAL);
++	}
+ 
+ 	/* Can't copy and clear. */
+ 	if ((flags & (RFFDG|RFCFDG)) == (RFFDG|RFCFDG))
 --- 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) */
- #define	RFKERNELONLY	(RFSTOPPED | RFHIGHPID | RFPPWAIT)
+@@ -191,6 +191,11 @@
+     RFTHREAD | RFSIGSHARE | RFLINUXTHPN | RFSTOPPED | RFHIGHPID | RFTSIGZMB | \
+     RFPPWAIT)
+ 
 +#define RFTHPNSHIFT	24	/* reserve bits 24-30 */
 +#define RFTHPNMASK	0x7F    /* for compatibility with linuxthreads/clone()   */
 +				/* allow to specify  "clone exit parent notification" signal */
 +#define RFTHPNSIGNUM(flags)	(((flags) >> RFTHPNSHIFT) & RFTHPNMASK)
- 
++
  #endif /* __BSD_VISIBLE */
  
+ #endif /* !_SYS_UNISTD_H_ */

Modified: trunk/kfreebsd-8/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/008_config.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/008_config.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -41,18 +41,6 @@
  #include <assert.h>
  #include <ctype.h>
  #include <err.h>
-@@ -622,7 +627,11 @@
- 	if ((dirp = opendir(p)) == NULL)
- 		err(EX_OSERR, "opendir %s", p);
- 	while ((dp = readdir(dirp)) != NULL) {
-+#ifdef _DIRENT_HAVE_D_NAMLEN
- 		i = dp->d_namlen - 2;
-+#else
-+		i = strlen (dp->d_name) - 2;
-+#endif
- 		/* Skip non-headers */
- 		if (dp->d_name[i] != '.' || dp->d_name[i + 1] != 'h')
- 			continue;
 --- a/usr.sbin/config/Makefile
 +++ b/usr.sbin/config/Makefile
 @@ -9,11 +9,11 @@

Modified: trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -4,7 +4,7 @@
 
 --- a/sys/i386/i386/pmap.c
 +++ b/sys/i386/i386/pmap.c
-@@ -219,7 +219,7 @@
+@@ -218,7 +218,7 @@
  SYSCTL_INT(_vm_pmap, OID_AUTO, pat_works, CTLFLAG_RD, &pat_works, 1,
      "Is page attribute table fully functional?");
  

Modified: trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -7,7 +7,7 @@
 
 --- a/sys/dev/acpica/acpi.c
 +++ b/sys/dev/acpica/acpi.c
-@@ -2315,9 +2315,7 @@
+@@ -2329,9 +2329,7 @@
  acpi_ReqSleepState(struct acpi_softc *sc, int state)
  {
  #if defined(__amd64__) || defined(__i386__)
@@ -17,7 +17,7 @@
      ACPI_STATUS status;
  
      if (state < ACPI_STATE_S1 || state > ACPI_S_STATES_MAX)
-@@ -2342,7 +2340,6 @@
+@@ -2356,7 +2354,6 @@
  
      /* Record the pending state and notify all apm devices. */
      sc->acpi_next_sstate = state;
@@ -25,7 +25,7 @@
      STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) {
  	clone->notify_status = APM_EV_NONE;
  	if ((clone->flags & ACPI_EVF_DEVD) == 0) {
-@@ -2350,7 +2347,6 @@
+@@ -2364,7 +2361,6 @@
  	    KNOTE_LOCKED(&clone->sel_read.si_note, 0);
  	}
      }
@@ -33,7 +33,7 @@
  
      /* If devd(8) is not running, immediately enter the sleep state. */
      if (!devctl_process_running()) {
-@@ -2418,7 +2414,6 @@
+@@ -2432,7 +2428,6 @@
       * are writable since read-only devices couldn't ack the request.
       */
      sleeping = TRUE;
@@ -41,7 +41,7 @@
      clone->notify_status = APM_EV_ACKED;
      STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) {
  	if ((clone->flags & ACPI_EVF_WRITE) != 0 &&
-@@ -2427,7 +2422,6 @@
+@@ -2441,7 +2436,6 @@
  	    break;
  	}
      }

Modified: trunk/kfreebsd-8/debian/patches/107_mount_update.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/107_mount_update.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/107_mount_update.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -4,7 +4,7 @@
 
 --- a/sys/kern/vfs_mount.c
 +++ b/sys/kern/vfs_mount.c
-@@ -559,10 +559,10 @@
+@@ -582,10 +582,10 @@
  	struct vfsopt *opt, *noro_opt, *tmp_opt;
  	char *fstype, *fspath, *errmsg;
  	int error, fstypelen, fspathlen, errmsg_len, errmsg_pos;
@@ -17,7 +17,7 @@
  	errmsg_pos = -1;
  
  	error = vfs_buildopts(fsoptions, &optlist);
-@@ -659,10 +659,8 @@
+@@ -682,10 +682,8 @@
  			fsflags &= ~MNT_RDONLY;
  			has_noro = 1;
  		}
@@ -29,7 +29,7 @@
  		else if (strcmp(opt->name, "ro") == 0)
  			fsflags |= MNT_RDONLY;
  		else if (strcmp(opt->name, "rdonly") == 0) {
-@@ -684,7 +682,7 @@
+@@ -707,7 +705,7 @@
  	 * we need a mount option "noro", since in vfs_mergeopts(),
  	 * "noro" will cancel "ro", but "rw" will not do anything.
  	 */

Modified: trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -5,9 +5,9 @@
 
 --- a/sys/compat/linprocfs/linprocfs.c
 +++ b/sys/compat/linprocfs/linprocfs.c
-@@ -1077,6 +1077,15 @@
+@@ -1082,6 +1082,15 @@
  		PROC_UNLOCK(p);
- 		return (ret);
+ 		return (0);
  	}
 +
 +	/*
@@ -21,12 +21,10 @@
  	if (p->p_args != NULL) {
  		sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length);
  		PROC_UNLOCK(p);
-@@ -1101,6 +1110,15 @@
- 		PROC_UNLOCK(p);
- 		return (ret);
+@@ -1108,6 +1117,15 @@
  	}
-+
-+	/*
+ 
+ 	/*
 +	 * Mimic linux behavior and pass only processes with usermode
 +	 * address space as valid.  Return zero silently otherwize.
 +	 */
@@ -34,6 +32,8 @@
 +		PROC_UNLOCK(p);
 +		return (0);
 +	}
- 	PROC_UNLOCK(p);
- 
- 	ret = linprocfs_doargv(td, p, sb, ps_string_env);
++
++	/*
+ 	 * Mimic linux behavior and pass only processes with usermode
+ 	 * address space as valid.  Return zero silently otherwize.
+ 	 */

Modified: trunk/kfreebsd-8/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/902_version.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/902_version.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -4,7 +4,7 @@
 
 --- a/sys/conf/newvers.sh
 +++ b/sys/conf/newvers.sh
-@@ -136,7 +136,7 @@
+@@ -132,7 +132,7 @@
  cat << EOF > vers.c
  $COPYRIGHT
  #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"

Modified: trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -36,7 +36,7 @@
  compat/linprocfs/linprocfs.c	optional linprocfs
  compat/linsysfs/linsysfs.c	optional linsysfs
  compat/linux/linux_emul.c	optional compat_linux
-@@ -172,14 +151,6 @@
+@@ -173,14 +152,6 @@
  dev/fe/if_fe_isa.c		optional fe isa
  dev/glxsb/glxsb.c		optional glxsb
  dev/glxsb/glxsb_hash.c		optional glxsb
@@ -61,7 +61,7 @@
  dev/random/nehemiah.c		optional random
 --- a/sys/i386/conf/GENERIC
 +++ b/sys/i386/conf/GENERIC
-@@ -146,8 +146,6 @@
+@@ -145,8 +145,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
@@ -72,7 +72,7 @@
  device		mly		# Mylex AcceleRAID/eXtremeRAID
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -103,8 +103,6 @@
+@@ -106,8 +106,6 @@
  	hifn \
  	hme \
  	${_hptiop} \
@@ -81,7 +81,7 @@
  	hwpmc \
  	${_i2c} \
  	${_ibcs2} \
-@@ -216,7 +214,6 @@
+@@ -223,7 +221,6 @@
  	ntfs \
  	ntfs_iconv \
  	nullfs \
@@ -89,7 +89,7 @@
  	${_nvram} \
  	${_nwfs} \
  	${_nxge} \
-@@ -469,8 +466,6 @@
+@@ -478,8 +475,6 @@
  _dpt=		dpt
  _ex=		ex
  _hptiop=	hptiop
@@ -98,7 +98,7 @@
  _ichwd=		ichwd
  _ida=		ida
  _iir=		iir
-@@ -486,7 +481,6 @@
+@@ -495,7 +490,6 @@
  _ixgbe=		ixgbe
  _mly=		mly
  _nfe=		nfe
@@ -106,7 +106,7 @@
  _nvram=		nvram
  _nxge=		nxge
  _tpm=		tpm
-@@ -540,8 +534,6 @@
+@@ -549,8 +543,6 @@
  _exca=		exca
  _ext2fs=	ext2fs
  _hptiop=	hptiop
@@ -115,7 +115,7 @@
  _i2c=		i2c
  _ichwd=		ichwd
  _ida=		ida
-@@ -566,7 +558,6 @@
+@@ -575,7 +567,6 @@
  _mly=		mly
  _ndis=		ndis
  _nfe=		nfe
@@ -178,9 +178,9 @@
  dev/hwpmc/hwpmc_amd.c		optional	hwpmc
  dev/hwpmc/hwpmc_intel.c		optional	hwpmc
  dev/hwpmc/hwpmc_core.c		optional	hwpmc
-@@ -214,7 +186,6 @@
+@@ -213,7 +185,6 @@
+ dev/lindev/full.c		optional	lindev
  dev/lindev/lindev.c		optional	lindev
- dev/mem/memutil.c		optional	mem
  dev/nfe/if_nfe.c		optional	nfe pci
 -dev/nve/if_nve.c		optional	nve pci
  dev/nvram/nvram.c		optional	nvram isa

Modified: trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -4,7 +4,7 @@
 
 --- a/sys/netinet6/in6_proto.c
 +++ b/sys/netinet6/in6_proto.c
-@@ -393,7 +393,7 @@
+@@ -394,7 +394,7 @@
  VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
  VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
  VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
@@ -13,7 +13,7 @@
  VNET_DEFINE(int, ip6_maxfragpackets);	/* initialized in frag6.c:frag6_init() */
  VNET_DEFINE(int, ip6_maxfrags);		/* initialized in frag6.c:frag6_init() */
  VNET_DEFINE(int, ip6_log_interval) = 5;
-@@ -406,7 +406,7 @@
+@@ -407,7 +407,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? */

Added: trunk/kfreebsd-8/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/917_disable_kgssapi.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/917_disable_kgssapi.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -0,0 +1,11 @@
+--- a/sys/modules/Makefile
++++ b/sys/modules/Makefile
+@@ -151,8 +151,6 @@
+ 	jme \
+ 	joy \
+ 	kbdmux \
+-	kgssapi \
+-	kgssapi_krb5 \
+ 	khelp \
+ 	krpc \
+ 	ksyms \

Modified: trunk/kfreebsd-8/debian/patches/917_track_alignment.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/917_track_alignment.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/917_track_alignment.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -4,7 +4,7 @@
 
 --- a/sys/geom/part/g_part_mbr.c
 +++ b/sys/geom/part/g_part_mbr.c
-@@ -449,13 +449,6 @@
+@@ -461,13 +461,6 @@
  				basetable->gpt_heads = heads;
  			}
  		}

Modified: trunk/kfreebsd-8/debian/patches/918_unix_socket_overflow.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/918_unix_socket_overflow.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/918_unix_socket_overflow.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -18,7 +18,7 @@
  	namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
  	if (namelen <= 0)
  		return (EINVAL);
-@@ -1168,7 +1173,12 @@
+@@ -1171,7 +1176,12 @@
  	KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
  
  	if (nam->sa_len > sizeof(struct sockaddr_un))

Modified: trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -24,8 +24,8 @@
  CFLAGS+=	-fstack-protector
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -135,6 +135,9 @@
- CFLAGS+=	-G0 -fno-pic -mno-abicalls -mlong-calls
+@@ -139,6 +139,9 @@
+ CTFFLAGS+=      -g
  .endif
  
 +# Disable stack protector as it causes kernel panic

Modified: trunk/kfreebsd-8/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_config.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/999_config.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -38,7 +38,7 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -87,7 +87,7 @@
+@@ -86,7 +86,7 @@
  options 	KDB_TRACE		# Print a stack trace for a panic
  
  # Make an SMP-capable kernel by default
@@ -47,7 +47,7 @@
  
  # CPU frequency control
  device		cpufreq
-@@ -96,9 +96,6 @@
+@@ -95,9 +95,6 @@
  device		acpi
  device		pci
  
@@ -57,7 +57,7 @@
  # ATA and ATAPI devices
  device		ata
  device		atadisk		# ATA disk drives
-@@ -106,6 +103,8 @@
+@@ -105,6 +102,8 @@
  device		atapicd		# ATAPI CDROM drives
  device		atapifd		# ATAPI floppy drives
  device		atapist		# ATAPI tape drives
@@ -74,7 +74,7 @@
  device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
  device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
  
-@@ -188,10 +186,6 @@
+@@ -189,10 +187,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -83,9 +83,9 @@
 -device		ppi		# Parallel port interface device
 -#device		vpo		# Requires scbus and da
  
- # If you've got a "dumb" serial or parallel PCI card that is
- # supported by the puc(4) glue driver, uncomment the following
-@@ -204,8 +198,6 @@
+ device		puc		# Multi I/O cards and multi-channel UARTs
+ 
+@@ -202,8 +196,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
@@ -94,7 +94,7 @@
  device		vx		# 3Com 3c590, 3c595 (``Vortex'')
  
  # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -215,12 +207,10 @@
+@@ -213,12 +205,10 @@
  device		age		# Attansic/Atheros L1 Gigabit Ethernet
  device		alc		# Atheros AR8131/AR8132 Ethernet
  device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@@ -107,7 +107,7 @@
  device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
  device		lge		# Level 1 LXT1001 gigabit Ethernet
  device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -230,7 +220,6 @@
+@@ -228,7 +218,6 @@
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
@@ -115,7 +115,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
-@@ -250,7 +239,6 @@
+@@ -248,7 +237,6 @@
  device		ex		# Intel EtherExpress Pro/10 and Pro/10+
  device		ep		# Etherlink III based cards
  device		fe		# Fujitsu MB8696x based cards
@@ -123,7 +123,7 @@
  device		xe		# Xircom pccard Ethernet
  
  # Wireless NIC cards
-@@ -275,11 +263,8 @@
+@@ -273,11 +261,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -135,7 +135,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -293,35 +278,9 @@
+@@ -291,35 +276,9 @@
  device		ohci		# OHCI PCI->USB interface
  device		ehci		# EHCI PCI->USB interface (USB 2.0)
  device		usb		# USB Bus (required)
@@ -171,7 +171,7 @@
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -330,3 +289,11 @@
+@@ -328,3 +287,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
@@ -231,7 +231,7 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -87,7 +89,7 @@
+@@ -86,7 +88,7 @@
  options 	KDB_TRACE		# Print a stack trace for a panic
  
  # To make an SMP kernel, the next two lines are needed
@@ -240,7 +240,7 @@
  device		apic			# I/O APIC
  
  # CPU frequency control
-@@ -98,9 +100,6 @@
+@@ -97,9 +99,6 @@
  device		eisa
  device		pci
  
@@ -250,7 +250,7 @@
  # ATA and ATAPI devices
  device		ata
  device		atadisk		# ATA disk drives
-@@ -108,6 +107,8 @@
+@@ -107,6 +106,8 @@
  device		atapicd		# ATAPI CDROM drives
  device		atapifd		# ATAPI floppy drives
  device		atapist		# ATAPI tape drives
@@ -259,7 +259,7 @@
  options 	ATA_STATIC_ID	# Static device numbering
  
  # SCSI Controllers
-@@ -128,7 +129,6 @@
+@@ -127,7 +128,6 @@
  device		trm		# Tekram DC395U/UW/F DC315U adapters
  
  device		adv		# Advansys SCSI adapters
@@ -276,9 +276,9 @@
 -device		ppi		# Parallel port interface device
 -#device		vpo		# Requires scbus and da
  
- # If you've got a "dumb" serial or parallel PCI card that is
- # supported by the puc(4) glue driver, uncomment the following
-@@ -215,8 +211,6 @@
+ device		puc		# Multi I/O cards and multi-channel UARTs
+ 
+@@ -212,8 +208,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
@@ -287,7 +287,7 @@
  device		vx		# 3Com 3c590, 3c595 (``Vortex'')
  
  # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -226,12 +220,10 @@
+@@ -223,12 +217,10 @@
  device		age		# Attansic/Atheros L1 Gigabit Ethernet
  device		alc		# Atheros AR8131/AR8132 Ethernet
  device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@@ -300,7 +300,7 @@
  device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
  device		lge		# Level 1 LXT1001 gigabit Ethernet
  device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -241,7 +233,6 @@
+@@ -238,7 +230,6 @@
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
@@ -308,7 +308,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
-@@ -262,7 +253,6 @@
+@@ -260,7 +251,6 @@
  device		ep		# Etherlink III based cards
  device		fe		# Fujitsu MB8696x based cards
  device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -316,7 +316,7 @@
  device		xe		# Xircom pccard Ethernet
  
  # Wireless NIC cards
-@@ -288,11 +278,8 @@
+@@ -286,11 +276,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -328,7 +328,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -306,36 +293,9 @@
+@@ -304,36 +291,9 @@
  device		ohci		# OHCI PCI->USB interface
  device		ehci		# EHCI PCI->USB interface (USB 2.0)
  device		usb		# USB Bus (required)
@@ -365,7 +365,7 @@
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -344,3 +304,11 @@
+@@ -342,3 +302,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons

Modified: trunk/kfreebsd-8/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_firmware.diff	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/999_firmware.diff	2011-12-03 18:44:55 UTC (rev 3916)
@@ -31,7 +31,7 @@
  dev/bfe/if_bfe.c		optional bfe
  dev/bge/if_bge.c		optional bge
  dev/bktr/bktr_audio.c		optional bktr pci
-@@ -794,34 +789,6 @@
+@@ -794,42 +789,6 @@
  dev/cs/if_cs.c			optional cs
  dev/cs/if_cs_isa.c		optional cs isa
  dev/cs/if_cs_pccard.c		optional cs pccard
@@ -63,10 +63,18 @@
 -	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 -dev/cxgb/cxgb_t3fw.c		optional cxgb cxgb_t3fw \
 -	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+-dev/cxgbe/t4_main.c		optional cxgbe pci \
+-	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
+-dev/cxgbe/t4_sge.c		optional cxgbe pci \
+-	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
+-dev/cxgbe/t4_l2t.c		optional cxgbe pci \
+-	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
+-dev/cxgbe/common/t4_hw.c	optional cxgbe pci \
+-	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
  dev/cy/cy.c			optional cy
  dev/cy/cy_isa.c			optional cy isa
  dev/cy/cy_pci.c			optional cy pci
-@@ -832,13 +799,6 @@
+@@ -840,13 +799,6 @@
  dev/dcons/dcons_crom.c		optional dcons_crom
  dev/dcons/dcons_os.c		optional dcons
  dev/de/if_de.c			optional de pci
@@ -80,7 +88,7 @@
  dev/digi/digi.c			optional digi
  dev/digi/digi_isa.c		optional digi isa
  dev/digi/digi_pci.c		optional digi pci
-@@ -871,26 +831,6 @@
+@@ -879,26 +831,6 @@
  dev/drm/mach64_drv.c		optional mach64drm
  dev/drm/mach64_irq.c		optional mach64drm
  dev/drm/mach64_state.c		optional mach64drm
@@ -107,7 +115,7 @@
  dev/drm/savage_bci.c		optional savagedrm
  dev/drm/savage_drv.c		optional savagedrm
  dev/drm/savage_state.c		optional savagedrm
-@@ -972,7 +912,6 @@
+@@ -981,7 +913,6 @@
  dev/firewire/sbp.c		optional sbp
  dev/firewire/sbp_targ.c		optional sbp_targ
  dev/flash/at45d.c		optional at45d
@@ -115,7 +123,7 @@
  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
-@@ -1022,48 +961,6 @@
+@@ -1031,48 +962,6 @@
  dev/ips/ips_ioctl.c		optional ips
  dev/ips/ips_pci.c		optional ips pci
  dev/ipw/if_ipw.c		optional ipw
@@ -164,7 +172,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
-@@ -1076,135 +973,7 @@
+@@ -1085,163 +974,7 @@
  dev/isp/isp_pci.c		optional isp pci
  dev/isp/isp_sbus.c		optional isp sbus
  dev/isp/isp_target.c		optional isp
@@ -223,8 +231,8 @@
 -	no-implicit-rule						\
 -	clean		"iwn1000fw.fwo"
 -iwn1000.fw			optional iwn1000fw | iwnfw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu" \
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu" \
+-	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"iwn1000.fw"
 -iwn4965fw.c			optional iwn4965fw | iwnfw		\
@@ -251,8 +259,8 @@
 -	no-implicit-rule						\
 -	clean		"iwn5000fw.fwo"
 -iwn5000.fw			optional iwn5000fw | iwnfw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu"	\
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu" \
+-	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu"	\
 -	no-obj no-implicit-rule						\
 -	clean		"iwn5000.fw"
 -iwn5150fw.c			optional iwn5150fw | iwnfw		\
@@ -283,6 +291,34 @@
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"iwn6000.fw"
+-iwn6000g2afw.c			optional iwn6000g2afw | iwnfw		\
+-	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6000g2a.fw:iwn6000g2afw -miwn6000g2afw -c${.TARGET}" \
+-	no-implicit-rule before-depend local				\
+-	clean		"iwn6000g2afw.c"
+-iwn6000g2afw.fwo		optional iwn6000g2afw | iwnfw		\
+-	dependency	"iwn6000g2a.fw"					\
+-	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn6000g2a.fw" \
+-	no-implicit-rule						\
+-	clean		"iwn6000g2afw.fwo"
+-iwn6000g2a.fw			optional iwn6000g2afw | iwnfw		\
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu" \
+-	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu" \
+-	no-obj no-implicit-rule						\
+-	clean		"iwn6000g2a.fw"
+-iwn6000g2bfw.c			optional iwn6000g2bfw | iwnfw		\
+-	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6000g2b.fw:iwn6000g2bfw -miwn6000g2bfw -c${.TARGET}" \
+-	no-implicit-rule before-depend local				\
+-	clean		"iwn6000g2bfw.c"
+-iwn6000g2bfw.fwo		optional iwn6000g2bfw | iwnfw		\
+-	dependency	"iwn6000g2b.fw"					\
+-	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn6000g2b.fw" \
+-	no-implicit-rule						\
+-	clean		"iwn6000g2bfw.fwo"
+-iwn6000g2b.fw			optional iwn6000g2bfw | iwnfw		\
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu" \
+-	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu" \
+-	no-obj no-implicit-rule						\
+-	clean		"iwn6000g2b.fw"
 -iwn6050fw.c			optional iwn6050fw | iwnfw		\
 -	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6050.fw:iwn6050fw -miwn6050fw -c${.TARGET}" \
 -	no-implicit-rule before-depend local				\
@@ -293,14 +329,14 @@
 -	no-implicit-rule						\
 -	clean		"iwn6050fw.fwo"
 -iwn6050.fw			optional iwn6050fw | iwnfw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu" \
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu" \
+-	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu" \
 -	no-obj no-implicit-rule						\
--	clean		"iwn6000.fw"
+-	clean		"iwn6050.fw"
  dev/ixgb/if_ixgb.c		optional ixgb
  dev/ixgb/ixgb_ee.c		optional ixgb
  dev/ixgb/ixgb_hw.c		optional ixgb
-@@ -1315,30 +1084,6 @@
+@@ -1362,30 +1095,6 @@
  dev/mwl/if_mwl.c		optional mwl
  dev/mwl/if_mwl_pci.c		optional mwl pci
  dev/mwl/mwlhal.c		optional mwl
@@ -331,7 +367,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
-@@ -1429,62 +1174,6 @@
+@@ -1476,62 +1185,6 @@
  dev/ral/rt2560.c		optional ral
  dev/ral/rt2661.c		optional ral
  dev/ral/if_ral_pci.c		optional ral pci
@@ -394,7 +430,7 @@
  dev/random/harvest.c		standard
  dev/random/hash.c		optional random
  dev/random/probe.c		optional random
-@@ -1509,14 +1198,7 @@
+@@ -1556,14 +1209,7 @@
  dev/scd/scd.c			optional scd isa
  dev/scd/scd_isa.c		optional scd isa
  dev/sdhci/sdhci.c		optional sdhci pci
@@ -409,7 +445,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
-@@ -1527,9 +1209,6 @@
+@@ -1574,9 +1220,6 @@
  dev/smbus/smbus.c		optional smbus
  dev/smbus/smbus_if.m		optional smbus
  dev/smc/if_smc.c		optional smc
@@ -419,7 +455,7 @@
  dev/snp/snp.c			optional snp
  dev/sound/clone.c		optional sound
  dev/sound/unit.c		optional sound
-@@ -1545,10 +1224,6 @@
+@@ -1592,10 +1235,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
@@ -430,7 +466,7 @@
  dev/sound/pci/emu10k1.c		optional snd_emu10k1 pci \
  	dependency "emu10k1-alsa%diked.h" \
  	warning "kernel contains GPL contaminated emu10k1 headers"
-@@ -1571,8 +1246,6 @@
+@@ -1618,8 +1257,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
@@ -439,7 +475,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
-@@ -1652,7 +1325,6 @@
+@@ -1699,7 +1336,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
@@ -447,15 +483,15 @@
  dev/tl/if_tl.c			optional tl pci
  dev/trm/trm.c			optional trm
  dev/twa/tw_cl_init.c		optional twa \
-@@ -1670,7 +1342,6 @@
- dev/twe/twe.c			optional twe
- dev/twe/twe_freebsd.c		optional twe
+@@ -1722,7 +1358,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 inet
  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
-@@ -1748,7 +1419,6 @@
+@@ -1801,7 +1436,6 @@
  dev/usb/net/if_cdce.c		optional cdce
  dev/usb/net/if_cue.c		optional cue
  dev/usb/net/if_ipheth.c		optional ipheth
@@ -463,7 +499,7 @@
  dev/usb/net/if_rue.c		optional rue
  dev/usb/net/if_udav.c		optional udav
  dev/usb/net/usb_ethernet.c	optional aue | axe | cdce | cue | kue | rue | \
-@@ -1757,13 +1427,10 @@
+@@ -1810,13 +1444,10 @@
  #
  # USB WLAN drivers
  #
@@ -479,7 +515,7 @@
  #
 --- a/sys/conf/files.i386
 +++ b/sys/conf/files.i386
-@@ -120,17 +120,9 @@
+@@ -121,17 +121,9 @@
  dev/atkbdc/atkbdc_isa.c		optional atkbdc isa
  dev/atkbdc/atkbdc_subr.c	optional atkbdc
  dev/atkbdc/psm.c		optional psm atkbdc
@@ -519,15 +555,15 @@
  	bfe \
  	bge \
  	${_bios} \
-@@ -53,7 +52,6 @@
- 	${_cbb} \
+@@ -54,7 +53,6 @@
+ 	cc \
  	cd9660 \
  	cd9660_iconv \
 -	${_ce} \
  	${_ciss} \
  	${_cm} \
  	${_cmx} \
-@@ -61,14 +59,11 @@
+@@ -62,14 +60,11 @@
  	coda5 \
  	${_coff} \
  	${_coretemp} \
@@ -539,10 +575,10 @@
  	${_cs} \
 -	${_ctau} \
 -	${_cxgb} \
+ 	cxgbe \
  	${_cyclic} \
  	dc \
- 	dcons \
-@@ -89,13 +84,11 @@
+@@ -92,13 +87,11 @@
  	${_ex} \
  	${_exca} \
  	${_ext2fs} \
@@ -556,7 +592,7 @@
  	gem \
  	geom \
  	${_glxsb} \
-@@ -135,14 +128,10 @@
+@@ -138,14 +131,10 @@
  	ip_mroute_mod \
  	${_ips} \
  	${_ipw} \
@@ -571,7 +607,7 @@
  	${_ixgb} \
  	${_ixgbe} \
  	jme \
-@@ -191,7 +180,6 @@
+@@ -196,7 +185,6 @@
  	msk \
  	mvs \
  	mwl \
@@ -579,7 +615,7 @@
  	mxge \
  	my \
  	${_ncp} \
-@@ -237,14 +225,12 @@
+@@ -242,14 +230,12 @@
  	${_pst} \
  	puc \
  	ral \
@@ -594,7 +630,7 @@
  	${_s3} \
  	${_safe} \
  	${_sbni} \
-@@ -253,7 +239,6 @@
+@@ -258,7 +244,6 @@
  	${_scsi_low} \
  	sdhci \
  	sem \
@@ -602,7 +638,7 @@
  	sge \
  	${_siba_bwn} \
  	siftr \
-@@ -261,7 +246,6 @@
+@@ -266,7 +251,6 @@
  	sis \
  	sk \
  	${_smbfs} \
@@ -610,7 +646,7 @@
  	${_snc} \
  	snp \
  	${_sound} \
-@@ -276,7 +260,6 @@
+@@ -281,7 +265,6 @@
  	${_sym} \
  	${_syscons} \
  	sysvipc \
@@ -618,15 +654,15 @@
  	tl \
  	${_tmpfs} \
  	${_tpm} \
-@@ -284,7 +267,6 @@
- 	${_twa} \
+@@ -290,7 +273,6 @@
  	twe \
+ 	tws \
  	tx \
 -	txp \
  	${_uart} \
  	ubsec \
  	udf \
-@@ -310,7 +292,6 @@
+@@ -317,7 +299,6 @@
  	wlan_wep \
  	wlan_xauth \
  	${_wpi} \
@@ -634,7 +670,7 @@
  	${_x86bios} \
  	${_xe} \
  	xfs \
-@@ -378,9 +359,7 @@
+@@ -385,9 +366,7 @@
  _bktr=		bktr
  _cardbus=	cardbus
  _cbb=		cbb
@@ -644,7 +680,7 @@
  _cpuctl=	cpuctl
  _cpufreq=	cpufreq
  _cs=		cs
-@@ -472,11 +451,8 @@
+@@ -479,11 +458,8 @@
  _ipmi=		ipmi
  _ips=		ips
  _ipw=		ipw
@@ -656,7 +692,7 @@
  _ixgb=		ixgb
  _ixgbe=		ixgbe
  _mly=		mly
-@@ -485,7 +461,6 @@
+@@ -492,7 +468,6 @@
  _nxge=		nxge
  _tpm=		tpm
  _wpi=		wpi
@@ -664,7 +700,7 @@
  .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
  _padlock=	padlock
  .endif
-@@ -544,11 +519,8 @@
+@@ -551,11 +526,8 @@
  _ipmi=		ipmi
  _ips=		ips
  _ipw=		ipw
@@ -676,7 +712,7 @@
  _ixgb=		ixgb
  _ixgbe=		ixgbe
  _lindev=	lindev
-@@ -583,7 +555,6 @@
+@@ -590,7 +562,6 @@
  _x86bios=	x86bios
  _wi=		wi
  _wpi=		wpi
@@ -704,9 +740,9 @@
  SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci}
 -SUBDIR += rum run uath upgt ural zyd ${_urtw}
 +SUBDIR += run uath upgt ural ${_urtw}
- SUBDIR += atp uhid ukbd ums udbp ufm
+ SUBDIR += atp uhid ukbd ums udbp ufm uep
  SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
- 	  umct umodem umoscom uplcom uslcom uvisor uvscom
+ 	  umct umcs umodem umoscom uplcom uslcom uvisor uvscom
 -SUBDIR += uether aue axe cdce cue kue rue udav uhso ipheth
 +SUBDIR += uether aue axe cdce cue rue udav uhso ipheth
  SUBDIR += usfs umass urio

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/patches/series	2011-12-03 18:44:55 UTC (rev 3916)
@@ -1,10 +1,6 @@
 000_coda.diff
 000_t_delta_warning.diff
-000_msk_backport.diff
 000_net80211_disclosure.diff
-000_uhid_nomatch.diff
-000_proc_swaps.diff
-000_unix_socket_overflow.diff
 000_teken_backport.diff
 000_syscons_backport.diff
 000_linker.diff 
@@ -12,7 +8,7 @@
 002_maxpathlen.diff
 003_glibc_dev_aicasm.diff
 004_xargs.diff
-007_clone_signals.diff
+#007_clone_signals.diff
 008_config.diff
 #009_disable_duped_modules.diff
 013_ip_packed.diff
@@ -39,6 +35,7 @@
 915_ip6.v6only.diff
 916_NKPT_amd64.diff
 917_track_alignment.diff
+917_disable_kgssapi.diff
 918_unix_socket_overflow.diff
 919_delete_key.diff
 950_no_stack_protector.diff

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2011-12-03 18:34:02 UTC (rev 3915)
+++ trunk/kfreebsd-8/debian/rules	2011-12-03 18:44:55 UTC (rev 3916)
@@ -19,7 +19,7 @@
 config_files	:= $(wildcard debian/arch/$(cpu)/*.config)
 flavours	:= $(config_files:debian/arch/$(cpu)/%.config=%)
 configfile	:= DEBCUSTOM
-abiname		:= 1
+abiname		:= 0
 ld_target	:= $(shell ld --help | sed -ne "s/[^ :]*: supported targets: \([^ ]*\) .*/\1/p")
 gcc_version	:= 4.4
 
@@ -29,9 +29,9 @@
 kfreebsd_cpu	:= $(cpu)
 endif
 
-SVN		:= http://svn.freebsd.org/base/release/$(version).0
+#SVN		:= http://svn.freebsd.org/base/release/$(version).0
 #SVN		:= http://svn.freebsd.org/base/releng/$(version)
-#SVN		:= http://svn.freebsd.org/base/stable/$(major)
+SVN		:= http://svn.freebsd.org/base/stable/$(major)
 SOURCE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-source-$(version)
 IMAGE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
 HEADERS_PACKAGE	:= $(CURDIR)/debian/kfreebsd-headers-$(version)-$(abiname)

More information about the Glibc-bsd-commits mailing list