Bug 200376

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

4 files changed, 70 insertions, 5 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index ad94d754203e..5ca9bc498ed9 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/open-vm-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.26 2009/10/29 14:14:51 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.27 2009/11/07 13:46:16 vadimk Exp $
+
+  07 Nov 2009; Vadim Kuznetsov vadimk@gentoo.org
+  open-vm-tools-0.0.20091015.201664.ebuild, +files/checkvm-pie-safety.patch:
+  Bug 200376. Thanks to Gordon Malm and Anthony Basile.
 
 *open-vm-tools-0.0.20091015.201664 (29 Oct 2009)
 
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index db2869f1c178..62491e5eb58a 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,3 +1,4 @@
+AUX checkvm-pie-safety.patch 1848 RMD160 c8b006000b0ff793accfb8c2246e8187aff59e35 SHA1 51d91d117fddf0ab8a9cc11939af33ea03a90785 SHA256 f65b3771560d4179a4ad6df6b312a84882ef463a0f1f99af83dccc8ac55e0d20
 AUX default-scripts.patch 3525 RMD160 7c3dfd342be245531493a9cf7a8be2be4c67dc4b SHA1 56ba6ca91262f73732a7d806a9c812aea683c2d2 SHA256 99ad1a202335736c50bbb92432371e522934d1a3347e992158b881cf9f810da6
 AUX default-scripts1.patch 4787 RMD160 3186d91d1f6f840bb7fb2e757b802ba05675894b SHA1 5843708e342b8c57f600a6cbd7d0b12f7f14a35b SHA256 3190fe24e2b03e99fa0b7b9f93d413c7b886138c1e964ca7917a45099f29609e
 AUX open-vm-tools.desktop 127 RMD160 375ec8cd688a5fe0609076798e515c048be81c15 SHA1 6b6adcb93fbcb11e1638d6a80b3828256f880dcf SHA256 7cb78f0d94f1849aa964bc8e9d9a6c49955ba1a9b937174b1c266a9cc8eb4bc3
@@ -13,6 +14,6 @@ DIST open-vm-tools-2009.10.15-201664.tar.gz 3507956 RMD160 14a26a7423c97398afe00
 EBUILD open-vm-tools-0.0.20090618.172495-r2.ebuild 3466 RMD160 b33bc77efed16056d6b38ef02eaf155f93eb8b7d SHA1 7ef10f905fbabee15fbac540cccaf7bf6065b271 SHA256 1ad2cc59a03d9925b0049f72acbd3ed8436cdd911ab46c15b3a7c6839cec09a7
 EBUILD open-vm-tools-0.0.20090722.179896.ebuild 3465 RMD160 19a673371becafdbcf2852114a877194eb8421fc SHA1 9b4969677bdc5c131efa9d156ad3550a9322265f SHA256 dcce2a06acf2da73513a42b40d1e08283e303995e73d6e859120d88c767a787d
 EBUILD open-vm-tools-0.0.20090824.187411.ebuild 3177 RMD160 c8be53e80ede486579201fe0bc8b54cc73dc67b0 SHA1 239de3201de177505bd580e1ea5f55e3b5ab6830 SHA256 4769a6f8b250aa2e6029949a4d7454790bbd991fefd060f46e14d777adce3496
-EBUILD open-vm-tools-0.0.20091015.201664.ebuild 2685 RMD160 8d6d3457fec1e7e9dfe889f14ae0e933680105e6 SHA1 1b6ea0b53a3aa8f89b7f98c1a738e79e37dc61aa SHA256 6a92580a968867cd2d6ecf1a66551c91058be278392b3ad5cce155f6f3b00849
-MISC ChangeLog 5708 RMD160 0a13184a9e4f8b3c7b0ffd4ae89663322d7c85b4 SHA1 3cd7959f8c5bcfc747699ca590b99c5312a00c3f SHA256 6f106319d483dc31f956e02eae7d242351f34d866f84a2f22e4a1fec682fca51
+EBUILD open-vm-tools-0.0.20091015.201664.ebuild 2684 RMD160 53bce21cd130cb5e328e2f68597d853ea060031a SHA1 b6a928c7f4f610486870ba87fcdef63de44b67cb SHA256 17acd7d9b9d17e2cdc9d05782dbd319530ec9ce23c6715cd41a6358a8a6ad04e
+MISC ChangeLog 5891 RMD160 d37f87114d75362c2e29bc5c4cdf207a12de9148 SHA1 b77d1672bd71b39f4c6f6f8c124f797c846adc0a SHA256 35cd332f0b4cee3132f04798edd44627cc2c5f8be55c8694a2107b2d58a4ae33
 MISC metadata.xml 791 RMD160 fdc392df0eb6c2b1ee6bb9cf2b96b87c23c5883d SHA1 1dbba034c610754769c810a38a0adf4c3aded1f6 SHA256 85ee302699fd64bd96f311935e21847e0d5d2c11d0654c1a9eac7ded2a1bf1b2
diff --git a/app-emulation/open-vm-tools/files/checkvm-pie-safety.patch b/app-emulation/open-vm-tools/files/checkvm-pie-safety.patch
new file mode 100644
index 000000000000..ec46c5e2b347
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/checkvm-pie-safety.patch
@@ -0,0 +1,60 @@
+--- a/checkvm/checkvm.c
++++ b/checkvm/checkvm.c
+@@ -79,8 +79,16 @@
+ {
+    uint32 eax, ebx, ecx, edx;
+    
+-   __asm__ volatile("inl (%%dx)" :
+-   	            "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
++   __asm__ volatile(
++#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler.
++		    "movl %%ebx, %3    \n\t"
++		    "inl (%%dx)        \n\t"
++		    "xchgl %%ebx, %3   \n\t" :
++		    "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) :
++#else
++		    "inl (%%dx)" :
++		    "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
++#endif
+ 		    "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETVERSION),
+ 		    "2"(BDOOR_PORT) : "memory");
+    version[0] = eax;
+@@ -96,8 +104,16 @@
+ {
+    uint32 eax, ebx, ecx, edx;
+    
+-   __asm__ volatile("inl (%%dx)" :
+-   	            "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
++   __asm__ volatile(
++#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler.
++		    "movl %%ebx, %3    \n\t"
++		    "inl (%%dx)        \n\t"
++		    "xchgl %%ebx, %3   \n\t" :
++		    "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) :
++#else
++		    "inl (%%dx)" :
++		    "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
++#endif
+ 		    "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETHWVERSION),
+ 		    "2"(BDOOR_PORT) : "memory");
+    *hwVersion = eax;
+@@ -112,8 +128,16 @@
+ {
+    uint32 eax, ebx, ecx, edx;
+    
+-   __asm__ volatile("inl (%%dx)" :
+-   		    "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
++   __asm__ volatile(
++#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler.
++		    "movl %%ebx, %3    \n\t"
++		    "inl (%%dx)        \n\t"
++		    "xchgl %%ebx, %3   \n\t" :
++		    "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) :
++#else
++		    "inl (%%dx)" :
++		    "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
++#endif
+ 		    "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETSCREENSIZE),
+ 		    "2"(BDOOR_PORT) : "memory");
+    *screensize = eax;
+
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20091015.201664.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20091015.201664.ebuild
index cc0501252cc2..b41ef8007349 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20091015.201664.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20091015.201664.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20091015.201664.ebuild,v 1.1 2009/10/29 14:14:51 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20091015.201664.ebuild,v 1.2 2009/11/07 13:46:16 vadimk Exp $
 
 EAPI="2"
 
@@ -60,7 +60,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/default-scripts1.patch"
-	#epatch "${FILESDIR}/checkvm-pie-safety.patch"
+	epatch "${FILESDIR}/checkvm-pie-safety.patch"
 	sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
 	sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
 }