commit:     3bfcf0499d0d3a4a3808d67106f8a17cdc53da13
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 02:04:35 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 02:06:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bfcf049

app-emulation/xen-tools: disable stackcheck in seabios

problem was seen in hardened system && using USE="-system-seabios"

Gentoo-bug: 569810

Package-Manager: portage-2.2.27

 app-emulation/xen-tools/Manifest                  | 1 +
 app-emulation/xen-tools/files/gentoo-patches.conf | 4 +++-
 app-emulation/xen-tools/xen-tools-4.6.1.ebuild    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 80dc2ff..fc36474 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -7,6 +7,7 @@ DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 
8ef2d139f86cb52d2208a17c97
 DIST xen-4.6.0.tar.gz 19694350 SHA256 
6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 
b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b
 WHIRLPOOL 
d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
 DIST xen-4.6.1.tar.gz 19693042 SHA256 
44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 
f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c
 WHIRLPOOL 
b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5
 DIST xen-gentoo-patches-4.tar.xz 23632 SHA256 
5cdb0f93ee32d0a5fc4fc7282270ace73acfdc4df694f7b29c1135180d902049 SHA512 
3006ce4cd67e80a9f79d9ba3814a64704b0d762159a439a140b1ec0a2699473cd5537950f0913b55f8f7e3d0fd2e9861f3199793120d8d2502aa3f8ef7816c8f
 WHIRLPOOL 
4a921103df2825ccd8b0481708e7cd692fa45d5aadae286c1522c144a1576920e7d3567648565bb9af85bb6bb597ea9d0ec04ea6abd2115db4caf7e739717b1a
+DIST xen-gentoo-patches-6.tar.xz 23864 SHA256 
96e774bd03c9df341fdb2f5d6cf231549c8d7a004c3c902c07b5cb690428d4c6 SHA512 
7f4966bb7dad02b213a3cbefcc312573039feaec964a2deaa6aa7f8fa488b6e31176834a4e2cf6ac380548f1b8251c7700d16d1cbc7b88fcee440f6cccd7f177
 WHIRLPOOL 
a41cae3441370e0e18fbf28ac7a780adfaa0d6af12dc62f1dfe90f52f01ebbd8055e3b5b399ae11602b29b8a206aafe2cbecb79948233bd072e73294468f3b08
 DIST xen-ovmf-patches-1.tar.xz 4724 SHA256 
d14e98e62c78c9f4b8a7e7b4a04de6dabf300f393eff44154d06f93aa43d7703 SHA512 
a17467762f6d92018ff9bce783ce148039f23159405e801ec2aef4c3db72c3976c6f1e41d8c2a2cb704a9654556a2050302f284cfe8e32f28f393b8e2c6d2f1c
 WHIRLPOOL 
de53ad07f20aa14fe76d974db92d5b6808f0a2dd26a627b818914990add7adad8e6135d42641819dc22947031981c5815bae5aeeed0f28785c90beda0a6ff6c8
 DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 
495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 
0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3
 WHIRLPOOL 
8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633
 DIST xen-qemu-patches-0.tar.gz 3224 SHA256 
ff1ac02a6d91e4abdbe069e1bb75d0b798deff5c2c72d1efb5459c72f4278f00 SHA512 
4fd0c663a733436188aca364e927ac430d9bbef9859da65c074d7fd66c330645b05ff1f3e849f4581dfcd7054801d65edcff8445c1c63c2725f11e3903415af0
 WHIRLPOOL 
5504d7ffbd3c1970026c1f43252d9c76f10c5448ede247719e2698aa8f8e93b20e4cc353da5582b3b6887fb3fd7d1e13765f664ea60daeb6020f052eaca9b9f4

diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf 
b/app-emulation/xen-tools/files/gentoo-patches.conf
index ea628ec..44e5472 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -80,6 +80,8 @@ _gx033=" xen-tools-4.4.2-gcc99.patch"
 _gx034=" xen-tools-4.5.0-gcc99.patch"
 
 _gx035=" xen-tools-4.2-pod-docs-r1.patch"
+# disable stackcheck for hardened system, bug 569810
+_gx036=" xen-tools-4.6-no-stackcheck.patch"
 # xen-tools-4.2.5 patches set
 _gpv_xen_tools_425_0="
 ${_gx001} ${_gx002} ${_gx003} ${_gx004} ${_gx005}
@@ -120,5 +122,5 @@ _gpv_xen_tools_461_0="
 ${_gx008} ${_gx021}
 ${_gx022} ${_gx017} ${_gx031}
 ${_gx027} ${_gx032}
-${_gx028} ${_gx029}
+${_gx028} ${_gx029} ${_gx036}
 "

diff --git a/app-emulation/xen-tools/xen-tools-4.6.1.ebuild 
b/app-emulation/xen-tools/xen-tools-4.6.1.ebuild
index c380955..c84766c 100644
--- a/app-emulation/xen-tools/xen-tools-4.6.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.6.1.ebuild
@@ -28,7 +28,7 @@ else
        SEC_VER=
        QEMU_VER=
        # xen-tools's gentoo patches tarball
-       GENTOO_VER=4
+       GENTOO_VER=6
        # xen-tools's gentoo patches version which apply to this specific ebuild
        GENTOO_GPV=0
        # xen-tools ovmf's patches

Reply via email to