Version bump adding patch for SA-06:11.

(Portage version: 2.1_pre7-r3)

6 files changed, 102 insertions, 18 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 77150b188ac3..ac65344fa195 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.4 2006/04/03 23:55:54 flameeyes Exp $
+
+*freebsd-sources-6.0-r2 (03 Apr 2006)
+
+  03 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/SA-06-11-ipsec.patch, +files/freebsd-sources-gentoo.patch,
+  -freebsd-sources-6.0-r1.ebuild, +freebsd-sources-6.0-r2.ebuild:
+  Version bump adding patch for SA-06:11.
 
   02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/SA-05-09-htt5.patch, -files/SA-05-13-ipfw.patch,
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 44da3fc5868f..b9c1dfb1193d 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a2c38273d236955deded87b1182601e9 ChangeLog 3807
 RMD160 e1ff22db7e5347ee9bc1c6668b1a9b61f3dd8bdf ChangeLog 3807
 SHA256 753bda6f9638234bbd24626921ed40360ab5bae28b9886fa707964f4c1be5070 ChangeLog 3807
@@ -16,25 +13,24 @@ SHA256 b936aa96fb99cc58ac63f66172f0e2c51e8c603551f47e17e09b1d574960500d files/SA
 MD5 525228df597306f1e2fb3b2981ed26ee files/SA-06-07-pf.patch 647
 RMD160 c605dcdfa97381edc7b5c16b8818c30deecabd4b files/SA-06-07-pf.patch 647
 SHA256 876dc53071bf2f743ae443eed42fa55a5d902a7c7902e1f1581dd20979be12c7 files/SA-06-07-pf.patch 647
-MD5 fdd5f9464a24e94d9c07afb96d280ec8 files/digest-freebsd-sources-6.0-r1 256
-RMD160 f0a1c1e21d535da51ee9e2839293c99a8b3fea3b files/digest-freebsd-sources-6.0-r1 256
-SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/digest-freebsd-sources-6.0-r1 256
+MD5 afbee903132dd6d6d400b6d1ede0146f files/SA-06-11-ipsec.patch 906
+RMD160 dbd41d9ce4d2f0b6d5c45f915c9780c2ee43391a files/SA-06-11-ipsec.patch 906
+SHA256 33ee98a658ac5abaa8b1d1dea7e53c0e8a47aa11d109c3279defe29c734728ad files/SA-06-11-ipsec.patch 906
+MD5 fdd5f9464a24e94d9c07afb96d280ec8 files/digest-freebsd-sources-6.0-r2 256
+RMD160 f0a1c1e21d535da51ee9e2839293c99a8b3fea3b files/digest-freebsd-sources-6.0-r2 256
+SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/digest-freebsd-sources-6.0-r2 256
 MD5 cc7f31d9d11f552a06379d58f076a154 files/freebsd-sources-6.0-flex-2.5.31.patch 826
 RMD160 a93341cfba5ddbd8df777273591ce21164f3ed41 files/freebsd-sources-6.0-flex-2.5.31.patch 826
 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 files/freebsd-sources-6.0-flex-2.5.31.patch 826
 MD5 c0b1372211b9f1eaa2d8a2715cb0b4b8 files/freebsd-sources-6.0-gentoover.patch 653
 RMD160 673b66cb91874a667546f9b39b973c6713f2832a files/freebsd-sources-6.0-gentoover.patch 653
 SHA256 16a6e168c993a64e4000bab47e3ba6c09e727198025422b3c89d52e88ceca76f files/freebsd-sources-6.0-gentoover.patch 653
