* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/
@ 2012-09-11 17:29 Alexis Ballier
0 siblings, 0 replies; 10+ messages in thread
From: Alexis Ballier @ 2012-09-11 17:29 UTC (permalink / raw
To: gentoo-commits
commit: c094d71d8779d9d10f6863dfe41be0106425ef6a
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 17:29:27 2012 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 17:29:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=c094d71d
remove freebsd-sources, merged to the main tree
---
sys-freebsd/freebsd-sources/Manifest | 34 -----
.../files/freebsd-sources-6.0-flex-2.5.31.patch | 22 ---
.../files/freebsd-sources-6.1-ntfs.patch | 32 -----
.../files/freebsd-sources-7.0-gentoo.patch | 35 -----
.../freebsd-sources-7.0-tmpfs_whiteout_stub.patch | 44 ------
.../files/freebsd-sources-7.0-werror.patch | 27 ----
.../files/freebsd-sources-7.1-asm.patch | 139 --------------------
.../files/freebsd-sources-7.1-binutils_link.patch | 37 -----
.../files/freebsd-sources-7.1-includes.patch | 13 --
.../freebsd-sources-7.1-subnet-route-pr40133.patch | 21 ---
.../files/freebsd-sources-7.1-types.h-fix.patch | 15 --
.../files/freebsd-sources-7.2-debug-O2.patch | 27 ----
.../files/freebsd-sources-7.2-devfs7.patch | 15 --
.../files/freebsd-sources-7.2-ipv6.patch | 25 ----
.../files/freebsd-sources-7.2-null.patch | 47 -------
.../files/freebsd-sources-7.2-pipe.patch | 18 ---
.../files/freebsd-sources-7.2-sparc64.patch | 11 --
.../files/freebsd-sources-7.2-zfs712.patch | 25 ----
.../freebsd-sources-8.0-arpresolve_panic.patch | 18 ---
.../files/freebsd-sources-8.0-gentoo.patch | 33 -----
.../files/freebsd-sources-8.0-mf626.patch | 24 ----
.../files/freebsd-sources-8.0-sparc64.patch | 11 --
.../freebsd-sources-8.0-subnet-route-pr40133.patch | 21 ---
.../files/freebsd-sources-8.0-werror.patch | 22 ---
.../files/freebsd-sources-8.0-zfs.patch | 23 ----
.../files/freebsd-sources-8.2-unix2.patch | 55 --------
.../freebsd-sources-9.0-disable-optimization.patch | 32 -----
...freebsd-sources-9.0-disable-optimizations.patch | 30 ----
.../files/freebsd-sources-9.0-gentoo.patch | 33 -----
.../files/freebsd-sources-9.0-ipv6refcount.patch | 128 ------------------
.../files/freebsd-sources-9.0-sysctluint.patch | 13 --
.../files/freebsd-sources-9.1-gentoo.patch | 33 -----
.../files/freebsd-sources-cve-2012-0217.patch | 26 ----
.../freebsd-sources/freebsd-sources-9.1_rc1.ebuild | 99 --------------
34 files changed, 0 insertions(+), 1188 deletions(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
deleted file mode 100644
index b29cf84..0000000
--- a/sys-freebsd/freebsd-sources/Manifest
+++ /dev/null
@@ -1,34 +0,0 @@
-AUX freebsd-sources-6.0-flex-2.5.31.patch 826 RMD160 a93341cfba5ddbd8df777273591ce21164f3ed41 SHA1 9f991b64b237a397e7aa0bad79a9a28c0de69339 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99
-AUX freebsd-sources-6.1-ntfs.patch 1043 RMD160 0389ef971934db5b239d81ec016d94a21398c226 SHA1 03d8c702bbd6bd79f7b3cbe64f720487b87fa442 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469
-AUX freebsd-sources-7.0-gentoo.patch 1346 RMD160 9182f84f08fa8edb68e505c1ec274c93678cab2c SHA1 277d7f7a6c24c37ec30d051b775ab6c3eea96996 SHA256 c5930673345572ab3466c862ecb2aefa410931e541cf58b1ca4464827bb1646e
-AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 RMD160 af12f7948ebb3704f6dd32ec624fe8160e855fea SHA1 7f6d466c631a1d83b19b8320b2131f3595808844 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44
-AUX freebsd-sources-7.0-werror.patch 948 RMD160 8862a2ee66980cc24a5950329e4983fe316d5f7e SHA1 fca026de5887cad2f29298858a1684434edaec34 SHA256 64d576efa55feefda2084ac2254f60318abf9c038db2f9f54df14278eff63d43
-AUX freebsd-sources-7.1-asm.patch 4185 RMD160 57c23aa1bc5624e49709ab7d2f47404b52a62d48 SHA1 13465c42d7efcd0aa4138bbef829b389c6819582 SHA256 62724ee4426419dd8057c2fd1a3b22f1dc04df0e64f4785907691a75be2138db
-AUX freebsd-sources-7.1-binutils_link.patch 1297 RMD160 f0cd329298d0f3d02ca98c56dae73b6570518f1a SHA1 e91a865c7e9874e8ecd244172c19703c9062d16a SHA256 957c03640f3aac6141efa3e775f33fcadd501f920612055d0e00b3f80fcd8f17
-AUX freebsd-sources-7.1-includes.patch 318 RMD160 d801a2abce4958ecf775a6246ba057716d31059c SHA1 4fd34230c452955dd5f8b6dc7b249e1d2a68bd2c SHA256 70c73d0939325185430a3a133380f0bc10674cb8fbe5c7ebfe3b07630d023369
-AUX freebsd-sources-7.1-subnet-route-pr40133.patch 546 RMD160 b6b1df97612860dbb8d281926f133348a0409f47 SHA1 fd1b1b8637cd49d5d2ae2a6448db66e87f1a2515 SHA256 e9ccfb24bb05122ec939f6ecbbee0447fe9281c3a7d80387402e058315435673
-AUX freebsd-sources-7.1-types.h-fix.patch 371 RMD160 d514196ccf1ba246a158b5f421f009d96d2dd8c4 SHA1 b04bec25903446c20bdfd144796fe9924f9ba39f SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473
-AUX freebsd-sources-7.2-debug-O2.patch 771 RMD160 9cebbeb3aa9a58c2fccb51baf2a9b3238db2bfce SHA1 5325bdebc7dc50ea615e5b019e1bf473c42630af SHA256 ad1fdd8a6dd53186793d70b65e1b37e3d3e7a4e50c32069aa535ae9f8e9aded8
-AUX freebsd-sources-7.2-devfs7.patch 414 RMD160 e09e7ad20e3faec887b7a2af5f243bbc77637572 SHA1 4ea557bcf544ca52a057a6f8d5679a428a70265f SHA256 9144a5052d09ce2bf3a33ad09e27351dc115c98b055a9b7b735dcdc372632071
-AUX freebsd-sources-7.2-ipv6.patch 858 RMD160 fae14bbcd3d5c2c6ff76f845cd34a50c6a32e640 SHA1 fa8b9f415d943d1bd1d6c9d672262d8a368ffba5 SHA256 909842ecf21d7a369b0f9445082142920c9021d978ad33858a92a23d33478151
-AUX freebsd-sources-7.2-null.patch 1529 RMD160 b498b8ebdae7f59c35dc33552c601ba5e9793433 SHA1 0221e1be7d26039067e3a1b75eabdd16e3c99f9a SHA256 e617f280e8f957d6b0e1a09380ed7fc8370418b6b581fb2d49e09b1101f7c6c4
-AUX freebsd-sources-7.2-pipe.patch 771 RMD160 093b002265a7fa086c92972c1a99db6cf5f81d71 SHA1 03e8d28acd80ac4ffa47e8492f14b50124de5dfb SHA256 7f8b87ef0d7ba883627823709746cc02fb8590d4a81d1b2dd76803b40aa9190b
-AUX freebsd-sources-7.2-sparc64.patch 446 RMD160 70e36ed7ab84e743ceae47135e400b4c42085f58 SHA1 9983471737dba92625941dad5b250b1dda4d26bb SHA256 cc6d10c593c4f0122f9b9f55b80981bfd4fcd009e69606119d2eea62d94afa69
-AUX freebsd-sources-7.2-zfs712.patch 883 RMD160 eacf62347e9c53b5a0ecdaa7f4ab809e7e366835 SHA1 057c4d3f3c7f462e8c510719bad53ecb60d96dbf SHA256 8d69f079942092aa270f3d499aa90aa24af2138797b41cf69eafe770f002b367
-AUX freebsd-sources-8.0-arpresolve_panic.patch 603 RMD160 499dbcd6250dc0d8254fc8f4af0c13b0af4bbc8e SHA1 1323275f27981106c040fa1f03c7ffc6b8de6307 SHA256 b33eb882b28267cf0826de9430de29c31bacbc0183264dee4c567019a9537fc1
-AUX freebsd-sources-8.0-gentoo.patch 1138 RMD160 6aef808adec3fb9aa309a80a5dba800216f27372 SHA1 88ab1cd4c5ed69e8957c669e5648ea34b01bbd9b SHA256 0bb6e4cb59bb6f5fd86c88bfd36ce8c9d148d96e8722f1d6a485f98ba892650c
-AUX freebsd-sources-8.0-mf626.patch 885 RMD160 e2f8bd353b0019a56171477fb8f0b7d1d16b878a SHA1 83452175e37bda1bf2058fa12fa2b22acd75461b SHA256 23a77733b3ec15ce87519d9e7d087809bba69763676ad1ac409561a318de8da3
-AUX freebsd-sources-8.0-sparc64.patch 450 RMD160 d712559b603cd8d92f9c4e21eb3696cc9b273400 SHA1 f675ed357a913c0d5087b054ab0000274e00237c SHA256 77f5f26d6ef3502289a334bf3975b0b570ea9a8993050fcd889ef4102d3428fd
-AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 RMD160 51be284cf04c41d0ff89148582d98c2e130abc27 SHA1 9ee460dd7b27b2afef2bf8eb68c4bd395e85f66d SHA256 091764c97f4148d2245c24dcfabebd53ef0b4f3175a140fd5b1132788e718ca1
-AUX freebsd-sources-8.0-werror.patch 718 RMD160 a216ab16df0e4ce896cfe1cfa7ccc4a4376151e7 SHA1 449b058d0b2672436973575e326b3f7c5a90820d SHA256 a8675081639004d576be3c9f2cdb11d586290dc65db4fc9b0ec4da5fe57392bd
-AUX freebsd-sources-8.0-zfs.patch 926 RMD160 be94ae9270060e3892071695e0abcf95d420a59f SHA1 bb2c34cbd9fa6f510e1b19c213f720b213373244 SHA256 d9cf38d074ac26b04f8a36abc4c2a6c8fca52bc16d1cbcd1f87c8c233a0a64f5
-AUX freebsd-sources-8.2-unix2.patch 1642 RMD160 0ddbf08159fe3d99fde9d07ac624a07a53cad81b SHA1 a86aade71970678609d1966dc229ec519c71e3e6 SHA256 6dd35d13a13f5e9333557a84b56c89fc4988d55bc3267cca72e8ca8ca169ce61
-AUX freebsd-sources-9.0-disable-optimization.patch 927 RMD160 77f8b87f57d4cd3df163fc971567afc4374ca078 SHA1 ae2ac9608ff808c5e1ee52c9294aa66ae0d15ccc SHA256 e8ad8d8ed1f729b7b22839a7af93b3dd667f257b05db95f408c48b270003a486
-AUX freebsd-sources-9.0-disable-optimizations.patch 792 RMD160 4cd19f9cb5c119eabb3700da25d1f25fd1fc2750 SHA1 3a799bec3310d928cb11c45873faec002d88a732 SHA256 4d04d158c118ec218eae51db8e522efa16467b554df8d1e8f1a882617d36a555
-AUX freebsd-sources-9.0-gentoo.patch 1194 RMD160 1933e7ca85b65d8f81622c01d1b3374fa9072319 SHA1 30992a38173c1732ec1f05fe6c19ac961717917c SHA256 251178d014e62fbc3f20c26dd0e78401cc6691a848facd3ff2c7418ed7a43f22
-AUX freebsd-sources-9.0-ipv6refcount.patch 3259 RMD160 e9f53cf11931e900ab881748f9fb617a4ecfc0f2 SHA1 5ad1a4a47099772d2655244443fd4d2dbdad06e2 SHA256 18186ef2f9fc020c0da053953b9e8c8629c2302082e0ee172dd7e84a7104bdd5
-AUX freebsd-sources-9.0-sysctluint.patch 403 RMD160 46bb18c424ea7011db86341e427fd095495c4bcc SHA1 9d3c1606c886d96a88c89283bc18a2717c87fc76 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e
-AUX freebsd-sources-9.1-gentoo.patch 1177 RMD160 ce55a71414efb8580f15a3c73f48d8ff8c37875c SHA1 19387e59447c5b2e675aaa24a79187eb7dc8580b SHA256 6aa1e9a7a22cc56bc4bc3f310b9b2cca9e4674d466c74432b896c8519a895097
-AUX freebsd-sources-cve-2012-0217.patch 856 RMD160 38cd459f900671f0f39df40353da6a0a1894b4b8 SHA1 3f96d861602f6b0442b2a412cd6b18437a3cfa55 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe
-DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
-EBUILD freebsd-sources-9.1_rc1.ebuild 3234 RMD160 523cfadcbb390552f5b8c4e73966e339a6931eb2 SHA1 f9d819852baf6caedec516603a477cf075f14031 SHA256 e6ac738255c3daf56ae3c086fff7e8ee5f1962ac31772dd58e88aef395b7310c
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch
deleted file mode 100644
index 88710cf..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-===================================================================
---- fbsd-6.orig/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-+++ fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-@@ -528,7 +528,7 @@ expand_macro(struct symbol *macro_symbol
-
- /* Put back everything up until the replacement. */
- while (body_pos > next_match)
-- unput(*--body_pos);
-+ yyunput(*--body_pos, body_head);
-
- /* Perform the replacement. */
- if (match_marg != NULL) {
-@@ -537,7 +537,7 @@ expand_macro(struct symbol *macro_symbol
- next_match = match_marg->replacement_text;
- strp = next_match + strlen(next_match);
- while (strp > next_match)
-- unput(*--strp);
-+ yyunput(*--strp, next_match);
-
- /* Skip past the unexpanded macro arg. */
- body_pos -= match.rm_eo - match.rm_so;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
deleted file mode 100644
index e74fcd3..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- sys/fs/ntfs/ntfs_vnops.c.orig 2006-10-17 17:31:36 -0300
-+++ sys/fs/ntfs/ntfs_vnops.c 2006-10-17 17:30:24 -0300
-@@ -507,8 +507,12 @@
-
- /* Simulate . in every dir except ROOT */
- if( ip->i_number != NTFS_ROOTINO ) {
-- struct dirent dot = { NTFS_ROOTINO,
-- sizeof(struct dirent), DT_DIR, 1, "." };
-+ struct dirent dot;
-+ dot.d_fileno = NTFS_ROOTINO;
-+ dot.d_reclen = sizeof(struct dirent);
-+ dot.d_type = DT_DIR;
-+ dot.d_namlen = 1;
-+ bcopy(".", dot.d_name, 1);
-
- if( uio->uio_offset < sizeof(struct dirent) ) {
- dot.d_fileno = ip->i_number;
-@@ -522,8 +526,12 @@
-
- /* Simulate .. in every dir including ROOT */
- if( uio->uio_offset < 2 * sizeof(struct dirent) ) {
-- struct dirent dotdot = { NTFS_ROOTINO,
-- sizeof(struct dirent), DT_DIR, 2, ".." };
-+ struct dirent dotdot;
-+ dotdot.d_fileno = NTFS_ROOTINO;
-+ dotdot.d_reclen = sizeof(struct dirent);
-+ dotdot.d_type = DT_DIR;
-+ dotdot.d_namlen = 2;
-+ bcopy("..", dotdot.d_name, 2);
-
- error = uiomove((char *)&dotdot,sizeof(struct dirent),uio);
- if(error)
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-gentoo.patch
deleted file mode 100644
index 7da5197..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-gentoo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur ../src.orig/sys/conf/kern.mk ./sys/conf/kern.mk
---- ../src.orig/sys/conf/kern.mk 2007-05-24 23:53:42.000000000 +0200
-+++ ./sys/conf/kern.mk 2008-03-14 14:37:47.216420518 +0100
-@@ -12,7 +12,7 @@
- .else
- CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-- ${_wundef} ${_Wno_pointer_sign} -fformat-extensions
-+ ${_wundef} ${_Wno_pointer_sign}
- .if !defined(WITH_GCC3)
- _Wno_pointer_sign=-Wno-pointer-sign
- .endif
-@@ -36,7 +36,7 @@
- # reserved for user applications.
- #
- .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 -mno-sse3
- INLINE_LIMIT?= 8000
- .endif
-Only in ./sys/conf: kern.mk.rej
-Only in ./sys/conf: kern.mk~
-diff -ur ../src.orig/sys/dev/aic7xxx/aicasm/Makefile ./sys/dev/aic7xxx/aicasm/Makefile
---- ../src.orig/sys/dev/aic7xxx/aicasm/Makefile 2005-11-21 15:41:10.000000000 +0100
-+++ ./sys/dev/aic7xxx/aicasm/Makefile 2008-03-14 14:36:35.859698365 +0100
-@@ -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
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch
deleted file mode 100644
index 13524ef..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur sys/fs/tmpfs.orig/tmpfs_vnops.c sys/fs/tmpfs/tmpfs_vnops.c
---- sys/fs/tmpfs.orig/tmpfs_vnops.c 2008-06-22 12:17:48 -0300
-+++ sys/fs/tmpfs/tmpfs_vnops.c 2008-06-28 12:05:10 -0300
-@@ -1459,6 +1459,30 @@
- return (0);
- }
-
-+
-+/* --------------------------------------------------------------------- */
-+/* This does absolutely nothing */
-+#ifdef GENTOO_LIVECD
-+static int
-+tmpfs_whiteout(struct vop_whiteout_args *ap)
-+{
-+ switch (ap->a_flags) {
-+ case LOOKUP:
-+ return (0);
-+ break;
-+ case CREATE:
-+ return(EOPNOTSUPP);
-+ break;
-+ case DELETE:
-+ return (0);
-+ break;
-+ default:
-+ return(EOPNOTSUPP);
-+ }
-+ return(0);
-+}
-+#endif
-+
- /* --------------------------------------------------------------------- */
-
- /*
-@@ -1484,6 +1508,9 @@
- .vop_mkdir = tmpfs_mkdir,
- .vop_rmdir = tmpfs_rmdir,
- .vop_symlink = tmpfs_symlink,
-+#ifdef GENTOO_LIVECD
-+ .vop_whiteout = tmpfs_whiteout,
-+#endif
- .vop_readdir = tmpfs_readdir,
- .vop_readlink = tmpfs_readlink,
- .vop_inactive = tmpfs_inactive,
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-werror.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-werror.patch
deleted file mode 100644
index 3a2be63..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-werror.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur ../src.orig/sys/conf/kern.pre.mk ./sys/conf/kern.pre.mk
---- ../src.orig/sys/conf/kern.pre.mk 2007-08-08 21:12:06.000000000 +0200
-+++ ./sys/conf/kern.pre.mk 2008-03-14 14:10:03.183569137 +0100
-@@ -90,7 +90,7 @@
- .if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || \
- ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "powerpc" || \
- ${MACHINE_ARCH} == "sparc64"
--WERROR?= -Werror
-+WERROR?= -Wno-error
- .endif
- .endif
-
-Only in ./sys/conf: kern.pre.mk.rej
-Only in ./sys/conf: kern.pre.mk~
-diff -ur ../src.orig/sys/conf/kmod.mk ./sys/conf/kmod.mk
---- ../src.orig/sys/conf/kmod.mk 2007-07-11 03:20:37.000000000 +0200
-+++ ./sys/conf/kmod.mk 2008-03-14 14:11:21.856366378 +0100
-@@ -79,7 +79,6 @@
- . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
- CFLAGS+= -fno-strict-aliasing
- . endif
--#WERROR?= -Werror
- .endif
- CFLAGS+= ${WERROR}
- CFLAGS+= -D_KERNEL
-Only in ./sys/conf: kmod.mk.rej
-Only in ./sys/conf: kmod.mk~
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-asm.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-asm.patch
deleted file mode 100644
index c0f5d78..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-asm.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -ur ../src.orig/sys/compat/ndis/winx32_wrap.S ./sys/compat/ndis/winx32_wrap.S
---- ../src.orig/sys/compat/ndis/winx32_wrap.S 2006-06-12 22:35:59.000000000 +0200
-+++ ./sys/compat/ndis/winx32_wrap.S 2008-03-14 14:00:41.949886084 +0100
-@@ -369,7 +369,7 @@
- ret
-
- ENTRY(x86_setfs)
-- movl 4(%esp),%fs
-+ movw 4(%esp),%fs
- ret
-
- ENTRY(x86_gettid)
-diff -ur ../src.orig/sys/i386/i386/locore.s ./sys/i386/i386/locore.s
---- ../src.orig/sys/i386/i386/locore.s 2007-03-24 20:53:22.000000000 +0100
-+++ ./sys/i386/i386/locore.s 2008-03-14 14:00:41.946886262 +0100
-@@ -358,7 +358,7 @@
- pushl %eax
- testl $PSL_VM,UC_EFLAGS(%eax)
- jne 1f
-- movl UC_GS(%eax),%gs /* restore %gs */
-+ movw UC_GS(%eax),%gs /* restore %gs */
- 1:
- movl $SYS_sigreturn,%eax
- pushl %eax /* junk to fake return addr. */
-@@ -375,7 +375,7 @@
- pushl %eax
- testl $PSL_VM,UC4_EFLAGS(%eax)
- jne 1f
-- movl UC4_GS(%eax),%gs /* restore %gs */
-+ movw UC4_GS(%eax),%gs /* restore %gs */
- 1:
- movl $344,%eax /* 4.x SYS_sigreturn */
- pushl %eax /* junk to fake return addr. */
-@@ -393,7 +393,7 @@
- pushl %eax
- testl $PSL_VM,SC_PS(%eax)
- jne 9f
-- movl SC_GS(%eax),%gs /* restore %gs */
-+ movw SC_GS(%eax),%gs /* restore %gs */
- 9:
- movl $103,%eax /* 3.x SYS_sigreturn */
- pushl %eax /* junk to fake return addr. */
-diff -ur ../src.orig/sys/i386/i386/swtch.s ./sys/i386/i386/swtch.s
---- ../src.orig/sys/i386/i386/swtch.s 2007-08-22 07:06:14.000000000 +0200
-+++ ./sys/i386/i386/swtch.s 2008-03-14 14:00:41.948886237 +0100
-@@ -130,7 +130,7 @@
- movl %ebp,PCB_EBP(%edx)
- movl %esi,PCB_ESI(%edx)
- movl %edi,PCB_EDI(%edx)
-- movl %gs,PCB_GS(%edx)
-+ movw %gs,PCB_GS(%edx)
- pushfl /* PSL */
- popl PCB_PSL(%edx)
- /* Test if debug registers should be saved. */
-@@ -301,7 +301,7 @@
- /* This must be done after loading the user LDT. */
- .globl cpu_switch_load_gs
- cpu_switch_load_gs:
-- movl PCB_GS(%edx),%gs
-+ movw PCB_GS(%edx),%gs
-
- /* Test if debug registers should be restored. */
- testl $PCB_DBREGS,PCB_FLAGS(%edx)
-@@ -371,7 +371,7 @@
- movl %ebp,PCB_EBP(%ecx)
- movl %esi,PCB_ESI(%ecx)
- movl %edi,PCB_EDI(%ecx)
-- movl %gs,PCB_GS(%ecx)
-+ movw %gs,PCB_GS(%ecx)
- pushfl
- popl PCB_PSL(%ecx)
-
-diff -ur ../src.orig/sys/i386/include/cpufunc.h ./sys/i386/include/cpufunc.h
---- ../src.orig/sys/i386/include/cpufunc.h 2007-08-09 22:14:35.000000000 +0200
-+++ ./sys/i386/include/cpufunc.h 2008-03-14 14:03:09.264377451 +0100
-@@ -452,7 +452,7 @@
- rfs(void)
- {
- u_int sel;
-- __asm __volatile("movl %%fs,%0" : "=rm" (sel));
-+ __asm __volatile("movw %%fs,%0" : "=rm" (sel));
- return (sel);
- }
-
-@@ -468,7 +468,7 @@
- rgs(void)
- {
- u_int sel;
-- __asm __volatile("movl %%gs,%0" : "=rm" (sel));
-+ __asm __volatile("movw %%gs,%0" : "=rm" (sel));
- return (sel);
- }
-
-@@ -492,7 +492,7 @@
- rss(void)
- {
- u_int sel;
-- __asm __volatile("movl %%ss,%0" : "=rm" (sel));
-+ __asm __volatile("movw %%ss,%0" : "=rm" (sel));
- return (sel);
- }
-
-@@ -507,13 +507,13 @@
- static __inline void
- load_fs(u_int sel)
- {
-- __asm __volatile("movl %0,%%fs" : : "rm" (sel));
-+ __asm __volatile("movw %0,%%fs" : : "rm" (sel));
- }
-
- static __inline void
- load_gs(u_int sel)
- {
-- __asm __volatile("movl %0,%%gs" : : "rm" (sel));
-+ __asm __volatile("movw %0,%%gs" : : "rm" (sel));
- }
-
- static __inline void
-diff -ur ../src.orig/sys/i386/linux/linux_locore.s ./sys/i386/linux/linux_locore.s
---- ../src.orig/sys/i386/linux/linux_locore.s 2001-02-25 07:29:01.000000000 +0100
-+++ ./sys/i386/linux/linux_locore.s 2008-03-14 14:00:41.949886084 +0100
-@@ -8,7 +8,7 @@
- NON_GPROF_ENTRY(linux_sigcode)
- call *LINUX_SIGF_HANDLER(%esp)
- leal LINUX_SIGF_SC(%esp),%ebx /* linux scp */
-- movl LINUX_SC_GS(%ebx),%gs
-+ movw LINUX_SC_GS(%ebx),%gs
- movl %esp, %ebx /* pass sigframe */
- push %eax /* fake ret addr */
- movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */
-@@ -20,7 +20,7 @@
- call *LINUX_RT_SIGF_HANDLER(%esp)
- leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */
- leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */
-- movl LINUX_SC_GS(%ecx),%gs
-+ movw LINUX_SC_GS(%ecx),%gs
- push %eax /* fake ret addr */
- movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */
- int $0x80 /* enter kernel with args */
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
deleted file mode 100644
index 43d01ba..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ruN sys.orig/conf/kern.post.mk sys/conf/kern.post.mk
---- sys.orig/conf/kern.post.mk 2007-03-23 18:55:59 -0300
-+++ sys/conf/kern.post.mk 2008-06-18 19:51:13 -0300
-@@ -85,7 +85,9 @@
- ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
- @rm -f ${.TARGET}
- @echo linking ${.TARGET}
-- ${SYSTEM_LD}
-+ ${SYSTEM_LD} -o ${.TARGET}.tmp
-+ @sh $S/tools/gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt
-+ ${SYSTEM_LD} "@${.TARGET}.lopt"
- .if defined(CTFMERGE)
- ${SYSTEM_CTFMERGE}
- .endif
-diff -ruN sys.orig/conf/kmod.mk sys/conf/kmod.mk
---- sys.orig/conf/kmod.mk 2008-06-18 09:11:53 -0300
-+++ sys/conf/kmod.mk 2008-06-18 19:50:01 -0300
-@@ -176,7 +176,8 @@
-
- .if ${MACHINE_ARCH} != amd64
- ${FULLPROG}: ${KMOD}.kld
-- ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
-+ sh ./@/tools/gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
-+ ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
- .if !defined(DEBUG_FLAGS)
- ${OBJCOPY} --strip-debug ${.TARGET}
- .endif
-diff -ruN sys.orig/tools/gen-ld-u-options sys/tools/gen-ld-u-options
---- sys.orig/tools/gen-ld-u-options 1969-12-31 21:00:00 -0300
-+++ sys/tools/gen-ld-u-options 2008-06-18 19:47:56 -0300
-@@ -0,0 +1,6 @@
-+#!/bin/sh
-+
-+for i in `objdump -h -w $1 | grep set_ | cut -c5- | cut -f1 -d " "`
-+do
-+ echo -n " -u __start_$i -u __stop_$i "
-+done
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch
deleted file mode 100644
index 3db46fa..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Make headers usable alone, include the headers they need.
-There are probably much more missing.
-
---- sys/net/if.h.old 2009-05-15 10:51:50 +0000
-+++ sys/net/if.h 2009-05-15 10:52:05 +0000
-@@ -34,6 +34,7 @@
- #define _NET_IF_H_
-
- #include <sys/cdefs.h>
-+#include <sys/socket.h>
-
- #ifdef _KERNEL
- #include <sys/queue.h>
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-subnet-route-pr40133.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-subnet-route-pr40133.patch
deleted file mode 100644
index 1184280..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-subnet-route-pr40133.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fixes changing the default subnet route after removing an ip address.
-
-See: http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40133
-and http://mail-index.netbsd.org/tech-net/2008/12/03/msg000896.html
-
-Thanks to Roy Marples.
---- sys/netinet/in.c.orig
-+++ sys/netinet/in.c
-@@ -858,6 +858,12 @@
- error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags);
- if (!error)
- target->ia_flags |= IFA_ROUTE;
-+ else if (error == EEXIST) {
-+ /*
-+ * the fact that the route already exists is not an error.
-+ */
-+ error = 0;
-+ }
- return error;
- }
-
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch
deleted file mode 100644
index 8de5df2..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes a compile error if XOPEN_SOURCE 600 is defined.
-
-See: http://www.mailinglistarchive.com/freebsd-current@freebsd.org/msg15011.html
-
---- sys/sys/types.h.orig
-+++ sys/sys/types.h
-@@ -46,7 +46,7 @@
-
- #include <sys/_pthreadtypes.h>
-
--#if __BSD_VISIBLE
-+#ifndef _POSIX_SOURCE
- typedef unsigned char u_char;
- typedef unsigned short u_short;
- typedef unsigned int u_int;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
deleted file mode 100644
index 4fa3565..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-My UltraSPARC U5 panics on boot about a memory alignment error when compiled
-with gcc4 and -O. Compiling with -O2 fixes this, and it should not adversly
-affect debugging.
-
-NOTE: This does not fix the memory alignment panic when loading kernel modules.
-
-Roy Marples (uberlord@gentoo.org)
-
---- sys/conf/kern.pre.mk.old 2009-05-22 10:09:46 +0000
-+++ sys/conf/kern.pre.mk 2009-05-22 10:10:27 +0000
-@@ -22,15 +22,13 @@
- COPTFLAGS?= -O
- .else
- . if defined(DEBUG)
--_MINUS_O= -O
- CTFFLAGS+= -g
- . else
--_MINUS_O= -O2
- . endif
- . if ${MACHINE_ARCH} == "amd64"
- COPTFLAGS?=-O2 -frename-registers -pipe
- . else
--COPTFLAGS?=${_MINUS_O} -pipe
-+COPTFLAGS?=-O2 -pipe
- . endif
- . if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
- COPTFLAGS+= -fno-strict-aliasing
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch
deleted file mode 100644
index e1fcefb..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-SA-09:14.devfs.asc
-
-Index: sys/fs/devfs/devfs_vnops.c
-===================================================================
---- sys/fs/devfs/devfs_vnops.c (revision 192300)
-+++ sys/fs/devfs/devfs_vnops.c (revision 192301)
-@@ -890,6 +890,7 @@
- if (fp != NULL) {
- FILE_LOCK(fp);
- fp->f_data = dev;
-+ fp->f_vnode = vp;
- FILE_UNLOCK(fp);
- }
- fpop = td->td_fpop;
-
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch
deleted file mode 100644
index de8e0ac..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-SA-09:10.ipv6.asc
-
-Index: sys/netinet6/in6.c
-===================================================================
-RCS file: /home/ncvs/src/sys/netinet6/in6.c,v
-retrieving revision 1.109
-diff -p -u -I__FBSDID -I$FreeBSD -u -r1.109 in6.c
---- sys/netinet6/in6.c 27 May 2009 14:11:23 -0000 1.109
-+++ sys/netinet6/in6.c 8 Jun 2009 18:02:59 -0000
-@@ -215,6 +215,7 @@ in6_control(struct socket *so, u_long cm
- case SIOCSRTRFLUSH_IN6:
- case SIOCSDEFIFACE_IN6:
- case SIOCSIFINFO_FLAGS:
-+ case SIOCSIFINFO_IN6:
- if (td != NULL) {
- error = priv_check(td, PRIV_NETINET_ND6);
- if (error)
-@@ -223,7 +224,6 @@ in6_control(struct socket *so, u_long cm
- /* FALLTHROUGH */
- case OSIOCGIFINFO_IN6:
- case SIOCGIFINFO_IN6:
-- case SIOCSIFINFO_IN6:
- case SIOCGDRLST_IN6:
- case SIOCGPRLST_IN6:
- case SIOCGNBRINFO_IN6:
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch
deleted file mode 100644
index 16e5023..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-EN-09:05.null.asc
-
-Index: sys/kern/kern_exec.c
-===================================================================
---- sys/kern/kern_exec.c (revision 197682)
-+++ sys/kern/kern_exec.c (working copy)
-@@ -122,6 +122,11 @@
- SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW,
- &ps_arg_cache_limit, 0, "");
-
-+static int map_at_zero = 1;
-+TUNABLE_INT("security.bsd.map_at_zero", &map_at_zero);
-+SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RW, &map_at_zero, 0,
-+ "Permit processes to map an object at virtual address 0.");
-+
- static int
- sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS)
- {
-@@ -939,7 +944,7 @@
- int error;
- struct proc *p = imgp->proc;
- struct vmspace *vmspace = p->p_vmspace;
-- vm_offset_t stack_addr;
-+ vm_offset_t sv_minuser, stack_addr;
- vm_map_t map;
- u_long ssiz;
-
-@@ -955,13 +960,17 @@
- * not disrupted
- */
- map = &vmspace->vm_map;
-- if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv->sv_minuser &&
-+ if (map_at_zero)
-+ sv_minuser = sv->sv_minuser;
-+ else
-+ sv_minuser = MAX(sv->sv_minuser, PAGE_SIZE);
-+ if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv_minuser &&
- vm_map_max(map) == sv->sv_maxuser) {
- shmexit(vmspace);
- pmap_remove_pages(vmspace_pmap(vmspace));
- vm_map_remove(map, vm_map_min(map), vm_map_max(map));
- } else {
-- error = vmspace_exec(p, sv->sv_minuser, sv->sv_maxuser);
-+ error = vmspace_exec(p, sv_minuser, sv->sv_maxuser);
- if (error)
- return (error);
- vmspace = p->p_vmspace;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch
deleted file mode 100644
index 4b7db02..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-SA-09:09.pipe.asc
-
-Index: sys/kern/sys_pipe.c
-===================================================================
-RCS file: /home/ncvs/src/sys/kern/sys_pipe.c,v
-retrieving revision 1.201
-diff -p -u -I__FBSDID -I$FreeBSD -r1.201 sys_pipe.c
---- sys/kern/sys_pipe.c 10 Mar 2009 21:28:43 -0000 1.201
-+++ sys/kern/sys_pipe.c 5 Jun 2009 07:53:01 -0000
-@@ -761,6 +761,8 @@ pipe_build_write_buffer(wpipe, uio)
- pmap = vmspace_pmap(curproc->p_vmspace);
- endaddr = round_page((vm_offset_t)uio->uio_iov->iov_base + size);
- addr = trunc_page((vm_offset_t)uio->uio_iov->iov_base);
-+ if (endaddr < addr)
-+ return (EFAULT);
- for (i = 0; addr < endaddr; addr += PAGE_SIZE, i++) {
- /*
- * vm_fault_quick() can sleep. Consequently,
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch
deleted file mode 100644
index b179fd6..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sys/conf/ldscript.sparc64.old 2009-05-17 11:04:47 +0000
-+++ sys/conf/ldscript.sparc64 2009-05-17 11:05:41 +0000
-@@ -1,6 +1,6 @@
- /* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4.30.1 2009/04/15 03:14:26 kensmith Exp $ */
--OUTPUT_FORMAT("elf64-sparc", "elf64-sparc",
-- "elf64-sparc")
-+OUTPUT_FORMAT("elf64-sparc-freebsd", "elf64-sparc-freebsd",
-+ "elf64-sparc-freebsd")
- OUTPUT_ARCH(sparc:v9)
- ENTRY(_start)
- SEARCH_DIR(/usr/lib);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch
deleted file mode 100644
index 814ced2..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-SA-10:03.zfs.asc
-
-Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
-===================================================================
---- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (revision 200583)
-+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (working copy)
-@@ -60,10 +60,14 @@ zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64
- {
- VATTR_NULL(vap);
- vap->va_mask = (uint_t)mask;
-- vap->va_type = IFTOVT(mode);
-- vap->va_mode = mode & MODEMASK;
-- vap->va_uid = (uid_t)uid;
-- vap->va_gid = (gid_t)gid;
-+ if (mask & AT_TYPE)
-+ vap->va_type = IFTOVT(mode);
-+ if (mask & AT_MODE)
-+ vap->va_mode = mode & MODEMASK;
-+ if (mask & AT_UID)
-+ vap->va_uid = (uid_t)uid;
-+ if (mask & AT_GID)
-+ vap->va_gid = (gid_t)gid;
- vap->va_rdev = zfs_cmpldev(rdev);
- vap->va_nodeid = nodeid;
- }
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-arpresolve_panic.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-arpresolve_panic.patch
deleted file mode 100644
index c624532..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-arpresolve_panic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This one (plus a misrule in my pf.conf) made my box crash at random after 6
-to 48 hours of uptime. Thanks to an incoming icmp packet.
-
-Taken from:
-http://svn.freebsd.org/viewvc/base/head/sys/netinet/if_ether.c?r1=198418&r2=201416
---- head/sys/netinet/if_ether.c
-+++ head/sys/netinet/if_ether.c
-@@ -372,8 +372,8 @@
- if (la->la_asked < V_arp_maxtries)
- error = EWOULDBLOCK; /* First request. */
- else
-- error =
-- (rt0->rt_flags & RTF_GATEWAY) ? EHOSTUNREACH : EHOSTDOWN;
-+ error = rt0 != NULL && (rt0->rt_flags & RTF_GATEWAY) ?
-+ EHOSTUNREACH : EHOSTDOWN;
-
- if (renew) {
- LLE_ADDREF(la);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
deleted file mode 100644
index 0f8d070..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- sys/conf/kern.mk.old 2007-05-24 23:53:42.000000000 +0200
-+++ sys/conf/kern.mk 2008-03-14 14:37:47.216420518 +0100
-@@ -12,7 +12,7 @@
- .else
- CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-- ${_wundef} ${_Wno_pointer_sign} -fformat-extensions
-+ ${_wundef} ${_Wno_pointer_sign}
- .if !defined(WITH_GCC3)
- _Wno_pointer_sign=-Wno-pointer-sign
- .endif
-@@ -36,7 +36,7 @@
- # reserved for user applications.
- #
- .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 -mno-sse3
- INLINE_LIMIT?= 8000
- .endif
-Only in ./sys/conf: kern.mk.rej
-Only in ./sys/conf: kern.mk~
---- sys/dev/aic7xxx/aicasm/Makefile.old 2010-03-10 14:01:50 +0100
-+++ sys/dev/aic7xxx/aicasm/Makefile 2010-03-10 14:01:56 +0100
-@@ -14,7 +14,7 @@
- SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
- DPADD= ${LIBL}
--LDADD= -ll
-+LDADD= -lfl
- WARNS?= 6
-
- # Correct path for kernel builds
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-mf626.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-mf626.patch
deleted file mode 100644
index 9121c0a..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-mf626.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Backport this 3g modem that I have.
-Given it's quite common, should be useful
-And I hate when I forget to patch the kernel after a re-emerge.
-
---- sys/dev/usb/usbdevs.orig
-+++ sys/dev/usb/usbdevs
-@@ -2055,6 +2055,7 @@
- product QUALCOMM2 CDMA_MSM 0x3196 CDMA Technologies MSM modem
- product QUALCOMMINC CDMA_MSM 0x0001 CDMA Technologies MSM modem
- product QUALCOMMINC ZTE_STOR 0x2000 USB ZTE Storage
-+product QUALCOMMINC MF626 0X0031 3G modem
- product QUALCOMMINC AC8700 0xfffe CDMA 1xEVDO USB modem
-
- /* Qtronix products */
---- sys/dev/usb/serial/u3g.c.orig
-+++ sys/dev/usb/serial/u3g.c
-@@ -184,6 +184,7 @@
- /* OEM: Qualcomm, Inc. */
- U3G_DEV(QUALCOMMINC, ZTE_STOR, U3GFL_SCSI_EJECT),
- U3G_DEV(QUALCOMMINC, CDMA_MSM, U3GFL_SCSI_EJECT),
-+ U3G_DEV(QUALCOMMINC, MF626, 0),
- /* OEM: Huawei */
- U3G_DEV(HUAWEI, MOBILE, U3GFL_HUAWEI_INIT),
- U3G_DEV(HUAWEI, E180V, U3GFL_HUAWEI_INIT),
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch
deleted file mode 100644
index 1729beb..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sys/conf/ldscript.sparc64.old 2010-03-10 14:42:03 +0100
-+++ sys/conf/ldscript.sparc64 2010-03-10 14:42:30 +0100
-@@ -1,6 +1,6 @@
- /* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4.32.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
--OUTPUT_FORMAT("elf64-sparc", "elf64-sparc",
-- "elf64-sparc")
-+OUTPUT_FORMAT("elf64-sparc-freebsd", "elf64-sparc-freebsd",
-+ "elf64-sparc-freebsd")
- OUTPUT_ARCH(sparc:v9)
- ENTRY(_start)
- SEARCH_DIR(/usr/lib);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch
deleted file mode 100644
index a7335f6..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fixes changing the default subnet route after removing an ip address.
-
-See: http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40133
-and http://mail-index.netbsd.org/tech-net/2008/12/03/msg000896.html
-
-Thanks to Roy Marples.
---- sys/netinet/in.c.orig
-+++ sys/netinet/in.c
-@@ -858,6 +858,12 @@
- error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags);
- if (!error)
- target->ia_flags |= IFA_ROUTE;
-+ else if (error == EEXIST) {
-+ /*
-+ * the fact that the route already exists is not an error.
-+ */
-+ error = 0;
-+ }
- return (error);
- }
-
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch
deleted file mode 100644
index 2d2e028..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- sys/conf/kern.pre.mk.old 2010-03-10 14:20:43 +0100
-+++ sys/conf/kern.pre.mk 2010-03-10 14:20:56 +0100
-@@ -93,7 +93,7 @@
- CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
- CFLAGS+= --param inline-unit-growth=100
- CFLAGS+= --param large-function-growth=1000
--WERROR?= -Werror
-+WERROR?= -Wno-error
- .endif
-
- # XXX LOCORE means "don't declare C stuff" not "for locore.s".
---- sys/conf/kmod.mk.old 2010-03-10 14:21:06 +0100
-+++ sys/conf/kmod.mk 2010-03-10 14:21:16 +0100
-@@ -79,7 +79,7 @@
- . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
- CFLAGS+= -fno-strict-aliasing
- . endif
--WERROR?= -Werror
-+WERROR?= -Wno-error
- .endif
- CFLAGS+= ${WERROR}
- CFLAGS+= -D_KERNEL -D__FreeBSD_cc_version=700004
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch
deleted file mode 100644
index f81b2b5..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
-===================================================================
---- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (revision 200583)
-+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (working copy)
-@@ -60,10 +60,14 @@ zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64
- {
- VATTR_NULL(vap);
- vap->va_mask = (uint_t)mask;
-- vap->va_type = IFTOVT(mode);
-- vap->va_mode = mode & MODEMASK;
-- vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid;
-- vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid;
-+ if (mask & AT_TYPE)
-+ vap->va_type = IFTOVT(mode);
-+ if (mask & AT_MODE)
-+ vap->va_mode = mode & MODEMASK;
-+ if (mask & AT_UID)
-+ vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid;
-+ if (mask & AT_GID)
-+ vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid;
- vap->va_rdev = zfs_cmpldev(rdev);
- vap->va_nodeid = nodeid;
- }
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
deleted file mode 100644
index 50dacd0..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: sys/kern/uipc_usrreq.c
-===================================================================
---- sys/kern/uipc_usrreq.c (revision 225745)
-+++ sys/kern/uipc_usrreq.c (working copy)
-@@ -462,6 +462,8 @@
- unp = sotounpcb(so);
- KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
-
-+ if (soun->sun_len > sizeof(struct sockaddr_un))
-+ return (EINVAL);
- namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
- if (namelen <= 0)
- return (EINVAL);
-@@ -1252,6 +1254,8 @@
- unp = sotounpcb(so);
- KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
-
-+ if (nam->sa_len > sizeof(struct sockaddr_un))
-+ return (EINVAL);
- len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
- if (len <= 0)
- return (EINVAL);
-Index: sys/compat/linux/linux_socket.c
-===================================================================
---- sys/compat/linux/linux_socket.c (revision 225919)
-+++ sys/compat/linux/linux_socket.c (working copy)
-@@ -104,6 +104,7 @@
- int oldv6size;
- struct sockaddr_in6 *sin6;
- #endif
-+ int namelen;
-
- if (*osalen < 2 || *osalen > UCHAR_MAX || !osa)
- return (EINVAL);
-@@ -166,6 +167,20 @@
- }
- }
-
-+ if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) {
-+ for (namelen = 0;
-+ namelen < *osalen - offsetof(struct sockaddr_un, sun_path);
-+ namelen++)
-+ if (!((struct sockaddr_un *)kosa)->sun_path[namelen])
-+ break;
-+ if (namelen + offsetof(struct sockaddr_un, sun_path) >
-+ sizeof(struct sockaddr_un)) {
-+ error = EINVAL;
-+ goto out;
-+ }
-+ alloclen = sizeof(struct sockaddr_un);
-+ }
-+
- sa = (struct sockaddr *) kosa;
- sa->sa_family = bdom;
- sa->sa_len = alloclen;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch
deleted file mode 100644
index 4824ff6..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Taken from debian GNU/kFreeBSD.
-
-Regretably, with GCC 4.4 or later this is the only flag combination
-I could find that doesn't cause kernel panics CPU triple-faults or
-other kind of severe breakage. This is Gentoo Bug #410945.
-
-Clang can use -O2, so we do not force -O1 on it
-
---- a/sys/conf/kern.pre.mk
-+++ b/sys/conf/kern.pre.mk
-@@ -41,6 +41,9 @@
- .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
- COPTFLAGS+= -fno-strict-aliasing
- .endif
-+.if ${CC:T:Mclang} != "clang" && !empty(COPTFLAGS:M-O[23s])
-+COPTFLAGS+= -O1
-+.endif
- .if !defined(NO_CPU_COPTFLAGS)
- COPTFLAGS+= ${_CPUCFLAGS}
- .endif
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -91,6 +91,9 @@
- .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
- CFLAGS+= -fno-strict-aliasing
- .endif
-+.if ${CC:T:Mclang} != "clang" && !empty(CFLAGS:M-O[23s])
-+CFLAGS+= -O1
-+.endif
- WERROR?= -Werror
- CFLAGS+= ${WERROR}
- CFLAGS+= -D_KERNEL
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimizations.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimizations.patch
deleted file mode 100644
index 6160a7b..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimizations.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Taken from debian GNU/kFreeBSD.
-
-Regretably, with GCC 4.4 or later this is the only flag combination
-I could find that doesn't cause kernel panics CPU triple-faults or
-other kind of severe breakage.
-
---- a/sys/conf/kern.pre.mk
-+++ b/sys/conf/kern.pre.mk
-@@ -41,6 +41,9 @@
- .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
- COPTFLAGS+= -fno-strict-aliasing
- .endif
-+.if !empty(COPTFLAGS:M-O[23s])
-+COPTFLAGS+= -O1
-+.endif
- .if !defined(NO_CPU_COPTFLAGS)
- COPTFLAGS+= ${_CPUCFLAGS}
- .endif
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -91,6 +91,9 @@
- .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
- CFLAGS+= -fno-strict-aliasing
- .endif
-+.if !empty(CFLAGS:M-O[23s])
-+CFLAGS+= -O1
-+.endif
- WERROR?= -Werror
- CFLAGS+= ${WERROR}
- CFLAGS+= -D_KERNEL
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch
deleted file mode 100644
index 840af81..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -uNr sys.old/conf/kern.mk sys/conf/kern.mk
---- sys.old/conf/kern.mk 2011-11-02 13:02:13.000000000 +0000
-+++ sys/conf/kern.mk 2011-11-02 13:05:53.000000000 +0000
-@@ -5,7 +5,7 @@
- #
- CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-- -Wundef -Wno-pointer-sign -fformat-extensions \
-+ -Wundef -Wno-pointer-sign \
- -Wmissing-include-dirs -fdiagnostics-show-option
- #
- # The following flags are next up for working on:
-@@ -32,7 +32,7 @@
- #
- .if ${MACHINE_CPUARCH} == "i386"
- .if ${CC:T:Mclang} != "clang"
--CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse
-+CFLAGS+= -mpreferred-stack-boundary=2 -mno-sse
- .else
- CFLAGS+= -mno-aes -mno-avx
- .endif
-diff -uNr sys.old/dev/aic7xxx/aicasm/Makefile sys/dev/aic7xxx/aicasm/Makefile
---- sys.old/dev/aic7xxx/aicasm/Makefile 2011-11-02 13:02:11.000000000 +0000
-+++ sys/dev/aic7xxx/aicasm/Makefile 2011-11-02 13:06:24.000000000 +0000
-@@ -14,7 +14,7 @@
- SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
- DPADD= ${LIBL}
--LDADD= -ll
-+LDADD= -lfl
- WARNS?= 5
-
- # Correct path for kernel builds
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch
deleted file mode 100644
index f0984f6..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Index: sys/netinet6/in6.c
-===================================================================
---- sys/netinet6/in6.c.orig
-+++ sys/netinet6/in6.c
-@@ -1369,6 +1369,8 @@ in6_purgeaddr(struct ifaddr *ifa)
- }
-
- cleanup:
-+ if (ifa0 != NULL)
-+ ifa_free(ifa0);
-
- plen = in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL); /* XXX */
- if ((ia->ia_flags & IFA_ROUTE) && plen == 128) {
-@@ -1393,8 +1395,6 @@ cleanup:
- return;
- ia->ia_flags &= ~IFA_ROUTE;
- }
-- if (ifa0 != NULL)
-- ifa_free(ifa0);
-
- in6_unlink_ifa(ia, ifp);
- }
-@@ -1667,14 +1667,19 @@ in6_lifaddr_ioctl(struct socket *so, u_long cmd, c
- hostid = IFA_IN6(ifa);
-
- /* prefixlen must be <= 64. */
-- if (64 < iflr->prefixlen)
-+ if (64 < iflr->prefixlen) {
-+ if (ifa != NULL)
-+ ifa_free(ifa);
- return EINVAL;
-+ }
- prefixlen = iflr->prefixlen;
-
- /* hostid part must be zero. */
- sin6 = (struct sockaddr_in6 *)&iflr->addr;
- if (sin6->sin6_addr.s6_addr32[2] != 0 ||
- sin6->sin6_addr.s6_addr32[3] != 0) {
-+ if (ifa != NULL)
-+ ifa_free(ifa);
- return EINVAL;
- }
- } else
-@@ -2265,14 +2265,20 @@ in6_ifawithifp(struct ifnet *ifp, struct in6_addr
- IN6_IFADDR_RUNLOCK();
- return (struct in6_ifaddr *)ifa;
- }
-- IN6_IFADDR_RUNLOCK();
-
- /* use the last-resort values, that are, deprecated addresses */
-- if (dep[0])
-+ if (dep[0]) {
-+ ifa_ref((struct ifaddr *)dep[0]);
-+ IN6_IFADDR_RUNLOCK();
- return dep[0];
-- if (dep[1])
-+ }
-+ if (dep[1]) {
-+ ifa_ref((struct ifaddr *)dep[1]);
-+ IN6_IFADDR_RUNLOCK();
- return dep[1];
-+ }
-
-+ IN6_IFADDR_RUNLOCK();
- return NULL;
- }
-
-Index: sys/netinet6/ip6_input.c
-===================================================================
---- sys/netinet6/ip6_input.c.orig
-+++ sys/netinet6/ip6_input.c
-@@ -879,19 +879,23 @@ passin:
- * as our interface address (e.g. multicast addresses, addresses
- * within FAITH prefixes and such).
- */
-- if (deliverifp && !ip6_getdstifaddr(m)) {
-+ if (deliverifp) {
- struct in6_ifaddr *ia6;
-
-- ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
-- if (ia6) {
-- if (!ip6_setdstifaddr(m, ia6)) {
-- /*
-- * XXX maybe we should drop the packet here,
-- * as we could not provide enough information
-- * to the upper layers.
-- */
-+ if ((ia6 = ip6_getdstifaddr(m)) != NULL) {
-+ ifa_free(&ia6->ia_ifa);
-+ } else {
-+ ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
-+ if (ia6) {
-+ if (!ip6_setdstifaddr(m, ia6)) {
-+ /*
-+ * XXX maybe we should drop the packet here,
-+ * as we could not provide enough information
-+ * to the upper layers.
-+ */
-+ }
-+ ifa_free(&ia6->ia_ifa);
- }
-- ifa_free(&ia6->ia_ifa);
- }
- }
-
-Index: sys/netinet/tcp_input.c
-===================================================================
---- sys/netinet/tcp_input.c.orig
-+++ sys/netinet/tcp_input.c
-@@ -512,6 +512,8 @@ tcp6_input(struct mbuf **mp, int *offp, int proto)
- (caddr_t)&ip6->ip6_dst - (caddr_t)ip6);
- return IPPROTO_DONE;
- }
-+ if (ia6)
-+ ifa_free(&ia6->ia_ifa);
-
- tcp_input(m, *offp);
- return IPPROTO_DONE;
-@@ -1240,7 +1242,8 @@ relocked:
- rstreason = BANDLIM_RST_OPENPORT;
- goto dropwithreset;
- }
-- ifa_free(&ia6->ia_ifa);
-+ if (ia6)
-+ ifa_free(&ia6->ia_ifa);
- }
- #endif /* INET6 */
- /*
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch
deleted file mode 100644
index 751a77c..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-u_int is defined in sys/types.h
-makes header usable alone.
-
---- sys/sys/sysctl.h.old 2012-05-25 11:08:53.000000000 -0400
-+++ sys/sys/sysctl.h 2012-05-25 11:09:16.000000000 -0400
-@@ -788,6 +788,7 @@
- struct sysctl_req *);
- #else /* !_KERNEL */
- #include <sys/cdefs.h>
-+#include <sys/types.h> /* for u_int */
-
- __BEGIN_DECLS
- int sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch
deleted file mode 100644
index b84d97f..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur sys.orig/conf/kern.mk sys/conf/kern.mk
---- sys.orig/conf/kern.mk 2012-07-12 13:26:37.000000000 +0900
-+++ sys/conf/kern.mk 2012-07-16 02:32:19.000000000 +0900
-@@ -5,7 +5,7 @@
- #
- CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-- -Wundef -Wno-pointer-sign -fformat-extensions \
-+ -Wundef -Wno-pointer-sign \
- -Wmissing-include-dirs -fdiagnostics-show-option \
- ${CWARNEXTRA}
- #
-@@ -52,7 +52,7 @@
- #
- .if ${MACHINE_CPUARCH} == "i386"
- .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
--CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
-+CFLAGS+= -mpreferred-stack-boundary=2
- .else
- CFLAGS+= -mno-aes -mno-avx
- .endif
-diff -Nur sys.orig/dev/aic7xxx/aicasm/Makefile sys/dev/aic7xxx/aicasm/Makefile
---- sys.orig/dev/aic7xxx/aicasm/Makefile 2012-07-12 13:27:17.000000000 +0900
-+++ sys/dev/aic7xxx/aicasm/Makefile 2012-07-16 02:32:37.000000000 +0900
-@@ -14,7 +14,7 @@
- SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
- DPADD= ${LIBL}
--LDADD= -ll
-+LDADD= -lfl
- WARNS?= 5
-
- # Correct path for kernel builds
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
deleted file mode 100644
index 0bf1b61..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: sys/amd64/amd64/trap.c
-===================================================================
---- sys/amd64/amd64/trap.c.orig
-+++ sys/amd64/amd64/trap.c (working copy)
-@@ -972,4 +972,21 @@
- syscallname(td->td_proc, sa.code)));
-
- syscallret(td, error, &sa);
-+
-+ /*
-+ * If the user-supplied value of %rip is not a canonical
-+ * address, then some CPUs will trigger a ring 0 #GP during
-+ * the sysret instruction. However, the fault handler would
-+ * execute with the user's %gs and %rsp in ring 0 which would
-+ * not be safe. Instead, preemptively kill the thread with a
-+ * SIGBUS.
-+ */
-+ if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) {
-+ ksiginfo_init_trap(&ksi);
-+ ksi.ksi_signo = SIGBUS;
-+ ksi.ksi_code = BUS_OBJERR;
-+ ksi.ksi_trapno = T_PROTFLT;
-+ ksi.ksi_addr = (void *)td->td_frame->tf_rip;
-+ trapsignal(td, &ksi);
-+ }
- }
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1.ebuild
deleted file mode 100644
index 4e09e8a..0000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # This replaces the gentoover patch, it doesn't need reapply every time.
- sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
- -e 's:^BRANCH=.*:BRANCH="Gentoo":' \
- -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
- "${S}/conf/newvers.sh"
-
- # workaround a kernel panic for amd64-fbsd, bug #408019
- epatch "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-
- # __FreeBSD_cc_version comes from FreeBSD's gcc.
- # on 9.0-RELEASE it's 900001.
- sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
- -i "${S}/conf/kern.pre.mk" \
- -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
- # Remove -Werror
- sed -e "s:-Werror:-Wno-error:g" \
- -i "${S}/conf/kern.pre.mk" \
- -i "${S}/conf/kmod.mk" || die
-
- epatch "${FILESDIR}/${PN}-9.1-gentoo.patch"
- epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
- sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i "${S}/conf/ldscript.sparc64" || die
- epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
- epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
- epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
- epatch "${FILESDIR}/${PN}-7.1-includes.patch"
- epatch "${FILESDIR}/${PN}-9.0-sysctluint.patch"
-
- # By adding -DGENTOO_LIVECD to CFLAGS activate this stub
- # vop_whiteout to tmpfs, so it can be used as an overlay
- # unionfs filesystem over the cd9660 readonly filesystem.
- epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-}
-
-src_compile() {
- einfo "Nothing to compile.."
-}
-
-src_install() {
- insinto "/usr/src/sys-${MY_PVR}"
- doins -r "${S}/"*
-}
-
-pkg_postinst() {
- if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
- einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
- ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
- eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
- # just in case...
- [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
- ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
- eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
- elif use symlink; then
- einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
- rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
- eerror "Couldn't remove previous symlinks, please fix manually."
- ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
- eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
- ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
- eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
- fi
-
- if use sparc-fbsd ; then
- ewarn "WARNING: kldload currently causes kernel panics"
- ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
- ewarn "we need gcc-4.1 to compile the kernel correctly :/"
- ewarn "Please compile all modules you need into the kernel"
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/
@ 2012-11-29 14:07 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2012-11-29 14:07 UTC (permalink / raw
To: gentoo-commits
commit: c2024950819c1f42785d7b82410381eb3a61dd8d
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Nov 29 14:06:53 2012 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Nov 29 14:06:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=c2024950
added freebsd-sources, fixed security issue CVE-2012-4576 and bug 444918
---
sys-freebsd/freebsd-sources/Manifest | 41 ++++++
.../files/freebsd-sources-6.0-flex-2.5.31.patch | 22 +++
.../files/freebsd-sources-6.1-ntfs.patch | 32 +++++
.../files/freebsd-sources-7.0-gentoo.patch | 35 +++++
.../freebsd-sources-7.0-tmpfs_whiteout_stub.patch | 44 ++++++
.../files/freebsd-sources-7.0-werror.patch | 27 ++++
.../files/freebsd-sources-7.1-asm.patch | 139 ++++++++++++++++++++
.../files/freebsd-sources-7.1-binutils_link.patch | 37 +++++
.../files/freebsd-sources-7.1-includes.patch | 13 ++
.../freebsd-sources-7.1-subnet-route-pr40133.patch | 21 +++
.../files/freebsd-sources-7.1-types.h-fix.patch | 15 ++
.../files/freebsd-sources-7.2-debug-O2.patch | 27 ++++
.../files/freebsd-sources-7.2-devfs7.patch | 15 ++
.../files/freebsd-sources-7.2-ipv6.patch | 25 ++++
.../files/freebsd-sources-7.2-null.patch | 47 +++++++
.../files/freebsd-sources-7.2-pipe.patch | 18 +++
.../files/freebsd-sources-7.2-sparc64.patch | 11 ++
.../files/freebsd-sources-7.2-zfs712.patch | 25 ++++
.../freebsd-sources-8.0-arpresolve_panic.patch | 18 +++
.../files/freebsd-sources-8.0-gentoo.patch | 33 +++++
.../files/freebsd-sources-8.0-mf626.patch | 24 ++++
.../files/freebsd-sources-8.0-sparc64.patch | 11 ++
.../freebsd-sources-8.0-subnet-route-pr40133.patch | 21 +++
.../files/freebsd-sources-8.0-werror.patch | 22 +++
.../files/freebsd-sources-8.0-zfs.patch | 23 ++++
.../files/freebsd-sources-8.2-unix2.patch | 55 ++++++++
.../freebsd-sources-9.0-disable-optimization.patch | 32 +++++
.../files/freebsd-sources-9.0-gentoo.patch | 33 +++++
.../files/freebsd-sources-9.0-ipv6refcount.patch | 128 ++++++++++++++++++
.../files/freebsd-sources-9.0-sysctluint.patch | 13 ++
.../files/freebsd-sources-9.1-MFC-r239588.patch | 122 +++++++++++++++++
.../files/freebsd-sources-9.1-gentoo.patch | 21 +++
.../files/freebsd-sources-cve-2012-0217.patch | 26 ++++
.../files/freebsd-sources-cve-2012-4576.patch | 16 +++
.../freebsd-sources/freebsd-sources-9.0-r5.ebuild | 103 +++++++++++++++
.../freebsd-sources-9.1_rc1-r1.ebuild | 101 ++++++++++++++
.../freebsd-sources-9.1_rc2-r1.ebuild | 101 ++++++++++++++
.../freebsd-sources-9.1_rc3-r1.ebuild | 93 +++++++++++++
38 files changed, 1590 insertions(+), 0 deletions(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
new file mode 100644
index 0000000..aa20473
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -0,0 +1,41 @@
+AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
+AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14
+AUX freebsd-sources-7.0-gentoo.patch 1346 SHA256 c5930673345572ab3466c862ecb2aefa410931e541cf58b1ca4464827bb1646e SHA512 02de295bec462974fe2f629099de5b6bb5bfa3564b1a56501b416c5d0901f70598346770fdee6edf73c88b2ad2afacb4501d79d154ee9bd02f5babe6a57eac9e WHIRLPOOL 5487e4247984872f1689663b26998ef86888454a65100e33eaaccd84e8e49c0508af567ab08d009c64d343ce63c14dfe32c247c5435696a1948e33cd953f3d10
+AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512
+AUX freebsd-sources-7.0-werror.patch 948 SHA256 64d576efa55feefda2084ac2254f60318abf9c038db2f9f54df14278eff63d43 SHA512 c6f59ece684e37433df6163ed05b74a50ed7edeba1ab9b94fef61bbd985e2de09a9e60fd6f4263552aba9055ab9d6dd8f0faf9c57e9499cd930326d3cc4fe47f WHIRLPOOL f453aef850e5abb4765b144d1cf8b668c070b5c6b4e285af3c1c210cec51fb3129d4fbbd315d4190fdc14a78dd494569ad729ddf3cf6fca369b342f2f5498856
+AUX freebsd-sources-7.1-asm.patch 4185 SHA256 62724ee4426419dd8057c2fd1a3b22f1dc04df0e64f4785907691a75be2138db SHA512 8248967bcc5d0e80abb35b317f129d5ca07da0e61693899370140951045c9f8b53a3f71241264301d841f1d5fff2e651474053bccfd2f433a0fa49d3794a4e74 WHIRLPOOL f63881cfed17810644f61c3bb477015b02ab030cf647e0cc782856dee58f3693331cdde3ffe2c442cc992d1db9f7bd75b8b3ec0e2eced61d8a209dc52c39d952
+AUX freebsd-sources-7.1-binutils_link.patch 1297 SHA256 957c03640f3aac6141efa3e775f33fcadd501f920612055d0e00b3f80fcd8f17 SHA512 0e3aa342646d18429ed76e484d7e15d353d858f00bda906dae74b01b4e73f1b4ccfb6404590d79cb206da3a732528a4437813540a26292d697ccc3b964dabfb0 WHIRLPOOL 5108bd5a1bd49f94a7902b5b478528b29f1e15fe1e06f96a80de6fbf047eaf4f925f00fcd5f83085d44e86828dee50cc2efd150ece362bbd3ab24b292d9e7249
+AUX freebsd-sources-7.1-includes.patch 318 SHA256 70c73d0939325185430a3a133380f0bc10674cb8fbe5c7ebfe3b07630d023369 SHA512 f73db3fd72bdd2972ae25c3f661e7677bd5877aa623981303a4b0c5e9522fd458e294799a0ebad17ac3c639d588394b10ad5fcab4d88743a6dfcc8a8d60eecd7 WHIRLPOOL 5dca685df773113dff0c8aac16f244882728ad586b62b7c20df948240b097e89d1bb62f16ed181f2535e13835471754d8fdd0f4ef02b73ce5077b9169c958557
+AUX freebsd-sources-7.1-subnet-route-pr40133.patch 546 SHA256 e9ccfb24bb05122ec939f6ecbbee0447fe9281c3a7d80387402e058315435673 SHA512 db7e88a035bd1ea6ed7209b7ed2b26725a25578a3be6fb7e46c366ad06a4a2b548ef1010f90cf18bf99e270208584d9995191d1ff00fb0638d185e7d4ecc541a WHIRLPOOL 622cc78602bf8e23b5fee0a831e613c93f41c0e8ddbbab9cc689ee4d54be14f1165eae5ac56084f52a94f48a29bc75dc2f67be1d2ead3d35af0abc634a83985c
+AUX freebsd-sources-7.1-types.h-fix.patch 371 SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f WHIRLPOOL d284dd82244a108e4677be143cfc302c18f18e5b39c39fcaa8915c61053d94bf7171e48028f40d25f8058f8ec910c3e55a3753ccecb46bbabbb0e5ba86e808e3
+AUX freebsd-sources-7.2-debug-O2.patch 771 SHA256 ad1fdd8a6dd53186793d70b65e1b37e3d3e7a4e50c32069aa535ae9f8e9aded8 SHA512 a74dacbd24c6130ec4c762a9c2df58a37d5fee2ee6fa4a970245b53837afa5ee3f72318b6e723e0591ddce00a5aa0fd66746a06783174d4edb9814e3a3724201 WHIRLPOOL 598f1e3282f5b8ebacd43835e148e5249737d8d7b240eaa459e5374444e0aeb39a692b01d3da5a8bec6aa44b8fe97879ce3bea739796688d8d6b365baac438b6
+AUX freebsd-sources-7.2-devfs7.patch 414 SHA256 9144a5052d09ce2bf3a33ad09e27351dc115c98b055a9b7b735dcdc372632071 SHA512 83a39e6b3d808c4c0afce5efe0d3b4689703167e8804f447227e18000e454be1030d0d26c4936502b97e6f6b96b1653d89bbed1f305b418c888ac68cf29b1e0e WHIRLPOOL 3f0a81f18dbba109094a876b1d3f36de98590864243a44e850e8c58a903af3d2e8d540bcc405d91a61eaf2b0ddeca503b91bf6449a80cf3ed36f36e352637abc
+AUX freebsd-sources-7.2-ipv6.patch 858 SHA256 909842ecf21d7a369b0f9445082142920c9021d978ad33858a92a23d33478151 SHA512 f68e530e36b60ab2fdc3ae324aad46f5d80be47322a27fc53dd6ce19e7f9dda703397e0e815e71335586738dbe5043f30c6c0428b87a66762c933ba1a208ddfa WHIRLPOOL 6e71815028e0f943a2ffa04872cfcb76d5c15aa0a95dd38e6dd410c24269202bd8a4568b8073884e92a4e5d8b1ae8dcb257e02d48fa9c08b35b9be18537e0b1c
+AUX freebsd-sources-7.2-null.patch 1529 SHA256 e617f280e8f957d6b0e1a09380ed7fc8370418b6b581fb2d49e09b1101f7c6c4 SHA512 2d3509d243c6cd04cad57c682b5c19fea57a86fdf1899e78cdd7f2ac1a03929bd22b16ae86da185dc9922403773dca8fb136981c49332537e15350d0eaebb6e1 WHIRLPOOL e19af844dad15086319bde20e5ae9ff392d8f7c5ca99d2e1a6cd1ed1b8601f0360a05187443f935cb90806a1acc6c2fb00b6274ce39c269bfc1be8042414aded
+AUX freebsd-sources-7.2-pipe.patch 771 SHA256 7f8b87ef0d7ba883627823709746cc02fb8590d4a81d1b2dd76803b40aa9190b SHA512 184d88e819fad8739c3618cbf30730c1a3a8883b896947e05000603d0960cfd420e905849795a82f3aeaac63d8c4990d90c57decf216e0f63b544d85600e6df2 WHIRLPOOL 9c342f6a7730f4f291813086f5c7711d837073bf6cb0c4340f0e36549dd15d2afc1c874f39cdb88d46fb94a59bdae3945ffe0f9aa1c3a013189d12d70e0d938d
+AUX freebsd-sources-7.2-sparc64.patch 446 SHA256 cc6d10c593c4f0122f9b9f55b80981bfd4fcd009e69606119d2eea62d94afa69 SHA512 6fc412fad0aa9e049436d94007ad3cd9f2c66feb19ab583b64d0f19015c1187cb1c59838482b97ca2e5499225feb109f9db38a5c1ad0465a6282f8cd888e4d66 WHIRLPOOL fca36c0000f85166bfa1b644f27e461a15c6d8b8ed29231f52ff6eb943c01e7bf7bc34fbb0c18cd946bd40adfaebf9d49ec04fc67c7db7ceb168f25807ecd50c
+AUX freebsd-sources-7.2-zfs712.patch 883 SHA256 8d69f079942092aa270f3d499aa90aa24af2138797b41cf69eafe770f002b367 SHA512 620c2489157fdb0400713665b99352202c4a7758af8c1621ab0e8a432c0b3a77e12467a3c5230023a124f65ef27445182f790d4a272aa8d7eda373f9ebe90014 WHIRLPOOL 02671dbb1704f63f9bdd67d6f8a6373d706eb14f44159ce0f3990b32a289c42e6a7c1dc509cee4783af38dac24538a79e5b13a6e4c8cbf9f0bd72ebdc6537ce1
+AUX freebsd-sources-8.0-arpresolve_panic.patch 603 SHA256 b33eb882b28267cf0826de9430de29c31bacbc0183264dee4c567019a9537fc1 SHA512 84b0790e8419fdd3d71c695b5d6abfdac458136d19cad9615ffcc0bcb116f56e33e9cb8137755010f171471f650348c7e129b9e7d6826bd88d84faf88af7d2bc WHIRLPOOL c0ae7134800825f1e6f7b2770e611c32acb5ef6305810d27dca10ff02a70f3c2c149851fed3664d9ce4eaba10ed556a41a7ff721cc34068cfa15d113e610e472
+AUX freebsd-sources-8.0-gentoo.patch 1138 SHA256 0bb6e4cb59bb6f5fd86c88bfd36ce8c9d148d96e8722f1d6a485f98ba892650c SHA512 677adbbbba367bda65f01b604a0a6235ac12d7b307857fa35c7722eb05e0a74d3cd35c03a9dfa56023b7869a865959c9edcfa601d841add92ff21a941d395ddc WHIRLPOOL bcf25d6f650f6435e7fa7c6d5888a1dbded300f0e4c9f595abc1386663b65fd378805efe1b8355c91efc357e0684ce7722526f93beae55a1102e813aaecbd711
+AUX freebsd-sources-8.0-mf626.patch 885 SHA256 23a77733b3ec15ce87519d9e7d087809bba69763676ad1ac409561a318de8da3 SHA512 7d2a8e12c0fe238cb833921792a52de648b5258365124f8bd7f14f26b102ba6fc47b546a019c9c710be4e8407635750013b7fe28c32c96ddc0743b8b06629cbd WHIRLPOOL 5d8fc674f08b43c80c19d366913080626a0d303f505957016b2e2a71cd849056e0fc903f4011a4c706b8f4b9e3877aa15093633f801842fceda43e76929a35e8
+AUX freebsd-sources-8.0-sparc64.patch 450 SHA256 77f5f26d6ef3502289a334bf3975b0b570ea9a8993050fcd889ef4102d3428fd SHA512 b0b86f423662afda204c90e483ffcf151679c497304d6ca2a241b4e5e1a642dc706d83ff4e4c51d6c8700e08d1fbdb018af14f4060f830e4180625c5a0ea109c WHIRLPOOL 8d4bd3f29ec40807766c19ba124f9181d8fb21edd56ddee5adffe25dcc8a11eab0e3d0f9042fb291a45e9f6743ba2e17e8d0f2575a1947b0d277ee3cdca32333
+AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 SHA256 091764c97f4148d2245c24dcfabebd53ef0b4f3175a140fd5b1132788e718ca1 SHA512 9ae65e2775302b664dd4e5f5cbc58fe1ca7db61b6182db10971660207c72ec74e542181f1c2aefcacd2fd4b54e10d371efc619c3c03a977c35d3cf67b99b7de5 WHIRLPOOL 01e27e011c94641498cf0c04a663e4f8f4844a57bd462aa38a1c23a8b3244e5eec226fb11b5e8e598de7227ac2d3dd33aaa98d16f6e7628329ac59e1e7ce62ae
+AUX freebsd-sources-8.0-werror.patch 718 SHA256 a8675081639004d576be3c9f2cdb11d586290dc65db4fc9b0ec4da5fe57392bd SHA512 fe700aef331df88231851fe8fa662bbbb576ff991eaaadeb7dedef96a505039c1e4cc2a34f31ff0665b4cda847dc10a23f15aacb0ef8534b7d5f0b8ceace1a0f WHIRLPOOL 10e9e87e84133074df2243dfce24802cb2d3e9b5274ee5d58a8d2810142492e0a203eb87fcac29af4cb5267c842cfabb674b8a455eede19fdb53be7367ded654
+AUX freebsd-sources-8.0-zfs.patch 926 SHA256 d9cf38d074ac26b04f8a36abc4c2a6c8fca52bc16d1cbcd1f87c8c233a0a64f5 SHA512 22dcd701141b8793bc5b12ec22fe8fb2839fb97cd2d713be6e8dca42b8dbb171f360299abcd4a1cce0f9900438c32a7d2614c00828d7abd823bf476217de8b21 WHIRLPOOL 8a2fb04ebc7172a9c947908f339d73003db10db4e1884b876fd29cd72624b0e9abfd77c640a81352dda388b14aa6985b59ecfcca8c5abf7fba90b917654d0b91
+AUX freebsd-sources-8.2-unix2.patch 1642 SHA256 6dd35d13a13f5e9333557a84b56c89fc4988d55bc3267cca72e8ca8ca169ce61 SHA512 a7f8166abc9883cab92a4b1ce038cefc3c00a6567fd79ebab96ccebbed7e230459dd8efc0b96ba2029a89b4b5d41305be87d0c40ad85fcfe4c819a4604b4490b WHIRLPOOL 5152dca64e3799cc9b6ffd97019c542f93082631489b9c0e03128a09a3d0c667da4220cfc67039c24d13a2cb527dd325db501029478d528c688c0c35cf2373c7
+AUX freebsd-sources-9.0-disable-optimization.patch 927 SHA256 e8ad8d8ed1f729b7b22839a7af93b3dd667f257b05db95f408c48b270003a486 SHA512 0b74874d42eab95994309b922f37ebbf3706d01db6c447c9f062b03e64b77c7f793bc297150b539acdf39530a8afd91f4bf824a87c674dd625a59056656c614b WHIRLPOOL 86f9586a3f07118f95e5fbce1a65fdd3be8dd701ed1bee1379ed2133cef3d9473b437826a13ec2a53c73f7b3e1003256d912a45eb80c86195749a8cd08f9813c
+AUX freebsd-sources-9.0-gentoo.patch 1194 SHA256 251178d014e62fbc3f20c26dd0e78401cc6691a848facd3ff2c7418ed7a43f22 SHA512 0c06b2e18ee8e97c8cc17eeaa50bd77a8a4fed0982cdc2f5cf3446b6020436bb91da256e8765a72ba4d384ebcb494f0b14c5302c4b956f540ff7374b6f55eea6 WHIRLPOOL 77a8bb44b6a18927eb21876672ece0bbfb79a57e29ea56df0eb484e5de37780156652330f03acfa7b8311b836d16ace56d52466a975cc036c3143c2994b14986
+AUX freebsd-sources-9.0-ipv6refcount.patch 3259 SHA256 18186ef2f9fc020c0da053953b9e8c8629c2302082e0ee172dd7e84a7104bdd5 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658 WHIRLPOOL c0511b2fec1f2ecc8a6e3aba23808a4c60a4c94f45693b6f21a30cb01386e24969fcc9b655584c78a501524579f7e266993fdd6d565525740f4f8e04f47b55a9
+AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
+AUX freebsd-sources-9.1-MFC-r239588.patch 3076 SHA256 c23f0f8b66c06e024413db49267d217225464c0f965d3ea4db07854c2e23458e SHA512 a11b6a7e7290a4c63dda13a15972cae57c21c0a23df8d3f7fe4679a2af273ea6b1be01b34e99148b4f61d83395f5453f65ccb3c2ebadfde57df02b9817e58e7b WHIRLPOOL 5ca75d43686d051e2282226ee4a82cc7e855353e409c1b08f98ea6b6a7d01b37b3bfac93483e6d5bf4883783a2608b4bb327cc5629877d77d4e1f2a68f1574e0
+AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e
+AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
+AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
+DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
+DIST freebsd-sys-9.1_rc1.tar.bz2 32607060 SHA256 0f375b358f5c407c16308a4884207b97022a7a5466e0291087642685f3c83957 SHA512 7aced802f7dd72cee12bdc7311d10137c73eedc9c661e81524b4a91b27df85b947d2b13f18345fa40325e6f87c759023af2620956353d0753653e230fcbfbd9d WHIRLPOOL a0849c14427c5920140a67bb693f54502bbe0860516b41090fb7f84628e4f55e1d0b26e83efbb013c59d57a9136249d8a0dce5b9ac76f0909c604960f56af45f
+DIST freebsd-sys-9.1_rc2.tar.bz2 32602564 SHA256 9b4914b1d5aae492af14c2fb28be5c28d98db43b8642bf397d261b982dbd78ac SHA512 5bf3729849b3d090542ee99995182663c2ccdc004a5ed8ff8792ad01b9db0fdaa9d37bcfed47dd4df25c9aa7121c91bd5acf34fe396e760a6b2ee015d07d69bf WHIRLPOOL 18b61b90e3f978c531bfa3001bc195deb4ac780234e5725b2f4140b0b8e56c00acd9ddfc98e26f50ff6fecb17e3925e7fba4fdda1a337ec34a374994c4ad9caa
+DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
+EBUILD freebsd-sources-9.0-r5.ebuild 3500 SHA256 b4a8c11875d3cc40eddaf160aa6a69dea9e283c1d1f3578dad38fb2462b7e2dc SHA512 b4e7022f6a7780493754c8b38ae9c881808b08f4911a3af2e98c19c7a065f29fc864d173efb9c5336f8631c0a84cd8335fa12d3b73a308871ab28fd28fea56db WHIRLPOOL 15fe9da8c9a3da0d98e708bbd474062a5372e23fa6b0bb244c91456a7ff16afad425445309249ce0a7195b331d97bce9f066703e9e785dfc153684c7f91f1cdd
+EBUILD freebsd-sources-9.1_rc1-r1.ebuild 3405 SHA256 7526cda92e47f09341694d97abea7547da5b32cedf5d421988cb33aa4dd08d4a SHA512 66ff107e9bb881f590eaa0e0614b0fbadb9f4e917682d628d57bfc7e009699b15577377d82e16cb50b0cfec63de339470c53a4e659c4a2cf8e17034fd13dcb49 WHIRLPOOL c9f0eaa2e1283da17f096c958d6039ec42bf0a81865a8c15d7243bd1d985d5d4e0f1ac46fc508816664756e705b29d0447ffdc35020dbd000ea8cce318ea974c
+EBUILD freebsd-sources-9.1_rc2-r1.ebuild 3405 SHA256 26b0d4f381fb6394be4ea62873193b08d98b40f0268de5ee80bf21e95edb926e SHA512 af9047e05e2f3121a414dd3ea952dbd441ad39fede1642a5b783bf3d07e56b3862e27097bb613ac9d352b7ac5db677302b363a5436c3b8191a44a9e6292005a6 WHIRLPOOL f50e4a56f9478c0f2ecbad7e49402aa5ec440d0c5f421343acfd3d94c52a4303544a962b46a9f7d6d627fd572c937659a31e5bb96e90e5ca07c17230eeb2565d
+EBUILD freebsd-sources-9.1_rc3-r1.ebuild 3065 SHA256 772badc11b6c18b04019ab3ce3dbbec2bf72b9ce00a599080ac1fa1413ae1986 SHA512 2e0f1f5556839b65c8f2a7b8231d0bc0e264496e903c083a642382f08ea6653d56613dda9058c1a5ee8cf67952e01d87d062ff39899ae8e109c1bf35e6f8bea6 WHIRLPOOL 0de540be2a35639786fdaf7cd6ea1b111ed516a9b3350636f3c946c22372fa1b63e339151cc6233ee81741972a3dca9f8cde09aef480b8c1b2154a01213b3a2a
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch
new file mode 100644
index 0000000..88710cf
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch
@@ -0,0 +1,22 @@
+Index: fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+===================================================================
+--- fbsd-6.orig/sys/dev/aic7xxx/aicasm/aicasm_scan.l
++++ fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+@@ -528,7 +528,7 @@ expand_macro(struct symbol *macro_symbol
+
+ /* Put back everything up until the replacement. */
+ while (body_pos > next_match)
+- unput(*--body_pos);
++ yyunput(*--body_pos, body_head);
+
+ /* Perform the replacement. */
+ if (match_marg != NULL) {
+@@ -537,7 +537,7 @@ expand_macro(struct symbol *macro_symbol
+ next_match = match_marg->replacement_text;
+ strp = next_match + strlen(next_match);
+ while (strp > next_match)
+- unput(*--strp);
++ yyunput(*--strp, next_match);
+
+ /* Skip past the unexpanded macro arg. */
+ body_pos -= match.rm_eo - match.rm_so;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
new file mode 100644
index 0000000..e74fcd3
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
@@ -0,0 +1,32 @@
+--- sys/fs/ntfs/ntfs_vnops.c.orig 2006-10-17 17:31:36 -0300
++++ sys/fs/ntfs/ntfs_vnops.c 2006-10-17 17:30:24 -0300
+@@ -507,8 +507,12 @@
+
+ /* Simulate . in every dir except ROOT */
+ if( ip->i_number != NTFS_ROOTINO ) {
+- struct dirent dot = { NTFS_ROOTINO,
+- sizeof(struct dirent), DT_DIR, 1, "." };
++ struct dirent dot;
++ dot.d_fileno = NTFS_ROOTINO;
++ dot.d_reclen = sizeof(struct dirent);
++ dot.d_type = DT_DIR;
++ dot.d_namlen = 1;
++ bcopy(".", dot.d_name, 1);
+
+ if( uio->uio_offset < sizeof(struct dirent) ) {
+ dot.d_fileno = ip->i_number;
+@@ -522,8 +526,12 @@
+
+ /* Simulate .. in every dir including ROOT */
+ if( uio->uio_offset < 2 * sizeof(struct dirent) ) {
+- struct dirent dotdot = { NTFS_ROOTINO,
+- sizeof(struct dirent), DT_DIR, 2, ".." };
++ struct dirent dotdot;
++ dotdot.d_fileno = NTFS_ROOTINO;
++ dotdot.d_reclen = sizeof(struct dirent);
++ dotdot.d_type = DT_DIR;
++ dotdot.d_namlen = 2;
++ bcopy("..", dotdot.d_name, 2);
+
+ error = uiomove((char *)&dotdot,sizeof(struct dirent),uio);
+ if(error)
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-gentoo.patch
new file mode 100644
index 0000000..7da5197
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-gentoo.patch
@@ -0,0 +1,35 @@
+diff -ur ../src.orig/sys/conf/kern.mk ./sys/conf/kern.mk
+--- ../src.orig/sys/conf/kern.mk 2007-05-24 23:53:42.000000000 +0200
++++ ./sys/conf/kern.mk 2008-03-14 14:37:47.216420518 +0100
+@@ -12,7 +12,7 @@
+ .else
+ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
+ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
+- ${_wundef} ${_Wno_pointer_sign} -fformat-extensions
++ ${_wundef} ${_Wno_pointer_sign}
+ .if !defined(WITH_GCC3)
+ _Wno_pointer_sign=-Wno-pointer-sign
+ .endif
+@@ -36,7 +36,7 @@
+ # reserved for user applications.
+ #
+ .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 -mno-sse3
+ INLINE_LIMIT?= 8000
+ .endif
+Only in ./sys/conf: kern.mk.rej
+Only in ./sys/conf: kern.mk~
+diff -ur ../src.orig/sys/dev/aic7xxx/aicasm/Makefile ./sys/dev/aic7xxx/aicasm/Makefile
+--- ../src.orig/sys/dev/aic7xxx/aicasm/Makefile 2005-11-21 15:41:10.000000000 +0100
++++ ./sys/dev/aic7xxx/aicasm/Makefile 2008-03-14 14:36:35.859698365 +0100
+@@ -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
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch
new file mode 100644
index 0000000..13524ef
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch
@@ -0,0 +1,44 @@
+diff -ur sys/fs/tmpfs.orig/tmpfs_vnops.c sys/fs/tmpfs/tmpfs_vnops.c
+--- sys/fs/tmpfs.orig/tmpfs_vnops.c 2008-06-22 12:17:48 -0300
++++ sys/fs/tmpfs/tmpfs_vnops.c 2008-06-28 12:05:10 -0300
+@@ -1459,6 +1459,30 @@
+ return (0);
+ }
+
++
++/* --------------------------------------------------------------------- */
++/* This does absolutely nothing */
++#ifdef GENTOO_LIVECD
++static int
++tmpfs_whiteout(struct vop_whiteout_args *ap)
++{
++ switch (ap->a_flags) {
++ case LOOKUP:
++ return (0);
++ break;
++ case CREATE:
++ return(EOPNOTSUPP);
++ break;
++ case DELETE:
++ return (0);
++ break;
++ default:
++ return(EOPNOTSUPP);
++ }
++ return(0);
++}
++#endif
++
+ /* --------------------------------------------------------------------- */
+
+ /*
+@@ -1484,6 +1508,9 @@
+ .vop_mkdir = tmpfs_mkdir,
+ .vop_rmdir = tmpfs_rmdir,
+ .vop_symlink = tmpfs_symlink,
++#ifdef GENTOO_LIVECD
++ .vop_whiteout = tmpfs_whiteout,
++#endif
+ .vop_readdir = tmpfs_readdir,
+ .vop_readlink = tmpfs_readlink,
+ .vop_inactive = tmpfs_inactive,
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-werror.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-werror.patch
new file mode 100644
index 0000000..3a2be63
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-werror.patch
@@ -0,0 +1,27 @@
+diff -ur ../src.orig/sys/conf/kern.pre.mk ./sys/conf/kern.pre.mk
+--- ../src.orig/sys/conf/kern.pre.mk 2007-08-08 21:12:06.000000000 +0200
++++ ./sys/conf/kern.pre.mk 2008-03-14 14:10:03.183569137 +0100
+@@ -90,7 +90,7 @@
+ .if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || \
+ ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "powerpc" || \
+ ${MACHINE_ARCH} == "sparc64"
+-WERROR?= -Werror
++WERROR?= -Wno-error
+ .endif
+ .endif
+
+Only in ./sys/conf: kern.pre.mk.rej
+Only in ./sys/conf: kern.pre.mk~
+diff -ur ../src.orig/sys/conf/kmod.mk ./sys/conf/kmod.mk
+--- ../src.orig/sys/conf/kmod.mk 2007-07-11 03:20:37.000000000 +0200
++++ ./sys/conf/kmod.mk 2008-03-14 14:11:21.856366378 +0100
+@@ -79,7 +79,6 @@
+ . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
+ CFLAGS+= -fno-strict-aliasing
+ . endif
+-#WERROR?= -Werror
+ .endif
+ CFLAGS+= ${WERROR}
+ CFLAGS+= -D_KERNEL
+Only in ./sys/conf: kmod.mk.rej
+Only in ./sys/conf: kmod.mk~
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-asm.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-asm.patch
new file mode 100644
index 0000000..c0f5d78
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-asm.patch
@@ -0,0 +1,139 @@
+diff -ur ../src.orig/sys/compat/ndis/winx32_wrap.S ./sys/compat/ndis/winx32_wrap.S
+--- ../src.orig/sys/compat/ndis/winx32_wrap.S 2006-06-12 22:35:59.000000000 +0200
++++ ./sys/compat/ndis/winx32_wrap.S 2008-03-14 14:00:41.949886084 +0100
+@@ -369,7 +369,7 @@
+ ret
+
+ ENTRY(x86_setfs)
+- movl 4(%esp),%fs
++ movw 4(%esp),%fs
+ ret
+
+ ENTRY(x86_gettid)
+diff -ur ../src.orig/sys/i386/i386/locore.s ./sys/i386/i386/locore.s
+--- ../src.orig/sys/i386/i386/locore.s 2007-03-24 20:53:22.000000000 +0100
++++ ./sys/i386/i386/locore.s 2008-03-14 14:00:41.946886262 +0100
+@@ -358,7 +358,7 @@
+ pushl %eax
+ testl $PSL_VM,UC_EFLAGS(%eax)
+ jne 1f
+- movl UC_GS(%eax),%gs /* restore %gs */
++ movw UC_GS(%eax),%gs /* restore %gs */
+ 1:
+ movl $SYS_sigreturn,%eax
+ pushl %eax /* junk to fake return addr. */
+@@ -375,7 +375,7 @@
+ pushl %eax
+ testl $PSL_VM,UC4_EFLAGS(%eax)
+ jne 1f
+- movl UC4_GS(%eax),%gs /* restore %gs */
++ movw UC4_GS(%eax),%gs /* restore %gs */
+ 1:
+ movl $344,%eax /* 4.x SYS_sigreturn */
+ pushl %eax /* junk to fake return addr. */
+@@ -393,7 +393,7 @@
+ pushl %eax
+ testl $PSL_VM,SC_PS(%eax)
+ jne 9f
+- movl SC_GS(%eax),%gs /* restore %gs */
++ movw SC_GS(%eax),%gs /* restore %gs */
+ 9:
+ movl $103,%eax /* 3.x SYS_sigreturn */
+ pushl %eax /* junk to fake return addr. */
+diff -ur ../src.orig/sys/i386/i386/swtch.s ./sys/i386/i386/swtch.s
+--- ../src.orig/sys/i386/i386/swtch.s 2007-08-22 07:06:14.000000000 +0200
++++ ./sys/i386/i386/swtch.s 2008-03-14 14:00:41.948886237 +0100
+@@ -130,7 +130,7 @@
+ movl %ebp,PCB_EBP(%edx)
+ movl %esi,PCB_ESI(%edx)
+ movl %edi,PCB_EDI(%edx)
+- movl %gs,PCB_GS(%edx)
++ movw %gs,PCB_GS(%edx)
+ pushfl /* PSL */
+ popl PCB_PSL(%edx)
+ /* Test if debug registers should be saved. */
+@@ -301,7 +301,7 @@
+ /* This must be done after loading the user LDT. */
+ .globl cpu_switch_load_gs
+ cpu_switch_load_gs:
+- movl PCB_GS(%edx),%gs
++ movw PCB_GS(%edx),%gs
+
+ /* Test if debug registers should be restored. */
+ testl $PCB_DBREGS,PCB_FLAGS(%edx)
+@@ -371,7 +371,7 @@
+ movl %ebp,PCB_EBP(%ecx)
+ movl %esi,PCB_ESI(%ecx)
+ movl %edi,PCB_EDI(%ecx)
+- movl %gs,PCB_GS(%ecx)
++ movw %gs,PCB_GS(%ecx)
+ pushfl
+ popl PCB_PSL(%ecx)
+
+diff -ur ../src.orig/sys/i386/include/cpufunc.h ./sys/i386/include/cpufunc.h
+--- ../src.orig/sys/i386/include/cpufunc.h 2007-08-09 22:14:35.000000000 +0200
++++ ./sys/i386/include/cpufunc.h 2008-03-14 14:03:09.264377451 +0100
+@@ -452,7 +452,7 @@
+ rfs(void)
+ {
+ u_int sel;
+- __asm __volatile("movl %%fs,%0" : "=rm" (sel));
++ __asm __volatile("movw %%fs,%0" : "=rm" (sel));
+ return (sel);
+ }
+
+@@ -468,7 +468,7 @@
+ rgs(void)
+ {
+ u_int sel;
+- __asm __volatile("movl %%gs,%0" : "=rm" (sel));
++ __asm __volatile("movw %%gs,%0" : "=rm" (sel));
+ return (sel);
+ }
+
+@@ -492,7 +492,7 @@
+ rss(void)
+ {
+ u_int sel;
+- __asm __volatile("movl %%ss,%0" : "=rm" (sel));
++ __asm __volatile("movw %%ss,%0" : "=rm" (sel));
+ return (sel);
+ }
+
+@@ -507,13 +507,13 @@
+ static __inline void
+ load_fs(u_int sel)
+ {
+- __asm __volatile("movl %0,%%fs" : : "rm" (sel));
++ __asm __volatile("movw %0,%%fs" : : "rm" (sel));
+ }
+
+ static __inline void
+ load_gs(u_int sel)
+ {
+- __asm __volatile("movl %0,%%gs" : : "rm" (sel));
++ __asm __volatile("movw %0,%%gs" : : "rm" (sel));
+ }
+
+ static __inline void
+diff -ur ../src.orig/sys/i386/linux/linux_locore.s ./sys/i386/linux/linux_locore.s
+--- ../src.orig/sys/i386/linux/linux_locore.s 2001-02-25 07:29:01.000000000 +0100
++++ ./sys/i386/linux/linux_locore.s 2008-03-14 14:00:41.949886084 +0100
+@@ -8,7 +8,7 @@
+ NON_GPROF_ENTRY(linux_sigcode)
+ call *LINUX_SIGF_HANDLER(%esp)
+ leal LINUX_SIGF_SC(%esp),%ebx /* linux scp */
+- movl LINUX_SC_GS(%ebx),%gs
++ movw LINUX_SC_GS(%ebx),%gs
+ movl %esp, %ebx /* pass sigframe */
+ push %eax /* fake ret addr */
+ movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */
+@@ -20,7 +20,7 @@
+ call *LINUX_RT_SIGF_HANDLER(%esp)
+ leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */
+ leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */
+- movl LINUX_SC_GS(%ecx),%gs
++ movw LINUX_SC_GS(%ecx),%gs
+ push %eax /* fake ret addr */
+ movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */
+ int $0x80 /* enter kernel with args */
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
new file mode 100644
index 0000000..43d01ba
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
@@ -0,0 +1,37 @@
+diff -ruN sys.orig/conf/kern.post.mk sys/conf/kern.post.mk
+--- sys.orig/conf/kern.post.mk 2007-03-23 18:55:59 -0300
++++ sys/conf/kern.post.mk 2008-06-18 19:51:13 -0300
+@@ -85,7 +85,9 @@
+ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
+ @rm -f ${.TARGET}
+ @echo linking ${.TARGET}
+- ${SYSTEM_LD}
++ ${SYSTEM_LD} -o ${.TARGET}.tmp
++ @sh $S/tools/gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt
++ ${SYSTEM_LD} "@${.TARGET}.lopt"
+ .if defined(CTFMERGE)
+ ${SYSTEM_CTFMERGE}
+ .endif
+diff -ruN sys.orig/conf/kmod.mk sys/conf/kmod.mk
+--- sys.orig/conf/kmod.mk 2008-06-18 09:11:53 -0300
++++ sys/conf/kmod.mk 2008-06-18 19:50:01 -0300
+@@ -176,7 +176,8 @@
+
+ .if ${MACHINE_ARCH} != amd64
+ ${FULLPROG}: ${KMOD}.kld
+- ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
++ sh ./@/tools/gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
++ ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
+ .if !defined(DEBUG_FLAGS)
+ ${OBJCOPY} --strip-debug ${.TARGET}
+ .endif
+diff -ruN sys.orig/tools/gen-ld-u-options sys/tools/gen-ld-u-options
+--- sys.orig/tools/gen-ld-u-options 1969-12-31 21:00:00 -0300
++++ sys/tools/gen-ld-u-options 2008-06-18 19:47:56 -0300
+@@ -0,0 +1,6 @@
++#!/bin/sh
++
++for i in `objdump -h -w $1 | grep set_ | cut -c5- | cut -f1 -d " "`
++do
++ echo -n " -u __start_$i -u __stop_$i "
++done
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch
new file mode 100644
index 0000000..3db46fa
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch
@@ -0,0 +1,13 @@
+Make headers usable alone, include the headers they need.
+There are probably much more missing.
+
+--- sys/net/if.h.old 2009-05-15 10:51:50 +0000
++++ sys/net/if.h 2009-05-15 10:52:05 +0000
+@@ -34,6 +34,7 @@
+ #define _NET_IF_H_
+
+ #include <sys/cdefs.h>
++#include <sys/socket.h>
+
+ #ifdef _KERNEL
+ #include <sys/queue.h>
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-subnet-route-pr40133.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-subnet-route-pr40133.patch
new file mode 100644
index 0000000..1184280
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-subnet-route-pr40133.patch
@@ -0,0 +1,21 @@
+Fixes changing the default subnet route after removing an ip address.
+
+See: http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40133
+and http://mail-index.netbsd.org/tech-net/2008/12/03/msg000896.html
+
+Thanks to Roy Marples.
+--- sys/netinet/in.c.orig
++++ sys/netinet/in.c
+@@ -858,6 +858,12 @@
+ error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags);
+ if (!error)
+ target->ia_flags |= IFA_ROUTE;
++ else if (error == EEXIST) {
++ /*
++ * the fact that the route already exists is not an error.
++ */
++ error = 0;
++ }
+ return error;
+ }
+
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch
new file mode 100644
index 0000000..8de5df2
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch
@@ -0,0 +1,15 @@
+Fixes a compile error if XOPEN_SOURCE 600 is defined.
+
+See: http://www.mailinglistarchive.com/freebsd-current@freebsd.org/msg15011.html
+
+--- sys/sys/types.h.orig
++++ sys/sys/types.h
+@@ -46,7 +46,7 @@
+
+ #include <sys/_pthreadtypes.h>
+
+-#if __BSD_VISIBLE
++#ifndef _POSIX_SOURCE
+ typedef unsigned char u_char;
+ typedef unsigned short u_short;
+ typedef unsigned int u_int;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
new file mode 100644
index 0000000..4fa3565
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
@@ -0,0 +1,27 @@
+My UltraSPARC U5 panics on boot about a memory alignment error when compiled
+with gcc4 and -O. Compiling with -O2 fixes this, and it should not adversly
+affect debugging.
+
+NOTE: This does not fix the memory alignment panic when loading kernel modules.
+
+Roy Marples (uberlord@gentoo.org)
+
+--- sys/conf/kern.pre.mk.old 2009-05-22 10:09:46 +0000
++++ sys/conf/kern.pre.mk 2009-05-22 10:10:27 +0000
+@@ -22,15 +22,13 @@
+ COPTFLAGS?= -O
+ .else
+ . if defined(DEBUG)
+-_MINUS_O= -O
+ CTFFLAGS+= -g
+ . else
+-_MINUS_O= -O2
+ . endif
+ . if ${MACHINE_ARCH} == "amd64"
+ COPTFLAGS?=-O2 -frename-registers -pipe
+ . else
+-COPTFLAGS?=${_MINUS_O} -pipe
++COPTFLAGS?=-O2 -pipe
+ . endif
+ . if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
+ COPTFLAGS+= -fno-strict-aliasing
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch
new file mode 100644
index 0000000..e1fcefb
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch
@@ -0,0 +1,15 @@
+http://security.freebsd.org/advisories/FreeBSD-SA-09:14.devfs.asc
+
+Index: sys/fs/devfs/devfs_vnops.c
+===================================================================
+--- sys/fs/devfs/devfs_vnops.c (revision 192300)
++++ sys/fs/devfs/devfs_vnops.c (revision 192301)
+@@ -890,6 +890,7 @@
+ if (fp != NULL) {
+ FILE_LOCK(fp);
+ fp->f_data = dev;
++ fp->f_vnode = vp;
+ FILE_UNLOCK(fp);
+ }
+ fpop = td->td_fpop;
+
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch
new file mode 100644
index 0000000..de8e0ac
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch
@@ -0,0 +1,25 @@
+http://security.freebsd.org/advisories/FreeBSD-SA-09:10.ipv6.asc
+
+Index: sys/netinet6/in6.c
+===================================================================
+RCS file: /home/ncvs/src/sys/netinet6/in6.c,v
+retrieving revision 1.109
+diff -p -u -I__FBSDID -I$FreeBSD -u -r1.109 in6.c
+--- sys/netinet6/in6.c 27 May 2009 14:11:23 -0000 1.109
++++ sys/netinet6/in6.c 8 Jun 2009 18:02:59 -0000
+@@ -215,6 +215,7 @@ in6_control(struct socket *so, u_long cm
+ case SIOCSRTRFLUSH_IN6:
+ case SIOCSDEFIFACE_IN6:
+ case SIOCSIFINFO_FLAGS:
++ case SIOCSIFINFO_IN6:
+ if (td != NULL) {
+ error = priv_check(td, PRIV_NETINET_ND6);
+ if (error)
+@@ -223,7 +224,6 @@ in6_control(struct socket *so, u_long cm
+ /* FALLTHROUGH */
+ case OSIOCGIFINFO_IN6:
+ case SIOCGIFINFO_IN6:
+- case SIOCSIFINFO_IN6:
+ case SIOCGDRLST_IN6:
+ case SIOCGPRLST_IN6:
+ case SIOCGNBRINFO_IN6:
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch
new file mode 100644
index 0000000..16e5023
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch
@@ -0,0 +1,47 @@
+http://security.freebsd.org/advisories/FreeBSD-EN-09:05.null.asc
+
+Index: sys/kern/kern_exec.c
+===================================================================
+--- sys/kern/kern_exec.c (revision 197682)
++++ sys/kern/kern_exec.c (working copy)
+@@ -122,6 +122,11 @@
+ SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW,
+ &ps_arg_cache_limit, 0, "");
+
++static int map_at_zero = 1;
++TUNABLE_INT("security.bsd.map_at_zero", &map_at_zero);
++SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RW, &map_at_zero, 0,
++ "Permit processes to map an object at virtual address 0.");
++
+ static int
+ sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS)
+ {
+@@ -939,7 +944,7 @@
+ int error;
+ struct proc *p = imgp->proc;
+ struct vmspace *vmspace = p->p_vmspace;
+- vm_offset_t stack_addr;
++ vm_offset_t sv_minuser, stack_addr;
+ vm_map_t map;
+ u_long ssiz;
+
+@@ -955,13 +960,17 @@
+ * not disrupted
+ */
+ map = &vmspace->vm_map;
+- if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv->sv_minuser &&
++ if (map_at_zero)
++ sv_minuser = sv->sv_minuser;
++ else
++ sv_minuser = MAX(sv->sv_minuser, PAGE_SIZE);
++ if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv_minuser &&
+ vm_map_max(map) == sv->sv_maxuser) {
+ shmexit(vmspace);
+ pmap_remove_pages(vmspace_pmap(vmspace));
+ vm_map_remove(map, vm_map_min(map), vm_map_max(map));
+ } else {
+- error = vmspace_exec(p, sv->sv_minuser, sv->sv_maxuser);
++ error = vmspace_exec(p, sv_minuser, sv->sv_maxuser);
+ if (error)
+ return (error);
+ vmspace = p->p_vmspace;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch
new file mode 100644
index 0000000..4b7db02
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch
@@ -0,0 +1,18 @@
+http://security.freebsd.org/advisories/FreeBSD-SA-09:09.pipe.asc
+
+Index: sys/kern/sys_pipe.c
+===================================================================
+RCS file: /home/ncvs/src/sys/kern/sys_pipe.c,v
+retrieving revision 1.201
+diff -p -u -I__FBSDID -I$FreeBSD -r1.201 sys_pipe.c
+--- sys/kern/sys_pipe.c 10 Mar 2009 21:28:43 -0000 1.201
++++ sys/kern/sys_pipe.c 5 Jun 2009 07:53:01 -0000
+@@ -761,6 +761,8 @@ pipe_build_write_buffer(wpipe, uio)
+ pmap = vmspace_pmap(curproc->p_vmspace);
+ endaddr = round_page((vm_offset_t)uio->uio_iov->iov_base + size);
+ addr = trunc_page((vm_offset_t)uio->uio_iov->iov_base);
++ if (endaddr < addr)
++ return (EFAULT);
+ for (i = 0; addr < endaddr; addr += PAGE_SIZE, i++) {
+ /*
+ * vm_fault_quick() can sleep. Consequently,
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch
new file mode 100644
index 0000000..b179fd6
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch
@@ -0,0 +1,11 @@
+--- sys/conf/ldscript.sparc64.old 2009-05-17 11:04:47 +0000
++++ sys/conf/ldscript.sparc64 2009-05-17 11:05:41 +0000
+@@ -1,6 +1,6 @@
+ /* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4.30.1 2009/04/15 03:14:26 kensmith Exp $ */
+-OUTPUT_FORMAT("elf64-sparc", "elf64-sparc",
+- "elf64-sparc")
++OUTPUT_FORMAT("elf64-sparc-freebsd", "elf64-sparc-freebsd",
++ "elf64-sparc-freebsd")
+ OUTPUT_ARCH(sparc:v9)
+ ENTRY(_start)
+ SEARCH_DIR(/usr/lib);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch
new file mode 100644
index 0000000..814ced2
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch
@@ -0,0 +1,25 @@
+http://security.freebsd.org/advisories/FreeBSD-SA-10:03.zfs.asc
+
+Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
+===================================================================
+--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (revision 200583)
++++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (working copy)
+@@ -60,10 +60,14 @@ zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64
+ {
+ VATTR_NULL(vap);
+ vap->va_mask = (uint_t)mask;
+- vap->va_type = IFTOVT(mode);
+- vap->va_mode = mode & MODEMASK;
+- vap->va_uid = (uid_t)uid;
+- vap->va_gid = (gid_t)gid;
++ if (mask & AT_TYPE)
++ vap->va_type = IFTOVT(mode);
++ if (mask & AT_MODE)
++ vap->va_mode = mode & MODEMASK;
++ if (mask & AT_UID)
++ vap->va_uid = (uid_t)uid;
++ if (mask & AT_GID)
++ vap->va_gid = (gid_t)gid;
+ vap->va_rdev = zfs_cmpldev(rdev);
+ vap->va_nodeid = nodeid;
+ }
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-arpresolve_panic.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-arpresolve_panic.patch
new file mode 100644
index 0000000..c624532
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-arpresolve_panic.patch
@@ -0,0 +1,18 @@
+This one (plus a misrule in my pf.conf) made my box crash at random after 6
+to 48 hours of uptime. Thanks to an incoming icmp packet.
+
+Taken from:
+http://svn.freebsd.org/viewvc/base/head/sys/netinet/if_ether.c?r1=198418&r2=201416
+--- head/sys/netinet/if_ether.c
++++ head/sys/netinet/if_ether.c
+@@ -372,8 +372,8 @@
+ if (la->la_asked < V_arp_maxtries)
+ error = EWOULDBLOCK; /* First request. */
+ else
+- error =
+- (rt0->rt_flags & RTF_GATEWAY) ? EHOSTUNREACH : EHOSTDOWN;
++ error = rt0 != NULL && (rt0->rt_flags & RTF_GATEWAY) ?
++ EHOSTUNREACH : EHOSTDOWN;
+
+ if (renew) {
+ LLE_ADDREF(la);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
new file mode 100644
index 0000000..0f8d070
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
@@ -0,0 +1,33 @@
+--- sys/conf/kern.mk.old 2007-05-24 23:53:42.000000000 +0200
++++ sys/conf/kern.mk 2008-03-14 14:37:47.216420518 +0100
+@@ -12,7 +12,7 @@
+ .else
+ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
+ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
+- ${_wundef} ${_Wno_pointer_sign} -fformat-extensions
++ ${_wundef} ${_Wno_pointer_sign}
+ .if !defined(WITH_GCC3)
+ _Wno_pointer_sign=-Wno-pointer-sign
+ .endif
+@@ -36,7 +36,7 @@
+ # reserved for user applications.
+ #
+ .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 -mno-sse3
+ INLINE_LIMIT?= 8000
+ .endif
+Only in ./sys/conf: kern.mk.rej
+Only in ./sys/conf: kern.mk~
+--- sys/dev/aic7xxx/aicasm/Makefile.old 2010-03-10 14:01:50 +0100
++++ sys/dev/aic7xxx/aicasm/Makefile 2010-03-10 14:01:56 +0100
+@@ -14,7 +14,7 @@
+ SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
+ CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
+ DPADD= ${LIBL}
+-LDADD= -ll
++LDADD= -lfl
+ WARNS?= 6
+
+ # Correct path for kernel builds
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-mf626.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-mf626.patch
new file mode 100644
index 0000000..9121c0a
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-mf626.patch
@@ -0,0 +1,24 @@
+Backport this 3g modem that I have.
+Given it's quite common, should be useful
+And I hate when I forget to patch the kernel after a re-emerge.
+
+--- sys/dev/usb/usbdevs.orig
++++ sys/dev/usb/usbdevs
+@@ -2055,6 +2055,7 @@
+ product QUALCOMM2 CDMA_MSM 0x3196 CDMA Technologies MSM modem
+ product QUALCOMMINC CDMA_MSM 0x0001 CDMA Technologies MSM modem
+ product QUALCOMMINC ZTE_STOR 0x2000 USB ZTE Storage
++product QUALCOMMINC MF626 0X0031 3G modem
+ product QUALCOMMINC AC8700 0xfffe CDMA 1xEVDO USB modem
+
+ /* Qtronix products */
+--- sys/dev/usb/serial/u3g.c.orig
++++ sys/dev/usb/serial/u3g.c
+@@ -184,6 +184,7 @@
+ /* OEM: Qualcomm, Inc. */
+ U3G_DEV(QUALCOMMINC, ZTE_STOR, U3GFL_SCSI_EJECT),
+ U3G_DEV(QUALCOMMINC, CDMA_MSM, U3GFL_SCSI_EJECT),
++ U3G_DEV(QUALCOMMINC, MF626, 0),
+ /* OEM: Huawei */
+ U3G_DEV(HUAWEI, MOBILE, U3GFL_HUAWEI_INIT),
+ U3G_DEV(HUAWEI, E180V, U3GFL_HUAWEI_INIT),
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch
new file mode 100644
index 0000000..1729beb
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch
@@ -0,0 +1,11 @@
+--- sys/conf/ldscript.sparc64.old 2010-03-10 14:42:03 +0100
++++ sys/conf/ldscript.sparc64 2010-03-10 14:42:30 +0100
+@@ -1,6 +1,6 @@
+ /* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4.32.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
+-OUTPUT_FORMAT("elf64-sparc", "elf64-sparc",
+- "elf64-sparc")
++OUTPUT_FORMAT("elf64-sparc-freebsd", "elf64-sparc-freebsd",
++ "elf64-sparc-freebsd")
+ OUTPUT_ARCH(sparc:v9)
+ ENTRY(_start)
+ SEARCH_DIR(/usr/lib);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch
new file mode 100644
index 0000000..a7335f6
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch
@@ -0,0 +1,21 @@
+Fixes changing the default subnet route after removing an ip address.
+
+See: http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40133
+and http://mail-index.netbsd.org/tech-net/2008/12/03/msg000896.html
+
+Thanks to Roy Marples.
+--- sys/netinet/in.c.orig
++++ sys/netinet/in.c
+@@ -858,6 +858,12 @@
+ error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags);
+ if (!error)
+ target->ia_flags |= IFA_ROUTE;
++ else if (error == EEXIST) {
++ /*
++ * the fact that the route already exists is not an error.
++ */
++ error = 0;
++ }
+ return (error);
+ }
+
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch
new file mode 100644
index 0000000..2d2e028
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch
@@ -0,0 +1,22 @@
+--- sys/conf/kern.pre.mk.old 2010-03-10 14:20:43 +0100
++++ sys/conf/kern.pre.mk 2010-03-10 14:20:56 +0100
+@@ -93,7 +93,7 @@
+ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
+ CFLAGS+= --param inline-unit-growth=100
+ CFLAGS+= --param large-function-growth=1000
+-WERROR?= -Werror
++WERROR?= -Wno-error
+ .endif
+
+ # XXX LOCORE means "don't declare C stuff" not "for locore.s".
+--- sys/conf/kmod.mk.old 2010-03-10 14:21:06 +0100
++++ sys/conf/kmod.mk 2010-03-10 14:21:16 +0100
+@@ -79,7 +79,7 @@
+ . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
+ CFLAGS+= -fno-strict-aliasing
+ . endif
+-WERROR?= -Werror
++WERROR?= -Wno-error
+ .endif
+ CFLAGS+= ${WERROR}
+ CFLAGS+= -D_KERNEL -D__FreeBSD_cc_version=700004
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch
new file mode 100644
index 0000000..f81b2b5
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch
@@ -0,0 +1,23 @@
+Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
+===================================================================
+--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (revision 200583)
++++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (working copy)
+@@ -60,10 +60,14 @@ zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64
+ {
+ VATTR_NULL(vap);
+ vap->va_mask = (uint_t)mask;
+- vap->va_type = IFTOVT(mode);
+- vap->va_mode = mode & MODEMASK;
+- vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid;
+- vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid;
++ if (mask & AT_TYPE)
++ vap->va_type = IFTOVT(mode);
++ if (mask & AT_MODE)
++ vap->va_mode = mode & MODEMASK;
++ if (mask & AT_UID)
++ vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid;
++ if (mask & AT_GID)
++ vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid;
+ vap->va_rdev = zfs_cmpldev(rdev);
+ vap->va_nodeid = nodeid;
+ }
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
new file mode 100644
index 0000000..50dacd0
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
@@ -0,0 +1,55 @@
+Index: sys/kern/uipc_usrreq.c
+===================================================================
+--- sys/kern/uipc_usrreq.c (revision 225745)
++++ sys/kern/uipc_usrreq.c (working copy)
+@@ -462,6 +462,8 @@
+ unp = sotounpcb(so);
+ KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
+
++ if (soun->sun_len > sizeof(struct sockaddr_un))
++ return (EINVAL);
+ namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
+ if (namelen <= 0)
+ return (EINVAL);
+@@ -1252,6 +1254,8 @@
+ unp = sotounpcb(so);
+ KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
+
++ if (nam->sa_len > sizeof(struct sockaddr_un))
++ return (EINVAL);
+ len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
+ if (len <= 0)
+ return (EINVAL);
+Index: sys/compat/linux/linux_socket.c
+===================================================================
+--- sys/compat/linux/linux_socket.c (revision 225919)
++++ sys/compat/linux/linux_socket.c (working copy)
+@@ -104,6 +104,7 @@
+ int oldv6size;
+ struct sockaddr_in6 *sin6;
+ #endif
++ int namelen;
+
+ if (*osalen < 2 || *osalen > UCHAR_MAX || !osa)
+ return (EINVAL);
+@@ -166,6 +167,20 @@
+ }
+ }
+
++ if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) {
++ for (namelen = 0;
++ namelen < *osalen - offsetof(struct sockaddr_un, sun_path);
++ namelen++)
++ if (!((struct sockaddr_un *)kosa)->sun_path[namelen])
++ break;
++ if (namelen + offsetof(struct sockaddr_un, sun_path) >
++ sizeof(struct sockaddr_un)) {
++ error = EINVAL;
++ goto out;
++ }
++ alloclen = sizeof(struct sockaddr_un);
++ }
++
+ sa = (struct sockaddr *) kosa;
+ sa->sa_family = bdom;
+ sa->sa_len = alloclen;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch
new file mode 100644
index 0000000..4824ff6
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch
@@ -0,0 +1,32 @@
+Taken from debian GNU/kFreeBSD.
+
+Regretably, with GCC 4.4 or later this is the only flag combination
+I could find that doesn't cause kernel panics CPU triple-faults or
+other kind of severe breakage. This is Gentoo Bug #410945.
+
+Clang can use -O2, so we do not force -O1 on it
+
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -41,6 +41,9 @@
+ .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
+ COPTFLAGS+= -fno-strict-aliasing
+ .endif
++.if ${CC:T:Mclang} != "clang" && !empty(COPTFLAGS:M-O[23s])
++COPTFLAGS+= -O1
++.endif
+ .if !defined(NO_CPU_COPTFLAGS)
+ COPTFLAGS+= ${_CPUCFLAGS}
+ .endif
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -91,6 +91,9 @@
+ .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
+ CFLAGS+= -fno-strict-aliasing
+ .endif
++.if ${CC:T:Mclang} != "clang" && !empty(CFLAGS:M-O[23s])
++CFLAGS+= -O1
++.endif
+ WERROR?= -Werror
+ CFLAGS+= ${WERROR}
+ CFLAGS+= -D_KERNEL
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch
new file mode 100644
index 0000000..840af81
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch
@@ -0,0 +1,33 @@
+diff -uNr sys.old/conf/kern.mk sys/conf/kern.mk
+--- sys.old/conf/kern.mk 2011-11-02 13:02:13.000000000 +0000
++++ sys/conf/kern.mk 2011-11-02 13:05:53.000000000 +0000
+@@ -5,7 +5,7 @@
+ #
+ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
+ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
+- -Wundef -Wno-pointer-sign -fformat-extensions \
++ -Wundef -Wno-pointer-sign \
+ -Wmissing-include-dirs -fdiagnostics-show-option
+ #
+ # The following flags are next up for working on:
+@@ -32,7 +32,7 @@
+ #
+ .if ${MACHINE_CPUARCH} == "i386"
+ .if ${CC:T:Mclang} != "clang"
+-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse
++CFLAGS+= -mpreferred-stack-boundary=2 -mno-sse
+ .else
+ CFLAGS+= -mno-aes -mno-avx
+ .endif
+diff -uNr sys.old/dev/aic7xxx/aicasm/Makefile sys/dev/aic7xxx/aicasm/Makefile
+--- sys.old/dev/aic7xxx/aicasm/Makefile 2011-11-02 13:02:11.000000000 +0000
++++ sys/dev/aic7xxx/aicasm/Makefile 2011-11-02 13:06:24.000000000 +0000
+@@ -14,7 +14,7 @@
+ SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
+ CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
+ DPADD= ${LIBL}
+-LDADD= -ll
++LDADD= -lfl
+ WARNS?= 5
+
+ # Correct path for kernel builds
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch
new file mode 100644
index 0000000..f0984f6
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch
@@ -0,0 +1,128 @@
+Index: sys/netinet6/in6.c
+===================================================================
+--- sys/netinet6/in6.c.orig
++++ sys/netinet6/in6.c
+@@ -1369,6 +1369,8 @@ in6_purgeaddr(struct ifaddr *ifa)
+ }
+
+ cleanup:
++ if (ifa0 != NULL)
++ ifa_free(ifa0);
+
+ plen = in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL); /* XXX */
+ if ((ia->ia_flags & IFA_ROUTE) && plen == 128) {
+@@ -1393,8 +1395,6 @@ cleanup:
+ return;
+ ia->ia_flags &= ~IFA_ROUTE;
+ }
+- if (ifa0 != NULL)
+- ifa_free(ifa0);
+
+ in6_unlink_ifa(ia, ifp);
+ }
+@@ -1667,14 +1667,19 @@ in6_lifaddr_ioctl(struct socket *so, u_long cmd, c
+ hostid = IFA_IN6(ifa);
+
+ /* prefixlen must be <= 64. */
+- if (64 < iflr->prefixlen)
++ if (64 < iflr->prefixlen) {
++ if (ifa != NULL)
++ ifa_free(ifa);
+ return EINVAL;
++ }
+ prefixlen = iflr->prefixlen;
+
+ /* hostid part must be zero. */
+ sin6 = (struct sockaddr_in6 *)&iflr->addr;
+ if (sin6->sin6_addr.s6_addr32[2] != 0 ||
+ sin6->sin6_addr.s6_addr32[3] != 0) {
++ if (ifa != NULL)
++ ifa_free(ifa);
+ return EINVAL;
+ }
+ } else
+@@ -2265,14 +2265,20 @@ in6_ifawithifp(struct ifnet *ifp, struct in6_addr
+ IN6_IFADDR_RUNLOCK();
+ return (struct in6_ifaddr *)ifa;
+ }
+- IN6_IFADDR_RUNLOCK();
+
+ /* use the last-resort values, that are, deprecated addresses */
+- if (dep[0])
++ if (dep[0]) {
++ ifa_ref((struct ifaddr *)dep[0]);
++ IN6_IFADDR_RUNLOCK();
+ return dep[0];
+- if (dep[1])
++ }
++ if (dep[1]) {
++ ifa_ref((struct ifaddr *)dep[1]);
++ IN6_IFADDR_RUNLOCK();
+ return dep[1];
++ }
+
++ IN6_IFADDR_RUNLOCK();
+ return NULL;
+ }
+
+Index: sys/netinet6/ip6_input.c
+===================================================================
+--- sys/netinet6/ip6_input.c.orig
++++ sys/netinet6/ip6_input.c
+@@ -879,19 +879,23 @@ passin:
+ * as our interface address (e.g. multicast addresses, addresses
+ * within FAITH prefixes and such).
+ */
+- if (deliverifp && !ip6_getdstifaddr(m)) {
++ if (deliverifp) {
+ struct in6_ifaddr *ia6;
+
+- ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
+- if (ia6) {
+- if (!ip6_setdstifaddr(m, ia6)) {
+- /*
+- * XXX maybe we should drop the packet here,
+- * as we could not provide enough information
+- * to the upper layers.
+- */
++ if ((ia6 = ip6_getdstifaddr(m)) != NULL) {
++ ifa_free(&ia6->ia_ifa);
++ } else {
++ ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
++ if (ia6) {
++ if (!ip6_setdstifaddr(m, ia6)) {
++ /*
++ * XXX maybe we should drop the packet here,
++ * as we could not provide enough information
++ * to the upper layers.
++ */
++ }
++ ifa_free(&ia6->ia_ifa);
+ }
+- ifa_free(&ia6->ia_ifa);
+ }
+ }
+
+Index: sys/netinet/tcp_input.c
+===================================================================
+--- sys/netinet/tcp_input.c.orig
++++ sys/netinet/tcp_input.c
+@@ -512,6 +512,8 @@ tcp6_input(struct mbuf **mp, int *offp, int proto)
+ (caddr_t)&ip6->ip6_dst - (caddr_t)ip6);
+ return IPPROTO_DONE;
+ }
++ if (ia6)
++ ifa_free(&ia6->ia_ifa);
+
+ tcp_input(m, *offp);
+ return IPPROTO_DONE;
+@@ -1240,7 +1242,8 @@ relocked:
+ rstreason = BANDLIM_RST_OPENPORT;
+ goto dropwithreset;
+ }
+- ifa_free(&ia6->ia_ifa);
++ if (ia6)
++ ifa_free(&ia6->ia_ifa);
+ }
+ #endif /* INET6 */
+ /*
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch
new file mode 100644
index 0000000..751a77c
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch
@@ -0,0 +1,13 @@
+u_int is defined in sys/types.h
+makes header usable alone.
+
+--- sys/sys/sysctl.h.old 2012-05-25 11:08:53.000000000 -0400
++++ sys/sys/sysctl.h 2012-05-25 11:09:16.000000000 -0400
+@@ -788,6 +788,7 @@
+ struct sysctl_req *);
+ #else /* !_KERNEL */
+ #include <sys/cdefs.h>
++#include <sys/types.h> /* for u_int */
+
+ __BEGIN_DECLS
+ int sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-MFC-r239588.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-MFC-r239588.patch
new file mode 100644
index 0000000..5390d0e
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-MFC-r239588.patch
@@ -0,0 +1,122 @@
+https://bugs.gentoo.org/444918
+
+Taken from
+http://svnweb.freebsd.org/base/stable/9/sys/kern/vfs_subr.c?r1=237839&r2=239755&view=patch
+
+FYI,
+http://svnweb.freebsd.org/base?view=revision&revision=239588
+
+--- stable/9/sys/kern/vfs_subr.c 2012/06/30 14:17:59 237839
++++ stable/9/sys/kern/vfs_subr.c 2012/08/27 20:25:26 239755
+@@ -41,6 +41,7 @@
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+
++#include "opt_compat.h"
+ #include "opt_ddb.h"
+ #include "opt_watchdog.h"
+
+@@ -3110,22 +3111,50 @@
+ /*
+ * Fill in a struct xvfsconf based on a struct vfsconf.
+ */
+-static void
+-vfsconf2x(struct vfsconf *vfsp, struct xvfsconf *xvfsp)
++static int
++vfsconf2x(struct sysctl_req *req, struct vfsconf *vfsp)
+ {
++ struct xvfsconf xvfsp;
+
+- strcpy(xvfsp->vfc_name, vfsp->vfc_name);
+- xvfsp->vfc_typenum = vfsp->vfc_typenum;
+- xvfsp->vfc_refcount = vfsp->vfc_refcount;
+- xvfsp->vfc_flags = vfsp->vfc_flags;
++ bzero(&xvfsp, sizeof(xvfsp));
++ strcpy(xvfsp.vfc_name, vfsp->vfc_name);
++ xvfsp.vfc_typenum = vfsp->vfc_typenum;
++ xvfsp.vfc_refcount = vfsp->vfc_refcount;
++ xvfsp.vfc_flags = vfsp->vfc_flags;
+ /*
+ * These are unused in userland, we keep them
+ * to not break binary compatibility.
+ */
+- xvfsp->vfc_vfsops = NULL;
+- xvfsp->vfc_next = NULL;
++ xvfsp.vfc_vfsops = NULL;
++ xvfsp.vfc_next = NULL;
++ return (SYSCTL_OUT(req, &xvfsp, sizeof(xvfsp)));
+ }
+
++#ifdef COMPAT_FREEBSD32
++struct xvfsconf32 {
++ uint32_t vfc_vfsops;
++ char vfc_name[MFSNAMELEN];
++ int32_t vfc_typenum;
++ int32_t vfc_refcount;
++ int32_t vfc_flags;
++ uint32_t vfc_next;
++};
++
++static int
++vfsconf2x32(struct sysctl_req *req, struct vfsconf *vfsp)
++{
++ struct xvfsconf32 xvfsp;
++
++ strcpy(xvfsp.vfc_name, vfsp->vfc_name);
++ xvfsp.vfc_typenum = vfsp->vfc_typenum;
++ xvfsp.vfc_refcount = vfsp->vfc_refcount;
++ xvfsp.vfc_flags = vfsp->vfc_flags;
++ xvfsp.vfc_vfsops = 0;
++ xvfsp.vfc_next = 0;
++ return (SYSCTL_OUT(req, &xvfsp, sizeof(xvfsp)));
++}
++#endif
++
+ /*
+ * Top level filesystem related information gathering.
+ */
+@@ -3133,14 +3162,16 @@
+ sysctl_vfs_conflist(SYSCTL_HANDLER_ARGS)
+ {
+ struct vfsconf *vfsp;
+- struct xvfsconf xvfsp;
+ int error;
+
+ error = 0;
+ TAILQ_FOREACH(vfsp, &vfsconf, vfc_list) {
+- bzero(&xvfsp, sizeof(xvfsp));
+- vfsconf2x(vfsp, &xvfsp);
+- error = SYSCTL_OUT(req, &xvfsp, sizeof xvfsp);
++#ifdef COMPAT_FREEBSD32
++ if (req->flags & SCTL_MASK32)
++ error = vfsconf2x32(req, vfsp);
++ else
++#endif
++ error = vfsconf2x(req, vfsp);
+ if (error)
+ break;
+ }
+@@ -3160,7 +3191,6 @@
+ int *name = (int *)arg1 - 1; /* XXX */
+ u_int namelen = arg2 + 1; /* XXX */
+ struct vfsconf *vfsp;
+- struct xvfsconf xvfsp;
+
+ printf("WARNING: userland calling deprecated sysctl, "
+ "please rebuild world\n");
+@@ -3184,9 +3214,12 @@
+ break;
+ if (vfsp == NULL)
+ return (EOPNOTSUPP);
+- bzero(&xvfsp, sizeof(xvfsp));
+- vfsconf2x(vfsp, &xvfsp);
+- return (SYSCTL_OUT(req, &xvfsp, sizeof(xvfsp)));
++#ifdef COMPAT_FREEBSD32
++ if (req->flags & SCTL_MASK32)
++ return (vfsconf2x32(req, vfsp));
++ else
++#endif
++ return (vfsconf2x(req, vfsp));
+ }
+ return (EOPNOTSUPP);
+ }
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch
new file mode 100644
index 0000000..b02d8b6
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch
@@ -0,0 +1,21 @@
+diff -Nur sys.orig/conf/kern.mk sys/conf/kern.mk
+--- sys.orig/conf/kern.mk 2012-07-12 13:26:37.000000000 +0900
++++ sys/conf/kern.mk 2012-07-16 02:32:19.000000000 +0900
+@@ -5,7 +5,7 @@
+ #
+ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
+ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
+- -Wundef -Wno-pointer-sign -fformat-extensions \
++ -Wundef -Wno-pointer-sign \
+ -Wmissing-include-dirs -fdiagnostics-show-option \
+ ${CWARNEXTRA}
+ #
+@@ -52,7 +52,7 @@
+ #
+ .if ${MACHINE_CPUARCH} == "i386"
+ .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
+-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
++CFLAGS+= -mpreferred-stack-boundary=2
+ .else
+ CFLAGS+= -mno-aes -mno-avx
+ .endif
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
new file mode 100644
index 0000000..0bf1b61
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
@@ -0,0 +1,26 @@
+Index: sys/amd64/amd64/trap.c
+===================================================================
+--- sys/amd64/amd64/trap.c.orig
++++ sys/amd64/amd64/trap.c (working copy)
+@@ -972,4 +972,21 @@
+ syscallname(td->td_proc, sa.code)));
+
+ syscallret(td, error, &sa);
++
++ /*
++ * If the user-supplied value of %rip is not a canonical
++ * address, then some CPUs will trigger a ring 0 #GP during
++ * the sysret instruction. However, the fault handler would
++ * execute with the user's %gs and %rsp in ring 0 which would
++ * not be safe. Instead, preemptively kill the thread with a
++ * SIGBUS.
++ */
++ if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) {
++ ksiginfo_init_trap(&ksi);
++ ksi.ksi_signo = SIGBUS;
++ ksi.ksi_code = BUS_OBJERR;
++ ksi.ksi_trapno = T_PROTFLT;
++ ksi.ksi_addr = (void *)td->td_frame->tf_rip;
++ trapsignal(td, &ksi);
++ }
+ }
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch
new file mode 100644
index 0000000..08110d6
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch
@@ -0,0 +1,16 @@
+Index: sys/compat/linux/linux_ioctl.c
+===================================================================
+--- sys/compat/linux/linux_ioctl.c (revision 242578)
++++ sys/compat/linux/linux_ioctl.c (working copy)
+@@ -2260,8 +2260,9 @@ again:
+
+ ifc.ifc_len = valid_len;
+ sbuf_finish(sb);
+- memcpy(PTRIN(ifc.ifc_buf), sbuf_data(sb), ifc.ifc_len);
+- error = copyout(&ifc, uifc, sizeof(ifc));
++ error = copyout(sbuf_data(sb), PTRIN(ifc.ifc_buf), ifc.ifc_len);
++ if (error == 0)
++ error = copyout(&ifc, uifc, sizeof(ifc));
+ sbuf_delete(sb);
+ CURVNET_RESTORE();
+
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r5.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r5.ebuild
new file mode 100644
index 0000000..b791358
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r4.ebuild,v 1.1 2012/06/27 10:29:23 naota Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # This replaces the gentoover patch, it doesn't need reapply every time.
+ sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+ -e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+ -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+ "${S}/conf/newvers.sh"
+
+ # workaround a kernel panic for amd64-fbsd, bug #408019
+ epatch "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+
+ # __FreeBSD_cc_version comes from FreeBSD's gcc.
+ # on 9.0-RELEASE it's 900001.
+ sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
+ -i "${S}/conf/kern.pre.mk" \
+ -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+ # Remove -Werror
+ sed -e "s:-Werror:-Wno-error:g" \
+ -i "${S}/conf/kern.pre.mk" \
+ -i "${S}/conf/kmod.mk" || die
+
+ epatch "${FILESDIR}/${PN}-9.0-gentoo.patch"
+ epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+ sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i "${S}/conf/ldscript.sparc64" || die
+ epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
+ epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+ epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+ epatch "${FILESDIR}/${PN}-7.1-includes.patch"
+ epatch "${FILESDIR}/${PN}-9.0-sysctluint.patch"
+
+ # By adding -DGENTOO_LIVECD to CFLAGS activate this stub
+ # vop_whiteout to tmpfs, so it can be used as an overlay
+ # unionfs filesystem over the cd9660 readonly filesystem.
+ epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
+
+ epatch "${FILESDIR}/${PN}-cve-2012-0217.patch"
+ epatch "${FILESDIR}/${PN}-9.0-ipv6refcount.patch"
+ epatch "${FILESDIR}/${PN}-cve-2012-4576.patch"
+}
+
+src_compile() {
+ einfo "Nothing to compile.."
+}
+
+src_install() {
+ insinto "/usr/src/sys-${MY_PVR}"
+ doins -r "${S}/"*
+}
+
+pkg_postinst() {
+ if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
+ einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+ # just in case...
+ [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+ elif use symlink; then
+ einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
+ rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't remove previous symlinks, please fix manually."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+ fi
+
+ if use sparc-fbsd ; then
+ ewarn "WARNING: kldload currently causes kernel panics"
+ ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+ ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+ ewarn "Please compile all modules you need into the kernel"
+ fi
+}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1-r1.ebuild
new file mode 100644
index 0000000..6842247
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1.ebuild,v 1.1 2012/09/11 17:29:57 aballier Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # This replaces the gentoover patch, it doesn't need reapply every time.
+ sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+ -e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+ -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+ "${S}/conf/newvers.sh"
+
+ # workaround a kernel panic for amd64-fbsd, bug #408019
+ epatch "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+
+ # __FreeBSD_cc_version comes from FreeBSD's gcc.
+ # on 9.0-RELEASE it's 900001.
+ sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
+ -i "${S}/conf/kern.pre.mk" \
+ -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+ # Remove -Werror
+ sed -e "s:-Werror:-Wno-error:g" \
+ -i "${S}/conf/kern.pre.mk" \
+ -i "${S}/conf/kmod.mk" || die
+
+ epatch "${FILESDIR}/${PN}-9.1-gentoo.patch"
+ epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+ sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i "${S}/conf/ldscript.sparc64" || die
+ epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
+ epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+ epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+ epatch "${FILESDIR}/${PN}-7.1-includes.patch"
+ epatch "${FILESDIR}/${PN}-9.0-sysctluint.patch"
+
+ # By adding -DGENTOO_LIVECD to CFLAGS activate this stub
+ # vop_whiteout to tmpfs, so it can be used as an overlay
+ # unionfs filesystem over the cd9660 readonly filesystem.
+ epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
+
+ epatch "${FILESDIR}/${PN}-cve-2012-4576.patch"
+}
+
+src_compile() {
+ einfo "Nothing to compile.."
+}
+
+src_install() {
+ insinto "/usr/src/sys-${MY_PVR}"
+ doins -r "${S}/"*
+}
+
+pkg_postinst() {
+ if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
+ einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+ # just in case...
+ [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+ elif use symlink; then
+ einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
+ rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't remove previous symlinks, please fix manually."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+ fi
+
+ if use sparc-fbsd ; then
+ ewarn "WARNING: kldload currently causes kernel panics"
+ ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+ ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+ ewarn "Please compile all modules you need into the kernel"
+ fi
+}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc2-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc2-r1.ebuild
new file mode 100644
index 0000000..c4539f0
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc2.ebuild,v 1.1 2012/10/14 15:28:12 aballier Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # This replaces the gentoover patch, it doesn't need reapply every time.
+ sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+ -e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+ -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+ "${S}/conf/newvers.sh"
+
+ # workaround a kernel panic for amd64-fbsd, bug #408019
+ epatch "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+
+ # __FreeBSD_cc_version comes from FreeBSD's gcc.
+ # on 9.0-RELEASE it's 900001.
+ sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
+ -i "${S}/conf/kern.pre.mk" \
+ -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+ # Remove -Werror
+ sed -e "s:-Werror:-Wno-error:g" \
+ -i "${S}/conf/kern.pre.mk" \
+ -i "${S}/conf/kmod.mk" || die
+
+ epatch "${FILESDIR}/${PN}-9.1-gentoo.patch"
+ epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+ sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i "${S}/conf/ldscript.sparc64" || die
+ epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
+ epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+ epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+ epatch "${FILESDIR}/${PN}-7.1-includes.patch"
+ epatch "${FILESDIR}/${PN}-9.0-sysctluint.patch"
+
+ # By adding -DGENTOO_LIVECD to CFLAGS activate this stub
+ # vop_whiteout to tmpfs, so it can be used as an overlay
+ # unionfs filesystem over the cd9660 readonly filesystem.
+ epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
+
+ epatch "${FILESDIR}/${PN}-cve-2012-4576.patch"
+}
+
+src_compile() {
+ einfo "Nothing to compile.."
+}
+
+src_install() {
+ insinto "/usr/src/sys-${MY_PVR}"
+ doins -r "${S}/"*
+}
+
+pkg_postinst() {
+ if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
+ einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+ # just in case...
+ [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+ elif use symlink; then
+ einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
+ rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't remove previous symlinks, please fix manually."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+ fi
+
+ if use sparc-fbsd ; then
+ ewarn "WARNING: kldload currently causes kernel panics"
+ ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+ ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+ ewarn "Please compile all modules you need into the kernel"
+ fi
+}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc3-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc3-r1.ebuild
new file mode 100644
index 0000000..25b4e67
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc3-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc3.ebuild,v 1.2 2012/11/24 11:30:56 aballier Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+ "${FILESDIR}/${PN}-9.1-gentoo.patch"
+ "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+ "${FILESDIR}/${PN}-6.1-ntfs.patch"
+ "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+ "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+ "${FILESDIR}/${PN}-7.1-includes.patch"
+ "${FILESDIR}/${PN}-9.0-sysctluint.patch"
+ "${FILESDIR}/${PN}-9.1-MFC-r239588.patch"
+ "${FILESDIR}/${PN}-cve-2012-4576.patch"
+ "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
+
+src_unpack() {
+ freebsd_src_unpack
+
+ # This replaces the gentoover patch, it doesn't need reapply every time.
+ sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+ -e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+ -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+ "${S}/conf/newvers.sh"
+
+ # __FreeBSD_cc_version comes from FreeBSD's gcc.
+ # on 9.0-RELEASE it's 900001.
+ sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
+ -i "${S}/conf/kern.pre.mk" \
+ -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+ # Remove -Werror
+ sed -e "s:-Werror:-Wno-error:g" \
+ -i "${S}/conf/kern.pre.mk" \
+ -i "${S}/conf/kmod.mk" || die
+}
+
+src_compile() {
+ einfo "Nothing to compile.."
+}
+
+src_install() {
+ insinto "/usr/src/sys-${MY_PVR}"
+ doins -r "${S}/"*
+}
+
+pkg_postinst() {
+ if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
+ einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+ # just in case...
+ [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+ elif use symlink; then
+ einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
+ rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't remove previous symlinks, please fix manually."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+ fi
+
+ if use sparc-fbsd ; then
+ ewarn "WARNING: kldload currently causes kernel panics"
+ ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+ ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+ ewarn "Please compile all modules you need into the kernel"
+ fi
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/
@ 2013-07-23 10:57 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2013-07-23 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 264ac9e4606fcd392ea8777bf87436e7750a3063
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Jul 23 10:56:25 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Jul 23 10:56:25 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=264ac9e4
freebsd-sources-9.9999: added 2 patches, required for successful compile.
---
sys-freebsd/freebsd-sources/Manifest | 4 +++-
.../files/freebsd-sources-9.9999-gentoo-gcc.patch | 13 ++++++++++
.../files/freebsd-sources-9.9999-no_ctf.patch | 28 ++++++++++++++++++++++
.../freebsd-sources-9.9999_p253470.ebuild | 2 ++
4 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index dd2f0c0..f603726 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -10,7 +10,9 @@ AUX freebsd-sources-9.0-ipv6refcount.patch 3259 SHA256 18186ef2f9fc020c0da053953
AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
AUX freebsd-sources-9.1-MFC-r239588.patch 3076 SHA256 c23f0f8b66c06e024413db49267d217225464c0f965d3ea4db07854c2e23458e SHA512 a11b6a7e7290a4c63dda13a15972cae57c21c0a23df8d3f7fe4679a2af273ea6b1be01b34e99148b4f61d83395f5453f65ccb3c2ebadfde57df02b9817e58e7b WHIRLPOOL 5ca75d43686d051e2282226ee4a82cc7e855353e409c1b08f98ea6b6a7d01b37b3bfac93483e6d5bf4883783a2608b4bb327cc5629877d77d4e1f2a68f1574e0
AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e
+AUX freebsd-sources-9.9999-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea1a30da8878014d0799220557820fd3a4bbe8 SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf WHIRLPOOL 42be74cafdad3e43815f638144b3ef8e89a7a95d791a312899a24387bf6a9cbc08acb0b30855d45fed607c6b73a3632afe1a44fb2bcd5738f76a7cf444b39218
AUX freebsd-sources-9.9999-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
+AUX freebsd-sources-9.9999-no_ctf.patch 1076 SHA256 35a1263b10208dc1e1e241bec4724009d809d270a54c06cfc77bfe5316b30d8b SHA512 aa2b71da3aabe89646f4f5006498223242b7d7e34dcf95a6334cd1deda57c5513a74847199f7bdfe575d86797c3c33a73af09a88b537d931d14881e76d8105fc WHIRLPOOL 3d4943cb6fdc8bc81713d6efed836fe8d61ece0a214cf76d516f7ca472a2bec5f0b38d7626aae7e3865871beea100d4082c050e38b1cc147f618c42bcb10a0af
AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
-EBUILD freebsd-sources-9.9999_p253470.ebuild 2470 SHA256 fc4eb40b1f485c9a9104bf3bf8a843264fc89ff8e6288fdecad2a801fff2b00c SHA512 89df229a24f5fa6a6caf25217483db3c1757c64c7b9efa8e8dfd5773c36e1ad4bf12e979e76abafec53b3d611a27ef17c505753b910d4ad4a89aebf0f355b9f2 WHIRLPOOL cb76e7912880ff005c72d879924fd088967356c76387e3f418eef9d4127e9d4239e6d2d1e392409b7a9c03934c25d54fc26b5177c3b2ee5d4bd1056b4aacf7b8
+EBUILD freebsd-sources-9.9999_p253470.ebuild 2556 SHA256 4cb37122af84787595089f70ae5bec27ff5a08888d6ff8aefd30de5902f39ef2 SHA512 0c4b45700e8914385ac269043760ad58004518c23458f86d2f9139ae402001dfe372b7c146b02d40c54c35d3c28a4a5a3b8a8d49f2edc4cd76ea59d5de758711 WHIRLPOOL 105590805a0060c9a3a818077f918a74eb0dcaca69b172f581ae82d40c81e7d9d9fb3e0be0f860cb035053df1b4b34607f053eda985f97ceee6b20c33225b5b7
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.9999-gentoo-gcc.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.9999-gentoo-gcc.patch
new file mode 100644
index 0000000..9076fd2
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.9999-gentoo-gcc.patch
@@ -0,0 +1,13 @@
+diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
+index e504f75..7aa63df 100644
+--- a/sys/conf/newvers.sh
++++ b/sys/conf/newvers.sh
+@@ -86,7 +86,7 @@ fi
+ touch version
+ v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
+ i=`${MAKE:-make} -V KERN_IDENT`
+-compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
++compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version' | tail -n 1)
+
+ for dir in /bin /usr/bin /usr/local/bin; do
+ if [ -x "${dir}/svnversion" ] ; then
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.9999-no_ctf.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.9999-no_ctf.patch
new file mode 100644
index 0000000..a3fe93f
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.9999-no_ctf.patch
@@ -0,0 +1,28 @@
+diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
+index 20d0c3f..3f5bf52 100644
+--- a/sys/amd64/conf/GENERIC
++++ b/sys/amd64/conf/GENERIC
+@@ -22,7 +22,8 @@ cpu HAMMER
+ ident GENERIC
+
+ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+-makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
++#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
++nomakeoptions WITH_CTF # Disabled on Gentoo/FreeBSD
+
+ options SCHED_ULE # ULE scheduler
+ options PREEMPTION # Enable kernel thread preemption
+diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
+index f77b0fc..1f67a3a 100644
+--- a/sys/i386/conf/GENERIC
++++ b/sys/i386/conf/GENERIC
+@@ -24,7 +24,8 @@ cpu I686_CPU
+ ident GENERIC
+
+ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+-makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
++#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
++nomakeoptions WITH_CTF # Disabled on Gentoo/FreeBSD
+
+ options SCHED_ULE # ULE scheduler
+ options PREEMPTION # Enable kernel thread preemption
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.9999_p253470.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.9999_p253470.ebuild
index 6bf7005..1e32da9 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.9999_p253470.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.9999_p253470.ebuild
@@ -30,6 +30,8 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
"${FILESDIR}/${PN}-7.1-includes.patch"
"${FILESDIR}/${PN}-9.0-sysctluint.patch"
+ "${FILESDIR}/${PN}-9.9999-no_ctf.patch"
+ "${FILESDIR}/${PN}-9.9999-gentoo-gcc.patch"
"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
src_unpack() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/
@ 2013-08-30 18:30 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2013-08-30 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 30a2effc364a6f57126d6d8eba24f334b711d1ad
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Aug 30 12:06:16 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Aug 30 12:06:16 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=30a2effc
freebsd-sources-9999_p255023: Updated the patch
---
sys-freebsd/freebsd-sources/Manifest | 3 ++-
.../files/freebsd-sources-9999-gentoo.patch | 22 ++++++++++++++++++++++
.../freebsd-sources-9999_p255023.ebuild | 3 +--
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 1c7f647..36c69f9 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -12,7 +12,8 @@ AUX freebsd-sources-9.1-MFC-r239588.patch 3076 SHA256 c23f0f8b66c06e024413db4926
AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e
AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea1a30da8878014d0799220557820fd3a4bbe8 SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf WHIRLPOOL 42be74cafdad3e43815f638144b3ef8e89a7a95d791a312899a24387bf6a9cbc08acb0b30855d45fed607c6b73a3632afe1a44fb2bcd5738f76a7cf444b39218
AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
+AUX freebsd-sources-9999-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf
AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
EBUILD freebsd-sources-9.9999.ebuild 3024 SHA256 c378a97b38a0aa17bd5999db9597622026967b5656f0c994df9d2701fe8c766f SHA512 72a1bac8e7d6171982ff3837fe336e51ae4bb355bb25fc9a72cf46b81b11b69d84d2d84099fb8e5bcb6ad13abe4eaba38e94b5cc57eddb85c873b291cea3a06f WHIRLPOOL 3d41a2874fa61fe78dbd3b9f8612ec3d1f51a53c756c3037450b5be0d2900e160ad8f251720ac1f99e477bde0cb1f1b1fcbd968ef71da172501a53a59142de05
-EBUILD freebsd-sources-9999_p255023.ebuild 3024 SHA256 c378a97b38a0aa17bd5999db9597622026967b5656f0c994df9d2701fe8c766f SHA512 72a1bac8e7d6171982ff3837fe336e51ae4bb355bb25fc9a72cf46b81b11b69d84d2d84099fb8e5bcb6ad13abe4eaba38e94b5cc57eddb85c873b291cea3a06f WHIRLPOOL 3d41a2874fa61fe78dbd3b9f8612ec3d1f51a53c756c3037450b5be0d2900e160ad8f251720ac1f99e477bde0cb1f1b1fcbd968ef71da172501a53a59142de05
+EBUILD freebsd-sources-9999_p255023.ebuild 2989 SHA256 2dbe561b58e8c0464a3de49e43fc6a3403e58f6ff46da935f5e5f9a039af0c4b SHA512 587d8152cfb332928bd058c11dca9b447c75eff2e1b05fec3cc0e16da604f122ae3d721d0e442abb30573d8b966a4d80a670493c18a37baae2997b01b24bc9b5 WHIRLPOOL fb479030cfa7a2695f20953af7ceed56b594931a6f9d81f8e58b1fa8e9c6a3ee36ef3f8315899d97a66daa76ec56013c06c6d6ec667343fffb7dee3cba75d773
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9999-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9999-gentoo.patch
new file mode 100644
index 0000000..c7e12bd
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9999-gentoo.patch
@@ -0,0 +1,22 @@
+diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
+index 2939a59..124ef6f 100644
+--- a/sys/conf/kern.mk
++++ b/sys/conf/kern.mk
+@@ -5,7 +5,7 @@
+ #
+ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
+ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
+- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \
++ -Wundef -Wno-pointer-sign \
+ -Wmissing-include-dirs -fdiagnostics-show-option \
+ ${CWARNEXTRA}
+ #
+@@ -61,7 +61,7 @@ FORMAT_EXTENSIONS= -fformat-extensions
+ #
+ .if ${MACHINE_CPUARCH} == "i386"
+ .if ${COMPILER_TYPE} != "clang"
+-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
++CFLAGS+= -mpreferred-stack-boundary=2
+ .else
+ CFLAGS+= -mno-aes -mno-avx
+ .endif
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9999_p255023.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9999_p255023.ebuild
index ad79ce4..7ade4a2 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9999_p255023.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9999_p255023.ebuild
@@ -32,9 +32,8 @@ S="${WORKDIR}/sys"
KERN_BUILD=GENERIC
PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
- "${FILESDIR}/${PN}-9.2-gentoo.patch"
+ "${FILESDIR}/${PN}-9999-gentoo.patch"
"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
- "${FILESDIR}/${PN}-6.1-ntfs.patch"
"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
"${FILESDIR}/${PN}-7.1-includes.patch"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/
@ 2013-10-15 11:28 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2013-10-15 11:28 UTC (permalink / raw
To: gentoo-commits
commit: 0713c06c6b86ed286b840953e912c27f901d2a93
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Oct 15 11:25:48 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Oct 15 11:25:48 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=0713c06c
freebsd-sources-10.9999_p256420: fix bug #487982
---
sys-freebsd/freebsd-sources/Manifest | 3 ++-
sys-freebsd/freebsd-sources/files/config-GENTOO | 4 ++++
.../freebsd-sources-10.9999_p256420.ebuild | 22 +++++++++++++++-------
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 6ae4c20..cc5bb53 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,3 +1,4 @@
+AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc1117f0aeb95b858 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 WHIRLPOOL 467ed565c0c6b508185f3c7d9a2031ce1861573614ba6fd5db7d6825fdaaabf23b9be1daef035d7fea9fa66f9d92ba17267085e894db66d8c9f49ed4ca9f16b9
AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf
AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14
@@ -15,5 +16,5 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea
AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
-EBUILD freebsd-sources-10.9999_p256420.ebuild 3010 SHA256 1d3bdcf72d8dd0be6f8734ebbe4aff7c224c19665a3d126b9973a7add610e423 SHA512 ec1b752ef08e06c9b28b5bb27cff85d103651f000c79da989546f43bef3b3a6504163928ecba4df135f0ed2126737680e3d5fed8b4cb2713574a3a83934f111e WHIRLPOOL 080ada2115091e9cb6f3980e75fb27ac8a1039c40a695a4ffd7a54cdef90b633d423510a398fab54c1b143fbbb58291bee8458ddb720d7c21effbc974ca6ac36
+EBUILD freebsd-sources-10.9999_p256420.ebuild 3290 SHA256 62cb0058559441d3d87dd0752e73301957bd381625c4722bbb77ad16d90dab8f SHA512 5f218360ff13490722d4221256fb5301f117f31b1f28a3cc4098bc30f962c22b42c7666c133ff90dff28c463e57541473a7b64c9e1a8b69f0d87ae649cd397d8 WHIRLPOOL d1f0678835dbce17600efb8d7a09ef2fa2e9070503af982c4aa3c5f0025a8999306af0c229285e304c39a7f124a3a3a3fe34ca417cb93249789cbda1c6cefffc
EBUILD freebsd-sources-9.9999.ebuild 3024 SHA256 c378a97b38a0aa17bd5999db9597622026967b5656f0c994df9d2701fe8c766f SHA512 72a1bac8e7d6171982ff3837fe336e51ae4bb355bb25fc9a72cf46b81b11b69d84d2d84099fb8e5bcb6ad13abe4eaba38e94b5cc57eddb85c873b291cea3a06f WHIRLPOOL 3d41a2874fa61fe78dbd3b9f8612ec3d1f51a53c756c3037450b5be0d2900e160ad8f251720ac1f99e477bde0cb1f1b1fcbd968ef71da172501a53a59142de05
diff --git a/sys-freebsd/freebsd-sources/files/config-GENTOO b/sys-freebsd/freebsd-sources/files/config-GENTOO
new file mode 100644
index 0000000..7c7eb26
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/config-GENTOO
@@ -0,0 +1,4 @@
+# Kernel configuration for Gentoo/FreeBSD.
+include GENERIC
+ident GENTOO
+
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.9999_p256420.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.9999_p256420.ebuild
index b37f9ee..143ae40 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.9999_p256420.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.9999_p256420.ebuild
@@ -9,7 +9,7 @@ inherit bsdmk freebsd flag-o-matic toolchain-funcs
DESCRIPTION="FreeBSD kernel sources"
SLOT="0"
-IUSE="+build-generic dtrace profile"
+IUSE="+build-generic debug dtrace profile zfs"
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
@@ -30,7 +30,7 @@ RESTRICT="strip binchecks"
S="${WORKDIR}/sys"
-KERN_BUILD=GENERIC
+KERN_BUILD=GENTOO
PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-10.0-gentoo.patch"
@@ -42,7 +42,13 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
+pkg_setup() {
+ use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
+}
+
src_prepare() {
+ local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
+
# This replaces the gentoover patch, it doesn't need reapply every time.
sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
@@ -60,6 +66,11 @@ src_prepare() {
-i "${S}/conf/kern.pre.mk" \
-i "${S}/conf/kmod.mk" || die
+ # Set the kernel configuration using USE flags.
+ cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
+ use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
+ use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
+
# Only used with USE=build-generic, let the kernel build with its own flags, its safer.
unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
}
@@ -74,12 +85,9 @@ src_configure() {
src_compile() {
if use build-generic ; then
- local myconf
- use dtrace || myconf="-DNO_CTF "
-
cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
- freebsd_src_compile depend ${myconf}
- freebsd_src_compile ${myconf}
+ freebsd_src_compile depend
+ freebsd_src_compile
else
einfo "Nothing to compile.."
fi
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/
@ 2014-01-23 11:06 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2014-01-23 11:06 UTC (permalink / raw
To: gentoo-commits
commit: 6eaf8819957c0c1b7cb89a6d839312046f0a3ea1
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Jan 23 11:06:11 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Jan 23 11:06:11 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=6eaf8819
fadded freebsd-sources-10.0-clang34.patch,
---
sys-freebsd/freebsd-sources/Manifest | 3 ++-
.../files/freebsd-sources-10.0-clang34.patch | 26 ++++++++++++++++++++++
.../freebsd-sources-10.0.9999.ebuild | 1 +
3 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 46285e4..2822f99 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,4 +1,5 @@
AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc1117f0aeb95b858 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 WHIRLPOOL 467ed565c0c6b508185f3c7d9a2031ce1861573614ba6fd5db7d6825fdaaabf23b9be1daef035d7fea9fa66f9d92ba17267085e894db66d8c9f49ed4ca9f16b9
+AUX freebsd-sources-10.0-clang34.patch 838 SHA256 2f1b02ff11ac48958857fa07168ea27f4974884cdf850f54f3c61541bf9617d2 SHA512 63403f328a2c394aefc66a6230e5c7699ca59d809780686055152f53ce5f7b86b7f2b083951e5e51d0a34ed20561f2473a22c3af8919f0336bf6f10a9db03113 WHIRLPOOL 5d0779ea5f5609f629d9751e365997ac39c2eaab3c0b8f2153b0ed17bf08896b581f3c109a51634be820f0e40b3cc18c6072b1540a1a270099263c63adfb3d67
AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf
AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14
@@ -16,4 +17,4 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea
AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
-EBUILD freebsd-sources-10.0.9999.ebuild 3528 SHA256 713c62fc61efaf7116d271195d37b6213405c22b41c2753deba6c06fc609067b SHA512 5bb80710bba5977456c5e8bda3769d6db27c6b83e579c8bc345f49678753792520b9fb67ff4c572c5e031a08cc140d2d1bc1697410e4715896db373e571ab42e WHIRLPOOL 5de4126149880d01bf21376736ff192e694124021c36a0fa9d0340a1526d5c2558e16e904564231aa4ce31a11346c6adf3564d580cacd4b951c2982679ed62cb
+EBUILD freebsd-sources-10.0.9999.ebuild 3568 SHA256 01a475909c436c8c87e2b595a5ad3d99123e587f538d056fed49022e89dd47f9 SHA512 e7d2d5ccfbeebdbf27faf1fab749144b7bd05ef7c1469e0ed44ac2a64799bb1ca1ebfc45b267f8782ee423e4c517f771b7d5847156c0df959d0c88ac805d5bfb WHIRLPOOL 4c3da21466f935d1c07965835507bcbcb69ab09521b9c619126121265305ed5db9215f2678a5a3942a56ee68834953d91486de33db31c6957b5eb15f411993f7
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-clang34.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-clang34.patch
new file mode 100644
index 0000000..271b436
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-clang34.patch
@@ -0,0 +1,26 @@
+http://svnweb.freebsd.org/base/stable/10/sys/modules/drm2/radeonkms/Makefile?r1=260321&r2=256281&view=patch
+
+diff -Nur sys.orig/modules/drm2/radeonkms/Makefile sys/modules/drm2/radeonkms/Makefile
+--- sys.orig/modules/drm2/radeonkms/Makefile 2014-01-25 00:19:59.000000000 +0900
++++ sys/modules/drm2/radeonkms/Makefile 2014-01-25 00:22:07.000000000 +0900
+@@ -1,5 +1,7 @@
+ # $FreeBSD: release/10.0.0/sys/modules/drm2/radeonkms/Makefile 254885 2013-08-25 19:37:15Z dumbbell $
+
++.include <bsd.own.mk>
++
+ .PATH: ${.CURDIR}/../../../dev/drm2/radeon
+
+ KMOD = radeonkms
+@@ -101,7 +103,10 @@
+ iicbus_if.h \
+ pci_if.h
+
+-CFLAGS += -I${.CURDIR}/../../../dev/drm2/radeon \
+- -fms-extensions
++
++CFLAGS += -I${.CURDIR}/../../../dev/drm2/radeon
++.if ${COMPILER_TYPE} == "gcc"
++CFLAGS += -fms-extensions
++.endif
+
+ .include <bsd.kmod.mk>
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.0.9999.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.9999.ebuild
index 930960b..a82f47c 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.0.9999.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.9999.ebuild
@@ -36,6 +36,7 @@ KERN_BUILD=GENTOO
PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-10.0-gentoo.patch"
+ "${FILESDIR}/${PN}-10.0-clang34.patch"
"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/
@ 2014-07-13 3:14 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2014-07-13 3:14 UTC (permalink / raw
To: gentoo-commits
commit: a11727c52e4d648aeae8e74c5ce58a8c4caf2334
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Jul 11 15:01:13 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Jul 11 15:01:13 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=a11727c5
freebsd-sources-10.0.0.9999-r4: security fix FreeBSD-SA-14:17.kmem
---
sys-freebsd/freebsd-sources/Manifest | 3 +-
.../files/freebsd-sources-10.0-SA-1417-kmem.patch | 263 +++++++++++++++++++++
...build => freebsd-sources-10.0.0.9999-r4.ebuild} | 3 +-
3 files changed, 267 insertions(+), 2 deletions(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 8c4ea32..2a4199c 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,5 +1,6 @@
AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc1117f0aeb95b858 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 WHIRLPOOL 467ed565c0c6b508185f3c7d9a2031ce1861573614ba6fd5db7d6825fdaaabf23b9be1daef035d7fea9fa66f9d92ba17267085e894db66d8c9f49ed4ca9f16b9
AUX freebsd-sources-10.0-EN-1407-pmap.patch 520 SHA256 64f3fc5765449538fecd6a911cf8fe4a03f8123a0169549ab2fa5363acbd4480 SHA512 eba94035c01d4e9819a89973a0e9baa2b573dfb20c9ee22cfbe786e29bb323beec54f6d6de2d14705c9a558ea6429e7a9edc81c34cd38ddcef4d9ed32b704108 WHIRLPOOL 4adb95ca70f781e5e812936a5fcf86149050bf10c12dccc9c1502ac6df79ae9f80e945b3872a55c187741d795f84e40ec83be015ecf9d7a729fcb13610429738
+AUX freebsd-sources-10.0-SA-1417-kmem.patch 10626 SHA256 217fed19e36d6febc973f2eff141e9d10ff5700122126b9097c36f9642b168e7 SHA512 0706bef96076723a92664316573c2a877e090213ea50fdde2418d8ea7d98acc76fd45832bb9b66a5af45b6fc97e9d6ab11e7aa561514a4c59ed3afce516d3581 WHIRLPOOL f06b189d12ee4dd7ccec1d84b68297d2b3e33c832440f01c94c07cf5e051e9fa8ef782c28d01f976a017941f832da0be88700575f1092498aaffb7eb931821ac
AUX freebsd-sources-10.0-clang34.patch 838 SHA256 2f1b02ff11ac48958857fa07168ea27f4974884cdf850f54f3c61541bf9617d2 SHA512 63403f328a2c394aefc66a6230e5c7699ca59d809780686055152f53ce5f7b86b7f2b083951e5e51d0a34ed20561f2473a22c3af8919f0336bf6f10a9db03113 WHIRLPOOL 5d0779ea5f5609f629d9751e365997ac39c2eaab3c0b8f2153b0ed17bf08896b581f3c109a51634be820f0e40b3cc18c6072b1540a1a270099263c63adfb3d67
AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf
AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
@@ -21,6 +22,6 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea
AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
-EBUILD freebsd-sources-10.0.0.9999-r3.ebuild 3722 SHA256 1787305dedb5935117f1c1d85a3997d981956af474d2d73f53a361816802c11e SHA512 15d00df0aab8898c2e2a6c2ca429d36ab7483e154350cf8e4a507287d4ba4efca0ec5d9d8c832bcf4e0181fda541978db0a981c5a545822861a28ee85b27955a WHIRLPOOL a9e5fb6d58962ed67b742c110871d4c4e311a34a81548b79ea63cdc7ac1747f55d66a7ef3e866b920ff3d6c91e92e42c4ceefde4096721c340040fe455b6a8c5
+EBUILD freebsd-sources-10.0.0.9999-r4.ebuild 3767 SHA256 157f4aca34c64778cb10fa0682ef2bcb71234a75d764617a2b565335a5fe0e06 SHA512 4404b0ca857ef88bad1f36238f79ee82a4806fee0207dfaa64c0e152d59f0a86450666d7fe0bff6134fdf8bffda0181f8169d68ae379d5016e49f1f4584f1fc6 WHIRLPOOL b7b8c3cf385134d59d76aa791cec0a290fd0c7c93c2d464084bdff8c4f6f074bff39a1d16ee7008d1b5024c9e75f1b78f07f33ac101a8426875e0e2a72abb0d5
EBUILD freebsd-sources-9.9999_p266864.ebuild 3480 SHA256 53444c2041f38e45f405f11f3ca98f833ddaec78d0ec9fd2c4d11d2826455404 SHA512 0d77fbb0c7a02d04f728f728ae89b1839fa042aa29d28189bbf82f378dd909d711f04cad5e9aab2b7ba2796dd50526475f7842664d63d09452a6359b995ef795 WHIRLPOOL 032aa9f584e58d1431d542968b927b670b40668e6350e1c3b05e38357d4da0a922ee5bdade75c1d5ca51727b3930cbe1803dec36cabcf91057e4406db2bca9a8
MISC metadata.xml 410 SHA256 f29a086ab076d7e7924571990c4cab73cce2aec303e10cf3be057dfa0c8b27fd SHA512 d949aac7499d418fce878c099d47713112e1856346dbf7478e95c14f37a5f2c2fbd580a21b2330712e439d5be235bc2de69ac182bd46c1727e95fbb3b081dd0f WHIRLPOOL ffc6ba7653dfa4be5d63231043a64c85a3ad2409f98b8e1f9cf03dd51edb84b1ed0add5a613e591e9f2409c92e3be08e8b3f7f2073fa45f362c19ef72ec7f63d
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-SA-1417-kmem.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-SA-1417-kmem.patch
new file mode 100644
index 0000000..433da94
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-SA-1417-kmem.patch
@@ -0,0 +1,263 @@
+Index: sys/kern/uipc_sockbuf.c
+===================================================================
+--- sys/kern/uipc_sockbuf.c (revision 268273)
++++ sys/kern/uipc_sockbuf.c (working copy)
+@@ -1071,6 +1071,11 @@ sbcreatecontrol(caddr_t p, int size, int type, int
+ m->m_len = 0;
+ KASSERT(CMSG_SPACE((u_int)size) <= M_TRAILINGSPACE(m),
+ ("sbcreatecontrol: short mbuf"));
++ /*
++ * Don't leave the padding between the msg header and the
++ * cmsg data and the padding after the cmsg data un-initialized.
++ */
++ bzero(cp, CMSG_SPACE((u_int)size));
+ if (p != NULL)
+ (void)memcpy(CMSG_DATA(cp), p, size);
+ m->m_len = CMSG_SPACE(size);
+Index: sys/netinet/sctp_auth.c
+===================================================================
+--- sys/netinet/sctp_auth.c (revision 268273)
++++ sys/netinet/sctp_auth.c (working copy)
+@@ -1790,6 +1790,7 @@ sctp_notify_authentication(struct sctp_tcb *stcb,
+
+ SCTP_BUF_LEN(m_notify) = 0;
+ auth = mtod(m_notify, struct sctp_authkey_event *);
++ memset(auth, 0, sizeof(struct sctp_authkey_event));
+ auth->auth_type = SCTP_AUTHENTICATION_EVENT;
+ auth->auth_flags = 0;
+ auth->auth_length = sizeof(*auth);
+Index: sys/netinet/sctp_indata.c
+===================================================================
+--- sys/netinet/sctp_indata.c (revision 268273)
++++ sys/netinet/sctp_indata.c (working copy)
+@@ -250,6 +250,11 @@ sctp_build_ctl_nchunk(struct sctp_inpcb *inp, stru
+
+ /* We need a CMSG header followed by the struct */
+ cmh = mtod(ret, struct cmsghdr *);
++ /*
++ * Make sure that there is no un-initialized padding between the
++ * cmsg header and cmsg data and after the cmsg data.
++ */
++ memset(cmh, 0, len);
+ if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_RECVRCVINFO)) {
+ cmh->cmsg_level = IPPROTO_SCTP;
+ cmh->cmsg_len = CMSG_LEN(sizeof(struct sctp_rcvinfo));
+Index: sys/netinet/sctputil.c
+===================================================================
+--- sys/netinet/sctputil.c (revision 268273)
++++ sys/netinet/sctputil.c (working copy)
+@@ -2622,6 +2622,7 @@ sctp_notify_assoc_change(uint16_t state, struct sc
+ }
+ SCTP_BUF_NEXT(m_notify) = NULL;
+ sac = mtod(m_notify, struct sctp_assoc_change *);
++ memset(sac, 0, notif_len);
+ sac->sac_type = SCTP_ASSOC_CHANGE;
+ sac->sac_flags = 0;
+ sac->sac_length = sizeof(struct sctp_assoc_change);
+@@ -2835,11 +2836,10 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uin
+ if (m_notify == NULL)
+ /* no space left */
+ return;
+- length += chk->send_size;
+- length -= sizeof(struct sctp_data_chunk);
+ SCTP_BUF_LEN(m_notify) = 0;
+ if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) {
+ ssfe = mtod(m_notify, struct sctp_send_failed_event *);
++ memset(ssfe, 0, length);
+ ssfe->ssfe_type = SCTP_SEND_FAILED_EVENT;
+ if (sent) {
+ ssfe->ssfe_flags = SCTP_DATA_SENT;
+@@ -2846,10 +2846,11 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uin
+ } else {
+ ssfe->ssfe_flags = SCTP_DATA_UNSENT;
+ }
++ length += chk->send_size;
++ length -= sizeof(struct sctp_data_chunk);
+ ssfe->ssfe_length = length;
+ ssfe->ssfe_error = error;
+ /* not exactly what the user sent in, but should be close :) */
+- bzero(&ssfe->ssfe_info, sizeof(ssfe->ssfe_info));
+ ssfe->ssfe_info.snd_sid = chk->rec.data.stream_number;
+ ssfe->ssfe_info.snd_flags = chk->rec.data.rcv_flags;
+ ssfe->ssfe_info.snd_ppid = chk->rec.data.payloadtype;
+@@ -2859,6 +2860,7 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uin
+ SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_send_failed_event);
+ } else {
+ ssf = mtod(m_notify, struct sctp_send_failed *);
++ memset(ssf, 0, length);
+ ssf->ssf_type = SCTP_SEND_FAILED;
+ if (sent) {
+ ssf->ssf_flags = SCTP_DATA_SENT;
+@@ -2865,6 +2867,8 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uin
+ } else {
+ ssf->ssf_flags = SCTP_DATA_UNSENT;
+ }
++ length += chk->send_size;
++ length -= sizeof(struct sctp_data_chunk);
+ ssf->ssf_length = length;
+ ssf->ssf_error = error;
+ /* not exactly what the user sent in, but should be close :) */
+@@ -2948,16 +2952,16 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, ui
+ /* no space left */
+ return;
+ }
+- length += sp->length;
+ SCTP_BUF_LEN(m_notify) = 0;
+ if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) {
+ ssfe = mtod(m_notify, struct sctp_send_failed_event *);
++ memset(ssfe, 0, length);
+ ssfe->ssfe_type = SCTP_SEND_FAILED_EVENT;
+ ssfe->ssfe_flags = SCTP_DATA_UNSENT;
++ length += sp->length;
+ ssfe->ssfe_length = length;
+ ssfe->ssfe_error = error;
+ /* not exactly what the user sent in, but should be close :) */
+- bzero(&ssfe->ssfe_info, sizeof(ssfe->ssfe_info));
+ ssfe->ssfe_info.snd_sid = sp->stream;
+ if (sp->some_taken) {
+ ssfe->ssfe_info.snd_flags = SCTP_DATA_LAST_FRAG;
+@@ -2971,12 +2975,13 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, ui
+ SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_send_failed_event);
+ } else {
+ ssf = mtod(m_notify, struct sctp_send_failed *);
++ memset(ssf, 0, length);
+ ssf->ssf_type = SCTP_SEND_FAILED;
+ ssf->ssf_flags = SCTP_DATA_UNSENT;
++ length += sp->length;
+ ssf->ssf_length = length;
+ ssf->ssf_error = error;
+ /* not exactly what the user sent in, but should be close :) */
+- bzero(&ssf->ssf_info, sizeof(ssf->ssf_info));
+ ssf->ssf_info.sinfo_stream = sp->stream;
+ ssf->ssf_info.sinfo_ssn = 0;
+ if (sp->some_taken) {
+@@ -3038,6 +3043,7 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb
+ return;
+ SCTP_BUF_LEN(m_notify) = 0;
+ sai = mtod(m_notify, struct sctp_adaptation_event *);
++ memset(sai, 0, sizeof(struct sctp_adaptation_event));
+ sai->sai_type = SCTP_ADAPTATION_INDICATION;
+ sai->sai_flags = 0;
+ sai->sai_length = sizeof(struct sctp_adaptation_event);
+@@ -3093,6 +3099,7 @@ sctp_notify_partial_delivery_indication(struct sct
+ return;
+ SCTP_BUF_LEN(m_notify) = 0;
+ pdapi = mtod(m_notify, struct sctp_pdapi_event *);
++ memset(pdapi, 0, sizeof(struct sctp_pdapi_event));
+ pdapi->pdapi_type = SCTP_PARTIAL_DELIVERY_EVENT;
+ pdapi->pdapi_flags = 0;
+ pdapi->pdapi_length = sizeof(struct sctp_pdapi_event);
+@@ -3202,6 +3209,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb)
+ /* no space left */
+ return;
+ sse = mtod(m_notify, struct sctp_shutdown_event *);
++ memset(sse, 0, sizeof(struct sctp_shutdown_event));
+ sse->sse_type = SCTP_SHUTDOWN_EVENT;
+ sse->sse_flags = 0;
+ sse->sse_length = sizeof(struct sctp_shutdown_event);
+@@ -3252,6 +3260,7 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb
+ }
+ SCTP_BUF_LEN(m_notify) = 0;
+ event = mtod(m_notify, struct sctp_sender_dry_event *);
++ memset(event, 0, sizeof(struct sctp_sender_dry_event));
+ event->sender_dry_type = SCTP_SENDER_DRY_EVENT;
+ event->sender_dry_flags = 0;
+ event->sender_dry_length = sizeof(struct sctp_sender_dry_event);
+@@ -3284,7 +3293,6 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb
+ struct mbuf *m_notify;
+ struct sctp_queued_to_read *control;
+ struct sctp_stream_change_event *stradd;
+- int len;
+
+ if ((stcb == NULL) ||
+ (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_CHANGEEVNT))) {
+@@ -3297,25 +3305,20 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb
+ return;
+ }
+ stcb->asoc.peer_req_out = 0;
+- m_notify = sctp_get_mbuf_for_msg(MCLBYTES, 0, M_NOWAIT, 1, MT_DATA);
++ m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_stream_change_event), 0, M_NOWAIT, 1, MT_DATA);
+ if (m_notify == NULL)
+ /* no space left */
+ return;
+ SCTP_BUF_LEN(m_notify) = 0;
+- len = sizeof(struct sctp_stream_change_event);
+- if (len > M_TRAILINGSPACE(m_notify)) {
+- /* never enough room */
+- sctp_m_freem(m_notify);
+- return;
+- }
+ stradd = mtod(m_notify, struct sctp_stream_change_event *);
++ memset(stradd, 0, sizeof(struct sctp_stream_change_event));
+ stradd->strchange_type = SCTP_STREAM_CHANGE_EVENT;
+ stradd->strchange_flags = flag;
+- stradd->strchange_length = len;
++ stradd->strchange_length = sizeof(struct sctp_stream_change_event);
+ stradd->strchange_assoc_id = sctp_get_associd(stcb);
+ stradd->strchange_instrms = numberin;
+ stradd->strchange_outstrms = numberout;
+- SCTP_BUF_LEN(m_notify) = len;
++ SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_stream_change_event);
+ SCTP_BUF_NEXT(m_notify) = NULL;
+ if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) {
+ /* no space */
+@@ -3346,7 +3349,6 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb
+ struct mbuf *m_notify;
+ struct sctp_queued_to_read *control;
+ struct sctp_assoc_reset_event *strasoc;
+- int len;
+
+ if ((stcb == NULL) ||
+ (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ASSOC_RESETEVNT))) {
+@@ -3353,25 +3355,20 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb
+ /* event not enabled */
+ return;
+ }
+- m_notify = sctp_get_mbuf_for_msg(MCLBYTES, 0, M_NOWAIT, 1, MT_DATA);
++ m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_assoc_reset_event), 0, M_NOWAIT, 1, MT_DATA);
+ if (m_notify == NULL)
+ /* no space left */
+ return;
+ SCTP_BUF_LEN(m_notify) = 0;
+- len = sizeof(struct sctp_assoc_reset_event);
+- if (len > M_TRAILINGSPACE(m_notify)) {
+- /* never enough room */
+- sctp_m_freem(m_notify);
+- return;
+- }
+ strasoc = mtod(m_notify, struct sctp_assoc_reset_event *);
++ memset(strasoc, 0, sizeof(struct sctp_assoc_reset_event));
+ strasoc->assocreset_type = SCTP_ASSOC_RESET_EVENT;
+ strasoc->assocreset_flags = flag;
+- strasoc->assocreset_length = len;
++ strasoc->assocreset_length = sizeof(struct sctp_assoc_reset_event);
+ strasoc->assocreset_assoc_id = sctp_get_associd(stcb);
+ strasoc->assocreset_local_tsn = sending_tsn;
+ strasoc->assocreset_remote_tsn = recv_tsn;
+- SCTP_BUF_LEN(m_notify) = len;
++ SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_assoc_reset_event);
+ SCTP_BUF_NEXT(m_notify) = NULL;
+ if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) {
+ /* no space */
+@@ -3424,6 +3421,7 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb,
+ return;
+ }
+ strreset = mtod(m_notify, struct sctp_stream_reset_event *);
++ memset(strreset, 0, len);
+ strreset->strreset_type = SCTP_STREAM_RESET_EVENT;
+ strreset->strreset_flags = flag;
+ strreset->strreset_length = len;
+@@ -6236,9 +6234,12 @@ sctp_soreceive(struct socket *so,
+ fromlen = 0;
+ }
+
++ if (filling_sinfo) {
++ memset(&sinfo, 0, sizeof(struct sctp_extrcvinfo));
++ }
+ error = sctp_sorecvmsg(so, uio, mp0, from, fromlen, flagsp,
+ (struct sctp_sndrcvinfo *)&sinfo, filling_sinfo);
+- if ((controlp) && (filling_sinfo)) {
++ if (controlp != NULL) {
+ /* copy back the sinfo in a CMSG format */
+ if (filling_sinfo)
+ *controlp = sctp_build_ctl_nchunk(inp,
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r4.ebuild
similarity index 97%
rename from sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r3.ebuild
rename to sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r4.ebuild
index 3466e8d..f8a1361 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r3.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r4.ebuild
@@ -47,7 +47,8 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-9.1-cve-2014-1453.patch"
"${FILESDIR}/${PN}-9.1-tcp.patch"
"${FILESDIR}/${PN}-9.1-ciss.patch"
- "${FILESDIR}/${PN}-10.0-EN-1407-pmap.patch" )
+ "${FILESDIR}/${PN}-10.0-EN-1407-pmap.patch"
+ "${FILESDIR}/${PN}-10.0-SA-1417-kmem.patch" )
pkg_setup() {
# Force set CC=clang. when using gcc, aesni fails to build.
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/
@ 2014-07-13 3:14 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2014-07-13 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 87484d4fc23b52a3578a532cdeda7245a049624e
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Jul 3 15:05:24 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Jul 3 15:05:24 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=87484d4f
freebsd-sources-10.0.0.9999-r3: eratta fix FreeBSD-EN-14:07.pmap
---
sys-freebsd/freebsd-sources/Manifest | 3 ++-
.../files/freebsd-sources-10.0-EN-1407-pmap.patch | 13 +++++++++++++
...9999-r2.ebuild => freebsd-sources-10.0.0.9999-r3.ebuild} | 3 ++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 831e8c2..8c4ea32 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,4 +1,5 @@
AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc1117f0aeb95b858 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 WHIRLPOOL 467ed565c0c6b508185f3c7d9a2031ce1861573614ba6fd5db7d6825fdaaabf23b9be1daef035d7fea9fa66f9d92ba17267085e894db66d8c9f49ed4ca9f16b9
+AUX freebsd-sources-10.0-EN-1407-pmap.patch 520 SHA256 64f3fc5765449538fecd6a911cf8fe4a03f8123a0169549ab2fa5363acbd4480 SHA512 eba94035c01d4e9819a89973a0e9baa2b573dfb20c9ee22cfbe786e29bb323beec54f6d6de2d14705c9a558ea6429e7a9edc81c34cd38ddcef4d9ed32b704108 WHIRLPOOL 4adb95ca70f781e5e812936a5fcf86149050bf10c12dccc9c1502ac6df79ae9f80e945b3872a55c187741d795f84e40ec83be015ecf9d7a729fcb13610429738
AUX freebsd-sources-10.0-clang34.patch 838 SHA256 2f1b02ff11ac48958857fa07168ea27f4974884cdf850f54f3c61541bf9617d2 SHA512 63403f328a2c394aefc66a6230e5c7699ca59d809780686055152f53ce5f7b86b7f2b083951e5e51d0a34ed20561f2473a22c3af8919f0336bf6f10a9db03113 WHIRLPOOL 5d0779ea5f5609f629d9751e365997ac39c2eaab3c0b8f2153b0ed17bf08896b581f3c109a51634be820f0e40b3cc18c6072b1540a1a270099263c63adfb3d67
AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf
AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
@@ -20,6 +21,6 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea
AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
-EBUILD freebsd-sources-10.0.0.9999-r2.ebuild 3677 SHA256 ae9bc98713f63ed33d56f44cd697d98f0cfd17bcfa394bccbb1302331f0d66d0 SHA512 6cfc223be526a5fdb72b7cf2c7c05b46c9f1d9fd9d3d8b348933b6642dccdd036fa1320d8a8af7c0dee68f3c106fea09b6b6776b518a611b98dbb56fc612ba07 WHIRLPOOL 7212dc28d0b8fd7d9955f7c126911e7f05e4ef7f07d8ab61ff5784b0740c861f625ca7f394e8361aadc75dbc11f5a507a66a272094d7151422d1c7c073b82682
+EBUILD freebsd-sources-10.0.0.9999-r3.ebuild 3722 SHA256 1787305dedb5935117f1c1d85a3997d981956af474d2d73f53a361816802c11e SHA512 15d00df0aab8898c2e2a6c2ca429d36ab7483e154350cf8e4a507287d4ba4efca0ec5d9d8c832bcf4e0181fda541978db0a981c5a545822861a28ee85b27955a WHIRLPOOL a9e5fb6d58962ed67b742c110871d4c4e311a34a81548b79ea63cdc7ac1747f55d66a7ef3e866b920ff3d6c91e92e42c4ceefde4096721c340040fe455b6a8c5
EBUILD freebsd-sources-9.9999_p266864.ebuild 3480 SHA256 53444c2041f38e45f405f11f3ca98f833ddaec78d0ec9fd2c4d11d2826455404 SHA512 0d77fbb0c7a02d04f728f728ae89b1839fa042aa29d28189bbf82f378dd909d711f04cad5e9aab2b7ba2796dd50526475f7842664d63d09452a6359b995ef795 WHIRLPOOL 032aa9f584e58d1431d542968b927b670b40668e6350e1c3b05e38357d4da0a922ee5bdade75c1d5ca51727b3930cbe1803dec36cabcf91057e4406db2bca9a8
MISC metadata.xml 410 SHA256 f29a086ab076d7e7924571990c4cab73cce2aec303e10cf3be057dfa0c8b27fd SHA512 d949aac7499d418fce878c099d47713112e1856346dbf7478e95c14f37a5f2c2fbd580a21b2330712e439d5be235bc2de69ac182bd46c1727e95fbb3b081dd0f WHIRLPOOL ffc6ba7653dfa4be5d63231043a64c85a3ad2409f98b8e1f9cf03dd51edb84b1ed0add5a613e591e9f2409c92e3be08e8b3f7f2073fa45f362c19ef72ec7f63d
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-EN-1407-pmap.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-EN-1407-pmap.patch
new file mode 100644
index 0000000..078d6e0
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-EN-1407-pmap.patch
@@ -0,0 +1,13 @@
+Index: sys/amd64/amd64/pmap.c
+===================================================================
+--- sys/amd64/amd64/pmap.c (revision 267572)
++++ sys/amd64/amd64/pmap.c (working copy)
+@@ -367,7 +367,7 @@ static int pmap_flags = PMAP_PDE_SUPERPAGE; /* fla
+
+ static struct unrhdr pcid_unr;
+ static struct mtx pcid_mtx;
+-int pmap_pcid_enabled = 1;
++int pmap_pcid_enabled = 0;
+ SYSCTL_INT(_vm_pmap, OID_AUTO, pcid_enabled, CTLFLAG_RDTUN, &pmap_pcid_enabled,
+ 0, "Is TLB Context ID enabled ?");
+ int invpcid_works = 0;
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r3.ebuild
similarity index 97%
rename from sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r2.ebuild
rename to sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r3.ebuild
index 79ef331..3466e8d 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r3.ebuild
@@ -46,7 +46,8 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
"${FILESDIR}/${PN}-9.1-cve-2014-1453.patch"
"${FILESDIR}/${PN}-9.1-tcp.patch"
- "${FILESDIR}/${PN}-9.1-ciss.patch" )
+ "${FILESDIR}/${PN}-9.1-ciss.patch"
+ "${FILESDIR}/${PN}-10.0-EN-1407-pmap.patch" )
pkg_setup() {
# Force set CC=clang. when using gcc, aesni fails to build.
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/
@ 2014-07-13 3:14 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2014-07-13 3:14 UTC (permalink / raw
To: gentoo-commits
commit: f5db614c82cf25e4a2c59bc35212b5535fd34f2e
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Wed May 21 15:03:53 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Wed May 21 15:03:53 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=f5db614c
freebsd-sources-10.0.0.9999-r2: eratta fix FreeBSD-EN-14:05.ciss
---
sys-freebsd/freebsd-sources/Manifest | 3 +-
.../files/freebsd-sources-9.1-ciss.patch | 65 ++++++++++++++++++++++
...build => freebsd-sources-10.0.0.9999-r2.ebuild} | 3 +-
3 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 083ef88..e6d6ae4 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -12,6 +12,7 @@ AUX freebsd-sources-9.0-gentoo.patch 1194 SHA256 251178d014e62fbc3f20c26dd0e7840
AUX freebsd-sources-9.0-ipv6refcount.patch 3259 SHA256 18186ef2f9fc020c0da053953b9e8c8629c2302082e0ee172dd7e84a7104bdd5 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658 WHIRLPOOL c0511b2fec1f2ecc8a6e3aba23808a4c60a4c94f45693b6f21a30cb01386e24969fcc9b655584c78a501524579f7e266993fdd6d565525740f4f8e04f47b55a9
AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
AUX freebsd-sources-9.1-MFC-r239588.patch 3076 SHA256 c23f0f8b66c06e024413db49267d217225464c0f965d3ea4db07854c2e23458e SHA512 a11b6a7e7290a4c63dda13a15972cae57c21c0a23df8d3f7fe4679a2af273ea6b1be01b34e99148b4f61d83395f5453f65ccb3c2ebadfde57df02b9817e58e7b WHIRLPOOL 5ca75d43686d051e2282226ee4a82cc7e855353e409c1b08f98ea6b6a7d01b37b3bfac93483e6d5bf4883783a2608b4bb327cc5629877d77d4e1f2a68f1574e0
+AUX freebsd-sources-9.1-ciss.patch 2067 SHA256 a450312394a9ed449144c1b320ec323f8fcd6cb744ad6c6862046b0fd5086e4e SHA512 5b8088644813d465443754f248e0068da1c53b4f947b7c1e584ae9dcd9b7b135a53edd70efc463b500aef74c4f8193e2d1d349b39ce183ed1f18284a2c2d7989 WHIRLPOOL 59f1324eaa98e11a094e4fe48e8ad8f468bc373691de101c5082630d1a69d10a3e6d904f3b6138a2107b0f35f37c16f07da575c1efb4bbfa22869a7cf328e5e2
AUX freebsd-sources-9.1-cve-2014-1453.patch 2239 SHA256 2605926b9a36cf2eecf65fc3bcc92ed772922562fdfebfd39c99137526f2a440 SHA512 27b48c96447cb961d2de3ad7f67a739ff78ee3904da508b2e6c1948d299090cb169bd3f289b0448e7d242c1c0d39fd5e5fc29700d92ba4877c3e6d013a6cd6a1 WHIRLPOOL 206c18f70756f77050c681ee4b14f7e0d0e38cac42d146ae0ccd9bd79a3977c4db57d1456c3bfe0294dad313eead5dfb748446e0fa401c98105ea53097505e45
AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e
AUX freebsd-sources-9.1-tcp.patch 1249 SHA256 a51412349a8724931cfc749150e3c07802126382a6ce5dbbc6617e4f81188e7a SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e WHIRLPOOL 6e81938c55e2a40f4d75a53f4bfeac1c4183feebf023bcc320c0179dbf802151cc5f04dde9302e233eff86c33fdca8a6e80dda70d47d0d762da61e22782b1b0d
@@ -19,6 +20,6 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea
AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
-EBUILD freebsd-sources-10.0.0.9999-r1.ebuild 3641 SHA256 cce2c6e2e62a0bc78ebdb826ef5ddd75987cb2ae45cfde1751013dcbef7c76d7 SHA512 a94e26610a8749944f5e5c8fcf4d30bd8997057729100a663fc733b523465f0256c866f1d0298d3a6aa41c2579230be2038148b0a53dd4b726625b56ab995de4 WHIRLPOOL 90076354fa4abbe64f629d65fb3de3fcd12aca359b56a42aa59e3a00316f0f1a7239cf8341846847f576635fe2ce0a7dfde2d41f2fb12e8420a104fdc3f4cf95
+EBUILD freebsd-sources-10.0.0.9999-r2.ebuild 3677 SHA256 ae9bc98713f63ed33d56f44cd697d98f0cfd17bcfa394bccbb1302331f0d66d0 SHA512 6cfc223be526a5fdb72b7cf2c7c05b46c9f1d9fd9d3d8b348933b6642dccdd036fa1320d8a8af7c0dee68f3c106fea09b6b6776b518a611b98dbb56fc612ba07 WHIRLPOOL 7212dc28d0b8fd7d9955f7c126911e7f05e4ef7f07d8ab61ff5784b0740c861f625ca7f394e8361aadc75dbc11f5a507a66a272094d7151422d1c7c073b82682
EBUILD freebsd-sources-9.9999.ebuild 3480 SHA256 53444c2041f38e45f405f11f3ca98f833ddaec78d0ec9fd2c4d11d2826455404 SHA512 0d77fbb0c7a02d04f728f728ae89b1839fa042aa29d28189bbf82f378dd909d711f04cad5e9aab2b7ba2796dd50526475f7842664d63d09452a6359b995ef795 WHIRLPOOL 032aa9f584e58d1431d542968b927b670b40668e6350e1c3b05e38357d4da0a922ee5bdade75c1d5ca51727b3930cbe1803dec36cabcf91057e4406db2bca9a8
MISC metadata.xml 410 SHA256 f29a086ab076d7e7924571990c4cab73cce2aec303e10cf3be057dfa0c8b27fd SHA512 d949aac7499d418fce878c099d47713112e1856346dbf7478e95c14f37a5f2c2fbd580a21b2330712e439d5be235bc2de69ac182bd46c1727e95fbb3b081dd0f WHIRLPOOL ffc6ba7653dfa4be5d63231043a64c85a3ad2409f98b8e1f9cf03dd51edb84b1ed0add5a613e591e9f2409c92e3be08e8b3f7f2073fa45f362c19ef72ec7f63d
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch
new file mode 100644
index 0000000..697984b
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch
@@ -0,0 +1,65 @@
+Index: sys/dev/ciss/ciss.c
+===================================================================
+--- sys/dev/ciss/ciss.c (revision 264510)
++++ sys/dev/ciss/ciss.c (revision 264511)
+@@ -180,8 +180,6 @@
+ static void ciss_cam_poll(struct cam_sim *sim);
+ static void ciss_cam_complete(struct ciss_request *cr);
+ static void ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio);
+-static struct cam_periph *ciss_find_periph(struct ciss_softc *sc,
+- int bus, int target);
+ static int ciss_name_device(struct ciss_softc *sc, int bus, int target);
+
+ /* periodic status monitoring */
+@@ -3398,27 +3396,6 @@
+
+
+ /********************************************************************************
+- * Find a peripheral attached at (target)
+- */
+-static struct cam_periph *
+-ciss_find_periph(struct ciss_softc *sc, int bus, int target)
+-{
+- struct cam_periph *periph;
+- struct cam_path *path;
+- int status;
+-
+- status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]),
+- target, 0);
+- if (status == CAM_REQ_CMP) {
+- periph = cam_periph_find(path, NULL);
+- xpt_free_path(path);
+- } else {
+- periph = NULL;
+- }
+- return(periph);
+-}
+-
+-/********************************************************************************
+ * Name the device at (target)
+ *
+ * XXX is this strictly correct?
+@@ -3427,12 +3404,22 @@
+ ciss_name_device(struct ciss_softc *sc, int bus, int target)
+ {
+ struct cam_periph *periph;
++ struct cam_path *path;
++ int status;
+
+ if (CISS_IS_PHYSICAL(bus))
+ return (0);
+- if ((periph = ciss_find_periph(sc, bus, target)) != NULL) {
++
++ status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]),
++ target, 0);
++
++ if (status == CAM_REQ_CMP) {
++ mtx_lock(&sc->ciss_mtx);
++ periph = cam_periph_find(path, NULL);
+ sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d",
+ periph->periph_name, periph->unit_number);
++ mtx_unlock(&sc->ciss_mtx);
++ xpt_free_path(path);
+ return(0);
+ }
+ sc->ciss_logical[bus][target].cl_name[0] = 0;
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r2.ebuild
similarity index 98%
rename from sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r1.ebuild
rename to sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r2.ebuild
index e0b09e6..79ef331 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r2.ebuild
@@ -45,7 +45,8 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
"${FILESDIR}/${PN}-9.1-cve-2014-1453.patch"
- "${FILESDIR}/${PN}-9.1-tcp.patch" )
+ "${FILESDIR}/${PN}-9.1-tcp.patch"
+ "${FILESDIR}/${PN}-9.1-ciss.patch" )
pkg_setup() {
# Force set CC=clang. when using gcc, aesni fails to build.
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/
@ 2016-09-30 11:40 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2016-09-30 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 348d0cda29759191a1a77af2b34e3543a198a0a0
Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Fri Sep 30 11:32:54 2016 +0000
Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Fri Sep 30 11:32:54 2016 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=348d0cda
sys-freebsd/freebsd-sources: remove ${PN}-11.0-gentoo.patch
sys-freebsd/freebsd-sources/Manifest | 3 +--
.../freebsd-sources/files/freebsd-sources-11.0-gentoo.patch | 13 -------------
sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild | 1 -
3 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index bfa922f..5dcfe24 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -2,7 +2,6 @@ AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc111
AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf
AUX freebsd-sources-10.1-gcc48.patch 452 SHA256 26ad0753e59bd7e45f957cc98c8a11c8c1bcaf89ed55898b4efc6d95e3943671 SHA512 55e5249ec8337d880d96fd9429a0ffe5663c6182996b6b2ab8d19fe9d5168a0042b81222b2bb89de6d90f98d042b593fb40a7f4178ac739f681f84c2d62b5c96 WHIRLPOOL b6ed5ad4d7e444c79afcc0a14ce9fc85fddd5d1ae6b1d7dc8aa3e4949bb598e0da7a0d95025ba7e3981fc0af741c52e3c84fc81cba00bc79f59ab510afa85441
AUX freebsd-sources-11.0-gentoo-gcc.patch 430 SHA256 e8f031a81dc611c7368bbb4330f2e162a50b72af9b3cdce012c93d0130668b8f SHA512 9869ba13091cc0975a7fe1a1b18a279835d19f1f57204dd3463798d3695a250ba6c96f2c1f6a2352dfce0022d7365257b0f938032b55e7090f68e58c4455bffe WHIRLPOOL 01b61475aabca1647092a8d77c426ffd609ce66a508672eb85b87f2b25db37dbc6191a3f9bfaa24f5fe03a233c122a4f2b971c3a4f4fd9022acaad55c8ad3427
-AUX freebsd-sources-11.0-gentoo.patch 464 SHA256 b027a41e0ffb719e3692a167830f7efe56c3cd4cabd6196578ad1cb40f91532c SHA512 5177ddb7cb5db32ed479fb3201911a76f225f15de8eb422a0c00355c1e8769ca71a46f6dea14d4b5e0a55e2a3ac53939ee25032c5f4b7cb8d25a3cafde078836 WHIRLPOOL b1747199f6ff9b12f5c431bca78dc6f8d454fd4dd638b9d9091dc03577d0f78c6089462b923ab33b819ae1172b70e23b32cfaf1b88746f8252e21df25b781880
AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14
AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512
@@ -35,5 +34,5 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea
AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae
DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dcf7f419
-EBUILD freebsd-sources-11.0.ebuild 4558 SHA256 0888e4513ee7dbb559c674a28e55dd6ab1b460c20d66ec1ef24af74559ea93a5 SHA512 984343d5c15d000e291c2e7e84bda9a601bc80c1922cc73b3107e39e05a42cd34fde4b9901f653e3576e04c109bd8aa4dedb5fe01d1db4515b2e133966cecdb0 WHIRLPOOL 4f2750b3b03ad1f35f9b7a77a080cd7b280ceec9be21db0057dc4f54ff3c30fca07be67c13c4bb158f0266e916e8d9fc95a359af89ebfdb9b2c31f84f3d1bab3
+EBUILD freebsd-sources-11.0.ebuild 4519 SHA256 a29fce1572ae6c34ed54d974f666607f4ef0331a3fe1eee450c17af17aba03dc SHA512 98dd91a352143754c44a6d8f302fd61ce0dd33a744c652983484405786af2edb0e43941cb8c8ea3b5a5b1710e7719055e8887e0d864ae487388af4714a4f813f WHIRLPOOL 13e62b88847320ede84ad38634a945913d3bcfdb4af71f771263ffcb4ea39da5f8fdd0ee942879b1f80eec52ffe9e2aac6e44d62416c7d1853996fd8f15f43d8
MISC metadata.xml 444 SHA256 c4696a22f747056498f14d7fbac5d3b317ee5ed5d0762351003ae7873475ff39 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc WHIRLPOOL af64f83a4459752b8b8656412abaf5feaedbaa4b06dbbd0a71f31fc440eb945d39617a540e6b9969586b190c984452f1eaded80062481c6b2b0121482cfa61c2
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch
deleted file mode 100644
index c0bfb47..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
-index 85be39e..b6aab23 100644
---- a/sys/conf/kern.mk
-+++ b/sys/conf/kern.mk
-@@ -5,7 +5,7 @@
- #
- CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \
-+ -Wundef -Wno-pointer-sign \
- -Wmissing-include-dirs -fdiagnostics-show-option \
- -Wno-unknown-pragmas \
- ${CWARNEXTRA}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild
index eb1120d..a14f752 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild
@@ -45,7 +45,6 @@ S="${WORKDIR}/sys"
KERN_BUILD=GENTOO
PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
- "${FILESDIR}/${PN}-11.0-gentoo.patch"
"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
"${FILESDIR}/${PN}-7.1-includes.patch"
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-09-30 11:40 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-13 3:14 [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/ Yuta SATOH
-- strict thread matches above, loose matches on Subject: below --
2016-09-30 11:40 Yuta SATOH
2014-07-13 3:14 Yuta SATOH
2014-07-13 3:14 Yuta SATOH
2014-01-23 11:06 Yuta SATOH
2013-10-15 11:28 Yuta SATOH
2013-08-30 18:30 Yuta SATOH
2013-07-23 10:57 Yuta SATOH
2012-11-29 14:07 Yuta SATOH
2012-09-11 17:29 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox