[patch] virtualbox-guest-additions-ebuild.patch

0001-fix-constant-kernel_param-on-hardened.patch (text/plain), 10.18 KB, created by Alex on 2017-07-06 16:48:36 UTC

From b3522dd450cea79c9e3699aba66587c260927f1e Mon Sep 17 00:00:00 2001
From: Alexander Dyadechko <[e-mail]>
Date: Thu, 6 Jul 2017 17:03:16 +0300
Subject: [PATCH] fix constant kernel_param on hardened

---
 app-emulation/virtualbox-guest-additions/Manifest  |  4 +-
 .../files/vboxguest-const-kernel_param.patch       | 74 ++++++++++++++++++++++
 ...=> virtualbox-guest-additions-5.1.22-r1.ebuild} |  5 +-
 3 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 app-emulation/virtualbox-guest-additions/files/vboxguest-const-kernel_param.patch
 rename app-emulation/virtualbox-guest-additions/{virtualbox-guest-additions-5.1.22.ebuild => virtualbox-guest-additions-5.1.22-r1.ebuild} (98%)

diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 2ac63e3..8ade543 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,11 +1,11 @@
 AUX vboxclient.desktop 145 SHA256 0e310fbb8defee6842f5fc9d2cf124a4ca7a0d1121074cf1aa2e1bea5900f905 SHA512 90e2ff4b8a67120f7f3c116676c7553243a1bf3c9a76f71ef471bc556c4eee55953e6a5dde952688d4892d469149db8704a921a14755eea66b1789805fe3ca42 WHIRLPOOL 31ee9fddce785e78706e579aa9260695e80bc72dcd2cae33212885a3d57e7d10e6bd3ec652ea1429a7fdc5d0b1c7c8855669afc38c21b12114b237329779abc4
 AUX vboxguest-4.1.0-log-use-c99.patch 393 SHA256 35a63e4ded04f4844ce2fdb1ad2f83618b40239fd04548d317fdbc49a9a2ab05 SHA512 7327faccd5095706d097f2b47acfea21736291ed54ee7b605670fdfddf5f09815759dc49f9497d06e5920043e0b5b9af1b4ee0993ea13e5055641cbeedd66d6f WHIRLPOOL 6d0c8f303a177580452dd8e4ff5aa9f7936aa3fae6bce1b329be8dce4801175d817c4b2ed66d3a7841aa49d6d68c12ae4e3f43a71c68e56b6f60964823bf2568
-AUX vboxguest-const-kernel_param.patch 2767 SHA256 e238b1c4959ddf5f6bdf10be30a134533e33736bf214fbc2983932681422e167 SHA512 099d76d6ec2f91a85c3d4354e7b91827a443abcb71561974f546e554bae912b011ecaf157fb400d15432fb548695afc619f756482026391d03d9c44f2730e2a5 WHIRLPOOL f1dd54f3a013806871536ed6124566139e27a394ec27288d87f8dc6608a68c5dbbf5c400d98021971446eb92be013036714fac96197eed1d5d0539e79682c120
+AUX vboxguest-const-kernel_param.patch 2761 SHA256 aefdb1b922f5fe7b8f2ae86c489c9cc72b52823868a3ab66d5a94b81927a0f56 SHA512 5ad2226831c97e77f8bc9945123007eae33fae4d3f858e7a96df4d08937c3a01c52a8326431cacecbfc42b8ed2a00a59ef258a31f23f4ca2228aa52b30f666dd WHIRLPOOL 94aea5faf0b3bb8f72abc8e975b9969039b74523a78f0a86ea8fcdce51881705df0fa6f158f424222dc5a8c07cd375a77d355ffb878d2b6649a7e0ff2d996700
 AUX virtualbox-guest-additions-3-localconfig 937 SHA256 477e3d4556a2b12c3c6125c4fecc63092b1f7879756941e53832d04a7c1eb682 SHA512 2105f997a2aced3a6a7f0abd3727c6d18a5d7e6b68fbaa0706b9cf1e09af413a1c5026abeb8f72427c31f2b271408d3e55ae0d17b903052772cb070d37b6e71d WHIRLPOOL cd472e0073d822a0b71b8d272ec9f3590650150ca910ba193a567d0c59f949d645d9cae31853e955cbcc0408e90acff47a974bad2e89bed9b2089965c5066f83
 AUX virtualbox-guest-additions-5-localconfig 937 SHA256 eb62978e90ce925df841822cc10a184ad3f9003deaeea687ab17d8b9f33724d4 SHA512 ccbc2db825060fd5044e42bf4e53271d6e64a7a400b09705230006367e696dd3bff384f1e4873bf2aedfec8e6fdc8f8ecc537cd5a1fe629727c2943371d13e40 WHIRLPOOL 518adf5b2a37d4a8c583798a2bf39bf032642203b1e177260b4347a6bca614ec37568a886b039fd0c64aab762b5cf787ac013f61ab3b861885e60c1ae70721ac
 AUX virtualbox-guest-additions-8.initd 538 SHA256 6be7c321b362054aefef183f0c4b8404ea64d4232154756ddc79de1fca067952 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca WHIRLPOOL 59cf99a3ca4c1df867a1399d6017a8d35ed7b323c698ce076cae4b83f8dc09ff6ece75bf69a37fed579bf9b1761a0064f24d10cdf85e093ad896f745bb42bc0f
 AUX virtualbox-guest-additions.service 411 SHA256 0b50116819c60f27ab0f9b171e00434f0be2cff8e6656af9e00229f6e07c2118 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83 WHIRLPOOL 1e4e37ba43532340f8a7e344a69241e9e3ec7ce10d07ad3c30edad01270bfa42e8a86f38b48a6d98d0e19f3ddb910740a88e4da9ad23dc879abc2f05ddf4fba0
 AUX xorg.conf.vbox 274 SHA256 69475950240533abd2824a30ff08cc7d3ea246d9601ff7163115f8fc100612fb SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9 WHIRLPOOL 6bd0dba97e442c831451d58f85e5ce3bdf37fc90254db54cffbdbafe1521464e0e4aed89dd610d432c8b26dc48b98f120fd81594bded2dbb10c5eb7d7b26f938
 DIST VirtualBox-5.1.22.tar.bz2 115838360 SHA256 fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899 SHA512 e48457371c9139fc04477c82fbd18974378fde08af2a6f9058a0eafa6e522987bd129b8d87c9f381789c4e817aded752fde6ea7fcb2ade471997373802e09348 WHIRLPOOL c6034aad69c8a25eaf5909b6889f04f8090ace562e18a76bc55ad4d3e8347844fa1ab466d32e92b09180dff71e0f928826db0994d34b03f44b11bdb03ccc40d2
-EBUILD virtualbox-guest-additions-5.1.22.ebuild 5925 SHA256 9795d30dd84130d1251375913b62474dd9bd2786049ab6a66582aa06c16f2124 SHA512 c112382f29c81d35ad7f149f8b160bdba958e63f7948718733aa8169ec0276c22dcf9b22e9d6a76eee3861f97c261892e9f036908ebaf6820c071ae2afdfd5b4 WHIRLPOOL b694a6c61ba04373e6233bbd1758921e6ccb21b4a6a9732e23ee8d1e1f200bc58acf835fd4de1409f35593277680dcdba30fb9322394d134efd6d806afc2bfad
+EBUILD virtualbox-guest-additions-5.1.22-r1.ebuild 6024 SHA256 33a862448a1ebc37a5b3ea6c538ef327a5804e1e2a9f88f553141e7fedd19c8a SHA512 a4e2351d1ce92b266bb454dafeedaa6f81e1368ae294adf26854cbaab9824f211ee6da04da61e00b8bd8037bd8255bbf580341deb2f9a5156a24d484979817e4 WHIRLPOOL 1aa9617b4a14693d7696020e33e0ac0838b650f06845daf53952d2eeb938282773249c76c309183d8283e272027becdbcefb77b831270467b6052d1f5dad0fe7
 MISC metadata.xml 407 SHA256 a07752ac478a75b8186129fcab7d7fc7b239adf7a03d52a275a1d61c66b54aa6 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2 WHIRLPOOL 38d004ad7163b0ba06c7b86c4e02612a94ff449f1d8a0be61fe705bd1a4bd8c88c8cab27fd5103110663f7b0de9f131b204aa92b7c3584cef93f0bde957c7248
diff --git a/app-emulation/virtualbox-guest-additions/files/vboxguest-const-kernel_param.patch b/app-emulation/virtualbox-guest-additions/files/vboxguest-const-kernel_param.patch
new file mode 100644
index 0000000..673ee4d
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/vboxguest-const-kernel_param.patch
@@ -0,0 +1,74 @@
+--- a/vboxguest/VBoxGuest-linux.c
++++ b/vboxguest/VBoxGuest-linux.c
+@@ -958,7 +958,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+ 
+ /** log and dbg_log parameter setter. */
+-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -973,7 +973,7 @@
+ }
+ 
+ /** log and dbg_log parameter getter. */
+-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+     *pszBuf = '\0';
+@@ -984,7 +984,7 @@
+ 
+ 
+ /** log and dbg_log_flags parameter setter. */
+-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -998,7 +998,7 @@
+ }
+ 
+ /** log and dbg_log_flags parameter getter. */
+-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+     *pszBuf = '\0';
+@@ -1009,7 +1009,7 @@
+ 
+ 
+ /** log and dbg_log_dest parameter setter. */
+-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1023,7 +1023,7 @@
+ }
+ 
+ /** log and dbg_log_dest parameter getter. */
+-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+     *pszBuf = '\0';
+@@ -1034,7 +1034,7 @@
+ 
+ 
+ /** r3_log_to_host parameter setter. */
+-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (    pszValue == NULL
+         || *pszValue == '\0'
+@@ -1052,7 +1052,7 @@
+ }
+ 
+ /** r3_log_to_host parameter getter. */
+-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
+     return strlen(pszBuf);
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.22.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.22-r1.ebuild
similarity index 98%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.22.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.22-r1.ebuild
index b68afcd..1c0f426 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.22.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.22-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X"
+IUSE="X pax_kernel"
 
 RDEPEND="X? ( x11-apps/xrandr
 		x11-apps/xrefresh
@@ -75,6 +75,9 @@ src_prepare() {
 	# PaX fixes (see bug #298988)
 	pushd "${WORKDIR}" &>/dev/null || die
 	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	if use pax_kernel ; then
+		eapply "${FILESDIR}"/vboxguest-const-kernel_param.patch
+	fi
 	popd &>/dev/null || die
 
 	# Disable things unused or splitted into separate ebuilds
-- 
2.13.0