-MD5 709a1169533fe0e8d03f590650bbb6de freebsd-sources-6.0-r1.ebuild 1649
-RMD160 d1490a3e0c9fd61664cf3a52e7e18df3468c017d freebsd-sources-6.0-r1.ebuild 1649
-SHA256 88e09d67c812cfd2138e6d1e2cc6716b81c74ff9679d9f78f18e68e54b8a6d6b freebsd-sources-6.0-r1.ebuild 1649
+MD5 4330b108279af439a1b22dbaabe7976f files/freebsd-sources-gentoo.patch 1750
+RMD160 220e9fc91fa2691889792d812ba64fea5e90b411 files/freebsd-sources-gentoo.patch 1750
+SHA256 cf488cd530f1e49c80296937939024eb7cca09666325f3232af186cf376119bb files/freebsd-sources-gentoo.patch 1750
+MD5 709a1169533fe0e8d03f590650bbb6de freebsd-sources-6.0-r2.ebuild 1649
+RMD160 d1490a3e0c9fd61664cf3a52e7e18df3468c017d freebsd-sources-6.0-r2.ebuild 1649
+SHA256 88e09d67c812cfd2138e6d1e2cc6716b81c74ff9679d9f78f18e68e54b8a6d6b freebsd-sources-6.0-r2.ebuild 1649
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEME+TAiZjviIA2XgRAnMPAJ99fnYxBafxiOcLpNAAxb8AFRur+gCg0fkv
-KqJoguSa2j6uEICBs/uZfEA=
-=/5Cy
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-11-ipsec.patch b/sys-freebsd/freebsd-sources/files/SA-06-11-ipsec.patch
new file mode 100644
index 000000000000..73dbb8f7b829
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/SA-06-11-ipsec.patch
@@ -0,0 +1,31 @@
+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/digest-freebsd-sources-6.0-r1 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r2
index 8ece252ae3b5..8ece252ae3b5 100644
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r1
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r2
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch
new file mode 100644
index 000000000000..b2ea95cb02ad
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch
@@ -0,0 +1,49 @@
+diff -ur sys/conf/kern.mk sys-gentoo/conf/kern.mk
+--- sys/conf/kern.mk	2005-03-16 18:54:36 +0000
++++ sys-gentoo/conf/kern.mk	2005-07-21 11:08:39 +0000
+@@ -12,7 +12,7 @@
+ .else
+ CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
+ 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
+-		-fformat-extensions -std=c99
++		-std=c99
+ .endif
+ #
+ # The following flags are next up for working on:
+@@ -28,7 +28,7 @@
+ # cache tag lines)
+ #
+ .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
+-CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2 \
++CFLAGS+=	-mpreferred-stack-boundary=2 \
+ 		-mno-mmx -mno-3dnow -mno-sse -mno-sse2
+ INLINE_LIMIT?=	8000
+ .endif
+Only in sys-gentoo/conf: kern.mk.orig
+diff -ur sys/conf/kern.pre.mk sys-gentoo/conf/kern.pre.mk
+--- sys/conf/kern.pre.mk	2005-03-16 17:51:56 +0000
++++ sys-gentoo/conf/kern.pre.mk	2005-07-21 11:08:20 +0000
+@@ -72,7 +72,8 @@
+ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
+ CFLAGS+= --param inline-unit-growth=100
+ CFLAGS+= --param large-function-growth=1000
+-WERROR?= -Werror
++# Gentoo's GCC outputs a few more warnings
++#WERROR?= -Werror
+ .endif
+ 
+ # XXX LOCORE means "don't declare C stuff" not "for locore.s".
+Only in sys-gentoo/conf: kern.pre.mk.orig
+diff -ur sys/dev/aic7xxx/aicasm/Makefile sys-gentoo/dev/aic7xxx/aicasm/Makefile
+--- sys/dev/aic7xxx/aicasm/Makefile	2005-02-13 07:23:32 +0000
++++ sys-gentoo/dev/aic7xxx/aicasm/Makefile	2005-07-21 11:08:20 +0000
+@@ -14,7 +14,7 @@
+ SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
+ CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
+ DPADD=	${LIBL}
+-LDADD=	-ll
++LDADD=	-lfl
+ 
+ # Correct path for kernel builds
+ # Don't rely on the kernel's .depend file
+Only in sys-gentoo/dev/aic7xxx/aicasm: Makefile.orig
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r2.ebuild
index 8dc1d3293267..9fbb5242cf3f 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r1.ebuild,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r2.ebuild,v 1.1 2006/04/03 23:55:54 flameeyes Exp $
 
 inherit bsdmk freebsd
 
@@ -33,6 +33,7 @@ src_unpack() {
 	epatch "${FILESDIR}/SA-06-05-80211.patch"
 	epatch "${FILESDIR}/SA-06-06-kmem60.patch"
 	epatch "${FILESDIR}/SA-06-07-pf.patch"
+	epatch "${FILESDIR}/SA-06-11-ipsec.patch"
 
 	sed -i -e "s:%GENTOOPVR%:${PVR}:" conf/newvers.sh
 }