Drop old versions and stray patches.

(Portage version: 2.1.1_pre3-r5)

Simon: "Am I talking to Miranda now?"  (River makes a face)  "No.  Right."

 (Signed Manifest commit)

9 files changed, 0 insertions, 327 deletions

diff --git a/sys-freebsd/freebsd-sources/files/SA-06-04-ipfw.patch b/sys-freebsd/freebsd-sources/files/SA-06-04-ipfw.patch
deleted file mode 100644
index e7a6a67973b4..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-04-ipfw.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sys/netinet/ip_fw2.c
-===================================================================
-RCS file: /home/ncvs/src/sys/netinet/ip_fw2.c,v
-retrieving revision 1.120
-diff -u -d -r1.120 ip_fw2.c
---- sys/netinet/ip_fw2.c	16 Dec 2005 13:10:32 -0000	1.120
-+++ sys/netinet/ip_fw2.c	1 Jan 2006 22:56:39 -0000
-@@ -3054,7 +3054,7 @@
- 				 * if the packet is not ICMP (or is an ICMP
- 				 * query), and it is not multicast/broadcast.
- 				 */
--				if (hlen > 0 && is_ipv4 &&
-+				if (hlen > 0 && is_ipv4 && offset == 0 &&
- 				    (proto != IPPROTO_ICMP ||
- 				     is_icmp_query(ICMP(ulp))) &&
- 				    !(m->m_flags & (M_BCAST|M_MCAST)) &&
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-05-80211.patch b/sys-freebsd/freebsd-sources/files/SA-06-05-80211.patch
deleted file mode 100644
index 7619e5a87838..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-05-80211.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: sys/net80211/ieee80211_ioctl.c
-===================================================================
-RCS file: /home/ncvs/src/sys/net80211/ieee80211_ioctl.c,v
-retrieving revision 1.41
-diff -u -p -I__FBSDID -r1.41 ieee80211_ioctl.c
---- sys/net80211/ieee80211_ioctl.c	14 Dec 2005 19:32:53 -0000	1.41
-+++ sys/net80211/ieee80211_ioctl.c	18 Jan 2006 04:39:48 -0000
-@@ -976,13 +976,25 @@ get_scan_result(struct ieee80211req_scan
- 	const struct ieee80211_node *ni)
- {
- 	struct ieee80211com *ic = ni->ni_ic;
-+	u_int ielen = 0;
- 
- 	memset(sr, 0, sizeof(*sr));
- 	sr->isr_ssid_len = ni->ni_esslen;
- 	if (ni->ni_wpa_ie != NULL)
--		sr->isr_ie_len += 2+ni->ni_wpa_ie[1];
-+		ielen += 2+ni->ni_wpa_ie[1];
- 	if (ni->ni_wme_ie != NULL)
--		sr->isr_ie_len += 2+ni->ni_wme_ie[1];
-+		ielen += 2+ni->ni_wme_ie[1];
-+
-+	/*
-+	 * The value sr->isr_ie_len is defined as a uint8_t, so we
-+	 * need to be careful to avoid an integer overflow.  If the
-+	 * value would overflow, we will set isr_ie_len to zero, and
-+	 * ieee80211_ioctl_getscanresults (below) will avoid copying
-+	 * the (overflowing) data.
-+	 */
-+	if (ielen > 255)
-+		ielen = 0;
-+	sr->isr_ie_len = ielen;
- 	sr->isr_len = sizeof(*sr) + sr->isr_ssid_len + sr->isr_ie_len;
- 	sr->isr_len = roundup(sr->isr_len, sizeof(u_int32_t));
- 	if (ni->ni_chan != IEEE80211_CHAN_ANYC) {
-@@ -1030,11 +1042,11 @@ ieee80211_ioctl_getscanresults(struct ie
- 		cp = (u_int8_t *)(sr+1);
- 		memcpy(cp, ni->ni_essid, ni->ni_esslen);
- 		cp += ni->ni_esslen;
--		if (ni->ni_wpa_ie != NULL) {
-+		if (sr->isr_ie_len > 0 && ni->ni_wpa_ie != NULL) {
- 			memcpy(cp, ni->ni_wpa_ie, 2+ni->ni_wpa_ie[1]);
- 			cp += 2+ni->ni_wpa_ie[1];
- 		}
--		if (ni->ni_wme_ie != NULL) {
-+		if (sr->isr_ie_len > 0 && ni->ni_wme_ie != NULL) {
- 			memcpy(cp, ni->ni_wme_ie, 2+ni->ni_wme_ie[1]);
- 			cp += 2+ni->ni_wme_ie[1];
- 		}
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-06-kmem60.patch b/sys-freebsd/freebsd-sources/files/SA-06-06-kmem60.patch
deleted file mode 100644
index 668ad3bd71ba..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-06-kmem60.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: sys/net/if_bridge.c
-===================================================================
-RCS file: /usr/ncvs/src/sys/net/if_bridge.c,v
-retrieving revision 1.11.2.12.2.3
-diff -u -r1.11.2.12.2.3 if_bridge.c
---- sys/net/if_bridge.c	27 Oct 2005 19:43:07 -0000	1.11.2.12.2.3
-+++ sys/net/if_bridge.c	22 Jan 2006 18:22:38 -0000
-@@ -583,6 +583,7 @@
- 			break;
- 		}
- 
-+		bzero(&args, sizeof args);
- 		if (bc->bc_flags & BC_F_COPYIN) {
- 			error = copyin(ifd->ifd_data, &args, ifd->ifd_len);
- 			if (error)
-@@ -914,6 +915,7 @@
- 
- 	count = 0;
- 	len = bifc->ifbic_len;
-+	bzero(&breq, sizeof breq);
- 	LIST_FOREACH(bif, &sc->sc_iflist, bif_next) {
- 		if (len < sizeof(breq))
- 			break;
-@@ -953,6 +955,7 @@
- 	getmicrotime(&tv);
- 
- 	len = bac->ifbac_len;
-+	bzero(&bareq, sizeof bareq);
- 	LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) {
- 		if (len < sizeof(bareq))
- 			goto out;
-Index: sys/net80211/ieee80211_ioctl.c
-===================================================================
-RCS file: /usr/ncvs/src/sys/net80211/ieee80211_ioctl.c,v
-retrieving revision 1.25.2.3.2.1
-diff -u -r1.25.2.3.2.1 ieee80211_ioctl.c
---- sys/net80211/ieee80211_ioctl.c	18 Jan 2006 09:03:36 -0000	1.25.2.3.2.1
-+++ sys/net80211/ieee80211_ioctl.c	22 Jan 2006 18:21:50 -0000
-@@ -884,7 +884,7 @@
- ieee80211_ioctl_getchanlist(struct ieee80211com *ic, struct ieee80211req *ireq)
- {
- 
--	if (sizeof(ic->ic_chan_active) > ireq->i_len)
-+	if (sizeof(ic->ic_chan_active) < ireq->i_len)
- 		ireq->i_len = sizeof(ic->ic_chan_active);
- 	return copyout(&ic->ic_chan_active, ireq->i_data, ireq->i_len);
- }
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-07-pf.patch b/sys-freebsd/freebsd-sources/files/SA-06-07-pf.patch
deleted file mode 100644
index d85aaed5d0c4..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-07-pf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sys/contrib/pf/net/pf_norm.c
-===================================================================
-RCS file: /home/ncvs/src/sys/contrib/pf/net/pf_norm.c,v
-retrieving revision 1.11.2.2
-diff -u -p -I__FBSDID -r1.11.2.2 pf_norm.c
---- sys/contrib/pf/net/pf_norm.c	17 Jan 2006 13:05:32 -0000	1.11.2.2
-+++ sys/contrib/pf/net/pf_norm.c	22 Jan 2006 16:38:31 -0000
-@@ -818,7 +818,7 @@ pf_fragcache(struct mbuf **m0, struct ip
- 			} else {
- 				hosed++;
- 			}
--		} else {
-+		} else if (frp == NULL) {
- 			/* There is a gap between fragments */
- 			DPFPRINTF(("fragcache[%d]: gap %d %d-%d (%d-%d)\n",
- 			    h->ip_id, -aftercut, off, max, fra->fr_off,
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-11-ipsec.patch b/sys-freebsd/freebsd-sources/files/SA-06-11-ipsec.patch
deleted file mode 100644
index 73dbb8f7b829..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-11-ipsec.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: sys/netipsec/xform_esp.c
-===================================================================
-RCS file: /usr/ncvs/src/sys/netipsec/xform_esp.c,v
-retrieving revision 1.11
-diff -u -r1.11 xform_esp.c
---- sys/netipsec/xform_esp.c	15 Mar 2006 21:11:11 -0000	1.11
-+++ sys/netipsec/xform_esp.c	19 Mar 2006 17:20:07 -0000
-@@ -555,6 +555,23 @@
- 	 */
- 	m->m_flags |= M_DECRYPTED;
- 
-+	/*
-+	 * Update replay sequence number, if appropriate.
-+	 */
-+	if (sav->replay) {
-+		u_int32_t seq;
-+
-+		m_copydata(m, skip + offsetof(struct newesp, esp_seq),
-+			   sizeof (seq), (caddr_t) &seq);
-+		if (ipsec_updatereplay(ntohl(seq), sav)) {
-+			DPRINTF(("%s: packet replay check for %s\n", __func__,
-+			    ipsec_logsastr(sav)));
-+			espstat.esps_replay++;
-+			error = ENOBUFS;
-+			goto bad;
-+		}
-+	}
-+
- 	/* Determine the ESP header length */
- 	if (sav->flags & SADB_X_EXT_OLD)
- 		hlen = sizeof (struct esp) + sav->ivlen;
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-14-fpu.patch b/sys-freebsd/freebsd-sources/files/SA-06-14-fpu.patch
deleted file mode 100644
index 1758f124d49f..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-06-14-fpu.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Index: sys/amd64/amd64/fpu.c
-===================================================================
-RCS file: /home/ncvs/src/sys/amd64/amd64/fpu.c,v
-retrieving revision 1.157
-diff -u -I__FBSDID -r1.157 fpu.c
---- sys/amd64/amd64/fpu.c	11 Mar 2005 22:16:09 -0000	1.157
-+++ sys/amd64/amd64/fpu.c	16 Apr 2006 20:18:07 -0000
-@@ -96,6 +96,8 @@
- 
- typedef u_char bool_t;
- 
-+static	void	fpu_clean_state(void);
-+
- int	hw_float = 1;
- SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
- 	CTLFLAG_RD, &hw_float, 0, 
-@@ -407,6 +409,8 @@
- 	PCPU_SET(fpcurthread, curthread);
- 	pcb = PCPU_GET(curpcb);
- 
-+	fpu_clean_state();
-+
- 	if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) {
- 		/*
- 		 * This is the first time this thread has used the FPU,
-@@ -474,6 +478,7 @@
- 
- 	s = intr_disable();
- 	if (td == PCPU_GET(fpcurthread)) {
-+		fpu_clean_state();
- 		fxrstor(addr);
- 		intr_restore(s);
- 	} else {
-@@ -484,6 +489,37 @@
- }
- 
- /*
-+ * On AuthenticAMD processors, the fxrstor instruction does not restore
-+ * the x87's stored last instruction pointer, last data pointer, and last
-+ * opcode values, except in the rare case in which the exception summary
-+ * (ES) bit in the x87 status word is set to 1.
-+ *
-+ * In order to avoid leaking this information across processes, we clean
-+ * these values by performing a dummy load before executing fxrstor().
-+ */
-+static	double	dummy_variable = 0.0;
-+static void
-+fpu_clean_state(void)
-+{
-+	u_short status;
-+
-+	/*
-+	 * Clear the ES bit in the x87 status word if it is currently
-+	 * set, in order to avoid causing a fault in the upcoming load.
-+	 */
-+	fnstsw(&status);
-+	if (status & 0x80)
-+		fnclex();
-+
-+	/*
-+	 * Load the dummy variable into the x87 stack.  This mangles
-+	 * the x87 stack, but we don't care since we're about to call
-+	 * fxrstor() anyway.
-+	 */
-+	__asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable));
-+}
-+
-+/*
-  * This really sucks.  We want the acpi version only, but it requires
-  * the isa_if.h file in order to get the definitions.
-  */
-Index: sys/i386/isa/npx.c
-===================================================================
-RCS file: /home/ncvs/src/sys/i386/isa/npx.c,v
-retrieving revision 1.164
-diff -u -I__FBSDID -r1.164 npx.c
---- sys/i386/isa/npx.c	6 Apr 2006 17:17:45 -0000	1.164
-+++ sys/i386/isa/npx.c	16 Apr 2006 20:18:08 -0000
-@@ -142,6 +142,10 @@
- 
- typedef u_char bool_t;
- 
-+#ifdef CPU_ENABLE_SSE
-+static	void	fpu_clean_state(void);
-+#endif
-+
- static	void	fpusave(union savefpu *);
- static	void	fpurstor(union savefpu *);
- static	int	npx_attach(device_t dev);
-@@ -952,15 +956,49 @@
- 		fnsave(addr);
- }
- 
-+#ifdef CPU_ENABLE_SSE
-+/*
-+ * On AuthenticAMD processors, the fxrstor instruction does not restore
-+ * the x87's stored last instruction pointer, last data pointer, and last
-+ * opcode values, except in the rare case in which the exception summary
-+ * (ES) bit in the x87 status word is set to 1.
-+ *
-+ * In order to avoid leaking this information across processes, we clean
-+ * these values by performing a dummy load before executing fxrstor().
-+ */
-+static	double	dummy_variable = 0.0;
-+static void
-+fpu_clean_state(void)
-+{
-+	u_short status;
-+
-+	/*
-+	 * Clear the ES bit in the x87 status word if it is currently
-+	 * set, in order to avoid causing a fault in the upcoming load.
-+	 */
-+	fnstsw(&status);
-+	if (status & 0x80)
-+		fnclex();
-+
-+	/*
-+	 * Load the dummy variable into the x87 stack.  This mangles
-+	 * the x87 stack, but we don't care since we're about to call
-+	 * fxrstor() anyway.
-+	 */
-+	__asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable));
-+}
-+#endif /* CPU_ENABLE_SSE */
-+
- static void
- fpurstor(addr)
- 	union savefpu *addr;
- {
- 
- #ifdef CPU_ENABLE_SSE
--	if (cpu_fxsr)
-+	if (cpu_fxsr) {
-+		fpu_clean_state();
- 		fxrstor(addr);
--	else
-+	} else
- #endif
- 		frstor(addr);
- }
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r1 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r1
deleted file mode 100644
index ed81a3f45c74..000000000000
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
-RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
-SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r2 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r2
deleted file mode 100644
index ed81a3f45c74..000000000000
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
-RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
-SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-gentoover.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-gentoover.patch
deleted file mode 100644
index 90e6e1c4732a..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-gentoover.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: fbsd-6.0/sys/conf/newvers.sh
-===================================================================
---- fbsd-6.0.orig/sys/conf/newvers.sh
-+++ fbsd-6.0/sys/conf/newvers.sh
-@@ -31,13 +31,13 @@
- # $FreeBSD: src/sys/conf/newvers.sh,v 1.69.2.8.2.1 2005/11/02 02:00:46 scottl Exp $
- 
- TYPE="FreeBSD"
--REVISION="6.0"
--BRANCH="RELEASE"
-+REVISION="%GENTOOPVR%"
-+BRANCH="Gentoo"
- if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
- 	BRANCH=${BRANCH_OVERRIDE}
- fi
- RELEASE=6.0-RELEASE
--VERSION="${TYPE} ${RELEASE}"
-+VERSION="${TYPE} ${BRANCH} ${REVISION}"
- 
- if [ "X${PARAMFILE}" != "X" ]; then
- 	RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \