From c86fea90b3ecb6cae22a6642b51c46e0240303fc Mon Sep 17 00:00:00 2001 From: Vadim Kuznetsov Date: Mon, 3 May 2010 16:53:39 +0000 Subject: [PATCH] Bugs 274529, 317583 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- app-emulation/vmware-modules/ChangeLog | 8 +++++++- app-emulation/vmware-modules/Manifest | 7 ++++--- app-emulation/vmware-modules/files/apic.patch | 12 ++++++++++++ .../vmware-modules/vmware-modules-1.0.0.25-r1.ebuild | 3 ++- .../vmware-modules/vmware-modules-1.0.0.26.ebuild | 3 ++- 5 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 app-emulation/vmware-modules/files/apic.patch diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog index 2ccef8206b58..c88f5cbe2504 100644 --- a/app-emulation/vmware-modules/ChangeLog +++ b/app-emulation/vmware-modules/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/vmware-modules # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.56 2010/02/28 17:51:15 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.57 2010/05/03 16:53:39 vadimk Exp $ + + 03 May 2010; Vadim Kuznetsov + vmware-modules-1.0.0.25-r1.ebuild, vmware-modules-1.0.0.26.ebuild, + +files/apic.patch: + Bugs 274529, 317583 + Thanks to Mikhail Zolotaryov for the patch. *vmware-modules-1.0.0.26 (28 Feb 2010) diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index bb609359c219..3dfaec10ad5f 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -8,6 +8,7 @@ AUX 1.0.0.25-makefile-include.patch 3185 RMD160 a3aa2f7cb3a51c96be13080061543d96 AUX 1.0.0.25-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f AUX 1.0.0.26-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d42fb SHA1 d48ca9316e65d536e50d07dfe945a6ff195be7cd SHA256 ac676433ca499268bd6a1f0d7d904a44095bb1a777ad31d055e8c4990eea586c AUX 1.0.0.26-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7 +AUX apic.patch 294 RMD160 ab0d6fea359f66ccd735cd3bc830442f6f6baa39 SHA1 537f1a903b94ea379003cf4e50c9507ae403c595 SHA256 6902f8dd82d48f479a3e5647e3bd7125d073f242dd85a5b2ddfd51f4ea8f663c AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 SHA1 be4f203063e676dc022ce600e15479b6ea56b954 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1ef97639351d82141 SHA1 d0a40f0483a144fc98d02213c6c63b2e2ddb9f66 SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521 AUX patches/vmblock/010_all_kernel-2.6.25.patch 2398 RMD160 d0a3464f03486eda983b230d0bd90bca8a5d7ed3 SHA1 b5de035a7d1f0051a76512be7e25b04ff3d0dbdd SHA256 4036d37415cad6109e95e82c3789f32ea2c4901961612fb158d5f7148671b32e @@ -28,7 +29,7 @@ DIST vmware-modules-1.0.0.26.x86.tar.bz2 630393 RMD160 f43fd73be421cac84a1b04f1b EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 910dd70caac0af5c1bdb6d714b96f9c134cbdd8a SHA1 c56288915c67790e3b38207e14598923203b2c7c SHA256 dbce7d028f4fe0f042323a7e05754e311366ac33feb7361dab63af70017683f7 EBUILD vmware-modules-1.0.0.15-r2.ebuild 445 RMD160 d16a678a0c9291289be89006b74782aeb0ba5a7a SHA1 c27bc611caae5e0b4afdc45ed5d62ee238a43b1e SHA256 f387e8c45b0b2fcee19b80a66dd3497981c54297fd9d21b7e01c60fb7e39a65d EBUILD vmware-modules-1.0.0.24-r1.ebuild 1996 RMD160 fa3489c03b4969c8dc13ef1abbbc0f5f2f51abbd SHA1 e9aafc9139cfaa99710a9bbe3932c282e986de7b SHA256 ae120390719de2d88368ca6721edfa7b06e638dfa2f68d03a8e733a1962caffc -EBUILD vmware-modules-1.0.0.25-r1.ebuild 1892 RMD160 3f278d97838aef8a9c9d386bbf4b39daf29b5af4 SHA1 a50ef9d741c4e67215010146e3b2b0691fc09b8c SHA256 43aea0c0fc63e20ebe2af19d2ff7d002fd47d770598a2b8a20f995254e703ad7 -EBUILD vmware-modules-1.0.0.26.ebuild 1795 RMD160 8792d7ae6dfa7a0bef0950d900616017c0236216 SHA1 b7ae00e1ee2bb5c4ea93ee69ae687a267fef875a SHA256 e8af1248e05799a0dc444318b64d01d5c9e5445dd2c2a09a2b029b7d9e761d11 -MISC ChangeLog 12794 RMD160 36c1353c34cdee3add2c6787e6d17fb12eb45a14 SHA1 334c580467ecf96b3f9de9442573f7a07bbec085 SHA256 88ddf588d1d1be394359c64afe9f7c852bd186bd2a9bc4e0ed9f8fd12455facb +EBUILD vmware-modules-1.0.0.25-r1.ebuild 1925 RMD160 52659155b6cb718fe5962b8ae3bd82326b8eeb62 SHA1 284f32a402b2f0934e86f63a147b14b998721270 SHA256 84e0d22b3aca8d52441e1bb713ac7af0d7b3498d8938032177c777213d76fc64 +EBUILD vmware-modules-1.0.0.26.ebuild 1828 RMD160 af9ffee94a1a1ee981cd4508e7193bdc8d6b2f4f SHA1 fab345cbda789428a4296ed981eaf11d02108693 SHA256 6bc057431620a4c7a6796ace33f43eb1f69bfb7307af1b8c51b1ac84edd62aa6 +MISC ChangeLog 13004 RMD160 e29a657efcca9325e647d43ab35aa3e4de8af8b3 SHA1 13f306c6d7abdb0710bf517f2a4c8737be461e6a SHA256 d4902daea3c0c28afa3c2fe92c2653cb7e38aa14de0e9e7ae6c7ad4699c6cad7 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37 diff --git a/app-emulation/vmware-modules/files/apic.patch b/app-emulation/vmware-modules/files/apic.patch new file mode 100644 index 000000000000..107da28ed976 --- /dev/null +++ b/app-emulation/vmware-modules/files/apic.patch @@ -0,0 +1,12 @@ +--- vmmon-only/linux/hostif.c.orig 2009-11-16 13:24:00.000000000 +0200 ++++ vmmon-only/linux/hostif.c 2009-11-16 13:08:56.000000000 +0200 +@@ -78,6 +78,8 @@ + #include "vmmonInt.h" + #include "versioned_atomic.h" + ++#include ++ + #define UPTIME_FREQ CONST64(1000000) + + static struct { + diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild index dbfab6d5b83e..d14da828ccb5 100644 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.2 2010/02/26 14:54:32 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.3 2010/05/03 16:53:39 vadimk Exp $ EAPI="2" @@ -60,6 +60,7 @@ src_prepare() { epatch "${FILESDIR}/${PV}-makefile-include.patch" epatch "${FILESDIR}/sched_h-2.6.32.patch" epatch "${FILESDIR}/${PV}-autoconf-generated.patch" + epatch "${FILESDIR}/apic.patch" } src_install() { diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild index ac6194f549dd..3c3e6235b511 100644 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.1 2010/02/28 17:51:15 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.2 2010/05/03 16:53:39 vadimk Exp $ EAPI="2" @@ -58,6 +58,7 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch" epatch "${FILESDIR}/${PV}-makefile-include.patch" + epatch "${FILESDIR}/apic.patch" } src_install() { -- 2.26.2