diff options
Diffstat (limited to 'sys-freebsd/freebsd-sources/files')
| -rw-r--r-- | sys-freebsd/freebsd-sources/files/SA-06-11-ipsec.patch | 31 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r2 (renamed from sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r1) | 0 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch | 49 |
3 files changed, 80 insertions, 0 deletions
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 |