From ef4af3562a78ac0d68c043b160f8b1bf3d28ad8f Mon Sep 17 00:00:00 2001 From: Andrew Savchenko Date: Fri, 1 May 2015 15:57:39 +0000 Subject: [PATCH] Mask net-fs/openafs-kernel and net-fs/openafs[modules] on hardened, wrt bug 540196 --- profiles/hardened/ChangeLog | 9 ++++++++- profiles/hardened/linux/package.mask | 7 ++++++- profiles/hardened/linux/package.use.mask | 6 +++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/profiles/hardened/ChangeLog b/profiles/hardened/ChangeLog index df18c4b70422..4aefd4bd2591 100644 --- a/profiles/hardened/ChangeLog +++ b/profiles/hardened/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.81 2015/04/19 01:30:47 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.82 2015/05/01 15:57:39 bircoph Exp $ + + 01 May 2015; Andrew Savchenko linux/package.mask, + linux/package.use.mask: + Mask net-fs/openafs-kernel since it can't be used on hardened + kernels due to lack of C99 support by upstream (and they can't do + that) and hardened kernel requirement of C99 struct init. + See bug 540196, comment 9. 19 Apr 2015; Chris Reffett linux/amd64/no-multilib/package.mask: diff --git a/profiles/hardened/linux/package.mask b/profiles/hardened/linux/package.mask index 10b61852cccd..eb8a3a0b6f14 100644 --- a/profiles/hardened/linux/package.mask +++ b/profiles/hardened/linux/package.mask @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.mask,v 1.45 2015/04/06 19:51:46 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.mask,v 1.46 2015/05/01 15:57:39 bircoph Exp $ # Hardened versions of gcc-4.0* through gcc-4.2* are not available. =sys-devel/gcc-4.0* @@ -26,3 +26,8 @@ dev-python/skype4py sys-devel/prelink # depends on prelink app-crypt/hmaccalc + +# OpenAFS kernel module is not compatible with hardened kernels +# due to C99 struct init requirement by hardened kernels, +# see bug 540196 comment 9. +net-fs/openafs-kernel diff --git a/profiles/hardened/linux/package.use.mask b/profiles/hardened/linux/package.use.mask index 569920fee8c1..bf070e3845eb 100644 --- a/profiles/hardened/linux/package.use.mask +++ b/profiles/hardened/linux/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.use.mask,v 1.17 2014/12/04 03:34:40 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.use.mask,v 1.18 2015/05/01 15:57:39 bircoph Exp $ # Tim Harder (11 Oct 2014) # Skype doesn't work on hardened @@ -23,3 +23,7 @@ net-analyzer/wireshark profile # Ian Stakenvicius (03 Dec 2014) # Have no way of knowing what Gecko Media Plugins will install in profiles www-client/firefox gmp-autoupdate + +# net-fs/openafs-kernel module can't be used on hardened, +# see bug 540196. +net-fs/openafs modules -- 2.26.2