From: Sven Eden <yamakuzure@gmx.net>
Date: Fri, 6 May 2016 15:45:43 +0000 (+0200)
Subject: sci-misc/boinc: Fix VSYSCALL check for boinc-7.4.42
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3c7ed3fc1248785347a43e6241e581fe4c8b1385;p=gentoo.git

sci-misc/boinc: Fix VSYSCALL check for boinc-7.4.42

Gentoo-Bug: 578750

The configuration options were misunderstood.

- CONFIG_X86_VSYSCALL_EMULATION only enables a dmesg message if any
  legacy application tries to use any vsyscall. If disabled, these
  applications simply segfault with no output in dmesg.
- To make the old calls available, either
  CONFIG_LEGACY_VSYSCALL_NATIVE or CONFIG_LEGACY_VSYSCALL_EMULATE
  must be used.

Therefore the ebuild was reverted to check against the
CONFIG_LEGACY_VSYSCALL_NONE option, and warns the user if this is
set.

Package-Manager: portage-2.2.28
---

diff --git a/sci-misc/boinc/boinc-7.4.42-r3.ebuild b/sci-misc/boinc/boinc-7.4.42-r4.ebuild
similarity index 78%
rename from sci-misc/boinc/boinc-7.4.42-r3.ebuild
rename to sci-misc/boinc/boinc-7.4.42-r4.ebuild
index f1c24082dbef..6e2e785acef9 100644
--- a/sci-misc/boinc/boinc-7.4.42-r3.ebuild
+++ b/sci-misc/boinc/boinc-7.4.42-r4.ebuild
@@ -50,32 +50,24 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
 
 pkg_setup() {
+	# Bug 578750
 	if use kernel_linux; then
 		linux-info_pkg_setup
 		if ! linux_config_exists; then
 			ewarn "Can't check the linux kernel configuration."
 			ewarn "You might be missing vsyscall support."
-		else
-			if   kernel_is -ge 4 4 \
-			  && linux_chkconfig_present LEGACY_VSYSCALL_NONE \
-			  && ! linux_chkconfig_present X86_VSYSCALL_EMULATION; then
-				ewarn "You do have neither x86 vsyscall emulation"
-				ewarn "nor legacy vsyscall support enabled."
-				ewarn "This will prevent some boinc projects from running."
-				ewarn "Please enable vsyscall emulation:"
-				ewarn "    CONFIG_X86_VSYSCALL_EMULATION=y"
-				ewarn "in /usr/src/linux/.config, to be found at"
-				ewarn "    Processor type and features --->"
-				ewarn "        [*] Enable vsyscall emulation"
-				ewarn "or set"
-				ewarn "    CONFIG_LEGACY_VSYSCALL_EMULATE=y"
-				ewarn "in /usr/src/linux/.config, to be found at"
-				ewarn "    Processor type and features --->"
-				ewarn "        vsyscall table for legacy applications (None) --->"
-				ewarn "            (X) Emulate"
-				ewarn "Alternatively, you can enable CONFIG_LEGACY_VSYSCALL_NATIVE."
-				ewarn "However, this has security implications and is not recommended."
-			fi
+		elif   kernel_is -ge 4 4 \
+		    && linux_chkconfig_present LEGACY_VSYSCALL_NONE; then
+			ewarn "You do not have vsyscall emulation enabled."
+			ewarn "This will prevent some boinc projects from running."
+			ewarn "Please enable vsyscall emulation:"
+			ewarn "    CONFIG_LEGACY_VSYSCALL_EMULATE=y"
+			ewarn "in /usr/src/linux/.config, to be found at"
+			ewarn "    Processor type and features --->"
+			ewarn "        vsyscall table for legacy applications (None) --->"
+			ewarn "            (X) Emulate"
+			ewarn "Alternatively, you can enable CONFIG_LEGACY_VSYSCALL_NATIVE."
+			ewarn "However, this has security implications and is not recommended."
 		fi
 	fi
 }