diff options
Diffstat (limited to 'sys-freebsd/freebsd-sources')
10 files changed, 30 insertions, 323 deletions
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index 873cb24befd4..d85a4f69ce36 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -5,13 +5,9 @@ AUX freebsd-sources-11.0-gentoo.patch 852 BLAKE2B 81306d42748674cf550d5399a1ab02 AUX freebsd-sources-6.0-flex-2.5.31.patch 826 BLAKE2B 7644dccfb8ad6242c903fb0d5d81601c9ab395628a1cfdc299a31575db4ea6656ac1d3e6c15c751e96a7ce384909e95a90928b3cd1caa9de7d926a3ad9682092 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 AUX freebsd-sources-6.1-ntfs.patch 1043 BLAKE2B cf7777656f4d49975c7ad4cb5786c0534c80db87cdc3ecc46619d4f757ad087527fbbd96a436a309255e8968341c9dda71cc485277ee485ab5b8127482120e03 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 BLAKE2B 86ef2add961195d4429db30e7d43ba3f6d43c1c2316e269e952e8e0c84da82fc6ec77fc84e7c3be2d5a5f76bec9e093b7d748ffbb57fa168f31c007066ae64d2 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 -AUX freebsd-sources-7.1-binutils_link.patch 1297 BLAKE2B 31f31c0a5b8999bf774e498d2b0734aaa7521b6af9e1b6ecbff17d0300ae74fce8daf62b451ebbea18d484c8f62cfd71643a703fca110c254a1185ad3daf13b8 SHA512 0e3aa342646d18429ed76e484d7e15d353d858f00bda906dae74b01b4e73f1b4ccfb6404590d79cb206da3a732528a4437813540a26292d697ccc3b964dabfb0 AUX freebsd-sources-7.1-includes.patch 318 BLAKE2B e95da1360824b9a5037bf55deda2d92a72a08e0e42f8ecd4080863bed69f10137b2c2637bafbe1088fe6bf2bfed7f83a748cab42a14b41b7243efd524ae15589 SHA512 f73db3fd72bdd2972ae25c3f661e7677bd5877aa623981303a4b0c5e9522fd458e294799a0ebad17ac3c639d588394b10ad5fcab4d88743a6dfcc8a8d60eecd7 AUX freebsd-sources-7.1-types.h-fix.patch 371 BLAKE2B 358a52999cd48561beb41e051829e0d47aba07d73b8852c0e164debfeeaa22e8dd04249897f807192239be3be673f1a51df98f8ee63529ceca5d469fd6cfc5e5 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f -AUX freebsd-sources-7.2-debug-O2.patch 771 BLAKE2B 97217822a435da048d6c628e5a3fd9ad104dc8e8a98cf992561f9e3750aaca7088eaded205fd53b0b28c6ba9d42160b7cd8be58849c9832387e4abb47838bde3 SHA512 a74dacbd24c6130ec4c762a9c2df58a37d5fee2ee6fa4a970245b53837afa5ee3f72318b6e723e0591ddce00a5aa0fd66746a06783174d4edb9814e3a3724201 -AUX freebsd-sources-8.0-gentoo.patch 1138 BLAKE2B 806bed2b9fad754bef54fa37795063d1f66314885726e22e0b46a9f3249eed72956b0a45a0d8af7bc9d699962b4311b86e582440e209d8e16f14f5a904a3bc7c SHA512 677adbbbba367bda65f01b604a0a6235ac12d7b307857fa35c7722eb05e0a74d3cd35c03a9dfa56023b7869a865959c9edcfa601d841add92ff21a941d395ddc AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 BLAKE2B 2c783822d71de3633c5b914a38d1a80b9afd4a5e4335ac9a01da605306c8d0f5605970f808d9b7c93e9853a7b741eaec8f0b1701602160761404558eaf93f680 SHA512 9ae65e2775302b664dd4e5f5cbc58fe1ca7db61b6182db10971660207c72ec74e542181f1c2aefcacd2fd4b54e10d371efc619c3c03a977c35d3cf67b99b7de5 -AUX freebsd-sources-8.2-unix2.patch 1642 BLAKE2B 96b784136100ca1094c847496f9755ff0e4b3bc033266c9f7cbe2be3fc89e963214e2bf479efab0c5e7005880cfcf6d767242cc8671965bb43cc5853b66e1c0b SHA512 a7f8166abc9883cab92a4b1ce038cefc3c00a6567fd79ebab96ccebbed7e230459dd8efc0b96ba2029a89b4b5d41305be87d0c40ad85fcfe4c819a4604b4490b AUX freebsd-sources-9.0-disable-optimization.patch 927 BLAKE2B 42fff42c4d1bc57aed5c4b4dc30328f8ac3317f36cb3b4df60690e5ce9e3ef19d2a1b6a8e35082aad6c43283b47af8df6c94912710d55fc925e2eae08d275459 SHA512 0b74874d42eab95994309b922f37ebbf3706d01db6c447c9f062b03e64b77c7f793bc297150b539acdf39530a8afd91f4bf824a87c674dd625a59056656c614b AUX freebsd-sources-9.0-ipv6refcount.patch 3259 BLAKE2B 48607d9851f9a37994fc507decf3fc6710406e2fc12cc24cc5a08f5a0717ebc4409ada146b795689036561481078a3cfbc74c697cb3559cc04d2f7b238ee1426 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658 AUX freebsd-sources-9.0-sysctluint.patch 403 BLAKE2B 3860821b308a75dcad8fa5910cb6c287ca2013269d21b588d0abbb1a79197366eac7eb733c87136f77ba2556913f36784842ac5f089d5c9bdb59bdb836748049 SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c @@ -30,17 +26,14 @@ AUX freebsd-sources-9.1-mmap.patch 676 BLAKE2B 17fb129a34eb0280b1edfdb2a5b138443 AUX freebsd-sources-9.1-nfsserver.patch 650 BLAKE2B d719735cfe035de970f42cc40dded1785c038ce03c568dd7ccaf5a3715f658131cb02e1291b2a327b54fdff1f58f76c5deb41332ba4a125cded18344e21a0a17 SHA512 e1d505440371d35722b3520212ded13acf5ccb433c18988aea08d8035881f633c04dedb912931684334154303731ad21ca849c02831f6b9122b54486fb5ab8fe AUX freebsd-sources-9.1-random.patch 792 BLAKE2B a730a48564bd3020d18381579709770a8541d3a3c0ede353a535f7e93f33ff62c800e9cf775e1bb56b5ba00917d1cd81294404dd660c6e954c01e352a5f413f9 SHA512 6e7137a5b68ec92a6eaa5d6bbc1609794f7a71210331959135663bf4021b6cffcbf87f23b5d757956a1ff6907929012490bd85ca0ec37efbdfc2b70de108bc99 AUX freebsd-sources-9.1-tcp.patch 1249 BLAKE2B 829e42d1e5da6185fb7dd37d85331f3d5281f1f06ad0df08cb7e8da17160d7da7379e8bcbdf99cb9b052a231402229cd2352ee8848be7c33193ef971315a4d84 SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e -AUX freebsd-sources-cve-2012-0217.patch 856 BLAKE2B 7dcbe58d7e58165fbdf734d59554c6e05f1248bdbafd0b5fa8b820de2aae50c9dd15938dc66603a683ba225e5e4e1271a7acea10fd1d43c6595226cea85f63b3 SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 DIST freebsd-sources-9.1-en-13-03.patch 32571 BLAKE2B 63b49582f5f7a205edca766bf8552ce951db9189f142b05e5217c3e39df62773095c5afc2e05357f14ce39bb3c5b5761aa0d02bd25b286854b9e29ce1f92eace SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc DIST freebsd-sources-EN-1707-vnet.patch 356 BLAKE2B 6e586e8cc767c0f177b6f1175512c4d5bd4fdf9abb94b644348dbe8b681d4838bdba8c83496ae351fb075329fed4e270bdd8768ce63e8c99fc69ba36d3040d8c SHA512 2fdb58388acb98811588beeabaf8a533926f96ac3f594f53dd80dcdb38ede4fe0dd66f0dd7bb32b40a27f756e2b03fed91c4416cbdcd4c16dd8143f5438885d7 DIST freebsd-sources-EN-1708-pf.patch 706 BLAKE2B 7b812c1d696f2a1ab6e648228fe4fce8b8e32f57ed8dc713b24db5dacca70e693ee24001f0db168d79c528e2c20c6011ac423629a807949757e9f468969c3127 SHA512 e9dc61ff10aafb9b92721c599577ce995458b8a1a93b31fc6cc39b910db2b8f965ff0354a45bf82d2d57abba7aa0bf6d2f002044d242e19121d5ee4cd7a1dc15 DIST freebsd-sources-SA-1708-ptrace.patch 696 BLAKE2B d040de29c3aca8fbc5d837c574e5ee81196ba41f1a90720579e854ba4e9786e23545547892d4e6d90c850161a53aaef7de014cbb918c45a261aea56b02cd2d7b SHA512 973bfe4e594fe34340ae723b3451a1b84a9877b51e1e14e8cd0a9944bec5bc4efec6ff39ba61998c1da1f2c2df0fe17272b3dad2e2cc3880cfa0ff6017d2730e DIST freebsd-sources-SA-1710-kldstat.patch 2155 BLAKE2B e2c47d72a4a497283d7def916cdf0991b5ec791f545736474db18301866362b3c96f0a4ac5e7c1c2a91535961ac048e5e1c1e7ad10d10ced3dba954453a04ef5 SHA512 a5cc0acfcac8401fb4066fd5bfbaa1c5718a38f05877b8fb1c5a9cce1df9af4a82bd1c263c80c2b58ad058349753dcec9c4aa13bdb178f3b80493785badc65a4 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca -DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d -EBUILD freebsd-sources-11.1_p2.ebuild 4596 BLAKE2B 66b50e7b707962a367151246456e215af2456f579fe93fecea423f919555d74c6c11f80d9c72d02e334072b8632cee9275ba345bedeed2d9ab1d5fe413b0d1ef SHA512 b9cb8af695e5ef100cfd72dc852a0e5b90c2ffdeb6e7866d105286d18cc343645b7985e6c47fe80a5aa56bb05011a589293e8a754baa914285bad43807a260a4 -EBUILD freebsd-sources-8.2-r2.ebuild 3671 BLAKE2B ffe430c6ad815d2135130de624acad622d9dfbee4ebc356d2e4d52fbcf67c979745067ebfbb331363f5b5859cb9e2cd11ecbbed018154bd3fabcd40e5d804d54 SHA512 4e2c7ff852639c0cc5124beb0a3b5f998780553892eae1d1c6bbc2b253a82e56838897062f6e55e4fb47be2f99060f1e9b7392e794b25a49a38d925774a1423a -EBUILD freebsd-sources-9.1-r3.ebuild 2514 BLAKE2B 8365ccfc2287740cdbb4f1b59cdc105065edef4f44ec59b3051b506072210491f4468ecd52fcb7d071967b665590f467ef5c788985d9bd10c3c396cbff456683 SHA512 e21a899b3329ac8abfb1a167a56a71a6e37b0b3ec50af9f6274f2353c2a422805a62543105eeda21a1f7d7a4325de6bb749b08851ffe7f5e8b113d8e8571023d -EBUILD freebsd-sources-9.1-r9.ebuild 3059 BLAKE2B 99e91d727964772bf769cecfadb152e917cec34858b20cfa9ad6401d0466b90c07f4cecb457b4740c4ed532f3ec933a7dd95fa868524aa4c060f27554b6e53c7 SHA512 5e241adb02fe3b5fedbd4dac59c1f38d815c2b1041bf6efdd0ed406ff9b380ff7b8ba72210539fc94a11dbb3d7b7422a162e03ee0fb393f8fa7a77df3b327d55 +EBUILD freebsd-sources-11.1_p2.ebuild 4594 BLAKE2B b4861bdab72dcfbaaadccacd98efabada77878264140e35428acbe427e17a9d56edda10c5275bb7abcc9107badfe010fa642bcc1bf760e02241b4da6c9644887 SHA512 a700daa8edbfc20f6aa9e82288529f613bc2134ed5dab624d0aba56b4189b78a680ec3a13110d7e4aa15471c4133651ce4472096ae242c772a73faa953df10ab +EBUILD freebsd-sources-9.1-r3.ebuild 2508 BLAKE2B 2aee9a694feb07368341dc8817f441d7c1f842b2b2ba2e4398b2ee23633b2f5648519ce4d85180fb6a66fb220bd9992427d8709b614afc0caa5687ed7d167b4b SHA512 481a7816515b4b08f9b7185837b90a35aab02912135f6eab5bc12a0d1223e3b7cddcd6c1d23e9ebdf440fe9d2e3035af091238b6bd004dbeff389f50be558df5 +EBUILD freebsd-sources-9.1-r9.ebuild 3053 BLAKE2B 92fe95d5496c84a86cc5eca23902e326c1645a6d34b8a5031d7a3f43fbceba0f6ee4f69e039d92996e99e8923b39b08e00fc972b5f56534399d2e55ba9aa1cf8 SHA512 99535792a4e17d9ad108174f8e09f32582b0f6a0a3d6edcb026668479e90a319252b628f7348add35740952467b84875b47eb125bc61d43d712fcda461071295 MISC metadata.xml 444 BLAKE2B 26160b0d71ed4eb333357e7d3d5fd131038abfeb50db42107cabab63fe2123cc9d495d53a33bc8fea3622dee7994076c57163ab9904c452c1d3bbdad569481b9 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc 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 43d01baef347..000000000000 --- 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.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch deleted file mode 100644 index 4fa3565207ec..000000000000 --- 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-8.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch deleted file mode 100644 index 0f8d070e9a31..000000000000 --- 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.2-unix2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch deleted file mode 100644 index 50dacd0e5a49..000000000000 --- 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-cve-2012-0217.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch deleted file mode 100644 index 0bf1b611a091..000000000000 --- 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-11.1_p2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild index b4d22b6fc70e..32b3d46dc935 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild @@ -18,7 +18,7 @@ UPSTREAM_PATCHES=( "SA-17:08/ptrace.patch" "EN-17:08/pf.patch" ) if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" + KEYWORDS="~amd64-fbsd ~x86-fbsd" SRC_URI="${SRC_URI} $(freebsd_upstream_patches)" fi @@ -137,18 +137,18 @@ pkg_preinst() { rm -f "${ROOT}/usr/src/sys" 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 +# 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 ewarn "If you want to manually compile (not recommended), please don't forget the following steps." - if ! use sparc-fbsd ; then - ewarn "export CC=clang" - ewarn "export CXX=clang++" - fi +# if ! use sparc-fbsd ; then +# ewarn "export CC=clang" +# ewarn "export CXX=clang++" +# fi if ! use zfs ; then ewarn "export WITHOUT_CDDL=" ewarn "Note, Please set USE=zfs if you want to enable modules under the CDDL." diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild deleted file mode 100644 index ccb0c43f6faf..000000000000 --- a/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit bsdmk freebsd flag-o-matic - -DESCRIPTION="FreeBSD kernel sources" -SLOT="${PVR}" -KEYWORDS="~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" - - # __FreeBSD_cc_version comes from FreeBSD's gcc. - # on 8.2-RELEASE it's 800001. - sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=800001: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}-8.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.2-debug-O2.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" - # http://security.FreeBSD.org/patches/SA-11:05/unix2.patch - epatch "${FILESDIR}"/${P}-unix2.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" - - # See https://sourceware.org/bugzilla/show_bug.cgi?id=5391 - # ld doesn't provide symbols constructed as the __start_set_(s) ones - # are on FreeBSD modules. - # This patch adds code to generate a list of these and adds them - # as undefined references to ld's commandline to get them. - # Without this kernel modules will not load. - epatch "${FILESDIR}/${PN}-7.1-binutils_link.patch" - - epatch "${FILESDIR}/${PN}-cve-2012-0217.patch" - epatch "${FILESDIR}/${PN}-9.0-ipv6refcount.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-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild index a36f195b6947..fc852df1d6ff 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 inherit bsdmk freebsd flag-o-matic DESCRIPTION="FreeBSD kernel sources" SLOT="${RV}" -KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~amd64-fbsd ~x86-fbsd" IUSE="symlink" @@ -74,10 +74,10 @@ pkg_postinst() { eerror "Couldn't create ${ROOT}/usr/src/sys 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 +# 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-r9.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild index 798f1f370f0b..de5badfc6b22 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 inherit bsdmk freebsd flag-o-matic DESCRIPTION="FreeBSD kernel sources" SLOT="${RV}" -KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~amd64-fbsd ~x86-fbsd" IUSE="symlink" @@ -87,10 +87,10 @@ pkg_postinst() { eerror "Couldn't create ${ROOT}/usr/src/sys 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 +# 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 } |